Fri Jun 25 21:05:57 2010 UTC ()
DESTDIR support


(joerg)
diff -r1.43 -r1.44 pkgsrc/cad/spice/Makefile
diff -r1.10 -r1.11 pkgsrc/cad/spice/distinfo
diff -r1.4 -r1.5 pkgsrc/cad/spice/patches/patch-ag
cvs diff -r1.43 -r1.44 pkgsrc/cad/spice/Makefile (expand / switch to unified diff)

--- pkgsrc/cad/spice/Makefile 2009/12/17 20:58:25 1.43
+++ pkgsrc/cad/spice/Makefile 2010/06/25 21:05:57 1.44
@@ -1,26 +1,27 @@ @@ -1,26 +1,27 @@
1# $NetBSD: Makefile,v 1.43 2009/12/17 20:58:25 abs Exp $ 1# $NetBSD: Makefile,v 1.44 2010/06/25 21:05:57 joerg Exp $
2 2
3DISTNAME= sp3f4.kit 3DISTNAME= sp3f4.kit
4PKGNAME= spice-3f5.1 4PKGNAME= spice-3f5.1
5PKGREVISION= 6 5PKGREVISION= 6
6CATEGORIES= cad 6CATEGORIES= cad
7MASTER_SITES= ftp://ic.eecs.berkeley.edu/pub/Spice3/ 7MASTER_SITES= ftp://ic.eecs.berkeley.edu/pub/Spice3/
8EXTRACT_SUFX= .tar.Z 8EXTRACT_SUFX= .tar.Z
9 9
10MAINTAINER= dmcmahill@NetBSD.org 10MAINTAINER= dmcmahill@NetBSD.org
11HOMEPAGE= http://bwrc.eecs.berkeley.edu/Classes/IcBook/SPICE/ 11HOMEPAGE= http://bwrc.eecs.berkeley.edu/Classes/IcBook/SPICE/
12COMMENT= General-purpose circuit simulation program 12COMMENT= General-purpose circuit simulation program
13 13
 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
