From ca3da75ed9516bcfee302b67e0a7c4e812baabe8 Mon Sep 17 00:00:00 2001 From: jtb Date: Thu, 1 Mar 2001 01:48:26 +0000 Subject: Correct the location of the `ctpp' preprocessor in the `telakka' script. --- math/tela/Makefile | 6 +++--- math/tela/files/patch-sum | 5 ++--- math/tela/patches/patch-ad | 17 +++++++++++------ math/tela/patches/patch-ai | 13 ------------- 4 files changed, 16 insertions(+), 25 deletions(-) delete mode 100644 math/tela/patches/patch-ai (limited to 'math') diff --git a/math/tela/Makefile b/math/tela/Makefile index c472d4cf89f..7df16b95f6d 100644 --- a/math/tela/Makefile +++ b/math/tela/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/02/28 22:34:05 jtb Exp $ +# $NetBSD: Makefile,v 1.2 2001/03/01 01:48:26 jtb Exp $ DISTNAME= tela-1.30 CATEGORIES= math @@ -29,8 +29,8 @@ CONFIGURE_ENV+= "INSTALLATION_PREFIX=${PREFIX}/share/tela" CONFIGURE_ENV+= "ARCHDEP_INSTALLATION_PREFIX=${PREFIX}/lib/tela" pre-configure: - @for f in ${WRKSRC}/telakka.in ${WRKSRC}/t/demo.t \ - ${WRKSRC}/t/docview.t ${WRKSRC}/t/std.t; do \ + @for f in ${WRKSRC}/t/demo.t ${WRKSRC}/t/docview.t \ + ${WRKSRC}/t/std.t; do \ ${SED} -e 's:@PREFIX@:'${PREFIX}':g' \ < $$f > $$f.tmp && ${MV} -f $$f.tmp $$f; \ done diff --git a/math/tela/files/patch-sum b/math/tela/files/patch-sum index 956e57e8bf0..478eaccc06f 100644 --- a/math/tela/files/patch-sum +++ b/math/tela/files/patch-sum @@ -1,10 +1,9 @@ -$NetBSD: patch-sum,v 1.1.1.1 2001/02/28 22:34:08 jtb Exp $ +$NetBSD: patch-sum,v 1.2 2001/03/01 01:48:26 jtb Exp $ MD5 (patch-aa) = abfae9aac1fd143eaa8ac0044e3aa471 MD5 (patch-ab) = 1aba13fb7197a84658356ea21f51ce83 MD5 (patch-ac) = dd2f3f9190ba1494c43bf9bf5ec4bf67 -MD5 (patch-ad) = 4de2fe35d40f272789718b1949ab0a58 +MD5 (patch-ad) = fe43629443074456c8f84ad836c1976d MD5 (patch-af) = 4a89d7f3fe822d7cbfdc3182fce7f563 MD5 (patch-ag) = 1383a1a031ec726774912d54d80917d3 MD5 (patch-ah) = d7b90350c973c03a24edb9ede76502fc -MD5 (patch-ai) = 5ed610dfafd8c30f4c5675a5a23c7a1c diff --git a/math/tela/patches/patch-ad b/math/tela/patches/patch-ad index 68ec813358f..4b917200ca9 100644 --- a/math/tela/patches/patch-ad +++ b/math/tela/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.1.1.1 2001/02/28 22:34:09 jtb Exp $ +$NetBSD: patch-ad,v 1.2 2001/03/01 01:48:26 jtb Exp $ --- Makefile.orig Tue Dec 5 07:43:56 2000 +++ Makefile @@ -20,7 +20,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/02/28 22:34:09 jtb Exp $ what help : @echo 'make - same as make tela';\ -@@ -541,20 +541,20 @@ +@@ -541,20 +541,22 @@ if [ ! -d ct ]; then mkdir ct; chmod 755 ct; fi;\ if [ ! -d include ]; then mkdir include; chmod 755 include; fi;\ if [ ! -d include/templ ]; then mkdir include/templ; chmod 755 include/templ; fi @@ -28,13 +28,18 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/02/28 22:34:09 jtb Exp $ - $(INSTALL_PROGRAM) tela $(INSTALL_BINDIR) + $(INSTALL_PROGRAM) ctpp ${PREFIX}/bin + $(INSTALL_PROGRAM) tela ${PREFIX}/bin ++ sed -e 's@^CTTP="$BINDIR@CTTP="${PREFIX}/bin@g' \ ++ telakka.1 sed -e 's@^BINDIR=.*$$@BINDIR=$(INSTALL_BINDIR)@' \ -e 's@^INCLUDEDIR=.*$$@INCLUDEDIR=$(INSTALL_LIBDIR)/include@' \ - telakka.1;\ - chmod +x telakka.1 +- telakka.1;\ +- chmod +x telakka.1 - $(INSTALL_PROGRAM) telakka.1 $(INSTALL_BINDIR)/telakka;\ -+ $(BSD_INSTALL_SCRIPT) telakka.1 ${PREFIX}/bin/telakka;\ - rm telakka.1 +- rm telakka.1 ++ telakka.2;\ ++ chmod +x telakka.2 ++ $(BSD_INSTALL_SCRIPT) telakka.2 ${PREFIX}/bin/telakka;\ ++ rm telakka.1 telakka.2 cd $(srcdir); for i in *.ct local/*.ct; do $(INSTALL_DATA) $$i $(INSTALL_LIBDIR)/ct; done cd $(srcdir)/opt; for i in *.ct; do $(INSTALL_DATA) $$i $(INSTALL_LIBDIR)/ct; done cd $(srcdir)/t; for i in *.t *.hdf; do $(INSTALL_DATA) $$i $(INSTALL_LIBDIR)/t; done diff --git a/math/tela/patches/patch-ai b/math/tela/patches/patch-ai deleted file mode 100644 index b0ccd4f7069..00000000000 --- a/math/tela/patches/patch-ai +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ai,v 1.1.1.1 2001/02/28 22:34:09 jtb Exp $ - ---- telakka.in.orig Mon Dec 4 07:27:58 2000 -+++ telakka.in -@@ -7,7 +7,7 @@ - - nm_options="" - --CTPP="$BINDIR/ctpp" -+CTPP="@PREFIX@/bin/ctpp" - compileOnly=false - shared=false - outputFileSpecified=false -- cgit v1.2.3