5 files changed, 24 insertions, 15 deletions

diff --git a/net/avahi/Makefile b/net/avahi/Makefile
index a5386af8e5e1..fc71986dc938 100644
--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/net/avahi/Makefile,v 1.15 2006/04/28 01:52:15 marcus Exp $
+#    $MCom: ports/net/avahi/Makefile,v 1.19 2006/10/12 16:44:41 marcus Exp $
 
 PORTNAME=	avahi
-PORTVERSION=	0.6.13
-PORTREVISION?=	3
+PORTVERSION=	0.6.14
+PORTREVISION?=	0
 CATEGORIES?=	net dns
 MASTER_SITES=	http://www.avahi.org/download/
 
@@ -16,13 +16,14 @@ COMMENT?=	Service discovery on a local network
 
 LIB_DEPENDS?=	expat.6:${PORTSDIR}/textproc/expat2 \
 		daemon.2:${PORTSDIR}/devel/libdaemon \
-		dbus-1.2:${PORTSDIR}/devel/dbus \
+		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
+USE_GETOPT_LONG=yes
 CONFIGURE_ARGS?=--with-distro=freebsd \
 		--with-dbus-system-address=unix:path=/var/run/dbus/dbus.pipe \
 		--disable-qt3 \
@@ -34,6 +35,7 @@ CONFIGURE_ARGS?=--with-distro=freebsd \
 		--disable-doxygen-dot \
 		--localstatedir=/var \
 		--enable-compat-howl \
+		--disable-autoipd \
 		--mandir=${PREFIX}/man
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
@@ -56,10 +58,6 @@ OPTIONS=	GTK2 "Build a GTK+ 2 browser utility" off \
 .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=""
diff --git a/net/avahi/distinfo b/net/avahi/distinfo
index 3a834eb6a204..8ab897bd5219 100644
--- a/net/avahi/distinfo
+++ b/net/avahi/distinfo
@@ -1,3 +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
+MD5 (avahi-0.6.14.tar.gz) = 6abad76bbc2ac0f51a8869b3a2e5c238
+SHA256 (avahi-0.6.14.tar.gz) = e599f03b2d493b492fc23f50c5fe7bbf78af90e79a0c6c8c2e6600048e71c2e6
+SIZE (avahi-0.6.14.tar.gz) = 923556
diff --git a/net/avahi/files/patch-Makefile.in b/net/avahi/files/patch-Makefile.in
index 19d2d7d3487b..18801509241b 100644
--- a/net/avahi/files/patch-Makefile.in
+++ b/net/avahi/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Tue May 16 11:50:31 2006
-+++ Makefile.in	Tue May 16 11:55:38 2006
-@@ -1043,21 +1043,29 @@
+--- 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' \
@@ -30,7 +30,7 @@
  @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 @@
+@@ -1082,6 +1089,8 @@ avahi-core.pc: avahi-core.pc.in
  @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' \
diff --git a/net/avahi/files/patch-avahi-core_dns.c b/net/avahi/files/patch-avahi-core_dns.c
new file mode 100644
index 000000000000..3c24721e58af
--- /dev/null
+++ b/net/avahi/files/patch-avahi-core_dns.c
@@ -0,0 +1,10 @@
+--- avahi-core/dns.c.orig	Thu Oct 12 12:43:19 2006
++++ avahi-core/dns.c	Thu Oct 12 12:43:31 2006
+@@ -28,6 +28,7 @@
+ #include <stdio.h>
+ #include <assert.h>
+ 
++#include <sys/types.h>
+ #include <netinet/in.h>
+ 
+ #include <avahi-common/defs.h>
diff --git a/net/avahi/pkg-plist b/net/avahi/pkg-plist
index e82e0f93da1c..242c7b2b83c0 100644
--- a/net/avahi/pkg-plist
+++ b/net/avahi/pkg-plist
@@ -11,6 +11,7 @@ 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