5 files changed, 63 insertions, 59 deletions

diff --git a/audio/gnump3d/Makefile b/audio/gnump3d/Makefile
index 987a359d646b..380ce467f1e2 100644
--- a/audio/gnump3d/Makefile
+++ b/audio/gnump3d/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gnump3d
-PORTVERSION=	2.2
+PORTVERSION=	2.3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/gnump3d/distinfo b/audio/gnump3d/distinfo
index 622469f0eed1..ef1fe18ca59f 100644
--- a/audio/gnump3d/distinfo
+++ b/audio/gnump3d/distinfo
@@ -1 +1 @@
-MD5 (gnump3d-2.2.tar.bz2) = fc3d6b4ad2d3ebf14c29536c8cc6a514
+MD5 (gnump3d-2.3.tar.bz2) = 35f795d8ad2b5c1164456330ac52fa21
diff --git a/audio/gnump3d/files/patch-bin::gnump3d2 b/audio/gnump3d/files/patch-bin::gnump3d2
index d28147978582..70874726ecfe 100644
--- a/audio/gnump3d/files/patch-bin::gnump3d2
+++ b/audio/gnump3d/files/patch-bin::gnump3d2
@@ -1,6 +1,6 @@
---- bin/gnump3d2.orig	Tue Feb  4 18:25:13 2003
-+++ bin/gnump3d2	Mon Feb 10 09:22:35 2003
-@@ -2397,9 +2397,9 @@
+--- bin/gnump3d2.orig	Tue Apr 29 06:18:15 2003
++++ bin/gnump3d2	Tue Apr 29 06:21:39 2003
+@@ -2234,9 +2234,9 @@
    {
        $CONFIG_FILE = $ENV{"HOME"} . "/.gnump3drc";
    }
