4 files changed, 461 insertions, 88 deletions

diff --git a/audio/pacpl/Makefile b/audio/pacpl/Makefile
index 8db8bae6eb29..39ee5d1dab14 100644
--- a/audio/pacpl/Makefile
+++ b/audio/pacpl/Makefile
@@ -6,95 +6,337 @@
 #
 
 PORTNAME=	pacpl
-PORTVERSION=	3.3.2
-PORTREVISION=	2
+PORTVERSION=	4.0.3
 CATEGORIES=	audio
 MASTER_SITES=	SFE
 
 MAINTAINER=	hideo@lastamericanempire.com
 COMMENT=	Perl Audio Converter
 
-RUN_DEPENDS=	p5-MP3-Tag>0:${PORTSDIR}/audio/p5-MP3-Tag \
-		p5-MP4-Info>0:${PORTSDIR}/multimedia/p5-MP4-Info \
-		p5-Audio-WMA>0:${PORTSDIR}/audio/p5-Audio-WMA \
-		p5-Ogg-Vorbis-Header>0:${PORTSDIR}/audio/p5-Ogg-Vorbis-Header \
-		p5-Audio-FLAC-Header>0:${PORTSDIR}/audio/p5-Audio-FLAC-Header \
-		p5-Audio-Musepack>0:${PORTSDIR}/audio/p5-Audio-Musepack \
-		p5-IO-String>0:${PORTSDIR}/devel/p5-IO-String \
-		lame:${PORTSDIR}/audio/lame \
-		oggenc:${PORTSDIR}/audio/vorbis-tools \
-		flac:${PORTSDIR}/audio/flac \
-		mac:${PORTSDIR}/audio/mac \
-		shorten:${PORTSDIR}/audio/shorten \
-		faac:${PORTSDIR}/audio/faac \
-		faad:${PORTSDIR}/audio/faad \
-		mppenc:${PORTSDIR}/audio/musepack \
-		wavpack:${PORTSDIR}/audio/wavpack \
-		ttaenc:${PORTSDIR}/audio/tta \
-		kexis:${PORTSDIR}/audio/kexis \
-		sox:${PORTSDIR}/audio/sox \
-		ffmpeg:${PORTSDIR}/multimedia/ffmpeg \
-		bonk:${PORTSDIR}/audio/bonk \
-		mplayer:${PORTSDIR}/multimedia/mplayer \
-		cdparanoia:${PORTSDIR}/audio/cdparanoia \
-		mpg123:${PORTSDIR}/audio/mpg123 \
-		laudio:${PORTSDIR}/audio/laudio \
-		ofr:${PORTSDIR}/audio/optimfrog \
-		lpac:${PORTSDIR}/audio/lpac
-
+USE_PERL5_BUILD=yes
+USE_PERL5_RUN=	yes
 ONLY_FOR_ARCHS=	i386 amd64
 NO_BUILD=	yes
-PACPL_LNG_FILES=	help long_help rip_help tag_help video_help
-PACPL_LNGS=	FR PT
-PACPL_PATHS=	lame oggenc oggdec flac mac shorten faac faad mplayer mppenc mppdec wavpack wvunpack \
-		ofr ofs ttaenc lpac sox ffmpeg la:laudio bonk cdparanoia kdialog
-AMAROK_SCR=	transcoding_pacx.pl
-AMAROK_SCR_DIR=	share/apps/amarok/scripts/transcoding_pacx
-KONQ_MIME=	ape bonk kxs la lpac ofr ofs rm shn tta wavpack
-KONQ_SVCM=	${PORTNAME}
-KONQ_MIME_DIR=	share/mimelnk/audio
-KONQ_SVCM_DIR=	share/apps/konqueror/servicemenus
-PLIST_FILES=	bin/pacpl etc/pacpl/pacpl.conf \
-		${PACPL_LNG_FILES:S,^,etc/pacpl/lang/FR/,:S,$,.FR,} \
-		${PACPL_LNG_FILES:S,^,etc/pacpl/lang/PT/,:S,$,.PT,} \
-		${AMAROK_SCR:S|^|${AMAROK_SCR_DIR}/|} \
-		${AMAROK_SCR_DIR}/transcoding_pacx.spec \
-		${KONQ_MIME:S|^|${KONQ_MIME_DIR}/x-|:S|$|.desktop|} \
-		${KONQ_SVCM:S|^|${KONQ_SVCM_DIR}/|:S|$|.desktop|}
-PLIST_DIRS=	etc/pacpl/lang/FR etc/pacpl/lang/PT etc/pacpl/lang etc/pacpl
+
+OPTIONS=	BLADEENC	"BladeEnc support"		off \
+		BONK		"Bonk support"			off \
+		CDPARANOIA	"CD Ripping support"		on \
+		CDDB		"CDDB support"			on \
+		FAAC		"FAAC support"			on \
+		FAAD		"FAAD support"			on \
+		FFMPEG		"FFMPEG suport"			on \
+		FLAC		"FLAC support"			on \
+		FLACTAG		"FLAC tagging support"		on \
+		GOGO		"GOGO-no-coda support"		off \
+		LAME		"Lame support"			on \
+		LAUDIO		"Laudio support"		off \
+		SNDFILE		"libsndfile support"		off \
+		LPAC		"LPAC support"			off \
+		MONKEY		"Monkey's Audio support"	off \
+		APETAG		"Monkey's tagging support"	off \
+		MP3TAG		"MP3 tagging support"		on \
+		MP4TAG		"MP4 tagging support"		off \
+		MPLAYER		"MPlayer support"		on \
+		MUSEPACK	"Musepack support"		off \
+		MUSETAG		"Musepack tagging support"	off \
+		OPTIMFROG	"OptimFROG support"		off \
+		OGGVORBIS	"Ogg/Vorbis support"		off \
+		OGGTAG		"Ogg/Vorbis tagging support"	off \
+		SHORTEN		"Shorten support"		off \
+		SOX		"SoX support"			off \
+		SPEEX		"Speex support"			off \
+		TOOLAME		"tooLAME support"		off \
+		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 \
+		MORELANGS	"Additional language support"	off
+
 MAN1=		pacpl.1
