21 files changed, 184 insertions, 129 deletions

diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
index f7ae43e746de..62a431aeba43 100644
--- a/net/avahi-app/Makefile
+++ b/net/avahi-app/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	avahi
-PORTVERSION=	0.6.22
-PORTREVISION?=	5
+PORTVERSION=	0.6.23
+PORTREVISION?=	0
 CATEGORIES?=	net dns
 MASTER_SITES=	http://www.avahi.org/download/
 PKGNAMESUFFIX?=	-app
@@ -29,7 +29,7 @@ USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
 AVAHI_SLAVE?=	no
 CONFIGURE_ARGS?=--with-distro=freebsd \
-		--with-dbus-system-address=unix:path=/var/run/dbus/system_bus_socket \
+		--with-dbus-system-socket=unix:path=/var/run/dbus/system_bus_socket \
 		--disable-monodoc \
 		--disable-doxygen-doc \
 		--disable-doxygen-dot \
@@ -60,9 +60,6 @@ USE_RC_SUBR=yes
 
 .if ${AVAHI_SLAVE}=="autoipd"
 CONFIGURE_ARGS+=--enable-autoipd
-.if ${OSVERSION} < 600000
-IGNORE=	${PORTNAME} does not build with libpcap from FreeBSD ${OSVERSION}
-.endif
 .else
 CONFIGURE_ARGS+=--disable-autoipd
 .endif
@@ -116,6 +113,8 @@ avahi-post-patch:
 	@${REINPLACE_CMD} -e 's|dbus_connection_disconnect|dbus_connection_close|g' \
 	    	${WRKSRC}/avahi-client/client.c \
 		${WRKSRC}/avahi-daemon/dbus-protocol.c
