10 files changed, 21 insertions, 17 deletions

diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
index 721919341c70..1c68a36fac70 100644
--- a/net/avahi-app/Makefile
+++ b/net/avahi-app/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	avahi
 PORTVERSION=	0.6.31
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	net dns
 MASTER_SITES=	http://www.avahi.org/download/
 PKGNAMESUFFIX?=	-app
@@ -23,11 +23,11 @@ LIB_DEPENDS?=	libexpat.so:${PORTSDIR}/textproc/expat2 \
 USERS?=		${PORTNAME}
 GROUPS?=	${USERS}
 
-USE_GNOME+=	ltverhack glib20 intltool introspection
-USES=		gettext gmake pathfix pkgconfig
+USES=		gettext gmake libtool:keepla pathfix pkgconfig
+USE_GNOME+=	glib20 intltool introspection
 USE_GNOME_SUBR=	yes
-USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS?=--with-distro=freebsd \
 		--with-dbus-system-socket=unix:path=/var/run/dbus/system_bus_socket \
 		--disable-monodoc \
@@ -38,6 +38,7 @@ CONFIGURE_ARGS?=--with-distro=freebsd \
 		--enable-compat-howl
 CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_KQUEUE
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
 .if ${AVAHI_SLAVE} == no
 CONFLICTS=	howl-[0-9]*
@@ -121,7 +122,7 @@ post-build: avahi-post-build
 
 avahi-post-build:
 .for f in ${AVAHI_PKGCONFIG}
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} \
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${f}
 .endfor
 
@@ -152,14 +153,7 @@ avahi-post-install:
 .if ${AVAHI_SLAVE}==no
 	${INSTALL_DATA} ${FILESDIR}/org.freedesktop.Avahi.service \
 		${STAGEDIR}${PREFIX}/share/dbus-1/system-services
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so*
-.elif ${AVAHI_SLAVE}==gtk3
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libavahi-ui-gtk3.so.0
-.elif ${AVAHI_SLAVE}==libdns
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libdns_sd.so.1
-.elif ${AVAHI_SLAVE}==qt4
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libavahi-qt4.so.1
 .endif
-.endif # avahi-header
+.endif # ! avahi-header
 
 .include <bsd.port.mk>
diff --git a/net/avahi-app/pkg-plist b/net/avahi-app/pkg-plist
index d56a940716c3..9cc5eadfaffa 100644
--- a/net/avahi-app/pkg-plist
+++ b/net/avahi-app/pkg-plist
@@ -77,26 +77,32 @@ lib/libavahi-client.a
 lib/libavahi-client.la
 lib/libavahi-client.so
 lib/libavahi-client.so.3
+lib/libavahi-client.so.3.2.9
 lib/libavahi-common.a
 lib/libavahi-common.la
 lib/libavahi-common.so
 lib/libavahi-common.so.3
+lib/libavahi-common.so.3.5.3
 lib/libavahi-core.a
 lib/libavahi-core.la
 lib/libavahi-core.so
 lib/libavahi-core.so.7
+lib/libavahi-core.so.7.0.2
 lib/libavahi-glib.a
 lib/libavahi-glib.la
 lib/libavahi-glib.so
 lib/libavahi-glib.so.1
+lib/libavahi-glib.so.1.0.2
 lib/libavahi-gobject.a
 lib/libavahi-gobject.la
 lib/libavahi-gobject.so
 lib/libavahi-gobject.so.0
+lib/libavahi-gobject.so.0.0.4
 lib/libhowl.a
 lib/libhowl.la
 lib/libhowl.so
 lib/libhowl.so.0
+lib/libhowl.so.0.0.0
 libdata/pkgconfig/avahi-client.pc
 libdata/pkgconfig/avahi-compat-howl.pc
 libdata/pkgconfig/avahi-core.pc
