summaryrefslogtreecommitdiff
path: root/cad
diff options
context:
space:
mode:
authorjperkin <jperkin>2016-04-21 13:15:15 +0000
committerjperkin <jperkin>2016-04-21 13:15:15 +0000
commit1480a86befaecd3ab4bc55400b5f6cfbcb0710d9 (patch)
tree934c66bd970f9260b1b9dacc3ae18e49ff19835e /cad
parent4b80ee9f14b6f20cc6e6955c7f7d89d29482da73 (diff)
downloadpkgsrc-1480a86befaecd3ab4bc55400b5f6cfbcb0710d9.tar.gz
Use PKGMANDIR. Use SUBST_VARS instead of manual SUBST_SEDs.
Diffstat (limited to 'cad')
-rw-r--r--cad/tkgate/Makefile6
-rw-r--r--cad/tkgate/distinfo4
-rw-r--r--cad/tkgate/patches/patch-aa4
3 files changed, 6 insertions, 8 deletions
diff --git a/cad/tkgate/Makefile b/cad/tkgate/Makefile
index 4d2f077a28f..15d0d35e4db 100644
--- a/cad/tkgate/Makefile
+++ b/cad/tkgate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2015/01/17 14:48:56 bsiegert Exp $
+# $NetBSD: Makefile,v 1.33 2016/04/21 13:15:15 jperkin Exp $
#
DISTNAME= tkgate-1.8.7
@@ -25,9 +25,7 @@ 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'
+SUBST_VARS.tkgate= LOCALBASE PKGMANDIR PREFIX X11BASE
do-configure:
${ECHO} "${TKGATE_SITENAME}" > ${WRKSRC}/sitename.txt
diff --git a/cad/tkgate/distinfo b/cad/tkgate/distinfo
index 4ef117307a3..851d6b3489b 100644
--- a/cad/tkgate/distinfo
+++ b/cad/tkgate/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2015/11/03 00:21:19 agc Exp $
+$NetBSD: distinfo,v 1.11 2016/04/21 13:15:15 jperkin Exp $
SHA1 (tkgate-1.8.7.tgz) = cf670ee0088c7bbd1f757d8647ec9b3a5ab58257
RMD160 (tkgate-1.8.7.tgz) = 87d7528f765adcd1b38fff4d019458fce1e855de
SHA512 (tkgate-1.8.7.tgz) = 6a02d06b8394bb6601774cbfc699534e8fe337177aa59130f791b863b8080463c5d555b50d72e32bd710cfa6be6e4e8a5e681344ffb833e8b8d699d9032d1ab0
Size (tkgate-1.8.7.tgz) = 1541823 bytes
SHA1 (patch-Imakefile) = 6b10f8aa4e7fe40d5b804809e10ea4be8a256c72
-SHA1 (patch-aa) = 69e17b0b38b18837efd886988c3891b5538482ab
+SHA1 (patch-aa) = e4ac73db08ae6cbd039e84e3640e5a23f3c7f840
SHA1 (patch-ab) = 1b80671b8ad504970f35d6413151439138269a1b
diff --git a/cad/tkgate/patches/patch-aa b/cad/tkgate/patches/patch-aa
index 4bfdc760bca..da1bd6ce2ce 100644
--- a/cad/tkgate/patches/patch-aa
+++ b/cad/tkgate/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2015/01/17 14:48:56 bsiegert Exp $
+$NetBSD: patch-aa,v 1.6 2016/04/21 13:15:15 jperkin Exp $
--- config.h.orig 2007-01-30 04:45:09.000000000 +0100
+++ config.h 2014-12-13 18:30:51.000000000 +0100
@@ -46,7 +46,7 @@ $NetBSD: patch-aa,v 1.5 2015/01/17 14:48:56 bsiegert Exp $
need to run the configure script again.
*/
-#define TKGATE_MANDIR /usr/X11R6/man/man1
-+#define TKGATE_MANDIR @PREFIX@/man/man1
++#define TKGATE_MANDIR @PREFIX@/@PKGMANDIR@/man1
/*
Digital circuit editor and simulator.