From owner-svn-ports-all@FreeBSD.ORG Sun Jul 27 14:14:15 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6DFA2A29; Sun, 27 Jul 2014 14:14:15 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5AB302FC6; Sun, 27 Jul 2014 14:14:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6REEFYt030378; Sun, 27 Jul 2014 14:14:15 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6REEEKe030375; Sun, 27 Jul 2014 14:14:14 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201407271414.s6REEEKe030375@svn.freebsd.org> From: Adam Weinberger Date: Sun, 27 Jul 2014 14:14:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363070 - in head/audio/pacpl: . 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-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jul 2014 14:14:15 -0000 Author: adamw Date: Sun Jul 27 14:14:14 2014 New Revision: 363070 URL: http://svnweb.freebsd.org/changeset/ports/363070 QAT: https://qat.redports.org/buildarchive/r363070/ Log: Update to 5.0.1. Fix numerous spelling mistakes in the names of OPTIONS and PORT_OPTIONS:Mxyz checks that rendered many OPTIONS useless. That said, most of the OPTIONS just bring in dependencies and don't do anything to the port itself, so the port definitely still needs work. Hopefully this should also fix the scattered build failures. Deleted: head/audio/pacpl/files/ Modified: head/audio/pacpl/Makefile head/audio/pacpl/distinfo head/audio/pacpl/pkg-plist Modified: head/audio/pacpl/Makefile ============================================================================== --- head/audio/pacpl/Makefile Sun Jul 27 14:05:33 2014 (r363069) +++ head/audio/pacpl/Makefile Sun Jul 27 14:14:14 2014 (r363070) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pacpl -PORTVERSION= 4.0.5 +PORTVERSION= 5.0.1 PORTREVISION= 9 CATEGORIES= audio MASTER_SITES= SF @@ -13,14 +13,12 @@ COMMENT= Perl Audio Converter USES= shebangfix perl5 ONLY_FOR_ARCHS= i386 amd64 NO_BUILD= yes -BUILD_DEPENDS= p5-Switch>0:${PORTSDIR}/lang/p5-Switch NO_ARCH= yes OPTIONS_DEFINE= CDPARANOIA CDDB FAAC FAAD FFMPEG FLAC FLACTAG \ LAME LAUDIO SNDFILE LPAC APE APETAG MP3TAG MP4TAG \ - MPP MPLAYER OPTIMFROG VORBIS VORBISTAG SHORTEN \ - SOX SPEEX TOOLAME TTA WAVPACK WMATAG KDE4 AMAROK NORELANGS \ - DOCS + MPPTAG MPLAYER NLS OPTIMFROG VORBIS VORBISTAG SHORTEN \ + SOX SPEEX TOOLAME TTA WAVPACK WMATAG KDE4 DOCS OPTIONS_DEFAULT= CDPARANOIA CDDB FAAD FFMPEG FLAC FLACTAG MP3TAG \ VORBIS VORBISTAG @@ -28,7 +26,8 @@ OPTIONS_DEFAULT= CDPARANOIA CDDB FAAD FF OPTIONS_DEFAULT= LAME FAAC .endif -AMAROK_DESC= Enable Amarok integration (BROKEN) +OPTIONS_SUB= yes + APETAG_DESC= Enable Monkey's tagging support FLACTAG_DESC= Enable FLAC tagging support KDE4_DESC= Enable Konqueror/Dolphin integration @@ -48,194 +47,64 @@ WAVPACK_DESC= Enable wavpack support WMATAG_DESC= Enable WMA tagging support MORELANGS_DESC= Enable Additional language support -PACPL_PO= en_US.po +SHEBANG_FILES= pacpl -SHEBANG_FILES= pacpl plugins/amarok/pacx +APE_RUN_DEPENDS= mac:${PORTSDIR}/audio/mac +APETAG_RUN_DEPENDS= p5-Audio-Musepack>0:${PORTSDIR}/audio/p5-Audio-Musepack +CDDB_RUN_DEPENDS= p5-CDDB_get>0:${PORTSDIR}/audio/p5-CDDB_get +CDPARANOIA_RUN_DEPENDS= cdparanoia:${PORTSDIR}/audio/cdparanoia +FAAC_RUN_DEPENDS= faac:${PORTSDIR}/audio/faac +FAAD_RUN_DEPENDS= faad:${PORTSDIR}/audio/faad +FFMPEG_RUN_DEPENDS= ffmpeg:${PORTSDIR}/multimedia/ffmpeg +FLAC_RUN_DEPENDS= flac:${PORTSDIR}/audio/flac +FLACTAG_RUN_DEPENDS= p5-Audio-FLAC-Header>0:${PORTSDIR}/audio/p5-Audio-FLAC-Header +KDE4_USE= KDE4=kdehier +LAME_RUN_DEPENDS= lame:${PORTSDIR}/audio/lame +LAUDIO_RUN_DEPENDS= laudio:${PORTSDIR}/audio/linux-laudio +SNDFILE_RUN_DEPENDS= sndfile-convert:${PORTSDIR}/audio/libsndfile +LPAC_RUN_DEPENDS= lpac:${PORTSDIR}/audio/lpac +MPPTAG_RUN_DEPENDS= p5-Audio-Musepack>0:${PORTSDIR}/audio/p5-Audio-Musepack +MP3TAG_RUN_DEPENDS= p5-MP3-Tag>0:${PORTSDIR}/audio/p5-MP3-Tag +MP4TAG_RUN_DEPENDS= p5-MP4-Info>0:${PORTSDIR}/multimedia/p5-MP4-Info +MPLAYER_RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer +MPPPACK_RUN_DEPENDS= mppenc:${PORTSDIR}/audio/musepack +OPTIMFROG_RUN_DEPENDS= ofr:${PORTSDIR}/audio/optimfrog +VORBIS_RUN_DEPENDS= oggenc:${PORTSDIR}/audio/vorbis-tools +VORBISTAG_RUN_DEPENDS= p5-Ogg-Vorbis-Header>0:${PORTSDIR}/audio/p5-Ogg-Vorbis-Header +SHORTEN_RUN_DEPENDS= shorten:${PORTSDIR}/audio/shorten +SOX_RUN_DEPENDS= sox:${PORTSDIR}/audio/sox +SPEEX_RUN_DEPENDS= speexenc:${PORTSDIR}/audio/speex +TOOLAME_RUN_DEPENDS= toolame:${PORTSDIR}/audio/toolame +TTA_RUN_DEPENDS= ttaenc:${PORTSDIR}/audio/tta +WAVPACK_RUN_DEPENDS= wavpack:${PORTSDIR}/audio/wavpack +WMATAG_RUN_DEPENDS= p5-Audio-WMA>0:${PORTSDIR}/audio/p5-Audio-WMA .include .if ${PORT_OPTIONS:MKDE4} -USE_KDE4= kdehier -PLIST_SUB+= KDE4SERVICEMENU="" KDE4_PREFIX="${KDE4_PREFIX}" -.else -PLIST_SUB+= KDE4SERVICEMENU="@comment " -.endif - -.if ${PORT_OPTIONS:MAMAROK} -BROKEN= Amarok support temporarily broken in 4.05+ -RUN_DEPENDS+= amarok:${PORTSDIR}/audio/amarok -PLIST_SUB+= AMAROK="" -.else -PLIST_SUB+= AMAROK="@comment " -.endif - -.if ${PORT_OPTIONS:MCDDB} -RUN_DEPENDS+= p5-CDDB_get>0:${PORTSDIR}/audio/p5-CDDB_get -.endif - -.if ${PORT_OPTIONS:MCDPARANOIA} -RUN_DEPENDS+= cdparanoia:${PORTSDIR}/audio/cdparanoia -.endif - -.if ${PORT_OPTIONS:MFAAC} -RUN_DEPENDS+= faac:${PORTSDIR}/audio/faac -.endif - -.if ${PORT_OPTIONS:MFAAD} -RUN_DEPENDS+= faad:${PORTSDIR}/audio/faad -.endif - -.if ${PORT_OPTIONS:MFFMPEG} -RUN_DEPENDS+= ffmpeg:${PORTSDIR}/multimedia/ffmpeg -.endif - -.if ${PORT_OPTIONS:MFLAC} -RUN_DEPENDS+= flac:${PORTSDIR}/audio/flac -.endif - -.if ${PORT_OPTIONS:MFLACTAG} -RUN_DEPENDS+= p5-Audio-FLAC-Header>0:${PORTSDIR}/audio/p5-Audio-FLAC-Header -.endif - -.if ${PORT_OPTIONS:MLAME} -RUN_DEPENDS+= lame:${PORTSDIR}/audio/lame -.endif - -.if ${PORT_OPTIONS:MLAUDIO} -RUN_DEPENDS+= laudio:${PORTSDIR}/audio/linux-laudio -.endif - -.if ${PORT_OPTIONS:MSNDFILE} -RUN_DEPENDS+= sndfile-convert:${PORTSDIR}/audio/libsndfile -.endif - -.if ${PORT_OPTIONS:MLPAC} -RUN_DEPENDS+= lpac:${PORTSDIR}/audio/lpac -.endif - -.if ${PORT_OPTIONS:MAPE} -RUN_DEPENDS+= mac:${PORTSDIR}/audio/mac -.endif - -.if ${PORT_OPTIONS:MMPPTAG} || ${PORT_OPTIONS:MAPETAG} -RUN_DEPENDS+= p5-Audio-Musepack>0:${PORTSDIR}/audio/p5-Audio-Musepack -.endif - -.if ${PORT_OPTIONS:MMP3TAG} -RUN_DEPENDS+= p5-MP3-Tag>0:${PORTSDIR}/audio/p5-MP3-Tag -.endif - -.if ${PORT_OPTIONS:MMP4TAG} -RUN_DEPENDS+= p5-MP4-Info>0:${PORTSDIR}/multimedia/p5-MP4-Info -.endif - -.if ${PORT_OPTIONS:MMPLAYER} -RUN_DEPENDS+= mplayer:${PORTSDIR}/multimedia/mplayer +PLIST_SUB+= KDE4_PREFIX="${KDE4_PREFIX}" .endif -.if ${PORT_OPTIONS:MMPPPACK} -RUN_DEPENDS+= mppenc:${PORTSDIR}/audio/musepack -.endif - -.if ${PORT_OPTIONS:MOPTIMFROG} -RUN_DEPENDS+= ofr:${PORTSDIR}/audio/optimfrog -.endif - -.if ${PORT_OPTIONS:MVORBISVORBIS} -RUN_DEPENDS+= oggenc:${PORTSDIR}/audio/vorbis-tools -.endif - -.if ${PORT_OPTIONS:MVORBISTAG} -RUN_DEPENDS+= p5-Ogg-Vorbis-Header>0:${PORTSDIR}/audio/p5-Ogg-Vorbis-Header -.endif - -.if ${PORT_OPTIONS:MSHORTEN} -RUN_DEPENDS+= shorten:${PORTSDIR}/audio/shorten -.endif - -.if ${PORT_OPTIONS:MSOX} -RUN_DEPENDS+= sox:${PORTSDIR}/audio/sox -.endif - -.if ${PORT_OPTIONS:MSPEEX} -RUN_DEPENDS+= speexenc:${PORTSDIR}/audio/speex -.endif - -.if ${PORT_OPTIONS:MTOOLAME} -RUN_DEPENDS+= toolame:${PORTSDIR}/audio/toolame -.endif - -.if ${PORT_OPTIONS:MTTA} -RUN_DEPENDS+= ttaenc:${PORTSDIR}/audio/tta -.endif - -.if ${PORT_OPTIONS:MWAVPACK} -RUN_DEPENDS+= wavpack:${PORTSDIR}/audio/wavpack -.endif - -.if ${PORT_OPTIONS:MWMATAG} -RUN_DEPENDS+= p5-Audio-WMA>0:${PORTSDIR}/audio/p5-Audio-WMA -.endif - -.if ${PORT_OPTIONS:MMORELANGS} -PACPL_PO+= ca.po de.po es.po et.po fr_FR.po it_IT.po nl_NL.po pl.po pt.po ro.po ru_RU.po tr.po zh_CN.po -PLIST_SUB+= ADDITIONAL_LANGS="" -.else -PLIST_SUB+= ADDITIONAL_LANGS="@comment " -.endif - -post-extract: - - @${ECHO_MSG} "" - @${ECHO_MSG} " * * * * * * * * * W A R N I N G * * * * * * * * * * * * * " - @${ECHO_MSG} "" - @${ECHO_MSG} "WARNING: Integration options with Amarok, KDE4 Dolphin and" - @${ECHO_MSG} "Konqueror now pull in their respective ports!" - @${ECHO_MSG} "" - @${ECHO_MSG} "The port now provides the option to select codecs, CD" - @${ECHO_MSG} "burning, CDDB and tagging modules individually so you don't" - @${ECHO_MSG} "have to install all by default. You will still be offered" - @${ECHO_MSG} "the ability to convert to and from these formats in the" - @${ECHO_MSG} "pacpl options even if the codec is not installed." - @${ECHO_MSG} "" - @${ECHO_MSG} "CTRL-C now if you'd like to reconfigure, read the Changelog," - @${ECHO_MSG} "or README:" - @${ECHO_MSG} "" - @${ECHO_MSG} " ${WRKSRC}/ChangeLog" - @${ECHO_MSG} " ${WRKSRC}/README" - @${ECHO_MSG} "" - @${ECHO_MSG} " * * * * * * * * * * * * * * * * * * * * * * * * * * * * * " - @${ECHO_MSG} "" - @sleep 5 - post-patch: @${REINPLACE_CMD} -e 's@/etc/pacpl@${PREFIX}/etc/pacpl@; \ s@/usr/share/pacpl@${DATADIR}@' ${WRKSRC}/pacpl ${WRKSRC}/pacpl.conf do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/pacpl ${STAGEDIR}${PREFIX}/bin/ - ${MKDIR} ${STAGEDIR}${PREFIX}/etc/pacpl/modules/ - ${MKDIR} ${STAGEDIR}${DATADIR}/locale/ + ${INSTALL_SCRIPT} ${WRKSRC}/pacpl ${STAGEDIR}${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/pacpl/modules + @${MKDIR} ${STAGEDIR}${DATADIR}/locale ${INSTALL_DATA} ${WRKSRC}/pacpl.conf ${STAGEDIR}${PREFIX}/etc/pacpl/pacpl.conf.sample ${INSTALL_DATA} ${WRKSRC}/codecs.conf ${STAGEDIR}${PREFIX}/etc/pacpl/codecs.conf.sample ${INSTALL_DATA} ${WRKSRC}/extra/sample.m ${STAGEDIR}${PREFIX}/etc/pacpl/modules/sample.m -.for po in ${PACPL_PO} - ${INSTALL_DATA} ${WRKSRC}/po/${po} ${STAGEDIR}${DATADIR}/locale -.endfor + ${INSTALL_DATA} ${WRKSRC}/po/* ${STAGEDIR}${DATADIR}/locale @pod2man ${WRKSRC}/pacpl ${WRKSRC}/pacpl.1 - ${INSTALL_MAN} ${WRKSRC}/pacpl.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/pacpl.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 .if ${PORT_OPTIONS:MKDE4} - ${INSTALL_DATA} ${WRKSRC}/plugins/konqueror/pacpl.desktop ${STAGEDIR}${KDE4_PREFIX}/share/kde4/services/ServiceMenus -.endif - -.if ${PORT_OPTIONS:MAMAROK} - ${MKDIR} ${STAGEDIR}${PREFIX}/share/apps/amarok/scripts/transcoding_pacx - ${INSTALL_DATA} ${WRKSRC}/plugins/amarok/pacx ${STAGEDIR}${PREFIX}/share/apps/amarok/scripts/transcoding_pacx/transcoding_pacx.pl - ${PERL} -e 'print qq(name = Pacx\ntype = transcode)' > ${STAGEDIR}${PREFIX}/share/apps/amarok/scripts/transcoding_pacx/transcoding_pacx.spec + ${INSTALL_DATA} ${WRKSRC}/plugins/kde/pacpl.desktop ${STAGEDIR}${KDE4_PREFIX}/share/kde4/services/ServiceMenus .endif - ${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/extra/README.module ${WRKSRC}/ChangeLog ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} post-install: Modified: head/audio/pacpl/distinfo ============================================================================== --- head/audio/pacpl/distinfo Sun Jul 27 14:05:33 2014 (r363069) +++ head/audio/pacpl/distinfo Sun Jul 27 14:14:14 2014 (r363070) @@ -1,2 +1,2 @@ -SHA256 (pacpl-4.0.5.tar.gz) = e6b3ff88acde0bdd7cb4469064afd58cce7fd6463b615713ff36caadbc668de7 -SIZE (pacpl-4.0.5.tar.gz) = 110384 +SHA256 (pacpl-5.0.1.tar.gz) = 52d4373d76ba217293cd7a4d9513b0167f44281bebfe1d82b531fbf7e0828a65 +SIZE (pacpl-5.0.1.tar.gz) = 144849 Modified: head/audio/pacpl/pkg-plist ============================================================================== --- head/audio/pacpl/pkg-plist Sun Jul 27 14:05:33 2014 (r363069) +++ head/audio/pacpl/pkg-plist Sun Jul 27 14:14:14 2014 (r363070) @@ -1,21 +1,20 @@ bin/pacpl man/man1/pacpl.1.gz %%DATADIR%%/locale/en_US.po -%%ADDITIONAL_LANGS%%%%DATADIR%%/locale/ca.po -%%ADDITIONAL_LANGS%%%%DATADIR%%/locale/de.po -%%ADDITIONAL_LANGS%%%%DATADIR%%/locale/es.po -%%ADDITIONAL_LANGS%%%%DATADIR%%/locale/et.po -%%ADDITIONAL_LANGS%%%%DATADIR%%/locale/fr_FR.po -%%ADDITIONAL_LANGS%%%%DATADIR%%/locale/it_IT.po -%%ADDITIONAL_LANGS%%%%DATADIR%%/locale/nl_NL.po -%%ADDITIONAL_LANGS%%%%DATADIR%%/locale/pl.po -%%ADDITIONAL_LANGS%%%%DATADIR%%/locale/pt.po -%%ADDITIONAL_LANGS%%%%DATADIR%%/locale/ro.po -%%ADDITIONAL_LANGS%%%%DATADIR%%/locale/ru_RU.po -%%ADDITIONAL_LANGS%%%%DATADIR%%/locale/tr.po -%%ADDITIONAL_LANGS%%%%DATADIR%%/locale/zh_CN.po -%%AMAROK%%share/apps/amarok/scripts/transcoding_pacx/transcoding_pacx.pl -%%AMAROK%%share/apps/amarok/scripts/transcoding_pacx/transcoding_pacx.spec +%%NLS%%%%DATADIR%%/locale/ca.po +%%NLS%%%%DATADIR%%/locale/de.po +%%NLS%%%%DATADIR%%/locale/es.po +%%NLS%%%%DATADIR%%/locale/et.po +%%NLS%%%%DATADIR%%/locale/fr_FR.po +%%NLS%%%%DATADIR%%/locale/GR.po +%%NLS%%%%DATADIR%%/locale/it_IT.po +%%NLS%%%%DATADIR%%/locale/nl_NL.po +%%NLS%%%%DATADIR%%/locale/pl.po +%%NLS%%%%DATADIR%%/locale/pt.po +%%NLS%%%%DATADIR%%/locale/ro.po +%%NLS%%%%DATADIR%%/locale/ru_RU.po +%%NLS%%%%DATADIR%%/locale/tr.po +%%NLS%%%%DATADIR%%/locale/zh_CN.po %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.module %%PORTDOCS%%%%DOCSDIR%%/ChangeLog @@ -23,10 +22,9 @@ man/man1/pacpl.1.gz etc/pacpl/modules/sample.m etc/pacpl/pacpl.conf.sample etc/pacpl/codecs.conf.sample -%%AMAROK%%@dirrm share/apps/amarok/scripts/transcoding_pacx @dirrm %%DATADIR%%/locale @dirrm %%DATADIR%% @dirrmtry etc/pacpl/modules @dirrmtry etc/pacpl -%%KDE4SERVICEMENU%%@cwd %%KDE4_PREFIX%% -%%KDE4SERVICEMENU%%share/kde4/services/ServiceMenus/pacpl.desktop +%%KDE4%%@cwd %%KDE4_PREFIX%% +%%KDE4%%share/kde4/services/ServiceMenus/pacpl.desktop