15WRKSRC= ${WRKDIR} 16WRKSRC= ${WRKDIR}
16# GPL license used by GNU readline is not compatible 17# GPL license used by GNU readline is not compatible
17# with 4 clause BSD license used by spice. 18# with 4 clause BSD license used by spice.
18#BUILDLINK_API_DEPENDS.readline= readline>=4.0 19#BUILDLINK_API_DEPENDS.readline= readline>=4.0
19#USE_GNU_READLINE= uses rl_* interface 20#USE_GNU_READLINE= uses rl_* interface
20 21
21# documentation in ftp://ic.eecs.berkeley.edu/pub/Spice3/um.3f3.ps 22# documentation in ftp://ic.eecs.berkeley.edu/pub/Spice3/um.3f3.ps
22 23
23# These are included as patch-ae 24# These are included as patch-ae
24#PATCH_SITES= ftp://ilpsoft.eecs.berkeley.edu/pub/SPICE3F5/ 25#PATCH_SITES= ftp://ilpsoft.eecs.berkeley.edu/pub/SPICE3F5/
25#PATCHFILES= grid.patch newcoms.patch spsmp.patch 26#PATCHFILES= grid.patch newcoms.patch spsmp.patch
26 27
@@ -35,28 +36,28 @@ SUBST_CLASSES+= conf @@ -35,28 +36,28 @@ SUBST_CLASSES+= conf
35SUBST_STAGE.conf= pre-configure 36SUBST_STAGE.conf= pre-configure
36SUBST_FILES.conf= conf/NetBSD conf/defaults 37SUBST_FILES.conf= conf/NetBSD conf/defaults
37SUBST_VARS.conf= MAKE_PROGRAM CFLAGS LDFLAGS WRKSRC PREFIX X11BASE 38SUBST_VARS.conf= MAKE_PROGRAM CFLAGS LDFLAGS WRKSRC PREFIX X11BASE
38 39
39do-configure: 40do-configure:
40 rm -f ${WRKSRC}/makefile 41 rm -f ${WRKSRC}/makefile
41 42
42do-build: 43do-build:
43 cd ${WRKSRC} && env ${MAKE_ENV} util/build NetBSD default 44 cd ${WRKSRC} && env ${MAKE_ENV} util/build NetBSD default
44 45
45INSTALLATION_DIRS+=share/examples/spice3 46INSTALLATION_DIRS+=share/examples/spice3
46 47
47do-install: 48do-install:
48 cd ${WRKSRC} && env ${MAKE_ENV} util/build NetBSD install 49 cd ${WRKSRC} && env ${MAKE_ENV} ${INSTALL_ENV} util/build NetBSD install
49 ${CHMOD} a+rx ${PREFIX}/bin/spice3 \ 50 ${CHMOD} a+rx ${DESTDIR}${PREFIX}/bin/spice3 \
50 ${DESTDIR}${PREFIX}/bin/nutmeg \ 51 ${DESTDIR}${PREFIX}/bin/nutmeg \
51 ${DESTDIR}${PREFIX}/bin/sconvert \ 52 ${DESTDIR}${PREFIX}/bin/sconvert \
52 ${DESTDIR}${PREFIX}/bin/help \ 53 ${DESTDIR}${PREFIX}/bin/help \
53 ${DESTDIR}${PREFIX}/bin/proc2mod \ 54 ${DESTDIR}${PREFIX}/bin/proc2mod \
54 ${DESTDIR}${PREFIX}/bin/multidec 55 ${DESTDIR}${PREFIX}/bin/multidec
55 strip ${DESTDIR}${PREFIX}/bin/spice3 \ 56 strip ${DESTDIR}${PREFIX}/bin/spice3 \
56 ${DESTDIR}${PREFIX}/bin/nutmeg \ 57 ${DESTDIR}${PREFIX}/bin/nutmeg \
57 ${DESTDIR}${PREFIX}/bin/sconvert \ 58 ${DESTDIR}${PREFIX}/bin/sconvert \
58 ${DESTDIR}${PREFIX}/bin/help \ 59 ${DESTDIR}${PREFIX}/bin/help \
59 ${DESTDIR}${PREFIX}/bin/proc2mod \ 60 ${DESTDIR}${PREFIX}/bin/proc2mod \
60 ${DESTDIR}${PREFIX}/bin/multidec 61 ${DESTDIR}${PREFIX}/bin/multidec
61 ${CHMOD} -R a+rX ${DESTDIR}${PREFIX}/share/spice3 62 ${CHMOD} -R a+rX ${DESTDIR}${PREFIX}/share/spice3
62 ${INSTALL_MAN} ${WRKSRC}/man/man5/mfbcap.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/mfbcap.5 63 ${INSTALL_MAN} ${WRKSRC}/man/man5/mfbcap.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/mfbcap.5
cvs diff -r1.10 -r1.11 pkgsrc/cad/spice/distinfo (expand / switch to unified diff)

