svn commit: r382163 - in head: editors/cooledit editors/leafpad editors/poedit editors/xmlcopyeditor x11-toolkits/fox14 x11-toolkits/libbonoboui x11-toolkits/plib x11-toolkits/py-gnome2 x11-toolkit...
John Marino
marino at FreeBSD.org
Tue Mar 24 19:37:52 UTC 2015
Author: marino
Date: Tue Mar 24 19:37:43 2015
New Revision: 382163
URL: https://svnweb.freebsd.org/changeset/ports/382163
QAT: https://qat.redports.org/buildarchive/r382163/
Log:
3 ports categories: Remove $PTHREAD_LIBS
Categories: editors, x11, x11-toolkits
approved by: PTHREAD blanket
Modified:
head/editors/cooledit/Makefile
head/editors/leafpad/Makefile
head/editors/poedit/Makefile
head/editors/xmlcopyeditor/Makefile
head/x11-toolkits/fox14/Makefile
head/x11-toolkits/libbonoboui/Makefile
head/x11-toolkits/plib/Makefile
head/x11-toolkits/py-gnome2/Makefile
head/x11-toolkits/py-gtk2/Makefile
head/x11-toolkits/vdk/Makefile
head/x11-toolkits/wxgtk28/Makefile
head/x11-toolkits/wxgtk28/files/patch-configure
head/x11/erun/Makefile
head/x11/gnome-menus/Makefile
head/x11/gnome-menus/files/patch-util_Makefile.in
head/x11/mate-applets/Makefile
head/x11/xlockmore/Makefile
head/x11/xscreensaver-gnome/Makefile
head/x11/xstroke/Makefile
Modified: head/editors/cooledit/Makefile
==============================================================================
--- head/editors/cooledit/Makefile Tue Mar 24 19:32:07 2015 (r382162)
+++ head/editors/cooledit/Makefile Tue Mar 24 19:37:43 2015 (r382163)
@@ -17,8 +17,8 @@ USE_LDCONFIG= yes
USE_GCC= any
INSTALL_TARGET= install-strip
-CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -lpthread -L${LOCALBASE}/lib
CFLAGS+= -DHAVE_MBRTOWC
OPTIONS_DEFINE= NEXT_LOOK
Modified: head/editors/leafpad/Makefile
==============================================================================
--- head/editors/leafpad/Makefile Tue Mar 24 19:32:07 2015 (r382162)
+++ head/editors/leafpad/Makefile Tue Mar 24 19:37:43 2015 (r382163)
@@ -18,8 +18,8 @@ USES= desktop-file-utils gmake pkgconfi
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-chooser
INSTALLS_ICONS= yes
-CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -lpthread -L${LOCALBASE}/lib
PORTDOCS= AUTHORS COPYING ChangeLog INSTALL README
Modified: head/editors/poedit/Makefile
==============================================================================
--- head/editors/poedit/Makefile Tue Mar 24 19:32:07 2015 (r382162)
+++ head/editors/poedit/Makefile Tue Mar 24 19:37:43 2015 (r382163)
@@ -26,8 +26,8 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= WXRC="${WXRC_CMD}"
INSTALLS_ICONS= yes
-CPPFLAGS+= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+= -L${BDB_LIB_DIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
+LDFLAGS+= -lpthread -L${BDB_LIB_DIR} -L${LOCALBASE}/lib
OPTIONS_DEFINE= NLS
OPTIONS_SUB=yes
Modified: head/editors/xmlcopyeditor/Makefile
==============================================================================
--- head/editors/xmlcopyeditor/Makefile Tue Mar 24 19:32:07 2015 (r382162)
+++ head/editors/xmlcopyeditor/Makefile Tue Mar 24 19:37:43 2015 (r382163)
@@ -30,7 +30,7 @@ LIB_DEPENDS= libxerces-c.so.3:${PORTSDIR
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
CPPFLAGS+= -I${LOCALBASE}/include \
- -I${LOCALBASE}/include/libxml2 ${PTHREAD_CFLAGS}
-LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} ${ICONV_LIB}
+ -I${LOCALBASE}/include/libxml2
+LDFLAGS+= -lpthread -L${LOCALBASE}/lib ${ICONV_LIB}
.include <bsd.port.mk>
Modified: head/x11-toolkits/fox14/Makefile
==============================================================================
--- head/x11-toolkits/fox14/Makefile Tue Mar 24 19:32:07 2015 (r382162)
+++ head/x11-toolkits/fox14/Makefile Tue Mar 24 19:37:43 2015 (r382163)
@@ -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 \
Modified: head/x11-toolkits/libbonoboui/Makefile
==============================================================================
--- head/x11-toolkits/libbonoboui/Makefile Tue Mar 24 19:32:07 2015 (r382162)
+++ head/x11-toolkits/libbonoboui/Makefile Tue Mar 24 19:37:43 2015 (r382163)
@@ -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>
Modified: head/x11-toolkits/plib/Makefile
==============================================================================
--- head/x11-toolkits/plib/Makefile Tue Mar 24 19:32:07 2015 (r382162)
+++ head/x11-toolkits/plib/Makefile Tue Mar 24 19:37:43 2015 (r382163)
@@ -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
Modified: head/x11-toolkits/py-gnome2/Makefile
==============================================================================
--- head/x11-toolkits/py-gnome2/Makefile Tue Mar 24 19:32:07 2015 (r382162)
+++ head/x11-toolkits/py-gnome2/Makefile Tue Mar 24 19:37:43 2015 (r382163)
@@ -26,7 +26,7 @@ USES= gettext gmake libtool:keepla path
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
Modified: head/x11-toolkits/py-gtk2/Makefile
==============================================================================
--- head/x11-toolkits/py-gtk2/Makefile Tue Mar 24 19:32:07 2015 (r382162)
+++ head/x11-toolkits/py-gtk2/Makefile Tue Mar 24 19:37:43 2015 (r382163)
@@ -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
Modified: head/x11-toolkits/vdk/Makefile
==============================================================================
--- head/x11-toolkits/vdk/Makefile Tue Mar 24 19:32:07 2015 (r382162)
+++ head/x11-toolkits/vdk/Makefile Tue Mar 24 19:37:43 2015 (r382163)
@@ -20,8 +20,8 @@ CONFIGURE_ARGS= --enable-opt=no --enable
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 ; \
Modified: head/x11-toolkits/wxgtk28/Makefile
==============================================================================
--- head/x11-toolkits/wxgtk28/Makefile Tue Mar 24 19:32:07 2015 (r382162)
+++ head/x11-toolkits/wxgtk28/Makefile Tue Mar 24 19:37:43 2015 (r382163)
@@ -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
Modified: head/x11-toolkits/wxgtk28/files/patch-configure
==============================================================================
--- head/x11-toolkits/wxgtk28/files/patch-configure Tue Mar 24 19:32:07 2015 (r382162)
+++ head/x11-toolkits/wxgtk28/files/patch-configure Tue Mar 24 19:37:43 2015 (r382163)
@@ -13,7 +13,7 @@
;;
*-*-freebsd*)
- THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
-+ THREAD_OPTS="${PTHREAD_LIBS}"
++ THREAD_OPTS="-pthread"
;;
*-*-darwin* | *-*-cygwin* )
THREAD_OPTS=""
Modified: head/x11/erun/Makefile
==============================================================================
--- head/x11/erun/Makefile Tue Mar 24 19:32:07 2015 (r382162)
+++ head/x11/erun/Makefile Tue Mar 24 19:37:43 2015 (r382163)
@@ -19,8 +19,8 @@ PLIST_FILES= bin/E-Run.epplet
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_GL= gl
-CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+= -L${LOCALBASE}/lib -lepplet -lImlib2 -lGL ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -lpthread -L${LOCALBASE}/lib -lepplet -lImlib2 -lGL
do-build:
cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -o ${PORTNAME}.epplet \
Modified: head/x11/gnome-menus/Makefile
==============================================================================
--- head/x11/gnome-menus/Makefile Tue Mar 24 19:32:07 2015 (r382162)
+++ head/x11/gnome-menus/Makefile Tue Mar 24 19:37:43 2015 (r382163)
@@ -23,8 +23,6 @@ INSTALL_TARGET= install-strip
post-patch:
@${SED} -e 's|/usr/local|${LOCALBASE}|g' \
< ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory
- @${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
- ${WRKSRC}/util/Makefile.in
post-install:
@${MKDIR} -p ${STAGEDIR}${PREFIX}/etc/xdg/menus/
Modified: head/x11/gnome-menus/files/patch-util_Makefile.in
==============================================================================
--- head/x11/gnome-menus/files/patch-util_Makefile.in Tue Mar 24 19:32:07 2015 (r382162)
+++ head/x11/gnome-menus/files/patch-util_Makefile.in Tue Mar 24 19:37:43 2015 (r382163)
@@ -4,7 +4,7 @@
test-menu-spec.c
gnome_menu_spec_test_LDADD = \
-+ %%PTHREAD_LIBS%% \
++ -lpthread \
$(GIO_UNIX_LIBS) \
../libmenu/libgnome-menu-3.la
Modified: head/x11/mate-applets/Makefile
==============================================================================
--- head/x11/mate-applets/Makefile Tue Mar 24 19:32:07 2015 (r382162)
+++ head/x11/mate-applets/Makefile Tue Mar 24 19:37:43 2015 (r382163)
@@ -33,8 +33,8 @@ GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
CONFIGURE_ARGS= --disable-networkmanager
CONFIGURE_ENV= OS_SYS="/usr/include"
-CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -lpthread -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.mate.panel.applet.charpick.gschema.xml \
Modified: head/x11/xlockmore/Makefile
==============================================================================
--- head/x11/xlockmore/Makefile Tue Mar 24 19:32:07 2015 (r382162)
+++ head/x11/xlockmore/Makefile Tue Mar 24 19:37:43 2015 (r382163)
@@ -62,7 +62,7 @@ KRB5LIB= -L${KRB5_HOME}/lib
.if ${PORT_OPTIONS:MMESAGL}
CONFIGURE_ARGS+= --with-mesa
-MESALIB=${PTHREAD_LIBS}
+MESALIB= -lpthread
USE_GL= yes
CFLAGS+= -I${LOCALBASE}/include/FTGL
.else
Modified: head/x11/xscreensaver-gnome/Makefile
==============================================================================
--- head/x11/xscreensaver-gnome/Makefile Tue Mar 24 19:32:07 2015 (r382162)
+++ head/x11/xscreensaver-gnome/Makefile Tue Mar 24 19:37:43 2015 (r382163)
@@ -73,8 +73,7 @@ CFLAGS+= -O0
DOS2UNIX_FILES= hacks/glx/topblock.c
post-patch:
- @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
- s|malloc.h|stdlib.h|g ; \
+ @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g ; \
s|/usr/X11R6|${LOCALBASE}|g' \
${WRKSRC}/configure
.if ${PORT_OPTIONS:MPAM}
Modified: head/x11/xstroke/Makefile
==============================================================================
--- head/x11/xstroke/Makefile Tue Mar 24 19:32:07 2015 (r382162)
+++ head/x11/xstroke/Makefile Tue Mar 24 19:37:43 2015 (r382163)
@@ -19,8 +19,8 @@ USE_XORG= xft x11 xext xi xtst
PLIST_FILES= bin/xstroke %%ETCDIR%%/alphabet man/man1/xstroke.1.gz
CFLAGS+= -I.
-CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -lpthread -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/etc/Imakefile
More information about the svn-ports-head
mailing list