diff --git a/math/mathomatic/Makefile b/math/mathomatic/Makefile index bcf254659a9..d565deb0056 100644 --- a/math/mathomatic/Makefile +++ b/math/mathomatic/Makefile @@ -1,13 +1,12 @@ -# $OpenBSD: Makefile,v 1.21 2010/10/18 20:52:06 espie Exp $ +# $OpenBSD: Makefile,v 1.22 2010/10/23 16:47:33 steven Exp $ COMMENT = small, portable, general purpose computer algebra system -DISTNAME = mathomatic-14.5.5 -REVISION = 0 +DISTNAME = mathomatic-15.3.0 CATEGORIES = math -HOMEPAGE = http://www.mathomatic.org/ +HOMEPAGE = http://www.mathomatic.org/math/ # LGPL PERMIT_PACKAGE_CDROM = Yes @@ -22,7 +21,7 @@ EXTRACT_SUFX = .tar.bz2 MAKE_ENV = READLINE=1 MAKE_FILE = makefile -FAKE_FLAGS = prefix=${WRKINST}${PREFIX} +USE_GMAKE = Yes USE_GROFF = Yes REGRESS_TARGET = test diff --git a/math/mathomatic/distinfo b/math/mathomatic/distinfo index e795ec4dce5..e2253a0083e 100644 --- a/math/mathomatic/distinfo +++ b/math/mathomatic/distinfo @@ -1,5 +1,5 @@ -MD5 (mathomatic-14.5.5.tar.bz2) = 8uPuHrCzZebavahIrNzpnw== -RMD160 (mathomatic-14.5.5.tar.bz2) = EyuN+/EPDLBY6mnwRYDQ54fU5VU= -SHA1 (mathomatic-14.5.5.tar.bz2) = cosCjfxakyTars+MRvW67TU63MQ= -SHA256 (mathomatic-14.5.5.tar.bz2) = JZjW5JEgbxzjr6Gt4mBPOJ0sbxaPT1yw5D94CTIj0H0= -SIZE (mathomatic-14.5.5.tar.bz2) = 170610 +MD5 (mathomatic-15.3.0.tar.bz2) = dX3MGF90gSUXYb75V7oOAQ== +RMD160 (mathomatic-15.3.0.tar.bz2) = UNse2qmnxcPj7ZW1bKCsDzwhuaU= +SHA1 (mathomatic-15.3.0.tar.bz2) = m0ieeY0L3Jjiy9ZscPYpec3mURo= +SHA256 (mathomatic-15.3.0.tar.bz2) = 2157a+qE6zRdDq74ormU6YzXj9MsFME2YlBPZe/CaPk= +SIZE (mathomatic-15.3.0.tar.bz2) = 180588 diff --git a/math/mathomatic/patches/patch-globals_c b/math/mathomatic/patches/patch-globals_c index e4356df23b6..d9588a5ffb6 100644 --- a/math/mathomatic/patches/patch-globals_c +++ b/math/mathomatic/patches/patch-globals_c @@ -1,8 +1,8 @@ -$OpenBSD: patch-globals_c,v 1.13 2009/10/10 10:16:17 steven Exp $ ---- globals.c.orig Mon Aug 3 11:45:43 2009 -+++ globals.c Sat Oct 10 12:14:08 2009 -@@ -61,7 +61,7 @@ int debug_level; /* current debug level */ - #if LIBRARY +$OpenBSD: patch-globals_c,v 1.14 2010/10/23 16:47:34 steven Exp $ +--- globals.c.orig Fri Oct 8 19:57:18 2010 ++++ globals.c Sat Oct 23 18:05:12 2010 +@@ -81,7 +81,7 @@ int debug_level; /* current debug level */ + #if LIBRARY || NO_COLOR int color_flag = false; /* library shouldn't default to color mode */ #else -int color_flag = true; /* "set color" flag, true for color output mode */ diff --git a/math/mathomatic/patches/patch-makefile b/math/mathomatic/patches/patch-makefile index 1f448c02ded..41f66878f3d 100644 --- a/math/mathomatic/patches/patch-makefile +++ b/math/mathomatic/patches/patch-makefile @@ -1,17 +1,18 @@ -$OpenBSD: patch-makefile,v 1.10 2009/10/10 10:16:17 steven Exp $ ---- makefile.orig Sat Sep 5 17:12:42 2009 -+++ makefile Sat Oct 10 12:13:26 2009 -@@ -6,7 +6,7 @@ +$OpenBSD: patch-makefile,v 1.11 2010/10/23 16:47:34 steven Exp $ +--- makefile.orig Fri Oct 8 01:43:47 2010 ++++ makefile Sat Oct 23 18:07:42 2010 +@@ -9,7 +9,8 @@ INSTALL ?= install # installer to use + INSTALL_PROGRAM ?= $(INSTALL) # command to install program files + INSTALL_DATA ?= $(INSTALL) -m 0644 # command to install data files + +-CC_OPTIMIZE = -O # default C compiler optimization flags ++CC_OPTIMIZE = ++#CC_OPTIMIZE = -O # default C compiler optimization flags + #CC_OPTIMIZE = -O3 -msse2 -mfpmath=sse -fomit-frame-pointer # optimize for speed on a Pentium 4 or higher CPU VERSION = `cat VERSION` - CFLAGS += -Wall -Wshadow -Wno-char-subscripts -fomit-frame-pointer # gcc specific flags --CFLAGS += -O -DUNIX -DVERSION=\"$(VERSION)\" -+CFLAGS += -DUNIX -DVERSION=\"$(VERSION)\" - LDLIBS += -lm # libraries to link - - # "make READLINE=1" to include readline support: -@@ -20,7 +20,7 @@ LDLIBS += $(READLINE:1=-lreadline -lncurses) - # Install directories follow, installs everything in /usr/local by default: +@@ -31,7 +32,7 @@ LDLIBS += $(READLINE:1=-lreadline -lncurses) + # DESTDIR is only used by package maintainers, who should remove all DESTDIR patches soon. prefix ?= /usr/local bindir ?= $(prefix)/bin -mandir ?= $(prefix)/share/man diff --git a/math/mathomatic/pkg/PLIST b/math/mathomatic/pkg/PLIST index 58c7cf7ebf8..594381582ae 100644 --- a/math/mathomatic/pkg/PLIST +++ b/math/mathomatic/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.11 2009/12/21 22:07:57 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.12 2010/10/23 16:47:34 steven Exp $ @bin bin/mathomatic @man man/man1/mathomatic.1 share/applications/mathomatic.desktop @@ -15,6 +15,7 @@ share/doc/mathomatic/factorial/fact.py share/doc/mathomatic/factorial/factorial share/doc/mathomatic/factorial/intfact.c share/doc/mathomatic/html/ +share/doc/mathomatic/html/README.txt share/doc/mathomatic/html/am.html share/doc/mathomatic/html/doc.css share/doc/mathomatic/html/favicon.ico @@ -22,22 +23,28 @@ share/doc/mathomatic/html/greenfade.png share/doc/mathomatic/html/index.html share/doc/mathomatic/html/led_circle_green.png share/doc/mathomatic/html/manual.html +share/doc/mathomatic/html/matho-mult.1.html share/doc/mathomatic/html/matho-pascal.1.html share/doc/mathomatic/html/matho-primes.1.html +share/doc/mathomatic/html/matho-sum.1.html share/doc/mathomatic/html/matho-sumsq.1.html share/doc/mathomatic/html/mathomatic.1.html share/doc/mathomatic/html/mathomatic16x16.png share/doc/mathomatic/html/open_book_nae_02.png +share/doc/mathomatic/html/primorial.1.html share/doc/mathomatic/m4/ share/doc/mathomatic/m4/README.txt share/doc/mathomatic/m4/functions.m4 share/doc/mathomatic/m4/matho +share/doc/mathomatic/m4/matho-install +share/doc/mathomatic/m4/matho-uninstall share/doc/mathomatic/m4/rmath share/doc/mathomatic/tests/ share/doc/mathomatic/tests/README.txt share/doc/mathomatic/tests/all.in share/doc/mathomatic/tests/all.out share/doc/mathomatic/tests/circles.in +share/doc/mathomatic/tests/collatz.in share/doc/mathomatic/tests/conversions.in share/doc/mathomatic/tests/cubic.in share/doc/mathomatic/tests/david.in @@ -67,14 +74,14 @@ share/doc/mathomatic/tests/poly.in share/doc/mathomatic/tests/pyth3d.in share/doc/mathomatic/tests/radius.in share/doc/mathomatic/tests/simplify.in -share/doc/mathomatic/tests/test +share/doc/mathomatic/tests/t share/doc/mathomatic/tests/test.in share/doc/mathomatic/tests/test1.in share/doc/mathomatic/tests/test2.in share/doc/mathomatic/tests/test6.in -share/doc/mathomatic/tests/torus.in share/doc/mathomatic/tests/trig.in share/pixmaps/ share/pixmaps/mathomatic.png +share/pixmaps/mathomatic.xpm @exec %D/bin/update-desktop-database @unexec-delete %D/bin/update-desktop-database