diff options
| author | jmmv <jmmv@pkgsrc.org> | 2003-06-06 11:55:06 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2003-06-06 11:55:06 +0000 |
| commit | aa9ddb13e17e72a6c3f0f69b9649266ac5537e4c (patch) | |
| tree | ba57800e783019ce191226a386474d5b4fc63f01 /emulators/doscmd | |
| parent | 582f3a3d4fead340d4a2fafadec717f4aae3a92d (diff) | |
| download | pkgsrc-aa9ddb13e17e72a6c3f0f69b9649266ac5537e4c.tar.gz | |
Merge two patches fixing the same file (doscmd_loader.c); they were causing
problems as one was undoing changes done by the other.
Diffstat (limited to 'emulators/doscmd')
| -rw-r--r-- | emulators/doscmd/distinfo | 5 | ||||
| -rw-r--r-- | emulators/doscmd/patches/patch-ad | 13 | ||||
| -rw-r--r-- | emulators/doscmd/patches/patch-ah | 10 |
3 files changed, 7 insertions, 21 deletions
diff --git a/emulators/doscmd/distinfo b/emulators/doscmd/distinfo index e7290d90775..2e3b2e84e93 100644 --- a/emulators/doscmd/distinfo +++ b/emulators/doscmd/distinfo @@ -1,14 +1,13 @@ -$NetBSD: distinfo,v 1.2 2001/04/20 10:49:54 agc Exp $ +$NetBSD: distinfo,v 1.3 2003/06/06 11:55:06 jmmv Exp $ SHA1 (doscmd-19960502-2.tar.gz) = 85ec8e478d32d0f2861084d6d19186b5e1f0fc95 Size (doscmd-19960502-2.tar.gz) = 109791 bytes SHA1 (patch-aa) = 56e3f9951ac3dcb6e07cd1f76c665286a694d67b SHA1 (patch-ab) = c83d7e5b8b514ca7f88b0bd3a0be963b7f77d3a4 SHA1 (patch-ac) = 09757f9522e52b7491c3052dbb856a9b3828ce45 -SHA1 (patch-ad) = bc9ad510f408cb3ea99bfd000c5549cb64693e43 SHA1 (patch-ae) = 6a33c0eff738caab4e30513dbe9b9f57d7b21d09 SHA1 (patch-af) = b0091e54d0ffe8a2ebcae28a924fad24888ed20e SHA1 (patch-ag) = bbbca5339d66cb52b93019b712d21301d910d32b -SHA1 (patch-ah) = 5dd22373fc8cc6119c3137dfeaaeae08b9a2be38 +SHA1 (patch-ah) = 65e9a252e27b8ea339048d20df2d5f23977b5f66 SHA1 (patch-ai) = e72e42897f221929aa269800a11e37ea2dd4419c SHA1 (patch-aj) = c400eb5ec1f46def1105ddb6e6a2a1397f8ec54e diff --git a/emulators/doscmd/patches/patch-ad b/emulators/doscmd/patches/patch-ad deleted file mode 100644 index 225818c6dba..00000000000 --- a/emulators/doscmd/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.2 1998/08/07 10:40:34 agc Exp $ - ---- doscmd_loader.c.orig Fri Jul 17 23:38:10 1998 -+++ doscmd_loader.c Fri Jul 17 23:38:28 1998 -@@ -38,7 +38,7 @@ - */ - static const char filler[4096] = { 0, }; - --#define _PATH_DOS_KERNEL_DIR "/usr/libexec/" -+#define _PATH_DOS_KERNEL_DIR "%PREFIX%/libexec/" - #define _PATH_DOS_KERNEL "doscmd.kernel" - - int diff --git a/emulators/doscmd/patches/patch-ah b/emulators/doscmd/patches/patch-ah index f677f25e2de..81ddec5d65a 100644 --- a/emulators/doscmd/patches/patch-ah +++ b/emulators/doscmd/patches/patch-ah @@ -1,7 +1,7 @@ -$NetBSD: patch-ah,v 1.2 1999/12/18 22:10:02 christos Exp $ +$NetBSD: patch-ah,v 1.3 2003/06/06 11:55:07 jmmv Exp $ ---- doscmd_loader.c.orig Fri Dec 17 22:48:20 1999 -+++ doscmd_loader.c Sat Dec 18 17:01:53 1999 +--- doscmd_loader.c.orig 2003-06-06 14:00:18.000000000 +0200 ++++ doscmd_loader.c @@ -31,38 +31,50 @@ */ @@ -17,8 +17,8 @@ $NetBSD: patch-ah,v 1.2 1999/12/18 22:10:02 christos Exp $ */ static const char filler[4096] = { 0, }; --#define _PATH_DOS_KERNEL_DIR "%PREFIX%/libexec/" -+#define _PATH_DOS_KERNEL_DIR "/usr/pkg/libexec/" +-#define _PATH_DOS_KERNEL_DIR "/usr/libexec/" ++#define _PATH_DOS_KERNEL_DIR "%PREFIX%/libexec/" #define _PATH_DOS_KERNEL "doscmd.kernel" -int |