pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Fixed wrong use of WRKSRC.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8cd310627816
branches:  trunk
changeset: 502286:8cd310627816
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Nov 03 21:51:57 2005 +0000

description:
Fixed wrong use of WRKSRC.

diffstat:

 emulators/swarm/Makefile          |   9 +++++----
 emulators/swarm/distinfo          |  22 +++++++++++-----------
 emulators/swarm/patches/patch-aa  |   6 +++---
 emulators/swarm/patches/patch-ab  |   6 +++---
 emulators/swarm/patches/patch-ac  |   6 +++---
 emulators/swarm/patches/patch-ad  |   6 +++---
 emulators/swarm/patches/patch-ae  |   6 +++---
 emulators/swarm/patches/patch-af  |   6 +++---
 emulators/swarm/patches/patch-ag  |   6 +++---
 emulators/swarm/patches/patch-ah  |   6 +++---
 emulators/swarm/patches/patch-ai  |   6 +++---
 emulators/swarm/patches/patch-aj  |   6 +++---
 games/gnuchess4/Makefile          |   7 ++++---
 games/gnuchess4/distinfo          |  14 +++++++-------
 games/gnuchess4/patches/patch-aa  |   6 +++---
 games/gnuchess4/patches/patch-ab  |   6 +++---
 games/gnuchess4/patches/patch-ac  |   6 +++---
 games/gnuchess4/patches/patch-ad  |   6 +++---
 games/gnuchess4/patches/patch-ae  |   6 +++---
 games/gnuchess4/patches/patch-af  |   6 +++---
 games/xscavenger/Makefile         |  13 +++++++------
 games/xscavenger/PLIST            |   6 +++---
 games/xscavenger/distinfo         |  10 +++++-----
 games/xscavenger/patches/patch-aa |   6 +++---
 games/xscavenger/patches/patch-ab |   6 +++---
 games/xscavenger/patches/patch-ac |   6 +++---
 games/xscavenger/patches/patch-ad |   6 +++---
 graphics/hp2xx/Makefile           |   6 +++---
 graphics/hp2xx/distinfo           |   8 ++++----
 graphics/hp2xx/patches/patch-ab   |   6 +++---
 graphics/hp2xx/patches/patch-ad   |   6 +++---
 graphics/hp2xx/patches/patch-ae   |   6 +++---
 graphics/wmphoto/Makefile         |   8 ++++----
 graphics/wmphoto/distinfo         |   4 ++--
 graphics/wmphoto/patches/patch-aa |   7 ++++---
 lang/bwbasic/Makefile             |  15 +++++++++------
 lang/bwbasic/distinfo             |   6 +++---
 lang/bwbasic/patches/patch-aa     |   6 +++---
 lang/bwbasic/patches/patch-ac     |   6 +++---
 39 files changed, 146 insertions(+), 139 deletions(-)

diffs (truncated from 675 to 300 lines):

diff -r 9943990333e4 -r 8cd310627816 emulators/swarm/Makefile
--- a/emulators/swarm/Makefile  Thu Nov 03 21:34:23 2005 +0000
+++ b/emulators/swarm/Makefile  Thu Nov 03 21:51:57 2005 +0000
@@ -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 @@
 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 -r 9943990333e4 -r 8cd310627816 emulators/swarm/distinfo
