[Midnightbsd-cvs] mports: mports/net: Update avahi, break it into several ports.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Feb 17 00:21:12 EST 2008


Log Message:
-----------
Update avahi, break it into several ports.  more to come

Modified Files:
--------------
    mports/net:
        Makefile (r1.50 -> r1.51)
    mports/net/avahi:
        Makefile (r1.3 -> r1.4)

Added Files:
-----------
    mports/net/avahi-app:
        Makefile (r1.1)
        distinfo (r1.1)
        pkg-descr (r1.1)
        pkg-install (r1.1)
        pkg-plist (r1.1)
    mports/net/avahi-app/files:
        patch-Makefile.in (r1.1)
        patch-avahi-autoipd_main.c (r1.1)
        patch-avahi-client.pc.in (r1.1)
        patch-avahi-common_Makefile.in (r1.1)
        patch-avahi-compat-howl.pc.in (r1.1)
        patch-avahi-compat-libdns_sd.pc.in (r1.1)
        patch-avahi-compat-libdns_sd_Makefile.in (r1.1)
        patch-avahi-core.pc.in (r1.1)
        patch-avahi-daemon_Makefile.in (r1.1)
        patch-avahi-daemon_main.c (r1.1)
        patch-avahi-discover-standalone_Makefile.in (r1.1)
        patch-avahi-glib.pc.in (r1.1)
        patch-avahi-qt3.pc.in (r1.1)
        patch-avahi-qt4.pc.in (r1.1)
        patch-avahi-qt_Makefile.in (r1.1)
        patch-avahi-ui_Makefile.in (r1.1)
        patch-avahi-utils_Makefile.in (r1.1)
        patch-configure (r1.1)
        patch-dnsconfd_Makefile.in (r1.1)
        patch-initscript_freebsd_avahi-daemon.sh.in (r1.1)
        patch-initscript_freebsd_avahi-dnsconfd.sh.in (r1.1)
        patch-man_Makefile.in (r1.1)
    mports/net/avahi-qt3:
        Makefile (r1.1)
        pkg-descr (r1.1)
        pkg-plist (r1.1)

Removed Files:
-------------
    mports/net/avahi:
        distinfo
        pkg-install
        pkg-plist
    mports/net/avahi/files:
        patch-Makefile.in
        patch-avahi-client.pc.in
        patch-avahi-compat-howl.pc.in
        patch-avahi-compat-libdns_sd.pc.in
        patch-avahi-core.pc.in
        patch-avahi-core_fdutil.c
        patch-avahi-daemon_main.c
        patch-avahi-glib.pc.in
        patch-avahi-qt3.pc.in
        patch-avahi-qt_Makefile.in
        patch-avahi-ui_avahi-ui.c
        patch-configure
        patch-initscript_freebsd_avahi-daemon.sh.in
        patch-initscript_freebsd_avahi-dnsconfd.sh.in
        patch-man_Makefile.in

-------------- next part --------------
--- net/avahi/pkg-install
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/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
--- net/avahi/pkg-plist
+++ /dev/null
@@ -1,133 +0,0 @@
-bin/avahi-browse
-bin/avahi-browse-domains
-%%GTK%%bin/avahi-discover-standalone
-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
-%%GTK%%bin/bssh
-%%GTK%%bin/bvnc
-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
-%%LIBDNS%%include/avahi-compat-libdns_sd/dns_sd.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
-%%GTK%%include/avahi-ui/avahi-ui.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
-%%GTK%%lib/libavahi-ui.a
-%%GTK%%lib/libavahi-ui.la
-%%GTK%%lib/libavahi-ui.so
-%%GTK%%lib/libavahi-ui.so.0
-%%LIBDNS%%lib/libdns_sd.a
-%%LIBDNS%%lib/libdns_sd.la
-%%LIBDNS%%lib/libdns_sd.so
-%%LIBDNS%%lib/libdns_sd.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
-%%LIBDNS%%libdata/pkgconfig/avahi-compat-libdns_sd.pc
-libdata/pkgconfig/avahi-core.pc
-libdata/pkgconfig/avahi-glib.pc
-%%GTK%%libdata/pkgconfig/avahi-ui.pc
-sbin/avahi-daemon
-sbin/avahi-dnsconfd
-%%GTK%%share/applications/bssh.desktop
-%%GTK%%share/applications/bvnc.desktop
-%%DATADIR%%/avahi-service.dtd
-%%GTK%%%%DATADIR%%/interfaces/avahi-discover.glade
-%%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
- at dirrm %%DATADIR%%/introspection
-%%GTK%%@dirrm %%DATADIR%%/interfaces
- at dirrm %%DATADIR%%
- at dirrmtry share/applications
-%%GTK%%@dirrm include/avahi-ui
- at dirrm include/avahi-glib
- at dirrm include/avahi-core
-%%LIBDNS%%@dirrm include/avahi-compat-libdns_sd
- at dirrm include/avahi-compat-howl/salt
- at dirrm include/avahi-compat-howl/rendezvous
- at dirrm include/avahi-compat-howl/discovery
- at dirrm include/avahi-compat-howl/corby
- at dirrm include/avahi-compat-howl
- at dirrm include/avahi-common
- at dirrm include/avahi-client
- at dirrm etc/avahi/services
- at dirrm etc/avahi
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/net/avahi/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L net/avahi/Makefile -L net/avahi/Makefile -u -r1.3 -r1.4
--- net/avahi/Makefile
+++ net/avahi/Makefile
@@ -3,93 +3,64 @@
 # Whom:			Joe Marcus Clarke <marcus at FreeBSD.org>
 #
 # $MidnightBSD$
