Don't abuse PATCHFILES, copy patches from angband-tty instead.

Addresses part of 15717.

6 files changed, 101 insertions, 12 deletions

diff --git a/games/angband-x11/Makefile b/games/angband-x11/Makefile
index d75cdd55c44..30524aeecf2 100644
--- a/games/angband-x11/Makefile
+++ b/games/angband-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/12/15 20:25:36 agc Exp $
+# $NetBSD: Makefile,v 1.10 2002/03/18 15:30:15 wiz Exp $
 #
 
 DISTNAME=		angband-283
@@ -20,9 +20,6 @@ MAKEFILE=		Makefile.std
 ALL_TARGET=		angband
 USE_X11=		yes
 
-PATCHFILES+=		${_PKGSRCDIR}/games/angband-tty/patches/patch-*
-ALLFILES=		${DISTFILES}	# don't checksum shared patches
-
 SPOILERFILE=		angband-spoilers.tar.gz
 
 do-install:
diff --git a/games/angband-x11/distinfo b/games/angband-x11/distinfo
index 196aeb6b71b..111b14bc5bf 100644
--- a/games/angband-x11/distinfo
+++ b/games/angband-x11/distinfo
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 02:08:17 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/03/18 15:30:15 wiz Exp $
 
 SHA1 (angband-283.tar.gz) = 1dc4a2786c31c2336daf57f76f4fa762f7d84cf3
 Size (angband-283.tar.gz) = 822762 bytes
 SHA1 (angband-spoilers.tar.gz) = 6f5db28f686be3f41df6c22990c53f9e46a1c7cd
 Size (angband-spoilers.tar.gz) = 234909 bytes
-SHA1 (patch-aa) = 069d80b8d749f0b102f27598bfac4a128f76770d
+SHA1 (patch-aa) = 4ac1892fd94ef97431a5860caacdb6394b01bd5b
+SHA1 (patch-ab) = 6abaa44ac3131720855950598e4bfa18fc0c595a
+SHA1 (patch-ac) = 845a47bec2b5eb3abf10d2f7f244041d8167fba6
+SHA1 (patch-ad) = ea446d8d7f79a35f0d70aa8bf03a18dcf87f908b
diff --git a/games/angband-x11/patches/patch-aa b/games/angband-x11/patches/patch-aa
index 1a48147da49..d8931ef39fa 100644
--- a/games/angband-x11/patches/patch-aa
+++ b/games/angband-x11/patches/patch-aa
@@ -1,11 +1,16 @@
-$NetBSD: patch-aa,v 1.1 1998/08/27 13:22:08 garbled Exp $
---- Makefile.std.orig	Sun Aug  9 02:28:37 1998
-+++ Makefile.std	Sun Aug  9 02:31:59 1998
-@@ -117,4 +117,5 @@
+$NetBSD: patch-aa,v 1.2 2002/03/18 15:30:15 wiz Exp $
+
+--- Makefile.std.orig	Wed Feb 11 12:30:28 1998
++++ Makefile.std
+@@ -115,8 +115,9 @@
+ # 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 -O -D"USE_GCU" -DDEFAULT_PATH=\"$(PREFIX)/share/angband/\"
--LIBS = -lcurses -ltermcap
+-CFLAGS = -Wall -O1 -pipe -g -D"USE_X11" -D"USE_GCU"
+-LIBS = -lX11 -lcurses -ltermcap
 +CFLAGS = -Wall -O -D"USE_X11" -D"USE_GCU" \
 +	-DDEFAULT_PATH=\"$(PREFIX)/share/angband/\" -I$(X11BASE)/include
 +LIBS = -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib -lX11 -lXmu -lXaw -lXt -lcurses -ltermcap
  
+ 
+ ##
diff --git a/games/angband-x11/patches/patch-ab b/games/angband-x11/patches/patch-ab
new file mode 100644
index 00000000000..8ed6a206415
--- /dev/null
+++ b/games/angband-x11/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.1 2002/03/18 15:30:16 wiz Exp $
+
+--- config.h.orig	Wed Feb 11 12:30:28 1998
++++ config.h
+@@ -46,7 +46,7 @@
+  * OPTION: define "SPECIAL_BSD" for using certain versions of UNIX
+  * that use the 4.4BSD Lite version of Curses in "main-gcu.c"
+  */
+-/* #define SPECIAL_BSD */
++#define SPECIAL_BSD
+ 
+ 
+ /*
+@@ -229,7 +229,7 @@
+  * about 15K of code in "save-old.c" to parse the old savefile format.
+  * Angband 2.8.0 will ignore a lot of info from pre-2.7.0 savefiles.
+  */
+-#define ALLOW_OLD_SAVEFILES
++/* #define ALLOW_OLD_SAVEFILES */
+ 
+ 
+ /*
diff --git a/games/angband-x11/patches/patch-ac b/games/angband-x11/patches/patch-ac
new file mode 100644
index 00000000000..7ca78cf5efa
--- /dev/null
+++ b/games/angband-x11/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2002/03/18 15:30:16 wiz Exp $
+
+--- h-config.h.orig	Fri Feb  6 10:10:31 1998
++++ h-config.h
+@@ -177,7 +177,7 @@
+  * The only such platform that angband is ported to is currently
+  * DEC Alpha AXP running OSF/1 (OpenVMS uses 32-bit longs).
+  */
+-#if defined(__alpha) && defined(__osf__)
++#if defined(__alpha) && (defined(__osf__) || defined(__NetBSD__))
+ # define L64
+ #endif
+ 
diff --git a/games/angband-x11/patches/patch-ad b/games/angband-x11/patches/patch-ad
new file mode 100644
index 00000000000..434fda00b4c
--- /dev/null
+++ b/games/angband-x11/patches/patch-ad
@@ -0,0 +1,49 @@
+$NetBSD: patch-ad,v 1.1 2002/03/18 15:30:17 wiz Exp $
+
+--- main-gcu.c.orig	Fri Feb  6 10:10:31 1998
++++ main-gcu.c
+@@ -458,6 +458,14 @@
+ 		/* Flush the curses buffer */
+ 		(void)refresh();
+ 
++#ifdef __NetBSD__
++		{
++		        int cury, curx;
++
++			getyx(curscr, cury, curx);
++			mvcur(cury, curx, LINES - 1, 0);
++		}
++#else
+ #ifdef SPECIAL_BSD
+ 		/* this moves curses to bottom right corner */
+ 		mvcur(curscr->cury, curscr->curx, LINES - 1, 0);
+@@ -465,6 +473,7 @@
+ 		/* this moves curses to bottom right corner */
+ 		mvcur(curscr->_cury, curscr->_curx, LINES - 1, 0);
+ #endif
++#endif
+ 
+ 		/* Exit curses */
+ 		endwin();
+@@ -529,12 +538,21 @@
+ 	/* Hack -- make sure the cursor is visible */
+ 	Term_xtra(TERM_XTRA_SHAPE, 1);
+ 
++#ifdef __NetBSD__
++	{
++	        int cury, curx;
++
++		getyx(curscr, cury, curx);
++		mvcur(cury, curx, LINES - 1, 0);
++	}
++#else
+ #ifdef SPECIAL_BSD
+ 	/* This moves curses to bottom right corner */
+ 	mvcur(curscr->cury, curscr->curx, LINES - 1, 0);
+ #else
+ 	/* This moves curses to bottom right corner */
+ 	mvcur(curscr->_cury, curscr->_curx, LINES - 1, 0);
++#endif
+ #endif
+ 
+ 	/* Flush the curses buffer */