Drop :keepla from libtool USES.

While here fix some stage qa issues, in a couple of these ports.

9 files changed, 14 insertions, 16 deletions

diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
index a19fcd7de18f..355a67301dde 100644
--- a/net/avahi-app/Makefile
+++ b/net/avahi-app/Makefile
@@ -1,10 +1,9 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/net/avahi-app/Makefile,v 1.25 2012/09/01 23:02:11 mezz Exp $
 
 PORTNAME=	avahi
 PORTVERSION=	0.6.31
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES?=	net dns
 MASTER_SITES=	http://www.avahi.org/download/
 PKGNAMESUFFIX?=	-app
@@ -23,7 +22,7 @@ LIB_DEPENDS?=	libexpat.so:${PORTSDIR}/textproc/expat2 \
 USERS?=		${PORTNAME}
 GROUPS?=	${USERS}
 
-USES+=		alias gettext gmake libtool:keepla pathfix pkgconfig
+USES+=		alias gettext gmake libtool pathfix pkgconfig
 USE_GNOME+=	glib20 intltool introspection
 USE_GNOME_SUBR=	yes
 USE_LDCONFIG=	yes
diff --git a/net/avahi-app/pkg-plist b/net/avahi-app/pkg-plist
index db4693b39c2e..26557a9150a7 100644
--- a/net/avahi-app/pkg-plist
+++ b/net/avahi-app/pkg-plist
@@ -74,32 +74,26 @@ 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-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
diff --git a/net/avahi-gtk/Makefile b/net/avahi-gtk/Makefile
index 3ae983c7f2aa..f6fdcbe92532 100644
--- a/net/avahi-gtk/Makefile
+++ b/net/avahi-gtk/Makefile
@@ -1,8 +1,7 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/net/avahi-gtk/Makefile,v 1.9 2012/07/09 18:22:19 kwm Exp $
 
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 PKGNAMESUFFIX=	-gtk
 
diff --git a/net/avahi-gtk/pkg-plist b/net/avahi-gtk/pkg-plist
index 42e4c12780f9..ba8c3ee86fc4 100644
--- a/net/avahi-gtk/pkg-plist
+++ b/net/avahi-gtk/pkg-plist
@@ -3,7 +3,6 @@ bin/bshell
 bin/bssh
 bin/bvnc
 lib/libavahi-ui.a
-lib/libavahi-ui.la
 lib/libavahi-ui.so
 lib/libavahi-ui.so.0
 lib/libavahi-ui.so.0.1.4
diff --git a/net/avahi-gtk3/Makefile b/net/avahi-gtk3/Makefile
index c7c38af42fb4..c3c439513be5 100644
--- a/net/avahi-gtk3/Makefile
+++ b/net/avahi-gtk3/Makefile
@@ -1,7 +1,7 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 PKGNAMESUFFIX=	-gtk3
 
@@ -28,4 +28,7 @@ do-build:
 do-install:
 	@(cd ${WRKSRC}/avahi-ui; ${MAKE_CMD} ${MAKE_ARGS} install-libLTLIBRARIES)
 
+post-install:
+	@${RMDIR} ${STAGEDIR}${PREFIX}/etc/avahi
+
 .include "${MASTERDIR}/Makefile"
diff --git a/net/avahi-gtk3/pkg-plist b/net/avahi-gtk3/pkg-plist
index c2e124d5811a..356dded5ca13 100644
--- a/net/avahi-gtk3/pkg-plist
+++ b/net/avahi-gtk3/pkg-plist
@@ -1,5 +1,4 @@
 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
diff --git a/net/avahi-libdns/Makefile b/net/avahi-libdns/Makefile
index db3762c1d3dd..829877a7f79d 100644
--- a/net/avahi-libdns/Makefile
+++ b/net/avahi-libdns/Makefile
@@ -1,7 +1,7 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 PKGNAMESUFFIX=	-libdns
 
@@ -21,4 +21,7 @@ AVAHI_PKGCONFIG=avahi-compat-libdns_sd.pc
 
 CONFLICTS=	mDNSResponder-[0-9]*
 
+post-install:
+	@${RMDIR} ${STAGEDIR}${PREFIX}/etc/avahi
+
 .include "${MASTERDIR}/Makefile"
diff --git a/net/avahi-libdns/pkg-plist b/net/avahi-libdns/pkg-plist
index 2d490c79745a..93c575b08f99 100644
--- a/net/avahi-libdns/pkg-plist
+++ b/net/avahi-libdns/pkg-plist
@@ -1,6 +1,5 @@
 include/avahi-compat-libdns_sd/dns_sd.h
 lib/libdns_sd.a
-lib/libdns_sd.la
 lib/libdns_sd.so
 lib/libdns_sd.so.1
 lib/libdns_sd.so.1.0.0
diff --git a/net/avahi-sharp/Makefile b/net/avahi-sharp/Makefile
index d867b5312df4..e0749fb070bb 100644
--- a/net/avahi-sharp/Makefile
+++ b/net/avahi-sharp/Makefile
@@ -27,4 +27,7 @@ post-patch:
 		${BUILD_WRKSRC}/avahi-sharp.dll.config.in
 	@${CP} ${WRKSRC}/avahi-sharp/avahi-sharp.dll.config.in ${WRKSRC}/avahi-sharp/avahi-sharp.dll.config
 
+post-install:
+	@${RMDIR} ${STAGEDIR}${PREFIX}/etc/avahi
+
 .include "${MASTERDIR}/Makefile"