4 files changed, 213 insertions, 196 deletions

diff --git a/audio/gnump3d/Makefile b/audio/gnump3d/Makefile
index 91fcc1d99d7f..fcdd724b5597 100644
--- a/audio/gnump3d/Makefile
+++ b/audio/gnump3d/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	gnump3d
-PORTVERSION=	2.5b
-PORTREVISION=	1
+PORTVERSION=	2.6
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A streaming server for MP3, OGG vorbis, and other streamable audio files
+COMMENT=	A streaming server for MP3, Ogg Vorbis, and other streamable audio files
 
 RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame \
+		sox:${PORTSDIR}/audio/sox \
 		oggenc:${PORTSDIR}/audio/vorbis-tools
 
 USE_BZIP2=	yes
diff --git a/audio/gnump3d/distinfo b/audio/gnump3d/distinfo
index ac80e0f036e2..4d9d4b57ba17 100644
--- a/audio/gnump3d/distinfo
+++ b/audio/gnump3d/distinfo
@@ -1 +1 @@
-MD5 (gnump3d-2.5b.tar.bz2) = a8f01fc73d1f18c3779546d92b74bf75
+MD5 (gnump3d-2.6.tar.bz2) = 0f7eaa6820c6f090a22674f9de143843
diff --git a/audio/gnump3d/files/patch-etc::gnump3d.conf b/audio/gnump3d/files/patch-etc::gnump3d.conf
index 81c90922baf2..604f614b3e3c 100644
--- a/audio/gnump3d/files/patch-etc::gnump3d.conf
+++ b/audio/gnump3d/files/patch-etc::gnump3d.conf
@@ -1,5 +1,5 @@
---- etc/gnump3d.conf.orig	Fri Jul  4 10:20:24 2003
-+++ etc/gnump3d.conf	Fri Jul  4 10:27:25 2003
+--- 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 @@
  # 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
-@@ -412,7 +412,7 @@
+@@ -424,7 +424,7 @@
  # the URL   http://server.host.name:port/stats/, and reads in a template
  # called 'stats.html'
  #
@@ -18,7 +18,7 @@
  # changed via the 'theme_directory' setting given below.
  #
  #  When the server is running you may set the theme from your browser
-@@ -439,7 +439,7 @@
+@@ -451,7 +451,7 @@
  # location.
  #
  ##
@@ -27,28 +27,20 @@
  ##
  
  
-@@ -600,13 +600,13 @@
+@@ -613,9 +613,9 @@
  # the string '$FILENAME' will be replaced by the file the user is
  # requesting.
  #
 -#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 $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 $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
  #
- 
- #
-@@ -642,7 +642,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 @@
  # the installation script - if this doesn't happen report this as
  # a bug.
  #
@@ -57,7 +49,7 @@
  #
  
  
-@@ -736,7 +736,7 @@
+@@ -750,7 +750,7 @@
  #
  #  Normally you shouldn't need to touch this.
  #
@@ -66,7 +58,7 @@
  
  
  #
-@@ -813,7 +813,7 @@
+@@ -827,7 +827,7 @@
  ##
  #
  #  jukebox_mode   = 1
diff --git a/audio/gnump3d/pkg-plist b/audio/gnump3d/pkg-plist
index 6864cf7860e6..206ae8b6c5db 100644
--- a/audio/gnump3d/pkg-plist
+++ b/audio/gnump3d/pkg-plist
@@ -7,7 +7,6 @@ bin/gnump3d2
 etc/gnump3d/gnump3d.conf-default
 @exec [ -f %B/gnump3d.conf ] || cp %B/%f %B/gnump3d.conf
 etc/gnump3d/mime.types
-lib/perl5/site_perl/%%PERL_VER%%/gnump3d/FreezeThaw.pm
 lib/perl5/site_perl/%%PERL_VER%%/gnump3d/IP.pm
 lib/perl5/site_perl/%%PERL_VER%%/gnump3d/base64.pm
 lib/perl5/site_perl/%%PERL_VER%%/gnump3d/config.pm
@@ -15,6 +14,8 @@ 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/lang/en.pm
+lib/perl5/site_perl/%%PERL_VER%%/gnump3d/lang/lookup.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
@@ -25,182 +26,206 @@ lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/prefs.pm
 lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/random.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/size.pm
 lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/stats.pm
 lib/perl5/site_perl/%%PERL_VER%%/gnump3d/tagcache.pm
 lib/perl5/site_perl/%%PERL_VER%%/gnump3d/url.pm
