5 files changed, 21 insertions, 40 deletions

diff --git a/audio/gnump3d/Makefile b/audio/gnump3d/Makefile
index c19072dac65a..67e52f229b22 100644
--- a/audio/gnump3d/Makefile
+++ b/audio/gnump3d/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnump3d
-PORTVERSION=	2.9.2
+PORTVERSION=	2.9.3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,7 +14,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A streaming server for MP3, Ogg Vorbis, and other streamable audio files
+COMMENT=	Streaming server for MP3, Ogg Vorbis and other streamable audio files
 
 RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame \
 		sox:${PORTSDIR}/audio/sox \
@@ -29,7 +29,6 @@ NO_BUILD=	yes
 MAN1=		gnump3d-index.1 gnump3d-top.1 gnump3d.1 gnump3d.conf.1
 
 CONFDIR=	${PREFIX}/etc/${PORTNAME}
-PERL_SITELIBDIR=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}
 
 .include <bsd.port.pre.mk>
 
@@ -39,24 +38,24 @@ IGNORE=	"You need at least perl 5.6.0. Do not use FreeBSD 4.x' system perl,\
 .endif
 
 post-patch:
-.for file in bin/gnump3d-index bin/gnump3d-top bin/gnump3d2 etc/gnump3d.conf \
+.for f in bin/gnump3d-index bin/gnump3d-top bin/gnump3d2 etc/gnump3d.conf \
 	man/gnump3d.conf.1
 	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g ; \
 		 s|%%LOCALBASE%%|${LOCALBASE}|g ; \
-		 s|%%PERL_SITELIBDIR%%|${PERL_SITELIBDIR}|g' ${WRKSRC}/${file}
+		 s|%%SITE_PERL%%|${SITE_PERL}|g' ${WRKSRC}/${f}
 .endfor
 
 do-install:
-.for file in gnump3d-index gnump3d-top gnump3d2
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/${file} ${PREFIX}/bin
+.for f in gnump3d-index gnump3d-top gnump3d2
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${PREFIX}/bin
 .endfor
 	${LN} -sf gnump3d2 ${PREFIX}/bin/gnump3d
-.for file in gnump3d-index.1 gnump3d-top.1 gnump3d.1 gnump3d.conf.1
-	${INSTALL_MAN} ${WRKSRC}/man/${file} ${MANPREFIX}/man/man1
+.for f in gnump3d-index.1 gnump3d-top.1 gnump3d.1 gnump3d.conf.1
+	${INSTALL_MAN} ${WRKSRC}/man/${f} ${MANPREFIX}/man/man1
 .endfor
-	${MKDIR} ${PERL_SITELIBDIR}
+	${MKDIR} ${SITE_PERL}
 	cd ${WRKSRC}/lib && ${FIND} . ! -empty | \
-		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PERL_SITELIBDIR}
+		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${SITE_PERL}
 	${MKDIR} ${DATADIR}
 	cd ${WRKSRC}/templates && ${FIND} . ! -empty | \
 		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
diff --git a/audio/gnump3d/distinfo b/audio/gnump3d/distinfo
index 1c20c541c194..5a2aaf179bd9 100644
--- a/audio/gnump3d/distinfo
+++ b/audio/gnump3d/distinfo
@@ -1,4 +1,4 @@
-MD5 (gnump3d-2.9.2.tar.bz2) = 59da4596bc254d565d0477c3699b9988
-SIZE (gnump3d-2.9.2.tar.bz2) = 576690
-MD5 (gnump3d-2.9.2.tar.bz2.sig) = 23c570358f094843586e6cf492a340e4
-SIZE (gnump3d-2.9.2.tar.bz2.sig) = 65
+MD5 (gnump3d-2.9.3.tar.bz2) = 17af7b93a5753e03155ce852e8099159
+SIZE (gnump3d-2.9.3.tar.bz2) = 591926
+MD5 (gnump3d-2.9.3.tar.bz2.sig) = 7f8ec336d05c5493ab71efdfbc3a200e
+SIZE (gnump3d-2.9.3.tar.bz2.sig) = 65
diff --git a/audio/gnump3d/files/patch-bin::gnump3d2 b/audio/gnump3d/files/patch-bin::gnump3d2
index 78fe86b7c697..aa90cb517a75 100644
--- a/audio/gnump3d/files/patch-bin::gnump3d2
+++ b/audio/gnump3d/files/patch-bin::gnump3d2
@@ -20,7 +20,7 @@
 -  $theme_dir     = getConfig( "theme_directory", "/usr/share/gnump3d" );
 -  $plugin_dir    = getConfig( "plugin_directory",  "/usr/lib/perl5/gnump3d/plugins" );
 +  $theme_dir     = getConfig( "theme_directory", "%%PREFIX%%/share/gnump3d" );
-+  $plugin_dir    = getConfig( "plugin_directory",  "%%PERL_SITELIBDIR%%/gnump3d/plugins" );
++  $plugin_dir    = getConfig( "plugin_directory",  "%%SITE_PERL%%/gnump3d/plugins" );
    $always_stream = getConfig( "always_stream", 1 );
    $access_log    = getConfig( "logfile", "/var/log/gnump3d/access.log" );
    $error_log     = getConfig( "errorlog", "/var/log/gnump3d/error.log" );
