diff options
author | jtb <jtb> | 2001-02-25 22:14:19 +0000 |
---|---|---|
committer | jtb <jtb> | 2001-02-25 22:14:19 +0000 |
commit | aef037e1d22399de5287c6e537fe4fc16a1295a4 (patch) | |
tree | 37b6bb8fc217dd2e02f6c2df7ad33d3cdba5e1e6 /math/mcsim/patches | |
parent | 517481264ad482e979f298129dd1469aab63254a (diff) | |
download | pkgsrc-aef037e1d22399de5287c6e537fe4fc16a1295a4.tar.gz |
Fixed typo. Tidied up the Makefile. Don't bother running the tests.
Diffstat (limited to 'math/mcsim/patches')
-rw-r--r-- | math/mcsim/patches/patch-ab | 47 | ||||
-rw-r--r-- | math/mcsim/patches/patch-ac | 48 | ||||
-rw-r--r-- | math/mcsim/patches/patch-ad | 4 | ||||
-rw-r--r-- | math/mcsim/patches/patch-af | 8 |
4 files changed, 96 insertions, 11 deletions
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 <bsd.subdir.mk> |