-share/gnump3d/LaFrere/AUTHOR
-share/gnump3d/LaFrere/COPYING.html
-share/gnump3d/LaFrere/bug.html
-share/gnump3d/LaFrere/config.ini
-share/gnump3d/LaFrere/error.html
-share/gnump3d/LaFrere/index.html
-share/gnump3d/LaFrere/info.html
-share/gnump3d/LaFrere/logo.png
-share/gnump3d/LaFrere/now.html
-share/gnump3d/LaFrere/playlist.html
-share/gnump3d/LaFrere/prefs.html
-share/gnump3d/LaFrere/random.html
-share/gnump3d/LaFrere/recent.html
-share/gnump3d/LaFrere/results.html
-share/gnump3d/LaFrere/search.html
-share/gnump3d/LaFrere/stats.html
-share/gnump3d/README
-share/gnump3d/Tabular/AUTHOR
-share/gnump3d/Tabular/COPYING.html
-share/gnump3d/Tabular/bug.html
-share/gnump3d/Tabular/config.ini
-share/gnump3d/Tabular/error.html
-share/gnump3d/Tabular/extras.html
-share/gnump3d/Tabular/footer.tmpl
-share/gnump3d/Tabular/header.tmpl
-share/gnump3d/Tabular/index.html
-share/gnump3d/Tabular/info.html
-share/gnump3d/Tabular/now.html
-share/gnump3d/Tabular/playlist.html
-share/gnump3d/Tabular/prefs.html
-share/gnump3d/Tabular/random.html
-share/gnump3d/Tabular/recent.html
-share/gnump3d/Tabular/results.html
-share/gnump3d/Tabular/search.html
-share/gnump3d/Tabular/statistics.html
-share/gnump3d/Tabular/stats.html
-share/gnump3d/Tabular/style.css
-share/gnump3d/Tabular/template.ini
-share/gnump3d/Thexder/AUTHOR
-share/gnump3d/Thexder/COPYING.html
-share/gnump3d/Thexder/bug.html
-share/gnump3d/Thexder/config.ini
-share/gnump3d/Thexder/dig_temp2_01.jpg
-share/gnump3d/Thexder/dig_temp2_02.jpg
-share/gnump3d/Thexder/dig_temp2_03.gif
-share/gnump3d/Thexder/dig_temp2_04.jpg
-share/gnump3d/Thexder/dig_temp2_06.jpg
-share/gnump3d/Thexder/dig_temp2_08.jpg
-share/gnump3d/Thexder/dig_temp2_10.jpg
-share/gnump3d/Thexder/dig_temp2_12.jpg
-share/gnump3d/Thexder/dig_temp2_14.jpg
-share/gnump3d/Thexder/error.html
-share/gnump3d/Thexder/hr.gif
-share/gnump3d/Thexder/index.html
-share/gnump3d/Thexder/info.html
-share/gnump3d/Thexder/link_1.jpg
-share/gnump3d/Thexder/link_2.jpg
-share/gnump3d/Thexder/link_3.jpg
-share/gnump3d/Thexder/link_4.jpg
-share/gnump3d/Thexder/link_5.jpg
-share/gnump3d/Thexder/logo7.jpg
-share/gnump3d/Thexder/now.html
-share/gnump3d/Thexder/playlist.html
-share/gnump3d/Thexder/prefs.html
-share/gnump3d/Thexder/random.html
-share/gnump3d/Thexder/recent.html
-share/gnump3d/Thexder/results.html
-share/gnump3d/Thexder/search.html
-share/gnump3d/Thexder/spacer.gif
-share/gnump3d/Thexder/stats.html
-share/gnump3d/default/AUTHOR
-share/gnump3d/default/COPYING.html
-share/gnump3d/default/bug.html
-share/gnump3d/default/error.html
-share/gnump3d/default/footer.tmpl
-share/gnump3d/default/header.tmpl
-share/gnump3d/default/index.html
-share/gnump3d/default/info.html
-share/gnump3d/default/now.html
-share/gnump3d/default/playlist.html
-share/gnump3d/default/prefs.html
-share/gnump3d/default/random.html
-share/gnump3d/default/recent.html
-share/gnump3d/default/results.html
-share/gnump3d/default/search.html
-share/gnump3d/default/stats.html
-share/gnump3d/default/style.css
-share/gnump3d/dotNET/AUTHOR
-share/gnump3d/dotNET/COPYING.html
-share/gnump3d/dotNET/bug.html
-share/gnump3d/dotNET/config.ini
-share/gnump3d/dotNET/content.tmpl
-share/gnump3d/dotNET/error.html
-share/gnump3d/dotNET/header.tmpl
-share/gnump3d/dotNET/images/ecke_unten_links.gif
-share/gnump3d/dotNET/images/ecke_unten_rechts.gif
-share/gnump3d/dotNET/images/eckeor.gif
-share/gnump3d/dotNET/images/eckeul.gif
-share/gnump3d/dotNET/images/eckeur.gif
-share/gnump3d/dotNET/images/horizontal.jpg
-share/gnump3d/dotNET/images/logo7.jpg
-share/gnump3d/dotNET/images/pfeilrechts.gif
-share/gnump3d/dotNET/images/reiter.jpg
-share/gnump3d/dotNET/images/transparent.gif
-share/gnump3d/dotNET/images/vertikal.jpg
-share/gnump3d/dotNET/index.html
-share/gnump3d/dotNET/info.html
-share/gnump3d/dotNET/now.html
-share/gnump3d/dotNET/playlist.html
-share/gnump3d/dotNET/prefs.html
-share/gnump3d/dotNET/random.html
-share/gnump3d/dotNET/recent.html
-share/gnump3d/dotNET/results.html
-share/gnump3d/dotNET/search.html
-share/gnump3d/dotNET/stats.html
-share/gnump3d/dotNET/style.css
-share/gnump3d/nausicaa/AUTHOR
-share/gnump3d/nausicaa/COPYING.html
-share/gnump3d/nausicaa/bug.html
-share/gnump3d/nausicaa/config.ini
-share/gnump3d/nausicaa/error.html
-share/gnump3d/nausicaa/extras.html
-share/gnump3d/nausicaa/index.html
-share/gnump3d/nausicaa/info.html
-share/gnump3d/nausicaa/now.html
-share/gnump3d/nausicaa/playlist.html
-share/gnump3d/nausicaa/prefs.html
-share/gnump3d/nausicaa/random.html
-share/gnump3d/nausicaa/recent.html
-share/gnump3d/nausicaa/results.html
-share/gnump3d/nausicaa/search.html
-share/gnump3d/nausicaa/stats.html
-share/gnump3d/nausicaa/style.css
-share/gnump3d/redgrey/AUTHOR
-share/gnump3d/redgrey/COPYING.html
-share/gnump3d/redgrey/bug.html
-share/gnump3d/redgrey/error.html
-share/gnump3d/redgrey/index.html
-share/gnump3d/redgrey/info.html
-share/gnump3d/redgrey/now.html
-share/gnump3d/redgrey/playlist.html
-share/gnump3d/redgrey/prefs.html
-share/gnump3d/redgrey/random.html
-share/gnump3d/redgrey/recent.html
-share/gnump3d/redgrey/results.html
-share/gnump3d/redgrey/search.html
-share/gnump3d/redgrey/stats.html
-share/gnump3d/simple/AUTHOR
-share/gnump3d/simple/COPYING.html
-share/gnump3d/simple/bug.html
-share/gnump3d/simple/config.ini
-share/gnump3d/simple/error.html
-share/gnump3d/simple/index.html
-share/gnump3d/simple/info.html
-share/gnump3d/simple/now.html
-share/gnump3d/simple/playlist.html
-share/gnump3d/simple/prefs.html
-share/gnump3d/simple/random.html
-share/gnump3d/simple/recent.html
-share/gnump3d/simple/results.html
-share/gnump3d/simple/search.html
-share/gnump3d/simple/stats.html
-@dirrm share/gnump3d/simple
-@dirrm share/gnump3d/redgrey
-@dirrm share/gnump3d/nausicaa
-@dirrm share/gnump3d/dotNET/images
-@dirrm share/gnump3d/dotNET
-@dirrm share/gnump3d/default
-@dirrm share/gnump3d/Thexder
-@dirrm share/gnump3d/Tabular
-@dirrm share/gnump3d/LaFrere
-@dirrm share/gnump3d
+%%DATADIR%%/Clean/AUTHOR
+%%DATADIR%%/Clean/COPYING.html
+%%DATADIR%%/Clean/bug.html
+%%DATADIR%%/Clean/config.ini
+%%DATADIR%%/Clean/error.html
+%%DATADIR%%/Clean/index.html
+%%DATADIR%%/Clean/info.html
+%%DATADIR%%/Clean/layout.css
+%%DATADIR%%/Clean/menu.tmpl
+%%DATADIR%%/Clean/now.html
+%%DATADIR%%/Clean/playlist.html
+%%DATADIR%%/Clean/prefs.html
+%%DATADIR%%/Clean/random.html
+%%DATADIR%%/Clean/recent.html
+%%DATADIR%%/Clean/results.html
+%%DATADIR%%/Clean/search.html
+%%DATADIR%%/Clean/size.html
+%%DATADIR%%/Clean/stats.html
+%%DATADIR%%/LaFrere/AUTHOR
+%%DATADIR%%/LaFrere/COPYING.html
+%%DATADIR%%/LaFrere/bug.html
+%%DATADIR%%/LaFrere/config.ini
+%%DATADIR%%/LaFrere/error.html
+%%DATADIR%%/LaFrere/index.html
+%%DATADIR%%/LaFrere/info.html
+%%DATADIR%%/LaFrere/logo.png
+%%DATADIR%%/LaFrere/now.html
+%%DATADIR%%/LaFrere/playlist.html
+%%DATADIR%%/LaFrere/prefs.html
+%%DATADIR%%/LaFrere/random.html
+%%DATADIR%%/LaFrere/recent.html
+%%DATADIR%%/LaFrere/results.html
+%%DATADIR%%/LaFrere/search.html
+%%DATADIR%%/LaFrere/size.html
+%%DATADIR%%/LaFrere/stats.html
+%%DATADIR%%/README
+%%DATADIR%%/Tabular/AUTHOR
+%%DATADIR%%/Tabular/COPYING.html
+%%DATADIR%%/Tabular/bug.html
+%%DATADIR%%/Tabular/config.ini
+%%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
+%%DATADIR%%/Tabular/playlist.html
+%%DATADIR%%/Tabular/prefs.html
+%%DATADIR%%/Tabular/random.html
+%%DATADIR%%/Tabular/recent.html
+%%DATADIR%%/Tabular/results.html
+%%DATADIR%%/Tabular/search.html
+%%DATADIR%%/Tabular/size.html
+%%DATADIR%%/Tabular/statistics.html
+%%DATADIR%%/Tabular/stats.html
+%%DATADIR%%/Tabular/style.css
+%%DATADIR%%/Tabular/template.ini
+%%DATADIR%%/Thexder/AUTHOR
+%%DATADIR%%/Thexder/COPYING.html
+%%DATADIR%%/Thexder/bug.html
+%%DATADIR%%/Thexder/config.ini
+%%DATADIR%%/Thexder/dig_temp2_01.jpg
+%%DATADIR%%/Thexder/dig_temp2_02.jpg
+%%DATADIR%%/Thexder/dig_temp2_03.gif
+%%DATADIR%%/Thexder/dig_temp2_04.jpg
+%%DATADIR%%/Thexder/dig_temp2_06.jpg
+%%DATADIR%%/Thexder/dig_temp2_08.jpg
+%%DATADIR%%/Thexder/dig_temp2_10.jpg
+%%DATADIR%%/Thexder/dig_temp2_12.jpg
+%%DATADIR%%/Thexder/dig_temp2_14.jpg
+%%DATADIR%%/Thexder/error.html
+%%DATADIR%%/Thexder/hr.gif
+%%DATADIR%%/Thexder/index.html
+%%DATADIR%%/Thexder/info.html
+%%DATADIR%%/Thexder/link_1.jpg
+%%DATADIR%%/Thexder/link_2.jpg
+%%DATADIR%%/Thexder/link_3.jpg
+%%DATADIR%%/Thexder/link_4.jpg
+%%DATADIR%%/Thexder/link_5.jpg
+%%DATADIR%%/Thexder/logo7.jpg
+%%DATADIR%%/Thexder/now.html
+%%DATADIR%%/Thexder/playlist.html
+%%DATADIR%%/Thexder/prefs.html
+%%DATADIR%%/Thexder/random.html
+%%DATADIR%%/Thexder/recent.html
+%%DATADIR%%/Thexder/results.html
+%%DATADIR%%/Thexder/search.html
+%%DATADIR%%/Thexder/spacer.gif
+%%DATADIR%%/Thexder/stats.html
+%%DATADIR%%/default/AUTHOR
+%%DATADIR%%/default/COPYING.html
+%%DATADIR%%/default/bug.html
+%%DATADIR%%/default/error.html
+%%DATADIR%%/default/footer.tmpl
+%%DATADIR%%/default/header.tmpl
+%%DATADIR%%/default/index.html
+%%DATADIR%%/default/info.html
+%%DATADIR%%/default/now.html
+%%DATADIR%%/default/playlist.html
+%%DATADIR%%/default/prefs.html
+%%DATADIR%%/default/random.html
+%%DATADIR%%/default/recent.html
+%%DATADIR%%/default/results.html
+%%DATADIR%%/default/search.html
+%%DATADIR%%/default/size.html
+%%DATADIR%%/default/stats.html
+%%DATADIR%%/default/style.css
+%%DATADIR%%/dotNET/AUTHOR
+%%DATADIR%%/dotNET/COPYING.html
+%%DATADIR%%/dotNET/bug.html
+%%DATADIR%%/dotNET/config.ini
+%%DATADIR%%/dotNET/content.tmpl
+%%DATADIR%%/dotNET/error.html
+%%DATADIR%%/dotNET/header.tmpl
+%%DATADIR%%/dotNET/images/ecke_unten_links.gif
+%%DATADIR%%/dotNET/images/ecke_unten_rechts.gif
+%%DATADIR%%/dotNET/images/eckeor.gif
+%%DATADIR%%/dotNET/images/eckeul.gif
+%%DATADIR%%/dotNET/images/eckeur.gif
+%%DATADIR%%/dotNET/images/horizontal.jpg
+%%DATADIR%%/dotNET/images/logo7.jpg
+%%DATADIR%%/dotNET/images/pfeilrechts.gif
+%%DATADIR%%/dotNET/images/reiter.jpg
+%%DATADIR%%/dotNET/images/transparent.gif
+%%DATADIR%%/dotNET/images/vertikal.jpg
+%%DATADIR%%/dotNET/index.html
+%%DATADIR%%/dotNET/info.html
+%%DATADIR%%/dotNET/now.html
+%%DATADIR%%/dotNET/playlist.html
+%%DATADIR%%/dotNET/prefs.html
+%%DATADIR%%/dotNET/random.html
+%%DATADIR%%/dotNET/recent.html
+%%DATADIR%%/dotNET/results.html
+%%DATADIR%%/dotNET/search.html
+%%DATADIR%%/dotNET/stats.html
+%%DATADIR%%/dotNET/style.css
+%%DATADIR%%/nausicaa/AUTHOR
+%%DATADIR%%/nausicaa/COPYING.html
+%%DATADIR%%/nausicaa/bug.html
+%%DATADIR%%/nausicaa/config.ini
+%%DATADIR%%/nausicaa/error.html
+%%DATADIR%%/nausicaa/extras.html
+%%DATADIR%%/nausicaa/index.html
+%%DATADIR%%/nausicaa/info.html
+%%DATADIR%%/nausicaa/now.html
+%%DATADIR%%/nausicaa/playlist.html
+%%DATADIR%%/nausicaa/prefs.html
+%%DATADIR%%/nausicaa/random.html
+%%DATADIR%%/nausicaa/recent.html
+%%DATADIR%%/nausicaa/results.html
+%%DATADIR%%/nausicaa/search.html
+%%DATADIR%%/nausicaa/stats.html
+%%DATADIR%%/nausicaa/style.css
+%%DATADIR%%/redgrey/AUTHOR
+%%DATADIR%%/redgrey/COPYING.html
+%%DATADIR%%/redgrey/bug.html
+%%DATADIR%%/redgrey/error.html
+%%DATADIR%%/redgrey/index.html
+%%DATADIR%%/redgrey/info.html
+%%DATADIR%%/redgrey/now.html
+%%DATADIR%%/redgrey/playlist.html
+%%DATADIR%%/redgrey/prefs.html
+%%DATADIR%%/redgrey/random.html
+%%DATADIR%%/redgrey/recent.html
+%%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
+@dirrm %%DATADIR%%/redgrey
+@dirrm %%DATADIR%%/nausicaa
+@dirrm %%DATADIR%%/dotNET/images
+@dirrm %%DATADIR%%/dotNET
+@dirrm %%DATADIR%%/default
+@dirrm %%DATADIR%%/Thexder
+@dirrm %%DATADIR%%/Tabular
+@dirrm %%DATADIR%%/LaFrere
+@dirrm %%DATADIR%%/Clean
+@dirrm %%DATADIR%%
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/gnump3d/lang
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/gnump3d
 @unexec rmdir %D/etc/gnump3d 2>/dev/null || true
 @unexec rmdir /var/log/gnump3d 2>/dev/null || true