diff options
author | obache <obache@pkgsrc.org> | 2010-12-25 09:59:25 +0000 |
---|---|---|
committer | obache <obache@pkgsrc.org> | 2010-12-25 09:59:25 +0000 |
commit | a422c9036d70c40d263deae61d16850d91076d5a (patch) | |
tree | dbdb4f25cb9aacfcb629d5e12d31c625a0c3d392 | |
parent | a8613d6178521e6fd79ec194fdd91e3ed319e9b5 (diff) | |
download | pkgsrc-a422c9036d70c40d263deae61d16850d91076d5a.tar.gz |
simplify.
-rw-r--r-- | games/dungeon/Makefile | 12 | ||||
-rw-r--r-- | games/dungeon/distinfo | 8 | ||||
-rw-r--r-- | games/dungeon/patches/patch-aa | 6 | ||||
-rw-r--r-- | games/dungeon/patches/patch-ab | 8 | ||||
-rw-r--r-- | games/dungeon/patches/patch-ac | 16 |
5 files changed, 24 insertions, 26 deletions
diff --git a/games/dungeon/Makefile b/games/dungeon/Makefile index 39416e8e81b..ab4bba2b7d4 100644 --- a/games/dungeon/Makefile +++ b/games/dungeon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2010/01/29 20:27:03 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2010/12/25 09:59:25 obache Exp $ # DISTNAME= dungeon-3.2b @@ -27,7 +27,7 @@ NO_BIN_ON_FTP= ${RESTRICTED} NO_SRC_ON_CDROM= ${RESTRICTED} NO_SRC_ON_FTP= ${RESTRICTED} -WRKSRC= ${WRKDIR}/dungeon-gdt +WRKSRC= ${WRKDIR} DATADIR= ${PREFIX}/share/dungeon MAKE_FLAGS+= DATADIR=${DATADIR} @@ -42,15 +42,13 @@ MAKE_ENV+= GDT_FLAG=-DHAVE_GDT .endif # Before we build the game itself, we need to build the glkterm library - -pre-build: - cd ${WRKDIR}/glkterm && env ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} +BUILD_DIRS= glkterm dungeon-gdt INSTALLATION_DIRS+= bin ${DATADIR} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/dungeon ${DESTDIR}${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/dundat ${DESTDIR}${DATADIR}/ + ${INSTALL_PROGRAM} ${WRKSRC}/dungeon-gdt/dungeon ${DESTDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/dungeon-gdt/dundat ${DESTDIR}${DATADIR}/ .include "../../devel/ncurses/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/dungeon/distinfo b/games/dungeon/distinfo index 0e9ea917168..d399847e67b 100644 --- a/games/dungeon/distinfo +++ b/games/dungeon/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2010/12/25 09:48:09 obache Exp $ +$NetBSD: distinfo,v 1.4 2010/12/25 09:59:25 obache Exp $ SHA1 (dungeon-gdt-glk.tar.gz) = ec148735ae713566c9511057473fbd899d673a6a RMD160 (dungeon-gdt-glk.tar.gz) = aed6e4a42c03be0a9bce2248dcab3370e1b1fbde @@ -6,6 +6,6 @@ Size (dungeon-gdt-glk.tar.gz) = 262052 bytes SHA1 (glkterm-080.tar.gz) = 8445929f9e00d773e3708aeae3bd3f602df2e97e RMD160 (glkterm-080.tar.gz) = 57e317e816a8c233fd0f2fe24a7c8a54c223edbc Size (glkterm-080.tar.gz) = 91260 bytes -SHA1 (patch-aa) = 4669935f7c106bd27d626b2a8171969f73edeb06 -SHA1 (patch-ab) = d7d83456c67f39c75b9fa161b82257fdf10eb966 -SHA1 (patch-ac) = b2fbb85157db8061fec21c9dd97b88cc39918331 +SHA1 (patch-aa) = 172cc658c3ec2f188448659708e2047d01e426e0 +SHA1 (patch-ab) = 05ddacb4213b23e2cbee576d7ac5074700b6a895 +SHA1 (patch-ac) = a44574841a5c344de484053daea0394845534ef8 diff --git a/games/dungeon/patches/patch-aa b/games/dungeon/patches/patch-aa index 0d9c5284f50..c3c29597f64 100644 --- a/games/dungeon/patches/patch-aa +++ b/games/dungeon/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.2 2010/12/25 09:48:09 obache Exp $ +$NetBSD: patch-aa,v 1.3 2010/12/25 09:59:25 obache Exp $ Use an explicit 32-bit data type. ---- ../glkterm/glk.h.orig 2009-11-20 14:08:17.000000000 -0800 -+++ ../glkterm/glk.h 2009-11-20 13:06:19.000000000 -0800 +--- glkterm/glk.h.orig 2008-03-15 15:43:04.000000000 +0000 ++++ glkterm/glk.h @@ -17,8 +17,15 @@ /* You may have to edit the definition of glui32 to make sure it's really a 32-bit unsigned integer type, and glsi32 to make sure it's really a diff --git a/games/dungeon/patches/patch-ab b/games/dungeon/patches/patch-ab index fb72eca5429..13e508b0926 100644 --- a/games/dungeon/patches/patch-ab +++ b/games/dungeon/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.1 2009/11/28 20:25:40 pgoyette Exp $ +$NetBSD: patch-ab,v 1.2 2010/12/25 09:59:25 obache Exp $ Remove an obsolete check that pointers fit into 32-bit data types. I was unable to find any code remaining that depends on this, and at least one program (dungeon!) works just fine without having had to do any hashtable coding! ---- ../glkterm/main.c.orig 2009-11-20 14:08:33.000000000 -0800 -+++ ../glkterm/main.c 2009-11-20 13:14:24.000000000 -0800 -@@ -52,10 +52,12 @@ +--- glkterm/main.c.orig 2008-03-18 02:32:07.000000000 +0000 ++++ glkterm/main.c +@@ -52,10 +52,12 @@ int main(int argc, char *argv[]) printf("Compile-time error: glui32 is not unsigned. Please fix glk.h.\n"); return 1; } diff --git a/games/dungeon/patches/patch-ac b/games/dungeon/patches/patch-ac index c497e3da5c9..5fa41fc9bca 100644 --- a/games/dungeon/patches/patch-ac +++ b/games/dungeon/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1 2009/12/10 22:00:25 pgoyette Exp $ +$NetBSD: patch-ac,v 1.2 2010/12/25 09:59:25 obache Exp $ The f2c translation maintains Fortran's pass-everything-by-reference, and as a result we get lots of constant values defined. Upstream @@ -6,9 +6,9 @@ took an earlier patch to provide a ftnlen typed version of the c__3 constant, but that patch was wrong. Correctly initialize the new constant. ---- parser.c.orig 2009-11-23 18:27:42.000000000 -0800 -+++ parser.c 2009-12-10 13:45:56.000000000 -0800 -@@ -663,7 +663,7 @@ +--- dungeon-gdt/parser.c.orig 2009-11-24 02:27:42.000000000 +0000 ++++ dungeon-gdt/parser.c +@@ -663,7 +663,7 @@ integer sparse_(char *lbuf, integer *lln /* System generated locals */ address a__1[3]; integer ret_val; @@ -17,7 +17,7 @@ constant. char ch__1[8]; /* Local variables */ -@@ -1318,7 +1318,6 @@ +@@ -1318,7 +1318,6 @@ L7000: i__1[1] = 8, a__1[1] = ch__1; i__1[2] = 1, a__1[2] = " "; s_cat(lcwrd1, a__1, i__1, &cc__3, 10L); @@ -25,7 +25,7 @@ constant. } if (obj < 0) { goto L7200; -@@ -1914,7 +1913,7 @@ +@@ -1914,7 +1913,7 @@ logical synmch_(integer *x) { /* System generated locals */ address a__1[3]; @@ -34,7 +34,7 @@ constant. integer i__2, i__3, i__4; logical ret_val; char ch__1[8], ch__2[8]; -@@ -2061,7 +2060,6 @@ +@@ -2061,7 +2060,6 @@ L3100: i__1[1] = 8, a__1[1] = ch__1; i__1[2] = 1, a__1[2] = " "; s_cat(lcprp1, a__1, i__1, &cc__3, 10L); @@ -42,7 +42,7 @@ constant. /* Writing concatenation */ i__1[0] = 1, a__1[0] = " "; i__2 = prssta_1.iobj & 511; -@@ -2070,7 +2068,6 @@ +@@ -2070,7 +2068,6 @@ L3100: i__1[1] = 8, a__1[1] = ch__1; i__1[2] = 1, a__1[2] = " "; s_cat(lcprp2, a__1, i__1, &cc__3, 10L); |