- Update to 3.3.0

3 files changed, 15 insertions, 219 deletions

diff --git a/audio/pacpl/Makefile b/audio/pacpl/Makefile
index cc9701222485..1d3f15f74d98 100644
--- a/audio/pacpl/Makefile
+++ b/audio/pacpl/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	pacpl
-PORTVERSION=	3.2.5
-PORTREVISION=	1
+PORTVERSION=	3.3.0
 CATEGORIES=	audio
 MASTER_SITES=	SFE
 
@@ -45,7 +44,9 @@ ONLY_FOR_ARCHS=	i386 amd64
 NO_BUILD=	yes
 PACPL_LNG_FILES=	help long_help rip_help tag_help video_help
 PACPL_LNGS=	FR PT
-AMAROK_SCR=	README transcoding_pacx.pl
+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 shn tta wavpack
 KONQ_SVCM=	${PORTNAME}
@@ -63,12 +64,16 @@ MAN1=		pacpl.1
 
 post-extract:
 	@${GUNZIP_CMD} ${WRKSRC}/man/pacpl.1.gz
-	@cd ${WRKSRC}/kde/amarok && ${TAR} xf pacx.amarokscript.tar.gz
-	@cd ${WRKSRC}/kde/amarok/pacx.amarokscript && ${MV} pacx.pl transcoding_pacx.pl
+	@cd ${WRKSRC}/kde/amarok/pacx && ${MV} pacx transcoding_pacx.pl
 
 post-patch:
 	@${REINPLACE_CMD} -e 's#/etc#${PREFIX}/etc#' ${WRKSRC}/pacpl
