diff options
-rw-r--r-- | x11-toolkits/pango/Makefile | 4 | ||||
-rw-r--r-- | x11-toolkits/pango/distinfo | 2 | ||||
-rw-r--r-- | x11-toolkits/pango/files/patch-ltmain.sh | 47 |
3 files changed, 13 insertions, 40 deletions
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile index cd813193c..1426cb5d9 100644 --- a/x11-toolkits/pango/Makefile +++ b/x11-toolkits/pango/Makefile @@ -6,7 +6,7 @@ # PORTNAME= pango -PORTVERSION= 1.1.3 +PORTVERSION= 1.1.4 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.1,} \ ftp://ftp.gtk.org/pub/gtk/v2.0/ \ @@ -17,7 +17,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX -LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20 \ +LIB_DEPENDS= glib-2.0.103:${PORTSDIR}/devel/glib20 \ Xft2.2:${PORTSDIR}/x11-fonts/Xft \ intl.4:${PORTSDIR}/devel/gettext diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo index 11cbd8d1c..8dada2117 100644 --- a/x11-toolkits/pango/distinfo +++ b/x11-toolkits/pango/distinfo @@ -1 +1 @@ -MD5 (gnome2/pango-1.1.3.tar.bz2) = 34f4c5486b9428d8c738acc0c76ed669 +MD5 (gnome2/pango-1.1.4.tar.bz2) = af374bb015fe5148b0e453b97033f700 diff --git a/x11-toolkits/pango/files/patch-ltmain.sh b/x11-toolkits/pango/files/patch-ltmain.sh index ec2f7e4ad..e9e312dfe 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. |