6 files changed, 66 insertions, 59 deletions

diff --git a/audio/gnump3d/Makefile b/audio/gnump3d/Makefile
index 9b507b8914ce..ba0f8ff3b3ec 100644
--- a/audio/gnump3d/Makefile
+++ b/audio/gnump3d/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	gnump3d
-PORTVERSION=	2.6
-PORTREVISION=	1
+PORTVERSION=	2.7
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/audio/gnump3d/distinfo b/audio/gnump3d/distinfo
index 108c99125a25..d46d153d23c0 100644
--- a/audio/gnump3d/distinfo
+++ b/audio/gnump3d/distinfo
@@ -1,4 +1,4 @@
-MD5 (gnump3d-2.6.tar.bz2) = 30c361ca60c4f01a81dc5b86fd949e6f
-SIZE (gnump3d-2.6.tar.bz2) = 190567
-MD5 (gnump3d-2.6.tar.bz2.asc) = 0fd3a6e0782e48496ddd60fca8af6450
-SIZE (gnump3d-2.6.tar.bz2.asc) = 189
+MD5 (gnump3d-2.7.tar.bz2) = 56c2feb0e97f31722dceaaa16e1a1f81
+SIZE (gnump3d-2.7.tar.bz2) = 212021
+MD5 (gnump3d-2.7.tar.bz2.sig) = ae49a362f942dd066134dd739b7a268a
+SIZE (gnump3d-2.7.tar.bz2.sig) = 65
diff --git a/audio/gnump3d/files/patch-bin::gnump3d-index b/audio/gnump3d/files/patch-bin::gnump3d-index
index 420082ca117b..d98ce62bc3e7 100644
--- a/audio/gnump3d/files/patch-bin::gnump3d-index
+++ b/audio/gnump3d/files/patch-bin::gnump3d-index
@@ -1,12 +1,6 @@
---- bin/gnump3d-index.orig	Thu Jul  3 05:44:16 2003
-+++ bin/gnump3d-index	Tue Aug 19 17:34:25 2003
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w -- -*- cperl -*-
-+#!/usr/bin/perl -w # -*- cperl -*- #
- #
- #  gnump3d-index - Create a database of all tag information for audio files.
- #
-@@ -54,9 +54,9 @@
+--- bin/gnump3d-index.orig	Fri Mar 26 03:49:02 2004
++++ bin/gnump3d-index	Fri Mar 26 12:54:24 2004
+@@ -68,9 +68,9 @@
  {
      $CONFIG_FILE = $ENV{"HOME"} . "/.gnump3drc";
  }
diff --git a/audio/gnump3d/files/patch-bin::gnump3d2 b/audio/gnump3d/files/patch-bin::gnump3d2
index 39e85ead990a..78fe86b7c697 100644
--- a/audio/gnump3d/files/patch-bin::gnump3d2
+++ b/audio/gnump3d/files/patch-bin::gnump3d2
@@ -1,18 +1,19 @@
---- bin/gnump3d2.orig	Fri Jul  4 10:20:24 2003
-+++ bin/gnump3d2	Fri Jul  4 10:23:13 2003
-@@ -2620,9 +2620,9 @@
-   {
-       $CONFIG_FILE = $ENV{"HOME"} . "/.gnump3drc";
+--- bin/gnump3d2.orig	Fri Mar 26 03:49:02 2004
++++ bin/gnump3d2	Fri Mar 26 12:57:38 2004
+@@ -3052,10 +3052,10 @@
+       # This is mainly here for Windows users.
+       $CONFIG_FILE = "gnump3d.conf";
    }
 -  elsif ( -e "/etc/gnump3d/gnump3d.conf" )
 +  elsif ( -e "%%PREFIX%%/etc/gnump3d/gnump3d.conf" )
    {
+       # None of the others are present, use the system wide one.
 -      $CONFIG_FILE = "/etc/gnump3d/gnump3d.conf";
 +      $CONFIG_FILE = "%%PREFIX%%/etc/gnump3d/gnump3d.conf";
    }
