aboutsummaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2004-05-04 16:56:26 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2004-05-04 16:56:26 +0000
commit60fa48c9a827751a1a4252fcc9bbda9f946ef6b9 (patch)
tree937769aaeff59b428957bb7cf4805dc57eb042c6 /devel
parent6602288943963e538ffe23d6cf21fa3f324a184a (diff)
downloadports-60fa48c9a827751a1a4252fcc9bbda9f946ef6b9.tar.gz
ports-60fa48c9a827751a1a4252fcc9bbda9f946ef6b9.zip
Fix a botch patch in the 2.4.1 update that resulted in the wrong PTHREAD_LIBS
being used on 5.X. Reported by: many
Notes
Notes: svn path=/head/; revision=108384
Diffstat (limited to 'devel')
-rw-r--r--devel/glib20/Makefile1
-rw-r--r--devel/glib20/files/patch-ae12
2 files changed, 7 insertions, 6 deletions
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 292a3ab3072b..63cfdcd107dd 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -7,6 +7,7 @@
PORTNAME= glib
PORTVERSION= 2.4.1
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.4,} \
ftp://ftp.gtk.org/pub/gtk/v2.3/ \
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index 0a7c2987dc3c..4f49b4a71f47 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -1,6 +1,6 @@
---- configure.orig Mon Dec 2 16:34:49 2002
-+++ configure Tue Dec 3 18:21:22 2002
-@@ -10176,6 +10176,7 @@
+--- configure.orig Fri Apr 30 09:05:01 2004
++++ configure Tue May 4 12:52:56 2004
+@@ -22276,6 +22276,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,9 +8,9 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -17057,6 +17058,8 @@
- fi
- done
+@@ -31818,6 +31819,8 @@
+ ;;
+ esac
fi
+ G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
+ G_THREAD_LIBS="${PTHREAD_LIBS}"