From owner-svn-ports-head@FreeBSD.ORG Fri Jan 17 21:38:51 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6FFE3814; Fri, 17 Jan 2014 21:38:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5B2061E01; Fri, 17 Jan 2014 21:38:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0HLcpOo093654; Fri, 17 Jan 2014 21:38:51 GMT (envelope-from riggs@svn.freebsd.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0HLcoIC093652; Fri, 17 Jan 2014 21:38:50 GMT (envelope-from riggs@svn.freebsd.org) Message-Id: <201401172138.s0HLcoIC093652@svn.freebsd.org> From: Thomas Zander Date: Fri, 17 Jan 2014 21:38:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340117 - in head/multimedia/transcode: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2014 21:38:51 -0000 Author: riggs Date: Fri Jan 17 21:38:50 2014 New Revision: 340117 URL: http://svnweb.freebsd.org/changeset/ports/340117 QAT: https://qat.redports.org/buildarchive/r340117/ Log: - Stagify - Use new LIB_DEPENDS format - Detect awk properly Approved by: portmgr (implicit, blanket), thierry (mentor) Modified: head/multimedia/transcode/Makefile head/multimedia/transcode/files/patch-configure (contents, props changed) Modified: head/multimedia/transcode/Makefile ============================================================================== --- head/multimedia/transcode/Makefile Fri Jan 17 21:38:14 2014 (r340116) +++ head/multimedia/transcode/Makefile Fri Jan 17 21:38:50 2014 (r340117) @@ -27,11 +27,6 @@ CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG} LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --enable-oss -MAN1= avifix.1 aviindex.1 avimerge.1 avisplit.1 avisync.1 tccat.1 tcdemux.1 \ - tcprobe.1 tcscan.1 transcode.1 tcextract.1 tcdecode.1 tcmodinfo.1 \ - tcpvmexportd.1 tcxmlcheck.1 transcode_export.1 transcode_filter.1 \ - transcode_import.1 tcexport.1 tcmodchain.1 - NO_OPTIONS_SORT= yes OPTIONS_DEFINE= OPTIMIZED_CFLAGS X11 MPEG2 BKTR POSTPROC FREETYPE LAME XVID \ X264 OGG VORBIS THEORA DVDREAD DV QUICKTIME LZO LIBA52 \ @@ -44,7 +39,6 @@ LZO_DESC= LZO compression support LIBA52_DESC= a52 support (as default decoder) XML_DESC= Libxml2 XML support -NO_STAGE= yes .include .if ${PORT_OPTIONS:MX11} @@ -55,7 +49,7 @@ CONFIGURE_ARGS+= --without-x .endif .if ${PORT_OPTIONS:MMPEG2} -LIB_DEPENDS+= mpeg2:${PORTSDIR}/multimedia/libmpeg2 +LIB_DEPENDS+= libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2 CONFIGURE_ARGS+= --enable-libmpeg2 --enable-libmpeg2convert .else CONFIGURE_ARGS+= --disable-libmpeg2 @@ -72,77 +66,77 @@ CONFIGURE_ARGS+= --disable-libpostproc .endif .if ${PORT_OPTIONS:MFREETYPE} -LIB_DEPENDS+= freetype:${PORTSDIR}/print/freetype2 +LIB_DEPENDS+= libfreetype.so:${PORTSDIR}/print/freetype2 CONFIGURE_ARGS+= --enable-freetype2 .else CONFIGURE_ARGS+= --disable-freetype2 .endif .if ${PORT_OPTIONS:MLAME} -LIB_DEPENDS+= mp3lame:${PORTSDIR}/audio/lame +LIB_DEPENDS+= libmp3lame.so:${PORTSDIR}/audio/lame CONFIGURE_ARGS+= --with-lame-prefix=${LOCALBASE} --enable-lame .else CONFIGURE_ARGS+= --disable-lame .endif .if ${PORT_OPTIONS:MXVID} -LIB_DEPENDS+= xvidcore:${PORTSDIR}/multimedia/xvid +LIB_DEPENDS+= libxvidcore.so:${PORTSDIR}/multimedia/xvid CONFIGURE_ARGS+= --with-xvid-prefix=${LOCALBASE} --enable-xvid .else CONFIGURE_ARGS+= --disable-xvid .endif .if ${PORT_OPTIONS:MX264} -LIB_DEPENDS+= x264:${PORTSDIR}/multimedia/x264 +LIB_DEPENDS+= libx264.so:${PORTSDIR}/multimedia/x264 CONFIGURE_ARGS+= --enable-x264 .else CONFIGURE_ARGS+= --disable-x264 .endif .if ${PORT_OPTIONS:MOGG} -LIB_DEPENDS+= ogg:${PORTSDIR}/audio/libogg +LIB_DEPENDS+= libogg.so:${PORTSDIR}/audio/libogg CONFIGURE_ARGS+= --enable-ogg .else CONFIGURE_ARGS+= --disable-ogg .endif .if ${PORT_OPTIONS:MVORBIS} -LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis +LIB_DEPENDS+= libvorbis.so:${PORTSDIR}/audio/libvorbis CONFIGURE_ARGS+= --enable-vorbis .else CONFIGURE_ARGS+= --disable-vorbis .endif .if ${PORT_OPTIONS:MTHEORA} -LIB_DEPENDS+= theora:${PORTSDIR}/multimedia/libtheora +LIB_DEPENDS+= libtheora.so:${PORTSDIR}/multimedia/libtheora CONFIGURE_ARGS+= --enable-theora .else CONFIGURE_ARGS+= --disable-theora .endif .if ${PORT_OPTIONS:MDVDREAD} -LIB_DEPENDS+= dvdread:${PORTSDIR}/multimedia/libdvdread +LIB_DEPENDS+= libdvdread.so:${PORTSDIR}/multimedia/libdvdread CONFIGURE_ARGS+= --with-libdvdread-prefix=${LOCALBASE} --enable-libdvdread .else CONFIGURE_ARGS+= --disable-libdvdread .endif .if ${PORT_OPTIONS:MDV} -LIB_DEPENDS+= dv:${PORTSDIR}/multimedia/libdv +LIB_DEPENDS+= libdv.so:${PORTSDIR}/multimedia/libdv CONFIGURE_ARGS+= --enable-libdv .else CONFIGURE_ARGS+= --disable-libdv .endif .if ${PORT_OPTIONS:MQUICKTIME} -LIB_DEPENDS+= quicktime:${PORTSDIR}/multimedia/libquicktime +LIB_DEPENDS+= libquicktime.so:${PORTSDIR}/multimedia/libquicktime CONFIGURE_ARGS+= --enable-libquicktime .else CONFIGURE_ARGS+= --disable-libquicktime .endif .if ${PORT_OPTIONS:MLZO} -LIB_DEPENDS+= lzo2:${PORTSDIR}/archivers/lzo2 +LIB_DEPENDS+= liblzo2.so:${PORTSDIR}/archivers/lzo2 CONFIGURE_ARGS+= --with-lzo-prefix=${LOCALBASE} --with-lzo-includes=${LOCALBASE} \ --enable-lzo .else @@ -150,14 +144,14 @@ CONFIGURE_ARGS+= --disable-lzo .endif .if ${PORT_OPTIONS:MLIBA52} -LIB_DEPENDS+= a52:${PORTSDIR}/audio/liba52 +LIB_DEPENDS+= liba52.so:${PORTSDIR}/audio/liba52 CONFIGURE_ARGS+= --with-a52-prefix=${LOCALBASE} --enable-a52 .else CONFIGURE_ARGS+= --disable-a52 .endif .if ${PORT_OPTIONS:MFAAC} -LIB_DEPENDS+= faac:${PORTSDIR}/audio/faac +LIB_DEPENDS+= libfaac.so:${PORTSDIR}/audio/faac CONFIGURE_ARGS+= --with-faac-prefix=${LOCALBASE} --enable-faac .else CONFIGURE_ARGS+= --disable-faac @@ -171,7 +165,7 @@ CONFIGURE_ARGS+= --disable-libxml2 .endif .if ${PORT_OPTIONS:MMJPEGTOOLS} -LIB_DEPENDS+= lavjpeg-2.0:${PORTSDIR}/multimedia/mjpegtools +LIB_DEPENDS+= liblavjpeg-2.0.so:${PORTSDIR}/multimedia/mjpegtools CONFIGURE_ARGS+= --enable-mjpegtools .else CONFIGURE_ARGS+= --disable-mjpegtools @@ -185,14 +179,14 @@ CONFIGURE_ARGS+= --disable-sdl .endif .if ${PORT_OPTIONS:MIMAGEMAGICK} -LIB_DEPENDS+= MagickWand:${PORTSDIR}/graphics/ImageMagick +LIB_DEPENDS+= libMagickWand.so:${PORTSDIR}/graphics/ImageMagick CONFIGURE_ARGS+= --with-imagemagick-prefix=${LOCALBASE} --enable-imagemagick .else CONFIGURE_ARGS+= --disable-imagemagick .endif .if ${PORT_OPTIONS:MJPEG} -LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg CONFIGURE_ARGS+= --with-libjpeg-prefix=${LOCALBASE} --enable-libjpeg .else CONFIGURE_ARGS+= --disable-libjpeg @@ -251,12 +245,14 @@ pre-install: ${MKDIR} ${FAKEDIR} ${TOUCH} -f ${PLIST} @(cd ${WRKSRC} && ${GMAKE} install prefix=${FAKEDIR} mandir=${FAKEDIR}/man) - ${RM} -rf ${FAKEDIR}/man # let bsd.port.mk handle man files .for dir in bin share/doc lib @(cd ${FAKEDIR}/${dir} && ${FIND} -s * -type f -o -type l | \ ${SED} -e 's|^|${dir}/|' >> ${PLIST}) @(cd ${FAKEDIR}/${dir} && ${FIND} -d * -type d | \ ${SED} -e 's|^|@dirrm ${dir}/|' >> ${PLIST}) .endfor + @(cd ${FAKEDIR}/man && ${FIND} -s * -type f -o -type l | \ + ${SED} -e 's|^|man/|' \ + -e 's|$$|.gz|' >> ${PLIST}) .include Modified: head/multimedia/transcode/files/patch-configure ============================================================================== --- head/multimedia/transcode/files/patch-configure Fri Jan 17 21:38:14 2014 (r340116) +++ head/multimedia/transcode/files/patch-configure Fri Jan 17 21:38:50 2014 (r340117) @@ -1,5 +1,14 @@ ---- configure.orig 2011-11-19 11:50:37.000000000 -0500 -+++ configure 2011-12-11 13:11:48.000000000 -0500 +--- configure.orig 2011-11-19 17:50:37.000000000 +0100 ++++ configure 2014-01-17 22:18:16.637476520 +0100 +@@ -5073,7 +5073,7 @@ + ;; + esac + fi +-PATH_TO_AWK=$ac_cv_path_PATH_TO_AWK ++PATH_TO_AWK=$ac_cv_prog_AWK + if test -n "$PATH_TO_AWK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_AWK" >&5 + $as_echo "$PATH_TO_AWK" >&6; } @@ -26196,7 +26196,7 @@ for l in $a52_ll ; do case $l in