Update to 0.6.31.

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

12 files changed, 65 insertions, 27 deletions

diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
index c51b71aed..48e359d5f 100644
--- a/net/avahi-app/Makefile
+++ b/net/avahi-app/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/avahi-app/Makefile,v 1.21 2011/09/13 11:01:32 kwm Exp $
+#   $MCom: ports/net/avahi-app/Makefile,v 1.22 2012/01/15 15:56:09 ahze Exp $
 #
 
 PORTNAME=	avahi
-PORTVERSION=	0.6.30
-PORTREVISION?=	1
+PORTVERSION=	0.6.31
+PORTREVISION?=	0
 CATEGORIES?=	net dns
 MASTER_SITES=	http://www.avahi.org/download/
 PKGNAMESUFFIX?=	-app
diff --git a/net/avahi-app/distinfo b/net/avahi-app/distinfo
index 4eb4d4f4f..c476c7bd6 100644
--- a/net/avahi-app/distinfo
+++ b/net/avahi-app/distinfo
@@ -1,2 +1,2 @@
-SHA256 (avahi-0.6.30.tar.gz) = f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f
-SIZE (avahi-0.6.30.tar.gz) = 1243534
+SHA256 (avahi-0.6.31.tar.gz) = 8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48
+SIZE (avahi-0.6.31.tar.gz) = 1268686
diff --git a/net/avahi-app/files/patch-avahi-daemon_Makefile.in b/net/avahi-app/files/patch-avahi-daemon_Makefile.in
index 41a621a3b..383720766 100644
--- a/net/avahi-app/files/patch-avahi-daemon_Makefile.in
+++ b/net/avahi-app/files/patch-avahi-daemon_Makefile.in
@@ -1,6 +1,6 @@
---- avahi-daemon/Makefile.in.orig	2010-07-24 19:49:59.000000000 -0400
-+++ avahi-daemon/Makefile.in	2010-07-24 19:51:01.000000000 -0400
-@@ -69,7 +69,7 @@ host_triplet = @host@
+--- avahi-daemon/Makefile.in.orig	2012-07-09 19:13:20.000000000 +0200
++++ avahi-daemon/Makefile.in	2012-07-09 20:06:06.000000000 +0200
+@@ -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
@@ -9,12 +9,12 @@
  @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 \
-@@ -678,7 +678,7 @@ clean-sbinPROGRAMS:
+@@ -688,7 +688,7 @@
  	rm -f $$list
- avahi-daemon$(EXEEXT): $(avahi_daemon_OBJECTS) $(avahi_daemon_DEPENDENCIES) 
+ 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) 
+ 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)
diff --git a/net/avahi-app/files/patch-avahi-utils_Makefile.in b/net/avahi-app/files/patch-avahi-utils_Makefile.in
index 90bc06015..49b05ea3c 100644
--- a/net/avahi-app/files/patch-avahi-utils_Makefile.in
+++ b/net/avahi-app/files/patch-avahi-utils_Makefile.in
@@ -1,20 +1,20 @@
---- avahi-utils/Makefile.in.orig	2010-07-24 19:59:10.000000000 -0400
-+++ avahi-utils/Makefile.in	2010-07-24 20:00:07.000000000 -0400
-@@ -513,16 +513,16 @@ clean-binPROGRAMS:
+--- 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) 
+ 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) 
+ 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) 
+ 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) 
+ 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)
diff --git a/net/avahi-gtk/Makefile b/net/avahi-gtk/Makefile
index 972ec407a..4712c0917 100644
--- a/net/avahi-gtk/Makefile
+++ b/net/avahi-gtk/Makefile
@@ -3,10 +3,10 @@
 # Whom:					Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/avahi-gtk/Makefile,v 1.7 2011/08/11 19:48:47 kwm Exp $
+#   $MCom: ports/net/avahi-gtk/Makefile,v 1.8 2011/09/13 11:01:32 kwm Exp $
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	net
 PKGNAMESUFFIX=	-gtk
 
diff --git a/net/avahi-gtk/pkg-plist b/net/avahi-gtk/pkg-plist
index a5b8a6671..e545a05d8 100644
--- a/net/avahi-gtk/pkg-plist
+++ b/net/avahi-gtk/pkg-plist
@@ -12,4 +12,3 @@ share/applications/bvnc.desktop
 %%DATADIR%%/interfaces/avahi-discover.ui
 @dirrm %%DATADIR%%/interfaces
 @dirrmtry share/applications
-@dirrm include/avahi-ui
diff --git a/net/avahi-gtk3/Makefile b/net/avahi-gtk3/Makefile
index a88291fae..9bf6ce5e3 100644
--- a/net/avahi-gtk3/Makefile
+++ b/net/avahi-gtk3/Makefile
@@ -3,10 +3,10 @@
 # Whom:					Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/avahi-gtk3/Makefile,v 1.5 2011/08/11 19:48:47 kwm Exp $
+#   $MCom: ports/net/avahi-gtk3/Makefile,v 1.6 2011/09/13 11:01:33 kwm Exp $
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	net
 PKGNAMESUFFIX=	-gtk3
 
diff --git a/net/avahi-header/Makefile b/net/avahi-header/Makefile
index 703988725..53b03683a 100644
--- a/net/avahi-header/Makefile
+++ b/net/avahi-header/Makefile
@@ -3,10 +3,10 @@
 # Whom:					Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/avahi-header/Makefile,v 1.2 2011/03/31 02:06:52 mezz Exp $
+#   $MCom: ports/net/avahi-header/Makefile,v 1.3 2011/04/15 06:44:57 kwm Exp $
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	net
 PKGNAMESUFFIX=	-header
 
diff --git a/net/avahi-qt3/Makefile b/net/avahi-qt3/Makefile
new file mode 100644
index 000000000..1066da236
--- /dev/null
+++ b/net/avahi-qt3/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for:	avahi-qt3
+# Date created:				12 April 2007
+# 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 $
+#
+
+PORTREVISION=	0
+CATEGORIES=	net
+PKGNAMESUFFIX=	-qt3
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Qt 3 bindings to the Avahi mDNS system
+
+LIB_DEPENDS=	avahi-common.3:${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
+USE_GNOME=	gnomehack 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
new file mode 100644
index 000000000..5ed735799
--- /dev/null
+++ b/net/avahi-qt3/pkg-descr
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 000000000..3025b57c0
--- /dev/null
+++ b/net/avahi-qt3/pkg-plist
@@ -0,0 +1,7 @@
+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
index 05b2bc93a..13f654b2c 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.30 2011/03/13 17:23:19 kwm Exp $
+#   $MCom: ports/net/avahi/Makefile,v 1.31 2011/04/05 10:34:43 kwm Exp $
 #
 
 PORTNAME=	avahi
-PORTVERSION=	0.6.30
+PORTVERSION=	0.6.31
 PORTREVISION?=	0
 CATEGORIES?=	net dns
 MASTER_SITES=	# empty