Update to 0.7

PR: 24354
Submitted by: Ports Fury

6 files changed, 66 insertions, 128 deletions

diff --git a/games/mangband/Makefile b/games/mangband/Makefile
index 659d06ce456e..85a878fff0bb 100644
--- a/games/mangband/Makefile
+++ b/games/mangband/Makefile
@@ -4,33 +4,33 @@
 # $FreeBSD$
 #
 
-PORTNAME=       mangband
-PORTVERSION=	0.5.4
+PORTNAME=	mangband
+PORTVERSION=	0.7.0
 CATEGORIES=	games
 MASTER_SITES=	http://mangband.org/download/
-DISTNAME=       mangband-054
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
 
-MAINTAINER=     ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 
-WRKSRC=         ${WRKDIR}/mangband/src
-ALL_TARGET=     install
+WRKSRC=		${WRKDIR}/${PORTNAME}/src
 
-USE_XLIB=       yes
+USE_XLIB=	yes
+ALL_TARGET=	install
 
-MALIB=          ${PREFIX}/lib/mangband
+MALIB=		${PREFIX}/lib/mangband
 
 do-install:
-	${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 555 ${MALIB}
-	cd ${WRKSRC}/../lib; ${CP} -R -p * ${MALIB}; \
-	   cd ${MALIB}; \
-	   ${TOUCH} file/wizards.txt; \
-	   ${CHMOD} 750 *; ${CHOWN} -R root.games *; \
-	   ${CHMOD} 755 user;
-	cd ${WRKSRC}; \
-	   ${INSTALL_PROGRAM} -o root -g games -m 2550 \
-		mangband ${PREFIX}/bin; \
-	   ${INSTALL_PROGRAM} -o root -g games -m 550 \
-		mangconsole ${PREFIX}/bin; \
-	   ${INSTALL_PROGRAM} mangclient ${PREFIX}/bin
+	${INSTALL_PROGRAM} -o root -g games -m 2550 \
+		${WRKSRC}/mangband ${PREFIX}/bin
+	${INSTALL_PROGRAM} -o root -g games -m 550 \
+		${WRKSRC}/mangconsole ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/mangclient ${PREFIX}/bin
+	@${MKDIR} ${MALIB}/file
+	@${TOUCH} ${MALIB}/file/wizards.txt
+	cd ${WRKSRC}/../lib && pax -rw * ${MALIB}
+	${CHMOD} 750 ${MALIB}/*
+	${CHMOD} 755 ${MALIB}/user
+	${CHOWN} -R root.games ${MALIB}/*
+	${CHOWN} ${SHAREOWN}:${SHAREGRP} ${MALIB}
 
 .include <bsd.port.mk>
diff --git a/games/mangband/distinfo b/games/mangband/distinfo
index 2e9c44a0def7..99f0da38761a 100644
--- a/games/mangband/distinfo
+++ b/games/mangband/distinfo
@@ -1 +1 @@
-MD5 (mangband-054.tar.gz) = 27bd83d4ad82841c278291af757f1baa
+MD5 (mangband-070.tar.gz) = e97438ac83b5773b4bad1dffa5d9b056
diff --git a/games/mangband/files/patch-aa b/games/mangband/files/patch-aa
index cb9cc4e10bb0..a2a43eaaa594 100644
--- a/games/mangband/files/patch-aa
+++ b/games/mangband/files/patch-aa
@@ -1,6 +1,6 @@
---- config.h.orig	Wed Oct 21 09:45:08 1998
-+++ config.h	Wed Dec 30 17:23:11 1998
-@@ -75,7 +75,7 @@
+--- config.h.orig	Sun Jan  7 07:21:32 2001
++++ config.h	Fri Jan 12 00:04:41 2001
+@@ -79,7 +79,7 @@
  /*
   * OPTION: Use the POSIX "termios" methods in "main-gcu.c"
   */
@@ -9,25 +9,16 @@
  
  /*
   * OPTION: Use the "termio" methods in "main-gcu.c"
-@@ -103,7 +103,7 @@
+@@ -107,7 +107,7 @@
   * OPTION: Use the "curs_set()" call in "main-gcu.c".
   * Hack -- This option will not work on most BSD machines
   */
--#ifdef SYS_V
-+#if defined(SYS_V) || defined(__FreeBSD__)
+-#if defined(SYS_V) || defined(linux)
++#if defined(SYS_V) || defined(linux) || defined(__FreeBSD__)
  # define USE_CURS_SET
  #endif
  
-@@ -504,7 +504,7 @@
- /*
-  * OPTION: Have the server respond to commands typed in on its tty.
-  */
--#define SERVER_CONSOLE
-+/* #define SERVER_CONSOLE */
- 
- /*
-  * OPTION: Enable a method to control the server from an external program.
-@@ -566,7 +566,7 @@
+@@ -582,7 +582,7 @@
  /*
   * OPTION: Attempt to prevent all "cheating"
   */
diff --git a/games/mangband/files/patch-ab b/games/mangband/files/patch-ab
index 90334c7255a9..e60ed9507503 100644
--- a/games/mangband/files/patch-ab
+++ b/games/mangband/files/patch-ab
@@ -1,12 +1,21 @@
---- Makefile.orig	Tue Dec  2 09:04:04 1997
-+++ Makefile	Fri Jan  1 05:42:43 1999
-@@ -153,8 +153,8 @@
+--- Makefile.orig	Sun Mar  5 05:04:02 2000
++++ Makefile	Fri Jan 12 00:02:53 2001
+@@ -134,7 +134,7 @@
+ #
+ # This is my compiler of choice, it seems to work most everywhere
+ #
+-CC = gcc
++#CC = gcc
+ 
+ 
+ #
+@@ -155,8 +155,8 @@
  # including "USE_GETCH" and "USE_CURS_SET".  Note that "config.h" will
  # attempt to "guess" at many of these flags based on your system.
  #
 -CFLAGS = -Wall -g -pipe -D"USE_X11" -D"USE_GCU" -I/usr/include/ncurses
--LIBS = -L/usr/X11R6/lib -lX11 -lncurses -ltermcap
-+CFLAGS += -Wall -D"USE_X11" -D"USE_GCU" -I${X11BASE}/include -DDEFAULT_PATH=\"${PREFIX}/lib/mangband\"
+-LIBS = -L/usr/X11R6/lib -lX11 -lncurses
++CFLAGS += -D"USE_X11" -D"USE_GCU" -DDEFAULT_PATH="\"${PREFIX}/lib/mangband\"" -I${X11BASE}/include
 +LIBS = -L${X11BASE}/lib -lX11 -lncurses -lmytinfo
  
  
diff --git a/games/mangband/files/patch-ad b/games/mangband/files/patch-ad
deleted file mode 100644
index 60fa2cb77dcb..000000000000
--- a/games/mangband/files/patch-ad
+++ /dev/null
@@ -1,52 +0,0 @@
---- common/net-unix.c.orig	Sat Nov 22 10:47:36 1997
-+++ common/net-unix.c	Wed Dec 30 18:12:07 1998
-@@ -2461,11 +2461,14 @@
- #ifdef UNIX_SOCKETS
-    strcpy(name, "localhost");
- #else
-+    struct hostent      *he;
-+#if 0
-     struct hostent	*he, *xpilot_he, tmp;
-     int			xpilot_len;
-     char		*alias, *dot;
-     char		xpilot_hostname[MAXHOSTNAMELEN];
-     static const char	xpilot[] = "xpilot";
-+#endif
- #ifdef VMS
-     char                vms_inethost[MAXHOSTNAMELEN]   = "UCX$INET_HOST";
-     char                vms_inetdomain[MAXHOSTNAMELEN] = "UCX$INET_DOMAIN";
-@@ -2473,7 +2476,7 @@
-     char                vms_domain[MAXHOSTNAMELEN];
-     int                 namelen;
- #endif
--
-+#if 0
-     xpilot_len = strlen(xpilot);
- 
-     /* Make a wild guess that a "xpilot" hostname or alias is in this domain */
-@@ -2484,7 +2487,7 @@
- 	    xpilot_he = &tmp;
- 	}
-     }
--
-+#endif
-     gethostname(name, size);
-     if ((he = gethostbyname(name)) == NULL) {
- 	return;
-@@ -2534,7 +2537,7 @@
- 	    return;
- 	}
-     }
--
-+#if 0
-     /*
-      * If a "xpilot" host is found compare if it's this one.
-      * and if so, make the local name as "xpilot.*"
-@@ -2573,6 +2576,7 @@
- 	}
- 	/* NOT REATCHED */
-     }
-+#endif
- #endif
- } /* GetLocalHostName */
- 
diff --git a/games/mangband/pkg-plist b/games/mangband/pkg-plist
index 95476b50ed19..2e4b718d9f47 100644
--- a/games/mangband/pkg-plist
+++ b/games/mangband/pkg-plist
@@ -1,35 +1,30 @@
 bin/mangband
 bin/mangclient
 bin/mangconsole