diff --git a/audio/gnump3d/files/patch-etc::gnump3d.conf b/audio/gnump3d/files/patch-etc::gnump3d.conf
index 71ae775c174e..249e1a505d5b 100644
--- a/audio/gnump3d/files/patch-etc::gnump3d.conf
+++ b/audio/gnump3d/files/patch-etc::gnump3d.conf
@@ -45,7 +45,7 @@
  # a bug.
  #
 -plugin_directory = PLUGINDIR/gnump3d/plugins
-+plugin_directory = %%PERL_SITELIBDIR%%/gnump3d/plugins
++plugin_directory = %%SITE_PERL%%/gnump3d/plugins
  #
  
  
diff --git a/audio/gnump3d/pkg-plist b/audio/gnump3d/pkg-plist
index da5f69e1fe69..e54383386a84 100644
--- a/audio/gnump3d/pkg-plist
+++ b/audio/gnump3d/pkg-plist
@@ -9,13 +9,16 @@ etc/gnump3d/gnump3d.conf-default
 etc/gnump3d/mime.types
 %%SITE_PERL%%/gnump3d/IP.pm
 %%SITE_PERL%%/gnump3d/MD5.pm
+%%SITE_PERL%%/gnump3d/WMA.pm
 %%SITE_PERL%%/gnump3d/base64.pm
 %%SITE_PERL%%/gnump3d/config.pm
 %%SITE_PERL%%/gnump3d/files.pm
 %%SITE_PERL%%/gnump3d/lang/de.pm
 %%SITE_PERL%%/gnump3d/lang/en.pm
+%%SITE_PERL%%/gnump3d/lang/fr.pm
 %%SITE_PERL%%/gnump3d/lang/lookup.pm
 %%SITE_PERL%%/gnump3d/mp3info.pm
+%%SITE_PERL%%/gnump3d/mp4info.pm
 %%SITE_PERL%%/gnump3d/ogginfo.pm
 %%SITE_PERL%%/gnump3d/oggtagreader.pm
 %%SITE_PERL%%/gnump3d/plugins/COPYING.pm
@@ -30,6 +33,7 @@ etc/gnump3d/mime.types
 %%SITE_PERL%%/gnump3d/plugins/size.pm
 %%SITE_PERL%%/gnump3d/plugins/stats.pm
 %%SITE_PERL%%/gnump3d/plugins/tagbrowse.pm
+%%SITE_PERL%%/gnump3d/readtags.pm
 %%SITE_PERL%%/gnump3d/sorting.pm
 %%SITE_PERL%%/gnump3d/tagcache.pm
 %%SITE_PERL%%/gnump3d/url.pm
@@ -70,28 +74,6 @@ etc/gnump3d/mime.types
 %%DATADIR%%/LaFrere/size.html
 %%DATADIR%%/LaFrere/stats.html
 %%DATADIR%%/LaFrere/tagbrowse.html
-%%DATADIR%%/Musicus/AUTHOR
-%%DATADIR%%/Musicus/COPYING.html
-%%DATADIR%%/Musicus/bug.html
-%%DATADIR%%/Musicus/config.ini
-%%DATADIR%%/Musicus/error.html
-%%DATADIR%%/Musicus/extras.html
-%%DATADIR%%/Musicus/footer.tmpl
-%%DATADIR%%/Musicus/index.html
-%%DATADIR%%/Musicus/info.html
-%%DATADIR%%/Musicus/now.html
-%%DATADIR%%/Musicus/playlist.html
-%%DATADIR%%/Musicus/prefs.html
-%%DATADIR%%/Musicus/random.html
-%%DATADIR%%/Musicus/recent.html
-%%DATADIR%%/Musicus/results.html
-%%DATADIR%%/Musicus/search.html
-%%DATADIR%%/Musicus/size.html
-%%DATADIR%%/Musicus/statistics.html
-%%DATADIR%%/Musicus/stats.html
-%%DATADIR%%/Musicus/style.css
-%%DATADIR%%/Musicus/tagbrowse.html
-%%DATADIR%%/Musicus/template.ini
 %%DATADIR%%/Nomad/COPYING.html
 %%DATADIR%%/Nomad/ClubNomadLogo.gif
 %%DATADIR%%/Nomad/GNUMP3dLogo.jpg
@@ -241,6 +223,7 @@ etc/gnump3d/mime.types
 %%DATADIR%%/dotNET/style.css
 %%DATADIR%%/handheld/AUTHOR
 %%DATADIR%%/handheld/config.ini
+%%DATADIR%%/handheld/error.html
 %%DATADIR%%/handheld/index.html
 %%DATADIR%%/handheld/random.html
 %%DATADIR%%/handheld/results.html
@@ -288,7 +271,6 @@ etc/gnump3d/mime.types
 @dirrm %%DATADIR%%/Tabular
 @dirrm %%DATADIR%%/SchwartzNGrau
 @dirrm %%DATADIR%%/Nomad
-@dirrm %%DATADIR%%/Musicus
 @dirrm %%DATADIR%%/LaFrere
 @dirrm %%DATADIR%%/Clean
 @dirrm %%DATADIR%%