Update to 0.6.22

14 files changed, 110 insertions, 34 deletions

diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
index dd69dbb6bfa3..4077697bca1c 100644
--- a/net/avahi-app/Makefile
+++ b/net/avahi-app/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	avahi
-PORTVERSION=	0.6.21
-PORTREVISION?=	1
+PORTVERSION=	0.6.22
+PORTREVISION?=	0
 CATEGORIES?=	net dns
 MASTER_SITES=	http://www.avahi.org/download/
 PKGNAMESUFFIX?=	-app
@@ -22,6 +22,7 @@ LIB_DEPENDS?=	expat.6:${PORTSDIR}/textproc/expat2 \
 		gdbm.3:${PORTSDIR}/databases/gdbm
 
 USE_GNOME?=	gnomehack ltverhack glib20
+USE_GETTEXT=	yes
 USE_GNOME_SUBR=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
@@ -122,6 +123,14 @@ avahi-post-build:
 		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${f}
 .endfor
 
+pre-install: avahi-pre-install
+
+avahi-pre-install:
+.if ${AVAHI_SLAVE}=="no"
+	@${MKDIR} ${PREFIX}/lib/avahi
+	@${TOUCH} -f ${PREFIX}/lib/avahi/.keep
+.endif
+
 post-install: avahi-post-install
 
 avahi-post-install:
