Convert to USES=libtool and INSTALL_TARGET=install-strip

Obtained from:	gnome-dev

2 files changed, 11 insertions, 27 deletions

diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 35a394206979..6aafa2c2e28b 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	gtk
 PORTVERSION=	3.8.8
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -31,16 +31,19 @@ RUN_DEPENDS+=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hico
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	atk pango gdkpixbuf2 ltverhack gtk-update-icon-cache \
-		introspection:build
-USES+=		gettext gmake pathfix perl5 pkgconfig
+USE_GNOME=	atk gdkpixbuf2 gtk-update-icon-cache \
+		introspection:build pango
+USES+=		gettext gmake libtool pathfix perl5 pkgconfig
 USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
 		xcomposite
 CONFIGURE_ARGS=	--enable-gtk2-dependency --disable-packagekit
 CPPFLAGS+=	-I${LOCALBASE}/include -fno-omit-frame-pointer
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	INTROSPECTION_GIRDIR=`pkg-config --variable=girdir gobject-introspection-1.0`
-ltverhack_PATCH_FILES=build-aux/ltmain.sh
+INSTALL_TARGET=	install-strip
+
+LIBVERSION=	0.800.8
+PLIST_SUB+=	LIBVERSION=${LIBVERSION}
 
 GLIB_SCHEMAS=	org.gtk.Demo.gschema.xml \
 		org.gtk.Settings.ColorChooser.gschema.xml \
@@ -96,11 +99,6 @@ post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/${GTK3_VERSION}/loaders
 	${INSTALL_MAN} ${WRKSRC}/docs/reference/gtk/gtk-query-immodules-3.0.1 \
 		${STAGEDIR}${PREFIX}/man/man1
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdk-3.so.0
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgtk-3.so.0
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgailutil-3.so.0
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/3.0.0/immodules/im*.so
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/3.0.0/printbackends/libprintbackend-*.so
 
 .include <bsd.port.mk>
 
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index bede2f521c19..236565fb33c6 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -337,43 +337,29 @@ include/gtk-3.0/unix-print/gtk/gtkunixprint.h
 lib/girepository-1.0/Gdk-3.0.typelib
 lib/girepository-1.0/GdkX11-3.0.typelib
 lib/girepository-1.0/Gtk-3.0.typelib
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-am-et.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-am-et.so
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-cedilla.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-cedilla.so
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-cyrillic-translit.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-cyrillic-translit.so
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-inuktitut.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-inuktitut.so
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ipa.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ipa.so
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-multipress.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-multipress.so
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-thai.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-thai.so
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ti-er.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ti-er.so
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ti-et.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ti-et.so
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-viqr.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-viqr.so
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-xim.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-xim.so
-%%CUPS%%lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-cups.la
 %%CUPS%%lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-cups.so
-lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-file.la
 lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-file.so
-lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-lpr.la
 lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-lpr.so
-lib/libgailutil-3.la
 lib/libgailutil-3.so
 lib/libgailutil-3.so.0
-lib/libgdk-3.la
+lib/libgailutil-3.so.0.0.0
 lib/libgdk-3.so
 lib/libgdk-3.so.0
-lib/libgtk-3.la
+lib/libgdk-3.so.%%LIBVERSION%%
 lib/libgtk-3.so
 lib/libgtk-3.so.0
+lib/libgtk-3.so.%%LIBVERSION%%
 libdata/pkgconfig/gail-3.0.pc
 libdata/pkgconfig/gdk-3.0.pc
 libdata/pkgconfig/gdk-x11-3.0.pc