pkg/43740: Update math/mathomatic to 15.1.6

[kamelderouiche%yahoo.com@localhost]

>Number:         43740
>Category:       pkg
>Synopsis:       Update math/mathomatic to 15.1.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Aug 10 22:00:00 +0000 2010
>Originator:     Derouiche
>Release:        NetBSD 5.0.2
>Organization:
Algerie Motors company
>Environment:
NetBSD Khaarasan 5.0.2 NetBSD 5.0.2 (GENERIC) #0: Sat Feb  6 17:53:27 UTC 2010  
builds%b7.netbsd.org@localhost:/home/builds/ab/netbsd-5-0-2-RELEASE/i386/201002061851Z-obj/home/builds/ab/netbsd-5-0-2-RELEASE/src/sys/arch/i386/compile/GENERIC
 i386

>Description:
Please testing other architecture
add two new file patch. 
>How-To-Repeat:
n/a
>Fix:
$ diff -ruN Makefile.orig Makefile 
--- Makefile.orig       2010-08-10 20:20:20.000000000 +0000
+++ Makefile    2010-08-10 22:37:53.000000000 +0000
@@ -1,34 +1,30 @@
-# $NetBSD: Makefile,v 1.90 2009/06/10 17:03:54 minskim Exp $
+# $NetBSD$
 #
 
-DISTNAME=              mathomatic-14.5.5
-CATEGORIES=            math
-MASTER_SITES=          http://www.panix.com/~gesslein/
-EXTRACT_SUFX=          .tar.bz2
+DISTNAME=      mathomatic-15.1.6
+CATEGORIES=    math
+MASTER_SITES=  http://mathomatic.org/
+EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=            minskim%NetBSD.org@localhost
 HOMEPAGE=              http://www.mathomatic.org/
 COMMENT=               Small portable symbolic math program
+LICENSE=       gnu-lgpl-v2.1
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 NO_CONFIGURE=          yes
+USE_TOOLS+=    gmake
 MAKE_FILE=             makefile
 
 CFLAGS.SunOS+=         -DSOLARIS
 
-INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
+INSTALLATION_DIRS=     bin
 
 BUILDLINK_API_DEPENDS.readline+=       readline>=5.1pl1nb1
 .include "../../devel/readline/buildlink3.mk"
 
