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

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/emulators Fixed wrong use of WRKSRC.
From: rillig <rillig%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 02:32:29 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/9943990333e4
branches:  trunk
changeset: 502285:9943990333e4
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Nov 03 21:34:23 2005 +0000

description:
Fixed wrong use of WRKSRC.

diffstat:

 emulators/BasiliskII/Makefile         |  12 +++++++-----
 emulators/BasiliskII/distinfo         |  10 +++++-----
 emulators/BasiliskII/patches/patch-aa |   6 +++---
 emulators/BasiliskII/patches/patch-ab |   6 +++---
 emulators/BasiliskII/patches/patch-ac |   6 +++---
 emulators/BasiliskII/patches/patch-ad |   6 +++---
 emulators/Cygne-SDL/Makefile          |  15 ++++++++-------
 emulators/Cygne-SDL/distinfo          |  10 +++++-----
 emulators/Cygne-SDL/patches/patch-aa  |   6 +++---
 emulators/Cygne-SDL/patches/patch-ab  |   6 +++---
 emulators/Cygne-SDL/patches/patch-ac  |   6 +++---
 emulators/Cygne-SDL/patches/patch-ad  |   6 +++---
 emulators/arnold/Makefile             |  17 ++++++++---------
 emulators/arnold/distinfo             |   6 +++---
 emulators/arnold/patches/patch-aa     |   6 +++---
 emulators/arnold/patches/patch-ab     |   6 +++---
 emulators/sms_sdl/Makefile            |  15 ++++++++-------
 17 files changed, 74 insertions(+), 71 deletions(-)

diffs (truncated from 357 to 300 lines):

diff -r 04cb6f62b9a4 -r 9943990333e4 emulators/BasiliskII/Makefile
--- a/emulators/BasiliskII/Makefile     Thu Nov 03 21:24:29 2005 +0000
+++ b/emulators/BasiliskII/Makefile     Thu Nov 03 21:34:23 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/09/13 12:07:34 adam Exp $
+# $NetBSD: Makefile,v 1.24 2005/11/03 21:34:23 rillig Exp $
 
 DISTNAME=      BasiliskII_src_22032005
 PKGNAME=       BasiliskII-1.0.20050322
@@ -10,23 +10,25 @@
 HOMEPAGE=      http://gwenole.beauchesne.online.fr/basilisk2/
 COMMENT=       Open Source 68k Macintosh emulator
 
-WRKSRC=                ${WRKDIR}/BasiliskII-1.0/src/Unix
+WRKSRC=                        ${WRKDIR}/BasiliskII-1.0
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            gmake
 GNU_CONFIGURE=         yes
+CONFIGURE_DIRS=                src/Unix
 CONFIGURE_ARGS+=       --disable-fbdev-dga
 CONFIGURE_ARGS+=       --enable-addressing=banks
 CONFIGURE_ARGS+=       --without-mon
 # disable gnome support, or configure will break if gnome-libs is installed
 CONFIGURE_ENV+=                ac_cv_path_GNOME_CONFIG=no
+BUILD_DIRS=            ${CONFIGURE_DIRS}
 
 .include "options.mk"
 
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/BasiliskII
-       ${INSTALL_DATA} ${WRKSRC}/../../README ${PREFIX}/share/doc/BasiliskII/
-       ${INSTALL_DATA} ${WRKSRC}/../../TECH ${PREFIX}/share/doc/BasiliskII/
-       ${INSTALL_DATA} ${WRKSRC}/../../TODO ${PREFIX}/share/doc/BasiliskII/
+       ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/BasiliskII/
+       ${INSTALL_DATA} ${WRKSRC}/TECH ${PREFIX}/share/doc/BasiliskII/
+       ${INSTALL_DATA} ${WRKSRC}/TODO ${PREFIX}/share/doc/BasiliskII/
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 04cb6f62b9a4 -r 9943990333e4 emulators/BasiliskII/distinfo
--- a/emulators/BasiliskII/distinfo     Thu Nov 03 21:24:29 2005 +0000
+++ b/emulators/BasiliskII/distinfo     Thu Nov 03 21:34:23 2005 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2005/07/01 12:34:32 adam Exp $
+$NetBSD: distinfo,v 1.10 2005/11/03 21:34:23 rillig Exp $
 
 SHA1 (BasiliskII_src_22032005.tar.bz2) = e6c6efe9dded3e50b204fc641f42d15447819109
 RMD160 (BasiliskII_src_22032005.tar.bz2) = 6fac78005ed8a8794c192a07d36285a68ad1ccfa
 Size (BasiliskII_src_22032005.tar.bz2) = 914468 bytes
