summaryrefslogtreecommitdiff
path: root/x11-toolkits
diff options
context:
space:
mode:
authorJohn Marino <marino@FreeBSD.org>2015-03-24 19:37:43 +0000
committerJohn Marino <marino@FreeBSD.org>2015-03-24 19:37:43 +0000
commit0ae327316befbab743485040abeca00aa9b31439 (patch)
treea4ccf69d55299b5301757b9646b86e3cfed1e46e /x11-toolkits
parentUpdate squirrelmail* to 20150324, and clean up permission/owner handling in (diff)
3 ports categories: Remove $PTHREAD_LIBS
Categories: editors, x11, x11-toolkits approved by: PTHREAD blanket
Notes
Notes: svn path=/head/; revision=382163
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/fox14/Makefile2
-rw-r--r--x11-toolkits/libbonoboui/Makefile2
-rw-r--r--x11-toolkits/plib/Makefile4
-rw-r--r--x11-toolkits/py-gnome2/Makefile2
-rw-r--r--x11-toolkits/py-gtk2/Makefile3
-rw-r--r--x11-toolkits/vdk/Makefile4
-rw-r--r--x11-toolkits/wxgtk28/Makefile3
-rw-r--r--x11-toolkits/wxgtk28/files/patch-configure2
8 files changed, 10 insertions, 12 deletions
diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile
index cb3a01ce5ae4..0520e03eb3f8 100644
--- a/x11-toolkits/fox14/Makefile
+++ b/x11-toolkits/fox14/Makefile
@@ -102,7 +102,7 @@ post-patch:
# CXXFLAGS safeness
@${REINPLACE_CMD} -E -e \
's|-O2|${CXXFLAGS}|g ; \
- s|-lc_r|${PTHREAD_LIBS}|g' \
+ s|-lc_r|-lpthread|g' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
# doc prefix safeness
@${REINPLACE_CMD} -E -e \
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index 2d2138291264..1868c499495f 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -22,7 +22,7 @@ USE_GNOME= gnomeprefix intlhack \
libgnomecanvas libgnome referencehack
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+= -lpthread -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
.include <bsd.port.mk>
diff --git a/x11-toolkits/plib/Makefile b/x11-toolkits/plib/Makefile
index 3fd18dc49d78..a5e4e23035eb 100644
--- a/x11-toolkits/plib/Makefile
+++ b/x11-toolkits/plib/Makefile
@@ -19,8 +19,8 @@ USE_GL= glu
GNU_CONFIGURE= yes
CXXFLAGS+= -fPIC
-CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -lpthread -L${LOCALBASE}/lib
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src-js-jsBSD.cxx
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index f9512951c734..c041488180e8 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -26,7 +26,7 @@ USES= gettext gmake libtool:keepla pathfix pkgconfig python:2 tar:bzip2
USE_LDCONFIG= yes
USE_GNOME= libgnomeui pygtk2
GNU_CONFIGURE= yes
-CONFIGURE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV= PTHREAD_LIBS="-lpthread"
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 0190e1cf0122..2e996e1513ab 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -52,8 +52,7 @@ CONFIGURE_ARGS+=--disable-numpy
#
.if !defined(WITHOUT_THREADS)
CONFIGURE_ARGS+= --enable-thread
-CFLAGS+= ${PTHREAD_CFLAGS}
-LDFLAGS+= ${PTHREAD_LIBS}
+LDFLAGS+= -lpthread
.else
CONFIGURE_ARGS+= --disable-thread
.endif
diff --git a/x11-toolkits/vdk/Makefile b/x11-toolkits/vdk/Makefile
index ef339ad9b620..8ef4b65a930b 100644
--- a/x11-toolkits/vdk/Makefile
+++ b/x11-toolkits/vdk/Makefile
@@ -20,8 +20,8 @@ CONFIGURE_ARGS= --enable-opt=no --enable-doc-html=no --enable-testvdk=no
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
-CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+= -L${LOCALBASE}/lib -lgnuregex ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -lpthread -lgnuregex -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e 's|CXXFLAGS="-s"|CXXFLAGS="$$CXXFLAGS"|g ; \
diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile
index 2b55c510af62..15de67f9bc66 100644
--- a/x11-toolkits/wxgtk28/Makefile
+++ b/x11-toolkits/wxgtk28/Makefile
@@ -33,8 +33,7 @@ CONFIGURE_ARGS= --with-libpng=sys\
--enable-mediactrl\
--disable-backtrace\
--enable-graphics_ctx
-CONFIGURE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}"\
- X11BASE="${LOCALBASE}"
+CONFIGURE_ENV= X11BASE="${LOCALBASE}"
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib
PLIST= ${.CURDIR}/pkg-plist
diff --git a/x11-toolkits/wxgtk28/files/patch-configure b/x11-toolkits/wxgtk28/files/patch-configure
index 1fec2d79037f..e5b934c300ba 100644
--- a/x11-toolkits/wxgtk28/files/patch-configure
+++ b/x11-toolkits/wxgtk28/files/patch-configure
@@ -13,7 +13,7 @@
;;
*-*-freebsd*)
- THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
-+ THREAD_OPTS="${PTHREAD_LIBS}"
++ THREAD_OPTS="-pthread"
;;
*-*-darwin* | *-*-cygwin* )
THREAD_OPTS=""