Update to GNOME 2.2.

This is Phase I.  All existing ports have been updated to their GNOME 2.2
counterparts.

5 files changed, 57 insertions, 67 deletions

diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 04de75c35123..0a9b9014751a 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	pango
-PORTVERSION=	1.0.5
+PORTVERSION=	1.2.1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.0,} \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.2,} \
 		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.3/ \
 		http://www.ameth.org/gimp/gtk/v1.3/
@@ -17,8 +17,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2	# XXX
-LIB_DEPENDS=	glib-2.0.0:${PORTSDIR}/devel/glib20 \
-		freetype.9:${PORTSDIR}/print/freetype2 \
+LIB_DEPENDS=	glib-2.0.200:${PORTSDIR}/devel/glib20 \
+		Xft2.2:${PORTSDIR}/x11-fonts/Xft \
 		intl.4:${PORTSDIR}/devel/gettext
 
 USE_BZIP2=	yes
@@ -26,9 +26,9 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
+GNU_CONFIGURE=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gnomehack
-GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-qt=no \
 		--with-html-dir=${PREFIX}/share/doc \
 		--enable-static
@@ -42,7 +42,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
 			-I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
-PLIST_SUB=	VERSION="1.0.0"
+PLIST_SUB=	VERSION="1.2.0"
 
 .include <bsd.port.pre.mk>
 
@@ -53,7 +53,7 @@ PLIST_SUB+=	XFREE4:=""
 .endif
 
 post-patch:
-	@find ${WRKSRC}/pango/opentype -name "*.[ch]" | xargs ${REINPLACE_CMD} -e \
+	@${FIND} ${WRKSRC}/pango/opentype -name "*.[ch]" | xargs ${REINPLACE_CMD} -e \
 		's|internal/tterrors\.h|fterrors.h| ; s|TT_Err_|FT_Err_|g'
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo
index 8c60dc1ae795..020067318579 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1 +1 @@
-MD5 (gnome2/pango-1.0.5.tar.bz2) = e300e5c163bc28e180e45c8e20543b4b
+MD5 (gnome2/pango-1.2.1.tar.bz2) = 6b354ef14e75739a92b5b78f4ca3165a
diff --git a/x11-toolkits/pango/files/patch-ltmain.sh b/x11-toolkits/pango/files/patch-ltmain.sh
index ec2f7e4ad88c..e9e312dfe402 100644
--- a/x11-toolkits/pango/files/patch-ltmain.sh
+++ b/x11-toolkits/pango/files/patch-ltmain.sh
@@ -1,32 +1,15 @@
---- ltmain.sh.orig	Fri Apr 26 05:23:44 2002
-+++ ltmain.sh	Wed Jul  3 12:50:12 2002
-@@ -1056,14 +1056,14 @@
- 	    # These systems don't actually have a C library (as such)
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
--	  *-*-openbsd*)
-+	  *-*-openbsd*|*-*-freebsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
- 	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
--	  *-*-openbsd*)
-+	  *-*-openbsd*|*-*-freebsd*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
-@@ -1073,8 +1073,16 @@
+--- ltmain.sh.orig	Fri Nov  8 15:40:11 2002
++++ ltmain.sh	Tue Dec  3 18:47:10 2002
+@@ -1082,8 +1082,16 @@
  	continue
  	;;
  
 +      -pthread)
-+	compile_command="$compile_command -pthread"
-+	finalize_command="$finalize_command -pthread"
-+	compiler_flags="$compiler_flags -pthread"
-+	continue
-+	;;
++       compile_command="$compile_command -pthread"
++       finalize_command="$finalize_command -pthread"
++       compiler_flags="$compiler_flags -pthread"
++       continue
++       ;;
 +
        -module)
  	module=yes
@@ -34,7 +17,7 @@
  	continue
  	;;
  
-@@ -2399,6 +2407,9 @@
+@@ -2397,6 +2405,9 @@
  	    # problems, so we reset it completely
  	    verstring=""
  	    ;;
@@ -44,17 +27,7 @@
  	  *)
  	    verstring="0.0"
  	    ;;
-@@ -2502,6 +2513,9 @@
- 	  *-*-openbsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4286,10 +4300,12 @@
+@@ -4327,10 +4338,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/x11-toolkits/pango/files/patch-pangoxft.h b/x11-toolkits/pango/files/patch-pangoxft.h
new file mode 100644
index 000000000000..939194042b12
--- /dev/null
+++ b/x11-toolkits/pango/files/patch-pangoxft.h
@@ -0,0 +1,11 @@
+--- pango/pangoxft.h.orig	Sun Oct  6 23:03:37 2002
++++ pango/pangoxft.h	Sun Oct  6 23:03:42 2002
+@@ -31,7 +31,7 @@
+ #define _XFT_NO_COMPAT
+ #define _XFTCOMPAT_H_
+ #include <X11/Xlib.h>
+-#include <X11/Xft/Xft.h>
++#include <X11/Xft/Xft2.h>
+ #if defined(XftVersion) && XftVersion >= 20000
+ #else
+ #error "must have Xft version 2 or newer"
diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist
index fe5974b94d84..6b2513e949e4 100644
--- a/x11-toolkits/pango/pkg-plist
+++ b/x11-toolkits/pango/pkg-plist
@@ -10,6 +10,7 @@ include/pango-1.0/pango/pango-enum-types.h
 include/pango-1.0/pango/pango-font.h
 include/pango-1.0/pango/pango-fontmap.h
 include/pango-1.0/pango/pango-fontset.h
+include/pango-1.0/pango/pango-glyph-item.h
 include/pango-1.0/pango/pango-glyph.h
 include/pango-1.0/pango/pango-indic.h
 include/pango-1.0/pango/pango-item.h
@@ -25,16 +26,16 @@ include/pango-1.0/pango/pangox.h
 %%XFREE4:%%include/pango-1.0/pango/pangoxft.h
 lib/libpango-1.0.a
 lib/libpango-1.0.so
-lib/libpango-1.0.so.0
+lib/libpango-1.0.so.200
 lib/libpangoft2-1.0.a
 lib/libpangoft2-1.0.so
-lib/libpangoft2-1.0.so.0
+lib/libpangoft2-1.0.so.200
 lib/libpangox-1.0.a
 lib/libpangox-1.0.so
-lib/libpangox-1.0.so.0
+lib/libpangox-1.0.so.200
 %%XFREE4:%%lib/libpangoxft-1.0.a
 %%XFREE4:%%lib/libpangoxft-1.0.so
-%%XFREE4:%%lib/libpangoxft-1.0.so.0
+%%XFREE4:%%lib/libpangoxft-1.0.so.200
 lib/pango/%%VERSION%%/modules/pango-arabic-ft2.so
 lib/pango/%%VERSION%%/modules/pango-arabic-x.so
 %%XFREE4:%%lib/pango/%%VERSION%%/modules/pango-arabic-xft.so
@@ -45,42 +46,47 @@ lib/pango/%%VERSION%%/modules/pango-bengali-x.so
 lib/pango/%%VERSION%%/modules/pango-devanagari-x.so
 lib/pango/%%VERSION%%/modules/pango-gujarati-x.so
 lib/pango/%%VERSION%%/modules/pango-gurmukhi-x.so
+%%XFREE4:%%lib/pango/%%VERSION%%/modules/pango-hangul-xft.so
 lib/pango/%%VERSION%%/modules/pango-hangul-x.so
 lib/pango/%%VERSION%%/modules/pango-hebrew-ft2.so
 lib/pango/%%VERSION%%/modules/pango-hebrew-x.so
 %%XFREE4:%%lib/pango/%%VERSION%%/modules/pango-hebrew-xft.so
+%%XFREE4:%%lib/pango/%%VERSION%%/modules/pango-indic-xft.so
 lib/pango/%%VERSION%%/modules/pango-myanmar-x.so
 lib/pango/%%VERSION%%/modules/pango-tamil-x.so
-%%XFREE4:%%lib/pango/%%VERSION%%/modules/pango-tamil-xft.so
 lib/pango/%%VERSION%%/modules/pango-thai-x.so
 %%XFREE4:%%lib/pango/%%VERSION%%/modules/pango-thai-xft.so
 libdata/pkgconfig/pango.pc
 libdata/pkgconfig/pangoft2.pc
 libdata/pkgconfig/pangox.pc
 %%XFREE4:%%libdata/pkgconfig/pangoxft.pc
+share/doc/pango/home.png
 share/doc/pango/index.html
 share/doc/pango/index.sgml
 share/doc/pango/layout.gif
+share/doc/pango/left.png
 share/doc/pango/lowlevel.html
-share/doc/pango/pango-coverage-maps.html
-share/doc/pango/pango-engines.html
-share/doc/pango/pango-fonts.html
-share/doc/pango/pango-freetype-fonts-and-rendering.html
-share/doc/pango/pango-glyph-storage.html
-share/doc/pango/pango-indic-engine-support.html
-share/doc/pango/pango-layout-objects.html
-share/doc/pango/pango-modules.html
-share/doc/pango/pango-opentype-font-handling.html
-share/doc/pango/pango-tab-stops.html
-share/doc/pango/pango-text-attributes.html
-share/doc/pango/pango-text-processing.html
-share/doc/pango/pango-win32-fonts-and-rendering.html
-share/doc/pango/pango-x-fonts.html
-share/doc/pango/pango-x-rendering.html
-share/doc/pango/pango-xft-fonts-and-rendering.html
+share/doc/pango/PangoMarkupFormat.html
+share/doc/pango/pango-Coverage-Maps.html
+share/doc/pango/pango-Engines.html
+share/doc/pango/pango-Fonts.html
+share/doc/pango/pango-FreeType-Fonts-and-Rendering.html
+share/doc/pango/pango-Glyph-Storage.html
+share/doc/pango/pango-Indic-Engine-Support.html
+share/doc/pango/pango-Layout-Objects.html
+share/doc/pango/pango-Modules.html
+share/doc/pango/pango-OpenType-Font-Handling.html
+share/doc/pango/pango-Tab-Stops.html
+share/doc/pango/pango-Text-Attributes.html
+share/doc/pango/pango-Text-Processing.html
+share/doc/pango/pango-Win32-Fonts-and-Rendering.html
+share/doc/pango/pango-X-Fonts-and-Rendering.html
+share/doc/pango/pango-Xft-Fonts-and-Rendering.html
+share/doc/pango/pango.devhelp
 share/doc/pango/pango.html
-share/doc/pango/pangomarkupformat.html
 share/doc/pango/rendering.html
+share/doc/pango/right.png
+share/doc/pango/up.png
 @dirrm share/doc/pango
 @dirrm lib/pango/%%VERSION%%/modules
 @dirrm lib/pango/%%VERSION%%