diff --git a/net/avahi-app/distinfo b/net/avahi-app/distinfo
index 2600f64c27fe..258a9c7d030d 100644
--- a/net/avahi-app/distinfo
+++ b/net/avahi-app/distinfo
@@ -1,3 +1,3 @@
-MD5 (avahi-0.6.21.tar.gz) = 9cc68f79c50c9dd9e419990c3c9b05b9
-SHA256 (avahi-0.6.21.tar.gz) = d817c35f43011861476eab02eea14edd123b2bc58b4408d9d9b69b0c39252561
-SIZE (avahi-0.6.21.tar.gz) = 976841
+MD5 (avahi-0.6.22.tar.gz) = c84b1a8a23126e188426728710414dc8
+SHA256 (avahi-0.6.22.tar.gz) = 9dc6f870b6ce050059054a26bfc15d6e7a836fa299edd1b89c63c1089bfedd52
+SIZE (avahi-0.6.22.tar.gz) = 1199901
diff --git a/net/avahi-app/files/patch-avahi-autoipd_main.c b/net/avahi-app/files/patch-avahi-autoipd_main.c
new file mode 100644
index 000000000000..f67ed7a2a89d
--- /dev/null
+++ b/net/avahi-app/files/patch-avahi-autoipd_main.c
@@ -0,0 +1,13 @@
+--- 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-common_dbus-watch-glue.c b/net/avahi-app/files/patch-avahi-common_dbus-watch-glue.c
deleted file mode 100644
index 1e148af8564c..000000000000
--- a/net/avahi-app/files/patch-avahi-common_dbus-watch-glue.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- avahi-common/dbus-watch-glue.c.orig	2007-08-26 00:46:45.000000000 -0400
-+++ avahi-common/dbus-watch-glue.c	2007-08-26 00:47:12.000000000 -0400
-@@ -134,7 +134,11 @@ static dbus_bool_t update_watch(const Av
- 
-         if (!(avahi_watch = poll_api->watch_new(
-                   poll_api,
-+#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR > 1) || (DBUS_VERSION_MAJOR > 1)
-                   dbus_watch_get_unix_fd(dbus_watch),
-+#else
-+		  dbus_watch_get_fd(dbus_watch),
-+#endif
-                   translate_dbus_to_avahi(dbus_watch_get_flags(dbus_watch)),
-                   watch_callback,
-                   dbus_watch)))
diff --git a/net/avahi-app/files/patch-avahi-daemon_Makefile.in b/net/avahi-app/files/patch-avahi-daemon_Makefile.in
new file mode 100644
index 000000000000..d1bec2793f4d
--- /dev/null
+++ b/net/avahi-app/files/patch-avahi-daemon_Makefile.in
@@ -0,0 +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 @@
+ 	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)
+ 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)
diff --git a/net/avahi-app/files/patch-avahi-utils_Makefile.in b/net/avahi-app/files/patch-avahi-utils_Makefile.in
new file mode 100644
index 000000000000..9505c4fbe03e
--- /dev/null
+++ b/net/avahi-app/files/patch-avahi-utils_Makefile.in
@@ -0,0 +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 @@
+ 	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-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-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-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)
+ 
+ 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
new file mode 100644
index 000000000000..22e8ddb7ad1a
--- /dev/null
+++ b/net/avahi-app/files/patch-dnsconfd_Makefile.in
@@ -0,0 +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 @@
+ 	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)
+ install-pkgsysconfSCRIPTS: $(pkgsysconf_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(pkgsysconfdir)" || $(mkdir_p) "$(DESTDIR)$(pkgsysconfdir)"
diff --git a/net/avahi-app/pkg-plist b/net/avahi-app/pkg-plist
index 04bf17bfdfa7..72475a8b23d8 100644
--- a/net/avahi-app/pkg-plist
+++ b/net/avahi-app/pkg-plist
@@ -59,6 +59,14 @@ 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/libavahi-client.a
 lib/libavahi-client.la
 lib/libavahi-client.so
@@ -75,6 +83,10 @@ 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
@@ -83,6 +95,7 @@ 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
@@ -96,9 +109,12 @@ sbin/avahi-dnsconfd
 %%DATADIR%%/introspection/ServiceResolver.introspect
 %%DATADIR%%/introspection/ServiceTypeBrowser.introspect
 %%DATADIR%%/service-types
+share/locale/de/LC_MESSAGES/avahi.mo
 @dirrm %%DATADIR%%/introspection
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
+@dirrm lib/avahi
+@dirrm include/avahi-gobject
 @dirrm include/avahi-glib
 @dirrm include/avahi-core
 @dirrm include/avahi-compat-howl/salt
diff --git a/net/avahi-gtk/Makefile b/net/avahi-gtk/Makefile
index 4673e5d9195c..0b7df00d6839 100644
--- a/net/avahi-gtk/Makefile
+++ b/net/avahi-gtk/Makefile
@@ -24,7 +24,8 @@ AVAHI_SLAVE=	gtk
 AVAHI_PKGCONFIG=avahi-ui.pc
 
 MAN1+=		bssh.1
-MLINKS+=	bssh.1 bvnc.1
+MLINKS+=	bssh.1 bvnc.1 \
+		bssh.1 bshell.1
 USE_GNOME=	gnomehack gnometarget ltverhack libglade2
 
 post-build:
diff --git a/net/avahi-gtk/pkg-plist b/net/avahi-gtk/pkg-plist
index 59f4cfe2b5ca..ce09d40ffb63 100644
--- a/net/avahi-gtk/pkg-plist
+++ b/net/avahi-gtk/pkg-plist
@@ -1,4 +1,5 @@
 bin/avahi-discover-standalone
+bin/bshell
 bin/bssh
 bin/bvnc
 include/avahi-ui/avahi-ui.h
diff --git a/net/avahi-qt4/Makefile b/net/avahi-qt4/Makefile
index 1ea3c4072bac..5b212fe74b21 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/Makefile b/net/avahi/Makefile
index 5f241bdb6fce..d5e362accc1b 100644
--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	avahi
-PORTVERSION=	0.6.21
-PORTREVISION?=	1
+PORTVERSION=	0.6.22
+PORTREVISION?=	0
 CATEGORIES?=	net dns
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/net/py-avahi/Makefile b/net/py-avahi/Makefile
index d4918761f959..dae008bedd5a 100644
--- a/net/py-avahi/Makefile
+++ b/net/py-avahi/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #    $MCom: ports/net/py-avahi/Makefile,v 1.4 2007/07/31 18:24:13 ahze Exp $
 
-PORTREVISION=	1
+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 18e948d0dd20..3a8c2ac4d1f0 100644
--- a/net/py-avahi/pkg-plist
+++ b/net/py-avahi/pkg-plist
@@ -1,15 +1,20 @@
 bin/avahi-bookmarks
 bin/avahi-discover
-lib/%%PYTHON_VERSION%%/site-packages/avahi/ServiceTypeDatabase.py
-lib/%%PYTHON_VERSION%%/site-packages/avahi/ServiceTypeDatabase.pyc
-lib/%%PYTHON_VERSION%%/site-packages/avahi/ServiceTypeDatabase.pyo
-lib/%%PYTHON_VERSION%%/site-packages/avahi/SimpleGladeApp.py
-lib/%%PYTHON_VERSION%%/site-packages/avahi/SimpleGladeApp.pyc
-lib/%%PYTHON_VERSION%%/site-packages/avahi/SimpleGladeApp.pyo
-lib/%%PYTHON_VERSION%%/site-packages/avahi/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/avahi/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/avahi/__init__.pyo
+%%PYTHON_SITELIBDIR%%/avahi/ServiceTypeDatabase.py
+%%PYTHON_SITELIBDIR%%/avahi/ServiceTypeDatabase.pyc
+%%PYTHON_SITELIBDIR%%/avahi/ServiceTypeDatabase.pyo
+%%PYTHON_SITELIBDIR%%/avahi/__init__.py
+%%PYTHON_SITELIBDIR%%/avahi/__init__.pyc
+%%PYTHON_SITELIBDIR%%/avahi/__init__.pyo
+%%PYTHON_SITELIBDIR%%/avahi_discover/SimpleGladeApp.py
+%%PYTHON_SITELIBDIR%%/avahi_discover/SimpleGladeApp.pyc
+%%PYTHON_SITELIBDIR%%/avahi_discover/SimpleGladeApp.pyo
+%%PYTHON_SITELIBDIR%%/avahi_discover/__init__.py
+%%PYTHON_SITELIBDIR%%/avahi_discover/__init__.pyc
+%%PYTHON_SITELIBDIR%%/avahi_discover/__init__.pyo
 share/applications/avahi-discover.desktop
 %%DATADIR%%/service-types.db
 @dirrmtry share/applications
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/avahi
+@dirrm %%DATADIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/avahi_discover
+@dirrm %%PYTHON_SITELIBDIR%%/avahi