+PACPL_PO=	en_US.po
+
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500701
+RUN_DEPENDS+=	p5-Switch>0:${PORTSDIR}/lang/p5-Switch
+.endif
+
+.if defined(WITH_BLADEENC)
+RUN_DEPENDS+=	bladeenc:${PORTSDIR}/audio/bladeenc
+.endif
+
+.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)
+RUN_DEPENDS+=	p5-CDDB_get>0:${PORTSDIR}/audio/p5-CDDB_get
+.endif
+
+.if defined(WITH_CDPARANOIA)
+RUN_DEPENDS+=	cdparanoia:${PORTSDIR}/audio/cdparanoia
+.endif
+
+.if defined(WITH_FAAC)
+RUN_DEPENDS+=	faac:${PORTSDIR}/audio/faac
+.endif
+
+.if defined(WITH_FAAD)
+RUN_DEPENDS+=	faad:${PORTSDIR}/audio/faad
+.endif
+
+.if defined(WITH_FFMPEG)
+RUN_DEPENDS+=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg
+.endif
+
+.if defined(WITH_FLAC)
+RUN_DEPENDS+=	flac:${PORTSDIR}/audio/flac
+.endif
+
+.if defined(WITH_FLACTAG)
+RUN_DEPENDS+=	p5-Audio-FLAC-Header>0:${PORTSDIR}/audio/p5-Audio-FLAC-Header
+.endif
+
+.if defined(WITH_GOGO)
+RUN_DEPENDS+=	gogo:${PORTSDIR}/audio/gogo
+.endif
+
+.if defined(WITH_LAME)
+RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
+.endif
+
+.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)
+RUN_DEPENDS+=	sndfile-convert:${PORTSDIR}/audio/libsndfile
+.endif
+
+.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)
+RUN_DEPENDS+=	p5-Audio-Musepack>0:${PORTSDIR}/audio/p5-Audio-Musepack
+.endif
+
+.if defined(WITH_MP3TAG)
+RUN_DEPENDS+=	p5-MP3-Tag>0:${PORTSDIR}/audio/p5-MP3-Tag
+.endif
+
+.if defined(WITH_MP4TAG)
+RUN_DEPENDS+=	p5-MP4-Info>0:${PORTSDIR}/multimedia/p5-MP4-Info
+.endif
+
+.if defined(WITH_MPLAYER)
+RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
+.endif
+
+.if defined(WITH_MUSEPACK)
+RUN_DEPENDS+=	mppenc:${PORTSDIR}/audio/musepack
+.endif
+
+.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)
+RUN_DEPENDS+=	oggenc:${PORTSDIR}/audio/vorbis-tools
+.endif
+
+.if defined(WITH_OGGTAG)
+RUN_DEPENDS+=	p5-Ogg-Vorbis-Header>0:${PORTSDIR}/audio/p5-Ogg-Vorbis-Header
+.endif
+
+.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)
+RUN_DEPENDS+=	sox:${PORTSDIR}/audio/sox
+.endif
+
+.if defined(WITH_SPEEX)
+RUN_DEPENDS+=	speexenc:${PORTSDIR}/audio/speex
+.endif
+
+.if defined(WITH_TOOLAME)
+RUN_DEPENDS+=	toolame:${PORTSDIR}/audio/toolame
+.endif
+
+.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
+PLIST_SUB+=	ADDITIONAL_LANGS=""
+.else
+PLIST_SUB+=	ADDITIONAL_LANGS="@comment "
+.endif
 
 post-extract:
