diff options
39 files changed, 146 insertions, 139 deletions
diff --git a/emulators/swarm/Makefile b/emulators/swarm/Makefile index 5ca94ae08cc..cb9c1d3f654 100644 --- a/emulators/swarm/Makefile +++ b/emulators/swarm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/06/16 06:57:51 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/11/03 21:51:57 rillig Exp $ # DISTNAME= swarm-0.61 @@ -9,13 +9,14 @@ MAINTAINER= agc@NetBSD.org HOMEPAGE= http://www.cl.cam.ac.uk/~mwd24/phd/swarm.html COMMENT= Software arm7M core emulator -WRKSRC= ${WRKDIR}/swarm/src +WRKSRC= ${WRKDIR}/swarm +BUILD_DIRS= src INSTALLATION_DIRS= bin do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/swarm ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/src/swarm ${PREFIX}/bin ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/swarm - ${INSTALL_DATA} ${WRKSRC}/../doc/swarm.pdf ${PREFIX}/share/doc/swarm + ${INSTALL_DATA} ${WRKSRC}/doc/swarm.pdf ${PREFIX}/share/doc/swarm .include "../../mk/bsd.pkg.mk" diff --git a/emulators/swarm/distinfo b/emulators/swarm/distinfo index 7eb3f7a0de3..e72a0ffad4f 100644 --- a/emulators/swarm/distinfo +++ b/emulators/swarm/distinfo @@ -1,15 +1,15 @@ -$NetBSD: distinfo,v 1.7 2005/02/23 18:49:21 agc Exp $ +$NetBSD: distinfo,v 1.8 2005/11/03 21:51:57 rillig Exp $ SHA1 (swarm-0.61.tar.gz) = 36ed52671f8be2cf8e799efd94a48b2919979d2c RMD160 (swarm-0.61.tar.gz) = d8e15da178236a46761a65cd52809276df5f3511 Size (swarm-0.61.tar.gz) = 395061 bytes -SHA1 (patch-aa) = 47bf38f1f6ffde193d4bbe03c8968c92ab66d406 -SHA1 (patch-ab) = 9859132762130859692614242f32022750db5a3f -SHA1 (patch-ac) = 57f5103fde8c1380ddd78c58dfd57c5368d92bfd -SHA1 (patch-ad) = a5a46138f385875511434f342654ad5e234f6647 -SHA1 (patch-ae) = 5b42d3332b6e1a7f5c8e94fa54007444a9de92b5 -SHA1 (patch-af) = 28479b4dd547cf55f4fb3968846140abf8f2dd5d -SHA1 (patch-ag) = c20ab04004bfe2982376c03b8411b698e6ba275f -SHA1 (patch-ah) = 806ce24ca3048953aa11f9c228c7cd759acc28c6 -SHA1 (patch-ai) = 03c5cf845928361926fec3983a8c2c3bdd1c449f -SHA1 (patch-aj) = ab261d34eda8b8f7307fb40e798205515169ddea +SHA1 (patch-aa) = 65da2134c0d99930412e60fbb3e0f299d3982113 +SHA1 (patch-ab) = 5a71a670297e4d8db2dd3c7c96d9528f878d13cb +SHA1 (patch-ac) = 20b0603e24178a6086531bd2f7eb0eb5fc0e99c3 +SHA1 (patch-ad) = bee100f2ed6311153f4286fc88c4a7dd98f3efb8 +SHA1 (patch-ae) = 08b8819ad53bb0a91c3ab7a56479b2f36faab754 +SHA1 (patch-af) = 8228c591fd22ee8984d1f434940ad2cbbba41a22 +SHA1 (patch-ag) = 4d3ca9cd45edc081b85019ec88135504b3e7b0a1 +SHA1 (patch-ah) = 94d58bdd8d48e73f49ef06ac90eb0a9b0e1af6db +SHA1 (patch-ai) = 51b43a6b560566447d588623b19d3da6ab7b4ade +SHA1 (patch-aj) = 227b459e8201320679d3484daa163a5a5c579b17 diff --git a/emulators/swarm/patches/patch-aa b/emulators/swarm/patches/patch-aa index b827e2b5475..3eea0de9b7e 100644 --- a/emulators/swarm/patches/patch-aa +++ b/emulators/swarm/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.4 2003/08/14 09:31:40 agc Exp $ +$NetBSD: patch-aa,v 1.5 2005/11/03 21:51:57 rillig Exp $ fix tests for endianness and use our own header files to get int64_t and uint64_t ---- swarm_types.h.orig Tue Apr 10 09:46:10 2001 -+++ swarm_types.h +--- src/swarm_types.h.orig Tue Apr 10 09:46:10 2001 ++++ src/swarm_types.h @@ -26,9 +26,10 @@ #ifndef __SWARM_TYPES_H__ #define __SWARM_TYPES_H__ diff --git a/emulators/swarm/patches/patch-ab b/emulators/swarm/patches/patch-ab index 4b823b4bbe3..a206c2798b0 100644 --- a/emulators/swarm/patches/patch-ab +++ b/emulators/swarm/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.3 2003/08/14 09:31:40 agc Exp $ +$NetBSD: patch-ab,v 1.4 2005/11/03 21:51:57 rillig Exp $ ---- Makefile.orig Wed Apr 11 17:43:07 2001 -+++ Makefile +--- src/Makefile.orig Wed Apr 11 17:43:07 2001 ++++ src/Makefile @@ -22,10 +22,10 @@ # ############################################################################### diff --git a/emulators/swarm/patches/patch-ac b/emulators/swarm/patches/patch-ac index f1455bbe3cd..e15561b05a1 100644 --- a/emulators/swarm/patches/patch-ac +++ b/emulators/swarm/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.1 2002/04/01 05:50:46 dmcmahill Exp $ +$NetBSD: patch-ac,v 1.2 2005/11/03 21:51:57 rillig Exp $ ---- isa_be.h.orig Mon Nov 6 12:38:08 2000 -+++ isa_be.h Mon Apr 1 00:43:50 2002 +--- src/isa_be.h.orig Mon Nov 6 12:38:08 2000 ++++ src/isa_be.h Mon Apr 1 00:43:50 2002 @@ -190,5 +190,5 @@ uint32_t p : 1; uint32_t u : 1; diff --git a/emulators/swarm/patches/patch-ad b/emulators/swarm/patches/patch-ad index ed7accdf64a..adc4e02cb46 100644 --- a/emulators/swarm/patches/patch-ad +++ b/emulators/swarm/patches/patch-ad @@ -1,7 +1,7 @@ -$NetBSD: patch-ad,v 1.1 2003/08/14 09:31:40 agc Exp $ +$NetBSD: patch-ad,v 1.2 2005/11/03 21:51:57 rillig Exp $ ---- uartctrl.cpp 2003/08/14 08:54:51 1.1 -+++ uartctrl.cpp 2003/08/14 09:15:14 +--- src/uartctrl.cpp 2003/08/14 08:54:51 1.1 ++++ src/uartctrl.cpp 2003/08/14 09:15:14 @@ -40,6 +40,29 @@ // int CUARTCtrl::GetPty() diff --git a/emulators/swarm/patches/patch-ae b/emulators/swarm/patches/patch-ae index 27a302d94f5..a96cf175c1c 100644 --- a/emulators/swarm/patches/patch-ae +++ b/emulators/swarm/patches/patch-ae @@ -1,7 +1,7 @@ -$NetBSD: patch-ae,v 1.1 2004/08/12 19:59:51 agc Exp $ +$NetBSD: patch-ae,v 1.2 2005/11/03 21:51:57 rillig Exp $ ---- core.cpp 2004/08/12 17:16:45 1.1 -+++ core.cpp 2004/08/12 17:17:18 +--- src/core.cpp 2004/08/12 17:16:45 1.1 ++++ src/core.cpp 2004/08/12 17:17:18 @@ -26,7 +26,7 @@ #include "core.h" #include "isa.h" diff --git a/emulators/swarm/patches/patch-af b/emulators/swarm/patches/patch-af index b4ab3a0b87a..51513e7266e 100644 --- a/emulators/swarm/patches/patch-af +++ b/emulators/swarm/patches/patch-af @@ -1,7 +1,7 @@ -$NetBSD: patch-af,v 1.1 2004/08/12 19:59:51 agc Exp $ +$NetBSD: patch-af,v 1.2 2005/11/03 21:51:57 rillig Exp $ ---- main.cpp 2004/08/12 18:28:49 1.1 -+++ main.cpp 2004/08/12 18:29:57 +--- src/main.cpp 2004/08/12 18:28:49 1.1 ++++ src/main.cpp 2004/08/12 18:29:57 @@ -34,11 +34,13 @@ #endif #include "cache.h" diff --git a/emulators/swarm/patches/patch-ag b/emulators/swarm/patches/patch-ag index 0dfa76e7e9b..f0a46bbef7b 100644 --- a/emulators/swarm/patches/patch-ag +++ b/emulators/swarm/patches/patch-ag @@ -1,7 +1,7 @@ -$NetBSD: patch-ag,v 1.1 2004/08/12 19:59:51 agc Exp $ +$NetBSD: patch-ag,v 1.2 2005/11/03 21:51:57 rillig Exp $ ---- syscopro.cpp 2004/08/12 18:34:07 1.1 -+++ syscopro.cpp 2004/08/12 18:37:39 +--- src/syscopro.cpp 2004/08/12 18:34:07 1.1 ++++ src/syscopro.cpp 2004/08/12 18:37:39 @@ -26,10 +26,12 @@ #include "syscopro.h" #include <string.h> diff --git a/emulators/swarm/patches/patch-ah b/emulators/swarm/patches/patch-ah index 42ac234a9dc..36a8add64a5 100644 --- a/emulators/swarm/patches/patch-ah +++ b/emulators/swarm/patches/patch-ah @@ -1,7 +1,7 @@ -$NetBSD: patch-ah,v 1.1 2004/08/12 19:59:51 agc Exp $ +$NetBSD: patch-ah,v 1.2 2005/11/03 21:51:57 rillig Exp $ ---- armproc.h 2004/08/12 18:45:56 1.1 -+++ armproc.h 2004/08/12 18:46:08 +--- src/armproc.h 2004/08/12 18:45:56 1.1 ++++ src/armproc.h 2004/08/12 18:46:08 @@ -29,7 +29,7 @@ #include "core.h" #include "cache.h" diff --git a/emulators/swarm/patches/patch-ai b/emulators/swarm/patches/patch-ai index dc101d30b8c..3c52ea6f61f 100644 --- a/emulators/swarm/patches/patch-ai +++ b/emulators/swarm/patches/patch-ai @@ -1,7 +1,7 @@ -$NetBSD: patch-ai,v 1.1 2004/08/12 19:59:51 agc Exp $ +$NetBSD: patch-ai,v 1.2 2005/11/03 21:51:57 rillig Exp $ ---- alu.cpp 2004/08/12 18:49:18 1.1 -+++ alu.cpp 2004/08/12 18:49:37 +--- src/alu.cpp 2004/08/12 18:49:18 1.1 ++++ src/alu.cpp 2004/08/12 18:49:37 @@ -24,7 +24,9 @@ #include "swarm.h" diff --git a/emulators/swarm/patches/patch-aj b/emulators/swarm/patches/patch-aj index 884e7b96151..b719fe18469 100644 --- a/emulators/swarm/patches/patch-aj +++ b/emulators/swarm/patches/patch-aj @@ -1,7 +1,7 @@ -$NetBSD: patch-aj,v 1.1 2004/08/12 19:59:51 agc Exp $ +$NetBSD: patch-aj,v 1.2 2005/11/03 21:51:57 rillig Exp $ ---- libc.cpp 2004/08/12 18:49:18 1.1 -+++ libc.cpp 2004/08/12 18:50:21 +--- src/libc.cpp 2004/08/12 18:49:18 1.1 ++++ src/libc.cpp 2004/08/12 18:50:21 @@ -31,12 +31,14 @@ #endif #include <fcntl.h> diff --git a/games/gnuchess4/Makefile b/games/gnuchess4/Makefile index 08c25f2df81..df5f77b6b0f 100644 --- a/games/gnuchess4/Makefile +++ b/games/gnuchess4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/03/24 21:12:54 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2005/11/03 22:01:10 rillig Exp $ DISTNAME= gnuchess-4.0.pl80 PKGNAME= gnuchess4-4.0.80 @@ -13,12 +13,13 @@ CONFLICTS= gnuchess-4.* NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL -WRKSRC= ${WRKDIR}/${DISTNAME}/src GNU_CONFIGURE= yes +CONFIGURE_DIRS= src +BUILD_DIRS= ${CONFIGURE_DIRS} post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gnuchess4 - cd ${WRKSRC}/../doc; ${INSTALL_DATA} \ + cd ${WRKSRC}/doc; ${INSTALL_DATA} \ ARTICLE ARTICLE.2 CHESSTOOL FAQ HEURISTICS MOVE-GEN \ README.font README.output \ ${PREFIX}/share/doc/gnuchess4 diff --git a/games/gnuchess4/distinfo b/games/gnuchess4/distinfo index 4bbff87d814..fc52812631f 100644 --- a/games/gnuchess4/distinfo +++ b/games/gnuchess4/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.4 2005/04/17 04:58:22 minskim Exp $ +$NetBSD: distinfo,v 1.5 2005/11/03 22:01:10 rillig Exp $ SHA1 (gnuchess-4.0.pl80.tar.gz) = 0c581be2e7b6b17524e288e105a468a7ca328c8b RMD160 (gnuchess-4.0.pl80.tar.gz) = 889510f73c3e5143fc312c010e8324e68c11dcdc Size (gnuchess-4.0.pl80.tar.gz) = 1493280 bytes -SHA1 (patch-aa) = 5536277956df81c31e7049e45fb9103dfa2aa58b -SHA1 (patch-ab) = 0149bdbaa0cce03ce29274bbbe2346013e045382 -SHA1 (patch-ac) = e3a320bc8e6e40be3a136b0229ff228b09bbe7a1 -SHA1 (patch-ad) = 33e3f2fe7792d1bb0e17ffec3e4499341446a28b -SHA1 (patch-ae) = 4c3a5aa4bedf06a7490676921071d974dd259d2e -SHA1 (patch-af) = b032046200573807801c2855e3a186f23e2591a9 +SHA1 (patch-aa) = 0528b70c06a07ba17093bce467446899b2eaf2fd +SHA1 (patch-ab) = 853b42df0871471047dddfb102841ad7d6e68499 +SHA1 (patch-ac) = 2d2ad394545b4eb4285389642c84872d4e0d9a25 +SHA1 (patch-ad) = 1fc8df5f7b34fd82fb43de71cdaf01ff5f72d51a +SHA1 (patch-ae) = 31ed0b133d10457b89eaa09e56cdbd5b3a1b382b +SHA1 (patch-af) = 220b368a8d2274419c9d173433a956ab5c0c96b4 diff --git a/games/gnuchess4/patches/patch-aa b/games/gnuchess4/patches/patch-aa index 37782a99bf6..1b065cd48b4 100644 --- a/games/gnuchess4/patches/patch-aa +++ b/games/gnuchess4/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.2 2005/04/17 04:58:22 minskim Exp $ +$NetBSD: patch-aa,v 1.3 2005/11/03 22:01:10 rillig Exp $ ---- dspcom.c.orig 1998-09-28 01:41:19.000000000 -0500 -+++ dspcom.c +--- src/dspcom.c.orig 1998-09-28 01:41:19.000000000 -0500 ++++ src/dspcom.c @@ -1099,7 +1099,7 @@ InputCommand (void) #ifdef NONDSP s[0] = sx[0] = '\0'; diff --git a/games/gnuchess4/patches/patch-ab b/games/gnuchess4/patches/patch-ab index 0abe7c9fe6b..7e26f8cd455 100644 --- a/games/gnuchess4/patches/patch-ab +++ b/games/gnuchess4/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.1.1.1 2000/03/26 14:44:41 jlam Exp $ +$NetBSD: patch-ab,v 1.2 2005/11/03 22:01:10 rillig Exp $ ---- gnuan.c.orig Sat Apr 3 05:58:53 1999 -+++ gnuan.c Wed Nov 17 23:57:25 1999 +--- src/gnuan.c.orig Sat Apr 3 05:58:53 1999 ++++ src/gnuan.c Wed Nov 17 23:57:25 1999 @@ -1348,12 +1348,12 @@ fpout = stderr; fprintf (fpout, "Input the file with the algebraic moves of the game.\n"); diff --git a/games/gnuchess4/patches/patch-ac b/games/gnuchess4/patches/patch-ac index ecce3c04705..81a10ce1e3e 100644 --- a/games/gnuchess4/patches/patch-ac +++ b/games/gnuchess4/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.1.1.1 2000/03/26 14:44:41 jlam Exp $ +$NetBSD: patch-ac,v 1.2 2005/11/03 22:01:10 rillig Exp $ ---- nondsp.c.orig Mon Sep 28 08:41:22 1998 -+++ nondsp.c Thu Dec 10 23:39:26 1998 +--- src/nondsp.c.orig Mon Sep 28 08:41:22 1998 ++++ src/nondsp.c Thu Dec 10 23:39:26 1998 @@ -264,10 +264,11 @@ NewGame (); diff --git a/games/gnuchess4/patches/patch-ad b/games/gnuchess4/patches/patch-ad index f3f1ead26f2..6325fe4474b 100644 --- a/games/gnuchess4/patches/patch-ad +++ b/games/gnuchess4/patches/patch-ad @@ -1,7 +1,7 @@ -$NetBSD: patch-ad,v 1.1.1.1 2000/03/26 14:44:41 jlam Exp $ +$NetBSD: patch-ad,v 1.2 2005/11/03 22:01:10 rillig Exp $ ---- search.c.orig Mon Sep 28 08:41:23 1998 -+++ search.c Thu Dec 10 23:39:26 1998 +--- src/search.c.orig Mon Sep 28 08:41:23 1998 ++++ src/search.c Thu Dec 10 23:39:26 1998 @@ -174,7 +174,7 @@ while (true) { diff --git a/games/gnuchess4/patches/patch-ae b/games/gnuchess4/patches/patch-ae index 6182bfbf914..7fe5fdb6ca0 100644 --- a/games/gnuchess4/patches/patch-ae +++ b/games/gnuchess4/patches/patch-ae @@ -1,7 +1,7 @@ -$NetBSD: patch-ae,v 1.2 2000/03/27 10:25:01 jlam Exp $ +$NetBSD: patch-ae,v 1.3 2005/11/03 22:01:10 rillig Exp $ ---- Makefile.in.orig Sun Sep 27 23:41:13 1998 -+++ Makefile.in Sun Mar 26 16:15:23 2000 +--- src/Makefile.in.orig Sun Sep 27 23:41:13 1998 ++++ src/Makefile.in Sun Mar 26 16:15:23 2000 @@ -127,7 +127,7 @@ prefix = @prefix@ diff --git a/games/gnuchess4/patches/patch-af b/games/gnuchess4/patches/patch-af index 47986c278a3..e508614eaf5 100644 --- a/games/gnuchess4/patches/patch-af +++ b/games/gnuchess4/patches/patch-af @@ -1,7 +1,7 @@ -$NetBSD: patch-af,v 1.1 2000/03/27 10:25:25 jlam Exp $ +$NetBSD: patch-af,v 1.2 2005/11/03 22:01:10 rillig Exp $ ---- ../doc/gnuchess.6.orig Sun Sep 27 23:41:10 1998 -+++ ../doc/gnuchess.6 Sun Mar 26 16:17:18 2000 +--- doc/gnuchess.6.orig Sun Sep 27 23:41:10 1998 ++++ doc/gnuchess.6 Sun Mar 26 16:17:18 2000 @@ -1,8 +1,8 @@ -.TH gnuchess 6 +.TH gnuchess4 6 diff --git a/games/xscavenger/Makefile b/games/xscavenger/Makefile index 6791b946915..734ee88dce2 100644 --- a/games/xscavenger/Makefile +++ b/games/xscavenger/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/09/08 13:39:21 martin Exp $ +# $NetBSD: Makefile,v 1.11 2005/11/03 22:03:18 rillig Exp $ # DISTNAME= xscavenger-1.4.4 @@ -13,8 +13,9 @@ COMMENT= Loderunner clone with sound for X11 PKG_INSTALLATION_TYPES= overwrite pkgviews -WRKSRC= ${WRKDIR}/${DISTNAME}/src -USE_IMAKE= yes +USE_IMAKE= yes +CONFIGURE_DIRS= src +BUILD_DIRS= ${CONFIGURE_DIRS} NO_INSTALL_MANPAGES= yes CPPFLAGS+= -DSOUNDDEV="\"${DEVOSSSOUND}\"" @@ -24,8 +25,8 @@ INSTALLATION_DIRS= man/man6 .include "../../mk/ossaudio.buildlink3.mk" post-install: - @ ${INSTALL_MAN} ${WRKSRC}/scavenger.6 ${PREFIX}/man/man6/ - @ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/scavenger - @ ${INSTALL_MAN} ${WRKSRC}/../DOC ${PREFIX}/share/doc/scavenger + @${INSTALL_MAN} ${WRKSRC}/src/scavenger.6 ${PREFIX}/man/man6/ + @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/scavenger + @${INSTALL_MAN} ${WRKSRC}/DOC ${PREFIX}/share/doc/scavenger .include "../../mk/bsd.pkg.mk" diff --git a/games/xscavenger/PLIST b/games/xscavenger/PLIST index cc6c355b7d9..8802558d387 100644 --- a/games/xscavenger/PLIST +++ b/games/xscavenger/PLIST @@ -1,6 +1,7 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:57:47 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2005/11/03 22:03:18 rillig Exp $ bin/scavenger man/man6/scavenger.6 +share/doc/scavenger/DOC share/scavenger/badguy.lbm share/scavenger/brownblue.lbm share/scavenger/death.raw @@ -14,6 +15,5 @@ share/scavenger/reddevil.lbm share/scavenger/regularguy.lbm share/scavenger/spiralthing.lbm share/scavenger/victory.raw -@dirrm share/scavenger -share/doc/scavenger/DOC @dirrm share/doc/scavenger +@dirrm share/scavenger diff --git a/games/xscavenger/distinfo b/games/xscavenger/distinfo index 885158bac09..dee22419496 100644 --- a/games/xscavenger/distinfo +++ b/games/xscavenger/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.6 2005/09/08 13:39:21 martin Exp $ +$NetBSD: distinfo,v 1.7 2005/11/03 22:03:18 rillig Exp $ SHA1 (xscavenger-1.4.4.tgz) = d9ef34d2ec1a9dfeca398004725cae4878bf9f2e RMD160 (xscavenger-1.4.4.tgz) = e410c86dbf406243cfac3d0f81ea83e79cdeab32 Size (xscavenger-1.4.4.tgz) = 193346 bytes -SHA1 (patch-aa) = 41145bdd7b44a53b0fea555e232915dc4a64f646 -SHA1 (patch-ab) = 64b844663ac8167f98751650b29b6faf1c126c53 -SHA1 (patch-ac) = b553b7925ac36cff519a049298346ddccf905101 -SHA1 (patch-ad) = f2586214c0e4fc65018d05830dc4fc75f8353b65 +SHA1 (patch-aa) = 8f4ef6a4fe58b5d4a395426b38bfc848d63ec582 +SHA1 (patch-ab) = aba4113a688f295a1a318c07be607cedecd1fb9a +SHA1 (patch-ac) = dd92d176417b90dc2c8330cc9c6f222692133219 +SHA1 (patch-ad) = 5fb24c9bdfba0e87e4bf491695180728bc7b5e63 diff --git a/games/xscavenger/patches/patch-aa b/games/xscavenger/patches/patch-aa index 1bc53d35942..9d960e5d9f0 100644 --- a/games/xscavenger/patches/patch-aa +++ b/games/xscavenger/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.2 2004/04/09 00:10:25 minskim Exp $ +$NetBSD: patch-aa,v 1.3 2005/11/03 22:03:18 rillig Exp $ ---- sound.c.orig 2002-12-02 00:03:54.000000000 -0600 -+++ sound.c +--- src/sound.c.orig 2002-12-02 00:03:54.000000000 -0600 ++++ src/sound.c @@ -5,7 +5,7 @@ #include <unistd.h> #include <fcntl.h> diff --git a/games/xscavenger/patches/patch-ab b/games/xscavenger/patches/patch-ab index c3126718500..df2a1fa8cb2 100644 --- a/games/xscavenger/patches/patch-ab +++ b/games/xscavenger/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.2 2004/04/09 00:10:25 minskim Exp $ +$NetBSD: patch-ab,v 1.3 2005/11/03 22:03:18 rillig Exp $ ---- Imakefile.orig Thu Jan 6 06:47:22 2000 -+++ Imakefile Sat Jan 8 18:10:48 2000 +--- src/Imakefile.orig Thu Jan 6 06:47:22 2000 ++++ src/Imakefile Sat Jan 8 18:10:48 2000 @@ -1,7 +1,7 @@ # set this to the path where data files should be stored. LIBDIR # is automatically defined by imake, usually to /usr/X11R6/lib/X11, so diff --git a/games/xscavenger/patches/patch-ac b/games/xscavenger/patches/patch-ac index d0c84a3fbbe..249ea14a238 100644 --- a/games/xscavenger/patches/patch-ac +++ b/games/xscavenger/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.1 2005/09/08 13:39:21 martin Exp $ +$NetBSD: patch-ac,v 1.2 2005/11/03 22:03:18 rillig Exp $ ---- scav.c.orig 2002-02-10 01:35:36.000000000 +0100 -+++ scav.c 2005-09-08 14:53:03.000000000 +0200 +--- src/scav.c.orig 2002-02-10 01:35:36.000000000 +0100 ++++ src/scav.c 2005-09-08 14:53:03.000000000 +0200 @@ -240,17 +240,18 @@ void *configtab[]= diff --git a/games/xscavenger/patches/patch-ad b/games/xscavenger/patches/patch-ad index a2cfe53ea4b..b52a672368c 100644 --- a/games/xscavenger/patches/patch-ad +++ b/games/xscavenger/patches/patch-ad @@ -1,7 +1,7 @@ -$NetBSD: patch-ad,v 1.1 2005/09/08 13:39:21 martin Exp $ +$NetBSD: patch-ad,v 1.2 2005/11/03 22:03:18 rillig Exp $ ---- scav.h.orig 2001-01-10 17:10:22.000000000 +0100 -+++ scav.h 2005-09-08 14:52:08.000000000 +0200 +--- src/scav.h.orig 2001-01-10 17:10:22.000000000 +0100 ++++ src/scav.h 2005-09-08 14:52:08.000000000 +0200 @@ -383,7 +383,7 @@ extern uchar ibuff[IBUFFLEN]; extern uchar *getgfx(); diff --git a/graphics/hp2xx/Makefile b/graphics/hp2xx/Makefile index 4b0bf67f538..1ad42534edf 100644 --- a/graphics/hp2xx/Makefile +++ b/graphics/hp2xx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/06/01 18:02:56 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2005/11/03 22:09:28 rillig Exp $ # DISTNAME= hp2xx-3.4.4 @@ -10,12 +10,12 @@ MAINTAINER= dmcmahill@NetBSD.org HOMEPAGE= http://www.gnu.org/software/hp2xx/hp2xx.html COMMENT= HPGL converter and previewer -WRKSRC= ${WRKDIR}/${DISTNAME}/sources +BUILD_DIRS= sources USE_MAKEINFO= YES INFO_FILES= hp2xx.info post-extract: - ${CP} ${WRKSRC}/../makes/generic.mak ${WRKSRC}/Makefile + ${CP} ${WRKSRC}/makes/generic.mak ${WRKSRC}/sources/Makefile .include "../../graphics/tiff/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" diff --git a/graphics/hp2xx/distinfo b/graphics/hp2xx/distinfo index 9a032829c15..2aacce0d066 100644 --- a/graphics/hp2xx/distinfo +++ b/graphics/hp2xx/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.6 2005/02/24 08:45:07 agc Exp $ +$NetBSD: distinfo,v 1.7 2005/11/03 22:09:28 rillig Exp $ SHA1 (hp2xx-3.4.4.tar.gz) = a168cbce5e0cea3859b404b9cbad372bd246af91 RMD160 (hp2xx-3.4.4.tar.gz) = 61befd1a3a3aaa717826fec632dacc01e017edb8 Size (hp2xx-3.4.4.tar.gz) = 610330 bytes -SHA1 (patch-ab) = a878f1fcdce47ef06a66fa9287245c5eab84c978 -SHA1 (patch-ad) = 25f67fbec1fbc6a0e5989564f352033469342224 -SHA1 (patch-ae) = a89f476bd97d954de4bf33c6167704753f58a8f6 +SHA1 (patch-ab) = cd71203243efacaad0e4696e48ed859282725bb9 +SHA1 (patch-ad) = 82c123c227c7566e73137cda38f6807830e6cc5c +SHA1 (patch-ae) = 30c3647e73c2e1fa2c417cc584809ec93c9efcf4 diff --git a/graphics/hp2xx/patches/patch-ab b/graphics/hp2xx/patches/patch-ab index 404fb064f30..45e586d358d 100644 --- a/graphics/hp2xx/patches/patch-ab +++ b/graphics/hp2xx/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.7 2004/11/28 15:12:11 dmcmahill Exp $ +$NetBSD: patch-ab,v 1.8 2005/11/03 22:09:28 rillig Exp $ ---- Makefile.orig Sat Nov 27 23:52:19 2004 -+++ Makefile +--- sources/Makefile.orig Sat Nov 27 23:52:19 2004 ++++ sources/Makefile @@ -28,13 +28,13 @@ SHELL = /bin/sh CHMOD = chmod diff --git a/graphics/hp2xx/patches/patch-ad b/graphics/hp2xx/patches/patch-ad index e78cfc9f479..33df84b6789 100644 --- a/graphics/hp2xx/patches/patch-ad +++ b/graphics/hp2xx/patches/patch-ad @@ -1,7 +1,7 @@ -$NetBSD: patch-ad,v 1.4 2004/11/28 15:12:11 dmcmahill Exp $ +$NetBSD: patch-ad,v 1.5 2005/11/03 22:09:28 rillig Exp $ ---- getopt.c.orig Sat Jun 21 15:31:51 2003 -+++ getopt.c +--- sources/getopt.c.orig Sat Jun 21 15:31:51 2003 ++++ sources/getopt.c @@ -56,6 +56,8 @@ void Eprintf(const char *, ...); #endif diff --git a/graphics/hp2xx/patches/patch-ae b/graphics/hp2xx/patches/patch-ae index 1752329d72c..b19e76201dd 100644 --- a/graphics/hp2xx/patches/patch-ae +++ b/graphics/hp2xx/patches/patch-ae @@ -1,7 +1,7 @@ -$NetBSD: patch-ae,v 1.5 2004/11/28 15:12:11 dmcmahill Exp $ +$NetBSD: patch-ae,v 1.6 2005/11/03 22:09:28 rillig Exp $ ---- ../doc/hp2xxinf.tex.orig Sat Jun 21 15:41:16 2003 -+++ ../doc/hp2xxinf.tex +--- doc/hp2xxinf.tex.orig Sat Jun 21 15:41:16 2003 ++++ doc/hp2xxinf.tex @@ -39,8 +39,7 @@ @ifinfo @format diff --git a/graphics/wmphoto/Makefile b/graphics/wmphoto/Makefile index d7a6f85c2a6..1627eae0d20 100644 --- a/graphics/wmphoto/Makefile +++ b/graphics/wmphoto/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:07 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/11/03 22:12:35 rillig Exp $ # DISTNAME= wmphoto-0.3a @@ -9,15 +9,15 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.dcc.uchile.cl/~amartoq/wmphoto/ COMMENT= Dock-app that can show you a photo -WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}/wmphoto +BUILD_DIRS= wmphoto USE_X11BASE= YES USE_TOOLS+= gmake MAKE_ENV+= X11PREFIX=${X11PREFIX} X11BASE=${X11BASE} post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wmphoto - ${INSTALL_DATA} ${WRKSRC}/../README ${PREFIX}/share/doc/wmphoto - ${INSTALL_DATA} ${WRKSRC}/../HINTS ${PREFIX}/share/doc/wmphoto + ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/wmphoto + ${INSTALL_DATA} ${WRKSRC}/HINTS ${PREFIX}/share/doc/wmphoto .include "../../graphics/xpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/wmphoto/distinfo b/graphics/wmphoto/distinfo index be9f8c1e348..830110686e7 100644 --- a/graphics/wmphoto/distinfo +++ b/graphics/wmphoto/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2005/02/24 08:45:14 agc Exp $ +$NetBSD: distinfo,v 1.3 2005/11/03 22:12:36 rillig Exp $ SHA1 (wmphoto-0.3a.tar.gz) = dbec1ddd49671bc915b6e9ce37462247557f7fb9 RMD160 (wmphoto-0.3a.tar.gz) = 64b0006b90d187ec01da32f1bc9b7607d19f4330 Size (wmphoto-0.3a.tar.gz) = 19320 bytes -SHA1 (patch-aa) = 53c1d2817e36b8cee04572edca295d0555e1e853 +SHA1 (patch-aa) = 952c53a00cb6a73e4b780e9d643144c394c7d6af diff --git a/graphics/wmphoto/patches/patch-aa b/graphics/wmphoto/patches/patch-aa index 1b61e7ab284..6421e111609 100644 --- a/graphics/wmphoto/patches/patch-aa +++ b/graphics/wmphoto/patches/patch-aa @@ -1,6 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/04/27 13:35:09 agc Exp $ ---- Makefile.orig Wed Mar 28 10:09:18 2001 -+++ Makefile Wed Mar 28 10:15:59 2001 +$NetBSD: patch-aa,v 1.2 2005/11/03 22:12:36 rillig Exp $ + +--- wmphoto/Makefile.orig Wed Mar 28 10:09:18 2001 ++++ wmphoto/Makefile Wed Mar 28 10:15:59 2001 @@ -1,19 +1,8 @@ # wmphoto Makefile diff --git a/lang/bwbasic/Makefile b/lang/bwbasic/Makefile index fbf24cd68a7..61b29e4fb36 100644 --- a/lang/bwbasic/Makefile +++ b/lang/bwbasic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/09/28 17:00:36 rillig Exp $ +# $NetBSD: Makefile,v 1.10 2005/11/03 22:19:01 rillig Exp $ PKGNAME= ${DISTNAME:=pl2} DISTNAME= bwbasic-2.20 @@ -9,21 +9,24 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= jspath@bcpl.net COMMENT= The Bywater Basic interpreter -WRKSRC= ${WRKDIR}/bwbasic-2.20p2/bwbasic-2.20 +WRKSRC= ${WRKDIR}/bwbasic-2.20p2 +BWBASIC_WRKSRC= ${WRKSRC}/bwbasic-2.20 DIST_SUBDIR= ${PKGNAME_NOREV} GNU_CONFIGURE= yes +CONFIGURE_DIRS= ${BWBASIC_WRKSRC} +BUILD_DIRS= ${CONFIGURE_DIRS} SHARE_DIR= ${PREFIX}/share/bwbasic pre-patch: - ${CP} ${WRKSRC}/../bwb-2.20-patch01/* ${WRKSRC} - ${CP} ${WRKSRC}/../bwb-2.20-patch02/* ${WRKSRC} + ${CP} ${WRKSRC}/bwb-2.20-patch01/* ${BWBASIC_WRKSRC} + ${CP} ${WRKSRC}/bwb-2.20-patch02/* ${BWBASIC_WRKSRC} post-install: ${INSTALL_DATA_DIR} ${SHARE_DIR} - ${CP} -r ${WRKSRC}/bwbtest ${SHARE_DIR} + ${CP} -r ${BWBASIC_WRKSRC}/bwbtest ${SHARE_DIR} ${FIND} ${SHARE_DIR} -type d -print | ${XARGS} ${CHMOD} ${BINMODE} ${FIND} ${SHARE_DIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE} - ${INSTALL_MAN} ${WRKSRC}/bwbasic.doc ${PREFIX}/man/man1/bwbasic.1 + ${INSTALL_MAN} ${BWBASIC_WRKSRC}/bwbasic.doc ${PREFIX}/man/man1/bwbasic.1 .include "../../mk/bsd.pkg.mk" diff --git a/lang/bwbasic/distinfo b/lang/bwbasic/distinfo index 52c3b157922..67e812e1898 100644 --- a/lang/bwbasic/distinfo +++ b/lang/bwbasic/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5 2005/02/24 09:03:05 agc Exp $ +$NetBSD: distinfo,v 1.6 2005/11/03 22:19:01 rillig Exp $ SHA1 (bwbasic-2.20pl2/bwbasic-2.20.tar.Z) = b96ff440c573b9aac17dfd90830e3defa46a5592 RMD160 (bwbasic-2.20pl2/bwbasic-2.20.tar.Z) = a6ae5cdde2aa18228258314a34b776d3681cb0e8 Size (bwbasic-2.20pl2/bwbasic-2.20.tar.Z) = 485971 bytes -SHA1 (patch-aa) = e397e2e5b88ccccb44750702bff6d65054d96641 -SHA1 (patch-ac) = e316d334098ba1919239959333804973619dbc81 +SHA1 (patch-aa) = 45a1ff2c8e76a8f8c7d1c1f4876acb8e0bb55add +SHA1 (patch-ac) = 286c3f91c90b33d1bab2de1581900129661ca74a diff --git a/lang/bwbasic/patches/patch-aa b/lang/bwbasic/patches/patch-aa index 5161bdd6606..61328b8c402 100644 --- a/lang/bwbasic/patches/patch-aa +++ b/lang/bwbasic/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/02/15 19:43:22 pooka Exp $ +$NetBSD: patch-aa,v 1.2 2005/11/03 22:19:01 rillig Exp $ ---- Makefile.in.orig Sat Nov 25 14:32:18 1995 -+++ Makefile.in Sun Feb 6 16:12:49 2000 +--- bwbasic-2.20/Makefile.in.orig Sat Nov 25 14:32:18 1995 ++++ bwbasic-2.20/Makefile.in Sun Feb 6 16:12:49 2000 @@ -16,9 +16,10 @@ DEFS = @DEFS@ diff --git a/lang/bwbasic/patches/patch-ac b/lang/bwbasic/patches/patch-ac index 803687bef6c..e2235228eaf 100644 --- a/lang/bwbasic/patches/patch-ac +++ b/lang/bwbasic/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.1.1.1 2000/02/15 19:43:22 pooka Exp $ +$NetBSD: patch-ac,v 1.2 2005/11/03 22:19:01 rillig Exp $ ---- bwbasic.doc Tue Oct 12 19:30:12 1993 -+++ bwbasic.1 Fri Feb 11 22:42:36 2000 +--- bwbasic-2.20/bwbasic.doc Tue Oct 12 19:30:12 1993 ++++ bwbasic-2.20/bwbasic.1 Fri Feb 11 22:42:36 2000 @@ -1,33 +1,10 @@ - - |