Date: Wed, 25 Mar 2015 20:09:43 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382266 - in head/graphics: Coin GraphicsMagick ImageMagick OpenEXR ayam ayam/files cairo cimg clutter-gtk clutter-gtk3 dia ffff fv gcolor gimp-app glfw2 glitz gnash graphviz kludge3d l... Message-ID: <201503252009.t2PK9hj7073555@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Wed Mar 25 20:09:42 2015 New Revision: 382266 URL: https://svnweb.freebsd.org/changeset/ports/382266 QAT: https://qat.redports.org/buildarchive/r382266/ Log: graphics category: Remove $PTHREAD_LIBS graphics/zbar didn't pass check-plist (pre-existing), fixed. approved by: PTHREAD blanket Modified: head/graphics/Coin/Makefile head/graphics/GraphicsMagick/Makefile head/graphics/ImageMagick/Makefile head/graphics/OpenEXR/Makefile head/graphics/ayam/Makefile head/graphics/ayam/files/patch-Makefile.shared head/graphics/cairo/Makefile head/graphics/cimg/Makefile head/graphics/clutter-gtk/Makefile head/graphics/clutter-gtk3/Makefile head/graphics/dia/Makefile head/graphics/ffff/Makefile head/graphics/fv/Makefile head/graphics/gcolor/Makefile head/graphics/gimp-app/Makefile head/graphics/glfw2/Makefile head/graphics/glitz/Makefile head/graphics/gnash/Makefile head/graphics/graphviz/Makefile head/graphics/kludge3d/Makefile head/graphics/lcdtest/Makefile head/graphics/libqrencode/Makefile head/graphics/libvisual04/Makefile head/graphics/mesa-demos/Makefile head/graphics/meshviewer/Makefile head/graphics/ocaml-lablgl/Makefile head/graphics/opendx/Makefile head/graphics/openrm/Makefile head/graphics/rawtherapee/Makefile head/graphics/tgif/Makefile head/graphics/tgif/files/patch-Tgif.tmpl-freebsd head/graphics/ufraw/Makefile head/graphics/xaos/Makefile head/graphics/zathura/Makefile head/graphics/zbar/Makefile Modified: head/graphics/Coin/Makefile ============================================================================== --- head/graphics/Coin/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/Coin/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -26,11 +26,14 @@ USE_LDCONFIG= yes MAKE_ENV= LANG=C post-patch: - @${REINPLACE_CMD} -e 's|DATA install-data-local|DATA|g' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure - @${FIND} ${WRKSRC} \( -name \*.cpp -o -name \*.h -a \! -name expat.h \) -a -print0 | ${XARGS} -0 ${REINPLACE_CMD} 's/<stdlib.h>/<cstdlib>/g' + @${REINPLACE_CMD} -e 's|DATA install-data-local|DATA|g' \ + ${WRKSRC}/Makefile.in + @${FIND} ${WRKSRC} \( -name \*.cpp -o -name \*.h -a \! \ + -name expat.h \) -a -print0 | ${XARGS} -0 \ + ${REINPLACE_CMD} 's/<stdlib.h>/<cstdlib>/g' post-build: - @${REINPLACE_CMD} -e '/^ldflags=/s|-R|-Wl,-rpath,|' ${WRKSRC}/coin-default.cfg + ${REINPLACE_CMD} -e '/^ldflags=/s|-R|-Wl,-rpath,|' \ + ${WRKSRC}/coin-default.cfg .include <bsd.port.mk> Modified: head/graphics/GraphicsMagick/Makefile ============================================================================== --- head/graphics/GraphicsMagick/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/GraphicsMagick/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -27,7 +27,7 @@ USES= iconv libtool tar:bzip2 USE_GNOME= libxml2 USE_GHOSTSCRIPT=yes GNU_CONFIGURE= yes -CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}" +CONFIGURE_ENV= PTHREAD_LIBS="-lpthread" CONFIGURE_ARGS= --without-perl --enable-shared --enable-static \ --with-quantum-depth="${QD}" \ --with-windows-font-dir="${WINDOWS_FONT_DIR}" Modified: head/graphics/ImageMagick/Makefile ============================================================================== --- head/graphics/ImageMagick/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/ImageMagick/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -125,9 +125,8 @@ PLIST_SUB+= WITH_PERL='@comment ' .if ${_IMAGEMAGICK_THREADS} == "yes" CONFIGURE_ARGS+= --with-threads -CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" -LDFLAGS+= ${PTHREAD_LIBS} +CONFIGURE_ENV+= PTHREAD_LIBS="-lpthread" +LDFLAGS+= -lpthread .else CONFIGURE_ARGS+= --without-threads _IMAGEMAGICK_THREADS=no Modified: head/graphics/OpenEXR/Makefile ============================================================================== --- head/graphics/OpenEXR/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/OpenEXR/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -28,7 +28,7 @@ USE_LDCONFIG= yes CPPFLAGS+= -I. -I../IlmImf # must be linked with -l{thr|pthread} explicitly -LDFLAGS+= ${PTHREAD_LIBS} +LDFLAGS+= -lpthread PORTDOCS= * PORTEXAMPLES= * Modified: head/graphics/ayam/Makefile ============================================================================== --- head/graphics/ayam/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/ayam/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -28,7 +28,6 @@ USE_LDCONFIG= ${PREFIX}/lib/ayam USES= gmake tk:84 WRKSRC= ${WRKDIR}/${PORTNAME}/src MAKEFILE= Makefile.shared -MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" MAKE_JOBS_UNSAFE= yes AYAM_PLUGINS= csphere mfio Modified: head/graphics/ayam/files/patch-Makefile.shared ============================================================================== --- head/graphics/ayam/files/patch-Makefile.shared Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/ayam/files/patch-Makefile.shared Wed Mar 25 20:09:42 2015 (r382266) @@ -163,7 +163,7 @@ +#AQSISRI2RIB = # if you use Aqsis libri2rib (add -DAYUSEAQSISRIB to CFLAGS above!): -#AQSISRI2RIB = $(AQSISLIBDIR)/libri2rib.so -L /usr/local/lib -llog4cpp -+AQSISRI2RIB = $(AQSISLIBDIR)/libaqsis_ri2rib.so -L${AQSISLIBDIR} -lstdc++ ${PTHREAD_LIBS} ++AQSISRI2RIB = $(AQSISLIBDIR)/libaqsis_ri2rib.so -L${AQSISLIBDIR} -lstdc++ -lpthread # BMRT Modified: head/graphics/cairo/Makefile ============================================================================== --- head/graphics/cairo/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/cairo/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -65,7 +65,7 @@ post-patch: -e '/LIBS/s/-lrt//' -e '/LIBS/s|-ldld||' \ -e '/LIBS/s|-ldl||' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|-lcairo|-lcairo ${PTHREAD_LIBS}|' \ + @${REINPLACE_CMD} -e 's|-lcairo|-lcairo -lpthread|' \ ${WRKSRC}/src/*.pc.in @${REINPLACE_CMD} -e '/@CAIRO_HAS_PNG_FUNCTIONS_TRUE@.*=/d' \ ${WRKSRC}/Makefile.in Modified: head/graphics/cimg/Makefile ============================================================================== --- head/graphics/cimg/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/cimg/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -39,8 +39,8 @@ USES+= blaslapack WRKSRC= ${WRKDIR}/${DISTNAME:C/_/-/} BUILD_WRKSRC= ${WRKSRC}/examples MAKE_ENV= X11PATH=${LOCALBASE} LOCALBASE=${LOCALBASE} -CPPFLAGS+= ${CFLAGS} ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} +CPPFLAGS+= ${CFLAGS} +LDFLAGS+= -lpthread OPTIONS_DEFINE= DOCS EXAMPLES Modified: head/graphics/clutter-gtk/Makefile ============================================================================== --- head/graphics/clutter-gtk/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/clutter-gtk/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -18,8 +18,8 @@ GNU_CONFIGURE= yes USE_GNOME= gtk20 gnomeprefix USE_XORG= xp x11 USE_LDCONFIG= yes -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 post-patch: Modified: head/graphics/clutter-gtk3/Makefile ============================================================================== --- head/graphics/clutter-gtk3/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/clutter-gtk3/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -18,8 +18,8 @@ GNU_CONFIGURE= yes USE_GNOME= gnomeprefix gtk30 introspection USE_XORG= xp x11 USE_LDCONFIG= yes -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 .include <bsd.port.mk> Modified: head/graphics/dia/Makefile ============================================================================== --- head/graphics/dia/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/dia/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -50,10 +50,10 @@ post-patch: ${WRKSRC}/tests/test-boundingbox.c @${FIND} ${WRKSRC} -name Makefile.in | \ ${XARGS} ${REINPLACE_CMD} -e \ - 's,\(^GTK_LIBS.*\),\1 ${PTHREAD_LIBS}, ; \ - s,\(^GTK_CFLAGS = \),\1 ${PTHREAD_CFLAGS} ,' + 's,\(^GTK_LIBS.*\),\1 -lpthread,' @${REINPLACE_CMD} -e 's|http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl|${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl| ; \ - s|echo aout|echo elf|g ; s|/usr/include/libEMF|${LOCALBASE}/include/libEMF|g ; \ + s|echo aout|echo elf|g ; \ + s|/usr/include/libEMF|${LOCALBASE}/include/libEMF|g ; \ s|-lstdc++||g' ${WRKSRC}/configure .include <bsd.port.mk> Modified: head/graphics/ffff/Makefile ============================================================================== --- head/graphics/ffff/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/ffff/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -20,9 +20,9 @@ SOURCE= FFFF3 FragmentProgram FragmentP PixelBuffer VertexProgram VertexProgramATI VertexProgramNV \ extensions vpext -CXXFLAGS+= -I${LOCALBASE}/include/GL -D__linux__ -msse -msse2 -m3dnow -I${LOCALBASE}/include/ \ - ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lglut -lGL -lXext -lX11 -lXmu \ +CXXFLAGS+= -I${LOCALBASE}/include/GL -D__linux__ -msse -msse2 -m3dnow \ + -I${LOCALBASE}/include/ +LDFLAGS+= -L${LOCALBASE}/lib -lpthread -lglut -lGL -lXext -lX11 -lXmu \ -lGLU -lm PLIST_FILES= bin/ffff Modified: head/graphics/fv/Makefile ============================================================================== --- head/graphics/fv/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/fv/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -19,11 +19,9 @@ USES= gmake pkgconfig zip USE_GL= glut ALL_TARGET= ${PORTNAME} -CXXFLAGS+= $$(pkg-config --cflags libpng) \ - -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= $$(pkg-config --libs libpng) \ - -L${LOCALBASE}/lib -lglut -lGLU -lGL -lbz2 -lm -lz -llzma \ - ${PTHREAD_LIBS} +CXXFLAGS+= $$(pkg-config --cflags libpng) -I${LOCALBASE}/include +LDFLAGS+= $$(pkg-config --libs libpng) -L${LOCALBASE}/lib -lglut \ + -lGLU -lGL -lbz2 -lm -lz -llzma -lpthread PORTDOCS= AUTHORS ChangeLog README PLIST_FILES= bin/${PORTNAME} Modified: head/graphics/gcolor/Makefile ============================================================================== --- head/graphics/gcolor/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/gcolor/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -17,7 +17,7 @@ CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib pre-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|DATADIRNAME=lib|DATADIRNAME=share|g' \ + ${WRKSRC}/configure .include <bsd.port.mk> Modified: head/graphics/gimp-app/Makefile ============================================================================== --- head/graphics/gimp-app/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/gimp-app/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -44,7 +44,7 @@ CONFIGURE_ARGS?=--with-html-dir=${PREFIX --with-desktop-dir=${PREFIX}/share \ --docdir=${PREFIX}/share/doc/gimp \ --enable-default-binary -CONFIGURE_ENV= GIMP_THREAD_LIBS=${PTHREAD_LIBS} +CONFIGURE_ENV= GIMP_THREAD_LIBS=-lpthread CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib Modified: head/graphics/glfw2/Makefile ============================================================================== --- head/graphics/glfw2/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/glfw2/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -60,11 +60,8 @@ post-extract: @${CHMOD} ${BINMODE} ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} post-patch: - @${REINPLACE_CMD} -e \ - 's|/usr/X11R6|${LOCALBASE}|; \ - /SOFLAGS/s|-soname |-Wl,-soname,|; \ - /CFLAGS_THREAD/s|"-pthread"|"${PTHREAD_CFLAGS}"|; \ - /LFLAGS_THREAD/s|"-pthread"|"${PTHREAD_LIBS}"|' \ + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|; \ + /SOFLAGS/s|-soname |-Wl,-soname,|' \ ${WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} \ -e 's|lib/pkgconfig|libdata/pkgconfig|g' \ Modified: head/graphics/glitz/Makefile ============================================================================== --- head/graphics/glitz/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/glitz/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -18,7 +18,6 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes INSTALL_TARGET= install-strip -CPPFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} +LDFLAGS+= -lpthread .include <bsd.port.mk> Modified: head/graphics/gnash/Makefile ============================================================================== --- head/graphics/gnash/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/gnash/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -219,8 +219,7 @@ pre-everything:: .endif post-patch: - ${REINPLACE_CMD} -e '/^PTHREAD_[LC][IF]*=/ d; s|-lpthread|${PTHREAD_LIBS}|' \ - -e '/KDE4_APPSDATADIR=/ s|share/kde4|share|' \ + ${REINPLACE_CMD} -e '/KDE4_APPSDATADIR=/ s|share/kde4|share|' \ -e 's|/usr/local|${LOCALBASE}|g; \ s|/lib64|/lib|g; \ s|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/configure \ Modified: head/graphics/graphviz/Makefile ============================================================================== --- head/graphics/graphviz/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/graphviz/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -148,8 +148,7 @@ TK_CPPFLAGS= -I${TK_INCLUDEDIR} TK_CONFIGURE_ON= --with-wish=${WISH} TK_CONFIGURE_ENV= TKCONFIG="${TK_LIBDIR}/tkConfig.sh" GUILE_CONFIGURE_ENABLE= guile -NVTHREADS_CFLAGS+= ${PTHREAD_CFLAGS} -NVTHREADS_LDFLAGS+= ${PTHREAD_LIBS} +NVTHREADS_LDFLAGS= -lpthread .include <bsd.port.options.mk> Modified: head/graphics/kludge3d/Makefile ============================================================================== --- head/graphics/kludge3d/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/kludge3d/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -21,10 +21,8 @@ CONFIGURE_ARGS= --with-lib-GL PLIST_FILES= bin/kludge3d -CPPFLAGS+= -I${LOCALBASE}/include \ - -I${PYTHON_INCLUDEDIR} ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib \ - -L${PYTHON_LIBDIR}/config -lm ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include -I${PYTHON_INCLUDEDIR} +LDFLAGS+= -L${LOCALBASE}/lib -L${PYTHON_LIBDIR}/config -lpthread -lm post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ Modified: head/graphics/lcdtest/Makefile ============================================================================== --- head/graphics/lcdtest/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/lcdtest/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -21,7 +21,7 @@ RUN_DEPENDS= liberation-fonts-ttf>0:${PO USE_SDL= sdl image ttf CFLAGS+= -I${LOCALBASE}/include -DRELEASE=1.18 -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lSDL -lSDL_image -lSDL_ttf +LDFLAGS+= -L${LOCALBASE}/lib -lpthread -lSDL -lSDL_image -lSDL_ttf PLIST_FILES= bin/${PORTNAME} \ man/man1/${PORTNAME}.1.gz \ Modified: head/graphics/libqrencode/Makefile ============================================================================== --- head/graphics/libqrencode/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/libqrencode/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -32,6 +32,6 @@ PLIST_FILES= bin/qrencode \ post-patch: @${REINPLACE_CMD} -e 's,libpng12,libpng,' ${WRKSRC}/configure - @${REINPLACE_CMD} -e '9s|$$| ${PTHREAD_LIBS}|' ${WRKSRC}/libqrencode.pc.in + @${REINPLACE_CMD} -e '9s|$$| -lpthread|' ${WRKSRC}/libqrencode.pc.in .include <bsd.port.mk> Modified: head/graphics/libvisual04/Makefile ============================================================================== --- head/graphics/libvisual04/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/libvisual04/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -16,8 +16,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES= gettext libtool:keepla pathfix pkgconfig GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -lpthread -L${LOCALBASE}/lib USE_LDCONFIG= yes VER= -0.4 PLIST_SUB= VER=${VER} Modified: head/graphics/mesa-demos/Makefile ============================================================================== --- head/graphics/mesa-demos/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/mesa-demos/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -15,8 +15,8 @@ USES= gmake pkgconfig tar:bzip2 GNU_CONFIGURE= yes USE_GL= glu glut glew USE_XORG= glproto x11 xext xi xxf86vm xdamage xfixes dri2proto -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -lpthread -L${LOCALBASE}/lib CONFIGURE_ARGS+=--disable-egl --disable-gles2 --disable-wayland \ --disable-gbm --disable-vg --disable-osmesa Modified: head/graphics/meshviewer/Makefile ============================================================================== --- head/graphics/meshviewer/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/meshviewer/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -20,8 +20,7 @@ USE_GL= glu USE_QT4= corelib gui opengl moc_build CXXFLAGS+= -I. -Imesh -Imathvector \ `pkg-config --cflags QtOpenGL glu` -LDFLAGS+= ${PTHREAD_LIBS} \ - `pkg-config --libs QtOpenGL glu` +LDFLAGS+= -lpthread `pkg-config --libs QtOpenGL glu` MAKE_ARGS= QTDIR="${QT_PREFIX}" CC="${CXX}" MOC="${MOC}" \ CXXFLAGS="${CXXFLAGS}" \ LIBPATH="" LIBS_QT4="${LDFLAGS}" Modified: head/graphics/ocaml-lablgl/Makefile ============================================================================== --- head/graphics/ocaml-lablgl/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/ocaml-lablgl/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -38,8 +38,7 @@ THREADS_DESC= Threaded Tcl/Tk (must matc .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MTHREADS} -THR_CPP= ${PTHREAD_CFLAGS} -THR_LD= ${PTHREAD_LIBS} +THR_LD= -lpthread .endif post-extract: @@ -53,7 +52,7 @@ post-patch: -e "s,^#\(LIBDIR[ \t]*=\).*,\1${PREFIX}/lib/ocaml,g" \ -e "s,^#\(DLLDIR[ \t]*=\).*,\1${STAGEDIR}${PREFIX}/lib/ocaml/stublibs,g" \ -e "s,^#\(INSTALLDIR[ \t]*=\).*,\1${STAGEDIR}${PREFIX}/lib/ocaml/lablGL,g" \ - -e "s!^#\(COPTS[ \t]*=\).*!\1-c ${CFLAGS} ${THR_CPP}!g" \ + -e "s!^#\(COPTS[ \t]*=\).*!\1-c ${CFLAGS}!g" \ -e "/^TKINCLUDES/s,=.*$$,= -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}," \ -e "/^TKLIBS/s,=.*$$,= -L${LOCALBASE}/lib -ltk${TK_SHLIB_VER}\ -ltcl${TCL_SHLIB_VER} ${THR_LD}," \ Modified: head/graphics/opendx/Makefile ============================================================================== --- head/graphics/opendx/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/opendx/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -22,7 +22,6 @@ USE_GL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared USE_LDCONFIG= yes -CFLAGS+= ${PTHREAD_CFLAGS} CONFIGURE_ENV= ARCH=freebsd CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -75,8 +74,7 @@ post-patch: @${FIND} ${WRKSRC}/${dir} -type f | ${XARGS} \ ${REINPLACE_CMD} -e "s;/usr/lpp;${PREFIX};g" .endfor - @${REINPLACE_CMD} -e "s;-lpthread;${PTHREAD_LIBS};g" \ - -e "s;/usr/X11R6;${LOCALBASE};g" \ + @${REINPLACE_CMD} -e "s;/usr/X11R6;${LOCALBASE};g" \ ${WRKSRC}/configure @${REINPLACE_CMD} -e "s|startserver.bat||" \ ${WRKSRC}/src/uipp/java/server/Makefile.in Modified: head/graphics/openrm/Makefile ============================================================================== --- head/graphics/openrm/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/openrm/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -59,7 +59,6 @@ post-patch: '/^RM/s|/usr|${PREFIX}| ; \ /^OPENGL/s|/usr|${LOCALBASE}| ; \ /^X11/s|/usr/X11R6|${LOCALBASE}| ; \ - /^X11/s|-lpthread|${PTHREAD_LIBS}| ; \ /^OPT/s|-g|| ; \ /^ARCH/s|-m32|| ; \ /^JPEG/s|/usr|${LOCALBASE}|' ${DEMO_WRKSRC}/makeinclude Modified: head/graphics/rawtherapee/Makefile ============================================================================== --- head/graphics/rawtherapee/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/rawtherapee/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -27,9 +27,9 @@ USES= cmake:outsource pkgconfig compile DOS2UNIX_REGEX= .*\.(cc|h) USE_GNOME= gtk20 glib20 USE_LDCONFIG= yes -CFLAGS+= -I${LOCALBASE}/include -fPIC ${PTHREAD_CFLAGS} -CXXFLAGS+= -I${LOCALBASE}/include -fPIC ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CFLAGS+= -I${LOCALBASE}/include -fPIC +CXXFLAGS+= -I${LOCALBASE}/include -fPIC +LDFLAGS+= -lpthread -L${LOCALBASE}/lib CMAKE_ENV= CFLAGS="${CFLAGS}" \ LDFLAGS="${LDFLAGS:C|-Wl,-rpath=${_GCC_RUNTIME}||:C|-L${_GCC_RUNTIME}||}" CMAKE_ARGS+= -DDOCDIR="${DOCSDIR}" \ Modified: head/graphics/tgif/Makefile ============================================================================== --- head/graphics/tgif/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/tgif/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -26,7 +26,6 @@ A4SIZE_DESC= Set default paper size to A USES= imake PORTDOCS= HISTORY README USE_XORG= x11 xext xt sm ice -MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" .include <bsd.port.options.mk> Modified: head/graphics/tgif/files/patch-Tgif.tmpl-freebsd ============================================================================== --- head/graphics/tgif/files/patch-Tgif.tmpl-freebsd Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/tgif/files/patch-Tgif.tmpl-freebsd Wed Mar 25 20:09:42 2015 (r382266) @@ -5,6 +5,6 @@ XCOMM LOCAL_LIBRARIES = $(XMULIB) $(XTOOLLIB) $(XLIB) XCOMM SYS_LIBRARIES = -ldl -lm -lz -SYS_LIBRARIES = -lm -lz -+SYS_LIBRARIES = -lm -lz ${PTHREAD_LIBS} ++SYS_LIBRARIES = -lm -lz -lpthread + +#include "Tgif.tmpl-freebsdports" Modified: head/graphics/ufraw/Makefile ============================================================================== --- head/graphics/ufraw/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/ufraw/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -22,7 +22,7 @@ CONFIGURE_ARGS= --disable-silent-rules - USES= gettext pkgconfig gmake desktop-file-utils CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +LDFLAGS+= -lpthread -L${LOCALBASE}/lib PC_FALSE= cinepaint OPTIONS_DEFINE= CONTRAST DST EXIV2 LENSFUN FITS GIMP GTK2 GNOME Modified: head/graphics/xaos/Makefile ============================================================================== --- head/graphics/xaos/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/xaos/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -40,7 +40,7 @@ NLS_CONFIGURE_ENABLE= nls THREADS_DESC= Enable SMP support (experimental) THREADS_CONFIGURE_WITH= pthread -THREADS_LIBS= ${PTHREAD_LIBS} +THREADS_LIBS= -lpthread CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib Modified: head/graphics/zathura/Makefile ============================================================================== --- head/graphics/zathura/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/zathura/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -48,7 +48,6 @@ post-patch: .SILENT ${WRKSRC}/Makefile .endif ${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include|' \ - -e 's/-lpthread/${PTHREAD_LIBS}/' \ -e 's/-lc//' \ -e 's/DL_LIB /#&/' \ ${WRKSRC}/config.mk Modified: head/graphics/zbar/Makefile ============================================================================== --- head/graphics/zbar/Makefile Wed Mar 25 20:06:20 2015 (r382265) +++ head/graphics/zbar/Makefile Wed Mar 25 20:09:42 2015 (r382266) @@ -3,7 +3,7 @@ PORTNAME= zbar PORTVERSION= 0.10 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics MASTER_SITES= SF @@ -17,6 +17,7 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/grap GNU_CONFIGURE= yes USE_LDCONFIG= yes USES= iconv libtool gmake pkgconfig +INSTALL_TARGET= install-strip CONFIGURE_ARGS= --with-jpeg=yes @@ -56,7 +57,6 @@ LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.options.mk> post-patch: - @${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/configure @${REINPLACE_CMD} 's|^pkgconfigdir = .*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|' \ ${WRKSRC}/Makefile.in .if empty(PORT_OPTIONS:MDOCS) @@ -64,4 +64,8 @@ post-patch: ${WRKSRC}/Makefile.in .endif +post-install: + # make check-plist happy + ${RMDIR} ${STAGEDIR}${DATADIR} + .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503252009.t2PK9hj7073555>