Ensure that the -pthread flag isn't omitted by libtool. I hope this would

solve problems people having on 4-STABLE after yesterday's GNOME megaupgrade.

5 files changed, 42 insertions, 11 deletions

diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile
index 854a496c9582..76cb0acb48cf 100644
--- a/devel/gnome-vfs1/Makefile
+++ b/devel/gnome-vfs1/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomevfs
 PORTVERSION=	1.0.4
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-vfs
@@ -27,10 +28,11 @@ USE_X_PREFIX=	yes
 USE_GNOMELIBS=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib" \
 		MSGFMT=${LOCALBASE}/bin/msgfmt-new \
-		XGETTEXT=${LOCALBASE}/bin/xgettext-new
+		XGETTEXT=${LOCALBASE}/bin/xgettext-new \
+		BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
 
 MAN5=		gnome-vfs-mime.5
 
diff --git a/devel/gnome-vfs1/files/patch-aa b/devel/gnome-vfs1/files/patch-aa
index 961b472beec1..6b14a395f165 100644
--- a/devel/gnome-vfs1/files/patch-aa
+++ b/devel/gnome-vfs1/files/patch-aa
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- configure.orig	Tue Jan 22 12:36:47 2002
-+++ configure	Tue Jan 22 12:38:07 2002
+--- configure.orig	Thu Jan 24 10:25:14 2002
++++ configure	Thu Jan 24 10:38:00 2002
 @@ -5949,7 +5949,7 @@
  VFS_GNOMEUI_LIBS="`gnome-config --libs gnome gnomeui`"
  VFS_GNOMEGNORBA_LIBS="`gnome-config --libs gnome gnomeui gnorba`"
@@ -54,3 +54,12 @@ $FreeBSD$
  		
  
  if true; then
+@@ -10594,7 +10594,7 @@
+ s%@GTK_CFLAGS@%$GTK_CFLAGS%g
+ s%@GTK_LIBS@%$GTK_LIBS%g
+ s%@cflags_set@%$cflags_set%g
+-s%@PTHREAD_LIB@%$PTHREAD_LIB%g
++s%@PTHREAD_LIB@%$BSD_PTHREAD_LIBS%g
+ s%@ALLOCA@%$ALLOCA%g
+ s%@USE_NLS@%$USE_NLS%g
+ s%@MSGFMT@%$MSGFMT%g
diff --git a/devel/gnome-vfs1/files/patch-ac b/devel/gnome-vfs1/files/patch-ac
index 781b2ec37bb8..03b8559abc77 100644
--- a/devel/gnome-vfs1/files/patch-ac
+++ b/devel/gnome-vfs1/files/patch-ac
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- modules/Makefile.in.orig	Tue Jan 22 12:42:11 2002
-+++ modules/Makefile.in	Tue Jan 22 13:13:11 2002
+--- modules/Makefile.in.orig	Thu Jan 24 10:25:14 2002
++++ modules/Makefile.in	Thu Jan 24 10:45:26 2002
 @@ -197,7 +197,7 @@
  @HAVE_CDDA_TRUE@CDDA_LTLIBS = libcdda.la
  @HAVE_CDDA_FALSE@CDDA_LTLIBS = 
  
 -module_flags = -export_dynamic -avoid-version
-+module_flags = -export_dynamic -avoid-version -module
++module_flags = -export_dynamic -avoid-version -module $(PTHREAD_LIB)
  modulesdir = $(libdir)/vfs/modules
  
  modules_LTLIBRARIES =  	$(CDDA_LTLIBS)					libextfs.la					libfile.la					libvfs-test.la					$(HTTP_LTLIBS)					libbzip2.la					libgzip.la					libftp.la					libnntp.la					libvfs-pipe.la					libvfs-translate.la				libdesktop.la					$(NULL)
diff --git a/devel/gnome-vfs1/files/patch-libgnomevfs-pthread::Makefile.in b/devel/gnome-vfs1/files/patch-libgnomevfs-pthread::Makefile.in
new file mode 100644
index 000000000000..715ae45928ec
--- /dev/null
+++ b/devel/gnome-vfs1/files/patch-libgnomevfs-pthread::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- libgnomevfs-pthread/Makefile.in	2002/01/24 08:42:41	1.1
++++ libgnomevfs-pthread/Makefile.in	2002/01/24 08:43:37
+@@ -207,7 +207,7 @@
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I..
+ LIBS = @LIBS@
+-libgnomevfs_pthread_la_LIBADD = 
++libgnomevfs_pthread_la_LIBADD = $(PTHREAD_LIB)
+ libgnomevfs_pthread_la_OBJECTS =  gnome-vfs-pthread.lo \
+ gnome-vfs-thread-pool.lo gnome-vfs-async-job-map.lo \
+ gnome-vfs-async-ops.lo gnome-vfs-job-slave.lo gnome-vfs-job.lo
diff --git a/devel/gnome-vfs1/files/patch-ltmain.sh b/devel/gnome-vfs1/files/patch-ltmain.sh
index 91c341790451..3284d88e43f0 100644
--- a/devel/gnome-vfs1/files/patch-ltmain.sh
+++ b/devel/gnome-vfs1/files/patch-ltmain.sh
@@ -2,16 +2,22 @@
 $FreeBSD$
 
 --- ltmain.sh.orig	Sun Jan 20 16:11:07 2002
-+++ ltmain.sh	Tue Jan 22 13:34:20 2002
-@@ -1060,6 +1060,7 @@
++++ ltmain.sh	Thu Jan 24 17:07:06 2002
+@@ -1058,8 +1058,13 @@
+ 	continue
+ 	;;
  
++      -pthread)
++	compiler_flags="$compiler_flags -pthread"
++	;;
++
        -module)
  	module=yes
 +	build_old_libs=no
  	continue
  	;;
  
-@@ -2442,6 +2443,9 @@
+@@ -2442,6 +2447,9 @@
  	  *-*-openbsd*)
  	    # Do not include libc due to us having libc/libc_r.
  	    ;;
@@ -21,7 +27,7 @@ $FreeBSD$
  	  *)
  	    # Add libc to deplibs on all other systems if necessary.
  	    if test $build_libtool_need_lc = "yes"; then
-@@ -4208,10 +4212,12 @@
+@@ -4208,10 +4216,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.