--- pkgsrc/cad/spice/distinfo 2007/03/07 14:59:06 1.10
+++ pkgsrc/cad/spice/distinfo 2010/06/25 21:05:57 1.11
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1$NetBSD: distinfo,v 1.10 2007/03/07 14:59:06 joerg Exp $ 1$NetBSD: distinfo,v 1.11 2010/06/25 21:05:57 joerg Exp $
2 2
3SHA1 (sp3f4.kit.tar.Z) = bded1e078d0acfef090117490a7ac8a57887f39e 3SHA1 (sp3f4.kit.tar.Z) = bded1e078d0acfef090117490a7ac8a57887f39e
4RMD160 (sp3f4.kit.tar.Z) = 0bd293298c41791a9a452648f5c6a936175e220c 4RMD160 (sp3f4.kit.tar.Z) = 0bd293298c41791a9a452648f5c6a936175e220c
5Size (sp3f4.kit.tar.Z) = 2086528 bytes 5Size (sp3f4.kit.tar.Z) = 2086528 bytes
6SHA1 (patch-aa) = e02c604b9d32b395dd8d7ac22255c96229fff72a 6SHA1 (patch-aa) = e02c604b9d32b395dd8d7ac22255c96229fff72a
7SHA1 (patch-ab) = aa036badf15b69f199861b1f1d0d10f85471f496 7SHA1 (patch-ab) = aa036badf15b69f199861b1f1d0d10f85471f496
8SHA1 (patch-ac) = 6b0a62e2f153401cd4dd806d08e5df24a9a7d488 8SHA1 (patch-ac) = 6b0a62e2f153401cd4dd806d08e5df24a9a7d488
9SHA1 (patch-ad) = a1a1a8dbbe7eebb9c224e42a34013ba7918cdad4 9SHA1 (patch-ad) = a1a1a8dbbe7eebb9c224e42a34013ba7918cdad4
10SHA1 (patch-ae) = 858e35606ff1eb622bac3bb1cc90f7ec50064b6d 10SHA1 (patch-ae) = 858e35606ff1eb622bac3bb1cc90f7ec50064b6d
11SHA1 (patch-af) = 23d047049d5f183af12e14b56c535adf95b9f208 11SHA1 (patch-af) = 23d047049d5f183af12e14b56c535adf95b9f208
12SHA1 (patch-ag) = d03a660e2e1f96eb4b5edb71c32fb0b44cc7921e 12SHA1 (patch-ag) = a2a7ba21feb905f4d9cb6387f42329fccc4e168f
13SHA1 (patch-ah) = 2c1f4f135cbba8e7159be4ae811e54e5464cbdda 13SHA1 (patch-ah) = 2c1f4f135cbba8e7159be4ae811e54e5464cbdda
14SHA1 (patch-ai) = 7e94175896b98f17f43338a05ed993657d4cc844 14SHA1 (patch-ai) = 7e94175896b98f17f43338a05ed993657d4cc844
15SHA1 (patch-aj) = 6229e4066ab8bfba8b29bcc1260d75563637a784 15SHA1 (patch-aj) = 6229e4066ab8bfba8b29bcc1260d75563637a784
16SHA1 (patch-ak) = f7e630445f87514e58221e0e10ae17cb4b532849 16SHA1 (patch-ak) = f7e630445f87514e58221e0e10ae17cb4b532849
17SHA1 (patch-al) = 4b27e02d8e6c74cb2ba6608d86f58fda891c6735 17SHA1 (patch-al) = 4b27e02d8e6c74cb2ba6608d86f58fda891c6735
18SHA1 (patch-am) = f80ff5cc36abdf0780f87ecdacce73ccd4abd395 18SHA1 (patch-am) = f80ff5cc36abdf0780f87ecdacce73ccd4abd395
19SHA1 (patch-an) = f0b06bf671f4370dedfe3693bfcd5461ddcccf24 19SHA1 (patch-an) = f0b06bf671f4370dedfe3693bfcd5461ddcccf24
20SHA1 (patch-ao) = 6701fc535be7f3ab3d6287b42af7b15e63980189 20SHA1 (patch-ao) = 6701fc535be7f3ab3d6287b42af7b15e63980189
21SHA1 (patch-ap) = f82a0828c1c2681dc1df5e3de7a37cd042c0494f 21SHA1 (patch-ap) = f82a0828c1c2681dc1df5e3de7a37cd042c0494f
22SHA1 (patch-aq) = 87739a58999dc7027468ff46c04a65c75cf853e3 22SHA1 (patch-aq) = 87739a58999dc7027468ff46c04a65c75cf853e3
23SHA1 (patch-ar) = 7bfa494147b26f7b330498d9c64ae66a79cebd27 23SHA1 (patch-ar) = 7bfa494147b26f7b330498d9c64ae66a79cebd27
24SHA1 (patch-as) = 44d36eedbdb1c9c95886ce0e34417ff8fd3cb72d 24SHA1 (patch-as) = 44d36eedbdb1c9c95886ce0e34417ff8fd3cb72d
25SHA1 (patch-at) = cf0156a20f3fdadca74434d1ee26f023f7d40bac 25SHA1 (patch-at) = cf0156a20f3fdadca74434d1ee26f023f7d40bac
cvs diff -r1.4 -r1.5 pkgsrc/cad/spice/patches/patch-ag (expand / switch to unified diff)

