From 7cb980a5342a368fab8c0b1c00a3a73f25cdc013 Mon Sep 17 00:00:00 2001 From: jtb Date: Sun, 25 Feb 2001 22:14:19 +0000 Subject: Fixed typo. Tidied up the Makefile. Don't bother running the tests. --- math/mcsim/Makefile | 31 ++++++++++++++--------------- math/mcsim/files/patch-sum | 9 +++++---- math/mcsim/patches/patch-ab | 47 ++++++++++++++++++++++++++++++++++++++++---- math/mcsim/patches/patch-ac | 48 ++++++++++++++++++++++++++++++++++++++++----- math/mcsim/patches/patch-ad | 4 ++-- math/mcsim/patches/patch-af | 8 ++++++++ math/mcsim/pkg/PLIST | 7 ++++--- 7 files changed, 120 insertions(+), 34 deletions(-) create mode 100644 math/mcsim/patches/patch-af (limited to 'math/mcsim') diff --git a/math/mcsim/Makefile b/math/mcsim/Makefile index 27fa414ed3b..17689b24645 100644 --- a/math/mcsim/Makefile +++ b/math/mcsim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/17 18:22:28 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/02/25 22:14:19 jtb Exp $ DISTNAME= mcsim-4.2.0 CATEGORIES= math @@ -8,27 +8,26 @@ MAINTAINER= jtb@netbsd.org COMMENT= Monte Carlo Simulation software WRKSRC= ${WRKDIR}/mcsim - INFO_FILES= mcsim -do-build: - @(cd ${WRKSRC}/mod && ${MAKE}) - @(cd ${WRKSRC}/sim && ${MAKE}) - @(cd ${WRKSRC}/sim && ${SH} Test_mcsim) - @(cd ${WRKSRC}/doc && makeinfo mcsim.texinfo) +post-build: + cd ${WRKSRC}/doc && makeinfo mcsim.texinfo do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mod/mod ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/sim/mcsim ${PREFIX}/bin ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mcsim - @(cd ${WRKSRC}/doc; \ - for i in *.txt MCSim* mcsim.html mcsim.dvi; \ - do \ - ${INSTALL_DATA} $$i ${PREFIX}/share/doc/mcsim; \ - done; \ - for i in mcsim mcsim-1 mcsim-2 mcsim-3; \ - do \ - ${INSTALL_DATA} $$i ${PREFIX}/info; \ - done) + @for f in ${WRKSRC}/doc/*.txt ${WRKSRC}/doc/MCSim* \ + ${WRKSRC}/doc/mcsim.dvi; do \ + i="${INSTALL_DATA} $$f ${PREFIX}/share/doc/mcsim/"; \ + ${ECHO} $$i; $$i; \ + done + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/mcsim + ${INSTALL_DATA} ${WRKSRC}/doc/mcsim.html \ + ${PREFIX}/share/doc/html/mcsim + @for f in mcsim mcsim-1 mcsim-2 mcsim-3; do \ + i="${INSTALL_DATA} ${WRKSRC}/doc/$$f ${PREFIX}/info/"; \ + ${ECHO} $$i; $$i; \ + done .include "../../mk/bsd.pkg.mk" diff --git a/math/mcsim/files/patch-sum b/math/mcsim/files/patch-sum index 51b10b7286d..58bc440b198 100644 --- a/math/mcsim/files/patch-sum +++ b/math/mcsim/files/patch-sum @@ -1,7 +1,8 @@ -$NetBSD: patch-sum,v 1.1.1.1 2000/11/26 23:02:38 jtb Exp $ +$NetBSD: patch-sum,v 1.2 2001/02/25 22:14:20 jtb Exp $ MD5 (patch-aa) = 32c8f56563c90a1486d6e75dbfa5069c -MD5 (patch-ab) = 7a65c756c0b1a7f6d822371e3ecdcb41 -MD5 (patch-ac) = e4ff78054d3d3e5f40df928f5a9ae8c6 -MD5 (patch-ad) = 1f6434b5a36da5e9667392d7c959d221 +MD5 (patch-ab) = 2d7c466c1e98e82cf116bae72dbed371 +MD5 (patch-ac) = a43f75ccc81317eb5a4e904d2265b9d4 +MD5 (patch-ad) = f6428197cd0d7a825bca405256c72dfe MD5 (patch-ae) = 9d6b9d9fdc1bd9e4ed0c0fad0cfdbb1a +MD5 (patch-af) = 22a7a7cf767b2184158d3055832658ed diff --git a/math/mcsim/patches/patch-ab b/math/mcsim/patches/patch-ab index bc111757bbe..c6e521ffdfe 100644 --- a/math/mcsim/patches/patch-ab +++ b/math/mcsim/patches/patch-ab @@ -1,7 +1,29 @@ -$NetBSD: patch-ab,v 1.1.1.1 2000/11/26 23:02:38 jtb Exp $ +$NetBSD: patch-ab,v 1.2 2001/02/25 22:14:20 jtb Exp $ ---- mod/Makefile.orig Wed Nov 22 22:39:24 2000 +--- mod/Makefile.orig Thu Mar 6 16:14:37 1997 +++ mod/Makefile +@@ -77,16 +77,16 @@ + # `realclean' removes other stuff not distributed + # + +- ++all: mod + + #---------- System Calls ---------- + # + #>>>> Define any system dependent calls here + +-ECHO = echo +-COPY = cp +-DEL = rm +-MKDIR = mkdir ++ECHO ?= echo ++COPY ?= cp ++DEL ?= rm -f ++MKDIR ?= mkdir + ARC = tar + ARCFLAGS = cvf + MOD = mod @@ -97,8 +97,8 @@ # #>>>> Define the COMPILER name and LINKER name here only. @@ -13,12 +35,12 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/11/26 23:02:38 jtb Exp $ #>>>> Define PATHS # The include path should be a directory containing header -@@ -137,13 +137,13 @@ +@@ -137,27 +137,27 @@ #>>>> To compile with OPTIMIZATION uncomment the following lines # DEBUG_SYMBOLS = -DNDEBUG -C_OPTIM_FLAG = -O -+C_OPTIM_FLAG = -O2 ++C_OPTIM_FLAG = L_OPTIM_FLAG = # @@ -29,3 +51,20 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/11/26 23:02:38 jtb Exp $ #-------------------- #**** You shouldn't need to change these lines. They are dependent + #**** only on the above setup. + +-CFLAGS = $(C_OPTIM_FLAG) $(C_DEBUG_FLAG) $(DEBUG_SYMBOLS) \ ++CFLAGS += $(C_OPTIM_FLAG) $(C_DEBUG_FLAG) $(DEBUG_SYMBOLS) \ + -I $(INCPATH) $(WARNINGS) -DMODGEN +-CLFLAGS = $(L_OPTIM_FLAG) $(L_DEBUG_FLAG) ++CLFLAGS += $(L_OPTIM_FLAG) $(L_DEBUG_FLAG) + + + # + #>>>> Extra link flags. Include libraries here + # +-LFLAGS = -lm ++LFLAGS += -lm + + + diff --git a/math/mcsim/patches/patch-ac b/math/mcsim/patches/patch-ac index a9533bf83c1..94ea1a5f307 100644 --- a/math/mcsim/patches/patch-ac +++ b/math/mcsim/patches/patch-ac @@ -1,8 +1,29 @@ -$NetBSD: patch-ac,v 1.1.1.1 2000/11/26 23:02:39 jtb Exp $ +$NetBSD: patch-ac,v 1.2 2001/02/25 22:14:20 jtb Exp $ ---- sim/Makefile.orig Wed Nov 22 22:41:05 2000 +--- sim/Makefile.orig Fri Nov 14 15:45:53 1997 +++ sim/Makefile -@@ -62,8 +62,8 @@ +@@ -46,14 +46,16 @@ + # LFLAGS : any flags specific to the linker. + # + ++all: mcsim ++ + #---------- System Calls ---------- + # + #>>>> Define any system dependent calls here + +-ECHO = echo +-COPY = cp +-DEL = rm +-MKDIR = mkdir ++ECHO ?= echo ++COPY ?= cp ++DEL ?= rm ++MKDIR ?= mkdir + MOD = mod + + +@@ -62,8 +64,8 @@ # #>>>> Define the COMPILER name and LINKER name here only. @@ -13,12 +34,12 @@ $NetBSD: patch-ac,v 1.1.1.1 2000/11/26 23:02:39 jtb Exp $ #>>>> Define PATHS # The include path should be a directory containing header -@@ -101,13 +101,13 @@ +@@ -101,27 +103,27 @@ #>>>> To compile with OPTIMIZATION uncomment the following lines # DEBUG_SYMBOLS = -DNDEBUG -C_OPTIM_FLAG = -O -+C_OPTIM_FLAG = -O2 ++C_OPTIM_FLAG = L_OPTIM_FLAG = # @@ -29,3 +50,20 @@ $NetBSD: patch-ac,v 1.1.1.1 2000/11/26 23:02:39 jtb Exp $ #-------------------- #**** You shouldn't need to change the next 2 lines. They are dependent + #**** only on the above setup. + +-CFLAGS = $(C_OPTIM_FLAG) $(C_DEBUG_FLAG) $(DEBUG_SYMBOLS) \ ++CFLAGS += $(C_OPTIM_FLAG) $(C_DEBUG_FLAG) $(DEBUG_SYMBOLS) \ + -I $(INCPATH) $(WARNINGS) +-CLFLAGS = $(L_OPTIM_FLAG) $(L_DEBUG_FLAG) ++CLFLAGS += $(L_OPTIM_FLAG) $(L_DEBUG_FLAG) + + + # + #>>>> Extra link flags. Include libraries here + # +-LFLAGS = -lm ++LFLAGS += -lm + + + diff --git a/math/mcsim/patches/patch-ad b/math/mcsim/patches/patch-ad index 53a7bbfe82f..57462315c28 100644 --- a/math/mcsim/patches/patch-ad +++ b/math/mcsim/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.1.1.1 2000/11/26 23:02:39 jtb Exp $ +$NetBSD: patch-ad,v 1.2 2001/02/25 22:14:20 jtb Exp $ --- sim/sim.c.orig Wed Nov 22 22:45:45 2000 +++ sim/sim.c @@ -16,7 +16,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2000/11/26 23:02:39 jtb Exp $ scanf ("%[^:\f\r\v\n]", *pszFileOut); #else - gets (*pszFileOut); -+ fgets (*pszFileOut, sizeof(pszFileOut), stdin); ++ fgets (*pszFileOut, sizeof(*pszFileOut), stdin); *pszFileOut = strtok (*pszFileOut, " \t"); #endif } diff --git a/math/mcsim/patches/patch-af b/math/mcsim/patches/patch-af new file mode 100644 index 00000000000..24b0bb50ebb --- /dev/null +++ b/math/mcsim/patches/patch-af @@ -0,0 +1,8 @@ +$NetBSD: patch-af,v 1.1 2001/02/25 22:14:20 jtb Exp $ + +--- /dev/null Sun Feb 25 21:54:22 2001 ++++ Makefile +@@ -0,0 +1,3 @@ ++SUBDIR = mod sim ++ ++.include diff --git a/math/mcsim/pkg/PLIST b/math/mcsim/pkg/PLIST index 86ecc7089a0..194d9a4492a 100644 --- a/math/mcsim/pkg/PLIST +++ b/math/mcsim/pkg/PLIST @@ -1,12 +1,13 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2000/11/26 23:02:38 jtb Exp $ +@comment $NetBSD: PLIST,v 1.2 2001/02/25 22:14:20 jtb Exp $ bin/mcsim bin/mod @unexec install-info --delete --info-dir=%D/info %D/info/mcsim info/mcsim -@exec install-info --info-dir=%D/info %D/info/mcsim info/mcsim-1 info/mcsim-2 info/mcsim-3 +@exec install-info --info-dir=%D/info %D/info/mcsim +share/doc/html/mcsim/mcsim.html share/doc/mcsim/About-Datasets.txt share/doc/mcsim/About-Doc.txt share/doc/mcsim/About-MCSim.txt @@ -15,5 +16,5 @@ share/doc/mcsim/MCSim-to-do share/doc/mcsim/Manual-Update.txt share/doc/mcsim/Programming-notes.txt share/doc/mcsim/mcsim.dvi -share/doc/mcsim/mcsim.html +@dirrm share/doc/html/mcsim @dirrm share/doc/mcsim -- cgit v1.2.3