diff --git a/net/avahi-gtk/Makefile b/net/avahi-gtk/Makefile
index c56a136c8030..b5dbc4abff91 100644
--- a/net/avahi-gtk/Makefile
+++ b/net/avahi-gtk/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #   $MCom: ports/net/avahi-gtk/Makefile,v 1.9 2012/07/09 18:22:19 kwm Exp $
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 PKGNAMESUFFIX=	-gtk
 
diff --git a/net/avahi-gtk/pkg-plist b/net/avahi-gtk/pkg-plist
index 1a0ab945031e..9bcdd848a791 100644
--- a/net/avahi-gtk/pkg-plist
+++ b/net/avahi-gtk/pkg-plist
@@ -6,6 +6,7 @@ lib/libavahi-ui.a
 lib/libavahi-ui.la
 lib/libavahi-ui.so
 lib/libavahi-ui.so.0
+lib/libavahi-ui.so.0.1.4
 libdata/pkgconfig/avahi-ui.pc
 man/man1/bshell.1.gz
 man/man1/bssh.1.gz
diff --git a/net/avahi-gtk3/Makefile b/net/avahi-gtk3/Makefile
index 2214cbb16287..ca3428ff4fe9 100644
--- a/net/avahi-gtk3/Makefile
+++ b/net/avahi-gtk3/Makefile
@@ -1,7 +1,7 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 PKGNAMESUFFIX=	-gtk3
 
diff --git a/net/avahi-gtk3/pkg-plist b/net/avahi-gtk3/pkg-plist
index 08125fa552f3..c2e124d5811a 100644
--- a/net/avahi-gtk3/pkg-plist
+++ b/net/avahi-gtk3/pkg-plist
@@ -2,4 +2,5 @@ lib/libavahi-ui-gtk3.a
 lib/libavahi-ui-gtk3.la
 lib/libavahi-ui-gtk3.so
 lib/libavahi-ui-gtk3.so.0
+lib/libavahi-ui-gtk3.so.0.1.4
 libdata/pkgconfig/avahi-ui-gtk3.pc
diff --git a/net/avahi-libdns/Makefile b/net/avahi-libdns/Makefile
index 7b1566c45cba..db3762c1d3dd 100644
--- a/net/avahi-libdns/Makefile
+++ b/net/avahi-libdns/Makefile
@@ -1,7 +1,7 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net
 PKGNAMESUFFIX=	-libdns
 
diff --git a/net/avahi-libdns/pkg-plist b/net/avahi-libdns/pkg-plist
index 16d0e55333ef..25a6263a9bcf 100644
--- a/net/avahi-libdns/pkg-plist
+++ b/net/avahi-libdns/pkg-plist
@@ -3,5 +3,6 @@ lib/libdns_sd.a
 lib/libdns_sd.la
 lib/libdns_sd.so
 lib/libdns_sd.so.1
+lib/libdns_sd.so.1.0.0
 libdata/pkgconfig/avahi-compat-libdns_sd.pc
 @dirrm include/avahi-compat-libdns_sd
diff --git a/net/avahi-qt4/Makefile b/net/avahi-qt4/Makefile
index f3576a54dab2..29c738fd0a56 100644
--- a/net/avahi-qt4/Makefile
+++ b/net/avahi-qt4/Makefile
@@ -1,7 +1,7 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net
 PKGNAMESUFFIX=	-qt4
 
diff --git a/net/avahi-qt4/pkg-plist b/net/avahi-qt4/pkg-plist
index d2519e300d37..35fb4eb7b479 100644
--- a/net/avahi-qt4/pkg-plist
+++ b/net/avahi-qt4/pkg-plist
@@ -3,5 +3,6 @@ lib/libavahi-qt4.a
 lib/libavahi-qt4.la
 lib/libavahi-qt4.so
 lib/libavahi-qt4.so.1
+lib/libavahi-qt4.so.1.0.2
 libdata/pkgconfig/avahi-qt4.pc
 @dirrm include/avahi-qt4