Attachment 144582 Details for Bug 191811 – audio_pacpl.diff

[patch] audio_pacpl.diff

audio_pacpl.diff (text/plain), 20.18 KB, created by tkato432 on 2014-07-11 18:40:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2014-07-11 18:40:12 UTC

Size: 20.18 KB

patch

obsolete

>diff -urN /usr/ports/audio/pacpl/Makefile audio/pacpl/Makefile
>--- /usr/ports/audio/pacpl/Makefile	2014-07-07 02:32:35.000000000 +0900
>+++ audio/pacpl/Makefile	2014-07-12 00:00:00.000000000 +0900
>@@ -2,275 +2,113 @@
> # $FreeBSD: head/audio/pacpl/Makefile 360923 2014-07-06 15:28:14Z bapt $
> 
> PORTNAME=	pacpl
>-PORTVERSION=	4.0.5
>-PORTREVISION=	8
>+PORTVERSION=	5.0.1
> CATEGORIES=	audio
> MASTER_SITES=	SF
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Perl Audio Converter
> 
>-USES=		shebangfix perl5
>-NO_STAGE=	yes
>-ONLY_FOR_ARCHS=	i386 amd64
>-NO_BUILD=	yes
>-
>-OPTIONS_DEFINE=	BONK 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
>-
>-OPTIONS_DEFAULT=	CDPARANOIA CDDB FAAD FFMPEG FLAC FLACTAG MP3TAG \
>-			VORBIS VORBISTAG
>-.if !defined(PACKAGE_BUILDING)
>-OPTIONS_DEFAULT=	LAME FAAC
>-.endif
>-
>-BONK_DESC=	Enable Bonk support
>-AMAROK_DESC=	Enable Amarok integration (BROKEN)
>-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
>-
>-MAN1=		pacpl.1
>-PACPL_PO=	en_US.po
>+LICENSE=	GPLv3 # (or later)
> 
>-SHEBANG_FILES=	pacpl plugins/amarok/pacx
>+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
>+
>+NO_ARCH=	yes
>+
>+USES=		perl5 shebangfix
>+SHEBANG_FILES=	pacpl plugins/gnome/nautilus/PACPL-Convert \
>+		plugins/kde/PACPL-Konvert
>+
>+OPTIONS_DEFINE=		APE BONK 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
>+BONK_DESC=		Bonk lossy/lossless audio support
>+BONK_RUN_DEPENDS=	bonk:${PORTSDIR}/audio/bonk
>+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
>+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
>+MPLAYER_RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
>+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
>+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_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
> 
> .include <bsd.port.options.mk>
> 
>-.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
>-
>-.include <bsd.port.pre.mk>
>-
>-.if ${PERL_LEVEL} >= 501400
>-BUILD_DEPENDS+= p5-Switch>0:${PORTSDIR}/lang/p5-Switch
>-.endif
>-
>-.if ${PORT_OPTIONS:MBONK}
>-RUN_DEPENDS+=	bonk:${PORTSDIR}/audio/bonk
>-.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
>-.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
>+	@${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 ${PREFIX}/bin/
>-	${MKDIR} ${PREFIX}/etc/pacpl/modules/
>-	${MKDIR} ${DATADIR}/locale/
>-	${INSTALL_DATA} ${WRKSRC}/pacpl.conf ${PREFIX}/etc/pacpl/pacpl.conf.sample
>-	${INSTALL_DATA} ${WRKSRC}/codecs.conf ${PREFIX}/etc/pacpl/codecs.conf.sample
>-	${INSTALL_DATA} ${WRKSRC}/extra/sample.m ${PREFIX}/etc/pacpl/modules/sample.m
>-.for po in ${PACPL_PO}
>-	${INSTALL_DATA} ${WRKSRC}/po/${po} ${DATADIR}/locale
>+	(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
>-	@pod2man ${WRKSRC}/pacpl ${WRKSRC}/pacpl.1
>-	${INSTALL_MAN} ${WRKSRC}/pacpl.1 ${MAN1PREFIX}/man/man1/
>-
>+	@${MKDIR} ${STAGEDIR}${ETCDIR}/modules
>+	(cd ${WRKSRC}/extra && ${INSTALL_DATA} sample.m \
>+		${STAGEDIR}${ETCDIR}/modules)
>+	@${MKDIR} ${STAGEDIR}${DATADIR}/locale
>+	(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/konqueror/pacpl.desktop ${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
> 
>-.if ${PORT_OPTIONS:MAMAROK}
>-	${MKDIR} ${PREFIX}/share/apps/amarok/scripts/transcoding_pacx
>-	${INSTALL_DATA} ${WRKSRC}/plugins/amarok/pacx ${PREFIX}/share/apps/amarok/scripts/transcoding_pacx/transcoding_pacx.pl
>-	${PERL} -e 'print qq(name = Pacx\ntype = transcode)' > ${PREFIX}/share/apps/amarok/scripts/transcoding_pacx/transcoding_pacx.spec
>-.endif
>-
>-.if ${PORT_OPTIONS:MDOCS}
>-	${MKDIR} ${DOCSDIR}
>-	${INSTALL_DATA} ${WRKSRC}/extra/README.module ${WRKSRC}/ChangeLog ${WRKSRC}/README ${DOCSDIR}
>-.endif
>-
>-post-install:
>-	@${ECHO_MSG} ""
>-	@${PREFIX}/bin/pacpl -f
>-	@${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.post.mk>
>+.include <bsd.port.mk>
>diff -urN /usr/ports/audio/pacpl/distinfo audio/pacpl/distinfo
>--- /usr/ports/audio/pacpl/distinfo	2014-06-21 17:54:17.000000000 +0900
>+++ audio/pacpl/distinfo	2014-07-12 00:00:00.000000000 +0900
>@@ -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
>diff -urN /usr/ports/audio/pacpl/files/patch-pacpl audio/pacpl/files/patch-pacpl
>--- /usr/ports/audio/pacpl/files/patch-pacpl	2014-06-21 17:54:17.000000000 +0900
>+++ audio/pacpl/files/patch-pacpl	1970-01-01 09:00:00.000000000 +0900
>@@ -1,101 +0,0 @@
>---- pacpl.orig	2008-08-16 21:31:57.000000000 -0600
>-+++ pacpl	2009-02-15 09:21:16.000000000 -0700
>-@@ -25,18 +25,6 @@
>- use File::Find;
>- use File::Spec::Functions qw(rel2abs);
>- 
>--# Tagging modules
>--use Ogg::Vorbis::Header;
>--use MP3::Tag;
>--use Audio::FLAC::Header;
>--use MP4::Info;
>--use Audio::WMA;
>--use Audio::Musepack;
>--use Audio::APETags;
>--
>--# CDDB module
>--use CDDB_get qw(get_cddb);
>--
>- # non-encoder/decoder related options
>- my 
>- (
>-@@ -202,8 +190,8 @@
>- 
>- # load po file and store in %lang hash
>- sub load_lang {
>--
>--    my $po = "$po_dir/$ENV{LANG}.po";
>-+    my $lang = $ENV{LANG} || 'en_US';
>-+    my $po = "$po_dir/$lang.po";
>-        $po =~ s/\.UTF-8//i      if $po =~ /UTF-8/i; 
>-        $po =~ s/\.utf8//i       if $po =~ /utf8/i;  
>-        $po =~ s/_\w+//          if not -e $po;      
>-@@ -1541,6 +1529,17 @@
>- # load codecs.conf file
>- load_codecs() if -e $codecs_conf;
>- 
>-+# Now that %run is populated, verify tagging modules
>-+for my $format (keys %run){
>-+	if(defined $run{$format}{TAGS}{MODULE}){
>-+		eval "require $run{$format}{TAGS}{MODULE}";
>-+		@{$run{$format}{TAGS}}{qw(READ WRITE)} = (0,0) if $@;
>-+	}
>-+}
>-+
>-+eval "require CDDB_get";
>-+$nocddb = 1 if $@;
>-+
>- my $out_name = $outfile; 
>- my $out_dir  = $outdir;
>- 
>-@@ -2177,7 +2176,7 @@
>-                        }
>- 
>-         case 'wma'     {
>--                            my $wma_tag = Audio::WMA->new($in_file)->tags();
>-+                            my $wma_tag = $tag_module->new($in_file)->tags();
>- 
>-                                $tag_name{title}   = $wma_tag->{TITLE}       if $wma_tag->{TITLE};
>-                                $tag_name{track}   = $wma_tag->{TRACKNUMBER} if $wma_tag->{TRACKNUMBER};
>-@@ -2198,12 +2197,13 @@
>- sub write_tags {
>- 
>-     my ($out_file, $out_format) = @_;
>-+    my $tag_module = $run{$out_format}{TAGS}{MODULE};
>-     my  $tag_m;
>- 
>-     switch ($out_format) {
>- 
>-            case 'mp3'  {
>--                            $tag_m = MP3::Tag->new("$out_file");
>-+                            $tag_m = $tag_module->new("$out_file");
>-                             
>-                             # ID3v2 Tags
>-                             unless(exists($tag_m->{ID3v2})) { $tag_m->new_tag("ID3v2"); }
>-@@ -2236,7 +2236,7 @@
>-                         }
>- 
>-            case 'ogg'   {
>--                            $tag_m = Ogg::Vorbis::Header->new("$out_file");
>-+                            $tag_m = $tag_module->new("$out_file");
>-                             
>-                             # this prevents duplicate tags =)
>-                             $tag_m->clear_comments();
>-@@ -2257,7 +2257,7 @@
>-                         }
>- 
>-        case /fla|flac/ {
>--                            $tag_m = Audio::FLAC::Header->new("$out_file");
>-+                            $tag_m = $tag_module->new("$out_file");
>-                          my $tag_i = $tag_m->tags();
>- 
>-                             $tag_i->{TITLE}       = "$tag_name{title}"   if $tag_name{title};
>-@@ -2446,7 +2446,7 @@
>-       $ripconfig{DEVICE}     = $device;
>-       $ripconfig{CDDB_INPUT} = $config{CDDB_INPUT};
>- 
>--      %cd = get_cddb(\%ripconfig);
>-+      %cd = CDDB_get::get_cddb(\%ripconfig);
>- 
>-       if (not $cd{title}) {
>-           pnotice("no_cddb","",2);
>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-12 00: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-06-21 17:54:17.000000000 +0900
>+++ audio/pacpl/pkg-plist	2014-07-12 00:00:00.000000000 +0900
>@@ -1,31 +1,32 @@
> bin/pacpl
>-%%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
>+%%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
>+%%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
>-%%AMAROK%%@dirrm share/apps/amarok/scripts/transcoding_pacx
>+%%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
>-%%KDE4SERVICEMENU%%@cwd %%KDE4_PREFIX%%
>-%%KDE4SERVICEMENU%%share/kde4/services/ServiceMenus/pacpl.desktop
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%
>+@dirrmtry %%ETCDIR%%/modules
>+@dirrmtry %%ETCDIR%%

Actions: View | Diff

Attachments on bug 191811: 144582 | 144682 | 145077