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

2 files changed, 5 insertions, 22 deletions

diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index 4600536e1..c4e22f0ca 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -1,9 +1,10 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports-experimental/trunk/sysutils/gnome-settings-daemon/Makefile 19545 2014-04-16 12:23:11Z gusi $
+#   $MCom$
 
 PORTNAME=	gnome-settings-daemon
 PORTVERSION=	3.12.2
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -14,7 +15,7 @@ COMMENT=	GNOME 3 settings daemon
 BUILD_DEPENDS=	gnome-session>=0:${PORTSDIR}/x11/gnome-session \
 		geoclue>=0:${PORTSDIR}/net/geoclue \
 		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \
-		${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas
+		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
 LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \
 		libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \
 		libibus-1.0.so:${PORTSDIR}/textproc/ibus \
@@ -28,11 +29,11 @@ LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \
 		libgweather-3.so:${PORTSDIR}/net/libgweather
 RUN_DEPENDS=	gnome-session>=0:${PORTSDIR}/x11/gnome-session \
 		geoclue>=0:${PORTSDIR}/net/geoclue \
-		${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas
+		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
 
 USE_XORG=	xxf86misc
 USE_GNOME=	gnomehier gnomedesktop3 gnomeprefix intlhack
-USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
+USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--disable-gudev \
diff --git a/sysutils/gnome-settings-daemon/pkg-plist b/sysutils/gnome-settings-daemon/pkg-plist
index b8b7b5a5a..2fb9bb1f3 100644
--- a/sysutils/gnome-settings-daemon/pkg-plist
+++ b/sysutils/gnome-settings-daemon/pkg-plist
@@ -10,58 +10,40 @@ lib/gnome-settings-daemon-3.0/datetime.gnome-settings-plugin
 lib/gnome-settings-daemon-3.0/housekeeping.gnome-settings-plugin
 lib/gnome-settings-daemon-3.0/keyboard.gnome-settings-plugin
 lib/gnome-settings-daemon-3.0/liba11y-keyboard.a
-lib/gnome-settings-daemon-3.0/liba11y-keyboard.la
 lib/gnome-settings-daemon-3.0/liba11y-keyboard.so
 lib/gnome-settings-daemon-3.0/liba11y-settings.a
-lib/gnome-settings-daemon-3.0/liba11y-settings.la
 lib/gnome-settings-daemon-3.0/liba11y-settings.so
 lib/gnome-settings-daemon-3.0/libclipboard.a
-lib/gnome-settings-daemon-3.0/libclipboard.la
 lib/gnome-settings-daemon-3.0/libclipboard.so
 lib/gnome-settings-daemon-3.0/libcolor.a
-lib/gnome-settings-daemon-3.0/libcolor.la
 lib/gnome-settings-daemon-3.0/libcolor.so
 lib/gnome-settings-daemon-3.0/libcursor.a
-lib/gnome-settings-daemon-3.0/libcursor.la
 lib/gnome-settings-daemon-3.0/libcursor.so
 lib/gnome-settings-daemon-3.0/libdatetime.a
-lib/gnome-settings-daemon-3.0/libdatetime.la
 lib/gnome-settings-daemon-3.0/libdatetime.so
 lib/gnome-settings-daemon-3.0/libgsd.a
-lib/gnome-settings-daemon-3.0/libgsd.la
 lib/gnome-settings-daemon-3.0/libgsd.so
 lib/gnome-settings-daemon-3.0/libhousekeeping.a
-lib/gnome-settings-daemon-3.0/libhousekeeping.la
 lib/gnome-settings-daemon-3.0/libhousekeeping.so
 lib/gnome-settings-daemon-3.0/libkeyboard.a
-lib/gnome-settings-daemon-3.0/libkeyboard.la
 lib/gnome-settings-daemon-3.0/libkeyboard.so
 lib/gnome-settings-daemon-3.0/libmedia-keys.a
-lib/gnome-settings-daemon-3.0/libmedia-keys.la
 lib/gnome-settings-daemon-3.0/libmedia-keys.so
 lib/gnome-settings-daemon-3.0/libmouse.a
-lib/gnome-settings-daemon-3.0/libmouse.la
 lib/gnome-settings-daemon-3.0/libmouse.so
 lib/gnome-settings-daemon-3.0/libpower.a
-lib/gnome-settings-daemon-3.0/libpower.la
 lib/gnome-settings-daemon-3.0/libpower.so
 %%CUPS%%lib/gnome-settings-daemon-3.0/libprint-notifications.a
-%%CUPS%%lib/gnome-settings-daemon-3.0/libprint-notifications.la
 %%CUPS%%lib/gnome-settings-daemon-3.0/libprint-notifications.so
 lib/gnome-settings-daemon-3.0/libscreensaver-proxy.a
-lib/gnome-settings-daemon-3.0/libscreensaver-proxy.la
 lib/gnome-settings-daemon-3.0/libscreensaver-proxy.so
 %%SMARTCARD%%lib/gnome-settings-daemon-3.0/libsmartcard.a
-%%SMARTCARD%%lib/gnome-settings-daemon-3.0/libsmartcard.la
 %%SMARTCARD%%lib/gnome-settings-daemon-3.0/libsmartcard.so
 lib/gnome-settings-daemon-3.0/libsound.a
-lib/gnome-settings-daemon-3.0/libsound.la
 lib/gnome-settings-daemon-3.0/libsound.so
 lib/gnome-settings-daemon-3.0/libxrandr.a
-lib/gnome-settings-daemon-3.0/libxrandr.la
 lib/gnome-settings-daemon-3.0/libxrandr.so
 lib/gnome-settings-daemon-3.0/libxsettings.a
-lib/gnome-settings-daemon-3.0/libxsettings.la
 lib/gnome-settings-daemon-3.0/libxsettings.so
 lib/gnome-settings-daemon-3.0/media-keys.gnome-settings-plugin
 lib/gnome-settings-daemon-3.0/mouse.gnome-settings-plugin