5 files changed, 44 insertions, 32 deletions

diff --git a/audio/gnump3d/Makefile b/audio/gnump3d/Makefile
index 380ce467f1e2..4004104f71e8 100644
--- a/audio/gnump3d/Makefile
+++ b/audio/gnump3d/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gnump3d
-PORTVERSION=	2.3
+PORTVERSION=	2.4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/gnump3d/distinfo b/audio/gnump3d/distinfo
index ef1fe18ca59f..06ac7144ee11 100644
--- a/audio/gnump3d/distinfo
+++ b/audio/gnump3d/distinfo
@@ -1 +1 @@
-MD5 (gnump3d-2.3.tar.bz2) = 35f795d8ad2b5c1164456330ac52fa21
+MD5 (gnump3d-2.4.tar.bz2) = df712073eed1bdd259d66a7df5015aa8
diff --git a/audio/gnump3d/files/patch-bin::gnump3d2 b/audio/gnump3d/files/patch-bin::gnump3d2
index 70874726ecfe..4306418fb119 100644
--- a/audio/gnump3d/files/patch-bin::gnump3d2
+++ b/audio/gnump3d/files/patch-bin::gnump3d2
@@ -1,6 +1,6 @@
---- bin/gnump3d2.orig	Tue Apr 29 06:18:15 2003
-+++ bin/gnump3d2	Tue Apr 29 06:21:39 2003
-@@ -2234,9 +2234,9 @@
+--- bin/gnump3d2.orig	Fri May  2 18:56:50 2003
++++ bin/gnump3d2	Sat May  3 00:11:54 2003
+@@ -2457,9 +2457,9 @@
    {
        $CONFIG_FILE = $ENV{"HOME"} . "/.gnump3drc";
    }
@@ -12,7 +12,7 @@
    }
    elsif ( -e "gnump3d.conf" )
    {
-@@ -2371,8 +2371,8 @@
+@@ -2599,8 +2599,8 @@
    $PORT          = getConfig( "port", 8888 );
    $bind_address  = getConfig( "binding_host", "" );
    $host          = getConfig( "hostname", "localhost" );
@@ -23,15 +23,14 @@
    $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 @@
+@@ -2608,10 +2608,10 @@
    $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" );
+   $play_rec      = getConfig( "play_recursively_text",  "Play" );
 -  $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 );
diff --git a/audio/gnump3d/files/patch-etc::gnump3d.conf b/audio/gnump3d/files/patch-etc::gnump3d.conf
index dbc2b602ba1f..202e486885c7 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 Apr 29 06:18:15 2003
-+++ etc/gnump3d.conf	Tue Apr 29 06:26:17 2003
-@@ -163,7 +163,7 @@
+--- etc/gnump3d.conf.orig	Fri May  2 18:56:50 2003
++++ etc/gnump3d.conf	Sat May  3 00:15:39 2003
+@@ -173,7 +173,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
-@@ -382,13 +382,13 @@
+@@ -388,13 +388,13 @@
  # theme variable below you specify which set of templates you wish
  # the server to use.
  #
@@ -26,7 +26,7 @@
  #      should set theme to be 'twin'
  #
  #  When the server is running you may set the theme from your browser
-@@ -415,7 +415,7 @@
+@@ -421,7 +421,7 @@
  # location.
  #
  ##
@@ -35,28 +35,28 @@
  ##
  
  
-@@ -568,13 +568,13 @@
+@@ -582,13 +582,13 @@
+ # the string '$FILENAME' will be replaced by the file the user is
+ # requesting.
  #
- #
- #
--#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_mp3   = /usr/bin/lame  --mp3input -b 56 $FILENAME -
+-#downsample_medium_mp3 = /usr/bin/lame  --mp3input -b 33 $FILENAME -
+-#downsample_low_mp3    = /usr/bin/lame  --mp3input -b 16 $FILENAME -
 -#
--#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   = /usr/bin/oggenc --mp3input $FILENAME --resample 32 -b 44
+-#downsample_medium_ogg = /usr/bin/oggenc --mp3input $FILENAME --resample 24 -b 44
+-#downsample_low_ogg    = /usr/bin/oggenc --mp3input $FILENAME --resample 16 -b 44
++#downsample_high_mp3   = %%LOCALBASE%%/bin/lame  --mp3input -b 56 $FILENAME -
++#downsample_medium_mp3 = %%LOCALBASE%%/bin/lame  --mp3input -b 33 $FILENAME -
++#downsample_low_mp3    = %%LOCALBASE%%/bin/lame  --mp3input -b 16 $FILENAME -
 +#
-+#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_high_ogg   = %%LOCALBASE%%/bin/oggenc --mp3input $FILENAME --resample 32 -b 44
++#downsample_medium_ogg = %%LOCALBASE%%/bin/oggenc --mp3input $FILENAME --resample 24 -b 44
++#downsample_low_ogg    = %%LOCALBASE%%/bin/oggenc --mp3input $FILENAME --resample 16 -b 44
  #
  
  #
-@@ -597,7 +597,7 @@
+@@ -611,7 +611,7 @@
  #  This next setting allows you to change the location from which the
  # plugins are loaded.
  #
@@ -65,7 +65,7 @@
  #
  #
  #  NOTE: the following directory should be correctly filled in by
-@@ -669,7 +669,7 @@
+@@ -683,7 +683,7 @@
  # used by default.  If not point this next file to wherever your mime
  # types file is located:
  #
@@ -74,3 +74,12 @@
  #
  #
  
+@@ -771,7 +771,7 @@
+ ##
+ #
+ #  jukebox_mode   = 1
+-#  jukebox_player = /usr/bin/mpg123 $FILENAME
++#  jukebox_player = %%LOCALBASE%%/bin/mpg123 $FILENAME
+ #
+ ##
+ 
diff --git a/audio/gnump3d/pkg-plist b/audio/gnump3d/pkg-plist
index 6c941f555853..c079a0e9fc19 100644
--- a/audio/gnump3d/pkg-plist
+++ b/audio/gnump3d/pkg-plist
@@ -11,17 +11,21 @@ lib/perl5/site_perl/%%PERL_VER%%/gnump3d/base64.pm
 lib/perl5/site_perl/%%PERL_VER%%/gnump3d/config.pm
 lib/perl5/site_perl/%%PERL_VER%%/gnump3d/files.pm
 lib/perl5/site_perl/%%PERL_VER%%/gnump3d/mp3info.pm
+lib/perl5/site_perl/%%PERL_VER%%/gnump3d/ogginfo.pm
 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/admin.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/passwords.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/recent.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/url.pm
 lib/perl5/site_perl/%%PERL_VER%%/gnump3d/tagreader.pm
 share/gnump3d/LaFrere/AUTHOR
 share/gnump3d/LaFrere/config.ini