Date: Wed, 25 Mar 2015 17:36:48 +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: r382254 - in head/multimedia: avidemux2 avidemux26 clutter-gst cuse4bsd-kmod ffmpeg ffmpeg0 ffmpeg26 flvstreamer ggrab gstreamer1-plugins librtmp libva libva-vdpau-driver libvpx libx264... Message-ID: <201503251736.t2PHanLP099909@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Wed Mar 25 17:36:47 2015 New Revision: 382254 URL: https://svnweb.freebsd.org/changeset/ports/382254 QAT: https://qat.redports.org/buildarchive/r382254/ Log: multimedia category: Remove $PTHREAD_LIBS approved by: PTHREAD blanket Modified: head/multimedia/avidemux2/Makefile.common head/multimedia/avidemux26/Makefile.common head/multimedia/clutter-gst/Makefile head/multimedia/cuse4bsd-kmod/Makefile head/multimedia/ffmpeg/Makefile head/multimedia/ffmpeg0/Makefile head/multimedia/ffmpeg26/Makefile head/multimedia/flvstreamer/Makefile head/multimedia/ggrab/Makefile head/multimedia/gstreamer1-plugins/Makefile head/multimedia/librtmp/Makefile head/multimedia/libva-vdpau-driver/Makefile head/multimedia/libva/Makefile head/multimedia/libvpx/Makefile head/multimedia/libx264/Makefile head/multimedia/lxdvdrip/Makefile head/multimedia/miro/Makefile head/multimedia/mplayer/Makefile.shared head/multimedia/mplayer/files/patch-configure head/multimedia/mplayer2/Makefile head/multimedia/mplayer2/files/patch-configure head/multimedia/nxtvepg/Makefile head/multimedia/recordmydesktop/Makefile head/multimedia/rtmpdump/Makefile head/multimedia/sabbu/Makefile head/multimedia/schroedinger/Makefile head/multimedia/vamps/Makefile head/multimedia/webcamd/Makefile head/multimedia/x264/Makefile head/multimedia/xawtv/Makefile head/multimedia/xtheater/Makefile Modified: head/multimedia/avidemux2/Makefile.common ============================================================================== --- head/multimedia/avidemux2/Makefile.common Wed Mar 25 17:00:13 2015 (r382253) +++ head/multimedia/avidemux2/Makefile.common Wed Mar 25 17:36:47 2015 (r382254) @@ -24,7 +24,7 @@ USE_QT4= # empty WANT_SDL= yes USES= cmake:outsource pkgconfig iconv gmake compiler:features CMAKE_USE_PTHREAD=yes -CMAKE_ARGS+= -DTHREADS_HAVE_PTHREAD_ARG:STRING="${PTHREAD_LIBS}" +CMAKE_ARGS+= -DTHREADS_HAVE_PTHREAD_ARG:STRING="-lpthread" CFLAGS+= -Wno-return-type MAKE_JOBS_UNSAFE= yes @@ -232,7 +232,6 @@ post-extract: ${WRKSRC}/avidemux/ADM_libraries/ADM_mplex/ADM_mplexout.cpp post-patch: - @${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/*/*/Makefile @${REINPLACE_CMD} '/--enable-shared/s,,& --cc=${CC},' ${WRKSRC}/cmake/admFFmpegBuild.cmake @${REINPLACE_CMD} '/sub $$1/s,sub,subl,' ${WRKSRC}/plugins/ADM_videoFilters/FluxSmooth/ADM_vidFlux.cpp @${CP} ${FILESDIR}/execinfo.cpp ${WRKSRC}/cmake_compile_check/ Modified: head/multimedia/avidemux26/Makefile.common ============================================================================== --- head/multimedia/avidemux26/Makefile.common Wed Mar 25 17:00:13 2015 (r382253) +++ head/multimedia/avidemux26/Makefile.common Wed Mar 25 17:36:47 2015 (r382254) @@ -258,10 +258,10 @@ BROKEN= Does not compile on ia64, power .endif post-patch: - @${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/*/*/Makefile @${MKDIR} ${CONFIGURE_WRKSRC}/config @${LN} -s ${LOCALBASE}/include/iconv.h ${CONFIGURE_WRKSRC}/config @${REINPLACE_CMD} 's|-ldl||' ${WRKSRC}/avidemux_core/CMakeLists.txt post-configure-common: - @${FIND} ${CONFIGURE_WRKSRC} -name link.txt -print0 |${XARGS} -0 ${REINPLACE_CMD} 's|-ldl||g' + @${FIND} ${CONFIGURE_WRKSRC} -name link.txt -print0 | \ + ${XARGS} -0 ${REINPLACE_CMD} 's|-ldl||g' Modified: head/multimedia/clutter-gst/Makefile ============================================================================== --- head/multimedia/clutter-gst/Makefile Wed Mar 25 17:00:13 2015 (r382253) +++ head/multimedia/clutter-gst/Makefile Wed Mar 25 17:36:47 2015 (r382254) @@ -23,8 +23,8 @@ USE_XORG= xp x11 USE_LDCONFIG= yes MAKE_ENV= XDG_CACHE_HOME=${WRKDIR} -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/multimedia/cuse4bsd-kmod/Makefile ============================================================================== --- head/multimedia/cuse4bsd-kmod/Makefile Wed Mar 25 17:00:13 2015 (r382253) +++ head/multimedia/cuse4bsd-kmod/Makefile Wed Mar 25 17:36:47 2015 (r382254) @@ -28,10 +28,10 @@ USES= kmod tar:bzip2 uidfix .include <bsd.port.options.mk> -MAKE_ARGS+=" PTHREAD_LIBS=${PTHREAD_LIBS}" +MAKE_ARGS+= PTHREAD_LIBS="-lpthread" .if ${PORT_OPTIONS:MDEBUG} -MAKE_ARGS+=" HAVE_DEBUG=YES" +MAKE_ARGS+= HAVE_DEBUG="YES" .endif do-install: Modified: head/multimedia/ffmpeg/Makefile ============================================================================== --- head/multimedia/ffmpeg/Makefile Wed Mar 25 17:00:13 2015 (r382253) +++ head/multimedia/ffmpeg/Makefile Wed Mar 25 17:36:47 2015 (r382254) @@ -263,7 +263,7 @@ CONFIGURE_ARGS+=--prefix="${PREFIX}" \ --cc="${CC}" \ --extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \ --extra-ldflags="-L${LOCALBASE}/lib ${FFMPEG_LDFLAGS}" \ - --extra-libs="${PTHREAD_LIBS}" + --extra-libs="-lpthread" DOC_FILES= Changelog CREDITS INSTALL.md LICENSE.md MAINTAINERS \ README.md RELEASE_NOTES @@ -350,7 +350,6 @@ post-patch: @${REINPLACE_CMD} -E \ -e "s|(EXTRALIBS[[:space:]]*=)|\1-L${LOCALBASE}/lib |g; \ s|%%LOCALBASE%%|${LOCALBASE}|g; \ - s|-pthread|${PTHREAD_LIBS}|g; \ s|gsm/gsm.h|gsm.h|g" \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|-ldl||' \ Modified: head/multimedia/ffmpeg0/Makefile ============================================================================== --- head/multimedia/ffmpeg0/Makefile Wed Mar 25 17:00:13 2015 (r382253) +++ head/multimedia/ffmpeg0/Makefile Wed Mar 25 17:36:47 2015 (r382254) @@ -118,7 +118,7 @@ CONFIGURE_ARGS+=--prefix="${PREFIX}" \ --cc="${CC}" \ --extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \ --extra-ldflags="-L${LOCALBASE}/lib ${FFMPEG_LDFLAGS}" \ - --extra-libs="${PTHREAD_LIBS}" + --extra-libs="-lpthread" SHLIB_VER= 1 PLIST_SUB+= SHLIB_VER=${SHLIB_VER} @@ -411,7 +411,6 @@ post-patch: @${REINPLACE_CMD} -E \ -e "s|(EXTRALIBS[[:space:]]*=)|\1-L${LOCALBASE}/lib |g; \ s|%%LOCALBASE%%|${LOCALBASE}|g; \ - s|-pthread|${PTHREAD_LIBS}|g; \ s|gsm/gsm.h|gsm.h|g" \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|-ldl||; s|$$(LIBMAJOR)|${SHLIB_VER}|g;' \ Modified: head/multimedia/ffmpeg26/Makefile ============================================================================== --- head/multimedia/ffmpeg26/Makefile Wed Mar 25 17:00:13 2015 (r382253) +++ head/multimedia/ffmpeg26/Makefile Wed Mar 25 17:36:47 2015 (r382254) @@ -275,7 +275,7 @@ CONFIGURE_ARGS+=--prefix="${PREFIX}" \ --cc="${CC}" \ --extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \ --extra-ldflags="-L${LOCALBASE}/lib ${FFMPEG_LDFLAGS}" \ - --extra-libs="${PTHREAD_LIBS}" + --extra-libs="-lpthread" DOC_FILES= Changelog CREDITS INSTALL.md LICENSE.md MAINTAINERS \ README.md RELEASE_NOTES @@ -362,7 +362,6 @@ post-patch: @${REINPLACE_CMD} -E \ -e "s|(EXTRALIBS[[:space:]]*=)|\1-L${LOCALBASE}/lib |g; \ s|%%LOCALBASE%%|${LOCALBASE}|g; \ - s|-pthread|${PTHREAD_LIBS}|g; \ s|gsm/gsm.h|gsm.h|g" \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|-ldl||' \ Modified: head/multimedia/flvstreamer/Makefile ============================================================================== --- head/multimedia/flvstreamer/Makefile Wed Mar 25 17:00:13 2015 (r382253) +++ head/multimedia/flvstreamer/Makefile Wed Mar 25 17:36:47 2015 (r382254) @@ -14,9 +14,7 @@ COMMENT= Open source command-line RTMP c USES= gmake ALL_TARGET= posix WRKSRC= ${WRKDIR}/${PORTNAME} -MAKE_ARGS= THREADLIB="${PTHREAD_LIBS}" \ - XCFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ - XLDFLAGS="${LDFLAGS}" +MAKE_ARGS= THREADLIB="-lpthread" XCFLAGS="${CFLAGS}" XLDFLAGS="${LDFLAGS}" PLIST_FILES= bin/flvstreamer bin/streams PORTDOCS= ChangeLog ChangeLog.rtmpdump README Modified: head/multimedia/ggrab/Makefile ============================================================================== --- head/multimedia/ggrab/Makefile Wed Mar 25 17:00:13 2015 (r382253) +++ head/multimedia/ggrab/Makefile Wed Mar 25 17:36:47 2015 (r382254) @@ -18,10 +18,6 @@ PORTDOCS= README OPTIONS_DEFINE= DOCS -post-patch: - @${REINPLACE_CMD} -e 's/-lpthread/${PTHREAD_LIBS}/g' \ - ${WRKSRC}/Makefile - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ggrab ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/sserver ${STAGEDIR}${PREFIX}/bin Modified: head/multimedia/gstreamer1-plugins/Makefile ============================================================================== --- head/multimedia/gstreamer1-plugins/Makefile Wed Mar 25 17:00:13 2015 (r382253) +++ head/multimedia/gstreamer1-plugins/Makefile Wed Mar 25 17:36:47 2015 (r382254) @@ -50,8 +50,8 @@ GST_PLUGIN?= base USE_LDCONFIG= yes CFLAGS:= ${CFLAGS} -O2 -Wno-format -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${EXTRA_LIBS} ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -lpthread -L${LOCALBASE}/lib ${EXTRA_LIBS} DEFAULT_AUDIOSINK?= osssink DEFAULT_AUDIOSRC?= osssrc Modified: head/multimedia/librtmp/Makefile ============================================================================== --- head/multimedia/librtmp/Makefile Wed Mar 25 17:00:13 2015 (r382253) +++ head/multimedia/librtmp/Makefile Wed Mar 25 17:36:47 2015 (r382254) @@ -14,7 +14,7 @@ LICENSE= GPLv2 USES= pkgconfig USE_LDCONFIG= yes USE_OPENSSL= yes -CFLAGS+= ${PTHREAD_CFLAGS} -I${OPENSSLINC} +CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} WRKSRC= ${WRKDIR}/${DISTNAME}/librtmp Modified: head/multimedia/libva-vdpau-driver/Makefile ============================================================================== --- head/multimedia/libva-vdpau-driver/Makefile Wed Mar 25 17:00:13 2015 (r382253) +++ head/multimedia/libva-vdpau-driver/Makefile Wed Mar 25 17:36:47 2015 (r382254) @@ -36,8 +36,7 @@ INSTALL_TARGET= install-strip .endif post-patch: .SILENT - ${REINPLACE_CMD} -e '/LIBS/{ s/-ldl//; \ - s/-lrt//; s/-lpthread/${PTHREAD_LIBS}/; }' \ + ${REINPLACE_CMD} -e '/LIBS/{ s/-ldl//; s/-lrt//; }' \ -e 's|driverdir|& --define-variable prefix=${PREFIX}|' \ -e '/\^vdpau_version/s|$$CC -E|& ${CPPFLAGS}|' \ ${WRKSRC}/configure Modified: head/multimedia/libva/Makefile ============================================================================== --- head/multimedia/libva/Makefile Wed Mar 25 17:00:13 2015 (r382253) +++ head/multimedia/libva/Makefile Wed Mar 25 17:36:47 2015 (r382254) @@ -55,8 +55,4 @@ post-patch: .SILENT ${WRKSRC}/doc/Makefile.am ${REINPLACE_CMD} 's/-ldl//' ${WRKSRC}/va/Makefile.am -post-configure: .SILENT - ${REINPLACE_CMD} 's/-lpthread/${PTHREAD_LIBS}/' \ - ${WRKSRC}/test/putsurface/Makefile - .include <bsd.port.post.mk> Modified: head/multimedia/libvpx/Makefile ============================================================================== --- head/multimedia/libvpx/Makefile Wed Mar 25 17:00:13 2015 (r382253) +++ head/multimedia/libvpx/Makefile Wed Mar 25 17:36:47 2015 (r382254) @@ -89,7 +89,5 @@ post-patch: ${WRKSRC}/build/make/Makefile ${WRKSRC}/libs.mk @${GREP} -Rl '^#!/bin/bash' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} \ -e 's,#!/bin/bash,#!/usr/bin/env bash,g' - @${GREP} -Rl -- '-l\?pthread' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} -E \ - -e 's/-l?pthread/${PTHREAD_LIBS}/g' .include <bsd.port.mk> Modified: head/multimedia/libx264/Makefile ============================================================================== --- head/multimedia/libx264/Makefile Wed Mar 25 17:00:13 2015 (r382253) +++ head/multimedia/libx264/Makefile Wed Mar 25 17:36:47 2015 (r382254) @@ -82,7 +82,6 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; \ - s|-lpthread|${PTHREAD_LIBS}|g; \ s|/bin/bash|${LOCALBASE}/bin/bash|; \ s|gpac_static|gpac|g' \ ${WRKSRC}/configure Modified: head/multimedia/lxdvdrip/Makefile ============================================================================== --- head/multimedia/lxdvdrip/Makefile Wed Mar 25 17:00:13 2015 (r382253) +++ head/multimedia/lxdvdrip/Makefile Wed Mar 25 17:36:47 2015 (r382254) @@ -38,8 +38,8 @@ LXDVDRIPSRC= cputest.c \ systools.c \ tcmemcpy.c \ vaporize.c -CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -ldvdread -lm +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lpthread -ldvdread -lm DOCS= Changelog.de Changelog.en Changelog.fr \ README.de README.en README.fr \ Modified: head/multimedia/miro/Makefile ============================================================================== --- head/multimedia/miro/Makefile Wed Mar 25 17:00:13 2015 (r382253) +++ head/multimedia/miro/Makefile Wed Mar 25 17:36:47 2015 (r382254) @@ -40,7 +40,7 @@ USE_PYTHON= distutils USE_LDCONFIG= yes INSTALLS_ICONS= yes -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +CPPFLAGS+= -I${LOCALBASE}/include .include <bsd.port.pre.mk> Modified: head/multimedia/mplayer/Makefile.shared ============================================================================== --- head/multimedia/mplayer/Makefile.shared Wed Mar 25 17:00:13 2015 (r382253) +++ head/multimedia/mplayer/Makefile.shared Wed Mar 25 17:36:47 2015 (r382254) @@ -24,9 +24,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/yasm:${P USES= compiler:c11 gmake iconv ncurses tar:xz GNU_CONFIGURE= yes -CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ - TMPDIR="${WRKSRC}" +CONFIGURE_ENV= TMPDIR="${WRKSRC}" CONFIGURE_ARGS= --cc="${CC}" \ --host-cc="${CC}" \ --as="${AS}" \ Modified: head/multimedia/mplayer/files/patch-configure ============================================================================== --- head/multimedia/mplayer/files/patch-configure Wed Mar 25 17:00:13 2015 (r382253) +++ head/multimedia/mplayer/files/patch-configure Wed Mar 25 17:36:47 2015 (r382254) @@ -91,7 +91,7 @@ THREAD_CFLAGS=-D_REENTRANT elif freebsd || netbsd || openbsd || bsdos ; then - THREAD_CFLAGS=-D_THREAD_SAFE -+ THREAD_CFLAGS=${PTHREAD_CFLAGS} ++ THREAD_CFLAGS= fi if test "$_pthreads" = auto ; then cat > $TMPC << EOF @@ -100,7 +100,7 @@ _pthreads=no if ! hpux ; then - for ld_tmp in "-lpthreadGC2" "" "-lpthread" "-pthread" ; do -+ for ld_tmp in ${PTHREAD_LIBS} ; do ++ for ld_tmp in "-lpthread" "-pthread" ; do # for crosscompilation, we cannot execute the program, be happy if we can link statically cc_check $THREAD_CFLAGS $ld_tmp && (tmp_run || test "$ld_static") && ld_pthread="$ld_tmp" && _pthreads=yes && break done Modified: head/multimedia/mplayer2/Makefile ============================================================================== --- head/multimedia/mplayer2/Makefile Wed Mar 25 17:00:13 2015 (r382253) +++ head/multimedia/mplayer2/Makefile Wed Mar 25 17:36:47 2015 (r382254) @@ -21,9 +21,7 @@ RUN_DEPENDS= ffmpeg:${PORTSDIR}/multimed USES= gmake iconv ncurses pkgconfig tar:xz HAS_CONFIGURE= yes -CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ - TMPDIR="${WRKSRC}" +CONFIGURE_ENV= TMPDIR="${WRKSRC}" CONFIGURE_ARGS= --cc=${CC} \ --extra-cflags='-I${LOCALBASE}/include/portaudio2' \ --extra-libs='-lavresample' \ Modified: head/multimedia/mplayer2/files/patch-configure ============================================================================== --- head/multimedia/mplayer2/files/patch-configure Wed Mar 25 17:00:13 2015 (r382253) +++ head/multimedia/mplayer2/files/patch-configure Wed Mar 25 17:36:47 2015 (r382254) @@ -5,7 +5,7 @@ THREAD_CFLAGS=-D_REENTRANT elif freebsd || netbsd || openbsd || bsdos ; then - THREAD_CFLAGS=-D_THREAD_SAFE -+ THREAD_CFLAGS=${PTHREAD_CFLAGS} ++ THREAD_CFLAGS= fi if test "$_pthreads" = auto ; then cat > $TMPC << EOF @@ -14,7 +14,7 @@ _pthreads=no if ! hpux ; then - for _ld_tmp in "-lpthreadGC2" "" "-lpthread" "-pthread" ; do -+ for _ld_tmp in ${PTHREAD_LIBS} ; do ++ for _ld_tmp in "-lpthread" "-pthread" ; do # for crosscompilation, we cannot execute the program, be happy if we can link statically cc_check $THREAD_CFLAGS $_ld_tmp && (tmp_run || test "$_ld_static") && _ld_pthread="$_ld_tmp" && _pthreads=yes && break done Modified: head/multimedia/nxtvepg/Makefile ============================================================================== --- head/multimedia/nxtvepg/Makefile Wed Mar 25 17:00:13 2015 (r382253) +++ head/multimedia/nxtvepg/Makefile Wed Mar 25 17:36:47 2015 (r382254) @@ -13,7 +13,8 @@ NOT_FOR_ARCHS= sparc64 USES= gmake tk:84 USE_XORG= x11 xmu MAKE_ARGS= ROOT=${STAGEDIR} -MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} WRKSRC=${WRKSRC} X11BASE=${LOCALBASE} +MAKE_ENV= PTHREAD_LIBS="-lpthread" WRKSRC="${WRKSRC}" \ + X11BASE="${LOCALBASE}" OPTIONS_DEFINE= DOCS Modified: head/multimedia/recordmydesktop/Makefile ============================================================================== --- head/multimedia/recordmydesktop/Makefile Wed Mar 25 17:00:13 2015 (r382253) +++ head/multimedia/recordmydesktop/Makefile Wed Mar 25 17:36:47 2015 (r382254) @@ -19,8 +19,4 @@ CONFIGURE_ARGS+= --enable-oss=yes \ USE_XORG= ice sm x11 xext xextproto xfixes xdamage PLIST_FILES= bin/recordmydesktop man/man1/recordmydesktop.1.gz -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/configure - .include <bsd.port.mk> Modified: head/multimedia/rtmpdump/Makefile ============================================================================== --- head/multimedia/rtmpdump/Makefile Wed Mar 25 17:00:13 2015 (r382253) +++ head/multimedia/rtmpdump/Makefile Wed Mar 25 17:36:47 2015 (r382254) @@ -15,8 +15,8 @@ LIB_DEPENDS= librtmp.so:${PORTSDIR}/mult USES= pkgconfig USE_OPENSSL= yes -MAKE_ENV= THREADLIB="${PTHREAD_LIBS}" -CFLAGS+= ${PTHREAD_CFLAGS} -I${OPENSSLINC} +MAKE_ENV= THREADLIB="-lpthread" +CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB} PORTDOCS= ChangeLog README Modified: head/multimedia/sabbu/Makefile ============================================================================== --- head/multimedia/sabbu/Makefile Wed Mar 25 17:00:13 2015 (r382253) +++ head/multimedia/sabbu/Makefile Wed Mar 25 17:36:47 2015 (r382254) @@ -16,9 +16,9 @@ USES= tar:bzip2 gmake pkgconfig iconv GNU_CONFIGURE= yes USE_GNOME= gtk20 -CFLAGS+= -I${LOCALBASE}/include/ffmpeg0 ${PTHREAD_CFLAGS} -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib/ffmpeg0 -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lswscale0 -LDFLAGS+= -lgmodule-2.0 +CFLAGS+= -I${LOCALBASE}/include/ffmpeg0 -I${LOCALBASE}/include +LDFLAGS+= -lpthread -L${LOCALBASE}/lib/ffmpeg0 -L${LOCALBASE}/lib +LDFLAGS+= -lswscale0 -lgmodule-2.0 OPTIONS_DEFINE= GTKSPELL OPTIONS_DEFAULT=GTKSPELL Modified: head/multimedia/schroedinger/Makefile ============================================================================== --- head/multimedia/schroedinger/Makefile Wed Mar 25 17:00:13 2015 (r382253) +++ head/multimedia/schroedinger/Makefile Wed Mar 25 17:36:47 2015 (r382254) @@ -24,6 +24,6 @@ USE_LDCONFIG= yes post-patch: @${REINPLACE_CMD} -e 's|^pkgconfigdir=.*|pkgconfigdir="\\$${prefix}/libdata/pkgconfig"|' \ - -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure + ${WRKSRC}/configure .include <bsd.port.mk> Modified: head/multimedia/vamps/Makefile ============================================================================== --- head/multimedia/vamps/Makefile Wed Mar 25 17:00:13 2015 (r382253) +++ head/multimedia/vamps/Makefile Wed Mar 25 17:36:47 2015 (r382254) @@ -14,20 +14,16 @@ LIB_DEPENDS= libdvdread.so:${PORTSDIR}/m USES= gmake -CFLAGS+= -DHAVE_BUILTIN_EXPECT \ - -I${LOCALBASE}/include \ - ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib \ - ${PTHREAD_LIBS} +CFLAGS+= -DHAVE_BUILTIN_EXPECT -I${LOCALBASE}/include +LDFLAGS+= -lpthread -L${LOCALBASE}/lib -PROGRAM_FILES= \ - play_cell/play_cell \ +PROGRAM_FILES= play_cell/play_cell \ vamps/vamps PLIST_FILES= ${PROGRAM_FILES:H:S,^,bin/,} do-install: - cd ${WRKSRC}; \ - ${INSTALL_PROGRAM} ${PROGRAM_FILES} ${STAGEDIR}${PREFIX}/bin/ + (cd ${WRKSRC} && \ + ${INSTALL_PROGRAM} ${PROGRAM_FILES} ${STAGEDIR}${PREFIX}/bin) .include <bsd.port.mk> Modified: head/multimedia/webcamd/Makefile ============================================================================== --- head/multimedia/webcamd/Makefile Wed Mar 25 17:00:13 2015 (r382253) +++ head/multimedia/webcamd/Makefile Wed Mar 25 17:36:47 2015 (r382254) @@ -39,11 +39,11 @@ GROUPS= webcamd .include <bsd.port.pre.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:MCUSE} -MAKE_ARGS+= "HAVE_CUSE=YES" +MAKE_ARGS+= HAVE_CUSE="YES" LIBCUSE= /usr/lib/libcuse.so .else BUILD_DEPENDS+= cuse4bsd-kmod>=0.1.31:${PORTSDIR}/multimedia/cuse4bsd-kmod @@ -52,23 +52,23 @@ LIBCUSE= ${LIBDIR}/libcuse4bsd.so .endif .if ${PORT_OPTIONS:MDVB} -MAKE_ARGS+= "HAVE_DVB_DRV=YES" +MAKE_ARGS+= HAVE_DVB_DRV="YES" .endif .if ${PORT_OPTIONS:MINPUT} -MAKE_ARGS+= "HAVE_INPUT_DRV=YES" +MAKE_ARGS+= HAVE_INPUT_DRV="YES" .endif .if ${PORT_OPTIONS:MRADIO} -MAKE_ARGS+= "HAVE_RADIO_DRV=YES" +MAKE_ARGS+= HAVE_RADIO_DRV="YES" .endif .if ${PORT_OPTIONS:MWEBCAM} -MAKE_ARGS+= "HAVE_WEBCAM_DRV=YES" +MAKE_ARGS+= HAVE_WEBCAM_DRV="YES" .endif .if ${PORT_OPTIONS:MHAL} -MAKE_ARGS+= "HAVE_HAL=YES" +MAKE_ARGS+= HAVE_HAL="YES" LIBHAL= ${LIBDIR}/libhal.so:${LIBDIR}/libdbus-1.so: LIB_DEPENDS+= libhal.so:${PORTSDIR}/sysutils/hal LIB_DEPENDS+= libdbus-1.so:${PORTSDIR}/devel/dbus @@ -77,19 +77,15 @@ LIBHAL= .endif .if ${PORT_OPTIONS:MVT_CLIENT} -MAKE_ARGS+= "HAVE_VTUNER_CLIENT=YES" +MAKE_ARGS+= HAVE_VTUNER_CLIENT="YES" .endif .if ${PORT_OPTIONS:MVT_SERVER} -MAKE_ARGS+= "HAVE_VTUNER_SERVER=YES" +MAKE_ARGS+= HAVE_VTUNER_SERVER="YES" .endif .if ${PORT_OPTIONS:MDEBUG} -MAKE_ARGS+= "HAVE_DEBUG=YES" -.endif - -.if ${OSVERSION} < 800000 -IGNORE= requires FreeBSD 8.0-RELEASE or later +MAKE_ARGS+= HAVE_DEBUG="YES" .endif # @@ -100,10 +96,10 @@ do-configure: ${MAKE} ${MAKE_ARGS} configure -C${WRKSRC} post-patch: - @cd ${WRKSRC}/patches; ${SH} ./do_patch.sh + @(cd ${WRKSRC}/patches && ${SH} ./do_patch.sh) pre-install: - @${SED} -i .orig \ + ${SED} -i .orig \ -e "s|%%PREFIX%%|${PREFIX}|g" \ -e "s|%%LIBHAL%%|${LIBHAL}|g" \ -e "s|%%LIBCUSE%%|${LIBCUSE}|g" \ @@ -111,7 +107,7 @@ pre-install: post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/devd - @${SED} -e "s|%%PREFIX%%|${PREFIX}|g" \ + ${SED} -e "s|%%PREFIX%%|${PREFIX}|g" \ < ${FILESDIR}/webcamd.conf.in > ${WRKDIR}/webcamd.conf ${INSTALL_DATA} "${WRKDIR}/webcamd.conf" ${STAGEDIR}${PREFIX}/etc/devd Modified: head/multimedia/x264/Makefile ============================================================================== --- head/multimedia/x264/Makefile Wed Mar 25 17:00:13 2015 (r382253) +++ head/multimedia/x264/Makefile Wed Mar 25 17:36:47 2015 (r382254) @@ -103,7 +103,6 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; \ - s|-lpthread|${PTHREAD_LIBS}|g; \ s|/bin/bash|${LOCALBASE}/bin/bash|; \ s|gpac_static|gpac|g' \ ${WRKSRC}/configure Modified: head/multimedia/xawtv/Makefile ============================================================================== --- head/multimedia/xawtv/Makefile Wed Mar 25 17:00:13 2015 (r382253) +++ head/multimedia/xawtv/Makefile Wed Mar 25 17:36:47 2015 (r382254) @@ -79,7 +79,6 @@ PLIST_SUB+= X11PREFIX=${LOCALBASE} post-patch: @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g; \ s|/usr/local|${LOCALBASE}|g; \ - s|-lpthread|${PTHREAD_LIBS}|g; \ s|-lquicktime|-L${LOCALBASE}/lib &|g; \ s|LIBV4L="yes"|LIBV4L="no"|g' \ ${WRKSRC}/configure Modified: head/multimedia/xtheater/Makefile ============================================================================== --- head/multimedia/xtheater/Makefile Wed Mar 25 17:00:13 2015 (r382253) +++ head/multimedia/xtheater/Makefile Wed Mar 25 17:36:47 2015 (r382254) @@ -24,8 +24,8 @@ USES= gmake libtool tar:bzip2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-gl -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|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503251736.t2PHanLP099909>