Remove keepla from MC. While here do other changes:

        - Remove STRIP_CMD all over the place and replace
          that with INSTALL_TARGET=install-tsrip
        - Drop full path  *_DEPENDS (like ${LOCALBASE}/bin/flex)
          and use either binary names (when possible) or
          package names instead.

I've been tempted to convert options to a more compact form, but
this will happen in the future.

Tested by: two complete poudriere runs


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

12 files changed, 19 insertions, 43 deletions

diff --git a/net/geocode-glib/Makefile b/net/geocode-glib/Makefile
index e8d5ab458..68b4d1f6f 100644
--- a/net/geocode-glib/Makefile
+++ b/net/geocode-glib/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	geocode-glib
 PORTVERSION=	3.12.2
+PORTREVISION=	1
 CATEGORIES=	net devel gnome
 MASTER_SITES=	GNOME
 
@@ -13,13 +14,14 @@ COMMENT=	Convenience library for the geocoding and reverse geocoding
 LIB_DEPENDS=	libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib \
 		libsoup-2.4.so:${PORTSDIR}/devel/libsoup
 
-USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
+USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	evolutiondataserver3 gnomehier intlhack
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV=	XDG_CACHE_HOME=${WRKDIR}
+INSTALL_TARGET=	install-strip
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|SoupGNOME|Soup|' \
diff --git a/net/geocode-glib/pkg-plist b/net/geocode-glib/pkg-plist
index a67abd97b..555d2cbb9 100644
--- a/net/geocode-glib/pkg-plist
+++ b/net/geocode-glib/pkg-plist
@@ -7,7 +7,6 @@ include/geocode-glib-1.0/geocode-glib/geocode-location.h
 include/geocode-glib-1.0/geocode-glib/geocode-place.h
 include/geocode-glib-1.0/geocode-glib/geocode-reverse.h
 lib/girepository-1.0/GeocodeGlib-1.0.typelib
-lib/libgeocode-glib.la
 lib/libgeocode-glib.so
 lib/libgeocode-glib.so.0
 lib/libgeocode-glib.so.0.0.0
diff --git a/net/gnome-online-accounts/Makefile b/net/gnome-online-accounts/Makefile
index f5c092ba3..d5f7f5fbb 100644
--- a/net/gnome-online-accounts/Makefile
+++ b/net/gnome-online-accounts/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	gnome-online-accounts
 PORTVERSION=	3.12.4
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	GNOME
 
@@ -20,7 +21,7 @@ LIB_DEPENDS=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 \
 		libsecret-1.so:${PORTSDIR}/security/libsecret \
 		librest-0.7.so:${PORTSDIR}/devel/librest
 
-USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
+USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	gtk30 intlhack introspection:build libxslt:build
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/net/gnome-online-accounts/pkg-plist b/net/gnome-online-accounts/pkg-plist
index fec59e950..5858b8a57 100644
--- a/net/gnome-online-accounts/pkg-plist
+++ b/net/gnome-online-accounts/pkg-plist
@@ -12,12 +12,10 @@ include/goa-1.0/goabackend/goabackendtypes.h
 include/goa-1.0/goabackend/goaprovider.h
 lib/girepository-1.0/Goa-1.0.typelib
 lib/libgoa-1.0.a
-lib/libgoa-1.0.la
 lib/libgoa-1.0.so
 lib/libgoa-1.0.so.0
 lib/libgoa-1.0.so.0.0.0
 lib/libgoa-backend-1.0.a
-lib/libgoa-backend-1.0.la
 lib/libgoa-backend-1.0.so
 lib/libgoa-backend-1.0.so.1.0.0
 include/goa-1.0/goa/goaversion.h
diff --git a/net/grilo-plugins/Makefile b/net/grilo-plugins/Makefile
index 544b5d4d7..0dae88549 100644
--- a/net/grilo-plugins/Makefile
+++ b/net/grilo-plugins/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	grilo-plugins
 PORTVERSION=	0.2.12
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	GNOME
 
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libgrilo-0.2.so:${PORTSDIR}/net/grilo \
 		libavahi-gobject.so:${PORTSDIR}/net/avahi-app \
 		libgdata.so:${PORTSDIR}/devel/libgdata
 
-USES=		gmake libtool:keepla pathfix pkgconfig tar:xz
+USES=		gmake libtool pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
 USE_GNOME=	glib20 gnomehier intlhack libxml2
 GNU_CONFIGURE=	yes
@@ -26,6 +26,7 @@ CONFIGURE_ARGS=	--enable-youtube \
 		--enable-tmdb
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/grilo-0.2/
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
 OPTIONS_SUB=			yes
 OPTIONS_DEFINE=                 TRACKER UPNP DMAP
