From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jun 15 20:50:02 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A9EE41065675 for ; Mon, 15 Jun 2009 20:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 825FA8FC16 for ; Mon, 15 Jun 2009 20:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n5FKo28v029977 for ; Mon, 15 Jun 2009 20:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n5FKo2FB029976; Mon, 15 Jun 2009 20:50:02 GMT (envelope-from gnats) Resent-Date: Mon, 15 Jun 2009 20:50:02 GMT Resent-Message-Id: <200906152050.n5FKo2FB029976@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, hideo Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 79ED41065811 for ; Mon, 15 Jun 2009 20:42:47 +0000 (UTC) (envelope-from hideo@lastamericanempire.com) Received: from darwin.lastamericanempire.com (lastamericanempire.com [66.134.56.226]) by mx1.freebsd.org (Postfix) with ESMTP id 24E2D8FC1E for ; Mon, 15 Jun 2009 20:42:46 +0000 (UTC) (envelope-from hideo@lastamericanempire.com) Received: by darwin.lastamericanempire.com (Postfix, from userid 1001) id 6D3CB1CFB0; Mon, 15 Jun 2009 14:42:46 -0600 (MDT) Message-Id: <20090615204246.6D3CB1CFB0@darwin.lastamericanempire.com> Date: Mon, 15 Jun 2009 14:42:46 -0600 (MDT) From: hideo To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: makc@FreeBSD.org Subject: ports/135605: [maintainer update] Update audio/pacpl from 4.03 to 4.05 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: hideo List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Jun 2009 20:50:03 -0000 >Number: 135605 >Category: ports >Synopsis: [maintainer update] Update audio/pacpl from 4.03 to 4.05 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Jun 15 20:50:02 UTC 2009 >Closed-Date: >Last-Modified: >Originator: hideo >Release: FreeBSD 7.2-STABLE i386 >Organization: >Environment: System: FreeBSD darwin.lastamericanempire.com 7.2-STABLE FreeBSD 7.2-STABLE #0: Sat May 9 13:53:29 MDT 2009 hideo@darwin.lastamericanempire.com:/usr/obj/usr/src/sys/darwin i386 >Description: Update pacpl from version 4.03 to 4.05. * Adds service menu support for KDE4 and drops support for KDE3. * Amarok integration is temporarily non-functional. Note: `port test` complains that options are use before including bsd.port.pre.mk. However, I couldn't find a way around it for USE_KDE4. >How-To-Repeat: >Fix: --- pacpl-4.0.5 begins here --- diff -ruN /usr/ports/audio/pacpl/Makefile pacpl/Makefile --- /usr/ports/audio/pacpl/Makefile 2009-03-27 03:43:30.000000000 -0600 +++ pacpl/Makefile 2009-06-15 14:30:03.000000000 -0600 @@ -6,7 +6,7 @@ # PORTNAME= pacpl -PORTVERSION= 4.0.3 +PORTVERSION= 4.0.5 CATEGORIES= audio MASTER_SITES= SFE @@ -49,14 +49,32 @@ TTA "TTA support" off \ WAVPACK "WavPack support" off \ WMATAG "WMA Tagging support" off \ - KONQUEROR "KDE/Konqueror integration" off \ - DOLPHIN "Dolphin integration" off \ - AMAROK "Amarok integration" off \ + KDE4SM "Konqueror/Dolphin integration" off \ + AMAROK "Amarok integration (BROKEN)" off \ MORELANGS "Additional language support" off MAN1= pacpl.1 PACPL_PO= en_US.po +.include + +#PLIST_SUB+= KDE4_PREFIX="${KDE4_PREFIX}" + +.if defined(WITH_KDE4SM) +USE_KDE4= kdebase +PLIST_SUB+= KDE4SERVICEMENU="" KDE4_PREFIX="${KDE4_PREFIX}" +.else +PLIST_SUB+= KDE4SERVICEMENU="@comment " +.endif + +.if defined(WITH_AMAROK) +BROKEN= Amarok support temporarily broken in 4.05+ +RUN_DEPENDS+= amarok:${PORTSDIR}/audio/amarok +PLIST_SUB+= AMAROK="" +.else +PLIST_SUB+= AMAROK="@comment " +.endif + .include .if ${PERL_LEVEL} < 500701 @@ -69,10 +87,6 @@ .if defined(WITH_BONK) RUN_DEPENDS+= bonk:${PORTSDIR}/audio/bonk -KONQMIMES+= x-bonk -PLIST_SUB+= BONK="" -.else -PLIST_SUB+= BONK="@comment " .endif .if defined(WITH_CDDB) @@ -113,10 +127,6 @@ .if defined(WITH_LAUDIO) RUN_DEPENDS+= laudio:${PORTSDIR}/audio/laudio -KONQMIMES+= x-la -PLIST_SUB+= LAUDIO="" -.else -PLIST_SUB+= LAUDIO="@comment " .endif .if defined(WITH_SNDFILE) @@ -125,18 +135,10 @@ .if defined(WITH_LPAC) RUN_DEPENDS+= lpac:${PORTSDIR}/audio/lpac -KONQMIMES+= x-lpac -PLIST_SUB+= LPAC="" -.else -PLIST_SUB+= LPAC="@comment " .endif .if defined(WITH_MONKEY) RUN_DEPENDS+= mac:${PORTSDIR}/audio/mac -KONQMIMES+= x-ape -PLIST_SUB+= MONKEY="" -.else -PLIST_SUB+= MONKEY="@comment " .endif .if defined(WITH_MUSETAG) || defined(WITH_APETAG) @@ -161,10 +163,6 @@ .if defined(WITH_OPTIMFROG) RUN_DEPENDS+= ofr:${PORTSDIR}/audio/optimfrog -KONQMIMES+= x-ofr x-ofs -PLIST_SUB+= OPTIMFROG="" -.else -PLIST_SUB+= OPTIMFROG="@comment " .endif .if defined(WITH_OGGVORBIS) @@ -177,10 +175,6 @@ .if defined(WITH_SHORTEN) RUN_DEPENDS+= shorten:${PORTSDIR}/audio/shorten -KONQMIMES+= x-shn -PLIST_SUB+= SHORTEN="" -.else -PLIST_SUB+= SHORTEN="@comment " .endif .if defined(WITH_SOX) @@ -197,54 +191,18 @@ .if defined(WITH_TTA) RUN_DEPENDS+= ttaenc:${PORTSDIR}/audio/tta -KONQMIMES+= x-tta -PLIST_SUB+= TTA="" -.else -PLIST_SUB+= TTA="@comment " .endif .if defined(WITH_WAVPACK) RUN_DEPENDS+= wavpack:${PORTSDIR}/audio/wavpack -KONQMIMES+= x-wavpack -PLIST_SUB+= WAVPACK="" -.else -PLIST_SUB+= WAVPACK="@comment " .endif .if defined(WITH_WMATAG) RUN_DEPENDS+= p5-Audio-WMA>0:${PORTSDIR}/audio/p5-Audio-WMA .endif -.if defined(WITH_FFMPEG) && defined(WITH_MPLAYER) -KONQMIMES+= x-rm -PLIST_SUB+= RM="" -.else -PLIST_SUB+= RM="@comment " -.endif - -.if defined(WITH_KONQUEROR) -RUN_DEPENDS+= konqueror:${PORTSDIR}/x11/kdebase3 -PLIST_SUB+= KONQUEROR="" -.else -PLIST_SUB+= KONQUEROR="@comment " -.endif - -.if defined(WITH_AMAROK) -RUN_DEPENDS+= amarok:${PORTSDIR}/audio/amarok -PLIST_SUB+= AMAROK="" -.else -PLIST_SUB+= AMAROK="@comment " -.endif - -.if defined(WITH_DOLPHIN) -RUN_DEPENDS+= dolphin:${PORTSDIR}/x11-fm/dolphin -PLIST_SUB+= DOLPHIN="" -.else -PLIST_SUB+= DOLPHIN="@comment " -.endif - .if defined(WITH_MORELANGS) -PACPL_PO+= ca.po de.po es.po et.po fr_FR.po pl.po pt.po ru_RU.po tr.po zh_CN.po +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 " @@ -255,8 +213,8 @@ @${ECHO_MSG} "" @${ECHO_MSG} " * * * * * * * * * W A R N I N G * * * * * * * * * * * * * " @${ECHO_MSG} "" - @${ECHO_MSG} "WARNING: Integration options with Amarok, Dolphin, and" - @${ECHO_MSG} "KDE3/Konqueror now pull in their respective ports!" + @${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" @@ -291,13 +249,8 @@ @pod2man ${WRKSRC}/pacpl ${WRKSRC}/pacpl.1 ${INSTALL_MAN} ${WRKSRC}/pacpl.1 ${MAN1PREFIX}/man/man1/ -.if defined(WITH_KONQUEROR) - ${MKDIR} ${PREFIX}/share/mimelnk/audio - ${MKDIR} ${PREFIX}/share/apps/konqueror/servicemenus - ${INSTALL_DATA} ${WRKSRC}/plugins/konqueror/pacpl.desktop ${PREFIX}/share/apps/konqueror/servicemenus/ -.for m in ${KONQMIMES} - ${INSTALL_DATA} ${WRKSRC}/plugins/konqueror/mimes/${m}.desktop ${PREFIX}/share/mimelnk/audio/ -.endfor +.if defined(WITH_KDE4SM) + ${INSTALL_DATA} ${WRKSRC}/plugins/konqueror/pacpl.desktop ${KDE4_PREFIX}/share/kde4/services/ServiceMenus .endif .if defined(WITH_AMAROK) @@ -306,11 +259,6 @@ ${PERL} -e 'print qq(name = Pacx\ntype = transcode)' > ${PREFIX}/share/apps/amarok/scripts/transcoding_pacx/transcoding_pacx.spec .endif -.if defined(WITH_DOLPHIN) - ${MKDIR} ${PREFIX}/share/apps/dolphin/servicemenus - ${INSTALL_DATA} ${WRKSRC}/plugins/dolphin/pacpl.desktop ${PREFIX}/share/apps/dolphin/servicemenus/ -.endif - .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/extra/README.module ${WRKSRC}/ChangeLog ${WRKSRC}/README ${DOCSDIR} diff -ruN /usr/ports/audio/pacpl/distinfo pacpl/distinfo --- /usr/ports/audio/pacpl/distinfo 2009-03-27 03:43:30.000000000 -0600 +++ pacpl/distinfo 2009-03-27 06:13:23.000000000 -0600 @@ -1,3 +1,3 @@ -MD5 (pacpl-4.0.3.tar.gz) = 8be8d23d69f99ac9cc1174d166347a44 -SHA256 (pacpl-4.0.3.tar.gz) = a92540102bf9b7d29cafaf5fc5fdbfc4058ea9a553a7ca3be5d37747dc8b06f4 -SIZE (pacpl-4.0.3.tar.gz) = 108043 +MD5 (pacpl-4.0.5.tar.gz) = fb96c0f9e525dd9327c0212bd381fd8d +SHA256 (pacpl-4.0.5.tar.gz) = e6b3ff88acde0bdd7cb4469064afd58cce7fd6463b615713ff36caadbc668de7 +SIZE (pacpl-4.0.5.tar.gz) = 110384 diff -ruN /usr/ports/audio/pacpl/pkg-plist pacpl/pkg-plist --- /usr/ports/audio/pacpl/pkg-plist 2009-03-27 03:43:30.000000000 -0600 +++ pacpl/pkg-plist 2009-06-15 14:16:33.000000000 -0600 @@ -5,25 +5,16 @@ %%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 -%%DOLPHIN%%share/apps/dolphin/servicemenus/pacpl.desktop -%%KONQUEROR%%%%MONKEY%%share/mimelnk/audio/x-ape.desktop -%%KONQUEROR%%%%BONK%%share/mimelnk/audio/x-bonk.desktop -%%KONQUEROR%%%%LAUDIO%%share/mimelnk/audio/x-la.desktop -%%KONQUEROR%%%%LPAC%%share/mimelnk/audio/x-lpac.desktop -%%KONQUEROR%%%%OPTIMFROG%%share/mimelnk/audio/x-ofr.desktop -%%KONQUEROR%%%%OPTIMFROG%%share/mimelnk/audio/x-ofs.desktop -%%KONQUEROR%%%%RM%%share/mimelnk/audio/x-rm.desktop -%%KONQUEROR%%%%SHORTEN%%share/mimelnk/audio/x-shn.desktop -%%KONQUEROR%%%%TTA%%share/mimelnk/audio/x-tta.desktop -%%KONQUEROR%%%%WAVPACK%%share/mimelnk/audio/x-wavpack.desktop -%%KONQUEROR%%share/apps/konqueror/servicemenus/pacpl.desktop %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.module %%PORTDOCS%%%%DOCSDIR%%/ChangeLog @@ -36,3 +27,5 @@ @dirrm %%DATADIR%% @dirrmtry etc/pacpl/modules @dirrmtry etc/pacpl +%%KDE4SERVICEMENU%%@cwd %%KDE4_PREFIX%% +%%KDE4SERVICEMENU%%share/kde4/services/ServiceMenus/pacpl.desktop --- pacpl-4.0.5 ends here --- >Release-Note: >Audit-Trail: >Unformatted: