summaryrefslogtreecommitdiff
path: root/cad
diff options
context:
space:
mode:
authorjmmv <jmmv>2004-06-08 18:01:14 +0000
committerjmmv <jmmv>2004-06-08 18:01:14 +0000
commit0afcc1cadb345efeb252668fe2175e7833778e4c (patch)
tree843861b9d5108dcd800a25db16857aac58f9a964 /cad
parent4d403c86f5435d70698f4e4927374fd2072c6da1 (diff)
downloadpkgsrc-0afcc1cadb345efeb252668fe2175e7833778e4c.tar.gz
Convert to use subst.mk instead of a home-grown string replacement "system".
Diffstat (limited to 'cad')
-rw-r--r--cad/tkgate/Makefile17
-rw-r--r--cad/tkgate/distinfo4
-rw-r--r--cad/tkgate/patches/patch-aa6
3 files changed, 13 insertions, 14 deletions
diff --git a/cad/tkgate/Makefile b/cad/tkgate/Makefile
index 990cbd1f5fd..a785aab8c68 100644
--- a/cad/tkgate/Makefile
+++ b/cad/tkgate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/06/08 17:52:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2004/06/08 18:01:14 jmmv Exp $
#
DISTNAME= tkgate-1.6i
@@ -23,16 +23,15 @@ TKGATE_SITENAME= Earth
CONFIGURE_ENV+= BUILDLINK_LDFLAGS="${BUILDLINK_LDFLAGS}"
CONFIGURE_ENV+= PREFIX="${PREFIX}"
-CONFIG_SUBST= PREFIX="${PREFIX}"
-CONFIG_SUBST+= LOCALBASE="${LOCALBASE}"
-CONFIG_SUBST+= X11BASE="${X11BASE}"
-CONFIG_SUBST_SED= ${CONFIG_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
-
-post-extract:
- ( cd ${WRKSRC} && ${MV} config.h config.h.in )
+SUBST_CLASSES+= tkgate
+SUBST_MESSAGE.tkgate= "Fixing paths in configuration files."
+SUBST_STAGE.tkgate= pre-configure
+SUBST_FILES.tkgate= config.h
+SUBST_SED.tkgate= -e 's|@LOCALBASE@|${LOCALBASE}|g'
+SUBST_SED.tkgate+= -e 's|@PREFIX@|${PREFIX}|g'
+SUBST_SED.tkgate+= -e 's|@X11BASE@|${X11BASE}|g'
do-configure:
- ${SED} ${CONFIG_SUBST_SED} ${WRKSRC}/config.h.in > ${WRKSRC}/config.h
${ECHO} "${TKGATE_SITENAME}" > ${WRKSRC}/sitename.txt
( cd ${WRKSRC} && ${CONFIGURE_ENV} ./configure )
diff --git a/cad/tkgate/distinfo b/cad/tkgate/distinfo
index 3b2409f21ba..b2d1a98c745 100644
--- a/cad/tkgate/distinfo
+++ b/cad/tkgate/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2004/06/08 17:52:22 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2004/06/08 18:01:14 jmmv Exp $
SHA1 (tkgate-1.6i.tgz) = 6eece2eb4aaa2f45c2b1c68b9c5b79a76b3bb084
Size (tkgate-1.6i.tgz) = 1459011 bytes
-SHA1 (patch-aa) = 210f7ceceb5be91db6316fbd5b108d7dac6263d2
+SHA1 (patch-aa) = 34f2d3a01acebeacd49401268c2faca80dbd4ef1
SHA1 (patch-ab) = fc014dff8095b9b62f68075572ca2dd3ba74f120
diff --git a/cad/tkgate/patches/patch-aa b/cad/tkgate/patches/patch-aa
index 33ecdcd50f5..51607f33bb7 100644
--- a/cad/tkgate/patches/patch-aa
+++ b/cad/tkgate/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/10/29 00:33:46 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.2 2004/06/08 18:01:14 jmmv Exp $
---- config.h.in.orig Mon Oct 28 13:10:53 2002
-+++ config.h.in Mon Oct 28 13:13:41 2002
+--- config.h.orig Mon Oct 28 13:10:53 2002
++++ config.h
@@ -54,13 +54,13 @@
double quotes and should be all one one line. This list is used to
find X11, tcl and tk.