Update to 3.10.7.

Switch to USES=libtool and new options helpers.


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

3 files changed, 17 insertions, 27 deletions

diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 3c6b18cbc..9efaf1240 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -4,7 +4,7 @@
 # Please keep gtk30 and x11-themes/gnome-themes-standard minor version in sync
 
 PORTNAME=	gtk
-PORTVERSION=	3.10.6
+PORTVERSION=	3.10.7
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
@@ -32,16 +32,17 @@ 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 \
+USE_GNOME=	atk pango gdkpixbuf2 gtk-update-icon-cache \
 		introspection:build
-USES=		gettext gmake pathfix perl5 pkgconfig
+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
+
+LIBVERSION=	0.1000.7
+PLIST_SUB+=	LIBVERSION=${LIBVERSION}
 
 GLIB_SCHEMAS=	org.gtk.Demo.gschema.xml \
 		org.gtk.Settings.ColorChooser.gschema.xml \
@@ -51,29 +52,15 @@ GLIB_SCHEMAS=	org.gtk.Demo.gschema.xml \
 OPTIONS_DEFINE=	CUPS COLORD DEBUG
 OPTIONS_DEFAULT=CUPS COLORD
 COLORD_DESC=	Color profile support
+COLORD_LIB_DEPENDS=	libcolord.so:${PORTSDIR}/graphics/colord
+COLORD_CONFIGURE_ENABLE=colord
+CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
+CUPS_CONFIGURE_ENABLE=	cups
+DEBUG_CONFIGURE_ENABLE=debug
 
+# needed for the exists() check, booo
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MCUPS}
-LIB_DEPENDS+=	libcups.so:${PORTSDIR}/print/cups-client
-CONFIGURE_ARGS+=--enable-cups=auto
-PLIST_SUB+=	CUPS=""
-.else
-CONFIGURE_ARGS+=--disable-cups
-PLIST_SUB+=	CUPS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=	--enable-debug=yes
-.endif
-
-.if ${PORT_OPTIONS:MCOLORD}
-LIB_DEPENDS+=	libcolord.so:${PORTSDIR}/graphics/colord
-CONFIGURE_ARGS+=--enable-colord
-.else
-CONFIGURE_ARGS+=--disable-colord
-.endif
-
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${GREP} -l lgmodule | \
 		${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index c4cf2d5e3..605f1ca84 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gtk+-3.10.6.tar.xz) = 3c24c57fc5cb7a5ea39d3a3ff7b12be63d7f21a52fd6f20f7b983e19b7b0268a
-SIZE (gnome3/gtk+-3.10.6.tar.xz) = 14387620
+SHA256 (gnome3/gtk+-3.10.7.tar.xz) = b7e9de15385031cff43897e7e59f6692eaabf500f36eef80e6b9d6486ad49427
+SIZE (gnome3/gtk+-3.10.7.tar.xz) = 14363820
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 2ec9a9544..607186723 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -377,12 +377,15 @@ lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-lpr.so
 lib/libgailutil-3.la
 lib/libgailutil-3.so
 lib/libgailutil-3.so.0
+lib/libgailutil-3.so.0.0.0
 lib/libgdk-3.la
 lib/libgdk-3.so
 lib/libgdk-3.so.0
+lib/libgdk-3.so.%%LIBVERSION%%
 lib/libgtk-3.la
 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