Index: head/x11-toolkits/pango/Makefile =================================================================== --- head/x11-toolkits/pango/Makefile (revision 81874) +++ head/x11-toolkits/pango/Makefile (revision 81875) @@ -1,63 +1,62 @@ # New ports collection makefile for: pango # Date Created: 18 July 2000 # Whom: Maxim Sobolev # # $FreeBSD$ # PORTNAME= pango -PORTVERSION= 1.2.1 -PORTREVISION= 3 +PORTVERSION= 1.2.2 CATEGORIES= x11-toolkits 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/ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= An open-source framework for the layout and rendering of i18n text BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/Xft \ intl.4:${PORTSDIR}/devel/gettext RUN_DEPENDS= ${FONTSCALE}:${PORTSDIR}/x11-fonts/XFree86-4-fontScalable \ ${FONTENCOD}:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_REINPLACE= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes USE_GNOME= gnomehack glib20 CONFIGURE_ARGS= --with-qt=no \ --with-html-dir=${PREFIX}/share/doc \ --enable-static PKGINSTALL= ${WRKDIR}/pkg-install # 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] # GLIB2_CFLAGS= `pkg-config glib-2.0 --cflags` CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ ${GLIB2_CFLAGS} -I${LOCALBASE}/include \ -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" PLIST_SUB= VERSION="1.2.0" FONTSCALE= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf FONTENCOD= ${X11BASE}/lib/X11/fonts/encodings/tcvn-0.enc post-patch: @${FIND} ${WRKSRC}/pango/opentype -name "*.[ch]" | ${XARGS} \ ${REINPLACE_CMD} -e 's|internal/tterrors\.h|fterrors.h| ; \ s|TT_Err_|FT_Err_|g' post-install: @${SED} -e 's|%%X11BASE%%|${X11BASE}|' < ${FILESDIR}/pkg-install.in \ > ${PKGINSTALL} .if !defined(PACKAGE_BUILDING) @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif .include Property changes on: head/x11-toolkits/pango/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.47 \ No newline at end of property +1.48 \ No newline at end of property Index: head/x11-toolkits/pango/distinfo =================================================================== --- head/x11-toolkits/pango/distinfo (revision 81874) +++ head/x11-toolkits/pango/distinfo (revision 81875) @@ -1 +1 @@ -MD5 (gnome2/pango-1.2.1.tar.bz2) = 6b354ef14e75739a92b5b78f4ca3165a +MD5 (gnome2/pango-1.2.2.tar.bz2) = b8858106b9c7c9b040fc466c95909713 Property changes on: head/x11-toolkits/pango/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.16 \ No newline at end of property +1.17 \ No newline at end of property Index: head/x11-toolkits/pango/files/patch-ltmain.sh =================================================================== --- head/x11-toolkits/pango/files/patch-ltmain.sh (revision 81874) +++ head/x11-toolkits/pango/files/patch-ltmain.sh (revision 81875) @@ -1,42 +1,51 @@ ---- ltmain.sh.orig Fri Nov 8 15:40:11 2002 -+++ ltmain.sh Tue Dec 3 18:47:10 2002 -@@ -1082,8 +1082,16 @@ +--- ltmain.sh.orig Thu Apr 24 19:44:23 2003 ++++ ltmain.sh Sat May 31 01:34:34 2003 +@@ -1280,7 +1280,7 @@ + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +- *-*-openbsd* | *-*-freebsd*) ++ *-*-openbsd* | *-*-freebsd4*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1290,8 +1290,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 + build_old_libs=no continue ;; -@@ -2397,6 +2405,9 @@ +@@ -3000,6 +3008,9 @@ # problems, so we reset it completely - verstring="" + verstring= ;; + *-*-freebsd*) + # FreeBSD doesn't need this... + ;; *) verstring="0.0" ;; -@@ -4327,10 +4338,12 @@ +@@ -5428,10 +5439,12 @@ fi # Install the pseudo-library for information purposes. + if /usr/bin/false; then name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` instname="$dir/$name"i $show "$install_prog $instname $destdir/$name" $run eval "$install_prog $instname $destdir/$name" || exit $? + fi # Maybe install the static library, too. test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" Property changes on: head/x11-toolkits/pango/files/patch-ltmain.sh ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.7 \ No newline at end of property +1.8 \ No newline at end of property Index: head/x11-toolkits/pango/pkg-plist =================================================================== --- head/x11-toolkits/pango/pkg-plist (revision 81874) +++ head/x11-toolkits/pango/pkg-plist (revision 81875) @@ -1,96 +1,99 @@ bin/pango-querymodules etc/pango/pango.modules etc/pango/pangox.aliases include/pango-1.0/pango/pango-attributes.h include/pango-1.0/pango/pango-break.h include/pango-1.0/pango/pango-context.h include/pango-1.0/pango/pango-coverage.h 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-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 include/pango-1.0/pango/pango-layout.h include/pango-1.0/pango/pango-modules.h include/pango-1.0/pango/pango-ot.h include/pango-1.0/pango/pango-tabs.h include/pango-1.0/pango/pango-types.h include/pango-1.0/pango/pango-utils.h include/pango-1.0/pango/pango.h include/pango-1.0/pango/pangoft2.h include/pango-1.0/pango/pangox.h include/pango-1.0/pango/pangoxft.h lib/libpango-1.0.a lib/libpango-1.0.so lib/libpango-1.0.so.200 lib/libpangoft2-1.0.a lib/libpangoft2-1.0.so lib/libpangoft2-1.0.so.200 lib/libpangox-1.0.a lib/libpangox-1.0.so lib/libpangox-1.0.so.200 lib/libpangoxft-1.0.a lib/libpangoxft-1.0.so lib/libpangoxft-1.0.so.200 lib/pango/%%VERSION%%/modules/pango-arabic-ft2.so lib/pango/%%VERSION%%/modules/pango-arabic-x.so lib/pango/%%VERSION%%/modules/pango-arabic-xft.so lib/pango/%%VERSION%%/modules/pango-basic-ft2.so lib/pango/%%VERSION%%/modules/pango-basic-x.so 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-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 lib/pango/%%VERSION%%/modules/pango-hebrew-xft.so lib/pango/%%VERSION%%/modules/pango-indic-xft.so +lib/pango/%%VERSION%%/modules/pango-indic-ft2.so lib/pango/%%VERSION%%/modules/pango-myanmar-x.so lib/pango/%%VERSION%%/modules/pango-tamil-x.so lib/pango/%%VERSION%%/modules/pango-thai-x.so lib/pango/%%VERSION%%/modules/pango-thai-xft.so +lib/pango/%%VERSION%%/modules/pango-thai-ft2.so libdata/pkgconfig/pango.pc libdata/pkgconfig/pangoft2.pc libdata/pkgconfig/pangox.pc libdata/pkgconfig/pangoxft.pc share/doc/pango/home.png share/doc/pango/index.html share/doc/pango/index.sgml +share/doc/pango/ix01.html share/doc/pango/layout.gif share/doc/pango/left.png share/doc/pango/lowlevel.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/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%% @dirrm lib/pango @dirrm include/pango-1.0/pango @dirrm include/pango-1.0 @dirrm etc/pango Property changes on: head/x11-toolkits/pango/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.12 \ No newline at end of property +1.13 \ No newline at end of property