-# $FreeBSD: ports/net/avahi/Makefile,v 1.45 2007/02/10 23:34:58 marcus Exp $
-#    $MCom: ports/net/avahi/Makefile,v 1.19 2006/10/12 16:44:41 marcus Exp $
+# $FreeBSD: ports/net/avahi/Makefile,v 1.56 2007/12/20 18:23:32 ahze Exp $
+#   $MCom: ports/net/avahi/Makefile,v 1.26 2007/09/09 22:45:27 mezz Exp $
+#
 
 PORTNAME=	avahi
-PORTVERSION=	0.6.20
+PORTVERSION=	0.6.22
 PORTREVISION?=	0
-CATEGORIES=	net dns
-MASTER_SITES=	http://www.avahi.org/download/
+CATEGORIES?=	net dns
+MASTER_SITES=	# empty
+DISTFILES=	# empty
+EXTRACT_ONLY=	# empty
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	The "meta-port" for the Avahi service discovery suite
+
+RUN_DEPENDS=	avahi-resolve:${PORTSDIR}/net/avahi-app \
+		avahi-app>=0.6.20_2:${PORTSDIR}/net/avahi-app
+
+OPTIONS=	AUTOIPD "IPv4LL network address configuration daemon" off \
+		GTK "Gtk+ tools and bindings" off \
+		LIBDNS "Apple's mDNSResponder compatibility library" off \
+		MONO "Mono bindings" off \
+		QT3 "Qt 3 bindings" off \
+		QT4 "Qt 4 bindings" off \
+		PYTHON "Python bindings and tools" off
 
-MAINTAINER?=	ports at MdinightBSD.org
-COMMENT?=	Service discovery on a local network
+NO_BUILD=	yes
 
-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_RC_SUBR=	yes
-USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
-USE_LDCONFIG=	yes
-USE_GETOPT_LONG=yes
-CONFIGURE_ARGS?=--with-distro=freebsd \
-		--with-dbus-system-address=unix:path=/var/run/dbus/system_bus_socket \
-		--disable-qt3 \
-		--disable-qt4 \
-		--disable-python \
-		--disable-mono \
-		--disable-monodoc \
-		--disable-doxygen-doc \
-		--disable-doxygen-dot \
-		--localstatedir=/var \
-		--enable-compat-howl \
-		--disable-autoipd \
-		--mandir=${PREFIX}/man
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DHAVE_KQUEUE" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
-
-.if !defined(AVAHI_SLAVE)
-CONFLICTS=	howl-[0-9]*
-
-MAN1=	avahi-browse-domains.1 avahi-browse.1 avahi-publish-address.1 \
-	avahi-publish-service.1 avahi-publish.1 avahi-resolve-address.1 \
-	avahi-resolve-host-name.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
+.include <bsd.port.pre.mk>
 
-OPTIONS=	GTK2 "Build a GTK+ 2 browser utility and other tools" off \
-		LIBDNS "Enable mDNSResponder compatibility" off
+.if defined(WITH_AUTOIPD)
+RUN_DEPENDS+=	avahi-autoipd:${PORTSDIR}/net/avahi-autoipd
 .endif
 
-.include <bsd.port.pre.mk>
+.if defined(WITH_GTK)
+RUN_DEPENDS+=	avahi-discover-standalone:${PORTSDIR}/net/avahi-gtk
+.endif
 
-.if !defined(AVAHI_SLAVE)
 .if defined(WITH_LIBDNS)
-CONFIGURE_ARGS+=--enable-compat-libdns_sd
-PLIST_SUB+=	LIBDNS=""
-CONFLICTS+=	mDNSResponder-[0-9]*
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}+libdns
-.else
-CONFIGURE_ARGS+=--disable-compat-libdns_sd
-PLIST_SUB+=	LIBDNS="@comment "
-.endif
-
-.if defined(WITH_GTK2)
-USE_GNOME+=	libglade2
-PLIST_SUB+=	GTK=""
-.else
-CONFIGURE_ARGS+=--disable-gtk
-PLIST_SUB+=	GTK="@comment "
-.endif
-
-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
+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
+
+do-install:
+
 .include <bsd.port.post.mk>