-@exec install -d -o bin -g bin -m 555 %D/lib/mangband
-@exec install -d -o games -g games -m 750 %D/lib/mangband/apex
-@exec install -d -o games -g games -m 750 %D/lib/mangband/bone
 @exec install -d -o games -g games -m 750 %D/lib/mangband/data
-@exec install -d -o games -g games -m 750 %D/lib/mangband/edit
 @exec install -d -o games -g games -m 750 %D/lib/mangband/file
-@exec install -d -o games -g games -m 750 %D/lib/mangband/help
-@exec install -d -o games -g games -m 750 %D/lib/mangband/info
+@exec install -d -o games -g games -m 750 %D/lib/mangband/game
+@exec install -d -o games -g games -m 750 %D/lib/mangband/text
 @exec install -d -o games -g games -m 750 %D/lib/mangband/save
 @exec install -d -o games -g games -m 755 %D/lib/mangband/user
-@exec install -d -o games -g games -m 750 %D/lib/mangband/xtra
-lib/mangband/edit/a_info.txt
-lib/mangband/edit/e_info.txt
-lib/mangband/edit/f_info.txt
-lib/mangband/edit/k_info.txt
-lib/mangband/edit/r_info.txt
-lib/mangband/edit/v_info.txt
-lib/mangband/file/dead.txt
-lib/mangband/file/news.txt
 lib/mangband/file/wizards.txt