--- pkgsrc/cad/spice/patches/patch-ag 2006/10/09 20:04:38 1.4
+++ pkgsrc/cad/spice/patches/patch-ag 2010/06/25 21:05:57 1.5
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1$NetBSD: patch-ag,v 1.4 2006/10/09 20:04:38 mlelstv Exp $ 1$NetBSD: patch-ag,v 1.5 2010/06/25 21:05:57 joerg Exp $
2 2
3--- conf/defaults.orig Thu Jul 29 17:33:56 1993 3--- conf/defaults.orig Thu Jul 29 17:33:56 1993
4+++ conf/defaults 4+++ conf/defaults
5@@ -65,7 +65,7 @@ 5@@ -65,7 +65,7 @@
6 # the following definition: 6 # the following definition:
7 # SYS_DIR = $(DIST_DIR) 7 # SYS_DIR = $(DIST_DIR)
8  8
9-SYS_DIR = $(TOP1)/$(SYSTEM) 9-SYS_DIR = $(TOP1)/$(SYSTEM)
10+SYS_DIR = $(TOP0)/$(SYSTEM) 10+SYS_DIR = $(TOP0)/$(SYSTEM)
11  11
12 # OBJ_TOP is the directory in which intermidiate files reside 12 # OBJ_TOP is the directory in which intermidiate files reside
13 # These are ".o" files, synthesized ".c" files, ".a" files, 13 # These are ".o" files, synthesized ".c" files, ".a" files,
14@@ -105,12 +105,12 @@ 14@@ -105,12 +105,12 @@
15 # identified as and SYSTEM is the name of the per-system definitions 15 # identified as and SYSTEM is the name of the per-system definitions
16 # file listed on the "build" command line. 16 # file listed on the "build" command line.
17  17
18-SPICE_DIR = $(TOP1)/$(SYSTEM) 18-SPICE_DIR = $(TOP1)/$(SYSTEM)
19-SPICE_LIB_DIR = $(SPICE_DIR)/lib 19-SPICE_LIB_DIR = $(SPICE_DIR)/lib
20+SPICE_DIR = @PREFIX@ 20+SPICE_DIR = ${DESTDIR}@PREFIX@
21+SPICE_LIB_DIR = $(SPICE_DIR)/share/spice3 21+SPICE_LIB_DIR = $(SPICE_DIR)/share/spice3
22 SPICE_EXEC_DIR = $(SPICE_DIR)/bin 22 SPICE_EXEC_DIR = $(SPICE_DIR)/bin
23  23
24 S_SPICE_DIR = $(SPICE_DIR) 24 S_SPICE_DIR = $(SPICE_DIR)
25-S_SPICE_LIB_DIR = $(S_SPICE_DIR)/lib 25-S_SPICE_LIB_DIR = $(S_SPICE_DIR)/lib
26+S_SPICE_LIB_DIR = $(S_SPICE_DIR)/share/spice3 26+S_SPICE_LIB_DIR = $(S_SPICE_DIR)/share/spice3
27 S_SPICE_EXEC_DIR= $(S_SPICE_DIR)/bin 27 S_SPICE_EXEC_DIR= $(S_SPICE_DIR)/bin
28  28
29 # INSTALL_DIRS lists the directories that need to be created before 29 # INSTALL_DIRS lists the directories that need to be created before
30@@ -129,11 +129,11 @@ 30@@ -129,11 +129,11 @@
31 # an extra definition to work around the same strange bug. See either 31 # an extra definition to work around the same strange bug. See either
32 # file "conf/vax" or "conf/gcc". 32 # file "conf/vax" or "conf/gcc".
33  33