Update to 0.9.9.8

PR:		38779
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

5 files changed, 44 insertions, 30 deletions

diff --git a/audio/gnump3d/Makefile b/audio/gnump3d/Makefile
index d565ad0cd506..4ca20a86d32f 100644
--- a/audio/gnump3d/Makefile
+++ b/audio/gnump3d/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	gnump3d
-PORTVERSION=	0.9.9.7
-PORTREVISION=	1
+PORTVERSION=	0.9.9.8
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/gnump3d/distinfo b/audio/gnump3d/distinfo
index b607c4076ed0..583e8214cadd 100644
--- a/audio/gnump3d/distinfo
+++ b/audio/gnump3d/distinfo
@@ -1 +1 @@
-MD5 (gnump3d-0.9.9.7.tar.gz) = 3aaf16eabf4f4517fd0c89cc1aeb3718
+MD5 (gnump3d-0.9.9.8.tar.gz) = 8f9ca0da7c720f12309a737375c9f7bc
diff --git a/audio/gnump3d/files/patch-freebsd b/audio/gnump3d/files/patch-freebsd
index de549f1a6bb5..fc1a2bfcf440 100644
--- a/audio/gnump3d/files/patch-freebsd
+++ b/audio/gnump3d/files/patch-freebsd
@@ -1,5 +1,5 @@
---- mkfiles/freebsd.orig	Thu May 16 18:08:35 2002
-+++ mkfiles/freebsd	Tue May 28 02:00:05 2002
+--- mkfiles/freebsd.orig	Thu May 30 03:58:51 2002
++++ mkfiles/freebsd	Fri May 31 21:18:56 2002
 @@ -6,8 +6,8 @@
  # if you wish you may change PREFIX to be /usr/local,
  # for example
@@ -30,14 +30,14 @@
 +LIBS   = ${PTHREAD_LIBS}
  
  
--DEFAULT_CFLAGS = -I.  -D_THREAD_SAFE -D_REENTRANT -DBINARY_DIR="\"$(BINARYDIR)\"" -DSYSCONFDIR="\"$(CONFIGDIR)\"" -DVERSION="\"0.9.9.7\""
+-DEFAULT_CFLAGS = -I.  -D_THREAD_SAFE -D_REENTRANT -DBINARY_DIR="\"$(BINARYDIR)\"" -DSYSCONFDIR="\"$(CONFIGDIR)\"" -DVERSION="\"0.9.9.8\""
 -CFLAGS  = $(DEFAULT_CFLAGS) -Wall -DFREEBSD=1 -DOS_TYPE="\"FreeBSD\""
-+DEFAULT_CFLAGS = -I.  ${PTHREAD_CFLAGS} -D_REENTRANT -DBINARY_DIR="\"$(BINARYDIR)\"" -DSYSCONFDIR="\"$(CONFIGDIR)\"" -DVERSION="\"0.9.9.7\""
++DEFAULT_CFLAGS = -I.  ${PTHREAD_CFLAGS} -D_REENTRANT -DBINARY_DIR="\"$(BINARYDIR)\"" -DSYSCONFDIR="\"$(CONFIGDIR)\"" -DVERSION="\"0.9.9.8\""
 +CFLAGS  += $(DEFAULT_CFLAGS) -Wall -DFREEBSD=1 -DOS_TYPE="\"FreeBSD\""
  
  
  #
-@@ -110,22 +110,22 @@
+@@ -113,19 +113,25 @@
  #  Install the software.
  #
  install: $(PROG)
@@ -45,31 +45,32 @@
 -	install ../mp3d $(BINARYDIR)
 -	install ../contrib/stats/mp3d-top $(BINARYDIR)
 -	install ../mp3d.conf $(CONFIGDIR)
-+	mkdir -p $(BINARYDIR) $(CONFIGDIR) $(TEMPLATEDIR)
++	-mkdir -p $(BINARYDIR) $(CONFIGDIR) $(TEMPLATEDIR)
 +	${BSD_INSTALL_PROGRAM} ../mp3d $(BINARYDIR)
 +	${BSD_INSTALL_SCRIPT} ../contrib/stats/mp3d-top $(BINARYDIR)
 +	${BSD_INSTALL_DATA} ../mp3d.conf $(CONFIGDIR)
- 	# Default template.
--	install -d $(TEMPLATEDIR)/default
--	cp -R ../templates/default/ $(TEMPLATEDIR)
-+	mkdir -p $(TEMPLATEDIR)/default
-+	${BSD_INSTALL_DATA} ../templates/default/* $(TEMPLATEDIR)/default
- 	# Simple template
--	install -d $(TEMPLATEDIR)/simple 
--	cp -R ../templates/simple/ $(TEMPLATEDIR)
+ 	# Install all the theme directories.
+-	for i in ../templates/*/; do cp -R ../templates/$$i $(TEMPLATEDIR); done
 -	install ../templates/README $(TEMPLATEDIR)