+	@${REINPLACE_CMD} -e 's|^_||g' \
+		${WRKSRC}/avahi-ui/*.desktop.in
 
 post-build: avahi-post-build
 
diff --git a/net/avahi-app/distinfo b/net/avahi-app/distinfo
index 258a9c7d030d..11fb8de045d0 100644
--- a/net/avahi-app/distinfo
+++ b/net/avahi-app/distinfo
@@ -1,3 +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
+MD5 (avahi-0.6.23.tar.gz) = aab1a304851d8145ea5f6a85c10af9e9
+SHA256 (avahi-0.6.23.tar.gz) = dedf5325105f071e5d9f898fdb7337a7fe88a3a8a1f832a6056ba00477b8cc3d
+SIZE (avahi-0.6.23.tar.gz) = 1104410
diff --git a/net/avahi-app/files/patch-avahi-common_Makefile.in b/net/avahi-app/files/patch-avahi-common_Makefile.in
index e30b7e2af7c2..6e020b0ade54 100644
--- a/net/avahi-app/files/patch-avahi-common_Makefile.in
+++ b/net/avahi-app/files/patch-avahi-common_Makefile.in
@@ -1,11 +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 = \
+--- avahi-common/Makefile.in.orig	2008-07-03 14:21:02.000000000 -0500
++++ avahi-common/Makefile.in	2008-07-03 14:22:16.000000000 -0500
+@@ -487,7 +487,7 @@
  	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)
+ libavahi_common_la_LDFLAGS = $(AM_LDFLAGS)  -version-info $(LIBAVAHI_COMMON_VERSION_INFO)
  strlst_test_SOURCES = \
  	strlst.c strlst.h \
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
index f111db2ab974..d3719ce74aab 100644
--- a/net/avahi-app/files/patch-avahi-compat-libdns_sd_Makefile.in
+++ b/net/avahi-app/files/patch-avahi-compat-libdns_sd_Makefile.in
@@ -1,6 +1,6 @@
---- 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 @@
+--- avahi-compat-libdns_sd/Makefile.in.orig	2008-07-03 14:23:56.000000000 -0500
++++ avahi-compat-libdns_sd/Makefile.in	2008-07-03 14:31:19.000000000 -0500
+@@ -106,9 +106,7 @@
  null_test_OBJECTS = $(am_null_test_OBJECTS)
  am__DEPENDENCIES_1 =
  @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@@ -8,28 +8,29 @@
 -@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) \
+ null_test_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(null_test_CFLAGS) \
+ 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+@@ -118,8 +116,7 @@
  @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 @@
+ txt_test_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=link $(CCLD) $(txt_test_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ 	$(LDFLAGS) -o $@
+@@ -411,7 +408,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@libdns_sd_la_LDFLAGS = $(AM_LDFLAGS)  -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)  -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 @@
+@@ -419,7 +416,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)
@@ -38,7 +39,7 @@
  @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 @@
+@@ -427,7 +424,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)
@@ -47,7 +48,7 @@
  @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@CLEANFILES = libdns_sd-test.o libdns_sd-test
  all: all-am
  
-@@ -883,7 +880,7 @@
+@@ -870,7 +867,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 
diff --git a/net/avahi-app/files/patch-avahi-daemon_Makefile.in b/net/avahi-app/files/patch-avahi-daemon_Makefile.in
index d1bec2793f4d..4bf12250c436 100644
--- a/net/avahi-app/files/patch-avahi-daemon_Makefile.in
+++ b/net/avahi-app/files/patch-avahi-daemon_Makefile.in
@@ -1,11 +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 @@
+--- avahi-daemon/Makefile.in.orig	2008-07-03 14:32:45.000000000 -0500
++++ avahi-daemon/Makefile.in	2008-07-03 14:33:25.000000000 -0500
+@@ -622,7 +622,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)
+-	$(avahi_daemon_LINK) $(avahi_daemon_OBJECTS) $(avahi_daemon_LDADD) $(LIBS)
++	$(avahi_daemon_LINK) $(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)
+ 	$(ini_file_parser_test_LINK) $(ini_file_parser_test_OBJECTS) $(ini_file_parser_test_LDADD) $(LIBS)
diff --git a/net/avahi-app/files/patch-avahi-discover-standalone_Makefile.in b/net/avahi-app/files/patch-avahi-discover-standalone_Makefile.in
index 70562fd5aa4e..7a9f57b6b937 100644
--- a/net/avahi-app/files/patch-avahi-discover-standalone_Makefile.in
+++ b/net/avahi-app/files/patch-avahi-discover-standalone_Makefile.in
@@ -1,24 +1,25 @@
---- 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 @@
+--- avahi-discover-standalone/Makefile.in.orig	2008-07-03 14:34:40.000000000 -0500
++++ avahi-discover-standalone/Makefile.in	2008-07-03 14:36:09.000000000 -0500
+@@ -79,9 +79,7 @@
+ avahi_discover_standalone_OBJECTS =  \
  	$(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_GLIB_TRUE@@HAVE_GTK_TRUE@avahi_discover_standalone_DEPENDENCIES = ../avahi-common/libavahi-common.la \
+-@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	../avahi-glib/libavahi-glib.la \
+-@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	../avahi-core/libavahi-core.la \
++@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@avahi_discover_standalone_DEPENDENCIES = \
+ @HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1) \
+ @HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1) \
+ @HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1)
+@@ -381,10 +379,7 @@
+ @HAVE_GLIB_TRUE@@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_GLIB_TRUE@@HAVE_GTK_TRUE@avahi_discover_standalone_LDADD = \
+-@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	$(AM_LDADD) \
+-@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	../avahi-common/libavahi-common.la \
+-@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	../avahi-glib/libavahi-glib.la \
+-@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	../avahi-core/libavahi-core.la  \
++@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	$(AM_LDADD) `$(PKG_CONFIG) --cflags --libs avahi-client avahi-core avahi-glib` \
+ @HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	$(GLIB20_LIBS) $(GTK20_LIBS) $(GLADE20_LIBS)
  
- @HAVE_GTK_FALSE@@HAVE_PYTHON_DBUS_TRUE@interfaces_DATA = $(interfaces)
+ @HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@interfaces_DATA = $(interfaces)
diff --git a/net/avahi-app/files/patch-avahi-qt_Makefile.in b/net/avahi-app/files/patch-avahi-qt_Makefile.in
index 5788e2399dd5..8f1dc3039c26 100644
--- a/net/avahi-app/files/patch-avahi-qt_Makefile.in
+++ b/net/avahi-app/files/patch-avahi-qt_Makefile.in
@@ -1,6 +1,6 @@
---- 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)
+--- avahi-qt/Makefile.in.orig	2008-07-03 14:37:05.000000000 -0500
++++ avahi-qt/Makefile.in	2008-07-03 14:39:27.000000000 -0500
+@@ -93,7 +93,6 @@
  LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
  @HAVE_QT3_TRUE@libavahi_qt3_la_DEPENDENCIES =  \
@@ -8,29 +8,29 @@
  @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)
+@@ -104,7 +103,6 @@
+ 	$(CXXFLAGS) $(libavahi_qt3_la_LDFLAGS) $(LDFLAGS) -o $@
  @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
+@@ -400,7 +398,7 @@
  @HAVE_QT3_TRUE@	qt-watch.cpp 
  
- @HAVE_QT3_TRUE@libavahi_qt3_la_CPPFLAGS = $(AM_CFLAGS) $(QT3_CFLAGS)
+ @HAVE_QT3_TRUE@libavahi_qt3_la_CPPFLAGS = $(AM_CFLAGS) $(QT3_CFLAGS) $(VISIBILITY_HIDDEN_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
+@@ -410,7 +408,7 @@
  @HAVE_QT4_TRUE@	qt-watch.cpp 
  
- @HAVE_QT4_TRUE@libavahi_qt4_la_CPPFLAGS = $(AM_CFLAGS) $(QT4_CFLAGS) -DQT4
+ @HAVE_QT4_TRUE@libavahi_qt4_la_CPPFLAGS = $(AM_CFLAGS) $(QT4_CFLAGS) -DQT4 $(VISIBILITY_HIDDEN_CFLAGS)
 -@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)
+ @HAVE_QT4_TRUE@libavahi_qt4_la_LDFLAGS = $(AM_LDFLAGS) -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
index 531e506687df..7b053ff1d712 100644
--- a/net/avahi-app/files/patch-avahi-ui_Makefile.in
+++ b/net/avahi-app/files/patch-avahi-ui_Makefile.in
@@ -1,40 +1,41 @@
---- 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 @@
+--- avahi-ui/Makefile.in.orig	2008-07-03 14:43:40.000000000 -0500
++++ avahi-ui/Makefile.in	2008-07-03 14:45:39.000000000 -0500
+@@ -92,9 +92,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)
+-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@libavahi_ui_la_DEPENDENCIES = ../avahi-common/libavahi-common.la \
+-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	../avahi-client/libavahi-client.la \
+-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	../avahi-glib/libavahi-glib.la \
++@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@libavahi_ui_la_DEPENDENCIES =  \
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1) \
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1)
  am__libavahi_ui_la_SOURCES_DIST = avahi-ui.h avahi-ui.c \
-@@ -112,8 +110,6 @@
+@@ -117,8 +115,6 @@
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@am_bssh_OBJECTS = bssh-bssh.$(OBJEXT)
  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
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@bssh_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	../avahi-client/libavahi-client.la \
+-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	../avahi-common/libavahi-common.la \
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	libavahi-ui.la
+ bssh_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=link $(CCLD) $(bssh_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+@@ -424,16 +420,13 @@
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	$(am__append_2) \
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	$(am__append_5)
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@libavahi_ui_la_LIBADD =  \
+-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	$(AM_LDADD) \
+-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	../avahi-common/libavahi-common.la \
+-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	../avahi-client/libavahi-client.la \
+-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	../avahi-glib/libavahi-glib.la \
++@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	$(AM_LDADD) `$(PKG_CONFIG) --cflags --libs avahi-client avahi-core avahi-glib` \
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	$(GTK20_LIBS) \
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	$(am__append_3)
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@libavahi_ui_la_LDFLAGS = $(AM_LDFLAGS)  -version-info $(LIBAVAHI_UI_VERSION_INFO)
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@bssh_SOURCES = bssh.c
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@bssh_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS)
+-@HAVE_DBUS_TRUE@@HAVE_GLIB_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_GLIB_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-utils_Makefile.in b/net/avahi-app/files/patch-avahi-utils_Makefile.in
index 9505c4fbe03e..60dead5742fa 100644
--- a/net/avahi-app/files/patch-avahi-utils_Makefile.in
+++ b/net/avahi-app/files/patch-avahi-utils_Makefile.in
@@ -1,23 +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 @@
+--- avahi-utils/Makefile.in.orig	2008-07-03 14:46:57.000000000 -0500
++++ avahi-utils/Makefile.in	2008-07-03 14:48:35.000000000 -0500
+@@ -489,16 +489,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_browse_LINK) $(avahi_browse_OBJECTS) $(avahi_browse_LDADD) $(LIBS)
++	$(avahi_browse_LINK) $(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_publish_LINK) $(avahi_publish_OBJECTS) $(avahi_publish_LDADD) $(LIBS)
++	$(avahi_publish_LINK) $(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_resolve_LINK) $(avahi_resolve_OBJECTS) $(avahi_resolve_LDADD) $(LIBS)
++	$(avahi_resolve_LINK) $(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)
+-	$(avahi_set_host_name_LINK) $(avahi_set_host_name_OBJECTS) $(avahi_set_host_name_LDADD) $(LIBS)
++	$(avahi_set_host_name_LINK) $(avahi_set_host_name_OBJECTS) $(avahi_set_host_name_LDADD) $(LIBS) $(INTLLIBS)
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
diff --git a/net/avahi-app/files/patch-dnsconfd_Makefile.in b/net/avahi-app/files/patch-dnsconfd_Makefile.in
index 22e8ddb7ad1a..868bb8b7a98a 100644
--- a/net/avahi-app/files/patch-dnsconfd_Makefile.in
+++ b/net/avahi-app/files/patch-dnsconfd_Makefile.in
@@ -1,11 +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 @@
+--- avahi-dnsconfd/Makefile.in.orig	2008-07-03 14:49:59.000000000 -0500
++++ avahi-dnsconfd/Makefile.in	2008-07-03 14:50:02.000000000 -0500
+@@ -432,7 +432,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)
+-	$(avahi_dnsconfd_LINK) $(avahi_dnsconfd_OBJECTS) $(avahi_dnsconfd_LDADD) $(LIBS)
++	$(avahi_dnsconfd_LINK) $(avahi_dnsconfd_OBJECTS) $(avahi_dnsconfd_LDADD) $(LIBS) $(INTLLIBS)
  install-pkgsysconfSCRIPTS: $(pkgsysconf_SCRIPTS)
  	@$(NORMAL_INSTALL)
- 	test -z "$(pkgsysconfdir)" || $(mkdir_p) "$(DESTDIR)$(pkgsysconfdir)"
+ 	test -z "$(pkgsysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgsysconfdir)"
diff --git a/net/avahi-app/files/patch-initscript_freebsd_Makefile.in b/net/avahi-app/files/patch-initscript_freebsd_Makefile.in
new file mode 100644
index 000000000000..2b80f6c20b55
--- /dev/null
+++ b/net/avahi-app/files/patch-initscript_freebsd_Makefile.in
@@ -0,0 +1,33 @@
+--- initscript/freebsd/Makefile.in.orig	2008-07-03 15:05:53.000000000 -0500
++++ initscript/freebsd/Makefile.in	2008-07-03 15:07:05.000000000 -0500
+@@ -333,12 +333,12 @@
+ 	avahi-dnsconfd.sh.in
+ 
+ initd_SCRIPTS = \
+-	avahi-daemon.sh \
+-	avahi-dnsconfd.sh
++	avahi-daemon \
++	avahi-dnsconfd
+ 
+ CLEANFILES = \
+-	avahi-daemon.sh \
+-	avahi-dnsconfd.sh
++	avahi-daemon \
++	avahi-dnsconfd
+ 
+ all: all-am
+ 
+@@ -531,11 +531,11 @@
+ 	uninstall uninstall-am uninstall-initdSCRIPTS
+ 
+ 
+-avahi-daemon.sh: avahi-daemon.sh.in
++avahi-daemon: avahi-daemon.sh.in
+ 	sed -e 's,@sbindir\@,$(sbindir),g' $< > $@
+ 	chmod +x $@
+ 
+-avahi-dnsconfd.sh: avahi-dnsconfd.sh.in
++avahi-dnsconfd: avahi-dnsconfd.sh.in
+ 	sed \
+ 	-e 's,@sbindir\@,$(sbindir),g' \
+ 	-e 's,@sysconfdir\@,$(sysconfdir),g' \
diff --git a/net/avahi-app/pkg-plist b/net/avahi-app/pkg-plist
index 72475a8b23d8..bf08432dcc01 100644
--- a/net/avahi-app/pkg-plist
+++ b/net/avahi-app/pkg-plist
@@ -13,8 +13,8 @@ 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
+etc/rc.d/avahi-daemon
+etc/rc.d/avahi-dnsconfd
 include/avahi-client/client.h
 include/avahi-client/lookup.h
 include/avahi-client/publish.h
@@ -110,6 +110,22 @@ sbin/avahi-dnsconfd
 %%DATADIR%%/introspection/ServiceTypeBrowser.introspect
 %%DATADIR%%/service-types
 share/locale/de/LC_MESSAGES/avahi.mo
+share/locale/en_AU/LC_MESSAGES/avahi.mo
+share/locale/en_CA/LC_MESSAGES/avahi.mo
+share/locale/en_GB/LC_MESSAGES/avahi.mo
+share/locale/en_NZ/LC_MESSAGES/avahi.mo
+share/locale/fr/LC_MESSAGES/avahi.mo
+share/locale/it/LC_MESSAGES/avahi.mo
+share/locale/pl/LC_MESSAGES/avahi.mo
+share/locale/pt_BR/LC_MESSAGES/avahi.mo
+share/locale/ru/LC_MESSAGES/avahi.mo
+share/locale/sr/LC_MESSAGES/avahi.mo
+share/locale/sr@latin/LC_MESSAGES/avahi.mo
+share/locale/zh_CN/LC_MESSAGES/avahi.mo
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/en_NZ/LC_MESSAGES
+@dirrmtry share/locale/en_NZ
 @dirrm %%DATADIR%%/introspection
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
diff --git a/net/avahi-autoipd/Makefile b/net/avahi-autoipd/Makefile
index 0b8834fd7bcf..1ff1e860abd8 100644
--- a/net/avahi-autoipd/Makefile
+++ b/net/avahi-autoipd/Makefile
@@ -3,9 +3,10 @@
 # Whom:					Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/net/avahi-autoipd/Makefile,v 1.1 2007/07/31 18:24:12 ahze Exp $
+#   $MCom: ports/net/avahi-autoipd/Makefile,v 1.1 2007/07/31 18:24:12 ahze Exp $
+#
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	net
 PKGNAMESUFFIX=	-autoipd
 
diff --git a/net/avahi-gtk/Makefile b/net/avahi-gtk/Makefile
index f409c188b903..6a0aa52c43de 100644
--- a/net/avahi-gtk/Makefile
+++ b/net/avahi-gtk/Makefile
@@ -3,9 +3,10 @@
 # Whom:					Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/net/avahi-gtk/Makefile,v 1.2 2007/09/12 12:41:45 ahze Exp $
+#   $MCom: ports/net/avahi-gtk/Makefile,v 1.2 2007/09/12 12:41:45 ahze Exp $
+#
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	net
 PKGNAMESUFFIX=	-gtk
 
diff --git a/net/avahi-libdns/Makefile b/net/avahi-libdns/Makefile
index 83accded96c2..b7121c4016c8 100644
--- a/net/avahi-libdns/Makefile
+++ b/net/avahi-libdns/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	net
 PKGNAMESUFFIX=	-libdns
 
diff --git a/net/avahi-qt3/Makefile b/net/avahi-qt3/Makefile
index 1a0f30bb3230..b2f784b2ed27 100644
--- a/net/avahi-qt3/Makefile
+++ b/net/avahi-qt3/Makefile
@@ -3,9 +3,10 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/net/avahi-qt3/Makefile,v 1.1 2007/07/31 18:24:12 ahze Exp $
+#   $MCom: ports/net/avahi-qt3/Makefile,v 1.1 2007/07/31 18:24:12 ahze Exp $
+#
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	net
 PKGNAMESUFFIX=	-qt3
 
diff --git a/net/avahi-qt4/Makefile b/net/avahi-qt4/Makefile
index e998ec37d9a9..32459da451a6 100644
--- a/net/avahi-qt4/Makefile
+++ b/net/avahi-qt4/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	net
 PKGNAMESUFFIX=	-qt4
 
diff --git a/net/avahi-sharp/Makefile b/net/avahi-sharp/Makefile
index d22a8ef054f5..d1515a3a73b7 100644
--- a/net/avahi-sharp/Makefile
+++ b/net/avahi-sharp/Makefile
@@ -6,7 +6,7 @@
 #   $Id: Makefile,v 1.2 2006/02/15 19:15:40 tmclau02 Exp $
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	net dns
 PKGNAMESUFFIX=	-sharp
 
diff --git a/net/avahi/Makefile b/net/avahi/Makefile
index 93d3147f5696..e4165ca1adbe 100644
--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	avahi
-PORTVERSION=	0.6.22
-PORTREVISION?=	1
+PORTVERSION=	0.6.23
+PORTREVISION?=	0
 CATEGORIES?=	net dns
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/net/py-avahi/Makefile b/net/py-avahi/Makefile
index a93325a20e42..d026b5b740b2 100644
--- a/net/py-avahi/Makefile
+++ b/net/py-avahi/Makefile
@@ -3,9 +3,10 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/net/py-avahi/Makefile,v 1.4 2007/07/31 18:24:13 ahze Exp $
+#   $MCom: ports/net/py-avahi/Makefile,v 1.4 2007/07/31 18:24:13 ahze Exp $
+#
 
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	net gnome python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	# empty
diff --git a/net/py-avahi/pkg-plist b/net/py-avahi/pkg-plist
index 3a8c2ac4d1f0..67b220387108 100644
--- a/net/py-avahi/pkg-plist
+++ b/net/py-avahi/pkg-plist
@@ -14,7 +14,7 @@ bin/avahi-discover
 %%PYTHON_SITELIBDIR%%/avahi_discover/__init__.pyo
 share/applications/avahi-discover.desktop
 %%DATADIR%%/service-types.db
-@dirrmtry share/applications
 @dirrm %%DATADIR%%
+@dirrmtry share/applications
 @dirrm %%PYTHON_SITELIBDIR%%/avahi_discover
 @dirrm %%PYTHON_SITELIBDIR%%/avahi