--- net/avahi/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (avahi-0.6.20.tar.gz) = 6acdff79afa2631f765f3bbbc3e25a74
-SHA256 (avahi-0.6.20.tar.gz) = 89ae5fd08018679b80cee201e1c1350d86db73bdcf6718aabb4bd3ea86f93ec9
-SIZE (avahi-0.6.20.tar.gz) = 974209
--- net/avahi/files/patch-avahi-daemon_main.c
+++ /dev/null
@@ -1,161 +0,0 @@
---- 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) {
--- net/avahi/files/patch-initscript_freebsd_avahi-daemon.sh.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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`
--- net/avahi/files/patch-avahi-ui_avahi-ui.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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>
--- net/avahi/files/patch-avahi-core.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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}
--- net/avahi/files/patch-Makefile.in
+++ /dev/null
@@ -1,50 +0,0 @@
---- 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, at prefix\@,$(prefix),g' \
- 	    -e 's, at libdir\@,$(libdir),g' \
-+	    -e 's, at PTHREAD_LIBS\@,$(PTHREAD_LIBS),g' \
-+	    -e 's, at PTHREAD_CFLAGS\@,$(PTHREAD_CFLAGS),g' \
- 	    -e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
- 
- @HAVE_DBUS_TRUE at avahi-client.pc: avahi-client.pc.in
- @HAVE_DBUS_TRUE@	sed -e 's, at prefix\@,$(prefix),g' \
- @HAVE_DBUS_TRUE@	    -e 's, at libdir\@,$(libdir),g' \
-+ at HAVE_DBUS_TRUE@	    -e 's, at PTHREAD_CFLAGS\@,$(PTHREAD_CFLAGS),g' \
-+ at HAVE_DBUS_TRUE@	    -e 's, at PTHREAD_LIBS\@,$(PTHREAD_LIBS),g' \
- @HAVE_DBUS_TRUE@	    -e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
- 
- @ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE at avahi-compat-howl.pc: avahi-compat-howl.pc.in
- @ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@	sed -e 's, at prefix\@,$(prefix),g' \
- @ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@	    -e 's, at libdir\@,$(libdir),g' \
-+ at ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@	    -e 's, at PTHREAD_CFLAGS\@,$(PTHREAD_CFLAGS),g' \
-+ at ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@	    -e 's, at PTHREAD_LIBS\@,$(PTHREAD_LIBS),g' \
- @ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@	    -e 's, at HOWL_COMPAT_VERSION\@,$(HOWL_COMPAT_VERSION),g' $< > $@
- 
- @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE at avahi-compat-libdns_sd.pc: avahi-compat-libdns_sd.pc.in
- @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	sed -e 's, at prefix\@,$(prefix),g' \
- @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	    -e 's, at libdir\@,$(libdir),g' \
-+ at ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	    -e 's, at PTHREAD_CFLAGS\@,$(PTHREAD_CFLAGS),g' \
-+ at ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	    -e 's, at PTHREAD_LIBS\@,$(PTHREAD_LIBS),g' \
- @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	    -e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
- 
- @HAVE_DBUS_TRUE@@HAVE_MONO_TRUE at avahi-sharp.pc: avahi-sharp.pc.in
-@@ -1096,6 +1104,8 @@
- @HAVE_GLIB_TRUE at avahi-glib.pc: avahi-glib.pc.in
- @HAVE_GLIB_TRUE@	sed -e 's, at prefix\@,$(prefix),g' \
- @HAVE_GLIB_TRUE@	    -e 's, at libdir\@,$(libdir),g' \
-+ at HAVE_GLIB_TRUE@	    -e 's, at PTHREAD_CFLAGS\@,$(PTHREAD_CFLAGS),g' \
-+ at HAVE_GLIB_TRUE@	    -e 's, at PTHREAD_LIBS\@,$(PTHREAD_LIBS),g' \
- @HAVE_GLIB_TRUE@	    -e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
- 
- @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE at avahi-ui.pc: avahi-ui.pc.in
-@@ -1106,6 +1116,8 @@
- @HAVE_QT3_TRUE at avahi-qt3.pc: avahi-qt3.pc.in
- @HAVE_QT3_TRUE@	sed -e 's, at prefix\@,$(prefix),g' \
- @HAVE_QT3_TRUE@	    -e 's, at libdir\@,$(libdir),g' \
-+ at HAVE_QT3_TRUE@	    -e 's, at PTHREAD_CFLAGS\@,$(PTHREAD_CFLAGS),g' \
-+ at HAVE_QT3_TRUE@	    -e 's, at PTHREAD_LIBS\@,$(PTHREAD_LIBS),g' \
- @HAVE_QT3_TRUE@	    -e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
- 
- @HAVE_QT4_TRUE at avahi-qt4.pc: avahi-qt4.pc.in
--- net/avahi/files/patch-avahi-compat-libdns_sd.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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}
--- net/avahi/files/patch-man_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 && \
-- at HAVE_DBUS_TRUE@                $(LN_S) bssh.1 bvnc.1
-+ at 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:
--- net/avahi/files/patch-avahi-qt_Makefile.in
+++ /dev/null
@@ -1,36 +0,0 @@
---- 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 at libavahi_qt3_la_DEPENDENCIES =  \
-- at 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 at 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 at am_libavahi_qt3_la_rpath = -rpath $(libdir)
- @HAVE_QT4_TRUE at libavahi_qt4_la_DEPENDENCIES =  \
-- at 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 at 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 at libavahi_qt3_la_CPPFLAGS = $(AM_CFLAGS) $(QT3_CFLAGS)
-- at HAVE_QT3_TRUE@libavahi_qt3_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT3_LIBS)
-+ at HAVE_QT3_TRUE@libavahi_qt3_la_LIBADD = $(AM_LDADD) -lavahi-common $(QT3_LIBS)
- @HAVE_QT3_TRUE at libavahi_qt3_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_QT3_VERSION_INFO)
- @HAVE_QT4_TRUE at avahiqt4includedir = $(includedir)/avahi-qt4
- @HAVE_QT4_TRUE at avahiqt4include_HEADERS = \
-@@ -428,7 +426,7 @@ BUILT_SOURCES = $(am__append_2) $(am__ap
- @HAVE_QT4_TRUE@	qt-watch.cpp 
- 
- @HAVE_QT4_TRUE at libavahi_qt4_la_CPPFLAGS = $(AM_CFLAGS) $(QT4_CFLAGS) -DQT4
-- at HAVE_QT4_TRUE@libavahi_qt4_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT4_LIBS)
-+ at HAVE_QT4_TRUE@libavahi_qt4_la_LIBADD = $(AM_LDADD) -lavahi-common $(QT4_LIBS)
- @HAVE_QT4_TRUE at libavahi_qt4_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_QT4_VERSION_INFO)
- CLEANFILES = $(BUILT_SOURCES)
- all: $(BUILT_SOURCES)
--- net/avahi/files/patch-avahi-compat-howl.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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}
--- net/avahi/files/patch-avahi-qt3.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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}
--- net/avahi/files/patch-configure
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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 ()
- {
--- net/avahi/files/patch-avahi-client.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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}
--- net/avahi/files/patch-avahi-glib.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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}
--- net/avahi/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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`
--- net/avahi/files/patch-avahi-core_fdutil.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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>
--- /dev/null
+++ net/avahi-app/files/patch-dnsconfd_Makefile.in
@@ -0,0 +1,11 @@
+--- avahi-dnsconfd/Makefile.in.orig	2007-12-19 14:33:03.000000000 +0000
++++ avahi-dnsconfd/Makefile.in	2007-12-19 14:33:08.000000000 +0000
+@@ -523,7 +523,7 @@
+ 	done
+ avahi-dnsconfd$(EXEEXT): $(avahi_dnsconfd_OBJECTS) $(avahi_dnsconfd_DEPENDENCIES) 
+ 	@rm -f avahi-dnsconfd$(EXEEXT)
+-	$(LINK) $(avahi_dnsconfd_LDFLAGS) $(avahi_dnsconfd_OBJECTS) $(avahi_dnsconfd_LDADD) $(LIBS)
++	$(LINK) $(avahi_dnsconfd_LDFLAGS) $(avahi_dnsconfd_OBJECTS) $(avahi_dnsconfd_LDADD) $(LIBS) $(INTLLIBS)
+ install-pkgsysconfSCRIPTS: $(pkgsysconf_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(pkgsysconfdir)" || $(mkdir_p) "$(DESTDIR)$(pkgsysconfdir)"
--- /dev/null
+++ 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 at avahi_discover_standalone_DEPENDENCIES =  \
+- at HAVE_GTK_TRUE@	../avahi-common/libavahi-common.la \
+- at HAVE_GTK_TRUE@	../avahi-glib/libavahi-glib.la \
+- at 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 at avahi_discover_standalone_LDADD = \
+- at HAVE_GTK_TRUE@	$(AM_LDADD) \
+- at HAVE_GTK_TRUE@	../avahi-common/libavahi-common.la \
+- at HAVE_GTK_TRUE@	../avahi-glib/libavahi-glib.la \
+- at HAVE_GTK_TRUE@	../avahi-core/libavahi-core.la  \
++ at 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 at interfaces_DATA = $(interfaces)
--- /dev/null
+++ 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`
--- /dev/null
+++ 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, at prefix\@,$(prefix),g' \
+ 	    -e 's, at libdir\@,$(libdir),g' \
++	    -e 's, at PTHREAD_LIBS\@,$(PTHREAD_LIBS),g' \
++	    -e 's, at PTHREAD_CFLAGS\@,$(PTHREAD_CFLAGS),g' \
+ 	    -e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
+ 
+ @HAVE_DBUS_TRUE at avahi-client.pc: avahi-client.pc.in
+ @HAVE_DBUS_TRUE@	sed -e 's, at prefix\@,$(prefix),g' \
+ @HAVE_DBUS_TRUE@	    -e 's, at libdir\@,$(libdir),g' \
++ at HAVE_DBUS_TRUE@	    -e 's, at PTHREAD_CFLAGS\@,$(PTHREAD_CFLAGS),g' \
++ at HAVE_DBUS_TRUE@	    -e 's, at PTHREAD_LIBS\@,$(PTHREAD_LIBS),g' \
+ @HAVE_DBUS_TRUE@	    -e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
+ 
+ @ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE at avahi-compat-howl.pc: avahi-compat-howl.pc.in
+ @ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@	sed -e 's, at prefix\@,$(prefix),g' \
+ @ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@	    -e 's, at libdir\@,$(libdir),g' \
++ at ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@	    -e 's, at PTHREAD_CFLAGS\@,$(PTHREAD_CFLAGS),g' \
++ at ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@	    -e 's, at PTHREAD_LIBS\@,$(PTHREAD_LIBS),g' \
+ @ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@	    -e 's, at HOWL_COMPAT_VERSION\@,$(HOWL_COMPAT_VERSION),g' $< > $@
+ 
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE at avahi-compat-libdns_sd.pc: avahi-compat-libdns_sd.pc.in
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	sed -e 's, at prefix\@,$(prefix),g' \
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	    -e 's, at libdir\@,$(libdir),g' \
++ at ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	    -e 's, at PTHREAD_CFLAGS\@,$(PTHREAD_CFLAGS),g' \
++ at ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	    -e 's, at PTHREAD_LIBS\@,$(PTHREAD_LIBS),g' \
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	    -e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
+ 
+ @HAVE_DBUS_TRUE@@HAVE_MONO_TRUE at avahi-sharp.pc: avahi-sharp.pc.in
+@@ -1096,6 +1104,8 @@
+ @HAVE_GLIB_TRUE at avahi-glib.pc: avahi-glib.pc.in
+ @HAVE_GLIB_TRUE@	sed -e 's, at prefix\@,$(prefix),g' \
+ @HAVE_GLIB_TRUE@	    -e 's, at libdir\@,$(libdir),g' \
++ at HAVE_GLIB_TRUE@	    -e 's, at PTHREAD_CFLAGS\@,$(PTHREAD_CFLAGS),g' \
++ at HAVE_GLIB_TRUE@	    -e 's, at PTHREAD_LIBS\@,$(PTHREAD_LIBS),g' \
+ @HAVE_GLIB_TRUE@	    -e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
+ 
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE at avahi-ui.pc: avahi-ui.pc.in
+@@ -1106,6 +1116,8 @@
+ @HAVE_QT3_TRUE at avahi-qt3.pc: avahi-qt3.pc.in
+ @HAVE_QT3_TRUE@	sed -e 's, at prefix\@,$(prefix),g' \
+ @HAVE_QT3_TRUE@	    -e 's, at libdir\@,$(libdir),g' \
++ at HAVE_QT3_TRUE@	    -e 's, at PTHREAD_CFLAGS\@,$(PTHREAD_CFLAGS),g' \
++ at HAVE_QT3_TRUE@	    -e 's, at PTHREAD_LIBS\@,$(PTHREAD_LIBS),g' \
+ @HAVE_QT3_TRUE@	    -e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
+ 
+ @HAVE_QT4_TRUE at avahi-qt4.pc: avahi-qt4.pc.in
--- /dev/null
+++ 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 =
+- at HAVE_DBUS_TRUE@@HAVE_GTK_TRUE at libavahi_ui_la_DEPENDENCIES = ../avahi-common/libavahi-common.la \
+- at HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@	../avahi-client/libavahi-client.la \
+- at HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@	../avahi-glib/libavahi-glib.la \
++ at HAVE_DBUS_TRUE@@HAVE_GTK_TRUE at 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 at bssh_DEPENDENCIES =  \
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1) \
+- at HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@	../avahi-client/libavahi-client.la \
+- at 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 at 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)
+- at HAVE_DBUS_TRUE@@HAVE_GTK_TRUE at libavahi_ui_la_LIBADD = $(AM_LDADD) \
+- at HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@	../avahi-common/libavahi-common.la \
+- at HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@	../avahi-client/libavahi-client.la \
+- at HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@	../avahi-glib/libavahi-glib.la \
++ at HAVE_DBUS_TRUE@@HAVE_GTK_TRUE at 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 at libavahi_ui_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_UI_VERSION_INFO)
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE at bssh_SOURCES = bssh.c
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE at bssh_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS)
+- at HAVE_DBUS_TRUE@@HAVE_GTK_TRUE at bssh_LDADD = $(AM_LDADD) $(GTK20_LIBS) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la libavahi-ui.la
++ at HAVE_DBUS_TRUE@@HAVE_GTK_TRUE at bssh_LDADD = $(AM_LDADD) $(GTK20_LIBS) `$(PKG_CONFIG) --cflags --libs avahi-client avahi-core` libavahi-ui.la
+ CLEANFILES = $(desktop_DATA)
+ all: all-am
+ 
--- /dev/null
+++ 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 && \
+- at HAVE_DBUS_TRUE@                $(LN_S) bssh.1 bvnc.1
++ at 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:
--- /dev/null
+++ net/avahi-app/files/patch-avahi-qt4.pc.in
@@ -0,0 +1,10 @@
+--- avahi-qt4.pc.in.orig	2006-01-23 07:15:20.000000000 +1000
++++ avahi-qt4.pc.in	2007-10-28 12:10:17.000000000 +1000
+@@ -7,5 +7,5 @@
+ Description: Avahi Multicast DNS Responder (QT4 Support)
+ Version: @PACKAGE_VERSION@
+ Requires.private: QtCore >= 4.0.0
+-Libs: -L${libdir} -lavahi-qt4
+-Cflags: -D_REENTRANT -I${includedir}
++Libs: -L${libdir} -lavahi-qt4 @PTHREAD_LIBS@
++Cflags: -D_REENTRANT @PTHREAD_CFLAGS@ -I${includedir}
--- /dev/null
+++ 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 at null_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- at ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	$(am__DEPENDENCIES_1) \
+- at ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	../avahi-common/libavahi-common.la \
+- at ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	../avahi-client/libavahi-client.la
++ at 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 at 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 at txt_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- at ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	$(am__DEPENDENCIES_1) \
+- at ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	../avahi-common/libavahi-common.la
++ at 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 at libdns_sd_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
+- at ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE at 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
++ at ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE at 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 at 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 at txt_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
+- at ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE at txt_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la
++ at ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE at txt_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) `$(PKG_CONFIG) --libs --cflags avahi-client`
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE at 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 at null_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
+- at ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE at null_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la
++ at ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE at null_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) `$(PKG_CONFIG) --libs --cflags avahi-client`
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE at CLEANFILES = libdns_sd-test.o libdns_sd-test
+ all: all-am
+ 
+@@ -883,7 +880,7 @@
+ 
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE at 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 
+- at 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 
++ at 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:
--- /dev/null
+++ net/avahi-app/files/patch-avahi-utils_Makefile.in
@@ -0,0 +1,23 @@
+--- avahi-utils/Makefile.in.orig	2007-12-19 14:37:00.000000000 +0000
++++ avahi-utils/Makefile.in	2007-12-19 14:38:01.000000000 +0000
+@@ -570,16 +570,16 @@
+ 	done
+ avahi-browse$(EXEEXT): $(avahi_browse_OBJECTS) $(avahi_browse_DEPENDENCIES) 
+ 	@rm -f avahi-browse$(EXEEXT)
+-	$(LINK) $(avahi_browse_LDFLAGS) $(avahi_browse_OBJECTS) $(avahi_browse_LDADD) $(LIBS)
++	$(LINK) $(avahi_browse_LDFLAGS) $(avahi_browse_OBJECTS) $(avahi_browse_LDADD) $(LIBS) $(INTLLIBS)
+ avahi-publish$(EXEEXT): $(avahi_publish_OBJECTS) $(avahi_publish_DEPENDENCIES) 
+ 	@rm -f avahi-publish$(EXEEXT)
+-	$(LINK) $(avahi_publish_LDFLAGS) $(avahi_publish_OBJECTS) $(avahi_publish_LDADD) $(LIBS)
++	$(LINK) $(avahi_publish_LDFLAGS) $(avahi_publish_OBJECTS) $(avahi_publish_LDADD) $(LIBS) $(INTLLIBS)
+ avahi-resolve$(EXEEXT): $(avahi_resolve_OBJECTS) $(avahi_resolve_DEPENDENCIES) 
+ 	@rm -f avahi-resolve$(EXEEXT)
+-	$(LINK) $(avahi_resolve_LDFLAGS) $(avahi_resolve_OBJECTS) $(avahi_resolve_LDADD) $(LIBS)
++	$(LINK) $(avahi_resolve_LDFLAGS) $(avahi_resolve_OBJECTS) $(avahi_resolve_LDADD) $(LIBS) $(INTLLIBS)
+ avahi-set-host-name$(EXEEXT): $(avahi_set_host_name_OBJECTS) $(avahi_set_host_name_DEPENDENCIES) 
+ 	@rm -f avahi-set-host-name$(EXEEXT)
+-	$(LINK) $(avahi_set_host_name_LDFLAGS) $(avahi_set_host_name_OBJECTS) $(avahi_set_host_name_LDADD) $(LIBS)
++	$(LINK) $(avahi_set_host_name_LDFLAGS) $(avahi_set_host_name_OBJECTS) $(avahi_set_host_name_LDADD) $(LIBS) $(INTLLIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
--- /dev/null
+++ 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}
--- /dev/null
+++ 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`
--- /dev/null
+++ 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++) {
--- /dev/null
+++ 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}
--- /dev/null
+++ 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}
--- /dev/null
+++ net/avahi-app/files/patch-avahi-daemon_Makefile.in
@@ -0,0 +1,11 @@
+--- avahi-daemon/Makefile.in.orig	2007-12-19 14:17:37.000000000 +0000
++++ avahi-daemon/Makefile.in	2007-12-19 14:17:43.000000000 +0000
+@@ -709,7 +709,7 @@
+ 	done
+ avahi-daemon$(EXEEXT): $(avahi_daemon_OBJECTS) $(avahi_daemon_DEPENDENCIES) 
+ 	@rm -f avahi-daemon$(EXEEXT)
+-	$(LINK) $(avahi_daemon_LDFLAGS) $(avahi_daemon_OBJECTS) $(avahi_daemon_LDADD) $(LIBS)
++	$(LINK) $(avahi_daemon_LDFLAGS) $(avahi_daemon_OBJECTS) $(avahi_daemon_LDADD) $(LIBS) $(INTLLIBS)
+ ini-file-parser-test$(EXEEXT): $(ini_file_parser_test_OBJECTS) $(ini_file_parser_test_DEPENDENCIES) 
+ 	@rm -f ini-file-parser-test$(EXEEXT)
+ 	$(LINK) $(ini_file_parser_test_LDFLAGS) $(ini_file_parser_test_OBJECTS) $(ini_file_parser_test_LDADD) $(LIBS)
--- /dev/null
+++ net/avahi-app/files/patch-avahi-common_Makefile.in
@@ -0,0 +1,11 @@
+--- avahi-common/Makefile.in.orig	2007-12-24 13:57:24.000000000 -0500
++++ avahi-common/Makefile.in	2007-12-24 14:00:15.000000000 -0500
+@@ -555,7 +555,7 @@ libavahi_common_la_SOURCES = \
+ 	i18n.c i18n.h
+ 
+ libavahi_common_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -DAVAHI_LOCALEDIR=\"$(avahilocaledir)\"
+-libavahi_common_la_LIBADD = $(AM_LDADD) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
++libavahi_common_la_LIBADD = $(AM_LDADD) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(INTLLIBS)
+ libavahi_common_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_COMMON_VERSION_INFO)
+ strlst_test_SOURCES = \
+ 	strlst.c strlst.h \
--- /dev/null
+++ 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}
--- /dev/null
+++ 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 at libavahi_qt3_la_DEPENDENCIES =  \
+- at 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 at 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 at am_libavahi_qt3_la_rpath = -rpath $(libdir)
+ @HAVE_QT4_TRUE at libavahi_qt4_la_DEPENDENCIES =  \
+- at 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 at 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 at libavahi_qt3_la_CPPFLAGS = $(AM_CFLAGS) $(QT3_CFLAGS)
+- at HAVE_QT3_TRUE@libavahi_qt3_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT3_LIBS)
++ at HAVE_QT3_TRUE@libavahi_qt3_la_LIBADD = $(AM_LDADD) -lavahi-common $(QT3_LIBS)
+ @HAVE_QT3_TRUE at libavahi_qt3_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_QT3_VERSION_INFO)
+ @HAVE_QT4_TRUE at avahiqt4includedir = $(includedir)/avahi-qt4
+ @HAVE_QT4_TRUE at avahiqt4include_HEADERS = \
+@@ -428,7 +426,7 @@ BUILT_SOURCES = $(am__append_2) $(am__ap
+ @HAVE_QT4_TRUE@	qt-watch.cpp 
+ 
+ @HAVE_QT4_TRUE at libavahi_qt4_la_CPPFLAGS = $(AM_CFLAGS) $(QT4_CFLAGS) -DQT4
+- at HAVE_QT4_TRUE@libavahi_qt4_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT4_LIBS)
++ at HAVE_QT4_TRUE@libavahi_qt4_la_LIBADD = $(AM_LDADD) -lavahi-common $(QT4_LIBS)
+ @HAVE_QT4_TRUE at libavahi_qt4_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_QT4_VERSION_INFO)
+ CLEANFILES = $(BUILT_SOURCES)
+ all: $(BUILT_SOURCES)
--- /dev/null
+++ 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}
--- /dev/null
+++ 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 ()
+ {
--- /dev/null
+++ 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}
--- /dev/null
+++ net/avahi-app/files/patch-avahi-autoipd_main.c
@@ -0,0 +1,13 @@
+--- avahi-autoipd/main.c.orig	2007-12-19 15:22:16.000000000 +0000
++++ avahi-autoipd/main.c	2007-12-19 15:23:39.000000000 +0000
+@@ -64,8 +64,8 @@
+ #include <pcap.h>
+ 
+ /* Old versions of PCAP defined it as D_IN */
+-#ifndef PCAP_D_IN
+-#define PCAP_D_IN D_IN
++#ifndef D_IN
++#define D_IN PCAP_D_IN
+ #endif
+ 
+ #endif
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/net/Makefile,v
retrieving revision 1.50
retrieving revision 1.51
diff -L net/Makefile -L net/Makefile -u -r1.50 -r1.51
--- net/Makefile
+++ net/Makefile
@@ -5,6 +5,8 @@
 
     SUBDIR += 44bsd-rdist
     SUBDIR += avahi