-lib/mangband/help/attack.txt
-lib/mangband/help/birth.txt
-lib/mangband/help/command.txt
-lib/mangband/help/dungeon.txt
-lib/mangband/help/general.txt
-lib/mangband/help/help.hlp
-lib/mangband/help/mangband.hlp
-lib/mangband/help/option.txt
-lib/mangband/help/version.txt
+lib/mangband/game/a_info.txt
+lib/mangband/game/e_info.txt
+lib/mangband/game/f_info.txt
+lib/mangband/game/k_info.txt
+lib/mangband/game/r_info.txt
+lib/mangband/game/v_info.txt
+lib/mangband/text/attack.txt
+lib/mangband/text/birth.txt
+lib/mangband/text/command.txt
+lib/mangband/text/dead.txt
+lib/mangband/text/dungeon.txt
+lib/mangband/text/general.txt
+lib/mangband/text/help.hlp
+lib/mangband/text/mangband.hlp
+lib/mangband/text/news.txt
+lib/mangband/text/option.txt
+lib/mangband/text/version.txt
 lib/mangband/user/font-ami.prf
 lib/mangband/user/font-ibm.prf
 lib/mangband/user/font-win.prf
@@ -45,16 +40,11 @@ lib/mangband/user/pref-win.prf
 lib/mangband/user/pref-x11.prf
 lib/mangband/user/pref-xaw.prf
 lib/mangband/user/pref.prf
-lib/mangband/user/priest.prf
 lib/mangband/user/window.prf
-@dirrm lib/mangband/apex
-@dirrm lib/mangband/bone
-@dirrm lib/mangband/data
-@dirrm lib/mangband/edit
-@dirrm lib/mangband/file
-@dirrm lib/mangband/help
-@dirrm lib/mangband/info
-@dirrm lib/mangband/save
 @dirrm lib/mangband/user
-@dirrm lib/mangband/xtra
+@dirrm lib/mangband/save
+@dirrm lib/mangband/text
+@dirrm lib/mangband/game
+@dirrm lib/mangband/file
+@dirrm lib/mangband/data
 @dirrm lib/mangband