***

       games/affenspiel
       - Support CC properly
       ***
       games/battalion
       - Support PREFIX properly
       ***
       games/block
       - Support CC/CFLAGS properly
       ***
       games/blue
       - Support CC/CFLAGS properly
       - Add WWW: line into pkg/DESCR

       New file:
       patches/patch-aa
       ***
       games/bs
       - Add WWW: line into pkg/DESCR
       ***
       games/columns
       - Support CXXFLAGS properly
       - Support sdl-config
       ***
       games/empire
       - Exclude GPL doc from package
       - Add WWW: line into pkg/DESCR
       ***
       games/freesweep to 0.87
       - Update to version 0.87
       ***
       games/galaxis
       - Support CC properly
       - Add WWW: line into pkg/DESCR
       ***
       games/garith
       - Support CC/CFLAGS properly
       - Support GTK_CONFIG
       ***
       games/gemdropx to 0.7
       - Update to version 0.7
       ***
       games/gtkballs
       - Exclude GPL doc from package
       - Support GTK_CONFIG
       ***
       games/icbm3d
       - Update WWW: line of pkg/DESCR
       ***
       games/mirrormagic
       - Support CC/X11BASE properly
       ***
       games/phalanx to 22
       - Update to version 22
       - Add WWW: line into pkg/DESCR
       ***
       games/spellcast
       - Update MASTER_SITES and WWW: line of pkg/DESCR
       - Support CFLAGS properly
       - Exclude GPL doc from package
       ***
       games/starlanes
       - Support CC properly
       - Exclude GPL doc from package
       ***
       games/xdigger to 1.0.10
       - Update to version 1.0.10

       New file:
       patches/patch-ad  patches/patch-ae
       ***
       games/xtron
       - Support PREFIX properly
       - Exclude GPL doc from package
       ***
       games/xtruco
       - Support CC/CFLAGS/X11BASE properly
       ***
       games/xvier
       - Support X11BASE properly
       ***

PR: 17741
Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>

6 files changed, 59 insertions, 28 deletions

diff --git a/games/xdigger/Makefile b/games/xdigger/Makefile
index 5b14ec784978..cb123baa37c3 100644
--- a/games/xdigger/Makefile
+++ b/games/xdigger/Makefile
@@ -1,38 +1,38 @@
 # New ports collection makefile for:	xdigger
-# Version required:			1.0.9
+# Version required:			1.0.10
 # Date created:				29 June 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		xdigger-1.0.9
-CATEGORIES=		games
-MASTER_SITES=		${MASTER_SITE_SUNSITE}
+DISTNAME=	xdigger-1.0.10
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/arcade
-EXTRACT_SUFX=		.tgz
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-USE_IMAKE=		yes
-MAN6=			xdigger.6
-MANCOMPRESSED=		no
+USE_IMAKE=	yes
+MAN6=		xdigger.6
+MANCOMPRESSED=	no
+
+post-patch:
+	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/configure.h
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/xdigger ${PREFIX}/bin
-	@ ${INSTALL_DATA} ${WRKSRC}/xdigger.man ${PREFIX}/man/man6/xdigger.6
-	@ ${MKDIR} ${PREFIX}/share/xdigger
-	@ ${INSTALL_DATA} ${WRKSRC}/xdigger.hiscore ${PREFIX}/share/xdigger
-	@ ${INSTALL_DATA} ${WRKSRC}/xdigger.level ${PREFIX}/share/xdigger
-.for file in diamond.au step.au stone.au
-	@ ${INSTALL_DATA} ${WRKSRC}/audio/${file} ${PREFIX}/share/xdigger
-.endfor
-	@ ${CHMOD} a+rw ${PREFIX}/share/xdigger/xdigger.hiscore
+	${INSTALL_PROGRAM} ${WRKSRC}/xdigger ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/xdigger.man ${PREFIX}/man/man6/xdigger.6
+	@${MKDIR} ${PREFIX}/share/xdigger
+	${INSTALL_DATA} ${WRKSRC}/xdigger.level ${PREFIX}/share/xdigger
+	${INSTALL_DATA} ${WRKSRC}/audio/*.au ${PREFIX}/share/xdigger
+	@${TOUCH} ${PREFIX}/share/xdigger/xdigger.hiscore
+	@${CHMOD} a+rw ${PREFIX}/share/xdigger/xdigger.hiscore
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/xdigger
-.for file in COPYING ChangeLog README
-	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/xdigger
-.endfor
+	@${MKDIR} ${PREFIX}/share/doc/xdigger
+	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/xdigger
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xdigger
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/xdigger/distinfo b/games/xdigger/distinfo
index 0e44540d1605..4c8c22da5eea 100644
--- a/games/xdigger/distinfo
+++ b/games/xdigger/distinfo
@@ -1 +1 @@
-MD5 (xdigger-1.0.9.tgz) = 4579ac31a83f8868290dbfa2ad988c9a
+MD5 (xdigger-1.0.10.tgz) = 74959b5c3f0ba47d1f25f515438c86ab
diff --git a/games/xdigger/files/patch-aa b/games/xdigger/files/patch-aa
index 13e59245dc1d..119e40e9fbec 100644
--- a/games/xdigger/files/patch-aa
+++ b/games/xdigger/files/patch-aa
@@ -1,12 +1,12 @@
---- configure.h	Thu Jan  1 00:06:00 1998
-+++ /home/andy/tmp/wrk/configure.h	Sat Jun 29 23:18:58 1996
+--- configure.h.orig	Thu Jan  1 00:06:00 1998
++++ configure.h	Thu Mar 30 03:40:23 2000
 @@ -19,8 +19,13 @@
  #define _CONFIGURE_H
  
  /* Directories */
 +#ifdef __FreeBSD__
-+#define XDIGGER_LIB_DIR     "/usr/X11R6/share/xdigger"
-+#define XDIGGER_HISCORE_DIR "/usr/X11R6/share/xdigger"
++#define XDIGGER_LIB_DIR     "%%PREFIX%%/share/xdigger"
++#define XDIGGER_HISCORE_DIR "%%PREFIX%%/share/xdigger"
 +#else
  #define XDIGGER_LIB_DIR     "/usr/lib/X11/xdigger"
  #define XDIGGER_HISCORE_DIR "/var/X11R6/scores"
diff --git a/games/xdigger/files/patch-ad b/games/xdigger/files/patch-ad
new file mode 100644
index 000000000000..05c4033ad37d
--- /dev/null
+++ b/games/xdigger/files/patch-ad
@@ -0,0 +1,18 @@
+--- Imakefile.orig	Sun Jul  4 18:47:11 1999
++++ Imakefile	Thu Mar 30 03:59:25 2000
+@@ -1,12 +1,12 @@
+ #include "configure.h"
+ 
+-BINDIR=/usr/bin/X11
++#BINDIR=/usr/bin/X11
+ MANDIR=$(MANSOURCEPATH)6
+ MANSUFFIX=6
+-ICONDIR=/usr/include/X11/pixmaps
++ICONDIR=$(INCDIR)/X11/pixmaps
+ 
+ # Flags
+-CDEBUGFLAGS = -Wall
++#CDEBUGFLAGS = -Wall
+ 
+ #ifdef SOUND_RPLAY
+ RPLAYLIB = -lrplay
diff --git a/games/xdigger/files/patch-ae b/games/xdigger/files/patch-ae
new file mode 100644
index 000000000000..e5268927ead0
--- /dev/null
+++ b/games/xdigger/files/patch-ae
@@ -0,0 +1,14 @@
+--- drawpixmaps.c.orig	Sun Jul  4 18:50:44 1999
++++ drawpixmaps.c	Thu Mar 30 04:00:13 2000
+@@ -14,7 +14,11 @@
+ along with this program; see the file COPYING.  If not, write to
+ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+ 
++#ifndef __STDC__
+ #include <malloc.h>
++#else
++#include <stdlib.h>
++#endif
+ #include <stdio.h>
+ #include <string.h>
+ #include <X11/Xlib.h>
diff --git a/games/xdigger/pkg-plist b/games/xdigger/pkg-plist
index 5a7b124803e4..79489911f50a 100644
--- a/games/xdigger/pkg-plist
+++ b/games/xdigger/pkg-plist
@@ -1,5 +1,4 @@
 bin/xdigger
-share/doc/xdigger/COPYING
 share/doc/xdigger/ChangeLog
 share/doc/xdigger/README
 share/xdigger/diamond.au