+    SUBDIR += avahi-app
+    SUBDIR += avahi-qt3
     SUBDIR += cvsup
     SUBDIR += cvsup-without-gui
     SUBDIR += fping
--- /dev/null
+++ 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
--- /dev/null
+++ 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/
--- /dev/null
+++ net/avahi-app/pkg-plist
@@ -0,0 +1,128 @@
+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
+include/avahi-gobject/ga-client.h
+include/avahi-gobject/ga-entry-group.h
+include/avahi-gobject/ga-enums.h
+include/avahi-gobject/ga-error.h
+include/avahi-gobject/ga-record-browser.h
+include/avahi-gobject/ga-service-browser.h
+include/avahi-gobject/ga-service-resolver.h
+lib/avahi/.keep
+lib/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/libavahi-gobject.a
+lib/libavahi-gobject.la
+lib/libavahi-gobject.so
+lib/libavahi-gobject.so.0
+lib/libhowl.a
+lib/libhowl.la
+lib/libhowl.so
+lib/libhowl.so.0
+libdata/pkgconfig/avahi-client.pc
+libdata/pkgconfig/avahi-compat-howl.pc
+libdata/pkgconfig/avahi-core.pc
+libdata/pkgconfig/avahi-glib.pc
+libdata/pkgconfig/avahi-gobject.pc
+sbin/avahi-daemon
+sbin/avahi-dnsconfd
+%%DATADIR%%/avahi-service.dtd
+%%DATADIR%%/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
+share/locale/de/LC_MESSAGES/avahi.mo
+ at dirrm %%DATADIR%%/introspection
+ at dirrm %%DATADIR%%
+ at dirrmtry share/applications
+ at dirrm lib/avahi
+ at dirrm include/avahi-gobject
+ at dirrm include/avahi-glib
+ at dirrm include/avahi-core
+ at dirrm include/avahi-compat-howl/salt
+ at dirrm include/avahi-compat-howl/rendezvous
+ at dirrm include/avahi-compat-howl/discovery
+ at dirrm include/avahi-compat-howl/corby
+ at dirrm include/avahi-compat-howl
+ at dirrm include/avahi-common
+ at dirrm include/avahi-client
+ at dirrm etc/avahi/services
+ at dirrm etc/avahi
--- /dev/null
+++ net/avahi-app/Makefile
@@ -0,0 +1,146 @@
+# New ports collection makefile for:	avahi
+# Date created:		18 November 2005
+# Whom:			Joe Marcus Clarke <marcus at FreeBSD.org>
+#
+# $MidnightBSD: mports/net/avahi-app/Makefile,v 1.1 2008/02/17 05:21:08 laffer1 Exp $
+# $FreeBSD: ports/net/avahi-app/Makefile,v 1.7 2007/12/24 19:05:22 marcus Exp $
+#   $MCom: ports/net/avahi-app/Makefile,v 1.6 2007/08/26 06:10:14 marcus Exp $
+#
+
+PORTNAME=	avahi
+PORTVERSION=	0.6.22
+CATEGORIES?=	net dns
+MASTER_SITES=	http://www.avahi.org/download/
+PKGNAMESUFFIX?=	-app
+
+MAINTAINER?=	ports at MidnightBSD.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 intltool
+USE_GETTEXT=	yes
+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
+
+USE_RC_SUBR=yes
+
+.include <bsd.port.pre.mk>
+
+.if ${AVAHI_SLAVE}=="autoipd"
+CONFIGURE_ARGS+=--enable-autoipd
+.else
+CONFIGURE_ARGS+=--disable-autoipd
+.endif
+.if ${AVAHI_SLAVE}=="gtk"
+CONFIGURE_ARGS+=--enable-gtk
+.else
+CONFIGURE_ARGS+=--disable-gtk
+.endif
+.if ${AVAHI_SLAVE}=="libdns"
+CONFIGURE_ARGS+=--enable-compat-libdns_sd
+.else
+CONFIGURE_ARGS+=--disable-compat-libdns_sd
+.endif
+.if ${AVAHI_SLAVE}=="python"
+CONFIGURE_ARGS+=--enable-python
+.else
+CONFIGURE_ARGS+=--disable-python
+.endif
+.if ${AVAHI_SLAVE}=="qt3"
+CONFIGURE_ARGS+=--enable-qt3
+.else
+CONFIGURE_ARGS+=--disable-qt3
+.endif
+.if ${AVAHI_SLAVE}=="qt4"
+CONFIGURE_ARGS+=--enable-qt4 \
+		--disable-expat \
+		--disable-gdbm
+.else
+CONFIGURE_ARGS+=--disable-qt4
+.endif
+.if ${AVAHI_SLAVE}=="sharp"
+CONFIGURE_ARGS+=--enable-mono
+.else
+CONFIGURE_ARGS+=--disable-mono
+.endif
+
+post-patch: avahi-post-patch
+
+avahi-post-patch:
+	@${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|' \
+		${WRKSRC}/man/*.*
+	@${RM} -f ${WRKSRC}/man/*.bak
+	@${REINPLACE_CMD} -e 's|-ldl||g ; s|netdev|network|g' \
+		${WRKSRC}/configure \
+		${WRKSRC}/avahi-client/Makefile.in \
+		${WRKSRC}/avahi-daemon/Makefile.in
+	@${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
+
+pre-su-install: avahi-pre-su-install
+
+avahi-pre-su-install:
+.if ${AVAHI_SLAVE}=="no"
+	@${MKDIR} ${PREFIX}/lib/avahi
+	@${TOUCH} -f ${PREFIX}/lib/avahi/.keep
+.endif
+
+post-install: avahi-post-install
+
+avahi-post-install:
+.if ${AVAHI_SLAVE}!="no"
+.for f in ${MAN1} ${MAN2} ${MAN3} ${MAN4} ${MAN5} ${MAN6} ${MAN7} ${MAN8} ${MAN9}
+	${INSTALL_DATA} ${WRKSRC}/man/${f} ${PREFIX}/man/man${f:E}/${f}
+.endfor
+.endif
+.for f in ${AVAHI_PKGCONFIG}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/libdata/pkgconfig
+.endfor
+.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>
--- /dev/null
+++ net/avahi-app/distinfo
@@ -0,0 +1,3 @@
+MD5 (avahi-0.6.22.tar.gz) = c84b1a8a23126e188426728710414dc8
+SHA256 (avahi-0.6.22.tar.gz) = 9dc6f870b6ce050059054a26bfc15d6e7a836fa299edd1b89c63c1089bfedd52
+SIZE (avahi-0.6.22.tar.gz) = 1199901
--- /dev/null
+++ net/avahi-qt3/pkg-descr
@@ -0,0 +1,3 @@
+Qt 3 bindings to the avahi mDNS service discovery system.
+
+WWW: http://www.avahi.org/
--- /dev/null
+++ 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
+ at dirrm include/avahi-qt3
--- /dev/null
+++ net/avahi-qt3/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for:	avahi-qt3
+# Date created:				12 April 2007
+# Whom:					Joe Marcus Clarke <marcus at FreeBSD.org>
+#
+# $MidnightBSD: mports/net/avahi-qt3/Makefile,v 1.1 2008/02/17 05:21:09 laffer1 Exp $
+# $FreeBSD: ports/net/avahi-qt3/Makefile,v 1.7 2007/12/23 20:29:49 marcus Exp $
+#    $MCom: ports/net/avahi-qt3/Makefile,v 1.1 2007/07/31 18:24:12 ahze Exp $
+
+PORTREVISION=	0
+CATEGORIES=	net
+PKGNAMESUFFIX=	-qt3
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	Qt 3 bindings to the Avahi mDNS system
+
+LIB_DEPENDS=	avahi-common.3:${PORTSDIR}/net/avahi-app
+
+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 intltool
+USE_QT_VER=	3
+AVAHI_PKGCONFIG=	avahi-qt3.pc
+
+.include "${MASTERDIR}/Makefile"


More information about the Midnightbsd-cvs mailing list