summaryrefslogtreecommitdiffstats
path: root/x11-toolkits
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2003-06-03 08:35:09 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2003-06-03 08:35:09 +0800
commite3a898a14db1f6c1e0532c06ee9c5e31144dbb73 (patch)
tree56f4a6cdbccd253fcb8f8e8b089731f738edc66e /x11-toolkits
parent5572eb318d41a8968f75d5f211115fb5edeaccb9 (diff)
downloadmarcuscom-ports-e3a898a14db1f6c1e0532c06ee9c5e31144dbb73.tar
marcuscom-ports-e3a898a14db1f6c1e0532c06ee9c5e31144dbb73.tar.gz
marcuscom-ports-e3a898a14db1f6c1e0532c06ee9c5e31144dbb73.tar.bz2
marcuscom-ports-e3a898a14db1f6c1e0532c06ee9c5e31144dbb73.tar.lz
marcuscom-ports-e3a898a14db1f6c1e0532c06ee9c5e31144dbb73.tar.xz
marcuscom-ports-e3a898a14db1f6c1e0532c06ee9c5e31144dbb73.tar.zst
marcuscom-ports-e3a898a14db1f6c1e0532c06ee9c5e31144dbb73.zip
Only link gnome-pty-helper with PTHREAD_LIBS.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@837 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/vte/Makefile4
-rw-r--r--x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in23
-rw-r--r--x11-toolkits/vte/files/patch-gnome-pty-helper_configure10
3 files changed, 33 insertions, 4 deletions
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index 343666667..64d3dd877 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -7,6 +7,7 @@
PORTNAME= vte
PORTVERSION= 0.11.8
+PORTREVISION= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.11
@@ -24,7 +25,8 @@ INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
USE_GNOME= gnomeprefix gnomehack gtk20
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
- LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
+ BSD_PTHREAD_LIBS="${PTHREAD_LIBS}"
CONFIGURE_ARGS= --disable-python
post-patch:
diff --git a/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in b/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in
index e609f0e13..fdb419f85 100644
--- a/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in
+++ b/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in
@@ -1,6 +1,23 @@
---- gnome-pty-helper/Makefile.in.orig Wed Nov 27 13:30:48 2002
-+++ gnome-pty-helper/Makefile.in Wed Nov 27 13:31:05 2002
-@@ -425,8 +425,8 @@
+--- gnome-pty-helper/Makefile.in.orig Mon Jun 2 20:23:02 2003
++++ gnome-pty-helper/Makefile.in Mon Jun 2 20:26:54 2003
+@@ -65,6 +65,7 @@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
++BSD_PTHREAD_LIBS = @BSD_PTHREAD_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+@@ -217,7 +218,7 @@
+ -test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS)
+ gnome-pty-helper$(EXEEXT): $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_DEPENDENCIES)
+ @rm -f gnome-pty-helper$(EXEEXT)
+- $(LINK) $(gnome_pty_helper_LDFLAGS) $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_LDADD) $(LIBS)
++ $(LINK) $(gnome_pty_helper_LDFLAGS) $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_LDADD) $(LIBS) $(BSD_PTHREAD_LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT) core *.core
+@@ -514,8 +515,8 @@
install-exec-hook:
diff --git a/x11-toolkits/vte/files/patch-gnome-pty-helper_configure b/x11-toolkits/vte/files/patch-gnome-pty-helper_configure
new file mode 100644
index 000000000..668f2a6db
--- /dev/null
+++ b/x11-toolkits/vte/files/patch-gnome-pty-helper_configure
@@ -0,0 +1,10 @@
+--- gnome-pty-helper/configure.orig Mon Jun 2 20:27:32 2003
++++ gnome-pty-helper/configure Mon Jun 2 20:28:06 2003
+@@ -6318,6 +6318,7 @@
+ s,@ECHO_N@,$ECHO_N,;t t
+ s,@ECHO_T@,$ECHO_T,;t t
+ s,@LIBS@,$LIBS,;t t
++s,@BSD_PTHREAD_LIBS@,$BSD_PTHREAD_LIBS,;t t
+ s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+ s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+ s,@INSTALL_DATA@,$INSTALL_DATA,;t t