Index: head/net/avahi-app/Makefile =================================================================== --- head/net/avahi-app/Makefile (revision 452568) +++ head/net/avahi-app/Makefile (revision 452569) @@ -1,156 +1,159 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ PORTNAME= avahi PORTVERSION= 0.6.31 PORTREVISION?= 5 CATEGORIES?= net dns MASTER_SITES= http://www.avahi.org/download/ PKGNAMESUFFIX?= -app MAINTAINER?= gnome@FreeBSD.org COMMENT?= Service discovery on a local network +LICENSE= LGPL21+ +LICENSE_FILE= ${WRKSRC}/LICENSE + AVAHI_SLAVE?= no .if ${AVAHI_SLAVE} != header LIB_DEPENDS?= libexpat.so:textproc/expat2 \ libdaemon.so:devel/libdaemon \ libdbus-glib-1.so:devel/dbus-glib \ libgdbm.so:databases/gdbm USERS?= ${PORTNAME} GROUPS?= ${USERS} USES+= alias gettext gmake libtool pathfix pkgconfig USE_GNOME+= glib20 intltool introspection USE_GNOME_SUBR= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes 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 \ --disable-qt3 \ --localstatedir=/var \ --enable-compat-howl CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_KQUEUE LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip .if ${AVAHI_SLAVE} == no CONFLICTS= howl-[0-9]* DAEMON_CONFIG_FILES= hosts avahi-daemon.conf .endif .endif # !avahi-header .include .if ${AVAHI_SLAVE} != header .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} == 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 CONFIGURE_ARGS+=--disable-stack-protector post-patch: avahi-post-patch avahi-post-patch: @${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|' \ ${WRKSRC}/man/*.* @${RM} ${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 @${REINPLACE_CMD} -e 's|have_inotify=yes|have_inotify=no|' \ ${WRKSRC}/configure @${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 @${REINPLACE_CMD} -e 's|am: install-avahiincludeHEADERS|am:|g' \ ${WRKSRC}/avahi-ui/Makefile.in post-build: avahi-post-build avahi-post-build: .for f in ${AVAHI_PKGCONFIG} @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${f} .endfor pre-su-install: avahi-pre-su-install avahi-pre-su-install: .if ${AVAHI_SLAVE}=="no" @${MKDIR} ${STAGEDIR}${PREFIX}/lib/avahi @${TOUCH} -f ${STAGEDIR}${PREFIX}/lib/avahi/.keep .endif post-install: avahi-post-install avahi-post-install: .if defined(MANPAGES) .for f in ${MANPAGES} ${INSTALL_DATA} ${WRKSRC}/man/${f} ${STAGEDIR}${PREFIX}/man/man${f:E}/${f} .endfor .endif .for f in ${AVAHI_PKGCONFIG} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/libdata/pkgconfig .endfor .for f in ${DAEMON_CONFIG_FILES} ${MKDIR} ${STAGEDIR}${PREFIX}/etc/avahi ${INSTALL_DATA} ${WRKSRC}/avahi-daemon/${f} \ ${STAGEDIR}${PREFIX}/etc/avahi/${f}.sample .endfor .if ${AVAHI_SLAVE}==no ${INSTALL_DATA} ${FILESDIR}/org.freedesktop.Avahi.service \ ${STAGEDIR}${PREFIX}/share/dbus-1/system-services .endif .endif # ! avahi-header .include Index: head/net/avahi-app/files/patch-dnsconfd_Makefile.in =================================================================== --- head/net/avahi-app/files/patch-dnsconfd_Makefile.in (revision 452568) +++ head/net/avahi-app/files/patch-dnsconfd_Makefile.in (nonexistent) @@ -1,11 +0,0 @@ ---- 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)" Property changes on: head/net/avahi-app/files/patch-dnsconfd_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/avahi-app/files/patch-avahi-compat-libdns_sd_Makefile.in =================================================================== --- head/net/avahi-app/files/patch-avahi-compat-libdns_sd_Makefile.in (revision 452568) +++ head/net/avahi-app/files/patch-avahi-compat-libdns_sd_Makefile.in (nonexistent) @@ -1,59 +0,0 @@ ---- 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. Property changes on: head/net/avahi-app/files/patch-avahi-compat-libdns_sd_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/avahi-app/files/patch-Makefile.in =================================================================== --- head/net/avahi-app/files/patch-Makefile.in (revision 452568) +++ head/net/avahi-app/files/patch-Makefile.in (revision 452569) @@ -1,11 +1,11 @@ ---- Makefile.in.orig 2011-03-13 18:12:06.000000000 +0100 -+++ Makefile.in 2011-03-13 18:14:22.000000000 +0100 -@@ -1179,6 +1179,8 @@ +--- Makefile.in.orig 2017-09-15 01:20:16 UTC ++++ Makefile.in +@@ -1206,6 +1206,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,@HOWL_COMPAT_VERSION\@,$(HOWL_COMPAT_VERSION),g' \ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@ Index: head/net/avahi-app/files/patch-avahi-autoipd_main.c =================================================================== --- head/net/avahi-app/files/patch-avahi-autoipd_main.c (revision 452568) +++ head/net/avahi-app/files/patch-avahi-autoipd_main.c (revision 452569) @@ -1,13 +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 @@ +--- avahi-autoipd/main.c.orig 2010-08-26 00:51:38 UTC ++++ avahi-autoipd/main.c +@@ -62,8 +62,8 @@ #include /* 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 Index: head/net/avahi-app/files/patch-avahi-client.pc.in =================================================================== --- head/net/avahi-app/files/patch-avahi-client.pc.in (revision 452568) +++ head/net/avahi-app/files/patch-avahi-client.pc.in (revision 452569) @@ -1,10 +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 @@ +--- avahi-client.pc.in.orig 2011-12-30 21:26:44 UTC ++++ avahi-client.pc.in +@@ -6,5 +6,5 @@ includedir=${prefix}/include 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} Index: head/net/avahi-app/files/patch-avahi-client_check-nss.c =================================================================== --- head/net/avahi-app/files/patch-avahi-client_check-nss.c (revision 452568) +++ head/net/avahi-app/files/patch-avahi-client_check-nss.c (revision 452569) @@ -1,10 +1,10 @@ ---- avahi-client/check-nss.c.orig 2014-09-08 12:26:55.000000000 -0400 -+++ avahi-client/check-nss.c 2014-09-08 12:27:24.000000000 -0400 +--- avahi-client/check-nss.c.orig 2010-08-26 00:51:38 UTC ++++ avahi-client/check-nss.c @@ -33,6 +33,7 @@ int avahi_nss_support(void) { #ifdef HAVE_DLOPEN static const char * const libs[] = { + "nss_mdns.so.1", "libnss_mdns.so.2", "libnss_mdns4.so.2", "libnss_mdns6.so.2", Index: head/net/avahi-app/files/patch-avahi-compat-howl.pc.in =================================================================== --- head/net/avahi-app/files/patch-avahi-compat-howl.pc.in (revision 452568) +++ head/net/avahi-app/files/patch-avahi-compat-howl.pc.in (revision 452569) @@ -1,10 +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 @@ +--- avahi-compat-howl.pc.in.orig 2011-12-30 21:26:44 UTC ++++ avahi-compat-howl.pc.in +@@ -6,5 +6,5 @@ includedir=${prefix}/include/avahi-compa 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} Index: head/net/avahi-app/files/patch-avahi-compat-libdns__sd_Makefile.in =================================================================== --- head/net/avahi-app/files/patch-avahi-compat-libdns__sd_Makefile.in (nonexistent) +++ head/net/avahi-app/files/patch-avahi-compat-libdns__sd_Makefile.in (revision 452569) @@ -0,0 +1,59 @@ +--- avahi-compat-libdns_sd/Makefile.in.orig 2017-09-15 01:20:16 UTC ++++ avahi-compat-libdns_sd/Makefile.in +@@ -133,9 +133,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 $@ +@@ -145,8 +143,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 $@ +@@ -443,7 +440,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 \ +@@ -451,7 +448,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 \ +@@ -459,7 +456,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 + +@@ -937,7 +934,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. Property changes on: head/net/avahi-app/files/patch-avahi-compat-libdns__sd_Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +ON \ No newline at end of property Index: head/net/avahi-app/files/patch-avahi-compat-libdns_sd.pc.in =================================================================== --- head/net/avahi-app/files/patch-avahi-compat-libdns_sd.pc.in (revision 452568) +++ head/net/avahi-app/files/patch-avahi-compat-libdns_sd.pc.in (revision 452569) @@ -1,10 +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 @@ +--- avahi-compat-libdns_sd.pc.in.orig 2011-12-30 21:26:44 UTC ++++ avahi-compat-libdns_sd.pc.in +@@ -6,5 +6,5 @@ includedir=${prefix}/include/avahi-compa 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} Index: head/net/avahi-app/files/patch-avahi-core.pc.in =================================================================== --- head/net/avahi-app/files/patch-avahi-core.pc.in (revision 452568) +++ head/net/avahi-app/files/patch-avahi-core.pc.in (revision 452569) @@ -1,10 +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 @@ +--- avahi-core.pc.in.orig 2011-12-30 21:26:44 UTC ++++ avahi-core.pc.in +@@ -6,5 +6,5 @@ includedir=${prefix}/include 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} Index: head/net/avahi-app/files/patch-avahi-daemon_Makefile.in =================================================================== --- head/net/avahi-app/files/patch-avahi-daemon_Makefile.in (revision 452568) +++ head/net/avahi-app/files/patch-avahi-daemon_Makefile.in (revision 452569) @@ -1,49 +1,49 @@ ---- avahi-daemon/Makefile.in.orig 2013-01-01 13:45:35.000000000 -0600 -+++ avahi-daemon/Makefile.in 2013-01-01 13:47:30.000000000 -0600 -@@ -69,7 +69,7 @@ +--- avahi-daemon/Makefile.in.orig 2017-09-15 01:20:16 UTC ++++ avahi-daemon/Makefile.in +@@ -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 \ -@@ -688,7 +688,7 @@ +@@ -688,7 +688,7 @@ clean-sbinPROGRAMS: rm -f $$list avahi-daemon$(EXEEXT): $(avahi_daemon_OBJECTS) $(avahi_daemon_DEPENDENCIES) $(EXTRA_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) $(EXTRA_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) -@@ -1222,17 +1222,17 @@ +@@ -1222,17 +1222,17 @@ uninstall-dist_serviceDATA: files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir) install-pkgsysconfDATA: $(pkgsysconf_DATA) - @$(NORMAL_INSTALL) - test -z "$(pkgsysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgsysconfdir)" - @list='$(pkgsysconf_DATA)'; test -n "$(pkgsysconfdir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgsysconfdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgsysconfdir)" || exit $$?; \ - done +# @$(NORMAL_INSTALL) +# test -z "$(pkgsysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgsysconfdir)" +# @list='$(pkgsysconf_DATA)'; test -n "$(pkgsysconfdir)" || list=; \ +# for p in $$list; do \ +# if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +# echo "$$d$$p"; \ +# done | $(am__base_list) | \ +# while read files; do \ +# echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgsysconfdir)'"; \ +# $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgsysconfdir)" || exit $$?; \ +# done uninstall-pkgsysconfDATA: @$(NORMAL_UNINSTALL) Index: head/net/avahi-app/files/patch-avahi-daemon_main.c =================================================================== --- head/net/avahi-app/files/patch-avahi-daemon_main.c (revision 452568) +++ head/net/avahi-app/files/patch-avahi-daemon_main.c (revision 452569) @@ -1,14 +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; +--- avahi-daemon/main.c.orig 2010-11-18 03:00:26 UTC ++++ avahi-daemon/main.c +@@ -320,6 +320,11 @@ static void update_browse_domains(void) + return; + } + 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++) { Index: head/net/avahi-app/files/patch-avahi-discover-standalone_Makefile.in =================================================================== --- head/net/avahi-app/files/patch-avahi-discover-standalone_Makefile.in (revision 452568) +++ head/net/avahi-app/files/patch-avahi-discover-standalone_Makefile.in (revision 452569) @@ -1,24 +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 +--- avahi-discover-standalone/Makefile.in.orig 2017-09-15 01:20:16 UTC ++++ avahi-discover-standalone/Makefile.in @@ -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 = \ + AM_V_lt = $(am__v_lt_@AM_V@) +@@ -428,9 +426,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) Index: head/net/avahi-app/files/patch-avahi-dnsconfd_Makefile.in =================================================================== --- head/net/avahi-app/files/patch-avahi-dnsconfd_Makefile.in (nonexistent) +++ head/net/avahi-app/files/patch-avahi-dnsconfd_Makefile.in (revision 452569) @@ -0,0 +1,11 @@ +--- avahi-dnsconfd/Makefile.in.orig 2017-09-15 01:20:16 UTC ++++ avahi-dnsconfd/Makefile.in +@@ -494,7 +494,7 @@ clean-sbinPROGRAMS: + rm -f $$list + avahi-dnsconfd$(EXEEXT): $(avahi_dnsconfd_OBJECTS) $(avahi_dnsconfd_DEPENDENCIES) $(EXTRA_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)" Property changes on: head/net/avahi-app/files/patch-avahi-dnsconfd_Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +ON \ No newline at end of property Index: head/net/avahi-app/files/patch-avahi-glib.pc.in =================================================================== --- head/net/avahi-app/files/patch-avahi-glib.pc.in (revision 452568) +++ head/net/avahi-app/files/patch-avahi-glib.pc.in (revision 452569) @@ -1,10 +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 @@ +--- avahi-glib.pc.in.orig 2011-12-30 21:26:44 UTC ++++ avahi-glib.pc.in +@@ -7,5 +7,5 @@ Name: avahi-glib 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} Index: head/net/avahi-app/files/patch-avahi-qt3.pc.in =================================================================== --- head/net/avahi-app/files/patch-avahi-qt3.pc.in (revision 452568) +++ head/net/avahi-app/files/patch-avahi-qt3.pc.in (revision 452569) @@ -1,10 +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 +--- avahi-qt3.pc.in.orig 2011-12-30 21:26:44 UTC ++++ avahi-qt3.pc.in @@ -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} Index: head/net/avahi-app/files/patch-avahi-qt4.pc.in =================================================================== --- head/net/avahi-app/files/patch-avahi-qt4.pc.in (revision 452568) +++ head/net/avahi-app/files/patch-avahi-qt4.pc.in (revision 452569) @@ -1,10 +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 @@ +--- avahi-qt4.pc.in.orig 2011-12-30 21:26:44 UTC ++++ avahi-qt4.pc.in +@@ -7,5 +7,5 @@ Name: avahi-qt4 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} Index: head/net/avahi-app/files/patch-avahi-qt_Makefile.in =================================================================== --- head/net/avahi-app/files/patch-avahi-qt_Makefile.in (revision 452568) +++ head/net/avahi-app/files/patch-avahi-qt_Makefile.in (revision 452569) @@ -1,36 +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 @@ +--- avahi-qt/Makefile.in.orig 2017-09-15 01:20:16 UTC ++++ avahi-qt/Makefile.in +@@ -117,7 +117,6 @@ am__installdirs = "$(DESTDIR)$(libdir)" 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 $@ +@@ -132,7 +131,6 @@ libavahi_qt3_la_LINK = $(LIBTOOL) $(AM_V + $(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 +@@ -433,7 +431,7 @@ BUILT_SOURCES = $(am__append_2) $(am__ap + @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 +@@ -443,7 +441,7 @@ BUILT_SOURCES = $(am__append_2) $(am__ap + @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) Index: head/net/avahi-app/files/patch-avahi-ui_Makefile.in =================================================================== --- head/net/avahi-app/files/patch-avahi-ui_Makefile.in (revision 452568) +++ head/net/avahi-app/files/patch-avahi-ui_Makefile.in (revision 452569) @@ -1,88 +1,88 @@ ---- avahi-ui/Makefile.in.orig 2013-12-11 12:03:44.000000000 +0100 -+++ avahi-ui/Makefile.in 2013-12-11 12:05:00.000000000 +0100 +--- avahi-ui/Makefile.in.orig 2017-09-15 01:20:16 UTC ++++ avahi-ui/Makefile.in @@ -125,9 +125,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 \ @@ -148,9 +146,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 \ @@ -172,12 +168,8 @@ 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 @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 bssh_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(bssh_CFLAGS) $(CFLAGS) \ @@ -464,8 +456,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ # This cool debug trap works on i386/gcc only -AM_CFLAGS = -I$(top_srcdir) -DG_DISABLE_DEPRECATED=1 \ - -DGDK_DISABLE_DEPRECATED=1 -DGTK_DISABLE_DEPRECATED=1 \ +AM_CFLAGS = -I$(top_srcdir) \ '-DDEBUG_TRAP=__asm__("int $$3")' $(am__append_1) pkglibdatadir = $(libdir)/avahi desktopdir = $(datadir)/applications @@ -489,9 +480,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) @@ -501,17 +490,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 @@ -711,7 +698,7 @@ clean-libtool: -rm -rf .libs _libs install-desktopDATA: $(desktop_DATA) @$(NORMAL_INSTALL) - test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)" +@HAVE_GTK_TRUE@ test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)" @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ Index: head/net/avahi-app/files/patch-avahi-utils_Makefile.in =================================================================== --- head/net/avahi-app/files/patch-avahi-utils_Makefile.in (revision 452568) +++ head/net/avahi-app/files/patch-avahi-utils_Makefile.in (revision 452569) @@ -1,23 +1,23 @@ ---- avahi-utils/Makefile.in.orig 2012-07-09 20:07:19.000000000 +0200 -+++ avahi-utils/Makefile.in 2012-07-09 20:10:46.000000000 +0200 -@@ -518,16 +518,16 @@ +--- avahi-utils/Makefile.in.orig 2017-09-15 01:20:16 UTC ++++ avahi-utils/Makefile.in +@@ -518,16 +518,16 @@ clean-binPROGRAMS: rm -f $$list avahi-browse$(EXEEXT): $(avahi_browse_OBJECTS) $(avahi_browse_DEPENDENCIES) $(EXTRA_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) $(EXTRA_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) $(EXTRA_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) $(EXTRA_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) Index: head/net/avahi-app/files/patch-configure =================================================================== --- head/net/avahi-app/files/patch-configure (revision 452568) +++ head/net/avahi-app/files/patch-configure (revision 452569) @@ -1,18 +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 +--- configure.orig 2012-02-14 22:36:33 UTC ++++ configure +@@ -16895,6 +16895,7 @@ $as_echo_n "checking whether to check fo 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 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +@@ -18460,6 +18461,7 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default +#include int main () { Index: head/net/avahi-app/files/patch-initscript_freebsd_Makefile.in =================================================================== --- head/net/avahi-app/files/patch-initscript_freebsd_Makefile.in (revision 452568) +++ head/net/avahi-app/files/patch-initscript_freebsd_Makefile.in (revision 452569) @@ -1,33 +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 @@ +--- initscript/freebsd/Makefile.in.orig 2017-09-15 01:20:16 UTC ++++ initscript/freebsd/Makefile.in +@@ -361,12 +361,12 @@ EXTRA_DIST = \ 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 @@ +@@ -595,11 +595,11 @@ uninstall-am: uninstall-initdSCRIPTS 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' \ Index: head/net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in =================================================================== --- head/net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in (revision 452568) +++ head/net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in (revision 452569) @@ -1,20 +1,20 @@ ---- initscript/freebsd/avahi-daemon.sh.in.orig 2010-06-25 02:54:22.000000000 +0200 -+++ initscript/freebsd/avahi-daemon.sh.in 2012-01-15 19:03:55.000000000 +0100 +--- initscript/freebsd/avahi-daemon.sh.in.orig 2010-08-26 00:51:39 UTC ++++ initscript/freebsd/avahi-daemon.sh.in @@ -9,13 +9,15 @@ # 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 +. %%GNOME_SUBR%% + +avahi_daemon_enable=${avahi_daemon_enable-${gnome_enable}} name=avahi_daemon -rcvar=`set_rcvar` +rcvar=avahi_daemon_enable start_cmd=avahi_daemon_start stop_cmd=avahi_daemon_stop Index: head/net/avahi-app/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in =================================================================== --- head/net/avahi-app/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in (revision 452568) +++ head/net/avahi-app/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in (revision 452569) @@ -1,20 +1,20 @@ ---- initscript/freebsd/avahi-dnsconfd.sh.in.orig 2010-06-25 02:54:22.000000000 +0200 -+++ initscript/freebsd/avahi-dnsconfd.sh.in 2012-01-15 19:04:25.000000000 +0100 +--- initscript/freebsd/avahi-dnsconfd.sh.in.orig 2010-08-26 00:51:39 UTC ++++ initscript/freebsd/avahi-dnsconfd.sh.in @@ -12,13 +12,15 @@ # 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 +. %%GNOME_SUBR%% + +avahi_dnsconfd_enable=${avahi_dnsconfd_enable-${gnome_enable}} name=avahi_dnsconfd -rcvar=`set_rcvar` +rcvar=avahi_dnsconfd_enable start_cmd=avahi_dnsconfd_start stop_cmd=avahi_dnsconfd_stop