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

4 files changed, 8 insertions, 9 deletions

diff --git a/www/gtkhtml4/Makefile b/www/gtkhtml4/Makefile
index 76eaab07a..c94279ec5 100644
--- a/www/gtkhtml4/Makefile
+++ b/www/gtkhtml4/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
 		${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
 
-USES=		gettext gmake libtool pathfix pkgconfig tar:xz
+USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
 USE_XORG=	xinerama xi xrandr xcursor xcomposite xdamage xproto
 USE_GNOME=	gnomeprefix intlhack gtk30
 USE_LDCONFIG=	yes
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index aa6cb6f4c..9c72ed92b 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -20,12 +20,10 @@ LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant \
 		libcurl.so:${PORTSDIR}/ftp/curl \
 		libsoup-2.4.so:${PORTSDIR}/devel/libsoup
 
-USE_XZ=		yes
 USE_GSTREAMER=	yes
 USE_XORG=	xt
-USES=		bison gettext gmake perl5 pkgconfig
-USE_AUTOTOOLS=	libtool
-USE_GNOME=	gtk20 libxslt ltverhack introspection:build
+USES=		bison gettext gmake libtool:keepla perl5 pkgconfig tar:xz
+USE_GNOME=	gtk20 libxslt introspection:build
 USE_SQLITE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
@@ -35,6 +33,7 @@ CONFIGURE_ENV=	ac_cv_path_FLEX="${LOCALBASE}/bin/flex" \
 		ac_cv_path_DOLT_BASH=""
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS=	--with-gtk=2.0 \
 		--enable-svg-fonts \
 		--disable-geolocation \
@@ -84,9 +83,6 @@ post-patch:
 		${WRKSRC}/Source/WebCore/plugins/PluginDatabase.cpp
 	@${FIND} ${WRKSRC} -name GNUmakefile.* | ${XARGS} ${REINPLACE_CMD} -e \
 		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
-# disable static library.
-	@${REINPLACE_CMD} -e 's|^build_old_libs=yes|build_old_libs=no|' \
-		${WRKDIR}/gnome-libtool
 	@${REINPLACE_CMD} -e 's|/usr/bin/gcc|${CC}|' \
 		${WRKSRC}/Source/WebCore/dom/make_names.pl \
 		${WRKSRC}/Source/WebCore/css/make-css-file-arrays.pl \
diff --git a/www/webkit-gtk2/pkg-plist b/www/webkit-gtk2/pkg-plist
index 6b531549f..db35e202d 100644
--- a/www/webkit-gtk2/pkg-plist
+++ b/www/webkit-gtk2/pkg-plist
@@ -279,9 +279,11 @@ lib/girepository-1.0/WebKit-1.0.typelib
 lib/libjavascriptcoregtk-1.0.la
 lib/libjavascriptcoregtk-1.0.so
 lib/libjavascriptcoregtk-1.0.so.0
+lib/libjavascriptcoregtk-1.0.so.0.13.4
 lib/libwebkitgtk-1.0.la
 lib/libwebkitgtk-1.0.so
 lib/libwebkitgtk-1.0.so.0
+lib/libwebkitgtk-1.0.so.0.13.4
 libdata/pkgconfig/javascriptcoregtk-1.0.pc
 libdata/pkgconfig/webkit-1.0.pc
 libdata/pkgconfig/webkitgtk-1.0.pc
diff --git a/www/webkit-gtk3/Makefile b/www/webkit-gtk3/Makefile
index 7bab1722c..5e60bfda1 100644
--- a/www/webkit-gtk3/Makefile
+++ b/www/webkit-gtk3/Makefile
@@ -26,7 +26,8 @@ RUN_DEPENDS=	geoclue>=0:${PORTSDIR}/net/geoclue
 
 USE_GSTREAMER1=	yes
 USE_XORG=	xt xdamage xcomposite
-USES=		bison gettext gmake libtool perl5 pkgconfig shebangfix tar:xz
+USES=		bison gettext gmake libtool:keepla perl5 pkgconfig \
+		shebangfix tar:xz
 USE_RUBY=	yes
 RUBY_NO_RUN_DEPENDS=yes
 USE_GNOME=	cairo gnomehier gtk20 gtk30 introspection:build \