diff options
| author | joerg <joerg> | 2007-03-07 14:59:06 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2007-03-07 14:59:06 +0000 |
| commit | 25d0ba8e5f846aea74a17470093b51a0315f84b7 (patch) | |
| tree | 3cbbde12f1b52808da2c23688ebfd413a638aa30 /cad/spice/patches | |
| parent | 7299f975cc0409a22199a129404fe8017ac1335b (diff) | |
| download | pkgsrc-25d0ba8e5f846aea74a17470093b51a0315f84b7.tar.gz | |
Modular Xorg support. Make it actually use the wrapper framework.
The build script overwrote PATH and didn't see the wrapper scripts
for that reason.
Diffstat (limited to 'cad/spice/patches')
| -rw-r--r-- | cad/spice/patches/patch-aa | 39 | ||||
| -rw-r--r-- | cad/spice/patches/patch-as | 19 |
2 files changed, 34 insertions, 24 deletions
diff --git a/cad/spice/patches/patch-aa b/cad/spice/patches/patch-aa index 54bf9bfe77b..2413646e12c 100644 --- a/cad/spice/patches/patch-aa +++ b/cad/spice/patches/patch-aa @@ -1,21 +1,20 @@ -$NetBSD: patch-aa,v 1.5 1999/10/01 17:05:15 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.6 2007/03/07 14:59:06 joerg Exp $ -*** util/build.orig Sun Mar 31 10:56:09 1996 ---- util/build Sun Mar 31 10:57:21 1996 -*************** -*** 96,102 **** - - TMP_LEADER="${TMP_DIR}/buildl$$" - TMP_TRAILER="${TMP_DIR}/buildt$$" -! trap 'rm -f ${TMP_LEADER} ${TMP_TRAILER}; exit 1' 1 2 3 4 6 7 8 9 10 12 13 14 15 - echo > "${TMP_TRAILER}" - BAD=false - DEBUG= ---- 96,102 ---- - - TMP_LEADER="${TMP_DIR}/buildl$$" - TMP_TRAILER="${TMP_DIR}/buildt$$" -! trap 'rm -f ${TMP_LEADER} ${TMP_TRAILER}; exit 1' 1 2 3 4 6 7 8 10 12 13 14 15 - echo > "${TMP_TRAILER}" - BAD=false - DEBUG= +--- util/build.orig 1993-07-29 08:46:39.000000000 +0000 ++++ util/build +@@ -1,6 +1,5 @@ + #! /bin/sh - + PROG=`basename "$0"` +-PATH=/bin:/usr/bin:/usr/ucb + if test "$#" -eq 0; then + echo "Usage: ${PROG} [-dnD] <system> [<modifiers>]" + echo " ${PROG} -help" +@@ -96,7 +95,7 @@ DIR4=`basename ${TOP3}` + + TMP_LEADER="${TMP_DIR}/buildl$$" + TMP_TRAILER="${TMP_DIR}/buildt$$" +-trap 'rm -f ${TMP_LEADER} ${TMP_TRAILER}; exit 1' 1 2 3 4 6 7 8 9 10 12 13 14 15 ++trap 'rm -f ${TMP_LEADER} ${TMP_TRAILER}; exit 1' 1 2 3 4 6 7 8 10 12 13 14 15 + echo > "${TMP_TRAILER}" + BAD=false + DEBUG= diff --git a/cad/spice/patches/patch-as b/cad/spice/patches/patch-as index ab4f152a05e..ecea07107ab 100644 --- a/cad/spice/patches/patch-as +++ b/cad/spice/patches/patch-as @@ -1,11 +1,22 @@ -$NetBSD: patch-as,v 1.1 1999/10/01 17:05:16 dmcmahill Exp $ +$NetBSD: patch-as,v 1.2 2007/03/07 14:59:06 joerg Exp $ ---- util/skeleton/make_def.bd.orig Thu Jul 29 17:35:18 1993 -+++ util/skeleton/make_def.bd Fri Oct 1 01:47:31 1999 -@@ -9,5 +9,5 @@ +--- util/skeleton/make_def.bd.orig 1993-07-29 21:35:18.000000000 +0000 ++++ util/skeleton/make_def.bd +@@ -8,7 +8,7 @@ SHELL = /bin/sh + PATH_SEP = / PS = / REVISION = -VERSION = 3f4 +VERSION = 3f5.1 VERSION_REVISION= $(VERSION)$(REVISION) NOTICE = + TOP = /projects/spice3/spice$(VERSION) +@@ -31,7 +31,7 @@ SYS_CONF = $(SYSCONF_DIR) + + DATALIB_DIR = $(TOP0)/lib + INCLUDE_DIR = $(DIST_DIR)/src/include +-DIST_DIR = $(TOP0) ++DIST_DIR = $(WRKSRC) + UTIL_DIR = $(DIST_DIR)/util + CONF_DIR = $(DIST_DIR)/conf + SKELETON_DIR = $(UTIL_DIR)/skeleton |