-SHA1 (patch-aa) = f1ddf3941a45e09dc2ec75a24939261387e35142
-SHA1 (patch-ab) = 3bbc87e42cdae430097483401a0d3b032a746185
-SHA1 (patch-ac) = 61804c0ff4778964241a5ae4d73ea1d4f09e13e2
-SHA1 (patch-ad) = 374d361b8aadcb31aa85e673b1b9ff0947f491dd
+SHA1 (patch-aa) = d1886fa85a58c2974ad355e6d8eb73cc611316bf
+SHA1 (patch-ab) = 462964cfa794f6ad97774fef525a9f210bd99d1b
+SHA1 (patch-ac) = ac4d313a8c60a807a5ea563dcca995e092be9c15
+SHA1 (patch-ad) = 6a215532e891848fe449ef5fe4307793c34bb9d6
diff -r 04cb6f62b9a4 -r 9943990333e4 emulators/BasiliskII/patches/patch-aa
--- a/emulators/BasiliskII/patches/patch-aa     Thu Nov 03 21:24:29 2005 +0000
+++ b/emulators/BasiliskII/patches/patch-aa     Thu Nov 03 21:34:23 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2005/07/01 12:34:33 adam Exp $
+$NetBSD: patch-aa,v 1.3 2005/11/03 21:34:23 rillig Exp $
 
---- ../dummy/ether_dummy.cpp.orig      2005-07-01 12:04:04.000000000 +0000
-+++ ../dummy/ether_dummy.cpp
+--- src/dummy/ether_dummy.cpp.orig     2005-07-01 12:04:04.000000000 +0000
++++ src/dummy/ether_dummy.cpp
 @@ -173,7 +173,7 @@ void EtherInterrupt(void)
                        length = recvfrom(fd, packet, 1514, 0, (struct sockaddr *)&from, &from_len);
                        if (length < 14)
diff -r 04cb6f62b9a4 -r 9943990333e4 emulators/BasiliskII/patches/patch-ab
--- a/emulators/BasiliskII/patches/patch-ab     Thu Nov 03 21:24:29 2005 +0000
+++ b/emulators/BasiliskII/patches/patch-ab     Thu Nov 03 21:34:23 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.2 2005/07/01 12:34:33 adam Exp $
+$NetBSD: patch-ab,v 1.3 2005/11/03 21:34:23 rillig Exp $
 
