Merged into ports + removal of obsolete Qt3 port.

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

41 files changed, 0 insertions, 1128 deletions

diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
deleted file mode 100644
index 12b36f4fe..000000000
--- a/net/avahi-app/Makefile
+++ /dev/null
@@ -1,175 +0,0 @@
-# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-# $FreeBSD$
-#   $MCom$
-
-PORTNAME=	avahi
-PORTVERSION=	0.6.31
-PORTREVISION?=	0
-CATEGORIES?=	net dns
-MASTER_SITES=	http://www.avahi.org/download/
-PKGNAMESUFFIX?=	-app
-
-MAINTAINER?=	gnome@FreeBSD.org
-COMMENT?=	Service discovery on a local network
-
-AVAHI_SLAVE?=	no
-
-.if ${AVAHI_SLAVE}!="header"
-LIB_DEPENDS?=	expat:${PORTSDIR}/textproc/expat2 \
-		daemon:${PORTSDIR}/devel/libdaemon \
-		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
-		gdbm:${PORTSDIR}/databases/gdbm
-
-USERS?=		${PORTNAME}
-GROUPS?=	${USERS}
-
-USE_GNOME+=	ltverhack glib20 intltool introspection
-USES+=		gettext pathfix pkgconfig
-USE_GNOME_SUBR=	yes
-USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool
-USE_LDCONFIG=	yes
-CONFIGURE_ARGS?=--with-distro=freebsd \
-		--with-dbus-system-socket=unix:path=/var/run/dbus/system_bus_socket \
-		--disable-monodoc \
-		--disable-doxygen-doc \
-		--disable-doxygen-dot \
-		--localstatedir=/var \
-		--enable-compat-howl
-CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
-CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_KQUEUE
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-.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
-
-DAEMON_CONFIG_FILES=	hosts avahi-daemon.conf
-.endif
-
-USE_RC_SUBR=yes
-.endif # avahi-header
-
-.include <bsd.port.pre.mk>
-.if ${AVAHI_SLAVE}!="header"
-.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}=="gtk3"
-CONFIGURE_ARGS+=--enable-gtk3
-.else
-CONFIGURE_ARGS+=--disable-gtk3
-.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|have_inotify=yes|have_inotify=no|' \
-		${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \
-	    	${REINPLACE_CMD} -e 's|(LIBINTL)|(INTLLIBS)|g ; \
-		s|(LIBICONV)|(LTLIBICONV)|g'
-	@${REINPLACE_CMD} -e 's|%%RC_SUBR%%|/etc/rc.subr| ; \
-	    	s|%%GNOME_SUBR%%|${GNOME_SUBR}|' \
-		${WRKSRC}/initscript/freebsd/avahi-dnsconfd.sh.in \
-		${WRKSRC}/initscript/freebsd/avahi-daemon.sh.in
-	@${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.in
-	@${REINPLACE_CMD} -e 's|am: install-avahiincludeHEADERS|am:|g' \
-			${WRKSRC}/avahi-ui/Makefile.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
-	${MKDIR} ${PREFIX}/etc/avahi
-.for f in ${DAEMON_CONFIG_FILES}
-	${INSTALL_DATA} ${WRKSRC}/avahi-daemon/${f} \
-	    	${PREFIX}/etc/avahi/${f}.dist
-	if [ ! -f ${PREFIX}/etc/avahi/${f} ]; then \
-	    	${INSTALL_DATA} ${WRKSRC}/avahi-daemon/${f} \
-			${PREFIX}/etc/avahi; \
-	fi
-.endfor
-.if ${AVAHI_SLAVE}=="no"
-	${INSTALL_DATA} ${FILESDIR}/org.freedesktop.Avahi.service \
-		${LOCALBASE}/share/dbus-1/system-services
-.endif
-.endif # avahi-header
-.include <bsd.port.post.mk>
diff --git a/net/avahi-app/distinfo b/net/avahi-app/distinfo
deleted file mode 100644
index c476c7bd6..000000000
--- a/net/avahi-app/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (avahi-0.6.31.tar.gz) = 8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48
-SIZE (avahi-0.6.31.tar.gz) = 1268686
diff --git a/net/avahi-app/files/org.freedesktop.Avahi.service b/net/avahi-app/files/org.freedesktop.Avahi.service
deleted file mode 100644
index 7030ab4cb..000000000
--- a/net/avahi-app/files/org.freedesktop.Avahi.service
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file is part of avahi.
-#
-# avahi is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# avahi is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
-# License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with avahi; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA.
-
-[D-BUS Service]
-Name=org.freedesktop.Avahi
-#SystemdService=avahi-daemon.service
-
-# This service should not be bus activated if systemd isn't running,
-# so that activation won't conflict with the init script startup.
-Exec=/usr/bin/false
diff --git a/net/avahi-app/files/patch-Makefile.in b/net/avahi-app/files/patch-Makefile.in
deleted file mode 100644
index 788676112..000000000
--- a/net/avahi-app/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2011-03-13 18:12:06.000000000 +0100
-+++ Makefile.in	2011-03-13 18:14:22.000000000 +0100
-@@ -1179,6 +1179,8 @@
- %.pc: %.pc.in
- 	$(AM_V_GEN)sed -e 's,@prefix\@,$(prefix),g' \
- 	    -e 's,@libdir\@,$(libdir),g' \
-+	    -e 's,@PTHREAD_CFLAGS\@,$(PTHREAD_CFLAGS),g' \
-+	    -e 's,@PTHREAD_LIBS\@,$(PTHREAD_LIBS),g' \
- 	    -e 's,@HOWL_COMPAT_VERSION\@,$(HOWL_COMPAT_VERSION),g' \
- 	    -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
- 
diff --git a/net/avahi-app/files/patch-avahi-autoipd_main.c b/net/avahi-app/files/patch-avahi-autoipd_main.c
deleted file mode 100644
index f67ed7a2a..000000000
--- a/net/avahi-app/files/patch-avahi-autoipd_main.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
diff --git a/net/avahi-app/files/patch-avahi-client.pc.in b/net/avahi-app/files/patch-avahi-client.pc.in
deleted file mode 100644
index e980e52e0..000000000
--- a/net/avahi-app/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}
diff --git a/net/avahi-app/files/patch-avahi-compat-howl.pc.in b/net/avahi-app/files/patch-avahi-compat-howl.pc.in
deleted file mode 100644
index f101cc1da..000000000
--- a/net/avahi-app/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}
diff --git a/net/avahi-app/files/patch-avahi-compat-libdns_sd.pc.in b/net/avahi-app/files/patch-avahi-compat-libdns_sd.pc.in
deleted file mode 100644
index 8487c1b5a..000000000
--- a/net/avahi-app/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}
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
deleted file mode 100644
index 971db032f..000000000
--- a/net/avahi-app/files/patch-avahi-compat-libdns_sd_Makefile.in
+++ /dev/null
@@ -1,59 +0,0 @@
---- avahi-compat-libdns_sd/Makefile.in.orig	2010-07-24 19:46:12.000000000 -0400
-+++ avahi-compat-libdns_sd/Makefile.in	2010-07-24 19:49:25.000000000 -0400
-@@ -127,9 +127,7 @@ am__null_test_SOURCES_DIST = dns_sd.h co
- null_test_OBJECTS = $(am_null_test_OBJECTS)
- am__DEPENDENCIES_1 =
- @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_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@	../avahi-client/libavahi-client.la
-+@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	$(am__DEPENDENCIES_1)
- null_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(null_test_CFLAGS) \
- 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@@ -139,8 +137,7 @@ am__txt_test_SOURCES_DIST = dns_sd.h txt
- @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)
- txt_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(txt_test_CFLAGS) \
- 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@@ -433,7 +430,7 @@ AM_CFLAGS = -I$(top_srcdir) '-DDEBUG_TRA
- @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)  -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 \
-@@ -441,7 +438,7 @@ AM_CFLAGS = -I$(top_srcdir) '-DDEBUG_TRA
- @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)
--@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la
-+@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) `$(PKG_CONFIG) --libs --cflags avahi-client`
- @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 \
-@@ -449,7 +446,7 @@ AM_CFLAGS = -I$(top_srcdir) '-DDEBUG_TRA
- @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)
--@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la
-+@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) `$(PKG_CONFIG) --libs --cflags avahi-client`
- @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@CLEANFILES = libdns_sd-test.o libdns_sd-test
- all: all-am
- 
-@@ -943,7 +940,7 @@ uninstall-am: uninstall-avahi_compat_lib
- 
- @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
--@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
-+@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.
diff --git a/net/avahi-app/files/patch-avahi-core.pc.in b/net/avahi-app/files/patch-avahi-core.pc.in
deleted file mode 100644
index fdde41be9..000000000
--- a/net/avahi-app/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}
diff --git a/net/avahi-app/files/patch-avahi-daemon_Makefile.in b/net/avahi-app/files/patch-avahi-daemon_Makefile.in
deleted file mode 100644
index 5f08d07c1..000000000
--- a/net/avahi-app/files/patch-avahi-daemon_Makefile.in
+++ /dev/null
@@ -1,49 +0,0 @@
---- avahi-daemon/Makefile.in.orig	2013-01-01 13:45:35.000000000 -0600
-+++ avahi-daemon/Makefile.in	2013-01-01 13:47:30.000000000 -0600
-@@ -69,7 +69,7 @@
- @ENABLE_CHROOT_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@	caps.c caps.h
- 
- @ENABLE_CHROOT_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@am__append_3 = -lcap
--@HAVE_DLOPEN_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@am__append_4 = -ldl
-+@HAVE_DLOPEN_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@am__append_4 = 
- @HAVE_DBUS_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@am__append_5 = \
- @HAVE_DBUS_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@	dbus-protocol.c dbus-protocol.h \
- @HAVE_DBUS_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@	dbus-util.c dbus-util.h \
-@@ -688,7 +688,7 @@
- 	rm -f $$list
- avahi-daemon$(EXEEXT): $(avahi_daemon_OBJECTS) $(avahi_daemon_DEPENDENCIES) $(EXTRA_avahi_daemon_DEPENDENCIES) 
- 	@rm -f avahi-daemon$(EXEEXT)
--	$(AM_V_CCLD)$(avahi_daemon_LINK) $(avahi_daemon_OBJECTS) $(avahi_daemon_LDADD) $(LIBS)
-+	$(AM_V_CCLD)$(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) $(EXTRA_ini_file_parser_test_DEPENDENCIES) 
- 	@rm -f ini-file-parser-test$(EXEEXT)
- 	$(AM_V_CCLD)$(ini_file_parser_test_LINK) $(ini_file_parser_test_OBJECTS) $(ini_file_parser_test_LDADD) $(LIBS)
-@@ -1222,17 +1222,17 @@
- 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- 	dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir)
- install-pkgsysconfDATA: $(pkgsysconf_DATA)
--	@$(NORMAL_INSTALL)
--	test -z "$(pkgsysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgsysconfdir)"
--	@list='$(pkgsysconf_DATA)'; test -n "$(pkgsysconfdir)" || list=; \
--	for p in $$list; do \
--	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  echo "$$d$$p"; \
--	done | $(am__base_list) | \
--	while read files; do \
--	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgsysconfdir)'"; \
--	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgsysconfdir)" || exit $$?; \
--	done
-+#	@$(NORMAL_INSTALL)
-+#	test -z "$(pkgsysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgsysconfdir)"
-+#	@list='$(pkgsysconf_DATA)'; test -n "$(pkgsysconfdir)" || list=; \
-+#	for p in $$list; do \
-+#	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+#	  echo "$$d$$p"; \
-+#	done | $(am__base_list) | \
-+#	while read files; do \
-+#	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgsysconfdir)'"; \
-+#	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgsysconfdir)" || exit $$?; \
-+#	done
- 
- uninstall-pkgsysconfDATA:
- 	@$(NORMAL_UNINSTALL)
diff --git a/net/avahi-app/files/patch-avahi-daemon_main.c b/net/avahi-app/files/patch-avahi-daemon_main.c
deleted file mode 100644
index c95ab399f..000000000
--- a/net/avahi-app/files/patch-avahi-daemon_main.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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++) {
diff --git a/net/avahi-app/files/patch-avahi-discover-standalone_Makefile.in b/net/avahi-app/files/patch-avahi-discover-standalone_Makefile.in
deleted file mode 100644
index d4afb05c0..000000000
--- a/net/avahi-app/files/patch-avahi-discover-standalone_Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
---- avahi-discover-standalone/Makefile.in.orig	2010-07-24 19:51:29.000000000 -0400
-+++ avahi-discover-standalone/Makefile.in	2010-07-24 19:53:14.000000000 -0400
-@@ -97,9 +97,7 @@ am__DEPENDENCIES_1 =
- @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
- @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) \
- @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@	$(am__DEPENDENCIES_1)
--@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@avahi_discover_standalone_DEPENDENCIES = ../avahi-common/libavahi-common.la \
--@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	../avahi-glib/libavahi-glib.la \
--@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	../avahi-core/libavahi-core.la \
-+@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@avahi_discover_standalone_DEPENDENCIES = \
- @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	$(am__DEPENDENCIES_2) \
- @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	$(am__DEPENDENCIES_3)
- AM_V_lt = $(am__v_lt_$(V))
-@@ -418,9 +416,7 @@ interfaces = \
- @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	$(am__append_3)
- @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@avahi_discover_standalone_LDADD =  \
- @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	$(AM_LDADD) \
--@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	../avahi-common/libavahi-common.la \
--@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	../avahi-glib/libavahi-glib.la \
--@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	../avahi-core/libavahi-core.la \
-+@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	`$(PKG_CONFIG) --cflags --libs avahi-client avahi-core avahi-glib` \
- @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	$(am__append_2) \
- @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	$(am__append_4)
- @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@interfaces_DATA = $(interfaces)
diff --git a/net/avahi-app/files/patch-avahi-glib.pc.in b/net/avahi-app/files/patch-avahi-glib.pc.in
deleted file mode 100644
index e2633c32d..000000000
--- a/net/avahi-app/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}
diff --git a/net/avahi-app/files/patch-avahi-qt3.pc.in b/net/avahi-app/files/patch-avahi-qt3.pc.in
deleted file mode 100644
index 8174f2584..000000000
--- a/net/avahi-app/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}
diff --git a/net/avahi-app/files/patch-avahi-qt4.pc.in b/net/avahi-app/files/patch-avahi-qt4.pc.in
deleted file mode 100644
index 7bffe2d95..000000000
--- a/net/avahi-app/files/patch-avahi-qt4.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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}
diff --git a/net/avahi-app/files/patch-avahi-qt_Makefile.in b/net/avahi-app/files/patch-avahi-qt_Makefile.in
deleted file mode 100644
index 8f1dc3039..000000000
--- a/net/avahi-app/files/patch-avahi-qt_Makefile.in
+++ /dev/null
@@ -1,36 +0,0 @@
---- 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 =  \
--@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@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 =  \
-@@ -400,7 +398,7 @@
- @HAVE_QT3_TRUE@	qt-watch.cpp 
- 
- @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 = \
-@@ -410,7 +408,7 @@
- @HAVE_QT4_TRUE@	qt-watch.cpp 
- 
- @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) -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
deleted file mode 100644
index ac34b5bb0..000000000
--- a/net/avahi-app/files/patch-avahi-ui_Makefile.in
+++ /dev/null
@@ -1,78 +0,0 @@
---- avahi-ui/Makefile.in.orig	2012-04-03 18:30:32.000000000 +0200
-+++ avahi-ui/Makefile.in	2012-04-03 18:33:59.000000000 +0200
-@@ -119,9 +119,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
- 	"$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(avahiincludedir)"
- LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
--@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@libavahi_ui_gtk3_la_DEPENDENCIES = ../avahi-common/libavahi-common.la \
--@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	../avahi-client/libavahi-client.la \
--@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	../avahi-glib/libavahi-glib.la \
-+@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@libavahi_ui_gtk3_la_DEPENDENCIES = \
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	$(am__DEPENDENCIES_1) \
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	$(am__DEPENDENCIES_1)
- am__libavahi_ui_gtk3_la_SOURCES_DIST = avahi-ui.h avahi-ui.c \
-@@ -142,9 +140,7 @@ libavahi_ui_gtk3_la_LINK = $(LIBTOOL) $(
- 	$(libavahi_ui_gtk3_la_LDFLAGS) $(LDFLAGS) -o $@
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@am_libavahi_ui_gtk3_la_rpath = -rpath \
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@	$(libdir)
--@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@libavahi_ui_la_DEPENDENCIES = ../avahi-common/libavahi-common.la \
--@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	../avahi-client/libavahi-client.la \
--@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	../avahi-glib/libavahi-glib.la \
-+@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@libavahi_ui_la_DEPENDENCIES = \
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	$(am__DEPENDENCIES_1) \
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	$(am__DEPENDENCIES_1)
- am__libavahi_ui_la_SOURCES_DIST = avahi-ui.h avahi-ui.c \
-@@ -166,12 +162,8 @@ am__bssh_SOURCES_DIST = bssh.c
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@am_bssh_OBJECTS = bssh-bssh.$(OBJEXT)
- bssh_OBJECTS = $(am_bssh_OBJECTS)
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@bssh_DEPENDENCIES = $(am__DEPENDENCIES_1) \
--@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@	../avahi-client/libavahi-client.la \
--@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@	../avahi-common/libavahi-common.la \
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@	libavahi-ui.la
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@bssh_DEPENDENCIES = $(am__DEPENDENCIES_1) \
--@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@	../avahi-client/libavahi-client.la \
--@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@	../avahi-common/libavahi-common.la \
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@	libavahi-ui-gtk3.la
- bssh_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(bssh_CFLAGS) $(CFLAGS) \
-@@ -482,9 +474,7 @@ EXTRA_DIST = $(desktop_DATA_in_in)
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	$(am__append_5) \
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	$(am__append_10)
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@libavahi_ui_la_LIBADD = $(AM_LDADD) \
--@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	../avahi-common/libavahi-common.la \
--@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	../avahi-client/libavahi-client.la \
--@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	../avahi-glib/libavahi-glib.la \
-+@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	`$(PKG_CONFIG) --cflags --libs avahi-client avahi-core avahi-glib` \
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	$(GTK20_LIBS) \
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	$(am__append_6)
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@libavahi_ui_la_LDFLAGS = $(AM_LDFLAGS)  -version-info $(LIBAVAHI_UI_VERSION_INFO)
-@@ -494,17 +484,15 @@ EXTRA_DIST = $(desktop_DATA_in_in)
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	$(am__append_7) \
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	$(am__append_11)
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@libavahi_ui_gtk3_la_LIBADD = $(AM_LDADD) \
--@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	../avahi-common/libavahi-common.la \
--@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	../avahi-client/libavahi-client.la \
--@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	../avahi-glib/libavahi-glib.la \
-+@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	`$(PKG_CONFIG) --cflags --libs avahi-client avahi-core avahi-glib` \
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	$(GTK30_LIBS) \
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	$(am__append_8)
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@libavahi_ui_gtk3_la_LDFLAGS = $(AM_LDFLAGS)  -version-info $(LIBAVAHI_UI_VERSION_INFO)
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@bssh_SOURCES = bssh.c
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@bssh_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS)
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@bssh_CFLAGS = $(AM_CFLAGS) $(GTK30_CFLAGS)
--@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@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_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@bssh_LDADD = $(AM_LDADD) $(GTK30_LIBS) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la libavahi-ui-gtk3.la
-+@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@bssh_LDADD = $(AM_LDADD) $(GTK20_LIBS) `$(PKG_CONFIG) --cflags --libs avahi-client avahi-core` libavahi-ui.la
-+@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@bssh_LDADD = $(AM_LDADD) $(GTK30_LIBS) `$(PKG_CONFIG) --cflags --libs avahi-client avahi-core` libavahi-ui-gtk3.la
- CLEANFILES = $(desktop_DATA) $(desktop_DATA_in)
- all: all-am
- 
-@@ -713,7 +701,7 @@ clean-libtool:
- 	-rm -rf .libs _libs
- install-desktopDATA: $(desktop_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
-+@HAVE_GTK_TRUE@	test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
- 	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
- 	for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
diff --git a/net/avahi-app/files/patch-avahi-utils_Makefile.in b/net/avahi-app/files/patch-avahi-utils_Makefile.in
deleted file mode 100644
index 49b05ea3c..000000000
--- a/net/avahi-app/files/patch-avahi-utils_Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
---- avahi-utils/Makefile.in.orig	2012-07-09 20:07:19.000000000 +0200
-+++ avahi-utils/Makefile.in	2012-07-09 20:10:46.000000000 +0200
-@@ -518,16 +518,16 @@
- 	rm -f $$list
- avahi-browse$(EXEEXT): $(avahi_browse_OBJECTS) $(avahi_browse_DEPENDENCIES) $(EXTRA_avahi_browse_DEPENDENCIES) 
- 	@rm -f avahi-browse$(EXEEXT)
--	$(AM_V_CCLD)$(avahi_browse_LINK) $(avahi_browse_OBJECTS) $(avahi_browse_LDADD) $(LIBS)
-+	$(AM_V_CCLD)$(avahi_browse_LINK) $(avahi_browse_OBJECTS) $(avahi_browse_LDADD) $(LIBS) $(INTLLIBS)
- avahi-publish$(EXEEXT): $(avahi_publish_OBJECTS) $(avahi_publish_DEPENDENCIES) $(EXTRA_avahi_publish_DEPENDENCIES) 
- 	@rm -f avahi-publish$(EXEEXT)
--	$(AM_V_CCLD)$(avahi_publish_LINK) $(avahi_publish_OBJECTS) $(avahi_publish_LDADD) $(LIBS)
-+	$(AM_V_CCLD)$(avahi_publish_LINK) $(avahi_publish_OBJECTS) $(avahi_publish_LDADD) $(LIBS) $(INTLLIBS)
- avahi-resolve$(EXEEXT): $(avahi_resolve_OBJECTS) $(avahi_resolve_DEPENDENCIES) $(EXTRA_avahi_resolve_DEPENDENCIES) 
- 	@rm -f avahi-resolve$(EXEEXT)
--	$(AM_V_CCLD)$(avahi_resolve_LINK) $(avahi_resolve_OBJECTS) $(avahi_resolve_LDADD) $(LIBS)
-+	$(AM_V_CCLD)$(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) $(EXTRA_avahi_set_host_name_DEPENDENCIES) 
- 	@rm -f avahi-set-host-name$(EXEEXT)
--	$(AM_V_CCLD)$(avahi_set_host_name_LINK) $(avahi_set_host_name_OBJECTS) $(avahi_set_host_name_LDADD) $(LIBS)
-+	$(AM_V_CCLD)$(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-configure b/net/avahi-app/files/patch-configure
deleted file mode 100644
index 141c9403f..000000000
--- a/net/avahi-app/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 ()
- {
diff --git a/net/avahi-app/files/patch-dnsconfd_Makefile.in b/net/avahi-app/files/patch-dnsconfd_Makefile.in
deleted file mode 100644
index 69f7e6cee..000000000
--- a/net/avahi-app/files/patch-dnsconfd_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- avahi-dnsconfd/Makefile.in.orig	2010-07-24 20:00:31.000000000 -0400
-+++ avahi-dnsconfd/Makefile.in	2010-07-24 20:01:08.000000000 -0400
-@@ -484,7 +484,7 @@ clean-sbinPROGRAMS:
- 	rm -f $$list
- avahi-dnsconfd$(EXEEXT): $(avahi_dnsconfd_OBJECTS) $(avahi_dnsconfd_DEPENDENCIES) 
- 	@rm -f avahi-dnsconfd$(EXEEXT)
--	$(AM_V_CCLD)$(avahi_dnsconfd_LINK) $(avahi_dnsconfd_OBJECTS) $(avahi_dnsconfd_LDADD) $(LIBS)
-+	$(AM_V_CCLD)$(avahi_dnsconfd_LINK) $(avahi_dnsconfd_OBJECTS) $(avahi_dnsconfd_LDADD) $(LIBS) $(INTLLIBS)
- install-pkgsysconfSCRIPTS: $(pkgsysconf_SCRIPTS)
- 	@$(NORMAL_INSTALL)
- 	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
deleted file mode 100644
index 2b80f6c20..000000000
--- a/net/avahi-app/files/patch-initscript_freebsd_Makefile.in
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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/files/patch-initscript_freebsd_avahi-daemon.sh.in b/net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in
deleted file mode 100644
index 9ee6242e7..000000000
--- a/net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- initscript/freebsd/avahi-daemon.sh.in.orig	2010-06-25 02:54:22.000000000 +0200
-+++ initscript/freebsd/avahi-daemon.sh.in	2012-01-15 19:03:55.000000000 +0100
-@@ -9,13 +9,15 @@
- # 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
-+. %%GNOME_SUBR%%
-+
-+avahi_daemon_enable=${avahi_daemon_enable-${gnome_enable}}
- 
- name=avahi_daemon
--rcvar=`set_rcvar`
-+rcvar=avahi_daemon_enable
- 
- start_cmd=avahi_daemon_start
- stop_cmd=avahi_daemon_stop
diff --git a/net/avahi-app/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in b/net/avahi-app/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in
deleted file mode 100644
index b12875709..000000000
--- a/net/avahi-app/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- initscript/freebsd/avahi-dnsconfd.sh.in.orig	2010-06-25 02:54:22.000000000 +0200
-+++ initscript/freebsd/avahi-dnsconfd.sh.in	2012-01-15 19:04:25.000000000 +0100
-@@ -12,13 +12,15 @@
- # 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
-+. %%GNOME_SUBR%%
-+
-+avahi_dnsconfd_enable=${avahi_dnsconfd_enable-${gnome_enable}}
- 
- name=avahi_dnsconfd
--rcvar=`set_rcvar`
-+rcvar=avahi_dnsconfd_enable
- 
- start_cmd=avahi_dnsconfd_start
- stop_cmd=avahi_dnsconfd_stop
diff --git a/net/avahi-app/pkg-descr b/net/avahi-app/pkg-descr
deleted file mode 100644
index fb85b6205..000000000
--- a/net/avahi-app/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-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-app/pkg-install b/net/avahi-app/pkg-install
deleted file mode 100644
index 9bbd14bce..000000000
--- a/net/avahi-app/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
diff --git a/net/avahi-app/pkg-plist b/net/avahi-app/pkg-plist
deleted file mode 100644
index 4f3dd8359..000000000
--- a/net/avahi-app/pkg-plist
+++ /dev/null
@@ -1,173 +0,0 @@
-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
-@unexec if cmp -s %D/etc/avahi/avahi-daemon.conf %D/etc/avahi/avahi-daemon.conf.dist; then rm -f %D/etc/avahi/avahi-daemon.conf; fi
-etc/avahi/avahi-daemon.conf.dist
-@exec [ -f %B/avahi-daemon.conf ] || cp %B/%f %B/avahi-daemon.conf
-etc/avahi/avahi-dnsconfd.action
-@unexec if cmp -s %D/etc/avahi/hosts %D/etc/avahi/hosts.dist; then rm -f %D/etc/avahi/hosts; fi
-etc/avahi/hosts.dist
-@exec [ -f %B/hosts ] || cp %B/%f %B/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
-etc/rc.d/avahi-dnsconfd
-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/girepository-1.0/Avahi-0.6.typelib
-lib/girepository-1.0/AvahiCore-0.6.typelib
-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.7
-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%%/service-types
-share/dbus-1/interfaces/org.freedesktop.Avahi.AddressResolver.xml
-share/dbus-1/interfaces/org.freedesktop.Avahi.DomainBrowser.xml
-share/dbus-1/interfaces/org.freedesktop.Avahi.EntryGroup.xml
-share/dbus-1/interfaces/org.freedesktop.Avahi.HostNameResolver.xml
-share/dbus-1/interfaces/org.freedesktop.Avahi.RecordBrowser.xml
-share/dbus-1/interfaces/org.freedesktop.Avahi.Server.xml
-share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceBrowser.xml
-share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceResolver.xml
-share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceTypeBrowser.xml
-share/dbus-1/system-services/org.freedesktop.Avahi.service
-share/gir-1.0/Avahi-0.6.gir
-share/gir-1.0/AvahiCore-0.6.gir
-share/locale/bg/LC_MESSAGES/avahi.mo
-share/locale/ca/LC_MESSAGES/avahi.mo
-share/locale/cs/LC_MESSAGES/avahi.mo
-share/locale/da/LC_MESSAGES/avahi.mo
-share/locale/de/LC_MESSAGES/avahi.mo
-share/locale/el/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/es/LC_MESSAGES/avahi.mo
-share/locale/fi/LC_MESSAGES/avahi.mo
-share/locale/fo/LC_MESSAGES/avahi.mo
-share/locale/fr/LC_MESSAGES/avahi.mo
-share/locale/gl/LC_MESSAGES/avahi.mo
-share/locale/he/LC_MESSAGES/avahi.mo
-share/locale/hu/LC_MESSAGES/avahi.mo
-share/locale/id/LC_MESSAGES/avahi.mo
-share/locale/it/LC_MESSAGES/avahi.mo
-share/locale/ja/LC_MESSAGES/avahi.mo
-share/locale/ms/LC_MESSAGES/avahi.mo
-share/locale/nl/LC_MESSAGES/avahi.mo
-share/locale/pl/LC_MESSAGES/avahi.mo
-share/locale/pt_BR/LC_MESSAGES/avahi.mo
-share/locale/ro/LC_MESSAGES/avahi.mo
-share/locale/ru/LC_MESSAGES/avahi.mo
-share/locale/sl/LC_MESSAGES/avahi.mo
-share/locale/sr/LC_MESSAGES/avahi.mo
-share/locale/sv/LC_MESSAGES/avahi.mo
-share/locale/sr@latin/LC_MESSAGES/avahi.mo
-share/locale/uk/LC_MESSAGES/avahi.mo
-share/locale/zh_CN/LC_MESSAGES/avahi.mo
-share/locale/zh_TW/LC_MESSAGES/avahi.mo
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/fo/LC_MESSAGES
-@dirrmtry share/locale/fo
-@dirrmtry share/locale/en_NZ/LC_MESSAGES
-@dirrmtry share/locale/en_NZ
-@dirrm %%DATADIR%%
-@dirrm lib/avahi
-@dirrm include/avahi-gobject
-@dirrm include/avahi-glib
-@dirrm include/avahi-core
-@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
diff --git a/net/avahi-gtk/Makefile b/net/avahi-gtk/Makefile
deleted file mode 100644
index eb2dcbd03..000000000
--- a/net/avahi-gtk/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Created by: Michael Johnson <ahze@FreeBSD.org>
-# $FreeBSD$
-#   $MCom$
-
-PORTREVISION=	0
-CATEGORIES=	net
-PKGNAMESUFFIX=	-gtk
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Gtk+ tools and bindings to the Avahi mDNS system
-
-LIB_DEPENDS=	avahi-common:${PORTSDIR}/net/avahi-app
-RUN_DEPENDS=	avahi-header>=0.6:${PORTSDIR}/net/avahi-header
-
-MASTERDIR=	${.CURDIR}/../avahi-app
-BUILD_WRKSRC=	${WRKSRC}/avahi-ui
-INSTALL_WRKSRC=	${BUILD_WRKSRC}
-DESCR=		${.CURDIR}/pkg-descr
-PLIST=		${.CURDIR}/pkg-plist
-
-AVAHI_SLAVE=	gtk
-AVAHI_PKGCONFIG=avahi-ui.pc
-
-MAN1+=		bssh.1
-MLINKS+=	bssh.1 bvnc.1 \
-		bssh.1 bshell.1
-USE_GNOME+=	libglade2
-
-post-build:
-	@(cd ${WRKSRC}/avahi-discover-standalone; \
-		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
-
-post-install:
-	@(cd ${WRKSRC}/avahi-discover-standalone; \
-		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/avahi-gtk/pkg-descr b/net/avahi-gtk/pkg-descr
deleted file mode 100644
index a19804145..000000000
--- a/net/avahi-gtk/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Gtk+ tools and bindings to the avahi mDNS service discovery system.
-
-WWW: http://www.avahi.org/
diff --git a/net/avahi-gtk/pkg-plist b/net/avahi-gtk/pkg-plist
deleted file mode 100644
index e545a05d8..000000000
--- a/net/avahi-gtk/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-bin/avahi-discover-standalone
-bin/bshell
-bin/bssh
-bin/bvnc
-lib/libavahi-ui.a
-lib/libavahi-ui.la
-lib/libavahi-ui.so
-lib/libavahi-ui.so.0
-libdata/pkgconfig/avahi-ui.pc
-share/applications/bssh.desktop
-share/applications/bvnc.desktop
-%%DATADIR%%/interfaces/avahi-discover.ui
-@dirrm %%DATADIR%%/interfaces
-@dirrmtry share/applications
diff --git a/net/avahi-gtk3/Makefile b/net/avahi-gtk3/Makefile
deleted file mode 100644
index 06e486a3e..000000000
--- a/net/avahi-gtk3/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# Created by: Michael Johnson <ahze@FreeBSD.org>
-# $FreeBSD$
-#   $MCom$
-
-PORTREVISION=	0
-CATEGORIES=	net
-PKGNAMESUFFIX=	-gtk3
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Gtk+ 3 library to the Avahi mDNS system
-
-LIB_DEPENDS=	avahi-common:${PORTSDIR}/net/avahi-app
-RUN_DEPENDS=	avahi-header>=0.6:${PORTSDIR}/net/avahi-header
-
-MASTERDIR=	${.CURDIR}/../avahi-app
-BUILD_WRKSRC=	${WRKSRC}/avahi-ui
-INSTALL_WRKSRC=	${BUILD_WRKSRC}
-DESCR=		${.CURDIR}/pkg-descr
-PLIST=		${.CURDIR}/pkg-plist
-
-CONFIGURE_ARGS+=--disable-silent-rules
-
-AVAHI_SLAVE=	gtk3
-AVAHI_PKGCONFIG=avahi-ui-gtk3.pc
-
-USE_GNOME+=	gtk30
-
-do-build:
-	@(cd ${WRKSRC}/avahi-ui; ${GMAKE} libavahi-ui-gtk3.la)
-
-do-install:
-	@(cd ${WRKSRC}/avahi-ui; ${GMAKE} install-libLTLIBRARIES)
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/avahi-gtk3/pkg-descr b/net/avahi-gtk3/pkg-descr
deleted file mode 100644
index a19804145..000000000
--- a/net/avahi-gtk3/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Gtk+ tools and bindings to the avahi mDNS service discovery system.
-
-WWW: http://www.avahi.org/
diff --git a/net/avahi-gtk3/pkg-plist b/net/avahi-gtk3/pkg-plist
deleted file mode 100644
index 08125fa55..000000000
--- a/net/avahi-gtk3/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/libavahi-ui-gtk3.a
-lib/libavahi-ui-gtk3.la
-lib/libavahi-ui-gtk3.so
-lib/libavahi-ui-gtk3.so.0
-libdata/pkgconfig/avahi-ui-gtk3.pc
diff --git a/net/avahi-header/Makefile b/net/avahi-header/Makefile
deleted file mode 100644
index d6b667891..000000000
--- a/net/avahi-header/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# Created by: Michael Johnson <ahze@FreeBSD.org>
-# $FreeBSD$
-#   $MCom$
-
-PORTREVISION=	0
-CATEGORIES=	net
-PKGNAMESUFFIX=	-header
-
-COMMENT=	Install an avahi-gtk* header to avoid conflict
-
-MASTERDIR=	${.CURDIR}/../avahi-app
-BUILD_WRKSRC=	${WRKSRC}/avahi-ui
-INSTALL_WRKSRC=	${BUILD_WRKSRC}
-DESCR=		${.CURDIR}/pkg-descr
-PLIST=		${.CURDIR}/pkg-plist
-
-AVAHI_SLAVE=	header
-
-NO_BUILD=	yes
-
-do-install:
-	${MKDIR} ${PREFIX}/include/avahi-ui
-	${INSTALL_DATA} ${BUILD_WRKSRC}/avahi-ui.h \
-		${PREFIX}/include/avahi-ui/
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/avahi-header/pkg-descr b/net/avahi-header/pkg-descr
deleted file mode 100644
index e83ee0ebb..000000000
--- a/net/avahi-header/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-The net/avahi-gtk and net/avahi-gtk3 install same header, avahi-ui.h. To
-avoid both ports to get conflict with the each others. Avoid both ports
-to install avahi-ui.h then have both ports to depend on here.
-
-WWW: http://www.avahi.org/
diff --git a/net/avahi-header/pkg-plist b/net/avahi-header/pkg-plist
deleted file mode 100644
index 07fff5e69..000000000
--- a/net/avahi-header/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-include/avahi-ui/avahi-ui.h
-@dirrm include/avahi-ui
diff --git a/net/avahi-qt3/Makefile b/net/avahi-qt3/Makefile
deleted file mode 100644
index edbe4474c..000000000
--- a/net/avahi-qt3/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-# $FreeBSD$
-#   $MCom$
-
-PORTREVISION=	0
-CATEGORIES=	net
-PKGNAMESUFFIX=	-qt3
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Qt 3 bindings to the Avahi mDNS system
-
-LIB_DEPENDS=	avahi-common:${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
-USES=		pathfix
-USE_GNOME=	ltverhack intltool
-USE_QT_VER=	3
-AVAHI_PKGCONFIG=	avahi-qt3.pc
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/avahi-qt3/pkg-descr b/net/avahi-qt3/pkg-descr
deleted file mode 100644
index 5ed735799..000000000
--- a/net/avahi-qt3/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Qt 3 bindings to the avahi mDNS service discovery system.
-
-WWW: http://www.avahi.org/
diff --git a/net/avahi-qt3/pkg-plist b/net/avahi-qt3/pkg-plist
deleted file mode 100644
index 3025b57c0..000000000
--- a/net/avahi-qt3/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-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
-@dirrm include/avahi-qt3
diff --git a/net/avahi/Makefile b/net/avahi/Makefile
deleted file mode 100644
index 6fbc9ef2e..000000000
--- a/net/avahi/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-# $FreeBSD: head/net/avahi/Makefile 314632 2013-03-19 10:40:22Z kwm $
-#   $MCom$
-
-PORTNAME=	avahi
-PORTVERSION=	0.6.31
-PORTREVISION?=	0
-CATEGORIES?=	net dns
-MASTER_SITES=	# empty
-DISTFILES=	# empty
-EXTRACT_ONLY=	# empty
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	The "meta-port" for the Avahi service discovery suite
-
-RUN_DEPENDS=	avahi-resolve:${PORTSDIR}/net/avahi-app \
-		avahi-app>=0.6.31:${PORTSDIR}/net/avahi-app
-
-OPTIONS_DEFINE=	AUTOIPD GTK LIBDNS MONO QT3 QT4 PYTHON
-OPTIONS_DEFAULT=AUTOIPD GTK LIBDNS
-AUTOIPD_DESC=	IPv4LL network address configuration daemon
-GTK_DESC=	Gtk+ tools and bindings
-LIBDNS_DESC=	Apple's mDNSResponder compatibility library
-QT3_DESC=	Qt 3 toolkit
-
-NO_BUILD=	yes
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MAUTOIPD}
-RUN_DEPENDS+=	avahi-autoipd:${PORTSDIR}/net/avahi-autoipd
-.endif
-
-.if ${PORT_OPTIONS:MGTK}
-RUN_DEPENDS+=	avahi-discover-standalone:${PORTSDIR}/net/avahi-gtk
-.endif
-
-.if ${PORT_OPTIONS:MLIBDNS}
-RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/avahi-compat-libdns_sd.pc:${PORTSDIR}/net/avahi-libdns
-.endif
-
-.if ${PORT_OPTIONS:MMONO}
-RUN_DEPENDS+=	${LOCALBASE}/lib/mono/avahi-sharp/avahi-sharp.dll:${PORTSDIR}/net/avahi-sharp
-.endif
-
-.if ${PORT_OPTIONS:MQT3}
-RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/avahi-qt3.pc:${PORTSDIR}/net/avahi-qt3
-.endif
-
-.if ${PORT_OPTIONS:MQT4}
-RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/avahi-qt4.pc:${PORTSDIR}/net/avahi-qt4
-.endif
-
-.if ${PORT_OPTIONS:MPYTHON}
-RUN_DEPENDS+=	avahi-bookmarks:${PORTSDIR}/net/py-avahi
-.endif
-
-do-install:
-
-.include <bsd.port.mk>
diff --git a/net/avahi/pkg-descr b/net/avahi/pkg-descr
deleted file mode 100644
index fb85b6205..000000000
--- a/net/avahi/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-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/