diff --git a/net/grilo-plugins/pkg-plist b/net/grilo-plugins/pkg-plist
index 3e50499ab..19508febf 100644
--- a/net/grilo-plugins/pkg-plist
+++ b/net/grilo-plugins/pkg-plist
@@ -21,51 +21,28 @@ lib/grilo-0.2/grl-tmdb.xml
 %%UPNP%%lib/grilo-0.2/grl-upnp.xml
 lib/grilo-0.2/grl-vimeo.xml
 lib/grilo-0.2/grl-youtube.xml
-lib/grilo-0.2/libgrlappletrailers.la
 lib/grilo-0.2/libgrlappletrailers.so
-lib/grilo-0.2/libgrlbliptv.la
 lib/grilo-0.2/libgrlbliptv.so
-lib/grilo-0.2/libgrlbookmarks.la
 lib/grilo-0.2/libgrlbookmarks.so
-%%DMAP%%lib/grilo-0.2/libgrldmap.la
 %%DMAP%%lib/grilo-0.2/libgrldmap.so
-lib/grilo-0.2/libgrlfilesystem.la
 lib/grilo-0.2/libgrlfilesystem.so
-lib/grilo-0.2/libgrlflickr.la
 lib/grilo-0.2/libgrlflickr.so
-lib/grilo-0.2/libgrlfreebox.la
 lib/grilo-0.2/libgrlfreebox.so
-lib/grilo-0.2/libgrlgravatar.la
 lib/grilo-0.2/libgrlgravatar.so
-lib/grilo-0.2/libgrljamendo.la
 lib/grilo-0.2/libgrljamendo.so
-lib/grilo-0.2/libgrllastfm-albumart.la
 lib/grilo-0.2/libgrllastfm-albumart.so
-%%TRACKER%%lib/grilo-0.2/libgrllocalmetadata.la
 %%TRACKER%%lib/grilo-0.2/libgrllocalmetadata.so
-lib/grilo-0.2/libgrlmagnatune.la
 lib/grilo-0.2/libgrlmagnatune.so
-lib/grilo-0.2/libgrlmetadatastore.la
 lib/grilo-0.2/libgrlmetadatastore.so
-lib/grilo-0.2/libgrloptical-media.la
 lib/grilo-0.2/libgrloptical-media.so
-lib/grilo-0.2/libgrlpocket.la
 lib/grilo-0.2/libgrlpocket.so
-lib/grilo-0.2/libgrlpodcasts.la
 lib/grilo-0.2/libgrlpodcasts.so
-lib/grilo-0.2/libgrlraitv.la
 lib/grilo-0.2/libgrlraitv.so
-lib/grilo-0.2/libgrlshoutcast.la
 lib/grilo-0.2/libgrlshoutcast.so
-lib/grilo-0.2/libgrltmdb.la
 lib/grilo-0.2/libgrltmdb.so
-%%TRACKER%%lib/grilo-0.2/libgrltracker.la
 %%TRACKER%%lib/grilo-0.2/libgrltracker.so
-%%UPNP%%lib/grilo-0.2/libgrlupnp.la
 %%UPNP%%lib/grilo-0.2/libgrlupnp.so
-lib/grilo-0.2/libgrlvimeo.la
 lib/grilo-0.2/libgrlvimeo.so
-lib/grilo-0.2/libgrlyoutube.la
 lib/grilo-0.2/libgrlyoutube.so
 share/help/C/examples/example-tmdb.c
 share/help/C/grilo-plugins/grilo-plugins.xml
diff --git a/net/grilo/Makefile b/net/grilo/Makefile
index 04eff1891..c5aa806ff 100644
--- a/net/grilo/Makefile
+++ b/net/grilo/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	grilo
 PORTVERSION=	0.2.10
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	GNOME
 
@@ -15,13 +16,14 @@ LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
 		liboauth.so:${PORTSDIR}/net/liboauth \
 		libtotem-plparser.so:${PORTSDIR}/multimedia/totem-pl-parser
 
-USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
+USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
 USE_GNOME=	glib20 gnomehier intlhack introspection:build libxml2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-vala -disable-debug
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALl_TARGET=	install-strip
 
 #  --enable-debug include debug symbols
 CONFIGURE_ARGS+=--enable-tests #          build unit tests
