From e05d6c0639224e3269650b86acec8cb9534ac5c8 Mon Sep 17 00:00:00 2001 From: sobomax Date: Fri, 18 Jan 2002 13:23:45 +0000 Subject: Update to 0.23. --- x11-toolkits/pango/Makefile | 5 +++-- x11-toolkits/pango/distinfo | 2 +- x11-toolkits/pango/files/patch-ab | 36 ++++++++++++++++++++------------ x11-toolkits/pango/files/patch-configure | 34 +++++++++++++++--------------- x11-toolkits/pango/pkg-plist | 1 + 5 files changed, 45 insertions(+), 33 deletions(-) (limited to 'x11-toolkits/pango') diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile index 1fc13a4facba..16a3fba6efc2 100644 --- a/x11-toolkits/pango/Makefile +++ b/x11-toolkits/pango/Makefile @@ -6,7 +6,7 @@ # PORTNAME= pango -PORTVERSION= 0.20 +PORTVERSION= 0.23 CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v1.3/ \ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.3/ \ @@ -16,7 +16,7 @@ MAINTAINER= gnome@FreeBSD.org BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig \ freetype-config:${PORTSDIR}/print/freetype2 # XXX -LIB_DEPENDS= glib-1.3.9:${PORTSDIR}/devel/glib13 \ +LIB_DEPENDS= glib-1.3.12:${PORTSDIR}/devel/glib13 \ freetype.7:${PORTSDIR}/print/freetype2 \ intl.1:${PORTSDIR}/devel/gettext RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig @@ -35,6 +35,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ ${GLIB2_CFLAGS} -I${LOCALBASE}/include \ -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} .include diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo index ba88d790225b..9bf19297a6f3 100644 --- a/x11-toolkits/pango/distinfo +++ b/x11-toolkits/pango/distinfo @@ -1 +1 @@ -MD5 (pango-0.20.tar.gz) = be6309bc6db56502fc76c61d9fa4f286 +MD5 (pango-0.23.tar.gz) = e2abd54433f47b2ffb1f698ccd4b3549 diff --git a/x11-toolkits/pango/files/patch-ab b/x11-toolkits/pango/files/patch-ab index 2504e79c34d2..2d2f8f2a8eb3 100644 --- a/x11-toolkits/pango/files/patch-ab +++ b/x11-toolkits/pango/files/patch-ab @@ -1,35 +1,45 @@ $FreeBSD$ ---- pango/Makefile.in.orig Wed Jul 18 15:23:42 2001 -+++ pango/Makefile.in Wed Jul 18 15:24:55 2001 -@@ -143,10 +143,10 @@ +--- 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) -+libpango_la_LDFLAGS = -version-info $(VERSION:S/./:/) $(GLIB_LIBS) - @HAVE_FRIBIDI_FALSE@libpango_la_LIBADD = mini-fribidi/libmini-fribidi.la +-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 = $(INCLUDED_X_MODULES) $(X_LIBS) libpango.la + libpangox_la_LIBADD = libpango.la $(INCLUDED_X_MODULES) $(X_LIBS) libpangox_la_DEPENDENCIES = $(INCLUDED_X_MODULES) libpango.la -@@ -154,14 +154,14 @@ +@@ -216,7 +216,7 @@ + module-defs-win32.c - libpangoxft_la_LIBADD = $(INCLUDED_XFT_MODULES) $(XFT_LIBS) opentype/libpango-ot.la libpango.la +-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 = pangoft2.h pangoft2.c pangoft2-private.h pangoft2-fontcache.c pangoft2-fontmap.c module-defs-ft2.c + libpangoft2_la_SOURCES = \ +@@ -240,7 +240,7 @@ - libpangoft2_la_LIBADD = $(INCLUDED_FT2_MODULES) $(FREETYPE_LIBS) libpango.la --libpangoft2_la_LDFLAGS = -release $(VERSION) -+libpangoft2_la_LDFLAGS = -version-info $(VERSION:S/./:/) + 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-configure b/x11-toolkits/pango/files/patch-configure index 807ac4dd9126..3376d79c5e1f 100644 --- a/x11-toolkits/pango/files/patch-configure +++ b/x11-toolkits/pango/files/patch-configure @@ -1,20 +1,20 @@ $FreeBSD$ ---- configure 2001/08/01 16:52:43 1.1 -+++ configure 2001/08/01 16:52:52 -@@ -7671,10 +7671,10 @@ - s%@INSTALL_DATA@%$INSTALL_DATA%g - s%@PACKAGE@%$PACKAGE%g - s%@VERSION@%$VERSION%g --s%@ACLOCAL@%$ACLOCAL%g --s%@AUTOCONF@%$AUTOCONF%g --s%@AUTOMAKE@%$AUTOMAKE%g --s%@AUTOHEADER@%$AUTOHEADER%g -+s%@ACLOCAL@%/usr/bin/true%g -+s%@AUTOCONF@%/usr/bin/true%g -+s%@AUTOMAKE@%/usr/bin/true%g -+s%@AUTOHEADER@%/usr/bin/true%g - s%@MAKEINFO@%$MAKEINFO%g - s%@SET_MAKE@%$SET_MAKE%g - s%@CC@%$CC%g +--- configure.orig Mon Dec 24 02:40:36 2001 ++++ configure Fri Jan 18 10:29:57 2002 +@@ -11190,10 +11190,10 @@ + s,@INSTALL_DATA@,$INSTALL_DATA,;t t + s,@PACKAGE@,$PACKAGE,;t t + s,@VERSION@,$VERSION,;t t +-s,@ACLOCAL@,$ACLOCAL,;t t +-s,@AUTOCONF@,$AUTOCONF,;t t +-s,@AUTOMAKE@,$AUTOMAKE,;t t +-s,@AUTOHEADER@,$AUTOHEADER,;t t ++s,@ACLOCAL@,/usr/bin/true,;t t ++s,@AUTOCONF@,/usr/bin/true,;t t ++s,@AUTOMAKE@,/usr/bin/true,;t t ++s,@AUTOHEADER@,/usr/bin/true,;t t + s,@MAKEINFO@,$MAKEINFO,;t t + s,@SET_MAKE@,$SET_MAKE,;t t + s,@CC@,$CC,;t t diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist index 1bba67739b20..2625508af200 100644 --- a/x11-toolkits/pango/pkg-plist +++ b/x11-toolkits/pango/pkg-plist @@ -9,6 +9,7 @@ include/pango-1.0/pango/pango-engine.h 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.h include/pango-1.0/pango/pango-indic.h include/pango-1.0/pango/pango-item.h -- cgit