-+	mkdir -p $(TEMPLATEDIR)/simple 
+-	chmod -R 555 $(TEMPLATEDIR)
++	-mkdir -p $(TEMPLATEDIR)/default 
++	${BSD_INSTALL_DATA} ../templates/default/* $(TEMPLATEDIR)/default
++	-mkdir -p $(TEMPLATEDIR)/nausicaa
++	${BSD_INSTALL_DATA} ../templates/nausicaa/* $(TEMPLATEDIR)/nausicaa
++	-mkdir -p $(TEMPLATEDIR)/simple 
 +	${BSD_INSTALL_DATA} ../templates/simple/* $(TEMPLATEDIR)/simple
++	-mkdir -p $(TEMPLATEDIR)/split
++	${BSD_INSTALL_DATA} ../templates/split/* $(TEMPLATEDIR)/split
 +	${BSD_INSTALL_DATA} ../templates/README $(TEMPLATEDIR)
  	# Man pages.
 -	install -d $(MANDIR)
 -	install ../doc/mp3d.1 $(MANDIR)
 -	install ../doc/mp3d.conf.1 $(MANDIR)
 -	install ../doc/mp3d-top.1 $(MANDIR)
-+	mkdir -p $(MANDIR)
-+	${BSD_INSTALL_DATA} ../doc/mp3d.1 $(MANDIR)
-+	${BSD_INSTALL_DATA} ../doc/mp3d.conf.1 $(MANDIR)
-+	${BSD_INSTALL_DATA} ../doc/mp3d-top.1 $(MANDIR)
++	-mkdir -p $(MANDIR)
++	${BSD_INSTALL_MAN} ../doc/mp3d.1 $(MANDIR)
++	${BSD_INSTALL_MAN} ../doc/mp3d.conf.1 $(MANDIR)
++	${BSD_INSTALL_MAN} ../doc/mp3d-top.1 $(MANDIR)
  
  
  #
diff --git a/audio/gnump3d/files/patch-server.c b/audio/gnump3d/files/patch-server.c
index d0541a2d2af7..c9b27bca3516 100644
--- a/audio/gnump3d/files/patch-server.c
+++ b/audio/gnump3d/files/patch-server.c
@@ -1,10 +1,10 @@
---- src/server.c.orig	Mon May 27 20:51:04 2002
-+++ src/server.c	Mon May 27 20:51:22 2002
+--- src/server.c.orig	Thu May 30 03:58:51 2002
++++ src/server.c	Fri May 31 19:35:18 2002
 @@ -32,6 +32,7 @@
   */
  
  
 +#include <sys/types.h>
- #include <arpa/inet.h>
  #include <ctype.h>
- #include <netinet/in.h>
+ #include <netdb.h>
+ #include <pwd.h>
diff --git a/audio/gnump3d/pkg-plist b/audio/gnump3d/pkg-plist
index f45472040afe..2bfab7543e52 100644
--- a/audio/gnump3d/pkg-plist
+++ b/audio/gnump3d/pkg-plist
@@ -4,14 +4,28 @@ etc/mp3d.conf
 etc/mp3d/README
 etc/mp3d/default/error.html
 etc/mp3d/default/index.html
+etc/mp3d/default/results.html
 etc/mp3d/default/search.html
 etc/mp3d/default/stats.html
-etc/mp3d/default/results.html
-etc/mp3d/simple/index.html
+etc/mp3d/nausicaa/error.html
+etc/mp3d/nausicaa/index.html
+etc/mp3d/nausicaa/results.html
+etc/mp3d/nausicaa/search.html
+etc/mp3d/nausicaa/stats.html
+etc/mp3d/simple/config.ini
 etc/mp3d/simple/error.html
+etc/mp3d/simple/index.html
+etc/mp3d/simple/results.html
 etc/mp3d/simple/search.html
 etc/mp3d/simple/stats.html
-etc/mp3d/simple/results.html
-@dirrm etc/mp3d/default
+etc/mp3d/split/config.ini
+etc/mp3d/split/error.html
+etc/mp3d/split/index.html
+etc/mp3d/split/results.html
+etc/mp3d/split/search.html
+etc/mp3d/split/stats.html
+@dirrm etc/mp3d/split
 @dirrm etc/mp3d/simple
+@dirrm etc/mp3d/nausicaa
+@dirrm etc/mp3d/default
 @dirrm etc/mp3d