Do not link in libc as this seems to cause -stable to acid trip in certain

places.  Instead, use PTHREAD_LIBS.  Bump PORTREVISION.

3 files changed, 39 insertions, 17 deletions

diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 3e77e1ebe754..0a40774b3e46 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pango
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,2.0.0/releases/gnome-2.0-desktop-final,} \
 		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
@@ -38,7 +39,7 @@ 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"
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 PLIST_SUB=	VERSION="1.0.0"
 
diff --git a/x11-toolkits/pango/files/patch-configure b/x11-toolkits/pango/files/patch-configure
index 3376d79c5e1f..611bcc5764e5 100644
--- a/x11-toolkits/pango/files/patch-configure
+++ b/x11-toolkits/pango/files/patch-configure
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- configure.orig	Mon Dec 24 02:40:36 2001
-+++ configure	Fri Jan 18 10:29:57 2002
-@@ -11190,10 +11190,10 @@
+--- configure.orig	Thu Jun 13 17:04:03 2002
++++ configure	Wed Jul  3 12:46:50 2002
+@@ -12084,10 +12085,10 @@
  s,@INSTALL_DATA@,$INSTALL_DATA,;t t
  s,@PACKAGE@,$PACKAGE,;t t
  s,@VERSION@,$VERSION,;t t
diff --git a/x11-toolkits/pango/files/patch-ltmain.sh b/x11-toolkits/pango/files/patch-ltmain.sh
index 91713d2306f8..ec2f7e4ad88c 100644
--- a/x11-toolkits/pango/files/patch-ltmain.sh
+++ b/x11-toolkits/pango/files/patch-ltmain.sh
@@ -1,9 +1,23 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
-+++ ltmain.sh	Sun Feb  3 01:44:17 2002
-@@ -1037,8 +1037,16 @@
+--- 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 @@
  	continue
  	;;
  
@@ -20,9 +34,19 @@ $FreeBSD$
  	continue
  	;;
  
-@@ -2412,6 +2420,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
+@@ -2399,6 +2407,9 @@
+ 	    # problems, so we reset it completely
+ 	    verstring=""
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    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...
@@ -30,7 +54,7 @@ $FreeBSD$
  	  *)
  	    # Add libc to deplibs on all other systems if necessary.
  	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4179,10 +4190,12 @@
+@@ -4286,10 +4300,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.