From 8dd93de9692217e706c2607cd1e95e47da10f88d Mon Sep 17 00:00:00 2001 From: joerg Date: Wed, 7 Mar 2007 14:59:06 +0000 Subject: 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. --- cad/spice/Makefile | 8 +++++--- cad/spice/distinfo | 6 +++--- cad/spice/patches/patch-aa | 39 +++++++++++++++++++-------------------- cad/spice/patches/patch-as | 19 +++++++++++++++---- 4 files changed, 42 insertions(+), 30 deletions(-) (limited to 'cad/spice') diff --git a/cad/spice/Makefile b/cad/spice/Makefile index dc859993ae3..e3f10b0fa50 100644 --- a/cad/spice/Makefile +++ b/cad/spice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2007/02/22 19:26:10 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2007/03/07 14:59:06 joerg Exp $ DISTNAME= sp3f4.kit PKGNAME= spice-3f5.1 @@ -26,6 +26,8 @@ WRKSRC= ${WRKDIR} INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man3 ${PKGMANDIR}/man5 +MAKE_ENV+= WRKSRC=${WRKSRC:Q} + post-extract: ${CP} ${FILESDIR}/NetBSD ${WRKSRC}/conf @@ -43,7 +45,7 @@ do-configure: done do-build: - cd ${WRKSRC}; util/build NetBSD default + cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} util/build NetBSD default do-install: cd ${WRKSRC}; util/build NetBSD install @@ -65,5 +67,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/examples/*.cir ${PREFIX}/share/examples/spice3 #.include "../../devel/readline/buildlink3.mk" -.include "../../mk/x11.buildlink3.mk" +.include "../../x11/libXaw/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/spice/distinfo b/cad/spice/distinfo index 9fb78a45343..ef81d93c0e4 100644 --- a/cad/spice/distinfo +++ b/cad/spice/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.9 2006/10/09 20:04:38 mlelstv Exp $ +$NetBSD: distinfo,v 1.10 2007/03/07 14:59:06 joerg Exp $ SHA1 (sp3f4.kit.tar.Z) = bded1e078d0acfef090117490a7ac8a57887f39e RMD160 (sp3f4.kit.tar.Z) = 0bd293298c41791a9a452648f5c6a936175e220c Size (sp3f4.kit.tar.Z) = 2086528 bytes -SHA1 (patch-aa) = 35d8d9ecfb2beaa54e0763197b551d5e26fc7f4e +SHA1 (patch-aa) = e02c604b9d32b395dd8d7ac22255c96229fff72a SHA1 (patch-ab) = aa036badf15b69f199861b1f1d0d10f85471f496 SHA1 (patch-ac) = 6b0a62e2f153401cd4dd806d08e5df24a9a7d488 SHA1 (patch-ad) = a1a1a8dbbe7eebb9c224e42a34013ba7918cdad4 @@ -21,7 +21,7 @@ SHA1 (patch-ao) = 6701fc535be7f3ab3d6287b42af7b15e63980189 SHA1 (patch-ap) = f82a0828c1c2681dc1df5e3de7a37cd042c0494f SHA1 (patch-aq) = 87739a58999dc7027468ff46c04a65c75cf853e3 SHA1 (patch-ar) = 7bfa494147b26f7b330498d9c64ae66a79cebd27 -SHA1 (patch-as) = b1c077eb64eb1a4401604283cfc1534a0ee4269b +SHA1 (patch-as) = 44d36eedbdb1c9c95886ce0e34417ff8fd3cb72d SHA1 (patch-at) = cf0156a20f3fdadca74434d1ee26f023f7d40bac SHA1 (patch-au) = 5b69fde30ec2cc301b970e2c40d83fac1b00c874 SHA1 (patch-av) = 9828210e621310023e059e4fc7f8f1c5d1c7e187 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] []" + 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 -- cgit v1.2.3