Update to 0.6.1.

5 files changed, 4 insertions, 91 deletions

diff --git a/net/avahi/Makefile b/net/avahi/Makefile
index abfa10a81073..72b1247870da 100644
--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	avahi
-PORTVERSION=	0.6
-PORTREVISION=	2
+PORTVERSION=	0.6.1
 CATEGORIES=	net dns
 MASTER_SITES=	http://www.freedesktop.org/~lennart/
 
@@ -35,7 +34,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 USE_RC_SUBR=	yes
-FILES_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 MAN1=	avahi-browse-domains.1 avahi-browse.1 avahi-publish-address.1 \
 	avahi-publish-service.1 avahi-publish.1 avahi-resolve-address.1 \
@@ -59,17 +57,9 @@ CONFIGURE_ARGS+=--disable-gtk
 PLIST_SUB+=	GTK="@comment "
 .endif
 
-post-configure:
-	@${SED} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/avahi-daemon.sh > ${WRKDIR}/avahi-daemon.sh
-	@${SED} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/avahi-dnsconfd.sh > ${WRKDIR}/avahi-dnsconfd.sh
-
 post-install:
 .if !defined(PACKAGE_BUILDING)
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
-	${INSTALL_SCRIPT} ${WRKDIR}/avahi-daemon.sh ${PREFIX}/etc/rc.d
-	${INSTALL_SCRIPT} ${WRKDIR}/avahi-dnsconfd.sh ${PREFIX}/etc/rc.d
 
 .include <bsd.port.post.mk>
diff --git a/net/avahi/distinfo b/net/avahi/distinfo
index 350b0e9c7fd7..82a85bb0bf0d 100644
--- a/net/avahi/distinfo
+++ b/net/avahi/distinfo
@@ -1,3 +1,3 @@
-MD5 (avahi-0.6.tar.gz) = 297c87077f5a0462f5cdb656351702e8
-SHA256 (avahi-0.6.tar.gz) = 455807d3f574d9d81f0d78c97a4102c827b69359767aae9da96e2aa1a67b4357
-SIZE (avahi-0.6.tar.gz) = 844657
+MD5 (avahi-0.6.1.tar.gz) = 330613902c59bd597f140a8254e9f4ec
+SHA256 (avahi-0.6.1.tar.gz) = 2b6bcb3aa7d2c6f737f3e3949ce5084a707148d8079fa1d6c8f561dad91a63dc
+SIZE (avahi-0.6.1.tar.gz) = 850021
diff --git a/net/avahi/files/avahi-daemon.sh b/net/avahi/files/avahi-daemon.sh
deleted file mode 100644
index 95d90e3ee402..000000000000
--- a/net/avahi/files/avahi-daemon.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: avahi_daemon
-# REQUIRE: DAEMON dbus
-# KEYWORD: FreeBSD
-#
-# Avahi's mDNSResponder, a Zeroconf (Bonjour) service advertisement daemon.
-#
-
-avahi_daemon_enable=${avahi_daemon_enable-"NO"}
-avahi_daemon_flags=${avahi_daemon_flags-"-D"}
-
-. %%RC_SUBR%%
-
-name=avahi_daemon
-rcvar=`set_rcvar`
-
-start_cmd=avahi_daemon_start
-stop_cmd=avahi_daemon_stop
-
-avahi_daemon_bin=%%PREFIX%%/sbin/avahi-daemon
-
-avahi_daemon_start() {
-    checkyesno avahi_daemon_enable && echo "Starting avahi-daemon." && \
-    	${avahi_daemon_bin} ${avahi_daemon_flags}
-}
-
-avahi_daemon_stop() {
-    checkyesno avahi_daemon_enable && echo "Stopping avahi-daemon." && \
-    	${avahi_daemon_bin} -k
-}
-
-load_rc_config ${name}
-run_rc_command "$1"
diff --git a/net/avahi/files/avahi-dnsconfd.sh b/net/avahi/files/avahi-dnsconfd.sh
deleted file mode 100644
index ad9f3e5b2dad..000000000000
--- a/net/avahi/files/avahi-dnsconfd.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: avahi_dnsconfd
-# REQUIRE: DAEMON dbus avahi_daemon
-# KEYWORD: FreeBSD
-#
-# avahi-dnsconfd connects to a running avahi-daemon and runs  the script
-# %%PREFIX%%/etc/avahi/dnsconf.action for each unicast DNS server that
-# is announced on the local LAN. This is useful for configuring unicast
-# DNS servers in a DHCP-like fashion with mDNS.
-#
-
-avahi_dnsconfd_enable=${avahi_dnsconfd_enable-"NO"}
-avahi_dnsconfd_flags=${avahi_dnsconfd_flags-"-D"}
-
-. %%RC_SUBR%%
-
-name=avahi_dnsconfd
-rcvar=`set_rcvar`
-
-start_cmd=avahi_dnsconfd_start
-stop_cmd=avahi_dnsconfd_stop
-
-avahi_dnsconfd_bin=%%PREFIX%%/sbin/avahi-dnsconfd
-
-avahi_dnsconfd_start() {
-    checkyesno avahi_dnsconfd_enable && echo "Starting avahi-dnsconfd." && \
-    	${avahi_dnsconfd_bin} ${avahi_dnsconfd_flags}
-}
-
-avahi_dnsconfd_stop() {
-    checkyesno avahi_dnsconfd_enable && echo "Stopping avahi-dnsconfd." && \
-    	${avahi_dnsconfd_bin} -k
-}
-
-load_rc_config ${name}
-run_rc_command "$1"
diff --git a/net/avahi/pkg-plist b/net/avahi/pkg-plist
index c4f1d51ddcd4..d96585689407 100644
--- a/net/avahi/pkg-plist
+++ b/net/avahi/pkg-plist
@@ -50,8 +50,6 @@ lib/libavahi-glib.a
 lib/libavahi-glib.so
 lib/libavahi-glib.so.1
 libdata/pkgconfig/avahi-client.pc
-libdata/pkgconfig/avahi-compat-howl.pc
-libdata/pkgconfig/avahi-compat-libdns_sd.pc
 libdata/pkgconfig/avahi-core.pc
 libdata/pkgconfig/avahi-glib.pc
 sbin/avahi-daemon