diff options
30 files changed, 902 insertions, 0 deletions
diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile new file mode 100644 index 000000000..163b2777c --- /dev/null +++ b/net/avahi-app/Makefile @@ -0,0 +1,175 @@ +# New ports collection makefile for: avahi +# Date created: 18 November 2005 +# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> +# +# $FreeBSD: ports/net/avahi-app/Makefile,v 1.29 2010/12/04 07:32:51 ade Exp $ +# $MCom: ports/net/avahi-app/Makefile,v 1.14 2010/10/23 20:58:29 marcus Exp $ +# + +PORTNAME= avahi +PORTVERSION= 0.6.28 +PORTREVISION?= 0 +CATEGORIES?= net dns +MASTER_SITES= http://www.avahi.org/download/ +PKGNAMESUFFIX?= -app + +MAINTAINER?= gnome@FreeBSD.org +COMMENT?= Service discovery on a local network + +BUILD_DEPENDS?= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection +LIB_DEPENDS?= expat.6:${PORTSDIR}/textproc/expat2 \ + daemon.0:${PORTSDIR}/devel/libdaemon \ + dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ + gdbm.3:${PORTSDIR}/databases/gdbm +RUN_DEPENDS?= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection + +USE_GNOME?= gnomehack ltverhack glib20 intltool +USE_GETTEXT= yes +USE_GNOME_SUBR= yes +USE_GMAKE= yes +USE_AUTOTOOLS= libtool +USE_LDCONFIG= yes +AVAHI_SLAVE?= no +CONFIGURE_ARGS?=--with-distro=freebsd \ + --with-dbus-system-socket=unix:path=/var/run/dbus/system_bus_socket \ + --disable-monodoc \ + --disable-doxygen-doc \ + --disable-doxygen-dot \ + --localstatedir=/var \ + --enable-compat-howl +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_KQUEUE" \ + LDFLAGS="-L${LOCALBASE}/lib" \ + PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ + PTHREAD_LIBS="${PTHREAD_LIBS}" + +.if ${AVAHI_SLAVE}=="no" +CONFLICTS= howl-[0-9]* + +MAN1= avahi-browse.1 avahi-publish.1 avahi-resolve.1 avahi-set-host-name.1 +MAN5= avahi-daemon.conf.5 avahi.service.5 avahi.hosts.5 +MAN8= avahi-daemon.8 avahi-dnsconfd.8 avahi-dnsconfd.action.8 + +MLINKS= avahi-browse.1 avahi-browse-domains.1 \ + avahi-publish.1 avahi-publish-address.1 \ + avahi-publish.1 avahi-publish-service.1 \ + avahi-resolve.1 avahi-resolve-address.1 \ + avahi-resolve.1 avahi-resolve-host-name.1 + +DAEMON_CONFIG_FILES= hosts avahi-daemon.conf +.endif + +USE_RC_SUBR=yes + +.include <bsd.port.pre.mk> + +.if ${AVAHI_SLAVE}=="autoipd" +CONFIGURE_ARGS+=--enable-autoipd +.else +CONFIGURE_ARGS+=--disable-autoipd +.endif +.if ${AVAHI_SLAVE}=="gtk" +CONFIGURE_ARGS+=--enable-gtk +.else +CONFIGURE_ARGS+=--disable-gtk +.endif +.if ${AVAHI_SLAVE}=="gtk3" +CONFIGURE_ARGS+=--enable-gtk3 +.else +CONFIGURE_ARGS+=--disable-gtk3 +.endif +.if ${AVAHI_SLAVE}=="libdns" +CONFIGURE_ARGS+=--enable-compat-libdns_sd +.else +CONFIGURE_ARGS+=--disable-compat-libdns_sd +.endif +.if ${AVAHI_SLAVE}=="python" +CONFIGURE_ARGS+=--enable-python +.else +CONFIGURE_ARGS+=--disable-python +.endif +.if ${AVAHI_SLAVE}=="qt3" +CONFIGURE_ARGS+=--enable-qt3 +.else +CONFIGURE_ARGS+=--disable-qt3 +.endif +.if ${AVAHI_SLAVE}=="qt4" +CONFIGURE_ARGS+=--enable-qt4 \ + --disable-expat \ + --disable-gdbm +.else +CONFIGURE_ARGS+=--disable-qt4 +.endif +.if ${AVAHI_SLAVE}=="sharp" +CONFIGURE_ARGS+=--enable-mono +.else +CONFIGURE_ARGS+=--disable-mono +.endif + +post-patch: avahi-post-patch + +avahi-post-patch: + @${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|' \ + ${WRKSRC}/man/*.* + @${RM} -f ${WRKSRC}/man/*.bak + @${REINPLACE_CMD} -e 's|-ldl||g ; s|netdev|network|g' \ + ${WRKSRC}/configure \ + ${WRKSRC}/avahi-client/Makefile.in \ + ${WRKSRC}/avahi-daemon/Makefile.in + @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \ + ${REINPLACE_CMD} -e 's|(LIBINTL)|(INTLLIBS)|g ; \ + s|(LIBICONV)|(LTLIBICONV)|g' + @${REINPLACE_CMD} -e 's|%%RC_SUBR%%|/etc/rc.subr| ; \ + s|%%GNOME_SUBR%%|${GNOME_SUBR}|' \ + ${WRKSRC}/initscript/freebsd/avahi-dnsconfd.sh.in \ + ${WRKSRC}/initscript/freebsd/avahi-daemon.sh.in + @${REINPLACE_CMD} -e 's|dbus_connection_disconnect|dbus_connection_close|g' \ + ${WRKSRC}/avahi-client/client.c \ + ${WRKSRC}/avahi-daemon/dbus-protocol.c + @${REINPLACE_CMD} -e 's|^_||g' \ + ${WRKSRC}/avahi-ui/*.desktop.in.in + +post-build: avahi-post-build + +avahi-post-build: +.for f in ${AVAHI_PKGCONFIG} + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} \ + ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${f} +.endfor + +pre-su-install: avahi-pre-su-install + +avahi-pre-su-install: +.if ${AVAHI_SLAVE}=="no" + @${MKDIR} ${PREFIX}/lib/avahi + @${TOUCH} -f ${PREFIX}/lib/avahi/.keep +.endif + +post-install: avahi-post-install + +avahi-post-install: +.if ${AVAHI_SLAVE}!="no" +.for f in ${MAN1} ${MAN2} ${MAN3} ${MAN4} ${MAN5} ${MAN6} ${MAN7} ${MAN8} ${MAN9} + ${INSTALL_DATA} ${WRKSRC}/man/${f} ${PREFIX}/man/man${f:E}/${f} +.endfor +.endif +.for f in ${AVAHI_PKGCONFIG} + ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/libdata/pkgconfig +.endfor + ${MKDIR} ${PREFIX}/etc/avahi +.for f in ${DAEMON_CONFIG_FILES} + ${INSTALL_DATA} ${WRKSRC}/avahi-daemon/${f} \ + ${PREFIX}/etc/avahi/${f}.dist + if [ ! -f ${PREFIX}/etc/avahi/${f} ]; then \ + ${INSTALL_DATA} ${WRKSRC}/avahi-daemon/${f} \ + ${PREFIX}/etc/avahi; \ + fi +.endfor +.if ${AVAHI_SLAVE}=="no" + ${INSTALL_DATA} ${FILESDIR}/org.freedesktop.Avahi.service \ + ${LOCALBASE}/share/dbus-1/system-services +.endif +.if !defined(PACKAGE_BUILDING) && (${AVAHI_SLAVE}=="no" || ${AVAHI_SLAVE}=="autoipd") + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL +.endif + +.include <bsd.port.post.mk> diff --git a/net/avahi-app/distinfo b/net/avahi-app/distinfo new file mode 100644 index 000000000..0ca2bc46b --- /dev/null +++ b/net/avahi-app/distinfo @@ -0,0 +1,3 @@ +MD5 (avahi-0.6.28.tar.gz) = d0143a5aa3265019072e53ab497818d0 +SHA256 (avahi-0.6.28.tar.gz) = a0d80aac88212b9f9d5331c248091d3c9c9209f0e41985421636ebd14230fc91 +SIZE (avahi-0.6.28.tar.gz) = 1238660 diff --git a/net/avahi-app/files/org.freedesktop.Avahi.service b/net/avahi-app/files/org.freedesktop.Avahi.service new file mode 100644 index 000000000..7030ab4cb --- /dev/null +++ b/net/avahi-app/files/org.freedesktop.Avahi.service @@ -0,0 +1,24 @@ +# This file is part of avahi. +# +# avahi is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# avahi is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public +# License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with avahi; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +[D-BUS Service] +Name=org.freedesktop.Avahi +#SystemdService=avahi-daemon.service + +# This service should not be bus activated if systemd isn't running, +# so that activation won't conflict with the init script startup. +Exec=/usr/bin/false diff --git a/net/avahi-app/files/patch-Makefile.in b/net/avahi-app/files/patch-Makefile.in new file mode 100644 index 000000000..5fd8b4105 --- /dev/null +++ b/net/avahi-app/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2010-07-24 19:44:27.000000000 -0400 ++++ Makefile.in 2010-07-24 19:45:59.000000000 -0400 +@@ -1175,6 +1175,8 @@ uninstall-am: uninstall-pkgconfigDATA + %.pc: %.pc.in + $(AM_V_GEN)sed -e 's,@prefix\@,$(prefix),g' \ + -e 's,@libdir\@,$(libdir),g' \ ++ -e 's,@PTHREAD_CFLAGS\@,$(PTHREAD_CFLAGS),g' \ ++ -e 's,@PTHREAD_LIBS\@,$(PTHREAD_LIBS),g' \ + -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@ + + avahi.devhelp: doxygen-run diff --git a/net/avahi-app/files/patch-avahi-autoipd_main.c b/net/avahi-app/files/patch-avahi-autoipd_main.c new file mode 100644 index 000000000..f67ed7a2a --- /dev/null +++ b/net/avahi-app/files/patch-avahi-autoipd_main.c @@ -0,0 +1,13 @@ +--- avahi-autoipd/main.c.orig 2007-12-19 15:22:16.000000000 +0000 ++++ avahi-autoipd/main.c 2007-12-19 15:23:39.000000000 +0000 +@@ -64,8 +64,8 @@ + #include <pcap.h> + + /* Old versions of PCAP defined it as D_IN */ +-#ifndef PCAP_D_IN +-#define PCAP_D_IN D_IN ++#ifndef D_IN ++#define D_IN PCAP_D_IN + #endif + + #endif diff --git a/net/avahi-app/files/patch-avahi-client.pc.in b/net/avahi-app/files/patch-avahi-client.pc.in new file mode 100644 index 000000000..e980e52e0 --- /dev/null +++ b/net/avahi-app/files/patch-avahi-client.pc.in @@ -0,0 +1,10 @@ +--- avahi-client.pc.in.orig Mon May 15 02:28:25 2006 ++++ avahi-client.pc.in Mon May 15 02:30:08 2006 +@@ -6,5 +6,5 @@ + Name: avahi-client + Description: Avahi Multicast DNS Responder (Client Support) + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -lavahi-common -lavahi-client +-Cflags: -D_REENTRANT -I${includedir} ++Libs: -L${libdir} -lavahi-common -lavahi-client @PTHREAD_LIBS@ ++Cflags: -D_REENTRANT @PTHREAD_CFLAGS@ -I${includedir} diff --git a/net/avahi-app/files/patch-avahi-compat-howl.pc.in b/net/avahi-app/files/patch-avahi-compat-howl.pc.in new file mode 100644 index 000000000..f101cc1da --- /dev/null +++ b/net/avahi-app/files/patch-avahi-compat-howl.pc.in @@ -0,0 +1,10 @@ +--- avahi-compat-howl.pc.in.orig Sun Jan 29 13:32:39 2006 ++++ avahi-compat-howl.pc.in Sun Jan 29 13:32:56 2006 +@@ -6,5 +6,5 @@ + Name: avahi-compat-howl + Description: Avahi Multicast DNS Responder (HOWL Compatibility) + Version: @HOWL_COMPAT_VERSION@ +-Libs: -L${libdir} -lhowl +-Cflags: -D_REENTRANT -I${includedir} ++Libs: -L${libdir} -lhowl @PTHREAD_LIBS@ ++Cflags: -D_REENTRANT @PTHREAD_CFLAGS@ -I${includedir} diff --git a/net/avahi-app/files/patch-avahi-compat-libdns_sd.pc.in b/net/avahi-app/files/patch-avahi-compat-libdns_sd.pc.in new file mode 100644 index 000000000..8487c1b5a --- /dev/null +++ b/net/avahi-app/files/patch-avahi-compat-libdns_sd.pc.in @@ -0,0 +1,10 @@ +--- avahi-compat-libdns_sd.pc.in.orig Sun Jan 29 13:33:21 2006 ++++ avahi-compat-libdns_sd.pc.in Sun Jan 29 13:33:40 2006 +@@ -6,5 +6,5 @@ + Name: avahi-compat-libdns_sd + Description: Avahi Multicast DNS Responder (libdns_sd Compatibility) + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -ldns_sd +-Cflags: -D_REENTRANT -I${includedir} ++Libs: -L${libdir} -ldns_sd @PTHREAD_LIBS@ ++Cflags: -D_REENTRANT @PTHREAD_CFLAGS@ -I${includedir} diff --git a/net/avahi-app/files/patch-avahi-compat-libdns_sd_Makefile.in b/net/avahi-app/files/patch-avahi-compat-libdns_sd_Makefile.in new file mode 100644 index 000000000..971db032f --- /dev/null +++ b/net/avahi-app/files/patch-avahi-compat-libdns_sd_Makefile.in @@ -0,0 +1,59 @@ +--- avahi-compat-libdns_sd/Makefile.in.orig 2010-07-24 19:46:12.000000000 -0400 ++++ avahi-compat-libdns_sd/Makefile.in 2010-07-24 19:49:25.000000000 -0400 +@@ -127,9 +127,7 @@ am__null_test_SOURCES_DIST = dns_sd.h co + null_test_OBJECTS = $(am_null_test_OBJECTS) + am__DEPENDENCIES_1 = + @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ $(am__DEPENDENCIES_1) \ +-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ ../avahi-common/libavahi-common.la \ +-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ ../avahi-client/libavahi-client.la ++@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ $(am__DEPENDENCIES_1) + null_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(null_test_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +@@ -139,8 +137,7 @@ am__txt_test_SOURCES_DIST = dns_sd.h txt + @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ txt_test-warn.$(OBJEXT) + txt_test_OBJECTS = $(am_txt_test_OBJECTS) + @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ $(am__DEPENDENCIES_1) \ +-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ ../avahi-common/libavahi-common.la ++@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ $(am__DEPENDENCIES_1) + txt_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(txt_test_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +@@ -433,7 +430,7 @@ AM_CFLAGS = -I$(top_srcdir) '-DDEBUG_TRA + @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ warn.c warn.h + + @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@libdns_sd_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) +-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@libdns_sd_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la ++@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@libdns_sd_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) `$(PKG_CONFIG) --libs --cflags avahi-client` + @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_SOURCES = \ + @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ dns_sd.h \ + @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ txt.c \ +@@ -441,7 +438,7 @@ AM_CFLAGS = -I$(top_srcdir) '-DDEBUG_TRA + @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ warn.c warn.h + + @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) +-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la ++@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) `$(PKG_CONFIG) --libs --cflags avahi-client` + @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_SOURCES = \ + @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ dns_sd.h \ + @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ compat.c \ +@@ -449,7 +446,7 @@ AM_CFLAGS = -I$(top_srcdir) '-DDEBUG_TRA + @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ warn.c warn.h + + @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) +-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la ++@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) `$(PKG_CONFIG) --libs --cflags avahi-client` + @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@CLEANFILES = libdns_sd-test.o libdns_sd-test + all: all-am + +@@ -943,7 +940,7 @@ uninstall-am: uninstall-avahi_compat_lib + + @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@libdns_sd-test: libdns_sd-test.c libdns_sd.la + @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ $(LIBTOOL) --mode=compile $(CC) $(AM_CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test.o -c libdns_sd-test.c +-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test libdns_sd-test.o $(PTHREAD_LIBS) ../avahi-common/libavahi-common.la libdns_sd.la ++@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test libdns_sd-test.o $(PTHREAD_LIBS) libdns_sd.la + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/net/avahi-app/files/patch-avahi-core.pc.in b/net/avahi-app/files/patch-avahi-core.pc.in new file mode 100644 index 000000000..fdde41be9 --- /dev/null +++ b/net/avahi-app/files/patch-avahi-core.pc.in @@ -0,0 +1,10 @@ +--- avahi-core.pc.in.orig Sun Jan 29 13:31:30 2006 ++++ avahi-core.pc.in Sun Jan 29 13:31:48 2006 +@@ -6,5 +6,5 @@ + Name: avahi-core + Description: Avahi Multicast DNS Responder (Embeddable Stack) + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -lavahi-common -lavahi-core +-Cflags: -D_REENTRANT -I${includedir} ++Libs: -L${libdir} -lavahi-common -lavahi-core @PTHREAD_LIBS@ ++Cflags: -D_REENTRANT @PTHREAD_CFLAGS@ -I${includedir} diff --git a/net/avahi-app/files/patch-avahi-daemon_Makefile.in b/net/avahi-app/files/patch-avahi-daemon_Makefile.in new file mode 100644 index 000000000..41a621a3b --- /dev/null +++ b/net/avahi-app/files/patch-avahi-daemon_Makefile.in @@ -0,0 +1,20 @@ +--- avahi-daemon/Makefile.in.orig 2010-07-24 19:49:59.000000000 -0400 ++++ avahi-daemon/Makefile.in 2010-07-24 19:51:01.000000000 -0400 +@@ -69,7 +69,7 @@ host_triplet = @host@ + @ENABLE_CHROOT_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@ caps.c caps.h + + @ENABLE_CHROOT_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@am__append_3 = -lcap +-@HAVE_DLOPEN_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@am__append_4 = -ldl ++@HAVE_DLOPEN_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@am__append_4 = + @HAVE_DBUS_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@am__append_5 = \ + @HAVE_DBUS_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@ dbus-protocol.c dbus-protocol.h \ + @HAVE_DBUS_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@ dbus-util.c dbus-util.h \ +@@ -678,7 +678,7 @@ clean-sbinPROGRAMS: + rm -f $$list + avahi-daemon$(EXEEXT): $(avahi_daemon_OBJECTS) $(avahi_daemon_DEPENDENCIES) + @rm -f avahi-daemon$(EXEEXT) +- $(AM_V_CCLD)$(avahi_daemon_LINK) $(avahi_daemon_OBJECTS) $(avahi_daemon_LDADD) $(LIBS) ++ $(AM_V_CCLD)$(avahi_daemon_LINK) $(avahi_daemon_OBJECTS) $(avahi_daemon_LDADD) $(LIBS) $(INTLLIBS) + ini-file-parser-test$(EXEEXT): $(ini_file_parser_test_OBJECTS) $(ini_file_parser_test_DEPENDENCIES) + @rm -f ini-file-parser-test$(EXEEXT) + $(AM_V_CCLD)$(ini_file_parser_test_LINK) $(ini_file_parser_test_OBJECTS) $(ini_file_parser_test_LDADD) $(LIBS) diff --git a/net/avahi-app/files/patch-avahi-daemon_main.c b/net/avahi-app/files/patch-avahi-daemon_main.c new file mode 100644 index 000000000..c95ab399f --- /dev/null +++ b/net/avahi-app/files/patch-avahi-daemon_main.c @@ -0,0 +1,14 @@ +--- avahi-daemon/main.c.orig 2007-08-26 00:48:40.000000000 -0400 ++++ avahi-daemon/main.c 2007-08-26 00:49:04.000000000 -0400 +@@ -317,6 +317,11 @@ static void update_browse_domains(void) + int n; + char **p; + ++ if (!resolv_conf_search_domains) { ++ avahi_server_set_browse_domains(avahi_server, NULL); ++ return; ++ } ++ + l = avahi_string_list_copy(config.server_config.browse_domains); + + for (p = resolv_conf_search_domains, n = 0; *p && n < BROWSE_DOMAINS_MAX; p++, n++) { diff --git a/net/avahi-app/files/patch-avahi-discover-standalone_Makefile.in b/net/avahi-app/files/patch-avahi-discover-standalone_Makefile.in new file mode 100644 index 000000000..d4afb05c0 --- /dev/null +++ b/net/avahi-app/files/patch-avahi-discover-standalone_Makefile.in @@ -0,0 +1,24 @@ +--- avahi-discover-standalone/Makefile.in.orig 2010-07-24 19:51:29.000000000 -0400 ++++ avahi-discover-standalone/Makefile.in 2010-07-24 19:53:14.000000000 -0400 +@@ -97,9 +97,7 @@ am__DEPENDENCIES_1 = + @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) + @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) \ + @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@ $(am__DEPENDENCIES_1) +-@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@avahi_discover_standalone_DEPENDENCIES = ../avahi-common/libavahi-common.la \ +-@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ ../avahi-glib/libavahi-glib.la \ +-@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ ../avahi-core/libavahi-core.la \ ++@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@avahi_discover_standalone_DEPENDENCIES = \ + @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(am__DEPENDENCIES_2) \ + @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(am__DEPENDENCIES_3) + AM_V_lt = $(am__v_lt_$(V)) +@@ -418,9 +416,7 @@ interfaces = \ + @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(am__append_3) + @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@avahi_discover_standalone_LDADD = \ + @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(AM_LDADD) \ +-@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ ../avahi-common/libavahi-common.la \ +-@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ ../avahi-glib/libavahi-glib.la \ +-@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ ../avahi-core/libavahi-core.la \ ++@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ `$(PKG_CONFIG) --cflags --libs avahi-client avahi-core avahi-glib` \ + @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(am__append_2) \ + @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(am__append_4) + @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@interfaces_DATA = $(interfaces) diff --git a/net/avahi-app/files/patch-avahi-glib.pc.in b/net/avahi-app/files/patch-avahi-glib.pc.in new file mode 100644 index 000000000..e2633c32d --- /dev/null +++ b/net/avahi-app/files/patch-avahi-glib.pc.in @@ -0,0 +1,10 @@ +--- avahi-glib.pc.in.orig Mon May 15 02:31:01 2006 ++++ avahi-glib.pc.in Mon May 15 02:31:25 2006 +@@ -7,5 +7,5 @@ + Description: Avahi Multicast DNS Responder (GLib Support) + Version: @PACKAGE_VERSION@ + Requires: glib-2.0 +-Libs: -L${libdir} -lavahi-glib +-Cflags: -D_REENTRANT -I${includedir} ++Libs: -L${libdir} -lavahi-glib @PTHREAD_LIBS@ ++Cflags: -D_REENTRANT @PTHREAD_CFLAGS@ -I${includedir} diff --git a/net/avahi-app/files/patch-avahi-qt3.pc.in b/net/avahi-app/files/patch-avahi-qt3.pc.in new file mode 100644 index 000000000..8174f2584 --- /dev/null +++ b/net/avahi-app/files/patch-avahi-qt3.pc.in @@ -0,0 +1,10 @@ +--- avahi-qt3.pc.in.orig Thu Apr 12 00:18:53 2007 ++++ avahi-qt3.pc.in Thu Apr 12 00:19:20 2007 +@@ -7,5 +7,5 @@ Name: avahi-qt3 + Description: Avahi Multicast DNS Responder (QT3 Support) + Version: @PACKAGE_VERSION@ + Requires.private: qt-mt >= 3.0.0 +-Libs: -L${libdir} -lavahi-qt3 +-Cflags: -D_REENTRANT -I${includedir} ++Libs: -L${libdir} -lavahi-qt3 @PTHREAD_LIBS@ ++Cflags: -D_REENTRANT @PTHREAD_CFLAGS@ -I${includedir} diff --git a/net/avahi-app/files/patch-avahi-qt4.pc.in b/net/avahi-app/files/patch-avahi-qt4.pc.in new file mode 100644 index 000000000..7bffe2d95 --- /dev/null +++ b/net/avahi-app/files/patch-avahi-qt4.pc.in @@ -0,0 +1,10 @@ +--- avahi-qt4.pc.in.orig 2006-01-23 07:15:20.000000000 +1000 ++++ avahi-qt4.pc.in 2007-10-28 12:10:17.000000000 +1000 +@@ -7,5 +7,5 @@ + Description: Avahi Multicast DNS Responder (QT4 Support) + Version: @PACKAGE_VERSION@ + Requires.private: QtCore >= 4.0.0 +-Libs: -L${libdir} -lavahi-qt4 +-Cflags: -D_REENTRANT -I${includedir} ++Libs: -L${libdir} -lavahi-qt4 @PTHREAD_LIBS@ ++Cflags: -D_REENTRANT @PTHREAD_CFLAGS@ -I${includedir} diff --git a/net/avahi-app/files/patch-avahi-qt_Makefile.in b/net/avahi-app/files/patch-avahi-qt_Makefile.in new file mode 100644 index 000000000..8f1dc3039 --- /dev/null +++ b/net/avahi-app/files/patch-avahi-qt_Makefile.in @@ -0,0 +1,36 @@ +--- avahi-qt/Makefile.in.orig 2008-07-03 14:37:05.000000000 -0500 ++++ avahi-qt/Makefile.in 2008-07-03 14:39:27.000000000 -0500 +@@ -93,7 +93,6 @@ + LTLIBRARIES = $(lib_LTLIBRARIES) + am__DEPENDENCIES_1 = + @HAVE_QT3_TRUE@libavahi_qt3_la_DEPENDENCIES = \ +-@HAVE_QT3_TRUE@ ../avahi-common/libavahi-common.la \ + @HAVE_QT3_TRUE@ $(am__DEPENDENCIES_1) + am__libavahi_qt3_la_SOURCES_DIST = qt-watch.cpp + @HAVE_QT3_TRUE@am_libavahi_qt3_la_OBJECTS = \ +@@ -104,7 +103,6 @@ + $(CXXFLAGS) $(libavahi_qt3_la_LDFLAGS) $(LDFLAGS) -o $@ + @HAVE_QT3_TRUE@am_libavahi_qt3_la_rpath = -rpath $(libdir) + @HAVE_QT4_TRUE@libavahi_qt4_la_DEPENDENCIES = \ +-@HAVE_QT4_TRUE@ ../avahi-common/libavahi-common.la \ + @HAVE_QT4_TRUE@ $(am__DEPENDENCIES_1) + am__libavahi_qt4_la_SOURCES_DIST = qt-watch.cpp + @HAVE_QT4_TRUE@am_libavahi_qt4_la_OBJECTS = \ +@@ -400,7 +398,7 @@ + @HAVE_QT3_TRUE@ qt-watch.cpp + + @HAVE_QT3_TRUE@libavahi_qt3_la_CPPFLAGS = $(AM_CFLAGS) $(QT3_CFLAGS) $(VISIBILITY_HIDDEN_CFLAGS) +-@HAVE_QT3_TRUE@libavahi_qt3_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT3_LIBS) ++@HAVE_QT3_TRUE@libavahi_qt3_la_LIBADD = $(AM_LDADD) -lavahi-common $(QT3_LIBS) + @HAVE_QT3_TRUE@libavahi_qt3_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_QT3_VERSION_INFO) + @HAVE_QT4_TRUE@avahiqt4includedir = $(includedir)/avahi-qt4 + @HAVE_QT4_TRUE@avahiqt4include_HEADERS = \ +@@ -410,7 +408,7 @@ + @HAVE_QT4_TRUE@ qt-watch.cpp + + @HAVE_QT4_TRUE@libavahi_qt4_la_CPPFLAGS = $(AM_CFLAGS) $(QT4_CFLAGS) -DQT4 $(VISIBILITY_HIDDEN_CFLAGS) +-@HAVE_QT4_TRUE@libavahi_qt4_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT4_LIBS) ++@HAVE_QT4_TRUE@libavahi_qt4_la_LIBADD = $(AM_LDADD) -lavahi-common $(QT4_LIBS) + @HAVE_QT4_TRUE@libavahi_qt4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_QT4_VERSION_INFO) + CLEANFILES = $(BUILT_SOURCES) + all: $(BUILT_SOURCES) diff --git a/net/avahi-app/files/patch-avahi-ui_Makefile.in b/net/avahi-app/files/patch-avahi-ui_Makefile.in new file mode 100644 index 000000000..c4408f918 --- /dev/null +++ b/net/avahi-app/files/patch-avahi-ui_Makefile.in @@ -0,0 +1,72 @@ +--- avahi-ui/Makefile.in.orig 2010-07-25 00:35:38.000000000 -0400 ++++ avahi-ui/Makefile.in 2010-07-25 02:52:46.000000000 -0400 +@@ -119,9 +117,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" + "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(avahiincludedir)" + LTLIBRARIES = $(lib_LTLIBRARIES) + am__DEPENDENCIES_1 = +-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@libavahi_ui_gtk3_la_DEPENDENCIES = ../avahi-common/libavahi-common.la \ +-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ ../avahi-client/libavahi-client.la \ +-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ ../avahi-glib/libavahi-glib.la \ ++@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@libavahi_ui_gtk3_la_DEPENDENCIES = \ + @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(am__DEPENDENCIES_1) \ + @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(am__DEPENDENCIES_1) + am__libavahi_ui_gtk3_la_SOURCES_DIST = avahi-ui.h avahi-ui.c \ +@@ -142,9 +138,7 @@ libavahi_ui_gtk3_la_LINK = $(LIBTOOL) $( + $(libavahi_ui_gtk3_la_LDFLAGS) $(LDFLAGS) -o $@ + @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@am_libavahi_ui_gtk3_la_rpath = -rpath \ + @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@ $(libdir) +-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@libavahi_ui_la_DEPENDENCIES = ../avahi-common/libavahi-common.la \ +-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ ../avahi-client/libavahi-client.la \ +-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ ../avahi-glib/libavahi-glib.la \ ++@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@libavahi_ui_la_DEPENDENCIES = \ + @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(am__DEPENDENCIES_1) \ + @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(am__DEPENDENCIES_1) + am__libavahi_ui_la_SOURCES_DIST = avahi-ui.h avahi-ui.c \ +@@ -166,13 +160,9 @@ am__bssh_SOURCES_DIST = bssh.c + @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@am_bssh_OBJECTS = bssh-bssh.$(OBJEXT) + bssh_OBJECTS = $(am_bssh_OBJECTS) + @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@bssh_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@ ../avahi-client/libavahi-client.la \ +-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@ ../avahi-common/libavahi-common.la \ +-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@ libavahi-ui.la ++ libavahi-ui.la + @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@bssh_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@ ../avahi-client/libavahi-client.la \ +-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@ ../avahi-common/libavahi-common.la \ +-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@ libavahi-ui-gtk3.la ++ libavahi-ui.la + bssh_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(bssh_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +@@ -478,9 +468,7 @@ EXTRA_DIST = $(desktop_DATA_in_in) + @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(am__append_5) \ + @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(am__append_10) + @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@libavahi_ui_la_LIBADD = $(AM_LDADD) \ +-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ ../avahi-common/libavahi-common.la \ +-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ ../avahi-client/libavahi-client.la \ +-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ ../avahi-glib/libavahi-glib.la \ ++@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ `$(PKG_CONFIG) --cflags --libs avahi-client avahi-core avahi-glib` \ + @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(GTK20_LIBS) \ + @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(am__append_6) + @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@libavahi_ui_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_UI_VERSION_INFO) +@@ -490,17 +478,15 @@ EXTRA_DIST = $(desktop_DATA_in_in) + @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(am__append_7) \ + @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(am__append_11) + @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@libavahi_ui_gtk3_la_LIBADD = $(AM_LDADD) \ +-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ ../avahi-common/libavahi-common.la \ +-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ ../avahi-client/libavahi-client.la \ +-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ ../avahi-glib/libavahi-glib.la \ ++@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ `$(PKG_CONFIG) --cflags --libs avahi-client avahi-core avahi-glib` \ + @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(GTK30_LIBS) \ + @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(am__append_8) + @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@libavahi_ui_gtk3_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_UI_VERSION_INFO) + @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@bssh_SOURCES = bssh.c + @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@bssh_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS) + @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@bssh_CFLAGS = $(AM_CFLAGS) $(GTK30_CFLAGS) +-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@bssh_LDADD = $(AM_LDADD) $(GTK20_LIBS) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la libavahi-ui.la +-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@bssh_LDADD = $(AM_LDADD) $(GTK30_LIBS) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la libavahi-ui-gtk3.la ++@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@bssh_LDADD = $(AM_LDADD) $(GTK20_LIBS) `$(PKG_CONFIG) --cflags --libs avahi-client avahi-core` libavahi-ui.la ++@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@bssh_LDADD = $(AM_LDADD) $(GTK30_LIBS) `$(PKG_CONFIG) --cflags --libs avahi-client avahi-core` libavahi-ui-gtk3.la + CLEANFILES = $(desktop_DATA) $(desktop_DATA_in) + all: all-am + diff --git a/net/avahi-app/files/patch-avahi-utils_Makefile.in b/net/avahi-app/files/patch-avahi-utils_Makefile.in new file mode 100644 index 000000000..90bc06015 --- /dev/null +++ b/net/avahi-app/files/patch-avahi-utils_Makefile.in @@ -0,0 +1,23 @@ +--- avahi-utils/Makefile.in.orig 2010-07-24 19:59:10.000000000 -0400 ++++ avahi-utils/Makefile.in 2010-07-24 20:00:07.000000000 -0400 +@@ -513,16 +513,16 @@ clean-binPROGRAMS: + rm -f $$list + avahi-browse$(EXEEXT): $(avahi_browse_OBJECTS) $(avahi_browse_DEPENDENCIES) + @rm -f avahi-browse$(EXEEXT) +- $(AM_V_CCLD)$(avahi_browse_LINK) $(avahi_browse_OBJECTS) $(avahi_browse_LDADD) $(LIBS) ++ $(AM_V_CCLD)$(avahi_browse_LINK) $(avahi_browse_OBJECTS) $(avahi_browse_LDADD) $(LIBS) $(INTLLIBS) + avahi-publish$(EXEEXT): $(avahi_publish_OBJECTS) $(avahi_publish_DEPENDENCIES) + @rm -f avahi-publish$(EXEEXT) +- $(AM_V_CCLD)$(avahi_publish_LINK) $(avahi_publish_OBJECTS) $(avahi_publish_LDADD) $(LIBS) ++ $(AM_V_CCLD)$(avahi_publish_LINK) $(avahi_publish_OBJECTS) $(avahi_publish_LDADD) $(LIBS) $(INTLLIBS) + avahi-resolve$(EXEEXT): $(avahi_resolve_OBJECTS) $(avahi_resolve_DEPENDENCIES) + @rm -f avahi-resolve$(EXEEXT) +- $(AM_V_CCLD)$(avahi_resolve_LINK) $(avahi_resolve_OBJECTS) $(avahi_resolve_LDADD) $(LIBS) ++ $(AM_V_CCLD)$(avahi_resolve_LINK) $(avahi_resolve_OBJECTS) $(avahi_resolve_LDADD) $(LIBS) $(INTLLIBS) + avahi-set-host-name$(EXEEXT): $(avahi_set_host_name_OBJECTS) $(avahi_set_host_name_DEPENDENCIES) + @rm -f avahi-set-host-name$(EXEEXT) +- $(AM_V_CCLD)$(avahi_set_host_name_LINK) $(avahi_set_host_name_OBJECTS) $(avahi_set_host_name_LDADD) $(LIBS) ++ $(AM_V_CCLD)$(avahi_set_host_name_LINK) $(avahi_set_host_name_OBJECTS) $(avahi_set_host_name_LDADD) $(LIBS) $(INTLLIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) diff --git a/net/avahi-app/files/patch-configure b/net/avahi-app/files/patch-configure new file mode 100644 index 000000000..141c9403f --- /dev/null +++ b/net/avahi-app/files/patch-configure @@ -0,0 +1,18 @@ +--- configure.orig Sat Jun 23 02:05:47 2007 ++++ configure Sat Jun 23 02:13:52 2007 +@@ -20338,6 +20338,7 @@ echo $ECHO_N "checking whether to check + check_inconsistencies=yes + case "${host_cpu}-${host_os}" in + *-darwin*) check_inconsistencies=no ;; ++ *-freebsd*) check_inconsistencies=no ;; + esac + if test x"$GCC" != xyes -o "x$check_inconsistencies" != xyes ; then + { echo "$as_me:$LINENO: result: no" >&5 +@@ -22442,6 +22443,7 @@ cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default ++#include <sys/socket.h> + int + main () + { diff --git a/net/avahi-app/files/patch-dnsconfd_Makefile.in b/net/avahi-app/files/patch-dnsconfd_Makefile.in new file mode 100644 index 000000000..69f7e6cee --- /dev/null +++ b/net/avahi-app/files/patch-dnsconfd_Makefile.in @@ -0,0 +1,11 @@ +--- avahi-dnsconfd/Makefile.in.orig 2010-07-24 20:00:31.000000000 -0400 ++++ avahi-dnsconfd/Makefile.in 2010-07-24 20:01:08.000000000 -0400 +@@ -484,7 +484,7 @@ clean-sbinPROGRAMS: + rm -f $$list + avahi-dnsconfd$(EXEEXT): $(avahi_dnsconfd_OBJECTS) $(avahi_dnsconfd_DEPENDENCIES) + @rm -f avahi-dnsconfd$(EXEEXT) +- $(AM_V_CCLD)$(avahi_dnsconfd_LINK) $(avahi_dnsconfd_OBJECTS) $(avahi_dnsconfd_LDADD) $(LIBS) ++ $(AM_V_CCLD)$(avahi_dnsconfd_LINK) $(avahi_dnsconfd_OBJECTS) $(avahi_dnsconfd_LDADD) $(LIBS) $(INTLLIBS) + install-pkgsysconfSCRIPTS: $(pkgsysconf_SCRIPTS) + @$(NORMAL_INSTALL) + test -z "$(pkgsysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgsysconfdir)" diff --git a/net/avahi-app/files/patch-initscript_freebsd_Makefile.in b/net/avahi-app/files/patch-initscript_freebsd_Makefile.in new file mode 100644 index 000000000..2b80f6c20 --- /dev/null +++ b/net/avahi-app/files/patch-initscript_freebsd_Makefile.in @@ -0,0 +1,33 @@ +--- initscript/freebsd/Makefile.in.orig 2008-07-03 15:05:53.000000000 -0500 ++++ initscript/freebsd/Makefile.in 2008-07-03 15:07:05.000000000 -0500 +@@ -333,12 +333,12 @@ + avahi-dnsconfd.sh.in + + initd_SCRIPTS = \ +- avahi-daemon.sh \ +- avahi-dnsconfd.sh ++ avahi-daemon \ ++ avahi-dnsconfd + + CLEANFILES = \ +- avahi-daemon.sh \ +- avahi-dnsconfd.sh ++ avahi-daemon \ ++ avahi-dnsconfd + + all: all-am + +@@ -531,11 +531,11 @@ + uninstall uninstall-am uninstall-initdSCRIPTS + + +-avahi-daemon.sh: avahi-daemon.sh.in ++avahi-daemon: avahi-daemon.sh.in + sed -e 's,@sbindir\@,$(sbindir),g' $< > $@ + chmod +x $@ + +-avahi-dnsconfd.sh: avahi-dnsconfd.sh.in ++avahi-dnsconfd: avahi-dnsconfd.sh.in + sed \ + -e 's,@sbindir\@,$(sbindir),g' \ + -e 's,@sysconfdir\@,$(sysconfdir),g' \ diff --git a/net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in b/net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in new file mode 100644 index 000000000..b50a9e875 --- /dev/null +++ b/net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in @@ -0,0 +1,17 @@ +--- initscript/freebsd/avahi-daemon.sh.in.orig Sun Nov 5 12:35:16 2006 ++++ initscript/freebsd/avahi-daemon.sh.in Sun Nov 5 12:36:51 2006 +@@ -9,10 +9,12 @@ + # Avahi's mDNSResponder, a Zeroconf (Bonjour) service advertisement daemon. + # + +-avahi_daemon_enable=${avahi_daemon_enable-"NO"} + avahi_daemon_flags=${avahi_daemon_flags-"-D"} + +-. /etc/rc.subr ++. /etc/rc.subr ++. %%GNOME_SUBR%% ++ ++avahi_daemon_enable=${avahi_daemon_enable-${gnome_enable}} + + name=avahi_daemon + rcvar=`set_rcvar` diff --git a/net/avahi-app/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in b/net/avahi-app/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in new file mode 100644 index 000000000..71c4343a1 --- /dev/null +++ b/net/avahi-app/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in @@ -0,0 +1,17 @@ +--- initscript/freebsd/avahi-dnsconfd.sh.in.orig Sun Nov 5 12:35:20 2006 ++++ initscript/freebsd/avahi-dnsconfd.sh.in Sun Nov 5 12:36:24 2006 +@@ -12,10 +12,12 @@ + # DNS servers in a DHCP-like fashion with mDNS. + # + +-avahi_dnsconfd_enable=${avahi_dnsconfd_enable-"NO"} + avahi_dnsconfd_flags=${avahi_dnsconfd_flags-"-D"} + +-. /etc/rc.subr ++. /etc/rc.subr ++. %%GNOME_SUBR%% ++ ++avahi_dnsconfd_enable=${avahi_dnsconfd_enable-${gnome_enable}} + + name=avahi_dnsconfd + rcvar=`set_rcvar` diff --git a/net/avahi-app/pkg-descr b/net/avahi-app/pkg-descr new file mode 100644 index 000000000..fb85b6205 --- /dev/null +++ b/net/avahi-app/pkg-descr @@ -0,0 +1,7 @@ +Service discovery on a local network -- this means that you can plug your +laptop or computer into a network and instantly be able to view other people +who you can chat with, find printers to print to or find files being shared. +This kind of technology is already found in MacOS X (branded 'Rendezvous', +'Bonjour' and sometimes 'ZeroConf') and is very convenient. + +WWW: http://www.avahi.org/ diff --git a/net/avahi-app/pkg-install b/net/avahi-app/pkg-install new file mode 100644 index 000000000..9bbd14bce --- /dev/null +++ b/net/avahi-app/pkg-install @@ -0,0 +1,36 @@ +#!/bin/sh + +case $2 in +POST-INSTALL) + USER=avahi + GROUP=${USER} + UID=558 + GID=${UID} + PW=/usr/sbin/pw + + if ${PW} group show "${GROUP}" 2>/dev/null; then + echo "You already have a group \"${GROUP}\", so I will use it." + else + if ${PW} groupadd ${GROUP} -g ${GID}; then + echo "Added group \"${GROUP}\"." + else + echo "Adding group \"${GROUP}\" failed..." + exit 1 + fi + fi + + if ${PW} user show "${USER}" 2>/dev/null; then + echo "You already have a user \"${USER}\", so I will use it." + else + if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \ + -d "/nonexistent" -s /sbin/nologin -c "Avahi Daemon User" + then + echo "Added user \"${USER}\"." + else + echo "Adding user \"${USER}\" failed..." + exit 1 + fi + fi + exit 0 + ;; +esac diff --git a/net/avahi-app/pkg-plist b/net/avahi-app/pkg-plist new file mode 100644 index 000000000..a30b15910 --- /dev/null +++ b/net/avahi-app/pkg-plist @@ -0,0 +1,174 @@ +bin/avahi-browse +bin/avahi-browse-domains +bin/avahi-publish +bin/avahi-publish-address +bin/avahi-publish-service +bin/avahi-resolve +bin/avahi-resolve-address +bin/avahi-resolve-host-name +bin/avahi-set-host-name +@unexec if cmp -s %D/etc/avahi/avahi-daemon.conf %D/etc/avahi/avahi-daemon.conf.dist; then rm -f %D/etc/avahi/avahi-daemon.conf; fi +etc/avahi/avahi-daemon.conf.dist +@exec [ -f %B/avahi-daemon.conf ] || cp %B/%f %B/avahi-daemon.conf +etc/avahi/avahi-dnsconfd.action +@unexec if cmp -s %D/etc/avahi/hosts %D/etc/avahi/hosts.dist; then rm -f %D/etc/avahi/hosts; fi +etc/avahi/hosts.dist +@exec [ -f %B/hosts ] || cp %B/%f %B/hosts +etc/avahi/services/sftp-ssh.service +etc/avahi/services/ssh.service +etc/dbus-1/system.d/avahi-dbus.conf +etc/rc.d/avahi-daemon +etc/rc.d/avahi-dnsconfd +include/avahi-client/client.h +include/avahi-client/lookup.h +include/avahi-client/publish.h +include/avahi-common/address.h +include/avahi-common/alternative.h +include/avahi-common/cdecl.h +include/avahi-common/defs.h +include/avahi-common/domain.h +include/avahi-common/error.h +include/avahi-common/gccmacro.h +include/avahi-common/llist.h +include/avahi-common/malloc.h +include/avahi-common/rlist.h +include/avahi-common/simple-watch.h +include/avahi-common/strlst.h +include/avahi-common/thread-watch.h +include/avahi-common/timeval.h +include/avahi-common/watch.h +include/avahi-compat-howl/corby/buffer.h +include/avahi-compat-howl/corby/channel.h +include/avahi-compat-howl/corby/corby.h +include/avahi-compat-howl/corby/message.h +include/avahi-compat-howl/corby/object.h +include/avahi-compat-howl/corby/orb.h +include/avahi-compat-howl/discovery/discovery.h +include/avahi-compat-howl/discovery/text_record.h +include/avahi-compat-howl/howl.h +include/avahi-compat-howl/rendezvous/rendezvous.h +include/avahi-compat-howl/rendezvous/text_record.h +include/avahi-compat-howl/salt/address.h +include/avahi-compat-howl/salt/debug.h +include/avahi-compat-howl/salt/interface.h +include/avahi-compat-howl/salt/platform.h +include/avahi-compat-howl/salt/salt.h +include/avahi-compat-howl/salt/signal.h +include/avahi-compat-howl/salt/socket.h +include/avahi-compat-howl/salt/time.h +include/avahi-core/core.h +include/avahi-core/log.h +include/avahi-core/lookup.h +include/avahi-core/publish.h +include/avahi-core/rr.h +include/avahi-glib/glib-malloc.h +include/avahi-glib/glib-watch.h +include/avahi-gobject/ga-client.h +include/avahi-gobject/ga-entry-group.h +include/avahi-gobject/ga-enums.h +include/avahi-gobject/ga-error.h +include/avahi-gobject/ga-record-browser.h +include/avahi-gobject/ga-service-browser.h +include/avahi-gobject/ga-service-resolver.h +lib/avahi/.keep +lib/girepository-1.0/Avahi-0.6.typelib +lib/girepository-1.0/AvahiCore-0.6.typelib +lib/libavahi-client.a +lib/libavahi-client.la +lib/libavahi-client.so +lib/libavahi-client.so.3 +lib/libavahi-common.a +lib/libavahi-common.la +lib/libavahi-common.so +lib/libavahi-common.so.3 +lib/libavahi-core.a +lib/libavahi-core.la +lib/libavahi-core.so +lib/libavahi-core.so.7 +lib/libavahi-glib.a +lib/libavahi-glib.la +lib/libavahi-glib.so +lib/libavahi-glib.so.1 +lib/libavahi-gobject.a +lib/libavahi-gobject.la +lib/libavahi-gobject.so +lib/libavahi-gobject.so.0 +lib/libhowl.a +lib/libhowl.la +lib/libhowl.so +lib/libhowl.so.0 +libdata/pkgconfig/avahi-client.pc +libdata/pkgconfig/avahi-compat-howl.pc +libdata/pkgconfig/avahi-core.pc +libdata/pkgconfig/avahi-glib.pc +libdata/pkgconfig/avahi-gobject.pc +sbin/avahi-daemon +sbin/avahi-dnsconfd +%%DATADIR%%/avahi-service.dtd +%%DATADIR%%/service-types +share/dbus-1/interfaces/org.freedesktop.Avahi.AddressResolver.xml +share/dbus-1/interfaces/org.freedesktop.Avahi.DomainBrowser.xml +share/dbus-1/interfaces/org.freedesktop.Avahi.EntryGroup.xml +share/dbus-1/interfaces/org.freedesktop.Avahi.HostNameResolver.xml +share/dbus-1/interfaces/org.freedesktop.Avahi.RecordBrowser.xml +share/dbus-1/interfaces/org.freedesktop.Avahi.Server.xml +share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceBrowser.xml +share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceResolver.xml +share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceTypeBrowser.xml +share/dbus-1/system-services/org.freedesktop.Avahi.service +share/gir-1.0/Avahi-0.6.gir +share/gir-1.0/AvahiCore-0.6.gir +share/locale/bg/LC_MESSAGES/avahi.mo +share/locale/ca/LC_MESSAGES/avahi.mo +share/locale/cs/LC_MESSAGES/avahi.mo +share/locale/da/LC_MESSAGES/avahi.mo +share/locale/de/LC_MESSAGES/avahi.mo +share/locale/el/LC_MESSAGES/avahi.mo +share/locale/en_AU/LC_MESSAGES/avahi.mo +share/locale/en_CA/LC_MESSAGES/avahi.mo +share/locale/en_GB/LC_MESSAGES/avahi.mo +share/locale/en_NZ/LC_MESSAGES/avahi.mo +share/locale/es/LC_MESSAGES/avahi.mo +share/locale/fi/LC_MESSAGES/avahi.mo +share/locale/fo/LC_MESSAGES/avahi.mo +share/locale/fr/LC_MESSAGES/avahi.mo +share/locale/gl/LC_MESSAGES/avahi.mo +share/locale/he/LC_MESSAGES/avahi.mo +share/locale/hu/LC_MESSAGES/avahi.mo +share/locale/id/LC_MESSAGES/avahi.mo +share/locale/it/LC_MESSAGES/avahi.mo +share/locale/ja/LC_MESSAGES/avahi.mo +share/locale/ms/LC_MESSAGES/avahi.mo +share/locale/nl/LC_MESSAGES/avahi.mo +share/locale/pl/LC_MESSAGES/avahi.mo +share/locale/pt_BR/LC_MESSAGES/avahi.mo +share/locale/ro/LC_MESSAGES/avahi.mo +share/locale/ru/LC_MESSAGES/avahi.mo +share/locale/sl/LC_MESSAGES/avahi.mo +share/locale/sr/LC_MESSAGES/avahi.mo +share/locale/sv/LC_MESSAGES/avahi.mo +share/locale/sr@latin/LC_MESSAGES/avahi.mo +share/locale/uk/LC_MESSAGES/avahi.mo +share/locale/zh_CN/LC_MESSAGES/avahi.mo +share/locale/zh_TW/LC_MESSAGES/avahi.mo +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin +@dirrmtry share/locale/fo/LC_MESSAGES +@dirrmtry share/locale/fo +@dirrmtry share/locale/en_NZ/LC_MESSAGES +@dirrmtry share/locale/en_NZ +@dirrm %%DATADIR%% +@dirrmtry share/applications +@dirrm lib/avahi +@dirrm include/avahi-gobject +@dirrm include/avahi-glib +@dirrm include/avahi-core +@dirrm include/avahi-compat-howl/salt +@dirrm include/avahi-compat-howl/rendezvous +@dirrm include/avahi-compat-howl/discovery +@dirrm include/avahi-compat-howl/corby +@dirrm include/avahi-compat-howl +@dirrm include/avahi-common +@dirrm include/avahi-client +@dirrm etc/avahi/services +@dirrm etc/avahi diff --git a/net/avahi-gtk3/Makefile b/net/avahi-gtk3/Makefile new file mode 100644 index 000000000..9ba1ae896 --- /dev/null +++ b/net/avahi-gtk3/Makefile @@ -0,0 +1,37 @@ +# New ports collection makefile for: avahi-gtk +# Date created: 31 July 2007 +# Whom: Michael Johnson <ahze@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/net/avahi-gtk/Makefile,v 1.2 2007/09/12 12:41:45 ahze Exp $ +# + +PORTREVISION= 0 +CATEGORIES= net +PKGNAMESUFFIX= -gtk3 + +MAINTAINER= gnome@FreeBSD.org +COMMENT= Gtk+ 3 library to the Avahi mDNS system + +LIB_DEPENDS= avahi-common.3:${PORTSDIR}/net/avahi-app + +MASTERDIR= ${.CURDIR}/../avahi-app +BUILD_WRKSRC= ${WRKSRC}/avahi-ui +INSTALL_WRKSRC= ${BUILD_WRKSRC} +DESCR= ${.CURDIR}/pkg-descr +PLIST= ${.CURDIR}/pkg-plist + +CONFIGURE_ARGS+=--disable-silent-rules + +AVAHI_SLAVE= gtk3 +AVAHI_PKGCONFIG=avahi-ui-gtk3.pc + +USE_GNOME= gnomehack gnometarget ltverhack intltool gtk30 + +do-build: + @(cd ${WRKSRC}/avahi-ui; ${GMAKE} libavahi-ui-gtk3.la) + +do-install: + @(cd ${WRKSRC}/avahi-ui; ${GMAKE} install-libLTLIBRARIES) + +.include "${MASTERDIR}/Makefile" diff --git a/net/avahi-gtk3/pkg-descr b/net/avahi-gtk3/pkg-descr new file mode 100644 index 000000000..a19804145 --- /dev/null +++ b/net/avahi-gtk3/pkg-descr @@ -0,0 +1,3 @@ +Gtk+ tools and bindings to the avahi mDNS service discovery system. + +WWW: http://www.avahi.org/ diff --git a/net/avahi-gtk3/pkg-plist b/net/avahi-gtk3/pkg-plist new file mode 100644 index 000000000..08125fa55 --- /dev/null +++ b/net/avahi-gtk3/pkg-plist @@ -0,0 +1,5 @@ +lib/libavahi-ui-gtk3.a +lib/libavahi-ui-gtk3.la +lib/libavahi-ui-gtk3.so +lib/libavahi-ui-gtk3.so.0 +libdata/pkgconfig/avahi-ui-gtk3.pc |