Switch to USES=libtool:keepla for now. While I rather want to ditch .la files

I think we need to keep em a cycle. So that other ports have a chance to
update there .la files not to record dependancies .la files.
sprinkle some USE_AUTOTOOLS=libtool -> libtoolize. This will give us base
libtool (ltmain.sh and libtool.m4) files. But doesn't depend on
${LOCALBASE}/bin/libtool
INSTALL_TARGET=install-strip and misc smaller cleanups.


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

7 files changed, 11 insertions, 15 deletions

diff --git a/sysutils/accountsservice/Makefile b/sysutils/accountsservice/Makefile
index 63a5ee0ae..7026f7cb8 100644
--- a/sysutils/accountsservice/Makefile
+++ b/sysutils/accountsservice/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 		libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit
 
 USE_GNOME=	glib20 gnomehier intlhack introspection:build libxslt
-USES=		gettext gmake libtool pathfix pkgconfig tar:xz
+USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-systemd --localstatedir=/var/
diff --git a/sysutils/cinnamon-control-center/Makefile b/sysutils/cinnamon-control-center/Makefile
index b19d4b5b8..c98be8051 100644
--- a/sysutils/cinnamon-control-center/Makefile
+++ b/sysutils/cinnamon-control-center/Makefile
@@ -36,19 +36,20 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-
 		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
 		py*-lxml>=0:${PORTSDIR}/devel/py-lxml
 
-USES=		gettext gmake pathfix pkgconfig
+USES=		gettext libtool:keepla gmake pathfix pkgconfig
 USE_GNOME=	evolutiondataserver3 gconf2 gnomeprefix \
 		gtk30 intlhack libgnomekbd
 USE_XORG=	x11 xfixes sm
 USE_PYTHON=	yes
 INSTALLS_ICONS=	yes
-USE_AUTOTOOLS=	libtool autoconf automake
+USE_AUTOTOOLS=	libtoolize autoconf automake
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-compile-warnings=no
 CFLAGS+=	-I${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	CUPS
 OPTIONS_DEFAULT=CUPS
@@ -72,8 +73,4 @@ post-patch:
 pre-configure:
 	cd ${WRKSRC} && NOCONFIGURE=yes ${SH} ./autogen.sh
 
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/cinnamon-control-center-1/panels/lib*.so
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcinnamon-control-center.so.1
-
 .include <bsd.port.mk>
diff --git a/sysutils/cinnamon-control-center/pkg-plist b/sysutils/cinnamon-control-center/pkg-plist
index ad6d79c5d..763599f69 100644
--- a/sysutils/cinnamon-control-center/pkg-plist
+++ b/sysutils/cinnamon-control-center/pkg-plist
@@ -32,6 +32,7 @@ lib/cinnamon-control-center-1/panels/libuniversal-access.so
 lib/libcinnamon-control-center.la
 lib/libcinnamon-control-center.so
 lib/libcinnamon-control-center.so.1
+lib/libcinnamon-control-center.so.1.0.0
 libdata/pkgconfig/libcinnamon-control-center.pc
 share/applications/cinnamon-color-panel.desktop
 share/applications/cinnamon-control-center.desktop
diff --git a/sysutils/cinnamon-settings-daemon/Makefile b/sysutils/cinnamon-settings-daemon/Makefile
index 58645bb66..450a1454a 100644
--- a/sysutils/cinnamon-settings-daemon/Makefile
+++ b/sysutils/cinnamon-settings-daemon/Makefile
@@ -30,10 +30,10 @@ RUN_DEPENDS=	cinnamon-session:${PORTSDIR}/x11/cinnamon-session \
 
 USE_GNOME=	gnomehier gnomeprefix intlhack libgnomekbd \
 		libxslt:build
-USES=		gettext gmake pathfix pkgconfig tar:xz
+USES=		gettext libtool:keepla gmake pathfix pkgconfig tar:xz
 USE_XORG=	xxf86misc
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool autoconf automake
+USE_AUTOTOOLS=	libtoolize autoconf automake
 PATHFIX_MAKEFILEIN=	Makefile.am
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
@@ -43,6 +43,7 @@ CONFIGURE_ARGS=	--disable-gudev \
 		--with-gnome-distributor="FreeBSD GNOME Project"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.cinnamon.settings-daemon.enums.xml \
 		org.cinnamon.settings-daemon.peripherals.gschema.xml \
@@ -89,7 +90,4 @@ post-patch:
 pre-configure:
 	cd ${WRKSRC} && NOCONFIGURE=yes ${SH} ./autogen.sh
 
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/cinnamon-settings-daemon-3.0/lib*.so
-
 .include <bsd.port.mk>
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index f74abc93e..e05c651b9 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -32,7 +32,7 @@ RUN_DEPENDS=	gnome-session>=0:${PORTSDIR}/x11/gnome-session \
 
 USE_XORG=	xxf86misc
 USE_GNOME=	gnomehier gnomedesktop3 gnomeprefix intlhack
-USES=		gettext gmake libtool pathfix pkgconfig tar:xz
+USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--disable-gudev \
diff --git a/sysutils/tracker/Makefile b/sysutils/tracker/Makefile
index 684adcc50..82c8ec8fc 100644
--- a/sysutils/tracker/Makefile
+++ b/sysutils/tracker/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS=	xdg-desktop-icon:${PORTSDIR}/devel/xdg-utils \
 
 PLIST_SUB=	TRACKER_VER="1.0"
 
-USES=		gettext gmake libtool pathfix pkgconfig tar:xz
+USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
 USE_GNOME=	gnomeprefix gtk30 intltool introspection:build
 USE_LDCONFIG=	yes
 USE_SQLITE=	3
diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index 52788609b..0a639f9b7 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \
 		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 
-USES=		gettext gmake libtool pathfix pkgconfig tar:xz
+USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
 USE_GNOME=	intlhack glib20 introspection:build
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes