5 files changed, 74 insertions, 91 deletions

diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index e0efc0c27118..310d2e842680 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	pango
-PORTVERSION=	0.25
+PORTVERSION=	1.0.0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta,} \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta2,} \
 		ftp://ftp.gtk.org/pub/gtk/v1.3/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.3/ \
 		http://www.ameth.org/gimp/gtk/v1.3/
@@ -17,16 +17,18 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2	# XXX
-LIB_DEPENDS=	glib-1.3.14:${PORTSDIR}/devel/glib13 \
-		freetype.8:${PORTSDIR}/print/freetype2 \
+LIB_DEPENDS=	glib-2.0.0:${PORTSDIR}/devel/glib20 \
+		freetype.9:${PORTSDIR}/print/freetype2 \
 		intl.1:${PORTSDIR}/devel/gettext
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-qt=no
-
+CONFIGURE_ARGS=	--with-qt=no \
+		--with-html-dir=${PREFIX}/share/doc \
+		--enable-static
 # Hmm.. tough one.  Found this one when I had graphics/hdf installed
 # (which installs glist.h) which is picked up before the glib-2.0
 # stuff, with Bad Results[tm]
@@ -37,6 +39,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
 			-I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+PLIST_SUB=	VERSION=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo
index b2098df5b877..d3175c7bc0d4 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1 +1 @@
-MD5 (gnome2/pango-0.25.tar.bz2) = b1da9f0b95a7d2bfd481db0278739e18
+MD5 (gnome2/pango-1.0.0.tar.bz2) = bfb7b217600fc9304889805d40dd5bd3
diff --git a/x11-toolkits/pango/files/patch-ab b/x11-toolkits/pango/files/patch-ab
deleted file mode 100644
index 2d2f8f2a8eb3..000000000000
--- a/x11-toolkits/pango/files/patch-ab
+++ /dev/null
@@ -1,45 +0,0 @@
-
-$FreeBSD$
-
---- pango/Makefile.in.orig	Fri Jan 18 10:25:47 2002
-+++ pango/Makefile.in	Fri Jan 18 10:28:08 2002
-@@ -200,10 +200,10 @@
- # down at which point we'll either use the GTK+ versioning
- # scheme or the standard libtool scheme.
- #
--libpango_la_LDFLAGS = -release $(VERSION) $(GLIB_LIBS) $(no_undefined) $(pango_export_symbols)
-+libpango_la_LDFLAGS = -version-info $(VERSION:S/./:/) $(GLIB_LIBS) $(no_undefined) $(pango_export_symbols)
- @HAVE_FRIBIDI_FALSE@libpango_la_LIBADD = @HAVE_FRIBIDI_FALSE@mini-fribidi/libmini-fribidi.la
- 
--libpangox_la_LDFLAGS = -release $(VERSION)
-+libpangox_la_LDFLAGS = -version-info $(VERSION:S/./:/)
- libpangox_la_LIBADD = libpango.la $(INCLUDED_X_MODULES) $(X_LIBS) 
- libpangox_la_DEPENDENCIES = $(INCLUDED_X_MODULES) libpango.la
- 
-@@ -216,7 +216,7 @@
- 	module-defs-win32.c
- 
- 
--libpangowin32_la_LDFLAGS = -release $(VERSION) $(GLIB_LIBS) $(no_undefined) $(pangowin32_export_symbols)
-+libpangowin32_la_LDFLAGS = -version-info $(VERSION:S/./:/) $(GLIB_LIBS) $(no_undefined) $(pangowin32_export_symbols)
- libpangowin32_la_LIBADD = libpango.la $(INCLUDED_WIN32_MODULES) $(WIN32_LIBS) 
- libpangowin32_la_DEPENDENCIES = libpango.la
- 
-@@ -228,7 +228,7 @@
- 
- 
- libpangoxft_la_LIBADD = opentype/libpango-ot.la libpango.la $(INCLUDED_XFT_MODULES) $(XFT_LIBS) 
--libpangoxft_la_LDFLAGS = -release $(VERSION)
-+libpangoxft_la_LDFLAGS = -version-info $(VERSION:S/./:/)
- libpangoxft_la_DEPENDENCIES = $(INCLUDED_XFT_MODULES) libpango.la
- 
- libpangoft2_la_SOURCES = \
-@@ -240,7 +240,7 @@
- 
- 
- libpangoft2_la_LIBADD = $(INCLUDED_FT2_MODULES) $(FREETYPE_LIBS) mini-xft/libmini-xft.la libpango.la
--libpangoft2_la_LDFLAGS = -release $(VERSION) $(GLIB_LIBS) $(no_undefined) $(pangoft2_export_symbols)
-+libpangoft2_la_LDFLAGS = -version-info $(VERSION:S/./:/) $(GLIB_LIBS) $(no_undefined) $(pangoft2_export_symbols)
- libpangoft2_la_DEPENDENCIES = $(INCLUDED_FT2_MODULES) libpango.la
- 
- pangoincludedir = $(includedir)/pango-1.0/pango
diff --git a/x11-toolkits/pango/files/patch-ac b/x11-toolkits/pango/files/patch-ac
index 740dc9b2eb38..58f739a1e675 100644
--- a/x11-toolkits/pango/files/patch-ac
+++ b/x11-toolkits/pango/files/patch-ac
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	Wed Jul 18 15:25:57 2001
-+++ Makefile.in	Wed Jul 18 15:26:20 2001
-@@ -101,7 +101,7 @@
- VERSION = @VERSION@
- XFT_LIBS = @XFT_LIBS@
+--- Makefile.in.orig	Mon Mar 11 12:16:33 2002
++++ Makefile.in	Mon Mar 11 12:24:58 2002
+@@ -116,7 +116,7 @@
+ YACC = @YACC@
+ ms_librarian = @ms_librarian@
  
 -SUBDIRS = pango modules examples docs tools tests
