Attachment 145077 Details for Bug 191811 – audio_pacpl.diff

[patch] audio_pacpl.diff

audio_pacpl.diff (text/plain), 11.99 KB, created by tkato432 on 2014-07-28 12:30:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2014-07-28 12:30:12 UTC

Size: 11.99 KB

patch

obsolete

>diff -urN /usr/ports/audio/pacpl/Makefile audio/pacpl/Makefile
>--- /usr/ports/audio/pacpl/Makefile	2014-07-28 06:33:23.000000000 +0900
>+++ audio/pacpl/Makefile	2014-07-28 21:00:00.000000000 +0900
>@@ -3,130 +3,111 @@
> 
> PORTNAME=	pacpl
> PORTVERSION=	5.0.1
>-PORTREVISION=	9
>+PORTREVISION=	10
> CATEGORIES=	audio
> MASTER_SITES=	SF
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Perl Audio Converter
> 
>-USES=		shebangfix perl5
>-ONLY_FOR_ARCHS=	i386 amd64
>-NO_BUILD=	yes
>-NO_ARCH=	yes
>-
>-OPTIONS_DEFINE=	CDPARANOIA CDDB FAAC FAAD FFMPEG FLAC FLACTAG \
>-		LAME LAUDIO SNDFILE LPAC APE APETAG MP3TAG MP4TAG \
>-		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
>-.if !defined(PACKAGE_BUILDING)
>-OPTIONS_DEFAULT=	LAME FAAC
>-.endif
>+LICENSE=	GPLv3 # (or later)
> 
>-OPTIONS_SUB=	yes
>+RUN_DEPENDS=	p5-Audio-FLAC-Header>0:${PORTSDIR}/audio/p5-Audio-FLAC-Header \
>+		p5-Audio-Scan>0:${PORTSDIR}/audio/p5-Audio-Scan \
>+		p5-CDDB_get>0:${PORTSDIR}/audio/p5-CDDB_get \
>+		p5-MP3-Tag>0:${PORTSDIR}/audio/p5-MP3-Tag \
>+		p5-Parallel-ForkManager>0:${PORTSDIR}/devel/p5-Parallel-ForkManager \
>+		p5-Switch>0:${PORTSDIR}/lang/p5-Switch
> 
>-APETAG_DESC=	Enable Monkey's tagging support
>-FLACTAG_DESC=	Enable FLAC tagging support
>-KDE4_DESC=	Enable Konqueror/Dolphin integration
>-LAUDIO_DESC=	Enable laudio support
>-LPAC_DESC=	Enable LPAC support
>-MP3TAG_DESC=	Enable MP3 tagging support
>-MP4TAG_DESC=	Enable MP4 tagging support
>-MPLAYER_DESC=	Enable Mplayer support
>-MPPTAG_DESC=	Enable Musepack tagging support
>-OPTIMFROG_DESC=	Enable OptimFROG support
>-VORBISTAG_DESC=	Enable Ogg/Vorbis tagging support
>-SHORTEN_DESC=	Enable Shorten support
>-SOX_DESC=	Enable SoX support
>-TOOLAME_DESC=	Enable tooLAME support
>-TTA_DESC=	Enable TTA support
>-WAVPACK_DESC=	Enable wavpack support
>-WMATAG_DESC=	Enable WMA tagging support
>-MORELANGS_DESC=	Enable Additional language support
>+NO_ARCH=	yes
> 
>-SHEBANG_FILES=	pacpl
>+USES=		perl5 shebangfix
>+SHEBANG_FILES=	pacpl plugins/gnome/nautilus/PACPL-Convert \
>+		plugins/kde/PACPL-Konvert
>+
>+OPTIONS_DEFINE=		APE CDPARANOIA DOCS FAAC FAAD FFMPEG KDE4 \
>+			LAME LAUDIO MUSEPACK MPLAYER OPTIMFROG OPUS \
>+			SHORTEN SNDFILE SOX SPEEX TOOLAME TTA VORBIS WAVPACK
>+OPTIONS_DEFAULT=	CDPARANOIA FAAC FAAD FFMPEG LAME VORBIS
>+OPTIONS_SUB=		yes
> 
> 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_DESC=		Konqueror/Dolphin integration
> KDE4_USE=		KDE4=kdehier
> LAME_RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame
>+LAUDIO_DESC=		Laudio support
> 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
>+MUSEPACK_RUN_DEPENDS=	mppenc:${PORTSDIR}/audio/musepack
>+OPTIMFROG_DESC=		OptimFROG lossless audio support
> OPTIMFROG_RUN_DEPENDS=	ofr:${PORTSDIR}/audio/optimfrog
>+OPUS_DESC=		Ogg Opus audio codec support
>+OPUS_RUN_DEPENDS=	opus:${PORTSDIR}/audio/opus
>+SNDFILE_RUN_DEPENDS=	sndfile-convert:${PORTSDIR}/audio/libsndfile
> VORBIS_RUN_DEPENDS=	oggenc:${PORTSDIR}/audio/vorbis-tools
>-VORBISTAG_RUN_DEPENDS=	p5-Ogg-Vorbis-Header>0:${PORTSDIR}/audio/p5-Ogg-Vorbis-Header
>+SHORTEN_DESC=		Shorten audio support
> SHORTEN_RUN_DEPENDS=	shorten:${PORTSDIR}/audio/shorten
>+SOX_DESC=		Audio conversion support via SoX
> SOX_RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox
> SPEEX_RUN_DEPENDS=	speexenc:${PORTSDIR}/audio/speex
>-TOOLAME_RUN_DEPENDS=	toolame:${PORTSDIR}/audio/toolame
>+TOOLAME_DESC=		TooLAME MP2 audio encoder support
>+TOOLAME_RUN_DEPENDS+=	toolame:${PORTSDIR}/audio/toolame
>+TTA_DESC=		TTA lossless audio support
> TTA_RUN_DEPENDS=	ttaenc:${PORTSDIR}/audio/tta
>+VORBIS_RUN_DEPENDS=	vorbiscomment:${PORTSDIR}/audio/vorbis-tools
> WAVPACK_RUN_DEPENDS=	wavpack:${PORTSDIR}/audio/wavpack
>-WMATAG_RUN_DEPENDS=	p5-Audio-WMA>0:${PORTSDIR}/audio/p5-Audio-WMA
> 
> .include <bsd.port.options.mk>
> 
>-.if ${PORT_OPTIONS:MKDE4}
>-PLIST_SUB+=	KDE4_PREFIX="${KDE4_PREFIX}"
>-.endif
>-
> post-patch:
>-	@${REINPLACE_CMD} -e 's@/etc/pacpl@${PREFIX}/etc/pacpl@; \
>-		s@/usr/share/pacpl@${DATADIR}@' ${WRKSRC}/pacpl ${WRKSRC}/pacpl.conf
>+	@${REINPLACE_CMD} -e \
>+		's|"/etc/pacpl|"${ETCDIR}| ; \
>+		 s|"/usr/share/pacpl|"${DATADIR}| ; \
>+		 s|^/etc/pacpl|${ETCDIR}|' ${WRKSRC}/pacpl
>+	@${REINPLACE_CMD} -e \
>+		's| /etc/pacpl| ${ETCDIR}|' ${WRKSRC}/pacpl.conf
>+	@${REINPLACE_CMD} -e \
>+		's|=/etc/pacpl|=${ETCDIR}| ; \
>+		 s|=/usr/bin|=${PREFIX}/libexec|' \
>+		${WRKSRC}/plugins/kde/pacpl.desktop
>+
>+do-build:
>+	@(cd ${WRKSRC} && pod2man pacpl pacpl.1)
> 
> do-install:
>-	${INSTALL_SCRIPT} ${WRKSRC}/pacpl ${STAGEDIR}${PREFIX}/bin
>-	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/pacpl/modules
>+	(cd ${WRKSRC} && ${INSTALL_SCRIPT} pacpl \
>+		${STAGEDIR}${PREFIX}/bin)
>+	(cd ${WRKSRC} && ${INSTALL_MAN} pacpl.1 \
>+		${STAGEDIR}${MANPREFIX}/man/man1)
>+	@${MKDIR} ${STAGEDIR}${ETCDIR}
>+	(cd ${WRKSRC} && ${INSTALL_DATA} pacpl.png \
>+		${STAGEDIR}${ETCDIR})
>+.for i in codecs.conf pacpl.conf
>+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} \
>+		${STAGEDIR}${ETCDIR}/${i}.sample)
>+.endfor
>+	@${MKDIR} ${STAGEDIR}${ETCDIR}/modules
>+	(cd ${WRKSRC}/extra && ${INSTALL_DATA} sample.m \
>+		${STAGEDIR}${ETCDIR}/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
>-	${INSTALL_DATA} ${WRKSRC}/po/* ${STAGEDIR}${DATADIR}/locale
>-	@pod2man ${WRKSRC}/pacpl ${WRKSRC}/pacpl.1
>-	${INSTALL_MAN} ${WRKSRC}/pacpl.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
>-
>+	(cd ${WRKSRC}/po && ${INSTALL_DATA} *.po \
>+		${STAGEDIR}${DATADIR}/locale)
>+	${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	(cd ${WRKSRC} && ${INSTALL_DATA} ChangeLog README \
>+		${STAGEDIR}${DOCSDIR})
>+	(cd ${WRKSRC}/extra && ${INSTALL_DATA} README.module \
>+		${STAGEDIR}${DOCSDIR})
>+	(cd ${WRKSRC}/plugins/gnome/nautilus && ${INSTALL_SCRIPT} PACPL-Convert \
>+		${STAGEDIR}${PREFIX}/libexec)
> .if ${PORT_OPTIONS:MKDE4}
>-	${INSTALL_DATA} ${WRKSRC}/plugins/kde/pacpl.desktop ${STAGEDIR}${KDE4_PREFIX}/share/kde4/services/ServiceMenus
>+	(cd ${WRKSRC}/plugins/kde && ${INSTALL_SCRIPT} PACPL-Konvert \
>+		${STAGEDIR}${PREFIX}/libexec)
>+	(cd ${WRKSRC}/plugins/kde && ${INSTALL_DATA} pacpl.desktop \
>+		${STAGEDIR}${PREFIX}/share/kde4/services/ServiceMenus)
> .endif
> 
>-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	${INSTALL_DATA} ${WRKSRC}/extra/README.module ${WRKSRC}/ChangeLog ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
>-
>-post-install:
>-	@${ECHO_MSG} ""
>-	#@${STAGEDIR}${PREFIX}/bin/pacpl -f # FIXME errors out
>-	@${ECHO_MSG} ""
>-	@${ECHO_MSG} "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * "
>-	@${ECHO_MSG} ""
>-	@${ECHO_MSG} "If you are updating from pacpl 3.x please do take"
>-	@${ECHO_MSG} "time to review the changes in 4.x:"
>-	@${ECHO_MSG} ""
>-	@${ECHO_MSG} "  http://sourceforge.net/p/pacpl/code/ci/master/tree/ChangeLog"
>-	@${ECHO_MSG} ""
>-	@${ECHO_MSG} "The command-line options are quite different in 4.x.  A"
>-	@${ECHO_MSG} "few features are no longer available and several are new. "
>-	@${ECHO_MSG} "You should also take a look at the two config files in"
>-	@${ECHO_MSG} "${PREFIX}/etc/pacpl."
>-	@${ECHO_MSG} ""
>-	@${ECHO_MSG} "The supported codecs and tagging available in this port"
>-	@${ECHO_MSG} "build are listed above this message."
>-	@${ECHO_MSG} ""
>-	@${ECHO_MSG} "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * "
>-	@${ECHO_MSG} ""
>-
> .include <bsd.port.mk>
>diff -urN /usr/ports/audio/pacpl/pkg-descr audio/pacpl/pkg-descr
>--- /usr/ports/audio/pacpl/pkg-descr	2014-06-21 17:54:17.000000000 +0900
>+++ audio/pacpl/pkg-descr	2014-07-28 21:00:00.000000000 +0900
>@@ -1,12 +1,23 @@
> Perl Audio Converter (PAC) is a tool for converting multiple audio types
>-from one format to another. It supports MP2, MP3, Ogg Vorbis, FLAC,
>-Shorten, Monkey Audio, FAAC (AAC/M4A/MP4), Musepack (MPC), Wavpack (WV),
>-OptimFrog (OFR/OFS), TTA, LPAC, Kexis (KXS), AIFF, AC3, Lossless Audio
>-(LA), BONK, AU, SND, RAW, VOC, SMP, RealAudio (RA/RAM), WAV, and WMA. It
>-can also convert audio from the following video formats/extensions: RM,
>-RV, ASF, DivX, MPG, MKV, MPEG, AVI, MOV, OGM, QT, VCD, VOB, and WMV. A
>-CD ripping function with CDDB support, batch and playlist conversion,
>-tag preservation for most supported formats, independent tag reading/
>-writing, and extensions for Konqueror and Amarok are also provided.
>+from one format to another.
>+ 
>+It supports the following audio formats:
>+------------------------------------------------------------
>+3G2, 3GP, 8SVX, AAC, AC3, ADTS, AIFF, AL, AMB, AMR, APE, AU, AVR, BONK,
>+CAF, CDR, CVU, DAT, DTS, DVMS, F32, F64, FAP, FLA, FLAC, FSSD, GSRT,
>+HCOM, IMA, IRCAM, LA, MAT, MAUD, MAT4, MAT5, M4A, MP2, MP3, MP4, MPC,
>+MPP, NIST, OFF, OFR, OFS, OPUS, OGA, OGG, PAF, PRC, PVF, RA, RAM, RAW,
>+RF64, SD2, SF, SHN, SMP, SND, SOU, SPX, SRN, TAK, TTA, TXW, VOC, VMS,
>+VQF, W64, WAV, WMA, and WV.
>+ 
>+It can also extract audio from the following video extensions:
>+--------------------------------------------------------------
>+RM, RV, ASF, DivX, MPG, MKV, MPEG, AVI, MOV, OGM, OGV, QT, VCD, SVCD,
>+M4V, NSV, NUV, PSP, SMK, VOB, FLV, WEBM and WMV.
>+ 
>+Parallel processing, a CD ripping function with CDDB support, batch
>+conversion, tag preservation for most supported formats, independent tag
>+reading & writing, service menus for KDE Dolphin/Konqueror are also
>+provided.
> 
> WWW: http://vorzox.wix.com/pacpl
>diff -urN /usr/ports/audio/pacpl/pkg-plist audio/pacpl/pkg-plist
>--- /usr/ports/audio/pacpl/pkg-plist	2014-07-28 06:33:23.000000000 +0900
>+++ audio/pacpl/pkg-plist	2014-07-28 21:00:00.000000000 +0900
>@@ -1,30 +1,32 @@
> bin/pacpl
>+%%ETCDIR%%/codecs.conf.sample
>+%%ETCDIR%%/modules/sample.m
>+%%ETCDIR%%/pacpl.conf.sample
>+%%ETCDIR%%/pacpl.png
>+libexec/PACPL-Convert
>+%%KDE4%%libexec/PACPL-Konvert
> man/man1/pacpl.1.gz
>-%%DATADIR%%/locale/en_US.po
>-%%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%%/ChangeLog
> %%PORTDOCS%%%%DOCSDIR%%/README
> %%PORTDOCS%%%%DOCSDIR%%/README.module
>-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%
>-etc/pacpl/modules/sample.m
>-etc/pacpl/pacpl.conf.sample
>-etc/pacpl/codecs.conf.sample
>+%%DATADIR%%/locale/GR.po
>+%%DATADIR%%/locale/ca.po
>+%%DATADIR%%/locale/de.po
>+%%DATADIR%%/locale/en_US.po
>+%%DATADIR%%/locale/es.po
>+%%DATADIR%%/locale/et.po
>+%%DATADIR%%/locale/fr_FR.po
>+%%DATADIR%%/locale/it_IT.po
>+%%DATADIR%%/locale/nl_NL.po
>+%%DATADIR%%/locale/pl.po
>+%%DATADIR%%/locale/pt.po
>+%%DATADIR%%/locale/ro.po
>+%%DATADIR%%/locale/ru_RU.po
>+%%DATADIR%%/locale/tr.po
>+%%DATADIR%%/locale/zh_CN.po
>+%%KDE4%%share/kde4/services/ServiceMenus/pacpl.desktop
> @dirrm %%DATADIR%%/locale
> @dirrm %%DATADIR%%
>-@dirrmtry etc/pacpl/modules
>-@dirrmtry etc/pacpl
>-%%KDE4%%@cwd %%KDE4_PREFIX%%
>-%%KDE4%%share/kde4/services/ServiceMenus/pacpl.desktop
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%
>+@dirrmtry %%ETCDIR%%/modules
>+@dirrmtry %%ETCDIR%%

Actions: View | Diff

Attachments on bug 191811: 144582 | 144682 | 145077