diff options
| author | jtb <jtb@pkgsrc.org> | 2001-04-25 23:35:30 +0000 |
|---|---|---|
| committer | jtb <jtb@pkgsrc.org> | 2001-04-25 23:35:30 +0000 |
| commit | a1417e24b95b18b555a0159241d162ffec4d0308 (patch) | |
| tree | 68fae24b22b2535a9e02f10312d076c342b68c95 /math | |
| parent | 790df1c634e6826fc8a6c1fc4e74fb08acb27c23 (diff) | |
| download | pkgsrc-a1417e24b95b18b555a0159241d162ffec4d0308.tar.gz | |
Respect CFLAGS. This seems to work okay with default optimization.
Diffstat (limited to 'math')
| -rw-r--r-- | math/otter/Makefile | 31 | ||||
| -rw-r--r-- | math/otter/distinfo | 4 | ||||
| -rw-r--r-- | math/otter/patches/patch-aa | 14 |
3 files changed, 25 insertions, 24 deletions
diff --git a/math/otter/Makefile b/math/otter/Makefile index 7e8ad69e8d9..589598bc0d0 100644 --- a/math/otter/Makefile +++ b/math/otter/Makefile @@ -1,7 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/04/14 21:43:54 jtb Exp $ -# -# XXX Otter doesn't respect CFLAGS because -O2 optimization causes -# the program to malfunction (-O is fine). +# $NetBSD: Makefile,v 1.5 2001/04/25 23:35:30 jtb Exp $ DISTNAME= otter-3.0.6 CATEGORIES= math @@ -19,22 +16,18 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/otter ${PREFIX}/bin ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/otter ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/otter - @(cd ${WRKDIR}/${PKGNAME}; \ - for r in Announce Changelog Copying README*; \ - do \ - ${INSTALL_DATA} $$r ${PREFIX}/share/doc/otter; \ - done; \ - for d in auto fringe ivy kalman misc program split wos; \ - do \ + cd ${WRKDIR}/${PKGNAME} && ${INSTALL_DATA} Announce Changelog \ + Copying README* ${PREFIX}/share/doc/otter + for d in auto fringe ivy kalman misc program split wos; do \ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/otter/$$d; \ - ${INSTALL_DATA} examples/$$d/* ${PREFIX}/share/examples/otter/$$d;\ - done; \ - for p in Run_all objects summary; \ - do \ - ${INSTALL_SCRIPT} examples/$$p ${PREFIX}/share/examples/otter/$$p;\ - done; \ - ${INSTALL_DATA} examples/README ${PREFIX}/share/examples/otter; \ + ${INSTALL_DATA} ${WRKDIR}/${PKGNAME}/examples/$$d/* \ + ${PREFIX}/share/examples/otter/$$d; \ + done + cd ${WRKDIR}/${PKGNAME}/examples && ${INSTALL_SCRIPT} Run_all \ + objects summary ${PREFIX}/share/examples/otter + ${INSTALL_DATA} ${WRKDIR}/${PKGNAME}/examples/README \ + ${PREFIX}/share/examples/otter ${INSTALL_DATA} ${WRKDIR}/${PKGNAME}/document/* \ - ${PREFIX}/share/doc/otter) + ${PREFIX}/share/doc/otter .include "../../mk/bsd.pkg.mk" diff --git a/math/otter/distinfo b/math/otter/distinfo index b309413c932..93351a0003f 100644 --- a/math/otter/distinfo +++ b/math/otter/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 08:45:42 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/04/25 23:35:30 jtb Exp $ SHA1 (otter-3.0.6.tar.gz) = 4d62fbeaf3464641bf63c2cd97a15a13ee81a858 Size (otter-3.0.6.tar.gz) = 764045 bytes -SHA1 (patch-aa) = b867015c299c2d56115cc3a10b27f2d2323ffb62 +SHA1 (patch-aa) = 7e36860368e3cbfcc56b1b1c2e25ff6e0b092e17 SHA1 (patch-ab) = ea7da3af08c16c8bccb6c7a950debc96c7cf2388 diff --git a/math/otter/patches/patch-aa b/math/otter/patches/patch-aa index 5d7e249eabc..5255c0108b6 100644 --- a/math/otter/patches/patch-aa +++ b/math/otter/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/11/25 18:19:21 jtb Exp $ +$NetBSD: patch-aa,v 1.2 2001/04/25 23:35:30 jtb Exp $ ---- Makefile.orig Mon Nov 13 23:57:18 2000 +--- Makefile.orig Thu Apr 13 15:34:18 2000 +++ Makefile -@@ -80,7 +80,7 @@ +@@ -80,14 +80,14 @@ # Specify the C compiler. I recommend gcc (GNU C Compiler) if you have it. # In many Linux environments, cc is just a symlink to gcc. @@ -11,3 +11,11 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/11/25 18:19:21 jtb Exp $ ############################################################################# # + # Specify the compiler flags; include DFLAGS (above) -- Pick one of these + # + # optimized +-CFLAGS = -O $(DFLAGS) ++CFLAGS += $(DFLAGS) + # + # save symbols for debuggers + # CFLAGS = -g $(DFLAGS) |