diff options
| author | John Marino <marino@FreeBSD.org> | 2015-03-25 21:37:39 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2015-03-25 21:37:39 +0000 |
| commit | 112f62e6b9a1ec43ddc94a4694095f410e4b643e (patch) | |
| tree | 277ac2758fc47caca6c3e00663bc52d197085558 /audio | |
| parent | 33ac97e0314d5998c3111bd87d8bcece3e1978b2 (diff) | |
| download | ports-112f62e6b9a1ec43ddc94a4694095f410e4b643e.tar.gz ports-112f62e6b9a1ec43ddc94a4694095f410e4b643e.zip | |
audio category: Remove $PTHREAD_LIBS
xmcd didn't pass check-plist (pre-existing), fixed.
approved by: PTHREAD blanket
Notes
Notes:
svn path=/head/; revision=382272
Diffstat (limited to 'audio')
37 files changed, 98 insertions, 135 deletions
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile index 36d6e11d43d8..a590dd78cfd6 100644 --- a/audio/audacity/Makefile +++ b/audio/audacity/Makefile @@ -113,10 +113,12 @@ VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis .include <bsd.port.pre.mk> -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -CPPFLAGS+= -I${WRKSRC}/lib-src/portsmf ${PTHREAD_CFLAGS} -CXXFLAGS+= -I${WRKSRC}/lib-src/portsmf ${PTHREAD_CFLAGS} -CFLAGS+= -I${WRKSRC}/lib-src/portsmf -I${WRKSRC}/lib-src/portaudio-v19/include -I${WRKSRC}/lib-src/lame -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -lpthread -L${LOCALBASE}/lib +CPPFLAGS+= -I${WRKSRC}/lib-src/portsmf +CXXFLAGS+= -I${WRKSRC}/lib-src/portsmf +CFLAGS+= -I${WRKSRC}/lib-src/portsmf \ + -I${WRKSRC}/lib-src/portaudio-v19/include \ + -I${WRKSRC}/lib-src/lame -I${LOCALBASE}/include post-patch: .if ! ${PORT_OPTIONS:MPORTMIXER} diff --git a/audio/espeak/Makefile b/audio/espeak/Makefile index 4066dc171b2c..66aaf564081b 100644 --- a/audio/espeak/Makefile +++ b/audio/espeak/Makefile @@ -36,9 +36,6 @@ RUNTIME_MAKE_ENV= AUDIO="runtime" CONFLICTS= speak-1.[0-9] -MAKE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" - CXXFLAGS+= -I${LOCALBASE}/include USES= gmake zip USE_LDCONFIG= yes diff --git a/audio/espeak/files/patch-src__Makefile b/audio/espeak/files/patch-src__Makefile index 42c87eb7f5c4..48f99b1acd64 100644 --- a/audio/espeak/files/patch-src__Makefile +++ b/audio/espeak/files/patch-src__Makefile @@ -1,5 +1,5 @@ ---- ./src/Makefile.orig 2011-11-22 22:46:08.000000000 +0100 -+++ ./src/Makefile 2012-05-03 16:00:55.000000000 +0200 +--- src/Makefile.orig 2014-02-02 10:58:11 UTC ++++ src/Makefile @@ -1,8 +1,8 @@ # remove -fno-exceptions if it causes problems with stdio library on some platforms (ARM) @@ -11,7 +11,7 @@ BINDIR=$(PREFIX)/bin INCDIR=$(PREFIX)/include/espeak LIBDIR=$(PREFIX)/lib -@@ -27,7 +27,7 @@ +@@ -27,7 +27,7 @@ MKDIR = mkdir -p # 'runtime' uses pulseaudio if it is running, else uses portaudio #AUDIO = runtime @@ -20,7 +20,7 @@ #AUDIO = portaudio0 #AUDIO = portaudio2 #AUDIO = pulseaudio -@@ -35,17 +35,17 @@ +@@ -35,17 +35,17 @@ AUDIO = portaudio ifeq ($(AUDIO),runtime) WAVE=wave.cpp wave_pulse.cpp @@ -41,36 +41,19 @@ USE_AUDIO=-DUSE_PORTAUDIO else ifeq ($(AUDIO),portaudio0) -@@ -83,23 +83,23 @@ - - SRCS1=$(speak_SOURCES) - OBJS1=$(patsubst %.cpp,%.o,$(SRCS1)) --LIBS1=-lstdc++ $(LIB_AUDIO) -lpthread $(EXTRA_LIBS) -+LIBS1=-lstdc++ $(LIB_AUDIO) $(PTHREAD_LIBS) $(EXTRA_LIBS) - - SRCS2=$(libespeak_SOURCES) - OBJS2=$(patsubst %.cpp,x_%.o,$(SRCS2)) --LIBS2=-lstdc++ $(LIB_AUDIO) -lpthread -+LIBS2=-lstdc++ $(LIB_AUDIO) $(PTHREAD_LIBS) +@@ -91,9 +91,9 @@ LIBS2=-lstdc++ $(LIB_AUDIO) -lpthread SRCS3 = espeak.cpp OBJS3=$(patsubst %.cpp,%.o,$(SRCS3)) -LIBS3=-lstdc++ -L . -lespeak -+LIBS3=-lstdc++ -L . -lespeak $(PTHREAD_LIBS) ++LIBS3=-lstdc++ -L . -lespeak -lpthread -CXXFLAGS=-O2 +CXXFLAGS?=-O2 all: $(BIN_NAME) $(LIB_NAME) $(STATIC_LIB_NAME) $(BIN2_NAME) - - .cpp.o: -- $(CXX) $(CXXFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions $< -+ $(CXX) $(CXXFLAGS) $(PTHREAD_CFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions $< - - $(BIN_NAME): $(OBJS1) - $(CXX) $(LDFLAGS) -o $@ $(OBJS1) $(LIBS1) -@@ -133,7 +133,7 @@ +@@ -133,7 +133,7 @@ distclean: clean install: all # Create directories @@ -79,7 +62,7 @@ $(MKDIR) $(DESTDIR)$(BINDIR) $(MKDIR) $(DESTDIR)$(LIBDIR) $(MKDIR) $(DESTDIR)$(INCDIR) -@@ -149,5 +149,5 @@ +@@ -149,5 +149,5 @@ install: all # Install development headers $(INSTALL) -pm 644 speak_lib.h $(DESTDIR)$(INCDIR) # Install data files diff --git a/audio/ezstream/Makefile b/audio/ezstream/Makefile index 136fb12c5cda..313acc5af08c 100644 --- a/audio/ezstream/Makefile +++ b/audio/ezstream/Makefile @@ -32,8 +32,8 @@ PORTEXAMPLES= ezstream_metadata.xml ezstream_mp3.xml \ PLIST_FILES= bin/ezstream bin/ezstream-file.sh etc/ezstream/ezstream.xml \ man/man1/ezstream-file.sh.1.gz man/man1/ezstream.1.gz -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -lpthread -L${LOCALBASE}/lib TAGLIB_CONFIGURE_OFF= --without-taglib TAGLIB_LIB_DEPENDS= libtag.so:${PORTSDIR}/audio/taglib diff --git a/audio/faad/Makefile b/audio/faad/Makefile index 1141a91bf898..fbebc6d29ab8 100644 --- a/audio/faad/Makefile +++ b/audio/faad/Makefile @@ -13,8 +13,8 @@ COMMENT= MPEG-2 and MPEG-4 AAC audio decoder USES= autoreconf dos2unix gmake libtool tar:bzip2 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 post-extract: diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile index 79bb3310aeab..3c04748b4a2f 100644 --- a/audio/fluidsynth/Makefile +++ b/audio/fluidsynth/Makefile @@ -22,8 +22,8 @@ CMAKE_ARGS= -Denable-ladcca:BOOL=FALSE \ -Denable-midishare:BOOL=FALSE USE_LDCONFIG= yes -CFLAGS+= -I${LOCALBASE}/include/portaudio2 -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib/portaudio2 -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CFLAGS+= -I${LOCALBASE}/include/portaudio2 -I${LOCALBASE}/include +LDFLAGS+= -lpthread -L${LOCALBASE}/lib/portaudio2 -L${LOCALBASE}/lib JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack JACK_CMAKE_OFF= -Denable-jack:BOOL=FALSE diff --git a/audio/funktrackergold/Makefile b/audio/funktrackergold/Makefile index 4738efdc047f..6e4b7147ca42 100644 --- a/audio/funktrackergold/Makefile +++ b/audio/funktrackergold/Makefile @@ -19,8 +19,7 @@ LICENSE= GPLv2 USES= compiler:nestedfct tar:tgz WRKSRC= ${WRKDIR}/funkgold -MAKE_ARGS= EXTRA_CFLAGS="${PTHREAD_CFLAGS}" \ - EXTRA_LDFLAGS="${PTHREAD_LIBS}" +MAKE_ARGS= EXTRA_LDFLAGS="-lpthread" PORTDOCS= INSTALL PLIST_FILES= bin/funkgold diff --git a/audio/gnuitar/Makefile b/audio/gnuitar/Makefile index c55c10d9bb8f..ee293e187625 100644 --- a/audio/gnuitar/Makefile +++ b/audio/gnuitar/Makefile @@ -36,10 +36,6 @@ DESKTOP_ENTRIES="GNUitar" \ pre-fetch: @${CAT} pkg-message -post-patch: - @${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" \ - ${WRKSRC}/configure ${WRKSRC}/src/Makefile - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/gnuitar ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/src/gnuitar.xpm ${STAGEDIR}${PREFIX}/share/pixmaps diff --git a/audio/hawkvoice/Makefile b/audio/hawkvoice/Makefile index 76cfed56c7a2..76cc0f5fb213 100644 --- a/audio/hawkvoice/Makefile +++ b/audio/hawkvoice/Makefile @@ -16,9 +16,10 @@ MAKEFILE= makefile.linux USE_CSTD= gnu89 USE_LDCONFIG= yes -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +LDFLAGS+= -lpthread -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include -MAKE_ARGS= LIBDIR=${STAGEDIR}${PREFIX}/lib INCDIR=${STAGEDIR}${PREFIX}/include +MAKE_ARGS= LIBDIR=${STAGEDIR}${PREFIX}/lib \ + INCDIR=${STAGEDIR}${PREFIX}/include WRKSRC= ${WRKDIR}/HawkVoiceDI/src diff --git a/audio/jack_ghero/Makefile b/audio/jack_ghero/Makefile index 19a70932d846..6bc64e518db8 100644 --- a/audio/jack_ghero/Makefile +++ b/audio/jack_ghero/Makefile @@ -23,11 +23,11 @@ OPTIONS_DEFINE= DEBUG .include <bsd.port.options.mk> -MAKE_ARGS+=" HAVE_MAN=YES" -MAKE_ARGS+=" PTHREAD_LIBS=${PTHREAD_LIBS}" +MAKE_ARGS+= HAVE_MAN="YES" +MAKE_ARGS+= PTHREAD_LIBS="-lpthread" .if ${PORT_OPTIONS:MDEBUG} -MAKE_ARGS+=" HAVE_DEBUG=YES" +MAKE_ARGS+= HAVE_DEBUG="YES" .endif .include <bsd.port.mk> diff --git a/audio/jack_umidi/Makefile b/audio/jack_umidi/Makefile index 90e7b877952e..1bbc473caa35 100644 --- a/audio/jack_umidi/Makefile +++ b/audio/jack_umidi/Makefile @@ -29,15 +29,13 @@ DEVD_SCRIPT_DESC= Install devd script to auto-launch jack_umidi PLIST_FILES+= etc/devd/jack_umidi.conf .endif -MAKE_ARGS+=" HAVE_MAN=YES" -MAKE_ARGS+=" PTHREAD_LIBS=${PTHREAD_LIBS}" +MAKE_ARGS+= HAVE_MAN="YES" +MAKE_ARGS+= PTHREAD_LIBS="-lpthread" .if ${PORT_OPTIONS:MDEBUG} -MAKE_ARGS+=" HAVE_DEBUG=YES" +MAKE_ARGS+= HAVE_DEBUG="YES" .endif -.include <bsd.port.pre.mk> - post-install: .if ${PORT_OPTIONS:MDEVD_SCRIPT} @${MKDIR} ${STAGEDIR}${PREFIX}/etc/devd @@ -45,4 +43,4 @@ post-install: ${STAGEDIR}${PREFIX}/etc/devd .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/audio/lxmusic/Makefile b/audio/lxmusic/Makefile index 66d9eaddb2bf..9dc3f73f3fe0 100644 --- a/audio/lxmusic/Makefile +++ b/audio/lxmusic/Makefile @@ -22,8 +22,8 @@ GNU_CONFIGURE= yes INSTALLS_ICONS= yes 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 PORTDOCS= AUTHORS README diff --git a/audio/mp-player/Makefile b/audio/mp-player/Makefile index 5b1f352d5cc2..e595b7acc086 100644 --- a/audio/mp-player/Makefile +++ b/audio/mp-player/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libmikmod.so:${PORTSDIR}/audio/libmikmod CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lmikmod ${PTHREAD_LIBS} -lncurses -lpanel +LDFLAGS+= -L${LOCALBASE}/lib -lmikmod -lpthread -lncurses -lpanel DEFINES= -D_REENTRANT PLIST_FILES= bin/mp-player diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile index 7466fb743a03..731cba2be2c7 100644 --- a/audio/mp3blaster/Makefile +++ b/audio/mp3blaster/Makefile @@ -15,8 +15,8 @@ GNU_CONFIGURE= yes WANT_GNOME= yes CONFIGURE_ARGS= --with-cxxflags="${CXXFLAGS}" -CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT +LDFLAGS+= -lpthread -L${LOCALBASE}/lib OPTIONS_DEFINE= LIRC SIDPLAY VORBIS DOCS OPTIONS_DEFAULT= SIDPLAY VORBIS @@ -69,9 +69,8 @@ CONFIGURE_ARGS+= --without-esd .endif post-patch: - @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/usr/local/share/mp3blaster/win2koi.tbl|${DATADIR}/charmap/win2koi.tbl|' \ - ${WRKSRC}/doc/sample.mp3blasterrc + ${WRKSRC}/doc/sample.mp3blasterrc post-install: .if ${PORT_OPTIONS:MDOCS} diff --git a/audio/muse/Makefile b/audio/muse/Makefile index 63dba010c569..8b5617b95bc7 100644 --- a/audio/muse/Makefile +++ b/audio/muse/Makefile @@ -22,8 +22,8 @@ USES= gettext gmake GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-debug --disable-lubrify --disable-rpath -CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_SYS_UIO_H ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib -lintl ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_SYS_UIO_H +LDFLAGS+= -lpthread -L${LOCALBASE}/lib -lintl PORTDOCS= AUTHORS ChangeLog NEWS KNOWN-BUGS README TODO USAGE PLIST_FILES= bin/muse man/man1/muse.1.gz diff --git a/audio/ncmpcpp/Makefile b/audio/ncmpcpp/Makefile index fbfb58e8635f..819d9dbff42e 100644 --- a/audio/ncmpcpp/Makefile +++ b/audio/ncmpcpp/Makefile @@ -19,7 +19,7 @@ USES= compiler:c++11-lib iconv libtool ncurses pkgconfig tar:bzip2 GNU_CONFIGURE= yes USE_GNOME= glib20 CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +LDFLAGS+= -lpthread -L${LOCALBASE}/lib CONFIGURE_ENV= BOOST_LIB_SUFFIX="" OPTIONS_DEFINE= CURL CLOCK DOCS OUTPUTS TAGLIB UTF8 VISUALIZER diff --git a/audio/openal/Makefile b/audio/openal/Makefile index 314e8dc2b8d8..445615e2c978 100644 --- a/audio/openal/Makefile +++ b/audio/openal/Makefile @@ -47,16 +47,13 @@ NOT_FOR_ARCHS_REASON_ia64= does not compile .include <bsd.port.options.mk> post-patch: - @${REINPLACE_CMD} -e 's/-pthread/${PTHREAD_LIBS}/; \ - s/x86_64\*/amd64\* | \*ia64\*/g; \ + @${REINPLACE_CMD} -e 's/x86_64\*/amd64\* | \*ia64\*/g; \ /CPPFLAGS=/ d; s/ \*linux\*)/ \*bsd\*)/' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/#include/ s|SDL/||' \ ${WRKSRC}/src/extensions/al_ext_mp3.c @${REINPLACE_CMD} -e 's|"mixaudio16_mmx_prk.h"|"arch/i386/mixaudio16_mmx_prk.h"|' \ ${WRKSRC}/src/mixaudio16.h - @${REINPLACE_CMD} -e 's|@requirements@||; \ - s|Libs: |&${PTHREAD_LIBS} |;\ - s|Cflags: |&${PTHREAD_CFLAGS} |' \ + @${REINPLACE_CMD} -e 's|@requirements@||' \ ${WRKSRC}/admin/pkgconfig/openal.pc.in .if ! ${PORT_OPTIONS:MASM} @${REINPLACE_CMD} -e '/^NASM=/ s|=.*|=no|' ${WRKSRC}/configure diff --git a/audio/p5-Shout/Makefile b/audio/p5-Shout/Makefile index 74a4bcdd7f10..ae56a30ca599 100644 --- a/audio/p5-Shout/Makefile +++ b/audio/p5-Shout/Makefile @@ -25,7 +25,8 @@ post-patch: ${REINPLACE_CMD} -i '' -e 's/CCFLAGS/INC/' ${WRKSRC}/Makefile.PL post-configure: - @${PERL} -i -pe '$$_ .= " ${PTHREAD_LIBS}" if /^LDDLFLAGS/;' ${WRKSRC}/Makefile + @${PERL} -i -pe '$$_ .= " -lpthread" if /^LDDLFLAGS/;' \ + ${WRKSRC}/Makefile OPTIONS_DEFINE= DOCS diff --git a/audio/portaudio/Makefile b/audio/portaudio/Makefile index e1f12c7f45ec..f31925fc99f2 100644 --- a/audio/portaudio/Makefile +++ b/audio/portaudio/Makefile @@ -18,8 +18,8 @@ GNU_CONFIGURE= yes MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX} USE_LDCONFIG= yes -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_CFLAGS} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -lpthread -L${LOCALBASE}/lib PLIST_SUB+= SHLIB_VERSION=${SHLIB_VERSION} SHLIB_VERSION= 0 @@ -43,10 +43,10 @@ OPTIONS_SUB= yes .include <bsd.port.options.mk> post-patch: - @${REINPLACE_CMD} -e 's|#include <malloc.h>|#include <stdlib.h>|' ${WRKSRC}/pa_unix_oss/pa_unix.h - @${REINPLACE_CMD} -e 's|machine/soundcard.h|sys/soundcard.h|' ${WRKSRC}/pa_unix_oss/pa_unix_oss.c - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure ${WRKSRC}/configure.in \ - ${WRKSRC}/pa_unix_oss/Makefile + @${REINPLACE_CMD} -e 's|#include <malloc.h>|#include <stdlib.h>|' \ + ${WRKSRC}/pa_unix_oss/pa_unix.h + @${REINPLACE_CMD} -e 's|machine/soundcard.h|sys/soundcard.h|' \ + ${WRKSRC}/pa_unix_oss/pa_unix_oss.c pre-configure: @${CHMOD} +x ${WRKSRC}/configure diff --git a/audio/portaudio2/Makefile b/audio/portaudio2/Makefile index c73e723d46df..83c731c5c73a 100644 --- a/audio/portaudio2/Makefile +++ b/audio/portaudio2/Makefile @@ -25,8 +25,8 @@ CONFIGURE_ARGS+=PKG_CONFIG_LIBDIR=${PREFIX}/libdata/pkgconfig \ USES= dos2unix gmake libtool pathfix pkgconfig tar:tgz USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}${PKGNAMESUFFIX} -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -lpthread -L${LOCALBASE}/lib PORTDOCS= * PORTEXAMPLES= * diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile index 6572459c2422..5daa12c81b67 100644 --- a/audio/pulseaudio/Makefile +++ b/audio/pulseaudio/Makefile @@ -30,8 +30,7 @@ USE_XORG= x11 sm xtst ice USE_LDCONFIG= yes USES= execinfo gettext gmake libtool pathfix pkgconfig tar:xz GNU_CONFIGURE= yes -CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ +CONFIGURE_ENV= PTHREAD_LIBS="-lpthread" \ OPENSSL_CFLAGS="-I/usr/include" \ OPENSSL_LIBS="-lcrypto -lssl" \ LIBS="-lm -lintl" \ diff --git a/audio/rawrec/Makefile b/audio/rawrec/Makefile index 2db545484abc..7fd2a360feff 100644 --- a/audio/rawrec/Makefile +++ b/audio/rawrec/Makefile @@ -17,9 +17,8 @@ LICENSE_FILE= ${WRKDIR}/${DISTNAME}/copyright WRKSRC= ${WRKDIR}/${DISTNAME}/src USES= gmake -MAKE_ARGS= CC="${CC}" \ - CFLAGS="${CPPFLAGS} ${CFLAGS} ${PTHREAD_CFLAGS}" \ - LDFLAGS="${LDFLAGS} -lm ${PTHREAD_LIBS}" +MAKE_ARGS= CC="${CC}" CFLAGS="${CPPFLAGS} ${CFLAGS}" \ + LDFLAGS="${LDFLAGS} -lm -lpthread" PLIST_FILES= bin/rawplay bin/rawrec man/man1/rawplay.1.gz man/man1/rawrec.1.gz diff --git a/audio/sox/Makefile b/audio/sox/Makefile index f39c21184d80..a829e0d42a57 100644 --- a/audio/sox/Makefile +++ b/audio/sox/Makefile @@ -35,7 +35,7 @@ GSM_DESC= Use libgsm from ports (else use bundled lib) PNG_DESC= PNG spectrogram creation CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +LDFLAGS+= -lpthread -L${LOCALBASE}/lib CONFIGURE_ARGS+= --with-pkgconfigdir="${PREFIX}/libdata/pkgconfig" CONFIGURE_ARGS+= --with-distro="${CONFIGURE_TARGET} ${PKGNAME}" \ --with-gsm diff --git a/audio/sphinxbase/Makefile b/audio/sphinxbase/Makefile index 59ea575fc924..2b240996d993 100644 --- a/audio/sphinxbase/Makefile +++ b/audio/sphinxbase/Makefile @@ -38,8 +38,7 @@ CONFIGURE_ENV+= HAVE_PKGCONFIG=no .endif .if ${PORT_OPTIONS:MTHREADS} -CPPFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} +LDFLAGS+= -lpthread CONFIGURE_ARGS+= --enable-threads .else CONFIGURE_ARGS+= --disable-threads diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile index d550ba8fce0d..98b5dbf393f4 100644 --- a/audio/spiralloops/Makefile +++ b/audio/spiralloops/Makefile @@ -16,7 +16,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libfltk.so:${PORTSDIR}/x11-toolkits/fltk GNU_CONFIGURE= yes -MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" +MAKE_ENV= PTHREAD_LIBS="-lpthread" WRKSRC= ${WRKDIR}/${DISTNAME} PLIST_FILES= bin/SpiralLoops @@ -36,7 +36,7 @@ post-patch: s:-O3::g; \ s:CFLAGS =:CFLAGS +=:g; \ s:CXXFLAGS=:CXXFLAGS+=:g; \ - s:-lm:${PTHREAD_LIBS} -lm:g; \ + s:-lm:-lpthread -lm:g; \ s:/usr/X11R6:${LOCALBASE}:g; \ s:gcc:${CC}:; s:g\+\+:${CXX}:" \ < ${WRKSRC}/Makefile.in.orig > ${WRKSRC}/Makefile.in diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile index 31d270ee0d15..d6c31c7eb691 100644 --- a/audio/spiralsynth/Makefile +++ b/audio/spiralsynth/Makefile @@ -14,8 +14,7 @@ COMMENT= MIDI-capable synthesizer for X LIB_DEPENDS= libfltk.so:${PORTSDIR}/x11-toolkits/fltk GNU_CONFIGURE= yes -MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" +MAKE_ENV= PTHREAD_LIBS="-lpthread" PLIST= ${WRKDIR}/pkg-plist WRKSRC= ${WRKDIR}/${DISTNAME} @@ -40,13 +39,13 @@ post-patch: SpiralSound/_SynthInfo.C \ Synth.h ${MV} ${WRKSRC}/${ii} ${WRKSRC}/${ii}.orig - ${SED} -e 's|-O3|${PTHREAD_CFLAGS}|g ; \ + ${SED} -e 's|-O3||g ; \ s|CC =|CC? =|g ; \ s|CFLAGS =|CFLAGS +=|g ; \ s|CXX =|CXX? =|g ; \ s|CXXFLAGS=|CXXFLAGS+=|g ; \ s|LINK = g++|LINK = ${CXX}|g ; \ - s|-lm|${PTHREAD_LIBS} -lm|g ; \ + s|-lm|-lpthread -lm|g ; \ s|/usr/X11R6|${LOCALBASE}|g ; \ s|iostream.h|iostream|g ;\ s|fstream.h|fstream|g ;\ diff --git a/audio/spiralsynthmodular/Makefile b/audio/spiralsynthmodular/Makefile index b6eb39ed0d09..f9c39deabd4b 100644 --- a/audio/spiralsynthmodular/Makefile +++ b/audio/spiralsynthmodular/Makefile @@ -34,8 +34,8 @@ OPTIMIZED_CFLAGS_CFLAGS=-O3 -ffast-math post-patch: @${REINPLACE_CMD} -E -e 's@(-O3|-ffast-math)@@g; \ s|-Wall||; \ - s|CFLAGS="-pipe|CFLAGS="\$$\{CFLAGS\} ${PTHREAD_CFLAGS}|; \ - s|CXXFLAGS="-pipe|CXXFLAGS="\$$\{CXXFLAGS\} ${PTHREAD_CFLAGS}|; \ + s|CFLAGS="-pipe|CFLAGS="\$$\{CFLAGS\}|; \ + s|CXXFLAGS="-pipe|CXXFLAGS="\$$\{CXXFLAGS\}|; \ s|^SpiralSound/Plugins/MidiPlugin/Makefile||; \ s|MidiPlugin||' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @@ -53,7 +53,7 @@ post-patch: ${WRKSRC}/SpiralSound/Sample.h @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -E -e \ 's,-l(dl|rt),,; s|g\+\+|$$(CXX)|; \ - /^(CC|CXX)[[:space:]]*=.+$$/d; s|-lpthread|${PTHREAD_LIBS}|g; \ + /^(CC|CXX)[[:space:]]*=.+$$/d; \ s,@FLTK_(C|CXX)FLAGS@,-I${LOCALBASE}/include,; \ s,(bin|lib)dir),DESTDIR)$$(&,' @${FIND} ${WRKSRC} -type f -name "*.C" -o -name "*.cpp" -o -name "*.h" \ diff --git a/audio/squash/Makefile b/audio/squash/Makefile index 054d5efaaf81..2b072eff1433 100644 --- a/audio/squash/Makefile +++ b/audio/squash/Makefile @@ -29,9 +29,9 @@ OPTIONS_DEFINE= DOCS PORTDOCS= * post-patch: - @${REINPLACE_CMD} -e "s|--std=gnu99|--std=gnu99 ${CFLAGS} ${PTHREAD_CFLAGS}|; \ + @${REINPLACE_CMD} -e "s|--std=gnu99|--std=gnu99 ${CFLAGS}|; \ s|-Iinclude|-Iinclude -I${LOCALBASE}/include|; \ - s|-lpthread|${PTHREAD_LIBS}|; s|-ldl|-L${LOCALBASE}/lib|" ${WRKSRC}/Makefile + s|-ldl|-L${LOCALBASE}/lib|" ${WRKSRC}/Makefile @${REINPLACE_CMD} -e "s,/usr/bin/ruby,${RUBY}," \ ${WRKSRC}/extra/*.rb @${REINPLACE_CMD} -e "s,/etc/squash.conf,${PREFIX}/etc/squash.conf," \ diff --git a/audio/streamripper/Makefile b/audio/streamripper/Makefile index 7af46f43f669..45f555cd2133 100644 --- a/audio/streamripper/Makefile +++ b/audio/streamripper/Makefile @@ -56,19 +56,19 @@ post-extract: ${MV} ${WRKDIR}/cdk-${CDK_VERSION} ${WRKSRC} post-patch: - @${REINPLACE_CMD} -e '/if test/s|==|=|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e '/if test/s|==|=|g' ${WRKSRC}/configure pre-configure: - @cd ${WRKSRC}/cdk-${CDK_VERSION} && ${SETENV} CC="${CC}" \ - CFLAGS="${CFLAGS}" ${SH} ./configure + (cd ${WRKSRC}/cdk-${CDK_VERSION} && ${SETENV} CC="${CC}" \ + CFLAGS="${CFLAGS}" ${SH} ./configure) pre-build: - @cd ${WRKSRC}/cdk-${CDK_VERSION} && ${SETENV} ${MAKE_ENV} \ - ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET} + (cd ${WRKSRC}/cdk-${CDK_VERSION} && ${SETENV} ${MAKE_ENV} \ + ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/streamripper ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/streamripper.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/streamripper.1 \ + ${STAGEDIR}${MANPREFIX}/man/man1 .include <bsd.port.mk> diff --git a/audio/streamtranscoder/Makefile b/audio/streamtranscoder/Makefile index 10d185e44f85..9602695fec1d 100644 --- a/audio/streamtranscoder/Makefile +++ b/audio/streamtranscoder/Makefile @@ -28,9 +28,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> post-patch: - @${REINPLACE_CMD} -e 's|-D_REENTRANT|${PTHREAD_CFLAGS}|g; \ - s|-pthread|${PTHREAD_LIBS}|g; s|-O20|$$CFLAGS|g' \ - ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|-O20|$$CFLAGS|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/<curl\/types.h>/d' \ ${WRKSRC}/aclocal.m4 ${WRKSRC}/configure \ ${WRKSRC}/src/libtranscoder/transcurl.cpp diff --git a/audio/tagtool/Makefile b/audio/tagtool/Makefile index d6b13ce59b0a..dfcef8fff62d 100644 --- a/audio/tagtool/Makefile +++ b/audio/tagtool/Makefile @@ -22,11 +22,11 @@ USE_GNOME= intlhack libglade2 GNU_CONFIGURE= yes INSTALLS_ICONS= yes -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -logg -lm +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lpthread -logg -lm post-patch: - @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|-Wno-pointer-sign||g' + @${FIND} ${WRKSRC} -name "Makefile.in" | \ + ${XARGS} ${REINPLACE_CMD} -e 's|-Wno-pointer-sign||g' .include <bsd.port.mk> diff --git a/audio/tse3/Makefile b/audio/tse3/Makefile index d182c2407616..f7809da09b25 100644 --- a/audio/tse3/Makefile +++ b/audio/tse3/Makefile @@ -20,8 +20,7 @@ USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes INSTALL_TARGET= install-strip -CPPFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} +LDFLAGS+= -lpthread OPTIONS_DEFINE= DOCS diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile index 26d8ca3b876b..f268d71b5bc9 100644 --- a/audio/vorbis-tools/Makefile +++ b/audio/vorbis-tools/Makefile @@ -20,8 +20,7 @@ LIB_DEPENDS= libao.so:${PORTSDIR}/audio/libao \ USES= iconv pkgconfig GNU_CONFIGURE= yes -CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" +CONFIGURE_ENV= PTHREAD_LIBS="-lpthread" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile index ae845027ecdb..f5fe486bb540 100644 --- a/audio/xmcd/Makefile +++ b/audio/xmcd/Makefile @@ -31,10 +31,6 @@ pre-patch: post-patch: @${SED} -e "s;@PREFIX@;${STAGDIR}${PREFIX};g" ${WRKSRC}/xmcd_d/XMcd.ad.in \ > ${WRKSRC}/xmcd_d/XMcd.ad - @${FIND} ${WRKSRC} -name Makefile -o -name Imakefile | \ - ${XARGS} ${REINPLACE_CMD} \ - -e 's|_CFLAGS= -pthread|_CFLAGS= ${PTHREAD_CFLAGS}|g; \ - s|_LDFLAGS= -pthread|_LDFLAGS= ${PTHREAD_LIBS}|g' post-configure: @${REINPLACE_CMD} \ @@ -50,27 +46,27 @@ post-configure: ${WRKSRC}/install.sh post-install: - @${STRIP_CMD} ${LIBBINDIR}/cda - @${STRIP_CMD} ${LIBBINDIR}/gobrowser - @${STRIP_CMD} ${LIBBINDIR}/has_alsa - @${STRIP_CMD} ${LIBBINDIR}/xmcd - @${CP} ${WRKSRC}/xmcd_d/XMcd.ad ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/XMcd - @${RM} ${STAGEDIR}${PREFIX}/bin/xmcd - @${RM} ${STAGEDIR}${PREFIX}/bin/cda - @${LN} -sf .xmcd_start ${STAGEDIR}${PREFIX}/bin/xmcd - @${LN} -sf .xmcd_start ${STAGEDIR}${PREFIX}/bin/cda - @${REINPLACE_CMD} \ + ${STRIP_CMD} ${LIBBINDIR}/cda ${LIBBINDIR}/gobrowser \ + ${LIBBINDIR}/has_alsa ${LIBBINDIR}/xmcd + ${INSTALL_DATA} ${WRKSRC}/xmcd_d/XMcd.ad \ + ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/XMcd + ${RM} ${STAGEDIR}${PREFIX}/bin/xmcd + ${RM} ${STAGEDIR}${PREFIX}/bin/cda + ${LN} -sf .xmcd_start ${STAGEDIR}${PREFIX}/bin/xmcd + ${LN} -sf .xmcd_start ${STAGEDIR}${PREFIX}/bin/cda + ${REINPLACE_CMD} \ -e 's:^BINDIR=.*:XMCDLIB=${PREFIX}/bin:' \ -e 's:^XMCDLIB=.*:XMCDLIB=${PREFIX}/lib/X11/xmcd:' \ -e 's:^DISCOGDIR=.*:DISCOGDIR=${PREFIX}/lib/X11/xmcd/discog:' \ -e 's:XMCD_LIBDIR=.*:XMCD_LIBDIR=${PREFIX}/lib/X11/xmcd:' \ ${STAGEDIR}${PREFIX}/lib/X11/xmcd/scripts/genidx \ ${STAGEDIR}${PREFIX}/bin/.xmcd_start - @${REINPLACE_CMD} \ + ${REINPLACE_CMD} \ -e 's:${STAGEDIR}::' \ ${STAGEDIR}${PREFIX}/lib/X11/xmcd/discog/discog.html \ ${STAGEDIR}${PREFIX}/lib/X11/xmcd/config/config.sh \ ${STAGEDIR}${PREFIX}/lib/X11/xmcd/bin-${OPSYS}_${OSREL:R:R}-${ARCH}/README - @${FIND} ${STAGEDIR} -name \*.bak -delete + ${FIND} ${STAGEDIR}${PREFIX} -name \*.bak -delete + ${FIND} ${STAGEDIR}${PREFIX} -type d -empty -delete .include <bsd.port.mk> diff --git a/audio/xmms-curses/Makefile b/audio/xmms-curses/Makefile index a92dbf72212e..c46072c02200 100644 --- a/audio/xmms-curses/Makefile +++ b/audio/xmms-curses/Makefile @@ -19,7 +19,9 @@ USE_GNOME= gtk12 USE_XORG= x11 xau xcb xdmcp xext xi do-build: - cd ${WRKSRC} && ${CC} ${CFLAGS} ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} -lncurses `xmms-config --cflags --libs` -o xmms-curses *.c + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ + ${CC} ${CFLAGS} -lpthread -lncurses \ + `xmms-config --cflags --libs` -o xmms-curses *.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xmms-curses ${STAGEDIR}${PREFIX}/bin diff --git a/audio/xmms2-scrobbler/Makefile b/audio/xmms2-scrobbler/Makefile index f560e5c819f9..4d121da4aa95 100644 --- a/audio/xmms2-scrobbler/Makefile +++ b/audio/xmms2-scrobbler/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= libxmmsclient.so:${PORTSDIR}/audio/xmms2 \ libcurl.so:${PORTSDIR}/ftp/curl USES= gmake pkgconfig -LDFLAGS+= ${PTHREAD_LIBS} +LDFLAGS+= -lpthread PLIST_FILES= bin/xmms2-scrobbler PORTDOCS= README diff --git a/audio/zinf/Makefile b/audio/zinf/Makefile index 34c1df4e29d8..39c27a9eecb7 100644 --- a/audio/zinf/Makefile +++ b/audio/zinf/Makefile @@ -20,7 +20,7 @@ CONFIGURE_ARGS= --enable-ipv6 \ --disable-arts CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +LDFLAGS+= -lpthread -L${LOCALBASE}/lib OPTIONS_DEFINE= ESOUND VORBIS OPTIONS_DEFAULT=VORBIS |