-	@${GUNZIP_CMD} ${WRKSRC}/man/pacpl.1.gz
-	@cd ${WRKSRC}/kde/amarok/pacx && ${MV} pacx transcoding_pacx.pl
+
+	@${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} ""
+	@${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#${PREFIX}/etc#' ${WRKSRC}/pacpl
-	@${REINPLACE_CMD} -e 's|/dev/cdrom|/dev/acd0|;/NICE/!s|/usr/bin|${LOCALBASE}/bin|'\
-		${WRKSRC}/pacpl.conf
-.for _bin in ${PACPL_PATHS}
-	@${REINPLACE_CMD} -e '/^${_bin:C/:.*//:U} .*=/s|=.*|=${LOCALBASE}/bin/${_bin:C/.*://}|'\
-		${WRKSRC}/pacpl.conf
-.endfor
+	@${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 ${PREFIX}/bin/
-	@${INSTALL} -d ${PACPL_LNGS:S,^,${PREFIX}/etc/pacpl/lang/,}
-	@${INSTALL_DATA} ${PACPL_LNG_FILES:S,^,${WRKSRC}/lang/FR/,:S,$,.FR,} ${PREFIX}/etc/pacpl/lang/FR/
-	@${INSTALL_DATA} ${PACPL_LNG_FILES:S,^,${WRKSRC}/lang/PT/,:S,$,.PT,} ${PREFIX}/etc/pacpl/lang/PT/
-	@${INSTALL_DATA} ${WRKSRC}/pacpl.conf ${PREFIX}/etc/pacpl/
-	@${INSTALL_MAN} ${WRKSRC}/man/pacpl.1 ${MAN1PREFIX}/man/man1/
-	@${INSTALL} -d ${PREFIX}/${AMAROK_SCR_DIR}/
-	@${INSTALL} -d ${PREFIX}/${KONQ_MIME_DIR}/
-	@${INSTALL} -d ${PREFIX}/${KONQ_SVCM_DIR}/
-	@${INSTALL_DATA} ${AMAROK_SCR:S|^|${WRKSRC}/kde/amarok/pacx/|} \
-		${PREFIX}/${AMAROK_SCR_DIR}/
-	@${INSTALL_DATA} ${KONQ_MIME:S|^|${WRKSRC}/kde/konqueror/mimes/x-|:S|$|.desktop|} \
-		${PREFIX}/${KONQ_MIME_DIR}/
-	@${INSTALL_DATA} ${KONQ_SVCM:S|^|${WRKSRC}/kde/konqueror/|:S|$|.desktop|} \
-		${PREFIX}/${KONQ_SVCM_DIR}/
-	@${CHMOD} a+x ${PREFIX}/${AMAROK_SCR_DIR}/*pl
-	@${ECHO_CMD} "name = Pacx" > ${PREFIX}/${AMAROK_SCR_DIR}/transcoding_pacx.spec
-	@${ECHO_CMD} "type = transcode" >> ${PREFIX}/${AMAROK_SCR_DIR}/transcoding_pacx.spec
-
-.include <bsd.port.mk>
+	${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
+.endfor
+	@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
+.endif
+
+.if defined(WITH_AMAROK)
+	${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 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}
+.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://pacpl.sourceforge.net/ChangeLog.txt"
+	@${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>
diff --git a/audio/pacpl/distinfo b/audio/pacpl/distinfo
index a331f029fbf4..cf751d28e612 100644
--- a/audio/pacpl/distinfo
+++ b/audio/pacpl/distinfo
@@ -1,3 +1,3 @@
-MD5 (pacpl-3.3.2.tar.gz) = 43d5a25360b7ad8ec57f639fecf64633
-SHA256 (pacpl-3.3.2.tar.gz) = e15f819f1e0b9e620ffcbb5e1940e5f922b5dfb5d1ddaef1c9f4edab5fb0bdea
-SIZE (pacpl-3.3.2.tar.gz) = 126493
+MD5 (pacpl-4.0.3.tar.gz) = 8be8d23d69f99ac9cc1174d166347a44
+SHA256 (pacpl-4.0.3.tar.gz) = a92540102bf9b7d29cafaf5fc5fdbfc4058ea9a553a7ca3be5d37747dc8b06f4
+SIZE (pacpl-4.0.3.tar.gz) = 108043
diff --git a/audio/pacpl/files/patch-pacpl b/audio/pacpl/files/patch-pacpl
new file mode 100644
index 000000000000..b9a84870f154
--- /dev/null
+++ b/audio/pacpl/files/patch-pacpl
@@ -0,0 +1,101 @@
+--- 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 --git a/audio/pacpl/pkg-plist b/audio/pacpl/pkg-plist
index b8ccc12336fe..5ca50f3c5b55 100644
--- a/audio/pacpl/pkg-plist
+++ b/audio/pacpl/pkg-plist
@@ -1,8 +1,38 @@
-@dirrm    share/apps/amarok/scripts/transcoding_pacx
-@dirrmtry share/apps/amarok/scripts
-@dirrmtry share/apps/amarok
-@dirrmtry share/apps/konqueror/servicemenus
-@dirrmtry share/apps/konqueror
-@dirrmtry share/apps
-@dirrmtry share/mimelnk/audio
-@dirrmtry share/mimelnk
+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/pl.po
+%%ADDITIONAL_LANGS%%%%DATADIR%%/locale/pt.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
+%%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
+@dirrm %%DATADIR%%/locale
+@dirrm %%DATADIR%%
+@dirrmtry etc/pacpl/modules
+@dirrmtry etc/pacpl