-	@${REINPLACE_CMD} -e 's#%%LOCALBASE%%#${LOCALBASE}#' ${WRKSRC}/pacpl.conf
+	@${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
 
 do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/pacpl ${PREFIX}/bin/
@@ -80,7 +85,7 @@ do-install:
 	@${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.amarokscript/|} \
+	@${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}/
diff --git a/audio/pacpl/distinfo b/audio/pacpl/distinfo
index 41dee4f6f8b4..f1e9a0557255 100644
--- a/audio/pacpl/distinfo
+++ b/audio/pacpl/distinfo
@@ -1,3 +1,3 @@
-MD5 (pacpl-3.2.5.tar.gz) = 99a01e373875639c44c2bcc4ef748449
-SHA256 (pacpl-3.2.5.tar.gz) = 8e2b3258ddcaa37513890fbbf963d4f767b44c2020eb57b6f7466972149d3eb7
-SIZE (pacpl-3.2.5.tar.gz) = 118612
+MD5 (pacpl-3.3.0.tar.gz) = b127407d00f8d3d34d996799fbbfae03
+SHA256 (pacpl-3.3.0.tar.gz) = 8bff65308c10ffe4cf9fdf82df5ad3e317d06274a6f4ad9692bb1f4838dd0d78
+SIZE (pacpl-3.3.0.tar.gz) = 120365
diff --git a/audio/pacpl/files/patch-pac.conf b/audio/pacpl/files/patch-pac.conf
deleted file mode 100644
index 751c8ae3be5c..000000000000
--- a/audio/pacpl/files/patch-pac.conf
+++ /dev/null
@@ -1,209 +0,0 @@
---- ./pacpl.conf.orig	Sat Nov  4 01:13:57 2006
-+++ ./pacpl.conf	Sat Nov  4 01:49:03 2006
-@@ -18,117 +18,117 @@
- 
- # LAME
- ###########################
--LAME =
-+LAME = %%LOCALBASE%%/bin/lame
- 
- 
- # Ogg Vorbis Encoder
- #############################
--OGGENC =
-+OGGENC = %%LOCALBASE%%/bin/oggenc
- 
- 
- # Ogg Vorbis Decoder
- #############################
--OGGDEC =
-+OGGDEC = %%LOCALBASE%%/bin/oggdec
- 
- 
- # Flac Encoder & Decoder
- ###########################
--FLAC =
-+FLAC = %%LOCALBASE%%/bin/flac
- 
- 
- # Monkey Audio (APE) Encoder/Decoder
- ####################################
--MAC =
-+MAC = %%LOCALBASE%%/bin/mac
- 
- 
- #Shorten (SHN) Encoder/Decoder
- ##############################
--SHORTEN =
-+SHORTEN = %%LOCALBASE%%/bin/shorten
- 
- 
- # (AAC/MP4/M4A) Encoder
- ###########################
--FAAC =
-+FAAC = %%LOCALBASE%%/bin/faac
- 
-  
- # (AAC/MP4/M4A) Decoder
- ###########################
--FAAD =
-+FAAD = %%LOCALBASE%%/bin/faad
- 
- 
- # Multi-Decoder
- ###############################
--MPLAYER =
-+MPLAYER = %%LOCALBASE%%/bin/mplayer
- 
- 
- # Musepack Encoder
- #############################
--MPPENC =
-+MPPENC = %%LOCALBASE%%/bin/mppenc
- 
- 
- # Musepack Decoder
- #############################
--MPPDEC =
-+MPPDEC = %%LOCALBASE%%/bin/mppdec
- 
- 
- # Wavpack Encoder
- ##############################
--WAVPACK =
-+WAVPACK = %%LOCALBASE%%/bin/wavpack
- 
- 
- # Wavpack Decoder
- ###############################
--WVUNPACK =
-+WVUNPACK = %%LOCALBASE%%/bin/wvunpack
- 
- 
- # OptimFrog (OFR) Encoder/Decoder
- #################################
--OFR =
-+OFR = %%LOCALBASE%%/bin/ofr
- 
- 
- # OptimFrog (OFS) Encoder/Decoder
- #################################
--OFS =
-+OFS = %%LOCALBASE%%/bin/ofs
- 
- 
- # TTA Encoder/Decoder
- #############################
--TTAENC =
-+TTAENC = %%LOCALBASE%%/bin/ttaenc
- 
- 
- # LPAC Encoder/Decoder
- ###########################
--LPAC =
-+LPAC = %%LOCALBASE%%/bin/lpac
- 
- 
- # SOX (SOund eXchange)
- ##########################
--SOX =
-+SOX = %%LOCALBASE%%/bin/sox
- 
- 
- # FFmpeg
- #############################
--FFMPEG =
-+FFMPEG = %%LOCALBASE%%/bin/ffmpeg
- 
- 
- # Lossless Audio (LA)
- #########################
--LA =
-+LA = %%LOCALBASE%%/bin/laudio
- 
- 
- # BONK
- ##########################
--BONK =
-+BONK = %%LOCALBASE%%/bin/bonk
- 
- 
- # CD Reader/Ripper 
- #################################
--CDPARANOIA =
-+CDPARANOIA = %%LOCALBASE%%/bin/cdparanoia
- 
- 
- # CDROM Device
- #########################
--CDROM      =  /dev/cdrom
-+CDROM      =  /dev/acd0
- 
- 
- #########################
-@@ -149,47 +149,47 @@
- 
- # MP3 Player
- ##############################
--MP3PLAYER  =   /usr/bin/mpg123
-+MP3PLAYER  =   %%LOCALBASE%%/bin/mpg123
- 
- 
- # Ogg Vorbis Player
- ##############################
--OGGPLAYER  =   /usr/bin/ogg123
-+OGGPLAYER  =   %%LOCALBASE%%/bin/ogg123
- 
- 
- # FLAC Player
- ###############################
--FLACPLAYER =   /usr/bin/mplayer
-+FLACPLAYER =   %%LOCALBASE%%/bin/mplayer
- 
- 
- # MP4 Player
- ###############################
--MP4PLAYER  =   /usr/bin/mplayer
-+MP4PLAYER  =   %%LOCALBASE%%/bin/mplayer
- 
- 
- # Musepack (MPC) Player
- ##############################
--MPCPLAYER  =   /usr/bin/mppdec
-+MPCPLAYER  =   %%LOCALBASE%%/bin/mppdec
- 
- 
- # BONK Player
- ############################
--BNKPLAYER  =   /usr/bin/bonk
-+BNKPLAYER  =   %%LOCALBASE%%/bin/bonk
- 
- 
- # WAV Player
- ############################
--WAVPLAYER  =   /usr/bin/play
-+WAVPLAYER  =   %%LOCALBASE%%/bin/play
- 
- 
- # WMA Player
- ###############################
--WMAPLAYER  =   /usr/bin/mplayer
-+WMAPLAYER  =   %%LOCALBASE%%/bin/mplayer
- 
- 
- # RealAudio (RA) Player
- ###############################
--RAPLAYER   =   /usr/bin/mplayer
-+RAPLAYER   =   %%LOCALBASE%%/bin/mplayer
- 
- 
- 
-@@ -395,7 +395,7 @@
- 
- # Path to kdialog binary 
- #
--KDIALOG =
-+KDIALOG   =    %%LOCALBASE%%/bin/kdialog
- 
- # Notify file converstion start/end & other various messages
- #