Chase the dbus update.

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

12 files changed, 361 insertions, 0 deletions

diff --git a/net/avahi/Makefile b/net/avahi/Makefile
new file mode 100644
index 000000000..5c48dff09
--- /dev/null
+++ b/net/avahi/Makefile
@@ -0,0 +1,94 @@
+# 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.13
+PORTREVISION?=	4
+CATEGORIES?=	net dns
+MASTER_SITES=	http://www.avahi.org/download/
+
+MAINTAINER?=	gnome@FreeBSD.org
+COMMENT?=	Service discovery on a local network
+
+LIB_DEPENDS?=	expat.6:${PORTSDIR}/textproc/expat2 \
+		daemon.2:${PORTSDIR}/devel/libdaemon \
+		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+		gdbm.3:${PORTSDIR}/databases/gdbm
+
+USE_GNOME?=	gnomehack ltverhack glib20
+USE_GMAKE=	yes
+USE_AUTOTOOLS=	libtool:15
+USE_LDCONFIG=	yes
+CONFIGURE_ARGS?=--with-distro=freebsd \
+		--with-dbus-system-address=unix:path=/var/run/dbus/dbus.pipe \
+		--disable-qt3 \
+		--disable-qt4 \
+		--disable-python \
+		--disable-mono \
+		--disable-monodoc \
+		--disable-doxygen-doc \
+		--disable-doxygen-dot \
+		--localstatedir=/var \
+		--enable-compat-howl \
+		--mandir=${PREFIX}/man
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		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
+
+OPTIONS=	GTK2 "Build a GTK+ 2 browser utility" off \
+		LIBDNS "Enable mDNSResponder compatibility" off
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if !defined(AVAHI_SLAVE)
+.if ${OSVERSION} < 500000
+IGNORE=	does not work on FreeBSD 4.X
+.endif
+
+.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
+
+post-install:
+.if !defined(PACKAGE_BUILDING)
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.endif
+
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/net/avahi/distinfo b/net/avahi/distinfo
new file mode 100644
index 000000000..3a834eb6a
--- /dev/null
+++ b/net/avahi/distinfo
@@ -0,0 +1,3 @@
+MD5 (avahi-0.6.13.tar.gz) = d1000689979105cc95b9ca102284aae4
+SHA256 (avahi-0.6.13.tar.gz) = 5e10afd1d3e98eac31ac0a4bdab63e6672b66a4bfd192eb700e6d3903be7b4b9
+SIZE (avahi-0.6.13.tar.gz) = 895380
diff --git a/net/avahi/files/patch-Makefile.in b/net/avahi/files/patch-Makefile.in
new file mode 100644
index 000000000..19d2d7d34
--- /dev/null
+++ b/net/avahi/files/patch-Makefile.in
@@ -0,0 +1,41 @@
+--- Makefile.in.orig	Tue May 16 11:50:31 2006
++++ Makefile.in	Tue May 16 11:55:38 2006
+@@ -1043,21 +1043,29 @@
+ 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
+@@ -1068,6 +1076,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_QT3_TRUE@avahi-qt3.pc: avahi-qt3.pc.in
diff --git a/net/avahi/files/patch-avahi-client.pc.in b/net/avahi/files/patch-avahi-client.pc.in
new file mode 100644
index 000000000..e980e52e0
--- /dev/null
+++ b/net/avahi/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/files/patch-avahi-compat-howl.pc.in b/net/avahi/files/patch-avahi-compat-howl.pc.in
new file mode 100644
index 000000000..f101cc1da
--- /dev/null
+++ b/net/avahi/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/files/patch-avahi-compat-libdns_sd.pc.in b/net/avahi/files/patch-avahi-compat-libdns_sd.pc.in
new file mode 100644
index 000000000..8487c1b5a
--- /dev/null
+++ b/net/avahi/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/files/patch-avahi-core.pc.in b/net/avahi/files/patch-avahi-core.pc.in
new file mode 100644
index 000000000..fdde41be9
--- /dev/null
+++ b/net/avahi/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/files/patch-avahi-glib.pc.in b/net/avahi/files/patch-avahi-glib.pc.in
new file mode 100644
index 000000000..e2633c32d
--- /dev/null
+++ b/net/avahi/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/files/patch-configure b/net/avahi/files/patch-configure
new file mode 100644
index 000000000..ab78027c6
--- /dev/null
+++ b/net/avahi/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Sun Sep  3 12:31:45 2006
++++ configure	Sun Sep  3 12:32:34 2006
+@@ -20559,6 +20559,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
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/avahi/pkg-install b/net/avahi/pkg-install
new file mode 100644
index 000000000..9bbd14bce
--- /dev/null
+++ b/net/avahi/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/pkg-plist b/net/avahi/pkg-plist
new file mode 100644
index 000000000..e82e0f93d
--- /dev/null
+++ b/net/avahi/pkg-plist
@@ -0,0 +1,120 @@
+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
+etc/avahi/avahi-daemon.conf
+etc/avahi/avahi-dnsconfd.action
+etc/avahi/hosts
+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
+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.4
+lib/libavahi-glib.a
+lib/libavahi-glib.la
+lib/libavahi-glib.so
+lib/libavahi-glib.so.1
+%%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
+sbin/avahi-daemon
+sbin/avahi-dnsconfd
+%%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
+@dirrm %%DATADIR%%/introspection
+%%GTK%%@dirrm %%DATADIR%%/interfaces
+@dirrm %%DATADIR%%
+@dirrm include/avahi-glib
+@dirrm include/avahi-core
+%%LIBDNS%%@dirrm include/avahi-compat-libdns_sd
+@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