summaryrefslogtreecommitdiff
path: root/net/avahi-app/files
diff options
context:
space:
mode:
Diffstat (limited to 'net/avahi-app/files')
-rw-r--r--net/avahi-app/files/patch-Makefile.in50
-rw-r--r--net/avahi-app/files/patch-avahi-client.pc.in10
-rw-r--r--net/avahi-app/files/patch-avahi-common_dbus-watch-glue.c14
-rw-r--r--net/avahi-app/files/patch-avahi-compat-howl.pc.in10
-rw-r--r--net/avahi-app/files/patch-avahi-compat-libdns_sd.pc.in10
-rw-r--r--net/avahi-app/files/patch-avahi-compat-libdns_sd_Makefile.in58
-rw-r--r--net/avahi-app/files/patch-avahi-core.pc.in10
-rw-r--r--net/avahi-app/files/patch-avahi-daemon_main.c14
-rw-r--r--net/avahi-app/files/patch-avahi-discover-standalone_Makefile.in24
-rw-r--r--net/avahi-app/files/patch-avahi-glib.pc.in10
-rw-r--r--net/avahi-app/files/patch-avahi-qt3.pc.in10
-rw-r--r--net/avahi-app/files/patch-avahi-qt_Makefile.in36
-rw-r--r--net/avahi-app/files/patch-avahi-ui_Makefile.in40
-rw-r--r--net/avahi-app/files/patch-configure18
-rw-r--r--net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in17
-rw-r--r--net/avahi-app/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in17
-rw-r--r--net/avahi-app/files/patch-man_Makefile.in11
17 files changed, 359 insertions, 0 deletions
diff --git a/net/avahi-app/files/patch-Makefile.in b/net/avahi-app/files/patch-Makefile.in
new file mode 100644
index 000000000000..9c28621038bd
--- /dev/null
+++ b/net/avahi-app/files/patch-Makefile.in
@@ -0,0 +1,50 @@
+--- Makefile.in.orig Wed Oct 11 01:31:58 2006
++++ Makefile.in Wed Oct 11 01:34:55 2006
+@@ -1057,21 +1056,29 @@ uninstall-info: uninstall-info-recursive
+ avahi-core.pc: avahi-core.pc.in
+ sed -e 's,@prefix\@,$(prefix),g' \
+ -e 's,@libdir\@,$(libdir),g' \
++ -e 's,@PTHREAD_LIBS\@,$(PTHREAD_LIBS),g' \
++ -e 's,@PTHREAD_CFLAGS\@,$(PTHREAD_CFLAGS),g' \
+ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
+
+ @HAVE_DBUS_TRUE@avahi-client.pc: avahi-client.pc.in
+ @HAVE_DBUS_TRUE@ sed -e 's,@prefix\@,$(prefix),g' \
+ @HAVE_DBUS_TRUE@ -e 's,@libdir\@,$(libdir),g' \
++@HAVE_DBUS_TRUE@ -e 's,@PTHREAD_CFLAGS\@,$(PTHREAD_CFLAGS),g' \
++@HAVE_DBUS_TRUE@ -e 's,@PTHREAD_LIBS\@,$(PTHREAD_LIBS),g' \
+ @HAVE_DBUS_TRUE@ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
+
+ @ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@avahi-compat-howl.pc: avahi-compat-howl.pc.in
+ @ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@ sed -e 's,@prefix\@,$(prefix),g' \
+ @ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@ -e 's,@libdir\@,$(libdir),g' \
++@ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@ -e 's,@PTHREAD_CFLAGS\@,$(PTHREAD_CFLAGS),g' \
++@ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@ -e 's,@PTHREAD_LIBS\@,$(PTHREAD_LIBS),g' \
+ @ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@ -e 's,@HOWL_COMPAT_VERSION\@,$(HOWL_COMPAT_VERSION),g' $< > $@
+
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@avahi-compat-libdns_sd.pc: avahi-compat-libdns_sd.pc.in
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ sed -e 's,@prefix\@,$(prefix),g' \
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ -e 's,@libdir\@,$(libdir),g' \
++@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ -e 's,@PTHREAD_CFLAGS\@,$(PTHREAD_CFLAGS),g' \
++@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ -e 's,@PTHREAD_LIBS\@,$(PTHREAD_LIBS),g' \
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
+
+ @HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@avahi-sharp.pc: avahi-sharp.pc.in
+@@ -1096,6 +1104,8 @@
+ @HAVE_GLIB_TRUE@avahi-glib.pc: avahi-glib.pc.in
+ @HAVE_GLIB_TRUE@ sed -e 's,@prefix\@,$(prefix),g' \
+ @HAVE_GLIB_TRUE@ -e 's,@libdir\@,$(libdir),g' \
++@HAVE_GLIB_TRUE@ -e 's,@PTHREAD_CFLAGS\@,$(PTHREAD_CFLAGS),g' \
++@HAVE_GLIB_TRUE@ -e 's,@PTHREAD_LIBS\@,$(PTHREAD_LIBS),g' \
+ @HAVE_GLIB_TRUE@ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
+
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@avahi-ui.pc: avahi-ui.pc.in
+@@ -1106,6 +1116,8 @@
+ @HAVE_QT3_TRUE@avahi-qt3.pc: avahi-qt3.pc.in
+ @HAVE_QT3_TRUE@ sed -e 's,@prefix\@,$(prefix),g' \
+ @HAVE_QT3_TRUE@ -e 's,@libdir\@,$(libdir),g' \
++@HAVE_QT3_TRUE@ -e 's,@PTHREAD_CFLAGS\@,$(PTHREAD_CFLAGS),g' \
++@HAVE_QT3_TRUE@ -e 's,@PTHREAD_LIBS\@,$(PTHREAD_LIBS),g' \
+ @HAVE_QT3_TRUE@ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
+
+ @HAVE_QT4_TRUE@avahi-qt4.pc: avahi-qt4.pc.in
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 000000000000..e980e52e0fe2
--- /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-common_dbus-watch-glue.c b/net/avahi-app/files/patch-avahi-common_dbus-watch-glue.c
new file mode 100644
index 000000000000..1e148af8564c
--- /dev/null
+++ b/net/avahi-app/files/patch-avahi-common_dbus-watch-glue.c
@@ -0,0 +1,14 @@
+--- avahi-common/dbus-watch-glue.c.orig 2007-08-26 00:46:45.000000000 -0400
++++ avahi-common/dbus-watch-glue.c 2007-08-26 00:47:12.000000000 -0400
+@@ -134,7 +134,11 @@ static dbus_bool_t update_watch(const Av
+
+ if (!(avahi_watch = poll_api->watch_new(
+ poll_api,
++#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR > 1) || (DBUS_VERSION_MAJOR > 1)
+ dbus_watch_get_unix_fd(dbus_watch),
++#else
++ dbus_watch_get_fd(dbus_watch),
++#endif
+ translate_dbus_to_avahi(dbus_watch_get_flags(dbus_watch)),
+ watch_callback,
+ dbus_watch)))
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 000000000000..f101cc1da5e3
--- /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 000000000000..8487c1b5a298
--- /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 000000000000..f111db2ab974
--- /dev/null
+++ b/net/avahi-app/files/patch-avahi-compat-libdns_sd_Makefile.in
@@ -0,0 +1,58 @@
+--- avahi-compat-libdns_sd/Makefile.in.orig 2007-07-31 12:31:07.000000000 -0400
++++ avahi-compat-libdns_sd/Makefile.in 2007-07-31 12:35:41.000000000 -0400
+@@ -101,17 +101,14 @@
+ 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)
+ am__txt_test_SOURCES_DIST = dns_sd.h txt.c txt-test.c warn.c warn.h
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@am_txt_test_OBJECTS = txt_test-txt.$(OBJEXT) \
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ txt_test-txt-test.$(OBJEXT) \
+ @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)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -430,7 +427,7 @@
+ @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) -export-dynamic -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) -export-dynamic -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 \
+@@ -438,7 +435,7 @@
+ @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 \
+@@ -446,7 +443,7 @@
+ @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
+
+@@ -883,7 +880,7 @@
+
+ @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.
+ .NOEXPORT:
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 000000000000..fdde41be9c53
--- /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_main.c b/net/avahi-app/files/patch-avahi-daemon_main.c
new file mode 100644
index 000000000000..c95ab399fe7e
--- /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 000000000000..70562fd5aa4e
--- /dev/null
+++ b/net/avahi-app/files/patch-avahi-discover-standalone_Makefile.in
@@ -0,0 +1,24 @@
+--- avahi-discover-standalone/Makefile.in.orig Tue Jul 31 11:41:28 2007
++++ avahi-discover-standalone/Makefile.in Tue Jul 31 11:43:05 2007
+@@ -79,9 +79,6 @@
+ $(am_avahi_discover_standalone_OBJECTS)
+ am__DEPENDENCIES_1 =
+ @HAVE_GTK_TRUE@avahi_discover_standalone_DEPENDENCIES = \
+-@HAVE_GTK_TRUE@ ../avahi-common/libavahi-common.la \
+-@HAVE_GTK_TRUE@ ../avahi-glib/libavahi-glib.la \
+-@HAVE_GTK_TRUE@ ../avahi-core/libavahi-core.la \
+ @HAVE_GTK_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ @HAVE_GTK_TRUE@ $(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+@@ -406,10 +403,7 @@
+ @HAVE_GTK_TRUE@ -DAVAHI_INTERFACES_DIR=\"$(interfacesdir)\"
+
+ @HAVE_GTK_TRUE@avahi_discover_standalone_LDADD = \
+-@HAVE_GTK_TRUE@ $(AM_LDADD) \
+-@HAVE_GTK_TRUE@ ../avahi-common/libavahi-common.la \
+-@HAVE_GTK_TRUE@ ../avahi-glib/libavahi-glib.la \
+-@HAVE_GTK_TRUE@ ../avahi-core/libavahi-core.la \
++@HAVE_GTK_TRUE@ $(AM_LDADD) `$(PKG_CONFIG) --cflags --libs avahi-client avahi-core avahi-glib` \
+ @HAVE_GTK_TRUE@ $(GLIB20_LIBS) $(GTK20_LIBS) $(GLADE20_LIBS)
+
+ @HAVE_GTK_FALSE@@HAVE_PYTHON_DBUS_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 000000000000..e2633c32db44
--- /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 000000000000..8174f25846d8
--- /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-qt_Makefile.in b/net/avahi-app/files/patch-avahi-qt_Makefile.in
new file mode 100644
index 000000000000..5788e2399dd5
--- /dev/null
+++ b/net/avahi-app/files/patch-avahi-qt_Makefile.in
@@ -0,0 +1,36 @@
+--- avahi-qt/Makefile.in.orig Thu Apr 12 00:16:01 2007
++++ avahi-qt/Makefile.in Thu Apr 12 00:17:25 2007
+@@ -90,7 +90,6 @@ libLTLIBRARIES_INSTALL = $(INSTALL)
+ 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 = \
+@@ -98,7 +97,6 @@ am__libavahi_qt3_la_SOURCES_DIST = qt-wa
+ libavahi_qt3_la_OBJECTS = $(am_libavahi_qt3_la_OBJECTS)
+ @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 = \
+@@ -418,7 +416,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)
+-@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 = \
+@@ -428,7 +426,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
+-@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) -export-dynamic -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 000000000000..531e506687df
--- /dev/null
+++ b/net/avahi-app/files/patch-avahi-ui_Makefile.in
@@ -0,0 +1,40 @@
+--- avahi-ui/Makefile.in.orig Tue Jul 31 11:49:11 2007
++++ avahi-ui/Makefile.in Tue Jul 31 11:50:37 2007
+@@ -89,9 +89,7 @@
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@libavahi_ui_la_DEPENDENCIES = ../avahi-common/libavahi-common.la \
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@ ../avahi-client/libavahi-client.la \
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@ ../avahi-glib/libavahi-glib.la \
++@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@libavahi_ui_la_DEPENDENCIES = \
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@ $(am__DEPENDENCIES_1) \
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@ $(am__DEPENDENCIES_1)
+ am__libavahi_ui_la_SOURCES_DIST = avahi-ui.h avahi-ui.c \
+@@ -112,8 +110,6 @@
+ bssh_OBJECTS = $(am_bssh_OBJECTS)
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@bssh_DEPENDENCIES = \
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@ $(am__DEPENDENCIES_1) \
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@ ../avahi-client/libavahi-client.la \
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@ ../avahi-common/libavahi-common.la \
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@ libavahi-ui.la
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+@@ -439,15 +435,12 @@
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@libavahi_ui_la_CFLAGS = $(AM_CFLAGS) \
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@ $(GTK20_CFLAGS) $(am__append_2) \
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@ $(am__append_5)
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@libavahi_ui_la_LIBADD = $(AM_LDADD) \
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@ ../avahi-common/libavahi-common.la \
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@ ../avahi-client/libavahi-client.la \
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@ ../avahi-glib/libavahi-glib.la \
++@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@libavahi_ui_la_LIBADD = $(AM_LDADD) `$(PKG_CONFIG) --cflags --libs avahi-client avahi-core avahi-glib` \
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@ $(GTK20_LIBS) $(am__append_3)
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@libavahi_ui_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_UI_VERSION_INFO)
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@bssh_SOURCES = bssh.c
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@bssh_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS)
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@bssh_LDADD = $(AM_LDADD) $(GTK20_LIBS) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la libavahi-ui.la
++@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@bssh_LDADD = $(AM_LDADD) $(GTK20_LIBS) `$(PKG_CONFIG) --cflags --libs avahi-client avahi-core` libavahi-ui.la
+ CLEANFILES = $(desktop_DATA)
+ all: all-am
+
diff --git a/net/avahi-app/files/patch-configure b/net/avahi-app/files/patch-configure
new file mode 100644
index 000000000000..141c9403f76b
--- /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-initscript_freebsd_avahi-daemon.sh.in b/net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in
new file mode 100644
index 000000000000..564577bf0b9e
--- /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
++. %%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 000000000000..1e7939466c58
--- /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
++. %%RC_SUBR%%
++. %%GNOME_SUBR%%
++
++avahi_dnsconfd_enable=${avahi_dnsconfd_enable-${gnome_enable}}
+
+ name=avahi_dnsconfd
+ rcvar=`set_rcvar`
diff --git a/net/avahi-app/files/patch-man_Makefile.in b/net/avahi-app/files/patch-man_Makefile.in
new file mode 100644
index 000000000000..b46557af681a
--- /dev/null
+++ b/net/avahi-app/files/patch-man_Makefile.in
@@ -0,0 +1,11 @@
+--- man/Makefile.in.orig Sat Jun 9 14:04:44 2007
++++ man/Makefile.in Sat Jun 9 14:05:41 2007
+@@ -861,7 +861,7 @@ uninstall-man: uninstall-man1 uninstall-
+ @HAVE_DBUS_TRUE@ $(LN_S) avahi-browse.1 avahi-browse-domains.1 && \
+ @HAVE_DBUS_TRUE@ $(LN_S) avahi-publish.1 avahi-publish-address.1 && \
+ @HAVE_DBUS_TRUE@ $(LN_S) avahi-publish.1 avahi-publish-service.1 && \
+-@HAVE_DBUS_TRUE@ $(LN_S) bssh.1 bvnc.1
++@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@ $(LN_S) bssh.1 bvnc.1
+ # 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.
+ .NOEXPORT: