- Split up avahi

- Add avahi-autoipd (needs rc.d script)


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9305 df743ca5-7f9a-e211-a948-0013205c9059

45 files changed, 1205 insertions, 0 deletions

diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
new file mode 100644
index 000000000..558cf7197
--- /dev/null
+++ b/net/avahi-app/Makefile
@@ -0,0 +1,124 @@
+# New ports collection makefile for:	avahi
+# Date created:		18 November 2005
+# Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+
+PORTNAME=	avahi
+PORTVERSION=	0.6.20
+PORTREVISION?=	2
+CATEGORIES?=	net dns
+MASTER_SITES=	http://www.avahi.org/download/
+PKGNAMESUFFIX?=	-app
+
+MAINTAINER?=	gnome@FreeBSD.org
+COMMENT?=	Service discovery on a local network
+
+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
+
+USE_GNOME?=	gnomehack ltverhack glib20
+USE_GNOME_SUBR=yes
+USE_GMAKE=	yes
+USE_AUTOTOOLS=	libtool:15
+USE_LDCONFIG=	yes
+USE_GETOPT_LONG=yes
+AVAHI_SLAVE?=	no
+CONFIGURE_ARGS?=--with-distro=freebsd \
+		--with-dbus-system-address=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
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${AVAHI_SLAVE}=="qt3"
+CONFIGURE_ARGS+=--enable-qt3
+.else
+CONFIGURE_ARGS+=--disable-qt3
+.endif
+.if ${AVAHI_SLAVE}=="qt4"
+CONFIGURE_ARGS+=--enable-qt4
+.else
+CONFIGURE_ARGS+=--disable-qt4
+.endif
+.if ${AVAHI_SLAVE}=="python"
+CONFIGURE_ARGS+=--enable-python
+.else
+CONFIGURE_ARGS+=--disable-python
+.endif
+.if ${AVAHI_SLAVE}=="sharp"
+CONFIGURE_ARGS+=--enable-mono
+.else
+CONFIGURE_ARGS+=--disable-mono
+.endif
+.if ${AVAHI_SLAVE}=="autoipd"
+CONFIGURE_ARGS+=--enable-autoipd
+.else
+CONFIGURE_ARGS+=--disable-autoipd
+.endif
+.if ${AVAHI_SLAVE}=="libdns"
+CONFIGURE_ARGS+=--enable-compat-libdns_sd
+.else
+CONFIGURE_ARGS+=--disable-compat-libdns_sd
+.endif
+
+post-patch: avahi-post-patch
+
+avahi-post-patch:
+	@${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|%%RC_SUBR%%|${RC_SUBR}| ; \
+	    	s|%%GNOME_SUBR%%|${GNOME_SUBR}|' \
+		${WRKSRC}/initscript/freebsd/avahi-dnsconfd.sh.in \
+		${WRKSRC}/initscript/freebsd/avahi-daemon.sh.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
+
+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
+.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..b17ca775e
--- /dev/null
+++ b/net/avahi-app/distinfo
@@ -0,0 +1,3 @@
+MD5 (avahi-0.6.20.tar.gz) = 6acdff79afa2631f765f3bbbc3e25a74
+SHA256 (avahi-0.6.20.tar.gz) = 89ae5fd08018679b80cee201e1c1350d86db73bdcf6718aabb4bd3ea86f93ec9
+SIZE (avahi-0.6.20.tar.gz) = 974209
diff --git a/net/avahi-app/files/patch-Makefile.in b/net/avahi-app/files/patch-Makefile.in
new file mode 100644
index 000000000..9c2862103
--- /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 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..f111db2ab
--- /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 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-core_fdutil.c b/net/avahi-app/files/patch-avahi-core_fdutil.c
new file mode 100644
index 000000000..9ca63b133
--- /dev/null
+++ b/net/avahi-app/files/patch-avahi-core_fdutil.c
@@ -0,0 +1,10 @@
+--- avahi-core/fdutil.c.orig	Sat Jun 23 02:09:02 2007
++++ avahi-core/fdutil.c	Sat Jun 23 02:09:37 2007
+@@ -23,6 +23,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <sys/select.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <assert.h>
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..f0e59c688
--- /dev/null
+++ b/net/avahi-app/files/patch-avahi-daemon_main.c
@@ -0,0 +1,161 @@
+--- avahi-daemon/main.c.orig	Wed May  9 09:09:19 2007
++++ avahi-daemon/main.c	Sat Jun  9 13:56:02 2007
+@@ -50,6 +50,12 @@
+ #endif
+ #endif
+ 
++#ifdef HAVE_KQUEUE
++#include <sys/types.h>
++#include <sys/event.h>
++#include <unistd.h>
++#endif
++
+ #include <libdaemon/dfork.h>
+ #include <libdaemon/dsignal.h>
+ #include <libdaemon/dlog.h>
+@@ -691,6 +697,53 @@ static void add_inotify_watches(void) {
+ 
+ #endif
+ 
++#ifdef HAVE_KQUEUE
++
++#define NUM_WATCHES 2
++
++static int kq = -1;
++static int kfds[NUM_WATCHES];
++static int num_kfds = 0;
++
++static void add_kqueue_watch(const char *dir);
++
++static void add_kqueue_watches(void) {
++	int c = 0;
++
++#ifdef ENABLE_CHROOT
++	c = config.use_chroot;
++#endif
++
++	add_kqueue_watch(c ? "/" : AVAHI_CONFIG_DIR);
++	add_kqueue_watch(c ? "/services" : AVAHI_SERVICE_DIR);
++}
++
++static void add_kqueue_watch(const char *dir) {
++	int fd;
++	struct kevent ev;
++
++	if (kq < 0)
++		return;
++
++	if (num_kfds >= NUM_WATCHES)
++		return;
++
++	fd = open(dir, O_RDONLY);
++	if (fd < 0)
++		return;
++	EV_SET(&ev, fd, EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR,
++			NOTE_DELETE | NOTE_EXTEND | NOTE_WRITE | NOTE_RENAME,
++			0, 0);
++	if (kevent(kq, &ev, 1, NULL, 0, NULL) == -1) {
++		close(fd);
++		return;
++	}
++
++	kfds[num_kfds++] = fd;
++}
++
++#endif
++
+ static void reload_config(void) {
+ 
+ #ifdef HAVE_INOTIFY
+@@ -698,6 +751,10 @@ static void reload_config(void) {
+     add_inotify_watches();
+ #endif
+ 
++#ifdef HAVE_KQUEUE
++    add_kqueue_watches();
++#endif
++
+ #ifdef ENABLE_CHROOT
+     static_service_load(config.use_chroot);
+     static_hosts_load(config.use_chroot);
+@@ -746,6 +803,31 @@ static void inotify_callback(AvahiWatch 
+ 
+ #endif
+ 
++#ifdef HAVE_KQUEUE
++
++static void kqueue_callback(AvahiWatch *watch, int fd, AVAHI_GCC_UNUSED AvahiWatchEvent event, AVAHI_GCC_UNUSED void *userdata) {
++	struct kevent ev;
++	struct timespec nullts = { 0, 0 };
++	int res;
++
++	assert(fd == kq);
++	assert(watch);
++
++	res = kevent(kq, NULL, 0, &ev, 1, &nullts);
++
++	if (res > 0) {
++		/* Sleep for a half-second to avoid potential races
++		 * during install/uninstall. */
++		usleep(500000);
++		avahi_log_info("Files changed, reloading.");
++		reload_config();
++	} else {
++		avahi_log_error("Failed to read kqueue event: %s", avahi_strerror(errno));
++	}
++}
++
++#endif
++
+ static void signal_callback(AvahiWatch *watch, AVAHI_GCC_UNUSED int fd, AVAHI_GCC_UNUSED AvahiWatchEvent event, AVAHI_GCC_UNUSED void *userdata) {
+     int sig;
+     const AvahiPoll *poll_api;
+@@ -801,6 +883,10 @@ static int run_server(DaemonConfig *c) {
+ #ifdef HAVE_INOTIFY
+     AvahiWatch *inotify_watch = NULL;
+ #endif
++#ifdef HAVE_KQUEUE
++    int i;
++    AvahiWatch *kqueue_watch = NULL;
++#endif
+ 
+     assert(c);
+ 
+@@ -876,6 +962,19 @@ static int run_server(DaemonConfig *c) {
+     }
+ #endif
+ 
++#ifdef HAVE_KQUEUE
++    if ((kq = kqueue()) < 0)
++	    avahi_log_warn( "Failed to initialize kqueue: %s", strerror(errno));
++    else {
++	    add_kqueue_watches();
++
++	    if (!(kqueue_watch = poll_api->watch_new(poll_api, kq, AVAHI_WATCH_IN, kqueue_callback, NULL))) {
++		    avahi_log_error( "Failed to create kqueue watcher");
++		    goto finish;
++	    }
++    }
++#endif
++
+     load_resolv_conf();
+ #ifdef ENABLE_CHROOT
+     static_service_load(config.use_chroot);
+@@ -944,6 +1043,17 @@ finish:
+         poll_api->watch_free(inotify_watch);
+     if (inotify_fd >= 0)
+         close(inotify_fd);
++#endif
++
++#ifdef HAVE_KQUEUE
++    if (kqueue_watch)
++	poll_api->watch_free(kqueue_watch);
++    if (kq >= 0)
++	close(kq);
++    for (i = 0; i < num_kfds; i++) {
++	if (kfds[i] >= 0)
++	    close(kfds[i]);
++    }
+ #endif
+     
+     if (simple_poll_api) {
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..70562fd5a
--- /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 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-qt_Makefile.in b/net/avahi-app/files/patch-avahi-qt_Makefile.in
new file mode 100644
index 000000000..5788e2399
--- /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 000000000..531e50668
--- /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-avahi-ui_avahi-ui.c b/net/avahi-app/files/patch-avahi-ui_avahi-ui.c
new file mode 100644
index 000000000..0eeddde45
--- /dev/null
+++ b/net/avahi-app/files/patch-avahi-ui_avahi-ui.c
@@ -0,0 +1,11 @@
+--- avahi-ui/avahi-ui.c.orig	Fri Apr 20 20:07:43 2007
++++ avahi-ui/avahi-ui.c	Fri Apr 20 20:09:03 2007
+@@ -23,6 +23,8 @@
+ #include <config.h>
+ #endif
+ 
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include <string.h>
+ #include <stdarg.h>
+ #include <net/if.h>
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-initscript_freebsd_avahi-daemon.sh.in b/net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in
new file mode 100644
index 000000000..564577bf0
--- /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 000000000..1e7939466
--- /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 000000000..b46557af6
--- /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:
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..04bf17bfd
--- /dev/null
+++ b/net/avahi-app/pkg-plist
@@ -0,0 +1,112 @@
+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
+etc/avahi/avahi-daemon.conf
+etc/avahi/avahi-dnsconfd.action
+etc/avahi/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.sh
+etc/rc.d/avahi-dnsconfd.sh
+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
+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.5
+lib/libavahi-glib.a
+lib/libavahi-glib.la
+lib/libavahi-glib.so
+lib/libavahi-glib.so.1
+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
+sbin/avahi-daemon
+sbin/avahi-dnsconfd
+%%DATADIR%%/avahi-service.dtd
+%%DATADIR%%/introspection/AddressResolver.introspect
+%%DATADIR%%/introspection/DomainBrowser.introspect
+%%DATADIR%%/introspection/EntryGroup.introspect
+%%DATADIR%%/introspection/HostNameResolver.introspect
+%%DATADIR%%/introspection/RecordBrowser.introspect
+%%DATADIR%%/introspection/Server.introspect
+%%DATADIR%%/introspection/ServiceBrowser.introspect
+%%DATADIR%%/introspection/ServiceResolver.introspect
+%%DATADIR%%/introspection/ServiceTypeBrowser.introspect
+%%DATADIR%%/service-types
+@dirrm %%DATADIR%%/introspection
+@dirrm %%DATADIR%%
+@dirrmtry share/applications
+@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-autoipd/Makefile b/net/avahi-autoipd/Makefile
new file mode 100644
index 000000000..bdd4293e1
--- /dev/null
+++ b/net/avahi-autoipd/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for:	avahi-autoipd
+# Date created:				31 July 2007
+# Whom:					Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+
+PORTREVISION=	0
+CATEGORIES=	net
+PKGNAMESUFFIX=	-autoipd
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	IPv4LL network address configuration daemon
+
+LIB_DEPENDS=	avahi-common.3:${PORTSDIR}/net/avahi
+
+MASTERDIR=	${.CURDIR}/../avahi-app
+BUILD_WRKSRC=	${WRKSRC}/avahi-autoipd
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+DESCR=		${.CURDIR}/pkg-descr
+PLIST=		${.CURDIR}/pkg-plist
+
+AVAHI_SLAVE=	autoipd
+
+MAN8=		avahi-autoipd.8
+USE_GNOME=	gnomehack gnometarget ltverhack
+PKGINSTALL=	${.CURDIR}/pkg-install
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net/avahi-autoipd/pkg-descr b/net/avahi-autoipd/pkg-descr
new file mode 100644
index 000000000..6bd36b16a
--- /dev/null
+++ b/net/avahi-autoipd/pkg-descr
@@ -0,0 +1,3 @@
+IPv4LL network address configuration daemon
+
+WWW: http://www.avahi.org/
diff --git a/net/avahi-autoipd/pkg-install b/net/avahi-autoipd/pkg-install
new file mode 100644
index 000000000..c4ce455d2
--- /dev/null
+++ b/net/avahi-autoipd/pkg-install
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+case $2 in
+POST-INSTALL)
+	USER=avahi-autoipd
+	GROUP=${USER}
+	UID=546
+	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 Autoipd 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-autoipd/pkg-plist b/net/avahi-autoipd/pkg-plist
new file mode 100644
index 000000000..1b558b08b
--- /dev/null
+++ b/net/avahi-autoipd/pkg-plist
@@ -0,0 +1,3 @@
+etc/avahi/avahi-autoipd.action
+sbin/avahi-autoipd
+@dirrm etc/avahi
diff --git a/net/avahi-gtk/Makefile b/net/avahi-gtk/Makefile
new file mode 100644
index 000000000..c228f0480
--- /dev/null
+++ b/net/avahi-gtk/Makefile
@@ -0,0 +1,30 @@
+# New ports collection makefile for:	avahi-gtk
+# Date created:				31 July 2007
+# Whom:					Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+
+PORTREVISION=	0
+CATEGORIES=	net
+PKGNAMESUFFIX=	-gtk
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Gtk+ tools and bindings to the Avahi mDNS system
+
+LIB_DEPENDS=	avahi-common.3:${PORTSDIR}/net/avahi
+
+MASTERDIR=	${.CURDIR}/../avahi-app
+BUILD_WRKSRC=	${WRKSRC}/avahi-ui ${WRKSRC}/avahi-discover-standalone
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+DESCR=		${.CURDIR}/pkg-descr
+PLIST=		${.CURDIR}/pkg-plist
+
+AVAHI_SLAVE=	gtk
+AVAHI_PKGCONFIG=avahi-ui.pc
+
+MAN1+=		bssh.1
+MLINKS+=	bssh.1 bvnc.1
+USE_GNOME=	gnomehack gnometarget ltverhack libglade2
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net/avahi-gtk/pkg-descr b/net/avahi-gtk/pkg-descr
new file mode 100644
index 000000000..a19804145
--- /dev/null
+++ b/net/avahi-gtk/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-gtk/pkg-plist b/net/avahi-gtk/pkg-plist
new file mode 100644
index 000000000..59f4cfe2b
--- /dev/null
+++ b/net/avahi-gtk/pkg-plist
@@ -0,0 +1,16 @@
+bin/avahi-discover-standalone
+bin/bssh
+bin/bvnc
+include/avahi-ui/avahi-ui.h
+lib/libavahi-ui.a
+lib/libavahi-ui.la
+lib/libavahi-ui.so
+lib/libavahi-ui.so.0
+libdata/pkgconfig/avahi-ui.pc
+share/applications/bssh.desktop
+share/applications/bvnc.desktop
+%%DATADIR%%/interfaces/avahi-discover.glade
+@dirrm %%DATADIR%%/interfaces
+@dirrm %%DATADIR%%
+@dirrmtry share/applications
+@dirrm include/avahi-ui
diff --git a/net/avahi-libdns/Makefile b/net/avahi-libdns/Makefile
new file mode 100644
index 000000000..249f9287a
--- /dev/null
+++ b/net/avahi-libdns/Makefile
@@ -0,0 +1,26 @@
+# New ports collection makefile for:	avahi-libdns
+# Date created:				31 July 2007
+# Whom:					Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTREVISION=	0
+CATEGORIES=	net
+PKGNAMESUFFIX=	-libdns
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	mDNSResponder compatibility from Avahi
+
+LIB_DEPENDS=	avahi-common.3:${PORTSDIR}/net/avahi
+
+MASTERDIR=	${.CURDIR}/../avahi-app
+BUILD_WRKSRC=	${WRKSRC}/avahi-compat-libdns_sd
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+DESCR=		${.CURDIR}/pkg-descr
+PLIST=		${.CURDIR}/pkg-plist
+
+AVAHI_SLAVE=	libdns
+AVAHI_PKGCONFIG=avahi-compat-libdns_sd.pc
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net/avahi-libdns/pkg-descr b/net/avahi-libdns/pkg-descr
new file mode 100644
index 000000000..a2a56e519
--- /dev/null
+++ b/net/avahi-libdns/pkg-descr
@@ -0,0 +1,3 @@
+mDNSResponder compatibility from Avavhi
+
+WWW: http://www.avahi.org/
diff --git a/net/avahi-libdns/pkg-install b/net/avahi-libdns/pkg-install
new file mode 100644
index 000000000..a7134b49f
--- /dev/null
+++ b/net/avahi-libdns/pkg-install
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+case $2 in
+POST-INSTALL)
+	USER=avahi-autoipd
+	GROUP=${USER}
+	UID=546
+	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-libdns/pkg-plist b/net/avahi-libdns/pkg-plist
new file mode 100644
index 000000000..16d0e5533
--- /dev/null
+++ b/net/avahi-libdns/pkg-plist
@@ -0,0 +1,7 @@
+include/avahi-compat-libdns_sd/dns_sd.h
+lib/libdns_sd.a
+lib/libdns_sd.la
+lib/libdns_sd.so
+lib/libdns_sd.so.1
+libdata/pkgconfig/avahi-compat-libdns_sd.pc
+@dirrm include/avahi-compat-libdns_sd
diff --git a/net/avahi-qt3/Makefile b/net/avahi-qt3/Makefile
new file mode 100644
index 000000000..14abaedc5
--- /dev/null
+++ b/net/avahi-qt3/Makefile
@@ -0,0 +1,28 @@
+# New ports collection makefile for:	avahi-qt3
+# Date created:				12 April 2007
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+
+PORTREVISION=	0
+CATEGORIES=	net
+PKGNAMESUFFIX=	-qt3
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Qt 3 bindings to the Avahi mDNS system
+
+LIB_DEPENDS=	avahi-common.3:${PORTSDIR}/net/avahi
+
+MASTERDIR=	${.CURDIR}/../avahi-app
+BUILD_WRKSRC=	${WRKSRC}/avahi-qt
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+DESCR=		${.CURDIR}/pkg-descr
+PLIST=		${.CURDIR}/pkg-plist
+
+AVAHI_SLAVE=	qt3
+USE_GNOME=	gnomehack gnometarget ltverhack
+USE_QT_VER=	3
+AVAHI_PKGCONFIG=	avahi-qt3.pc
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net/avahi-qt3/pkg-descr b/net/avahi-qt3/pkg-descr
new file mode 100644
index 000000000..5ed735799
--- /dev/null
+++ b/net/avahi-qt3/pkg-descr
@@ -0,0 +1,3 @@
+Qt 3 bindings to the avahi mDNS service discovery system.
+
+WWW: http://www.avahi.org/
diff --git a/net/avahi-qt3/pkg-plist b/net/avahi-qt3/pkg-plist
new file mode 100644
index 000000000..3025b57c0
--- /dev/null
+++ b/net/avahi-qt3/pkg-plist
@@ -0,0 +1,7 @@
+include/avahi-qt3/qt-watch.h
+lib/libavahi-qt3.a
+lib/libavahi-qt3.la
+lib/libavahi-qt3.so
+lib/libavahi-qt3.so.1
+libdata/pkgconfig/avahi-qt3.pc
+@dirrm include/avahi-qt3
diff --git a/net/avahi-sharp/Makefile b/net/avahi-sharp/Makefile
new file mode 100644
index 000000000..4e10619d1
--- /dev/null
+++ b/net/avahi-sharp/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for:	avahi-sharp
+# Date Created:				20041011
+# Whom:					Tom McLaughlin <tmclaugh@FreeBSD.org>
+#
+# $FreeBSD$
+#   $Id: Makefile,v 1.1 2007-07-31 18:24:13 ahze Exp $
+#
+
+PORTREVISION=	0
+CATEGORIES=	net dns
+PKGNAMESUFFIX=	-sharp
+
+MAINTAINER=	bsd-sharp-list@forge.novell.com
+COMMENT=	Mono bindings for Avahi service discovery
+
+LIB_DEPENDS=	avahi-core:${PORTSDIR}/net/avahi
+BUILD_DEPENDS=	mono:${PORTSDIR}/lang/mono
+RUN_DEPENDS=	mono:${PORTSDIR}/lang/mono
+
+MASTERDIR=	${.CURDIR}/../avahi-app
+BUILD_WRKSRC=	${WRKSRC}/avahi-sharp
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+DESCR=		${.CURDIR}/pkg-descr
+PLIST=		${.CURDIR}/pkg-plist
+
+AVAHI_SLAVE=	sharp
+AVAHI_PKGCONFIG=avahi-sharp.pc
+
+post-patch:
+	@${REINPLACE_CMD} 's|@CLIENT_DLNAME@|libavahi-client.so|g; \
+		s|@COMMON_DLNAME@|libavahi-common.so|g; \
+		s|@GLIB_DLNAME@|libavahi-glib.so|g' \
+		${BUILD_WRKSRC}/avahi-sharp.dll.config.in
+	@${CP} ${WRKSRC}/avahi-sharp/avahi-sharp.dll.config.in ${WRKSRC}/avahi-sharp/avahi-sharp.dll.config
+
+.include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
+.include "${MASTERDIR}/Makefile"
diff --git a/net/avahi-sharp/pkg-descr b/net/avahi-sharp/pkg-descr
new file mode 100644
index 000000000..b3712a1ee
--- /dev/null
+++ b/net/avahi-sharp/pkg-descr
@@ -0,0 +1,3 @@
+The C# interface to Avahi service discovery.
+
+WWW: http://www.avahi.org/
diff --git a/net/avahi-sharp/pkg-plist b/net/avahi-sharp/pkg-plist
new file mode 100644
index 000000000..e5783ec2c
--- /dev/null
+++ b/net/avahi-sharp/pkg-plist
@@ -0,0 +1,8 @@
+lib/mono/avahi-sharp/avahi-sharp.dll
+lib/mono/gac/avahi-sharp/1.0.0.0__4d116c78973743f5/avahi-sharp.dll
+lib/mono/gac/avahi-sharp/1.0.0.0__4d116c78973743f5/avahi-sharp.dll.config
+lib/mono/gac/avahi-sharp/1.0.0.0__4d116c78973743f5/avahi-sharp.dll.mdb
+libdata/pkgconfig/avahi-sharp.pc
+@dirrm lib/mono/gac/avahi-sharp/1.0.0.0__4d116c78973743f5
+@dirrm lib/mono/gac/avahi-sharp
+@dirrm lib/mono/avahi-sharp
diff --git a/net/avahi/Makefile b/net/avahi/Makefile
new file mode 100644
index 000000000..e1386dd1b
--- /dev/null
+++ b/net/avahi/Makefile
@@ -0,0 +1,59 @@
+# New ports collection makefile for:	avahi
+# Date created:		18 November 2005
+# Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom: ports/net/avahi/Makefile,v 1.19 2006/10/12 16:44:41 marcus Exp $
+
+PORTNAME=	avahi
+PORTVERSION=	0.6.20
+PORTREVISION?=	2
+CATEGORIES?=	net dns
+MASTER_SITES=	# empty
+DISTFILES=	# empty
+EXTRACT_ONLY=	# empty
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	The "meta-port" for the Avahi service discovery suite
+
+RUN_DEPENDS=	avahi-resolve:${PORTSDIR}/net/avahi-app
+
+OPTIONS=	AUTOIPD "IPv4LL network address configuration daemon" off \
+		GTK "Gtk+ tools and bindings" off \
+		LIBDNS "mDNSResponder compatibility" off \
+		MONO "Mono bindings" off \
+		QT3 "Qt 3 bindings" off \
+		QT4 "Qt 3 bindings" off \
+		PYTHON "Python bindings and tools" off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_AUTOIPD)
+RUN_DEPENDS+=	avahi-autoipd:${PORTSDIR}/net/avahi-autoipd
+.endif
+
+.if defined(WITH_GTK)
+RUN_DEPENDS+=	avahi-discover-standalone:${PORTSDIR}/net/avahi-gtk
+.endif
+
+.if defined(WITH_LIBDNS)
+RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/avahi-compat-libdns_sd.pc:${PORTSDIR}/net/avahi-libdns
+.endif
+
+.if defined(WITH_MONO)
+RUN_DEPENDS+=	${LOCALBASE}/lib/mono/avahi-sharp/avahi-sharp.dll:${PORTSDIR}/net/avahi-sharp
+.endif
+
+.if defined(WITH_QT3)
+RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/avahi-qt3.pc:${PORTSDIR}/net/avahi-qt3
+.endif
+
+.if defined(WITH_QT4)
+RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/avahi-qt4.pc:${PORTSDIR}/net/avahi-qt4
+.endif
+
+.if defined(WITH_PYTHON)
+RUN_DEPENDS+=	avahi-bookmarks:${PORTSDIR}/net/py-avahi
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/net/avahi/pkg-descr b/net/avahi/pkg-descr
new file mode 100644
index 000000000..fb85b6205
--- /dev/null
+++ b/net/avahi/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/py-avahi/Makefile b/net/py-avahi/Makefile
new file mode 100644
index 000000000..0617b413e
--- /dev/null
+++ b/net/py-avahi/Makefile
@@ -0,0 +1,48 @@
+# New ports collection makefile for:   py-avahi
+# Date Created:			06 May 2006
+# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+
+PORTREVISION=	1
+CATEGORIES=	net gnome python
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	# empty
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Python interface to the Avahi mDNS system
+
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gdbm.so:${PORTSDIR}/databases/py-gdbm \
+		${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus
+LIB_DEPENDS=	avahi-client.3:${PORTSDIR}/net/avahi
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gdbm.so:${PORTSDIR}/databases/py-gdbm \
+		${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus
+
+MASTERDIR=	${.CURDIR}/../avahi-app
+BUILD_WRKSRC=	${WRKSRC}/avahi-python
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+DESCR=		${.CURDIR}/pkg-descr
+PLIST=		${.CURDIR}/pkg-plist
+
+AVAHI_SLAVE=	python
+
+USE_GNOME=	gnomehack gnometarget pygtk2
+USE_PYTHON=	yes
+MAN1=		avahi-bookmarks.1 avahi-discover.1
+
+pre-build:
+	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+	    	Makefile ${MAKE_ARGS} clean
+
+post-build:
+	@cd ${WRKSRC}/service-type-database && ${SETENV} ${MAKE_ENV} ${GMAKE} \
+		${MAKE_FLAGS} Makefile ${MAKE_ARGS} ${ALL_TARGET}
+
+post-install:
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/service-type-database/service-types.db ${DATADIR}
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -l ${PYTHONPREFIX_SITELIBDIR}/avahi
+	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -l ${PYTHONPREFIX_SITELIBDIR}/avahi
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net/py-avahi/pkg-descr b/net/py-avahi/pkg-descr
new file mode 100644
index 000000000..b0d0aa0de
--- /dev/null
+++ b/net/py-avahi/pkg-descr
@@ -0,0 +1,3 @@
+Python interface to the avahi mDNS service discovery system.
+
+WWW: http://www.avahi.org/
diff --git a/net/py-avahi/pkg-plist b/net/py-avahi/pkg-plist
new file mode 100644
index 000000000..18e948d0d
--- /dev/null
+++ b/net/py-avahi/pkg-plist
@@ -0,0 +1,15 @@
+bin/avahi-bookmarks
+bin/avahi-discover
+lib/%%PYTHON_VERSION%%/site-packages/avahi/ServiceTypeDatabase.py
+lib/%%PYTHON_VERSION%%/site-packages/avahi/ServiceTypeDatabase.pyc
+lib/%%PYTHON_VERSION%%/site-packages/avahi/ServiceTypeDatabase.pyo
+lib/%%PYTHON_VERSION%%/site-packages/avahi/SimpleGladeApp.py
+lib/%%PYTHON_VERSION%%/site-packages/avahi/SimpleGladeApp.pyc
+lib/%%PYTHON_VERSION%%/site-packages/avahi/SimpleGladeApp.pyo
+lib/%%PYTHON_VERSION%%/site-packages/avahi/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/avahi/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/avahi/__init__.pyo
+share/applications/avahi-discover.desktop
+%%DATADIR%%/service-types.db
+@dirrmtry share/applications
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/avahi