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

3 files changed, 7 insertions, 18 deletions

diff --git a/lang/cjs/Makefile b/lang/cjs/Makefile
index 2483dca82..f33067fad 100644
--- a/lang/cjs/Makefile
+++ b/lang/cjs/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	cjs
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	lang gnome
 MASTER_SITES=	http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
 DIST_SUBDIR=	gnome3
@@ -17,17 +18,18 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 
 CONFLICTS_BUILD=spidermonkey17-1.7.*
 
-USES=		gettext gmake pathfix pkgconfig shebangfix
+USES=		gettext libtool:keepla gmake pathfix pkgconfig shebangfix
 USE_GNOME=	cairo glib20 gnomeprefix introspection:build \
 		intlhack
 USE_PYTHON_BUILD=yes
 USE_LDCONFIG=	yes
 PATHFIX_MAKEFILEIN=	Makefile.am
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool autoconf automake
+USE_AUTOTOOLS=	libtoolize autoconf automake
 CFLAGS+=	-I${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS+=--enable-compile-warnings=no
 
 SHEBANG_FILES=	scripts/make-tests
@@ -37,8 +39,4 @@ python_CMD=	${PYTHON_CMD}
 pre-configure:
 	cd ${WRKSRC} && NOCONFIGURE=yes ${SH} ./autogen.sh
 
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcjs*so*
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/cjs-1.0/*so
-
 .include <bsd.port.mk>
diff --git a/lang/cjs/pkg-plist b/lang/cjs/pkg-plist
index 913e2aeb7..becc94f7e 100644
--- a/lang/cjs/pkg-plist
+++ b/lang/cjs/pkg-plist
@@ -29,41 +29,32 @@ include/cjs-1.0/gi/repo.h
 include/cjs-1.0/gi/union.h
 include/cjs-1.0/gi/value.h
 lib/cjs/girepository-1.0/CjsPrivate-1.0.typelib
-lib/cjs-1.0/cairoNative.a
 lib/cjs-1.0/cairoNative.la
 lib/cjs-1.0/cairoNative.so
-lib/cjs-1.0/console.a
 lib/cjs-1.0/console.la
 lib/cjs-1.0/console.so
-lib/cjs-1.0/dbusNative.a
 lib/cjs-1.0/dbusNative.la
 lib/cjs-1.0/dbusNative.so
-lib/cjs-1.0/debugger.a
 lib/cjs-1.0/debugger.la
 lib/cjs-1.0/debugger.so
-lib/cjs-1.0/formatNative.a
 lib/cjs-1.0/formatNative.la
 lib/cjs-1.0/formatNative.so
-lib/cjs-1.0/gettextNative.a
 lib/cjs-1.0/gettextNative.la
 lib/cjs-1.0/gettextNative.so
-lib/cjs-1.0/langNative.a
 lib/cjs-1.0/langNative.la
 lib/cjs-1.0/langNative.so
-lib/cjs-1.0/mainloop.a
 lib/cjs-1.0/mainloop.la
 lib/cjs-1.0/mainloop.so
-lib/cjs-1.0/system.a
 lib/cjs-1.0/system.la
 lib/cjs-1.0/system.so
-lib/libcjs-dbus.a
 lib/libcjs-dbus.la
 lib/libcjs-dbus.so
 lib/libcjs-dbus.so.0
-lib/libcjs.a
+lib/libcjs-dbus.so.0.0.0
 lib/libcjs.la
 lib/libcjs.so
 lib/libcjs.so.0
+lib/libcjs.so.0.0.0
 libdata/pkgconfig/cjs-1.0.pc
 libdata/pkgconfig/cjs-dbus-1.0.pc
 libdata/pkgconfig/cjs-internals-1.0.pc
diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile
index bbf2984ef..8ceae1d28 100644
--- a/lang/gjs/Makefile
+++ b/lang/gjs/Makefile
@@ -14,7 +14,7 @@ COMMENT=	GNOME Javascript binding
 LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 		libmozjs-24.so:${PORTSDIR}/lang/spidermonkey24
 
-USES=		gettext gmake libtool pathfix pkgconfig tar:xz
+USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
 USE_GNOME=	cairo glib20 gnomeprefix introspection:build \
 		intlhack
 USE_PYTHON_BUILD=yes