@@ -12,28 +12,28 @@
    }
    elsif ( -e "gnump3d.conf" )
    {
-@@ -2534,8 +2534,8 @@
-   $PORT          = getConfig( "port" )            || 8888;
-   $bind_address  = getConfig( "binding_host" )    || "";
-   $host          = getConfig( "hostname" )        || "localhost";
--  $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";
-   $always_stream = getConfig( "always_stream" )   || 1;
-   $access_log    = getConfig( "logfile" )         || "/var/log/gnump3d/access.log";
-   $error_log     = getConfig( "errorlog" )        || "/var/log/gnump3d/error.log";
-@@ -2543,11 +2543,11 @@
-   $client_host   = getConfig( "use_client_host" ) || 1;
-   $default_theme = getConfig( "theme" )           || "default";
-   $TIMEOUT       = getConfig( "read_time" )       || 10;
--  $STATSPROG     = getConfig( "stats_program" )   || "/usr/bin/gnump3d-top";
-+  $STATSPROG     = getConfig( "stats_program" )   || "%%PREFIX%%/bin/gnump3d-top";
-   $STATSARGS     = getConfig( "stats_args" )      || "--count=40";
-   $play_all      = getConfig( "play_all_text" )   || "Play All";
-   $play_rec      = getConfig( "play_recursively_text" ) || "Play Recursively";
--  $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';
+@@ -2371,8 +2371,8 @@
+   $PORT          = getConfig( "port", 8888 );
+   $bind_address  = getConfig( "binding_host", "" );
+   $host          = getConfig( "hostname", "localhost" );
+-  $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" );
+   $always_stream = getConfig( "always_stream", 1 );
+   $access_log    = getConfig( "logfile", "/var/log/gnump3d/access.log" );
+   $error_log     = getConfig( "errorlog", "/var/log/gnump3d/error.log" );
+@@ -2380,11 +2380,11 @@
+   $client_host   = getConfig( "use_client_host", 1 );
+   $default_theme = getConfig( "theme", "default" );
+   $TIMEOUT       = getConfig( "read_time", 10 );
+-  $STATSPROG     = getConfig( "stats_program", "/usr/bin/gnump3d-top" );
++  $STATSPROG     = getConfig( "stats_program", "%%PREFIX%%/bin/gnump3d-top" );
+   $STATSARGS     = getConfig( "stats_arguments", "" );
+   $play_all      = getConfig( "play_all_text", "Play All" );
+   $play_rec      = getConfig( "play_recursively_text",  "Play Recursively" );
+-  $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' );
  
diff --git a/audio/gnump3d/files/patch-etc::gnump3d.conf b/audio/gnump3d/files/patch-etc::gnump3d.conf
index 14c4364b744d..dbc2b602ba1f 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	Tue Feb  4 18:25:13 2003
-+++ etc/gnump3d.conf	Mon Feb 10 09:08:29 2003
-@@ -145,7 +145,7 @@
+--- etc/gnump3d.conf.orig	Tue Apr 29 06:18:15 2003
++++ etc/gnump3d.conf	Tue Apr 29 06:26:17 2003
+@@ -163,7 +163,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
-@@ -359,13 +359,13 @@
+@@ -382,13 +382,13 @@
  # theme variable below you specify which set of templates you wish
  # the server to use.
  #
@@ -19,55 +19,53 @@
  #
 -#  eg. To use the templates in '/usr/share/gnump3d/simple/' then you
 +#  eg. To use the templates in '%%PREFIX%%/share/gnump3d/simple/' then you
- #      should set 'theme=simple'
+ #      should set theme to be 'simple'
  #
 -#      To use the templates in '/usr/share/gnump3d/twin/' then you
 +#      To use the templates in '%%PREFIX%%/share/gnump3d/twin/' then you
- #      should set 'theme=twin'
+ #      should set theme to be 'twin'
  #
  #  When the server is running you may set the theme from your browser
-@@ -392,7 +392,7 @@
+@@ -415,7 +415,7 @@
  # location.
  #
  ##
--# theme_directory = /usr/share/gnump3d/themes/
-+# theme_directory = %%PREFIX%%/share/gnump3d/themes/
+-# theme_directory = /usr/share/gnump3d/
++# theme_directory = %%PREFIX%%/share/gnump3d/
  ##
  
  
-@@ -574,11 +574,11 @@
- # downsampled it will be quoted in '"' characters.
+@@ -568,13 +568,13 @@
  #
  #
--# downsample_mp3_binary = /usr/bin/lame
-+# downsample_mp3_binary = %%LOCALBASE%%/bin/lame
- # downsample_mp3_args   = --mp3input --resample 32 -b 33 $FILENAME -
  #
+-#downsample_high_mp3   = /usr/bin/lame  --mp3input --resample 32 -b 33 
+-#downsample_medium_mp3 = /usr/bin/lame  --mp3input --resample 24 -b 24
+-#downsample_low_mp3    = /usr/bin/lame  --mp3input --resample 16 -b 16 
+-#
+-#downsample_high_ogg   = /usr/bin/oggenc --mp3input --resample 32 -b 44
+-#downsample_medium_ogg = /usr/bin/oggenc --mp3input --resample 24 -b 44
+-#downsample_low_ogg    = /usr/bin/oggenc --mp3input --resample 16 -b 44
++#downsample_high_mp3   = %%LOCALBASE%%/bin/lame  --mp3input --resample 32 -b 33 
++#downsample_medium_mp3 = %%LOCALBASE%%/bin/lame  --mp3input --resample 24 -b 24
++#downsample_low_mp3    = %%LOCALBASE%%/bin/lame  --mp3input --resample 16 -b 16 
++#
++#downsample_high_ogg   = %%LOCALBASE%%/bin/oggenc --mp3input --resample 32 -b 44
++#downsample_medium_ogg = %%LOCALBASE%%/bin/oggenc --mp3input --resample 24 -b 44
++#downsample_low_ogg    = %%LOCALBASE%%/bin/oggenc --mp3input --resample 16 -b 44
  #
--# downsample_ogg_binary = /usr/bin/oggenc
-+# downsample_ogg_binary = %%LOCALBASE%%/bin/oggenc
- # downsample_ogg_args = --mp3input --resample 32 -b 44 $FILENAME -
- #
- #
-@@ -586,7 +586,7 @@
- # binary.  So if you have .midi files you wish to downsample, (dunno if
- # that's possible but just for example), you would create lines like this
- #
--#     downsample_midi_binary = /usr/bin/mythic-downsampler.
-+#     downsample_midi_binary = %%LOCALBASE%%/bin/mythic-downsampler.
- #     downsample_midi_args   = --new-rate 3bps --output - $FILENAME
  
  #
-@@ -609,7 +609,7 @@
+@@ -597,7 +597,7 @@
  #  This next setting allows you to change the location from which the
  # plugins are loaded.
  #
 -# plugin_directory = /usr/lib/perl5/gnump3d/plugins
 +# plugin_directory = %%PERL_SITELIBDIR%%/gnump3d/plugins
  #
- 
- 
-@@ -671,7 +671,7 @@
+ #
+ #  NOTE: the following directory should be correctly filled in by
+@@ -669,7 +669,7 @@
  # used by default.  If not point this next file to wherever your mime
  # types file is located:
  #
diff --git a/audio/gnump3d/pkg-plist b/audio/gnump3d/pkg-plist
index 288429d93654..6c941f555853 100644
--- a/audio/gnump3d/pkg-plist
+++ b/audio/gnump3d/pkg-plist
@@ -15,11 +15,14 @@ lib/perl5/site_perl/%%PERL_VER%%/gnump3d/oggtagreader.pm
 lib/perl5/site_perl/%%PERL_VER%%/gnump3d/playlist.pm
 lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/COPYING.pm
 lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/bug.pm
+lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/info.pm
 lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/last.pm
+lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/now.pm
 lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/playlist.pm
 lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/prefs.pm
 lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/search.pm
 lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/stats.pm
+lib/perl5/site_perl/%%PERL_VER%%/gnump3d/tagreader.pm
 share/gnump3d/LaFrere/AUTHOR
 share/gnump3d/LaFrere/config.ini
 share/gnump3d/LaFrere/error.html
@@ -56,6 +59,8 @@ share/gnump3d/Thexder/spacer.gif
 share/gnump3d/Thexder/stats.html
 share/gnump3d/default/AUTHOR
 share/gnump3d/default/error.html
+share/gnump3d/default/footer.tmpl
+share/gnump3d/default/header.tmpl
 share/gnump3d/default/index.html
 share/gnump3d/default/plugin.html
 share/gnump3d/default/results.html
@@ -63,6 +68,7 @@ share/gnump3d/default/search.html
 share/gnump3d/default/stats.html
 share/gnump3d/default/style.css
 share/gnump3d/nausicaa/AUTHOR
+share/gnump3d/nausicaa/config.ini
 share/gnump3d/nausicaa/error.html
 share/gnump3d/nausicaa/index.html
 share/gnump3d/nausicaa/plugin.html