---- video_x.cpp.orig   2005-03-21 23:57:34.000000000 +0000
-+++ video_x.cpp
+--- src/Unix/video_x.cpp.orig  2005-03-21 23:57:34.000000000 +0000
++++ src/Unix/video_x.cpp
 @@ -2288,7 +2288,7 @@ static void update_display_dynamic(int t
  static void update_display_static(driver_window *drv)
  {
diff -r 04cb6f62b9a4 -r 9943990333e4 emulators/BasiliskII/patches/patch-ac
--- a/emulators/BasiliskII/patches/patch-ac     Thu Nov 03 21:24:29 2005 +0000
+++ b/emulators/BasiliskII/patches/patch-ac     Thu Nov 03 21:34:23 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.3 2005/07/01 12:34:33 adam Exp $
+$NetBSD: patch-ac,v 1.4 2005/11/03 21:34:23 rillig Exp $
 
---- vm_alloc.cpp.orig  2005-01-30 21:42:14.000000000 +0000
-+++ vm_alloc.cpp
+--- src/Unix/vm_alloc.cpp.orig 2005-01-30 21:42:14.000000000 +0000
++++ src/Unix/vm_alloc.cpp
 @@ -39,6 +39,7 @@
  #include "vm_alloc.h"
  
diff -r 04cb6f62b9a4 -r 9943990333e4 emulators/BasiliskII/patches/patch-ad
--- a/emulators/BasiliskII/patches/patch-ad     Thu Nov 03 21:24:29 2005 +0000
+++ b/emulators/BasiliskII/patches/patch-ad     Thu Nov 03 21:34:23 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.3 2005/07/01 12:34:33 adam Exp $
+$NetBSD: patch-ad,v 1.4 2005/11/03 21:34:23 rillig Exp $
 
---- sshpty.c.orig      2003-08-17 10:20:22.000000000 +0000
-+++ sshpty.c
+--- src/Unix/sshpty.c.orig     2003-08-17 10:20:22.000000000 +0000
++++ src/Unix/sshpty.c
 @@ -18,6 +18,7 @@ RCSID("$OpenBSD: sshpty.c,v 1.4 2001/12/
  /* Selections from openssh's "includes.h" */
  #include "config.h"
diff -r 04cb6f62b9a4 -r 9943990333e4 emulators/Cygne-SDL/Makefile
--- a/emulators/Cygne-SDL/Makefile      Thu Nov 03 21:24:29 2005 +0000
+++ b/emulators/Cygne-SDL/Makefile      Thu Nov 03 21:34:23 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/16 06:57:50 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/11/03 21:38:04 rillig Exp $
 #
 
 DISTNAME=              Cygne-SDL-0.1-src
@@ -14,9 +14,10 @@
 BUILD_DEPENDS+=                nasm>=0.98:../../devel/nasm
 BUILD_DEPENDS+=                zip>=2.0:../../archivers/zip
 
-WRKSRC=                        ${WRKDIR}/Cygne-SDL-0.1/src
+WRKSRC=                        ${WRKDIR}/Cygne-SDL-0.1
 MAKEFILE=              Makefiles/Makefile.unix
 NO_CONFIGURE=          yes
+BUILD_DIRS=            src
 USE_LANGUAGES=         c c++
 
 # Uses i386 assembly code
@@ -25,17 +26,17 @@
 INSTALLATION_DIRS=     bin
 
 post-build:
-       cd ${WRKSRC}/../WonderSnake && \
+       cd ${WRKSRC}/WonderSnake && \
                ${LOCALBASE}/bin/zip Wondersnake.zip Wondersnake.wsc
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/cygne ${PREFIX}/bin/Cygne-SDL
+       ${INSTALL_PROGRAM} ${WRKSRC}/src/cygne ${PREFIX}/bin/Cygne-SDL
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/Cygne-SDL
-       ${INSTALL_DATA} ${WRKSRC}/../README ${PREFIX}/share/doc/Cygne-SDL
+       ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/Cygne-SDL
        ${INSTALL_DATA_DIR} ${PREFIX}/share/Cygne-SDL
-       ${INSTALL_DATA} ${WRKSRC}/../WonderSnake/Wondersnake.txt \
+       ${INSTALL_DATA} ${WRKSRC}/WonderSnake/Wondersnake.txt \
                ${PREFIX}/share/Cygne-SDL
-       ${INSTALL_DATA} ${WRKSRC}/../WonderSnake/Wondersnake.zip \
+       ${INSTALL_DATA} ${WRKSRC}/WonderSnake/Wondersnake.zip \
                ${PREFIX}/share/Cygne-SDL
 
 .include "../../devel/SDL/buildlink3.mk"
diff -r 04cb6f62b9a4 -r 9943990333e4 emulators/Cygne-SDL/distinfo
--- a/emulators/Cygne-SDL/distinfo      Thu Nov 03 21:24:29 2005 +0000
+++ b/emulators/Cygne-SDL/distinfo      Thu Nov 03 21:34:23 2005 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 18:49:17 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/11/03 21:38:04 rillig Exp $
 
 SHA1 (Cygne-SDL-0.1-src.tar.gz) = f9c50702d1911d0ff1728e5aa089e67cfdfd0030
 RMD160 (Cygne-SDL-0.1-src.tar.gz) = 6d9fd7195a936f17fc3984a66722272c7e30991a
 Size (Cygne-SDL-0.1-src.tar.gz) = 106448 bytes
-SHA1 (patch-aa) = c57821d127898b840346616ad0d2b8be9e0efd7b
-SHA1 (patch-ab) = 89789c935f2865a015a72cf11621971d8b43b538
-SHA1 (patch-ac) = bee744a1b007158d681da122615bab3d8414b824
-SHA1 (patch-ad) = 120c1df8c521c1ffbd7750335730849ac921dc41
+SHA1 (patch-aa) = ee9dd0b364d278a45f2ac8d038b43aaf8f0c5c96
+SHA1 (patch-ab) = faff74d577fb243635a3aed7e6c17132bc43fe07
+SHA1 (patch-ac) = b8037825c79bd36aa65bf18745a3b09470b34ec0
+SHA1 (patch-ad) = 1bf79e577e70d13fb3032d331235dcd6e2d611f2
diff -r 04cb6f62b9a4 -r 9943990333e4 emulators/Cygne-SDL/patches/patch-aa
--- a/emulators/Cygne-SDL/patches/patch-aa      Thu Nov 03 21:24:29 2005 +0000
+++ b/emulators/Cygne-SDL/patches/patch-aa      Thu Nov 03 21:34:23 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2004/11/02 02:22:22 dillo Exp $
+$NetBSD: patch-aa,v 1.3 2005/11/03 21:38:04 rillig Exp $
 
---- Makefiles/Makefile.unix.orig       2002-03-26 17:50:55.000000000 +0100
-+++ Makefiles/Makefile.unix
+--- src/Makefiles/Makefile.unix.orig   2002-03-26 17:50:55.000000000 +0100
++++ src/Makefiles/Makefile.unix
 @@ -1,5 +1,4 @@
 -CC = gcc
 -LD = gcc 
diff -r 04cb6f62b9a4 -r 9943990333e4 emulators/Cygne-SDL/patches/patch-ab
--- a/emulators/Cygne-SDL/patches/patch-ab      Thu Nov 03 21:24:29 2005 +0000
+++ b/emulators/Cygne-SDL/patches/patch-ab      Thu Nov 03 21:34:23 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/07/23 19:01:41 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2005/11/03 21:38:04 rillig Exp $
 
---- Usage.h.orig       2002-03-26 16:55:20.000000000 +0100
-+++ Usage.h
+--- src/Usage.h.orig   2002-03-26 16:55:20.000000000 +0100
++++ src/Usage.h
 @@ -1,13 +1,13 @@
  void Usage()
  {
diff -r 04cb6f62b9a4 -r 9943990333e4 emulators/Cygne-SDL/patches/patch-ac
--- a/emulators/Cygne-SDL/patches/patch-ac      Thu Nov 03 21:24:29 2005 +0000
+++ b/emulators/Cygne-SDL/patches/patch-ac      Thu Nov 03 21:34:23 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/07/23 19:01:41 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2005/11/03 21:38:04 rillig Exp $
 
---- ddrawsdl.cpp.orig  2002-03-26 16:02:25.000000000 +0100
-+++ ddrawsdl.cpp
+--- src/ddrawsdl.cpp.orig      2002-03-26 16:02:25.000000000 +0100
++++ src/ddrawsdl.cpp
 @@ -174,66 +174,66 @@ void UpdateFrame_h()
  {
        switch(fBlitterMode) {
diff -r 04cb6f62b9a4 -r 9943990333e4 emulators/Cygne-SDL/patches/patch-ad
--- a/emulators/Cygne-SDL/patches/patch-ad      Thu Nov 03 21:24:29 2005 +0000
+++ b/emulators/Cygne-SDL/patches/patch-ad      Thu Nov 03 21:34:23 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/07/23 19:01:41 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2005/11/03 21:38:04 rillig Exp $
 
---- zlib/unzip.h.orig  2002-03-21 19:42:46.000000000 +0100
-+++ zlib/unzip.h
+--- src/zlib/unzip.h.orig      2002-03-21 19:42:46.000000000 +0100
++++ src/zlib/unzip.h
 @@ -49,6 +49,10 @@ extern "C" {
  #include "zlib.h"
  #endif
diff -r 04cb6f62b9a4 -r 9943990333e4 emulators/arnold/Makefile
--- a/emulators/arnold/Makefile Thu Nov 03 21:24:29 2005 +0000
+++ b/emulators/arnold/Makefile Thu Nov 03 21:34:23 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/16 06:57:50 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/11/03 21:40:13 rillig Exp $
 #
 
 DISTNAME=              arnsrc27012002
@@ -15,8 +15,10 @@
 # we want case sensitive file names.
 EXTRACT_CMD_OPTS.zip=  -aqo
 
-WRKSRC=                        ${WRKDIR}/arnold/src
+WRKSRC=                        ${WRKDIR}/arnold
 GNU_CONFIGURE=         yes
+CONFIGURE_DIRS=                src
+BUILD_DIRS=            ${CONFIGURE_DIRS}
 BUILD_TARGET=          arnold
 
 SHAREDIR=              ${PREFIX}/share/arnold
@@ -24,24 +26,21 @@
 MAKE_ENV+=             SHAREDIR=${SHAREDIR}
 INSTALLATION_DIRS=     bin
 
-post-extract:
-       ${CHMOD} +x ${WRKSRC}/configure
-
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/../arnold ${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/arnold ${PREFIX}/bin
        ${INSTALL_DATA_DIR} ${SHAREDIR}
        ${INSTALL_DATA_DIR} ${SHAREDIR}/roms
        for dir in amsdose cpc464e cpc6128e cpc664e cpcplus kcc; \
        do \
                ${INSTALL_DATA_DIR} ${SHAREDIR}/roms/$$dir; \
-               for f in ${WRKSRC}/../roms/$$dir/*; \
+               for f in ${WRKSRC}/roms/$$dir/*; \
                do \
                        ${INSTALL_DATA} $$f ${SHAREDIR}/roms/$$dir; \
                done \
        done
        ${INSTALL_DATA_DIR} ${DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/../readme.txt ${DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/../readme.linux ${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/readme.linux ${DOCDIR}
 
 .include "../../mk/ossaudio.buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
diff -r 04cb6f62b9a4 -r 9943990333e4 emulators/arnold/distinfo
--- a/emulators/arnold/distinfo Thu Nov 03 21:24:29 2005 +0000
+++ b/emulators/arnold/distinfo Thu Nov 03 21:34:23 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 18:49:17 agc Exp $
+$NetBSD: distinfo,v 1.3 2005/11/03 21:40:13 rillig Exp $
 
 SHA1 (arnsrc27012002.zip) = de3102b954d79176dce259375dc1824189027f8e
 RMD160 (arnsrc27012002.zip) = 7b43c157cbc4f6171ee9ef14cc282cc1692188c6
 Size (arnsrc27012002.zip) = 916680 bytes
-SHA1 (patch-aa) = 83ba9c44664d7d6fb938db0d250b4fc24702c09f
-SHA1 (patch-ab) = 3a733e50ee6f12dc2c37c378409e765a8b4d0c8d
+SHA1 (patch-aa) = aff649f6c37cf7a321c182442d9faac44594b413
+SHA1 (patch-ab) = fde2730f3cf53d539543489a6d691ad7a6bc9d68
diff -r 04cb6f62b9a4 -r 9943990333e4 emulators/arnold/patches/patch-aa
--- a/emulators/arnold/patches/patch-aa Thu Nov 03 21:24:29 2005 +0000
+++ b/emulators/arnold/patches/patch-aa Thu Nov 03 21:34:23 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/09/24 10:53:27 dillo Exp $
Prev by Date: [pkgsrc/trunk]: pkgsrc/archivers/gcpio Fixes for CAN-2005-1111 and CAN-2005-1229
Next by Date: [pkgsrc/trunk]: pkgsrc/doc regen.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/archivers/gcpio Fixes for CAN-2005-1111 and CAN-2005-1229
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc regen.
Indexes:
Home | Main Index | Thread Index | Old Index