diff --git a/net/grilo/pkg-plist b/net/grilo/pkg-plist
index 9e32a53c2..45f639e39 100644
--- a/net/grilo/pkg-plist
+++ b/net/grilo/pkg-plist
@@ -31,17 +31,14 @@ lib/girepository-1.0/Grl-0.2.typelib
 lib/girepository-1.0/GrlNet-0.2.typelib
 lib/girepository-1.0/GrlPls-0.2.typelib
 lib/libgrilo-0.2.a
-lib/libgrilo-0.2.la
 lib/libgrilo-0.2.so
 lib/libgrilo-0.2.so.1
 lib/libgrilo-0.2.so.1.6.0
 lib/libgrlnet-0.2.a
-lib/libgrlnet-0.2.la
 lib/libgrlnet-0.2.so
 lib/libgrlnet-0.2.so.0
 lib/libgrlnet-0.2.so.0.1.7
 lib/libgrlpls-0.2.a
-lib/libgrlpls-0.2.la
 lib/libgrlpls-0.2.so
 lib/libgrlpls-0.2.so.0
 lib/libgrlpls-0.2.so.0.0.2
diff --git a/net/libdmapsharing/Makefile b/net/libdmapsharing/Makefile
index c7b3fbba1..6ec2b4a80 100644
--- a/net/libdmapsharing/Makefile
+++ b/net/libdmapsharing/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	libdmapsharing
 PORTVERSION=	2.9.24
+PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	https://www.flyn.org/projects/libdmapsharing/
 DIST_SUBDIR=	gnome3
@@ -15,7 +16,7 @@ LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
 		libgee-0.8.so:${PORTSDIR}/devel/libgee
 BUILD_DEPENDS=	vala-vapigen>=0.16:${PORTSDIR}/lang/vala-vapigen
 
-USES=		gettext gmake libtool:keepla pathfix pkgconfig
+USES=		gettext gmake libtool pathfix pkgconfig
 USE_GNOME=	gnomeprefix gtk20 introspection:build
 USE_GSTREAMER1=	yes
 USE_LDCONFIG=	yes
@@ -24,6 +25,7 @@ CONFIGURE_ARGS=	--disable-introspection	\
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include `pkg-config --cflags gtk+-3.0`
 LDFLAGS+=	-L${LOCALBASE}/lib `pkg-config --libs gtk+-3.0`
+INSTALL_TARGET=	install-strip
 
 OPTIONS_SUB=	yes
 OPTIONS_SINGLE=	MDNS
diff --git a/net/libdmapsharing/pkg-plist b/net/libdmapsharing/pkg-plist
index 7f321fa6d..c7f86d1bb 100644
--- a/net/libdmapsharing/pkg-plist
+++ b/net/libdmapsharing/pkg-plist
@@ -22,7 +22,6 @@ include/libdmapsharing-3.0/libdmapsharing/dmap.h
 include/libdmapsharing-3.0/libdmapsharing/dpap-connection.h
 include/libdmapsharing-3.0/libdmapsharing/dpap-record.h
 include/libdmapsharing-3.0/libdmapsharing/dpap-share.h
-lib/libdmapsharing-3.0.la
 lib/libdmapsharing-3.0.so
 lib/libdmapsharing-3.0.so.2
 lib/libdmapsharing-3.0.so.2.9.24
diff --git a/net/libgweather/Makefile b/net/libgweather/Makefile
index e4c991a13..40a452363 100644
--- a/net/libgweather/Makefile
+++ b/net/libgweather/Makefile
@@ -4,17 +4,18 @@
 
 PORTNAME=	libgweather
 PORTVERSION=	3.12.2
+PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Library to accessing online weather informations
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
+BUILD_DEPENDS=	gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme
 LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
+RUN_DEPENDS=	gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme
 
-USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
+USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	gnomehier gnomeprefix gtk30 intlhack \
 		introspection:build
 INSTALLS_ICONS=	yes
@@ -22,10 +23,8 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 GLIB_SCHEMAS=	org.gnome.GWeather.enums.xml \
 		org.gnome.GWeather.gschema.xml
 
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.*
-
 .include <bsd.port.mk>
diff --git a/net/libgweather/pkg-plist b/net/libgweather/pkg-plist
index d6c07181c..e6802b592 100644
--- a/net/libgweather/pkg-plist
+++ b/net/libgweather/pkg-plist
@@ -9,7 +9,6 @@ include/libgweather-3.0/libgweather/timezone-menu.h
 include/libgweather-3.0/libgweather/gweather-version.h
 include/libgweather-3.0/libgweather/gweather-weather.h
 include/libgweather-3.0/libgweather/gweather.h
-lib/libgweather-3.la
 lib/libgweather-3.so
 lib/libgweather-3.so.6
 lib/libgweather-3.so.6.1.3