diff options
author | joerg <joerg> | 2010-06-25 21:05:57 +0000 |
---|---|---|
committer | joerg <joerg> | 2010-06-25 21:05:57 +0000 |
commit | f102d53021ec9990a0ee5dbb9f0588021fd9f0de (patch) | |
tree | d6b0dd7caecc116eb3f0db71e3b7f6697b562dc5 | |
parent | 2de95a34055432ebc64be59d2b6a1ee452911cb5 (diff) | |
download | pkgsrc-f102d53021ec9990a0ee5dbb9f0588021fd9f0de.tar.gz |
DESTDIR support
-rw-r--r-- | cad/spice/Makefile | 7 | ||||
-rw-r--r-- | cad/spice/distinfo | 4 | ||||
-rw-r--r-- | cad/spice/patches/patch-ag | 4 | ||||
-rw-r--r-- | chat/aim/Makefile | 8 |
4 files changed, 13 insertions, 10 deletions
diff --git a/cad/spice/Makefile b/cad/spice/Makefile index ab63832edeb..2115048dd0e 100644 --- a/cad/spice/Makefile +++ b/cad/spice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2009/12/17 20:58:25 abs Exp $ +# $NetBSD: Makefile,v 1.44 2010/06/25 21:05:57 joerg Exp $ DISTNAME= sp3f4.kit PKGNAME= spice-3f5.1 @@ -11,6 +11,7 @@ MAINTAINER= dmcmahill@NetBSD.org HOMEPAGE= http://bwrc.eecs.berkeley.edu/Classes/IcBook/SPICE/ COMMENT= General-purpose circuit simulation program +PKG_DESTDIR_SUPPORT= user-destdir WRKSRC= ${WRKDIR} # GPL license used by GNU readline is not compatible @@ -45,8 +46,8 @@ do-build: INSTALLATION_DIRS+=share/examples/spice3 do-install: - cd ${WRKSRC} && env ${MAKE_ENV} util/build NetBSD install - ${CHMOD} a+rx ${PREFIX}/bin/spice3 \ + cd ${WRKSRC} && env ${MAKE_ENV} ${INSTALL_ENV} util/build NetBSD install + ${CHMOD} a+rx ${DESTDIR}${PREFIX}/bin/spice3 \ ${DESTDIR}${PREFIX}/bin/nutmeg \ ${DESTDIR}${PREFIX}/bin/sconvert \ ${DESTDIR}${PREFIX}/bin/help \ diff --git a/cad/spice/distinfo b/cad/spice/distinfo index ef81d93c0e4..d0ff160aee6 100644 --- a/cad/spice/distinfo +++ b/cad/spice/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2007/03/07 14:59:06 joerg Exp $ +$NetBSD: distinfo,v 1.11 2010/06/25 21:05:57 joerg Exp $ SHA1 (sp3f4.kit.tar.Z) = bded1e078d0acfef090117490a7ac8a57887f39e RMD160 (sp3f4.kit.tar.Z) = 0bd293298c41791a9a452648f5c6a936175e220c @@ -9,7 +9,7 @@ SHA1 (patch-ac) = 6b0a62e2f153401cd4dd806d08e5df24a9a7d488 SHA1 (patch-ad) = a1a1a8dbbe7eebb9c224e42a34013ba7918cdad4 SHA1 (patch-ae) = 858e35606ff1eb622bac3bb1cc90f7ec50064b6d SHA1 (patch-af) = 23d047049d5f183af12e14b56c535adf95b9f208 -SHA1 (patch-ag) = d03a660e2e1f96eb4b5edb71c32fb0b44cc7921e +SHA1 (patch-ag) = a2a7ba21feb905f4d9cb6387f42329fccc4e168f SHA1 (patch-ah) = 2c1f4f135cbba8e7159be4ae811e54e5464cbdda SHA1 (patch-ai) = 7e94175896b98f17f43338a05ed993657d4cc844 SHA1 (patch-aj) = 6229e4066ab8bfba8b29bcc1260d75563637a784 diff --git a/cad/spice/patches/patch-ag b/cad/spice/patches/patch-ag index e46de6b420f..53123318eb0 100644 --- a/cad/spice/patches/patch-ag +++ b/cad/spice/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.4 2006/10/09 20:04:38 mlelstv Exp $ +$NetBSD: patch-ag,v 1.5 2010/06/25 21:05:57 joerg Exp $ --- conf/defaults.orig Thu Jul 29 17:33:56 1993 +++ conf/defaults @@ -17,7 +17,7 @@ $NetBSD: patch-ag,v 1.4 2006/10/09 20:04:38 mlelstv Exp $ -SPICE_DIR = $(TOP1)/$(SYSTEM) -SPICE_LIB_DIR = $(SPICE_DIR)/lib -+SPICE_DIR = @PREFIX@ ++SPICE_DIR = ${DESTDIR}@PREFIX@ +SPICE_LIB_DIR = $(SPICE_DIR)/share/spice3 SPICE_EXEC_DIR = $(SPICE_DIR)/bin diff --git a/chat/aim/Makefile b/chat/aim/Makefile index a4f92c270d1..27e26ea4ea7 100644 --- a/chat/aim/Makefile +++ b/chat/aim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2007/12/12 20:42:28 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2010/06/25 21:11:42 joerg Exp $ DISTNAME= aim-1.5.286-1.i386 PKGNAME= aim-1.5.286 @@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.aim.com/ COMMENT= AOL Instant Messenger (SM) +PKG_DESTDIR_SUPPORT= user-destdir + EMUL_PLATFORMS= linux-i386 EMUL_MODULES.linux= base compat x11 gtk @@ -27,7 +29,7 @@ WRKSRC= ${WRKDIR} BUILD_DIRS= # empty EMUL_PKG_FMT= rpm -RPM2PKG_PREFIX= ${PREFIX} +RPM2PKG_PREFIX= ${DESTDIR}${PREFIX} RPM2PKG_SUBPREFIX= ${EMULSUBDIR} .if (${OPSYS} == "Linux") && (${LOCALBASE} == "/usr") RPM2PKG_STRIP= 1 @@ -40,7 +42,7 @@ INSTALLATION_DIRS= bin .if ${OPSYS} != "Linux" post-install: - ${LN} -fs ${EMULDIR}/usr/bin/aim ${PREFIX}/bin/aim + ${LN} -fs ${EMULDIR}/usr/bin/aim ${DESTDIR}${PREFIX}/bin/aim ${ECHO} "bin/aim" >> ${RPM2PKG_PLIST} .endif |