--- a/emulators/swarm/distinfo  Thu Nov 03 21:34:23 2005 +0000
+++ b/emulators/swarm/distinfo  Thu Nov 03 21:51:57 2005 +0000
@@ -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 -r 9943990333e4 -r 8cd310627816 emulators/swarm/patches/patch-aa
--- a/emulators/swarm/patches/patch-aa  Thu Nov 03 21:34:23 2005 +0000
+++ b/emulators/swarm/patches/patch-aa  Thu Nov 03 21:51:57 2005 +0000
@@ -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 -r 9943990333e4 -r 8cd310627816 emulators/swarm/patches/patch-ab
--- a/emulators/swarm/patches/patch-ab  Thu Nov 03 21:34:23 2005 +0000
+++ b/emulators/swarm/patches/patch-ab  Thu Nov 03 21:51:57 2005 +0000
@@ -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 -r 9943990333e4 -r 8cd310627816 emulators/swarm/patches/patch-ac
--- a/emulators/swarm/patches/patch-ac  Thu Nov 03 21:34:23 2005 +0000
+++ b/emulators/swarm/patches/patch-ac  Thu Nov 03 21:51:57 2005 +0000
@@ -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 -r 9943990333e4 -r 8cd310627816 emulators/swarm/patches/patch-ad
--- a/emulators/swarm/patches/patch-ad  Thu Nov 03 21:34:23 2005 +0000
+++ b/emulators/swarm/patches/patch-ad  Thu Nov 03 21:51:57 2005 +0000
@@ -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 -r 9943990333e4 -r 8cd310627816 emulators/swarm/patches/patch-ae
--- a/emulators/swarm/patches/patch-ae  Thu Nov 03 21:34:23 2005 +0000
+++ b/emulators/swarm/patches/patch-ae  Thu Nov 03 21:51:57 2005 +0000
@@ -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 -r 9943990333e4 -r 8cd310627816 emulators/swarm/patches/patch-af
--- a/emulators/swarm/patches/patch-af  Thu Nov 03 21:34:23 2005 +0000
+++ b/emulators/swarm/patches/patch-af  Thu Nov 03 21:51:57 2005 +0000
@@ -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 -r 9943990333e4 -r 8cd310627816 emulators/swarm/patches/patch-ag
--- a/emulators/swarm/patches/patch-ag  Thu Nov 03 21:34:23 2005 +0000
+++ b/emulators/swarm/patches/patch-ag  Thu Nov 03 21:51:57 2005 +0000
@@ -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 -r 9943990333e4 -r 8cd310627816 emulators/swarm/patches/patch-ah
--- a/emulators/swarm/patches/patch-ah  Thu Nov 03 21:34:23 2005 +0000
+++ b/emulators/swarm/patches/patch-ah  Thu Nov 03 21:51:57 2005 +0000
@@ -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 -r 9943990333e4 -r 8cd310627816 emulators/swarm/patches/patch-ai
--- a/emulators/swarm/patches/patch-ai  Thu Nov 03 21:34:23 2005 +0000
+++ b/emulators/swarm/patches/patch-ai  Thu Nov 03 21:51:57 2005 +0000
@@ -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 -r 9943990333e4 -r 8cd310627816 emulators/swarm/patches/patch-aj
--- a/emulators/swarm/patches/patch-aj  Thu Nov 03 21:34:23 2005 +0000
+++ b/emulators/swarm/patches/patch-aj  Thu Nov 03 21:51:57 2005 +0000
@@ -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 -r 9943990333e4 -r 8cd310627816 games/gnuchess4/Makefile
--- a/games/gnuchess4/Makefile  Thu Nov 03 21:34:23 2005 +0000
+++ b/games/gnuchess4/Makefile  Thu Nov 03 21:51:57 2005 +0000
@@ -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 @@
 
 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 -r 9943990333e4 -r 8cd310627816 games/gnuchess4/distinfo
--- a/games/gnuchess4/distinfo  Thu Nov 03 21:34:23 2005 +0000
+++ b/games/gnuchess4/distinfo  Thu Nov 03 21:51:57 2005 +0000
@@ -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 -r 9943990333e4 -r 8cd310627816 games/gnuchess4/patches/patch-aa
--- a/games/gnuchess4/patches/patch-aa  Thu Nov 03 21:34:23 2005 +0000
+++ b/games/gnuchess4/patches/patch-aa  Thu Nov 03 21:51:57 2005 +0000
@@ -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 -r 9943990333e4 -r 8cd310627816 games/gnuchess4/patches/patch-ab
--- a/games/gnuchess4/patches/patch-ab  Thu Nov 03 21:34:23 2005 +0000
+++ b/games/gnuchess4/patches/patch-ab  Thu Nov 03 21:51:57 2005 +0000
@@ -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 -r 9943990333e4 -r 8cd310627816 games/gnuchess4/patches/patch-ac
--- a/games/gnuchess4/patches/patch-ac  Thu Nov 03 21:34:23 2005 +0000
+++ b/games/gnuchess4/patches/patch-ac  Thu Nov 03 21:51:57 2005 +0000
@@ -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 -r 9943990333e4 -r 8cd310627816 games/gnuchess4/patches/patch-ad
--- a/games/gnuchess4/patches/patch-ad  Thu Nov 03 21:34:23 2005 +0000
+++ b/games/gnuchess4/patches/patch-ad  Thu Nov 03 21:51:57 2005 +0000
@@ -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



Home | Main Index | Thread Index | Old Index