Update to 2.1.0.

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

3 files changed, 20 insertions, 15 deletions

diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 7a5411e4c..a69b6d413 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.0.6
+PORTVERSION=	2.1.0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.0,} \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.1,} \
 		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
 		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
@@ -21,8 +21,8 @@ DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	atk-1.0.0:${PORTSDIR}/devel/atk \
-		pango-1.0.0:${PORTSDIR}/x11-toolkits/pango \
+LIB_DEPENDS=	atk-1.0.100:${PORTSDIR}/devel/atk \
+		pango-1.0.100:${PORTSDIR}/x11-toolkits/pango \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
@@ -35,20 +35,22 @@ USE_REINPLACE=	yes
 USE_PERL5=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomehack
 CONFIGURE_ARGS=	--enable-static
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
 			  -I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
-PLIST_SUB=	GTK_VERSION="2.0.0"
+PLIST_SUB=	GTK_VERSION="2.0.100"
 
 MAN1=		gdk-pixbuf-csource.1
 
-post-extract:
+post-patch:
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${GREP} -l lgmodule | \
 		xargs ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
-	@find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \
-		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
+	@${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|Xft\.h|Xft2.h|g'
 
 pre-build:
 	${RM} -rf ${WRKSRC}/docs/gtk.info*
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index b84224498..f77eb7c57 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gtk+-2.0.6.tar.bz2) = 5f9c1b54abea95408155045c661a5adf
+MD5 (gnome2/gtk+-2.1.0.tar.bz2) = 85cb2451c634244ee920dda2c863ad0e
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index b8cb97155..a9f0aedfc 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -12,6 +12,8 @@ include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h
 include/gtk-2.0/gdk/gdk.h
 include/gtk-2.0/gdk/gdkcolor.h
 include/gtk-2.0/gdk/gdkcursor.h
+include/gtk-2.0/gdk/gdkdisplay.h
+include/gtk-2.0/gdk/gdkdisplaymanager.h
 include/gtk-2.0/gdk/gdkdnd.h
 include/gtk-2.0/gdk/gdkdrawable.h
 include/gtk-2.0/gdk/gdkenumtypes.h
@@ -30,6 +32,7 @@ include/gtk-2.0/gdk/gdkprivate.h
 include/gtk-2.0/gdk/gdkproperty.h
 include/gtk-2.0/gdk/gdkregion.h
 include/gtk-2.0/gdk/gdkrgb.h
+include/gtk-2.0/gdk/gdkscreen.h
 include/gtk-2.0/gdk/gdkselection.h
 include/gtk-2.0/gdk/gdktypes.h
 include/gtk-2.0/gdk/gdkvisual.h
@@ -181,6 +184,7 @@ include/gtk-2.0/gtk/gtkvscrollbar.h
 include/gtk-2.0/gtk/gtkvseparator.h
 include/gtk-2.0/gtk/gtkwidget.h
 include/gtk-2.0/gtk/gtkwindow.h
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.so
@@ -205,16 +209,16 @@ lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.so
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.so
 lib/libgdk-x11-2.0.a
 lib/libgdk-x11-2.0.so
-lib/libgdk-x11-2.0.so.0
+lib/libgdk-x11-2.0.so.100
 lib/libgdk_pixbuf-2.0.a
 lib/libgdk_pixbuf-2.0.so
-lib/libgdk_pixbuf-2.0.so.0
+lib/libgdk_pixbuf-2.0.so.100
 lib/libgdk_pixbuf_xlib-2.0.a
 lib/libgdk_pixbuf_xlib-2.0.so
-lib/libgdk_pixbuf_xlib-2.0.so.0
+lib/libgdk_pixbuf_xlib-2.0.so.100
 lib/libgtk-x11-2.0.a
 lib/libgtk-x11-2.0.so
-lib/libgtk-x11-2.0.so.0
+lib/libgtk-x11-2.0.so.100
 libdata/pkgconfig/gdk-2.0.pc
 libdata/pkgconfig/gdk-pixbuf-2.0.pc
 libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc
@@ -222,7 +226,6 @@ libdata/pkgconfig/gdk-x11-2.0.pc
 libdata/pkgconfig/gtk+-2.0.pc
 libdata/pkgconfig/gtk+-x11-2.0.pc
 share/aclocal/gtk-2.0.m4
-share/locale/ar/LC_MESSAGES/gtk20.mo
 share/locale/az/LC_MESSAGES/gtk20.mo
 share/locale/bg/LC_MESSAGES/gtk20.mo
 share/locale/ca/LC_MESSAGES/gtk20.mo
@@ -242,6 +245,7 @@ share/locale/fr/LC_MESSAGES/gtk20.mo
 share/locale/ga/LC_MESSAGES/gtk20.mo
 share/locale/gl/LC_MESSAGES/gtk20.mo
 share/locale/he/LC_MESSAGES/gtk20.mo
+share/locale/hi/LC_MESSAGES/gtk20.mo
 share/locale/hr/LC_MESSAGES/gtk20.mo
 share/locale/hu/LC_MESSAGES/gtk20.mo
 share/locale/ia/LC_MESSAGES/gtk20.mo
@@ -249,7 +253,6 @@ share/locale/it/LC_MESSAGES/gtk20.mo
 share/locale/ja/LC_MESSAGES/gtk20.mo
 share/locale/ko/LC_MESSAGES/gtk20.mo
 share/locale/lt/LC_MESSAGES/gtk20.mo
-share/locale/lv/LC_MESSAGES/gtk20.mo
 share/locale/ms/LC_MESSAGES/gtk20.mo
 share/locale/nl/LC_MESSAGES/gtk20.mo
 share/locale/nn/LC_MESSAGES/gtk20.mo