-do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/mathomatic ${DESTDIR}${PREFIX}/bin
-       ${INSTALL_MAN} ${WRKSRC}/mathomatic.1 \
-               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
-       ${INSTALL_DATA} ${WRKSRC}/doc/* ${WRKSRC}/README.txt \
-               ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
-
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"

$ diff -ruN PLIST.orig PLIST
--- PLIST.orig  2010-08-10 20:20:25.000000000 +0000
+++ PLIST       2010-08-10 22:44:54.000000000 +0000
@@ -1,17 +1,78 @@
-@comment $NetBSD: PLIST,v 1.12 2009/06/10 17:03:54 minskim Exp $
+@comment $NetBSD$
 bin/mathomatic
 man/man1/mathomatic.1
+share/applications/mathomatic.desktop
+share/doc/mathomatic/AUTHORS
+share/doc/mathomatic/COPYING
 share/doc/mathomatic/README.txt
-share/doc/mathomatic/am.html
-share/doc/mathomatic/doc.css
-share/doc/mathomatic/favicon.ico
-share/doc/mathomatic/greenfade.png
-share/doc/mathomatic/index.html
-share/doc/mathomatic/led_circle_green.png
-share/doc/mathomatic/manual.html
-share/doc/mathomatic/matho-pascal.1.html
-share/doc/mathomatic/matho-primes.1.html
-share/doc/mathomatic/matho-sumsq.1.html
-share/doc/mathomatic/mathomatic.1.html
-share/doc/mathomatic/mathomatic16x16.png
-share/doc/mathomatic/open_book_nae_02.png
+share/doc/mathomatic/VERSION
+share/doc/mathomatic/changes.txt
+share/doc/mathomatic/factorial/README.txt
+share/doc/mathomatic/factorial/fact.c
+share/doc/mathomatic/factorial/fact.py
+share/doc/mathomatic/factorial/factorial
+share/doc/mathomatic/factorial/intfact.c
+share/doc/mathomatic/html/README.txt
+share/doc/mathomatic/html/am.html
+share/doc/mathomatic/html/doc.css
+share/doc/mathomatic/html/favicon.ico
+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/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/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
+share/doc/mathomatic/tests/demo.in
+share/doc/mathomatic/tests/distance.in
+share/doc/mathomatic/tests/electronics.in
+share/doc/mathomatic/tests/ellipse.in
+share/doc/mathomatic/tests/examples.in
+share/doc/mathomatic/tests/fibonacci.in
+share/doc/mathomatic/tests/finance.in
+share/doc/mathomatic/tests/fix1.in
+share/doc/mathomatic/tests/fix2.in
+share/doc/mathomatic/tests/fix5.in
+share/doc/mathomatic/tests/fix7.in
+share/doc/mathomatic/tests/fix8.in
+share/doc/mathomatic/tests/fix9.in
+share/doc/mathomatic/tests/fraction.in
+share/doc/mathomatic/tests/geometry.in
+share/doc/mathomatic/tests/heron.in
+share/doc/mathomatic/tests/how_limit_works.in
+share/doc/mathomatic/tests/hypertrig.in
+share/doc/mathomatic/tests/limits.in
+share/doc/mathomatic/tests/linear.in
+share/doc/mathomatic/tests/pie.in
+share/doc/mathomatic/tests/points.in
+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/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/trig.in
+share/pixmaps/mathomatic.png

$ diff -ruN distinfo.orig distinfo
--- distinfo.orig       2010-08-10 22:45:05.000000000 +0000
+++ distinfo    2010-08-10 22:45:38.000000000 +0000
@@ -3,5 +3,5 @@
 SHA1 (mathomatic-15.1.6.tar.bz2) = 1514dfe908f50bac690dc7ba878692b49ca7349b
 RMD160 (mathomatic-15.1.6.tar.bz2) = 6038c68cba2dc4abca0fdb11e40afc0562a28fd6
 Size (mathomatic-15.1.6.tar.bz2) = 178648 bytes
-SHA1 (patch-aa) = 8b09af473df06b57a995a509e696022ef3a4e27d
-SHA1 (patch-ab) = a9dd1e928002d42878bdac922aa0f146cebb44c1
+SHA1 (patch-aa) = a72a4bead52cad86cbd8313a180dac0fcbb895f7
+SHA1 (patch-ab) = 9121f9af55da5f18e71a3b18211a81a02b40b202
$ diff -ruN ./patches.orig/patch-aa ./patches/patch-aa
--- ./patches.orig/patch-aa     2009-09-22 02:05:50.000000000 +0000
+++ ./patches/patch-aa  2010-08-10 22:45:20.000000000 +0000
@@ -1,15 +1,36 @@
 $NetBSD$
 
---- makefile.orig      2009-09-05 08:12:42.000000000 -0700
-+++ makefile
-@@ -10,8 +10,8 @@ CFLAGS               += -O -DUNIX -DVERSION=\"$(VERSI
- LDLIBS                += -lm # libraries to link
+--- makefile.orig      2010-08-09 00:45:21.000000000 +0000
++++ makefile   2010-08-10 22:40:20.000000000 +0000
+@@ -27,10 +27,11 @@
+ #LDFLAGS      += -m64
  
- # "make READLINE=1" to include readline support:
--CFLAGS                += $(READLINE:1=-DREADLINE)
--LDLIBS                += $(READLINE:1=-lreadline -lncurses)
-+CFLAGS                += -DREADLINE
-+LDLIBS                += -lreadline
+ # Install directories follow; installs everything in /usr/local by default:
+-prefix                ?= /usr/local
+-bindir                ?= $(prefix)/bin
+-mandir                ?= $(prefix)/share/man
+-docdir                ?= $(prefix)/share/doc
++DESTDIR=
++prefix                ?= /usr/pkg
++bindir                ?= $(DESTDIR)$(prefix)/bin
++mandir                ?= $(DESTDIR)$(prefix)/man
++docdir                ?= $(DESTDIR)$(prefix)/share/doc
+ mathdocdir    ?= $(docdir)/mathomatic
  
- # Uncomment the following to generate 64bit x86-64 code:
- #CFLAGS               += -m64
+ # Mathomatic program names (can be changed):
+@@ -137,11 +138,11 @@
+ 
+ bininstall:
+       $(INSTALL) -d $(bindir)
+-      $(INSTALL) -d $(prefix)/share/applications
+-      $(INSTALL) -d $(prefix)/share/pixmaps
++      $(INSTALL) -d $(DESTDIR)$(prefix)/share/applications
++      $(INSTALL) -d $(DESTDIR)$(prefix)/share/pixmaps
+       $(INSTALL_PROGRAM) $(AOUT) $(bindir)
+-      $(INSTALL_DATA) icons/mathomatic.desktop $(prefix)/share/applications
+-      $(INSTALL_DATA) icons/mathomatic.png $(prefix)/share/pixmaps
++      $(INSTALL_DATA) icons/mathomatic.desktop 
$(DESTDIR)$(prefix)/share/applications
++      $(INSTALL_DATA) icons/mathomatic.png $(DESTDIR)$(prefix)/share/pixmaps
+ 
+ docinstall:
+       $(INSTALL) -d $(mandir)/man1

$ cat < ./patches/patch-ab

$NetBSD$

--- includes.h.orig     2010-07-26 22:52:17.000000000 +0000
+++ includes.h  2010-08-10 21:45:22.000000000 +0000
@@ -60,7 +60,9 @@
 #include <locale.h>
 #endif
 #if    READLINE
-#if    !NO_COLOR && !LIBRARY && !CYGWIN        /* The following two includes on
ly needed if calling ncurses. */
+#ifdef __NetBSD__
+#include <ncurses/term.h>
+#else
 #include <curses.h>
 #include <term.h>
 #endif