Update to 2.24.5.

Switch to xz distfile.


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

5 files changed, 11 insertions, 25 deletions

diff --git a/graphics/gtk-update-icon-cache/Makefile b/graphics/gtk-update-icon-cache/Makefile
index cb5467673..e0ccf1495 100644
--- a/graphics/gtk-update-icon-cache/Makefile
+++ b/graphics/gtk-update-icon-cache/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/gtk-update-icon-cache/Makefile,v 1.4 2011/03/14 19:36:12 kwm Exp $
+#   $MCom: ports/graphics/gtk-update-icon-cache/Makefile,v 1.5 2011/04/02 10:50:19 kwm Exp $
 #
 
 PORTNAME=	gtk-update-icon-cache
-PORTVERSION=	2.24.4
+PORTVERSION=	2.24.5
 PORTREVISION?=	0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
@@ -26,7 +26,7 @@ COMMENT=	gtk-update-icon-cache utility from the Gtk+ toolkit.
 
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
-USE_BZIP2=	yes
+USE_XZ=		yes
 
 BUILD_DEPENDS+=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 RUN_DEPENDS+=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
@@ -42,7 +42,7 @@ USE_GETTEXT=	yes
 USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
 		xcomposite
 PATCHDIR=	${.CURDIR}/../../x11-toolkits/gtk20/files
-CONFIGURE_ARGS=	--enable-static --enable-xinput=yes
+CONFIGURE_ARGS=	--enable-static --with-xinput=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
 			  -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/gtk-update-icon-cache/distinfo b/graphics/gtk-update-icon-cache/distinfo
index b8cd4e717..53e9d1c87 100644
--- a/graphics/gtk-update-icon-cache/distinfo
+++ b/graphics/gtk-update-icon-cache/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gtk+-2.24.4.tar.bz2) = 7d3033ad83647079977466d3e8f1a7533f47abd5cc693f01b8797ff43dd407a5
-SIZE (gnome2/gtk+-2.24.4.tar.bz2) = 17607752
+SHA256 (gnome2/gtk+-2.24.5.tar.xz) = d6b30889efbb9fab9aa598092d08887826a7b2a3069b3bd5155dede28d9866f3
+SIZE (gnome2/gtk+-2.24.5.tar.xz) = 13252580
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 482c14f14..04e106de8 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.222 2011/03/14 19:36:12 kwm Exp $
+#   $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.223 2011/04/02 10:50:20 kwm Exp $
 #
 # Remember to update graphics/gtk-update-icon-cache too.
 
 PORTNAME=	gtk
-PORTVERSION=	2.24.4
+PORTVERSION=	2.24.5
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
@@ -27,7 +27,7 @@ COMMENT=	Gimp Toolkit for X11 GUI (previous stable version)
 
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
-USE_BZIP2=	yes
+USE_XZ=		yes
 LATEST_LINK=	gtk20
 
 .if !defined(REFERENCE_PORT)
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index b8cd4e717..53e9d1c87 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gtk+-2.24.4.tar.bz2) = 7d3033ad83647079977466d3e8f1a7533f47abd5cc693f01b8797ff43dd407a5
-SIZE (gnome2/gtk+-2.24.4.tar.bz2) = 17607752
+SHA256 (gnome2/gtk+-2.24.5.tar.xz) = d6b30889efbb9fab9aa598092d08887826a7b2a3069b3bd5155dede28d9866f3
+SIZE (gnome2/gtk+-2.24.5.tar.xz) = 13252580
diff --git a/x11-toolkits/gtk20/files/patch-configure b/x11-toolkits/gtk20/files/patch-configure
deleted file mode 100644
index 06a6f7b9f..000000000
--- a/x11-toolkits/gtk20/files/patch-configure
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.orig	2009-12-26 21:41:27.000000000 +0100
-+++ configure	2009-12-26 21:51:04.000000000 +0100
-@@ -33884,9 +33884,9 @@
-        INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-        INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-        INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
--       INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)}
-+       INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|${datadir}|\\\$(datadir)|"`
-        INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
--       INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)}
-+       INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|${libdir}|\\\$(libdir)|"`
-        INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
-        INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
-        INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection