10 files changed, 93 insertions, 86 deletions

diff --git a/games/xmille/Makefile b/games/xmille/Makefile
index 168dcce78251..37be1c728003 100644
--- a/games/xmille/Makefile
+++ b/games/xmille/Makefile
@@ -7,16 +7,20 @@
 
 PORTNAME=	xmille
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_XCONTRIB}  \
-		ftp://gatekeeper.dec.com/pub/X11-contrib/
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
-DISTFILES=	xmille.tar.Z
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+WRKSRC=		${WRKDIR}/Mille
+
 USE_IMAKE=	yes
-NO_WRKSUBDIR=	yes
 MAN1=		xmille.1
 
+post-extract:
+	@find ${WRKSRC} -name '*.[ao]' -delete
+
 .include <bsd.port.mk>
diff --git a/games/xmille/distinfo b/games/xmille/distinfo
index 949a51a4e721..fb6f04bb2b91 100644
--- a/games/xmille/distinfo
+++ b/games/xmille/distinfo
@@ -1 +1 @@
-MD5 (xmille.tar.Z) = 02dec1275c13d1f5e14588062c431636
+MD5 (xmille.tar.gz) = 31b018c3a02647c21b3369ade19dcd90
diff --git a/games/xmille/files/patch-aa b/games/xmille/files/patch-aa
deleted file mode 100644
index e4901f80ece5..000000000000
--- a/games/xmille/files/patch-aa
+++ /dev/null
@@ -1,48 +0,0 @@
-*** drawcard.c.orig	Thu Sep 16 00:47:18 1993
---- drawcard.c	Thu Sep 16 00:41:29 1993
-***************
-*** 183,194 ****
-  				WIDTH, HEIGHT);
-  		
-  		XSetForeground(dpy, cheap_gc, bits_p);
-! 		XSetStipple(dpy, cheap_gc, bits);
-  		XFillRectangle (dpy, cards[i].bits, cheap_gc, 0, 0,
-  				WIDTH, HEIGHT);
-  		
-  		XSetForeground(dpy, cheap_gc, mask_p);
-! 		XSetStipple(dpy, cheap_gc, mask);
-  		XFillRectangle (dpy, cards[i].bits, cheap_gc, 0, 0,
-  				WIDTH, HEIGHT);
-  		
---- 183,194 ----
-  				WIDTH, HEIGHT);
-  		
-  		XSetForeground(dpy, cheap_gc, bits_p);
-! 		XSetStipple(dpy, cheap_gc, mask);
-  		XFillRectangle (dpy, cards[i].bits, cheap_gc, 0, 0,
-  				WIDTH, HEIGHT);
-  		
-  		XSetForeground(dpy, cheap_gc, mask_p);
-! 		XSetStipple(dpy, cheap_gc, bits);
-  		XFillRectangle (dpy, cards[i].bits, cheap_gc, 0, 0,
-  				WIDTH, HEIGHT);
-  		
-*** roll.c.orig	Thu Apr  2 06:15:57 1992
---- roll.c	Thu Sep 16 00:36:38 1993
-***************
-*** 7,13 ****
-  
-  # define	reg	register
-  
-! # if (! defined ultrix && ! defined mips && ! defined vax)
-  # define	MAXRAND	32767L
-  
-  roll(ndie, nsides)
---- 7,13 ----
-  
-  # define	reg	register
-  
-! # if (! defined ultrix && ! defined mips && ! defined vax && ! defined __386BSD__ && ! defined __FreeBSD__)
-  # define	MAXRAND	32767L
-  
-  roll(ndie, nsides)
diff --git a/games/xmille/files/patch-ab b/games/xmille/files/patch-ab
index cd9ce57c259d..f21668f9fd04 100644
--- a/games/xmille/files/patch-ab
+++ b/games/xmille/files/patch-ab
@@ -1,19 +1,11 @@
-*** Imakefile.orig	Thu Apr  2 06:03:24 1992
---- Imakefile	Fri Dec 30 21:14:47 1994
-***************
-*** 5,11 ****
-  /**/# Dana Chee
-  /**/#
-  #define IHaveSubdirs
-! #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS) DEFINES=$(DEFINES)'
-  
-  HEADERS = ui.h
-  SRCS=	comp.c end.c extern.c init.c mille.c misc.c move.c print.c \
---- 5,11 ----
-  /**/# Dana Chee
-  /**/#
-  #define IHaveSubdirs
-! #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS) $(DEFINES)'
-  
-  HEADERS = ui.h
-  SRCS=	comp.c end.c extern.c init.c mille.c misc.c move.c print.c \
+--- Imakefile.orig	Thu Apr  2 23:03:24 1992
++++ Imakefile	Wed Jan 31 23:04:28 2001
+@@ -5,7 +5,7 @@
+ /**/# Dana Chee
+ /**/#
+ #define IHaveSubdirs
+-#define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS) DEFINES=$(DEFINES)'
++#define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS) $(DEFINES)'
+ 
+ HEADERS = ui.h
+ SRCS=	comp.c end.c extern.c init.c mille.c misc.c move.c print.c \
diff --git a/games/xmille/files/patch-ac b/games/xmille/files/patch-ac
index 6a1f787e3137..c8338cd71e64 100644
--- a/games/xmille/files/patch-ac
+++ b/games/xmille/files/patch-ac
@@ -1,14 +1,12 @@
-*** save.c.orig	Wed Apr  1 12:56:45 1992
---- save.c	Fri Dec 30 21:17:28 1994
-***************
-*** 22,28 ****
---- 22,30 ----
-   *	This routine saves the current game for use at a later date
-   */
-  extern int	errno;
-+ #ifndef __FreeBSD__
-  extern char	*sys_errlist[];
-+ #endif
-  
-  save() {
-  
+--- save.c.orig	Thu Apr  2 05:56:45 1992
++++ save.c	Wed Jan 31 23:04:29 2001
+@@ -22,7 +22,9 @@
+  *	This routine saves the current game for use at a later date
+  */
+ extern int	errno;
++#ifndef __FreeBSD__
+ extern char	*sys_errlist[];
++#endif
+ 
+ save() {
+ 
diff --git a/games/xmille/files/patch-ad b/games/xmille/files/patch-ad
new file mode 100644
index 000000000000..16ef005244ac
--- /dev/null
+++ b/games/xmille/files/patch-ad
@@ -0,0 +1,17 @@
+--- drawcard.c.orig	Thu Apr  2 05:55:06 1992
++++ drawcard.c	Wed Jan 31 23:04:23 2001
+@@ -183,12 +183,12 @@
+ 				WIDTH, HEIGHT);
+ 		
+ 		XSetForeground(dpy, cheap_gc, bits_p);
+-		XSetStipple(dpy, cheap_gc, bits);
++		XSetStipple(dpy, cheap_gc, mask);
+ 		XFillRectangle (dpy, cards[i].bits, cheap_gc, 0, 0,
+ 				WIDTH, HEIGHT);
+ 		
+ 		XSetForeground(dpy, cheap_gc, mask_p);
+-		XSetStipple(dpy, cheap_gc, mask);
++		XSetStipple(dpy, cheap_gc, bits);
+ 		XFillRectangle (dpy, cards[i].bits, cheap_gc, 0, 0,
+ 				WIDTH, HEIGHT);
+ 		
diff --git a/games/xmille/files/patch-ae b/games/xmille/files/patch-ae
new file mode 100644
index 000000000000..b53110ee65b8
--- /dev/null
+++ b/games/xmille/files/patch-ae
@@ -0,0 +1,11 @@
+--- mille.c.orig	Thu Mar 28 14:29:31 1996
++++ mille.c	Thu Feb  1 00:23:54 2001
+@@ -10,7 +10,7 @@
+ 
+ int	rub();
+ 
+-/*char	_sobuf[BUFSIZ];*/
++char	_sobuf[BUFSIZ];
+ 
+ main(ac, av)
+ reg int		ac;
diff --git a/games/xmille/files/patch-af b/games/xmille/files/patch-af
new file mode 100644
index 000000000000..7bc6bf5eebe2
--- /dev/null
+++ b/games/xmille/files/patch-af
@@ -0,0 +1,11 @@
+--- move.c.orig	Thu Mar 28 15:13:44 1996
++++ move.c	Thu Feb  1 00:33:58 2001
+@@ -9,8 +9,6 @@
+ #endif
+ #define	CTRL(c)		(c - 'A' + 1)
+ 
+-#define ANIMATE 1
+-
+ /*extern FILE *outf;*/
+ 
+ char	*Movenames[] = {
diff --git a/games/xmille/files/patch-ag b/games/xmille/files/patch-ag
new file mode 100644
index 000000000000..0ee99c117ee9
--- /dev/null
+++ b/games/xmille/files/patch-ag
@@ -0,0 +1,11 @@
+--- roll.c.orig	Thu Apr  2 23:16:11 1992
++++ roll.c	Wed Jan 31 23:04:23 2001
+@@ -7,7 +7,7 @@
+ 
+ # define	reg	register
+ 
+-# if (! defined ultrix && ! defined mips && ! defined vax)
++# if (! defined ultrix && ! defined mips && ! defined vax && ! defined __386BSD__ && ! defined __FreeBSD__)
+ # define	MAXRAND	32767L
+ 
+ roll(ndie, nsides)
diff --git a/games/xmille/files/patch-ah b/games/xmille/files/patch-ah
new file mode 100644
index 000000000000..5fe504f73e2b
--- /dev/null
+++ b/games/xmille/files/patch-ah
@@ -0,0 +1,11 @@
+--- varpush.c.orig	Wed Jul  8 11:33:36 1987
++++ varpush.c	Thu Feb  1 00:27:53 2001
+@@ -36,7 +36,7 @@
+ 			char	buf[80];
+ over:
+ 			printf("Debug file:");
+-			gets(buf);
++			fgets(buf, sizeof(buf), stdin);
+ 			if ((outf = fopen(buf, "w")) == NULL) {
+ 				perror(buf);
+ 				goto over;