-+SUBDIRS = pango modules examples tools tests
- 
- EXTRA_DIST =  	pango.spec.in		pango.pc.in		pangox.pc.in		pangoxft.pc.in		pangoft2.pc.in		pango-uninstalled.pc.in			pangox-uninstalled.pc.in		pangoxft-uninstalled.pc.in		pangoft2-uninstalled.pc.in		TODO.xml		README.win32
++SUBDIRS = pango modules examples docs tools
  
+ EXTRA_DIST = \
+ 	pango.spec.in	\
diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist
index 46b9f15db761..5bb930a9087d 100644
--- a/x11-toolkits/pango/pkg-plist
+++ b/x11-toolkits/pango/pkg-plist
@@ -23,41 +23,66 @@ include/pango-1.0/pango/pango.h
 include/pango-1.0/pango/pangoft2.h
 include/pango-1.0/pango/pangox.h
 %%XFREE4:%%include/pango-1.0/pango/pangoxft.h
-lib/libpango.a
-lib/libpango.so
-lib/libpango.so.0
-lib/libpangoft2.a
-lib/libpangoft2.so
-lib/libpangoft2.so.0
-lib/libpangox.a
-lib/libpangox.so
-lib/libpangox.so.0
-%%XFREE4:%%lib/libpangoxft.a
-%%XFREE4:%%lib/libpangoxft.so
-%%XFREE4:%%lib/libpangoxft.so.0
-lib/pango/modules/pango-arabic-ft2.so
-lib/pango/modules/pango-arabic-x.so
-%%XFREE4:%%lib/pango/modules/pango-arabic-xft.so
-lib/pango/modules/pango-basic-ft2.so
-lib/pango/modules/pango-basic-x.so
-%%XFREE4:%%lib/pango/modules/pango-basic-xft.so
-lib/pango/modules/pango-bengali-x.so
-lib/pango/modules/pango-devanagari-x.so
-lib/pango/modules/pango-gujarati-x.so
-lib/pango/modules/pango-gurmukhi-x.so
-lib/pango/modules/pango-hangul-x.so
-lib/pango/modules/pango-hebrew-ft2.so
-lib/pango/modules/pango-hebrew-x.so
-%%XFREE4:%%lib/pango/modules/pango-hebrew-xft.so
-lib/pango/modules/pango-myanmar-x.so
-lib/pango/modules/pango-tamil-x.so
-%%XFREE4:%%lib/pango/modules/pango-tamil-xft.so
-lib/pango/modules/pango-thai-x.so
+lib/libpango-1.0.a
+lib/libpango-1.0.so
+lib/libpango-1.0.so.0
+lib/libpangoft2-1.0.a
+lib/libpangoft2-1.0.so
+lib/libpangoft2-1.0.so.0
+lib/libpangox-1.0.a
+lib/libpangox-1.0.so
+lib/libpangox-1.0.so.0
+%%XFREE4:%%lib/libpangoxft-1.0.a
+%%XFREE4:%%lib/libpangoxft-1.0.so
+%%XFREE4:%%lib/libpangoxft-1.0.so.0
+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
+lib/pango/%%VERSION%%/modules/pango-basic-ft2.so
+lib/pango/%%VERSION%%/modules/pango-basic-x.so
+%%XFREE4:%%lib/pango/%%VERSION%%/modules/pango-basic-xft.so
+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
+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
+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
 libdata/pkgconfig/pango.pc
 libdata/pkgconfig/pangoft2.pc
 libdata/pkgconfig/pangox.pc
 %%XFREE4:%%libdata/pkgconfig/pangoxft.pc
-@dirrm lib/pango/modules
+share/doc/pango/index.html
+share/doc/pango/index.sgml
+share/doc/pango/layout.gif
+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/pango.html
+share/doc/pango/pangomarkupformat.html
+share/doc/pango/rendering.html
+@dirrm share/doc/pango
+@dirrm lib/pango/%%VERSION%%/modules
+@dirrm lib/pango/%%VERSION%%
 @dirrm lib/pango
 @dirrm include/pango-1.0/pango
 @dirrm include/pango-1.0