svn commit: r352828 - in head: graphics/gtk-update-icon-cache x11-toolkits/gtk20

[Koop Mast]

Author: kwm
Date: Fri May  2 17:00:01 2014
New Revision: 352828
URL: http://svnweb.freebsd.org/changeset/ports/352828
QAT: https://qat.redports.org/buildarchive/r352828/

Log:
  USE_BZIP2 -> USES=tar:bzip2
  USE_GNOME=ltverhack -> USES=libtool:keepla
  use INSTALL_TARGET=install-strip for stripping.

Modified:
  head/graphics/gtk-update-icon-cache/Makefile
  head/x11-toolkits/gtk20/Makefile
  head/x11-toolkits/gtk20/pkg-plist

Modified: head/graphics/gtk-update-icon-cache/Makefile
==============================================================================
--- head/graphics/gtk-update-icon-cache/Makefile	Fri May  2 16:35:17 2014	(r352827)
+++ head/graphics/gtk-update-icon-cache/Makefile	Fri May  2 17:00:01 2014	(r352828)
@@ -19,13 +19,12 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 RUN_DEPENDS+=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
 		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
-USE_XZ=		yes
-USES=		gettext gmake pathfix perl5 pkgconfig
+USES=		gettext gmake libtool:keepla pathfix perl5 pkgconfig tar:xz
 USE_PERL5=	build
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	atk pango gdkpixbuf2 introspection:build ltverhack
+USE_GNOME=	atk pango gdkpixbuf2 introspection:build
 USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
 		xcomposite
 PATCHDIR=	${.CURDIR}/../../x11-toolkits/gtk20/files

Modified: head/x11-toolkits/gtk20/Makefile
==============================================================================
--- head/x11-toolkits/gtk20/Makefile	Fri May  2 16:35:17 2014	(r352827)
+++ head/x11-toolkits/gtk20/Makefile	Fri May  2 17:00:01 2014	(r352828)
@@ -4,7 +4,7 @@
 
 PORTNAME=	gtk
 PORTVERSION=	2.24.22
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,7 +17,7 @@ COMMENT=	Gimp Toolkit for X11 GUI (previ
 
 LICENSE=	LGPL20
 
-USE_XZ=		yes
+USES=		tar:xz
 
 PORTSCOUT=	limitw:0,even
 
@@ -27,9 +27,9 @@ RUN_DEPENDS+=	${LOCALBASE}/share/mime/ma
 		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
 		python:${PORTSDIR}/lang/python
 
-USES=		gettext gmake pathfix perl5 pkgconfig
+USES+=		gettext gmake libtool:keepla pathfix perl5 pkgconfig
 GNU_CONFIGURE=	yes
-USE_GNOME=	atk pango gdkpixbuf2 introspection:build ltverhack \
+USE_GNOME=	atk pango gdkpixbuf2 introspection:build \
 		gtk-update-icon-cache
 USE_LDCONFIG=	yes
 USE_PERL5=	build
@@ -38,6 +38,7 @@ USE_XORG=	xext xrender x11 xinerama xi x
 CONFIGURE_ARGS=	--with-xinput=yes --enable-explicit-deps
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	CUPS DEBUG
 OPTIONS_DEFAULT=CUPS
@@ -50,6 +51,8 @@ DEBUG_CONFIGURE_ON=	--enable-debug=yes
 
 .include <bsd.port.options.mk>
 
+PLIST_SUB+=	LIBGAILVER=18.0.1 LIBGVER=0.2400.22
+
 post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${GREP} -l lgmodule | \
 		${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'

Modified: head/x11-toolkits/gtk20/pkg-plist
==============================================================================
--- head/x11-toolkits/gtk20/pkg-plist	Fri May  2 16:35:17 2014	(r352827)
+++ head/x11-toolkits/gtk20/pkg-plist	Fri May  2 17:00:01 2014	(r352828)
@@ -301,12 +301,15 @@ lib/gtk-2.0/modules/libgail.so
 lib/libgailutil.la
 lib/libgailutil.so
 lib/libgailutil.so.18
+lib/libgailutil.so.%%LIBGAILVER%%
 lib/libgdk-x11-2.0.la
 lib/libgdk-x11-2.0.so
 lib/libgdk-x11-2.0.so.0
+lib/libgdk-x11-2.0.so.%%LIBGVER%%
 lib/libgtk-x11-2.0.la
 lib/libgtk-x11-2.0.so
 lib/libgtk-x11-2.0.so.0
+lib/libgtk-x11-2.0.so.%%LIBGVER%%
 libdata/pkgconfig/gail.pc
 libdata/pkgconfig/gdk-2.0.pc
 libdata/pkgconfig/gdk-x11-2.0.pc