-   elsif ( -e "gnump3d.conf" )
-   {
-@@ -2764,8 +2764,8 @@
+ 
+ 
+@@ -3183,8 +3183,8 @@
    $PORT          = getConfig( "port", 8888 );
    $bind_address  = getConfig( "binding_host", "" );
    $host          = getConfig( "hostname", "localhost" );
@@ -23,7 +24,7 @@
    $always_stream = getConfig( "always_stream", 1 );
    $access_log    = getConfig( "logfile", "/var/log/gnump3d/access.log" );
    $error_log     = getConfig( "errorlog", "/var/log/gnump3d/error.log" );
-@@ -2773,11 +2773,11 @@
+@@ -3192,11 +3192,11 @@
    $client_host   = getConfig( "use_client_host", 1 );
    $default_theme = getConfig( "theme", "default" );
    $TIMEOUT       = getConfig( "read_time", 10 );
@@ -36,14 +37,14 @@
 -  $mime_file     = getConfig( "mime_file",  "/etc/gnump3d/mime.types" );
 +  $mime_file     = getConfig( "mime_file",  "%%PREFIX%%/etc/gnump3d/mime.types" );
    $enable_browse = getConfig( "enable_browsing", 1 );
-   $sort_order    = getConfig( "sort_order", '$SONGNAME' );
+   $sort_order    = getConfig( "sort_order", '$FILENAME' );
  
-@@ -2813,7 +2813,7 @@
+@@ -3238,7 +3238,7 @@
    # Experimental features.
    #
    $jukebox        = getConfig( "jukebox_mode", 0 );
 -  $jukebox_binary = getConfig( "jukebox_player", "/usr/bin/mpg123" );
-+  $jukebox_binary = getConfig( "jukebox_player", "%%PREFIX%%/bin/mpg123" );
++  $jukebox_binary = getConfig( "jukebox_player", "%%LOCALBASE%%/bin/mpg123" );
    if ( $jukebox )
    {
       $always_stream = 0;
diff --git a/audio/gnump3d/files/patch-etc::gnump3d.conf b/audio/gnump3d/files/patch-etc::gnump3d.conf
index 604f614b3e3c..ff208ecf8543 100644
--- a/audio/gnump3d/files/patch-etc::gnump3d.conf
+++ b/audio/gnump3d/files/patch-etc::gnump3d.conf
@@ -1,6 +1,6 @@
---- etc/gnump3d.conf.orig	Thu Oct 16 22:36:29 2003
-+++ etc/gnump3d.conf	Thu Oct 16 22:42:34 2003
-@@ -173,7 +173,7 @@
+--- etc/gnump3d.conf.orig	Fri Mar 26 03:49:02 2004
++++ etc/gnump3d.conf	Fri Mar 26 12:59:14 2004
+@@ -184,7 +184,7 @@
  # path if you don't have it installed upon the $PATH of the user
  # who starts the server:
  #
@@ -9,7 +9,7 @@
  #
  #
  #  For example you may change the default number of lines which are
-@@ -424,7 +424,7 @@
+@@ -435,7 +435,7 @@
  # the URL   http://server.host.name:port/stats/, and reads in a template
  # called 'stats.html'
  #
@@ -18,16 +18,16 @@
  # changed via the 'theme_directory' setting given below.
  #
  #  When the server is running you may set the theme from your browser
-@@ -451,7 +451,7 @@
+@@ -462,7 +462,7 @@
  # location.
  #
  ##
--# theme_directory = /usr/share/gnump3d/
-+# theme_directory = %%PREFIX%%/share/gnump3d/
+-theme_directory = /usr/share/gnump3d/
++theme_directory = %%PREFIX%%/share/gnump3d/
  ##
  
  
-@@ -613,9 +613,9 @@
+@@ -635,9 +635,9 @@
  # the string '$FILENAME' will be replaced by the file the user is
  # requesting.
  #
@@ -40,7 +40,7 @@
  #
  #downsample_high_ogg   = sox -t ogg $FILENAME -t raw - | oggenc --raw --downmix -b 96 -
  #downsample_medium_ogg = sox -t ogg $FILENAME -t raw - | oggenc --raw --downmix -b 64 -
-@@ -655,7 +655,7 @@
+@@ -677,7 +677,7 @@
  # the installation script - if this doesn't happen report this as
  # a bug.
  #
@@ -49,7 +49,7 @@
  #
  
  
-@@ -750,7 +750,7 @@
+@@ -772,7 +772,7 @@
  #
  #  Normally you shouldn't need to touch this.
  #
@@ -58,7 +58,7 @@
  
  
  #
-@@ -827,7 +827,7 @@
+@@ -849,7 +849,7 @@
  ##
  #
  #  jukebox_mode   = 1
diff --git a/audio/gnump3d/pkg-plist b/audio/gnump3d/pkg-plist
index 9a2036e2e9fe..c102cb26dde8 100644
--- a/audio/gnump3d/pkg-plist
+++ b/audio/gnump3d/pkg-plist
@@ -8,15 +8,16 @@ etc/gnump3d/gnump3d.conf-default
 @exec [ -f %B/gnump3d.conf ] || cp %B/%f %B/gnump3d.conf
 etc/gnump3d/mime.types
 %%SITE_PERL%%/gnump3d/IP.pm
+%%SITE_PERL%%/gnump3d/MD5.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/lookup.pm
 %%SITE_PERL%%/gnump3d/mp3info.pm
 %%SITE_PERL%%/gnump3d/ogginfo.pm
 %%SITE_PERL%%/gnump3d/oggtagreader.pm
-%%SITE_PERL%%/gnump3d/lang/en.pm
-%%SITE_PERL%%/gnump3d/lang/lookup.pm
-%%SITE_PERL%%/gnump3d/playlist.pm
 %%SITE_PERL%%/gnump3d/plugins/COPYING.pm
 %%SITE_PERL%%/gnump3d/plugins/bug.pm
 %%SITE_PERL%%/gnump3d/plugins/info.pm
@@ -28,6 +29,8 @@ etc/gnump3d/mime.types
 %%SITE_PERL%%/gnump3d/plugins/search.pm
 %%SITE_PERL%%/gnump3d/plugins/size.pm
 %%SITE_PERL%%/gnump3d/plugins/stats.pm
+%%SITE_PERL%%/gnump3d/plugins/tagbrowse.pm
+%%SITE_PERL%%/gnump3d/sorting.pm
 %%SITE_PERL%%/gnump3d/tagcache.pm
 %%SITE_PERL%%/gnump3d/url.pm
 %%DATADIR%%/Clean/AUTHOR
@@ -48,6 +51,7 @@ etc/gnump3d/mime.types
 %%DATADIR%%/Clean/search.html
 %%DATADIR%%/Clean/size.html
 %%DATADIR%%/Clean/stats.html
+%%DATADIR%%/Clean/tagbrowse.html
 %%DATADIR%%/LaFrere/AUTHOR
 %%DATADIR%%/LaFrere/COPYING.html
 %%DATADIR%%/LaFrere/bug.html
@@ -65,7 +69,27 @@ etc/gnump3d/mime.types
 %%DATADIR%%/LaFrere/search.html
 %%DATADIR%%/LaFrere/size.html
 %%DATADIR%%/LaFrere/stats.html
+%%DATADIR%%/LaFrere/tagbrowse.html
 %%DATADIR%%/README
+%%DATADIR%%/SchwartzNGrau/AUTHOR
+%%DATADIR%%/SchwartzNGrau/COPYING.html
+%%DATADIR%%/SchwartzNGrau/bug.html
+%%DATADIR%%/SchwartzNGrau/clear.gif
+%%DATADIR%%/SchwartzNGrau/config.ini
+%%DATADIR%%/SchwartzNGrau/error.html
+%%DATADIR%%/SchwartzNGrau/index.html
+%%DATADIR%%/SchwartzNGrau/info.html
+%%DATADIR%%/SchwartzNGrau/master.css
+%%DATADIR%%/SchwartzNGrau/now.html
+%%DATADIR%%/SchwartzNGrau/playlist.html
+%%DATADIR%%/SchwartzNGrau/prefs.html
+%%DATADIR%%/SchwartzNGrau/random.html
+%%DATADIR%%/SchwartzNGrau/recent.html
+%%DATADIR%%/SchwartzNGrau/results.html
+%%DATADIR%%/SchwartzNGrau/search.html
+%%DATADIR%%/SchwartzNGrau/size.html
+%%DATADIR%%/SchwartzNGrau/stats.html
+%%DATADIR%%/SchwartzNGrau/tagbrowse.html
 %%DATADIR%%/Tabular/AUTHOR
 %%DATADIR%%/Tabular/COPYING.html
 %%DATADIR%%/Tabular/bug.html
@@ -73,7 +97,6 @@ etc/gnump3d/mime.types
 %%DATADIR%%/Tabular/error.html
 %%DATADIR%%/Tabular/extras.html
 %%DATADIR%%/Tabular/footer.tmpl
-%%DATADIR%%/Tabular/header.tmpl
 %%DATADIR%%/Tabular/index.html
 %%DATADIR%%/Tabular/info.html
 %%DATADIR%%/Tabular/now.html
@@ -87,6 +110,7 @@ etc/gnump3d/mime.types
 %%DATADIR%%/Tabular/statistics.html
 %%DATADIR%%/Tabular/stats.html
 %%DATADIR%%/Tabular/style.css
+%%DATADIR%%/Tabular/tagbrowse.html
 %%DATADIR%%/Tabular/template.ini
 %%DATADIR%%/Thexder/AUTHOR
 %%DATADIR%%/Thexder/COPYING.html
@@ -123,6 +147,7 @@ etc/gnump3d/mime.types
 %%DATADIR%%/default/AUTHOR
 %%DATADIR%%/default/COPYING.html
 %%DATADIR%%/default/bug.html
+%%DATADIR%%/default/config.ini
 %%DATADIR%%/default/error.html
 %%DATADIR%%/default/footer.tmpl
 %%DATADIR%%/default/header.tmpl
@@ -138,6 +163,7 @@ etc/gnump3d/mime.types
 %%DATADIR%%/default/size.html
 %%DATADIR%%/default/stats.html
 %%DATADIR%%/default/style.css
+%%DATADIR%%/default/tagbrowse.html
 %%DATADIR%%/dotNET/AUTHOR
 %%DATADIR%%/dotNET/COPYING.html
 %%DATADIR%%/dotNET/bug.html
@@ -188,6 +214,7 @@ etc/gnump3d/mime.types
 %%DATADIR%%/redgrey/COPYING.html
 %%DATADIR%%/redgrey/bug.html
 %%DATADIR%%/redgrey/error.html
+%%DATADIR%%/redgrey/header.tmpl
 %%DATADIR%%/redgrey/index.html
 %%DATADIR%%/redgrey/info.html
 %%DATADIR%%/redgrey/now.html
@@ -198,22 +225,7 @@ etc/gnump3d/mime.types
 %%DATADIR%%/redgrey/results.html
 %%DATADIR%%/redgrey/search.html
 %%DATADIR%%/redgrey/stats.html
-%%DATADIR%%/simple/AUTHOR
-%%DATADIR%%/simple/COPYING.html
-%%DATADIR%%/simple/bug.html
-%%DATADIR%%/simple/config.ini
-%%DATADIR%%/simple/error.html
-%%DATADIR%%/simple/index.html
-%%DATADIR%%/simple/info.html
-%%DATADIR%%/simple/now.html
-%%DATADIR%%/simple/playlist.html
-%%DATADIR%%/simple/prefs.html
-%%DATADIR%%/simple/random.html
-%%DATADIR%%/simple/recent.html
-%%DATADIR%%/simple/results.html
-%%DATADIR%%/simple/search.html
-%%DATADIR%%/simple/stats.html
-@dirrm %%DATADIR%%/simple
+%%DATADIR%%/redgrey/tagbrowse.html
 @dirrm %%DATADIR%%/redgrey
 @dirrm %%DATADIR%%/nausicaa
 @dirrm %%DATADIR%%/dotNET/images
@@ -221,6 +233,7 @@ etc/gnump3d/mime.types
 @dirrm %%DATADIR%%/default
 @dirrm %%DATADIR%%/Thexder
 @dirrm %%DATADIR%%/Tabular
+@dirrm %%DATADIR%%/SchwartzNGrau
 @dirrm %%DATADIR%%/LaFrere
 @dirrm %%DATADIR%%/Clean
 @dirrm %%DATADIR%%