Update math/abs 0.8 -> 0.908
Index: Makefile
===================================================================
RCS file: /cvs/ports/math/abs/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile 12 Jul 2019 21:02:23 -0000 1.20
+++ Makefile 7 Apr 2020 09:21:30 -0000
@@ -2,16 +2,18 @@
COMMENT= free spreadsheet with graphical user interface
-DISTNAME= abs-src-0.8
-PKGNAME= ${DISTNAME:S/-src//}
-REVISION= 5
+DISTNAME= abs-src-0908
+PKGNAME= ${DISTNAME:S/-src-0908/-0.908/}
+REVISION= 0
CATEGORIES= math
PERMIT_PACKAGE= Yes
WANTLIB= X11 Xaw Xext Xmu Xpm Xt c>=35 m
-MASTER_SITES= http://www.ping.be/bertin/
+MASTER_SITES= http://utenti.gufi.org/~gmarco/files/distfiles/ \
+ http://fresh.t-systems-sfr.com/unix/src/privat2/
+WRKDIST= ${WRKDIR}/abs-src-0.908
NO_TEST= Yes
do-install:
Index: distinfo
===================================================================
RCS file: /cvs/ports/math/abs/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 18 Jan 2015 03:14:26 -0000 1.4
+++ distinfo 7 Apr 2020 09:21:30 -0000
@@ -1,2 +1,2 @@
-SHA256 (abs-src-0.8.tar.gz) = eqAvRsSmIfLVLqfum3iinCs2MA2pakFO8i2UhTrdEpg=
-SIZE (abs-src-0.8.tar.gz) = 287965
+SHA256 (abs-src-0908.tar.gz) = iaUlMO85/Rxk+o6ifCmp3d4eZE5D56w7FtlONMSH+V4=
+SIZE (abs-src-0908.tar.gz) = 314891
Index: patches/patch-ABV_io_c
===================================================================
RCS file: /cvs/ports/math/abs/patches/patch-ABV_io_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-ABV_io_c
--- patches/patch-ABV_io_c 23 Feb 2002 23:32:31 -0000 1.1
+++ patches/patch-ABV_io_c 7 Apr 2020 09:21:30 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-ABV_io_c,v 1.1 2002/02/23 23:32:31 pvalchev Exp $
--- ABV/io.c.orig Wed Nov 15 14:09:54 2000
+++ ABV/io.c Sat Feb 23 16:26:54 2002
-@@ -178,7 +178,7 @@ obj io_input (int unit)
+@@ -199,7 +199,7 @@ obj io_input (int unit)
obj o;
FILE *fp;
char buf[256];
Index: patches/patch-Database_cell_c
===================================================================
RCS file: /cvs/ports/math/abs/patches/patch-Database_cell_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Database_cell_c
--- patches/patch-Database_cell_c 3 Apr 2005 16:14:44 -0000 1.1
+++ patches/patch-Database_cell_c 7 Apr 2020 09:21:30 -0000
@@ -1,51 +1,38 @@
-$OpenBSD: patch-Database_cell_c,v 1.1 2005/04/03 16:14:44 espie Exp $
---- Database/cell.c.orig Sun Apr 3 18:06:33 2005
-+++ Database/cell.c Sun Apr 3 18:07:48 2005
-@@ -1306,47 +1306,6 @@ copymod3 (cell1, cell2, incr)
- return 0;
+--- Database/cell.c.orig Wed Nov 15 22:10:42 2000
++++ Database/cell.c Sun Apr 3 18:06:11 2005
+@@ -1456,7 +1456,7 @@ tolower (char *s)
}
--char *
--tolower (char *s)
--{
-- int j;
-- int len;
-- len = strlen (s);
-- for (j = 0; j < len; j++)
-- if (s[j] >= 'A' && s[j] <= 'Z')
-- s[j] = 'a' + s[j] - 'A';
-- return s;
--}
--
--char *
+ char *
-strcasestr (char *str1, char *str2)
--{
-- char *s1;
-- char *s2;
-- char *pos = NULL;
-- int l1;
-- s1 = strdup (str1);
-- if (s1 == NULL)
-- return NULL;
-- s2 = strdup (str2);
-- if (s2 == NULL)
-- {
-- free (s1);
-- return NULL;
-- }
--
-- tolower (s1);
-- tolower (s2);
-- pos = strstr (s1, s2);
-- l1 = pos - s1;
-- free (s1);
-- free (s2);
-- if (pos == NULL)
-- return NULL;
--
-- return str1 + l1;
--}
--
- int
- cell_chgwksname (Cell * cell, char *oldname, char *newname)
++trcasestr (char *str1, char *str2)
{
+ char *s1;
+ char *s2;
+@@ -1504,7 +1464,7 @@ cell_chgwksname (Cell * cell, char *oldname, char *new
+ return -1;
+ if (!strcmp (oldname, newname))
+ return 0;
+- if (strcasestr (cell->formula, oldname) == NULL)
++ if (trcasestr (cell->formula, oldname) == NULL)
+ return 0;
+
+
+@@ -1512,7 +1472,7 @@ cell_chgwksname (Cell * cell, char *oldname, char *new
+ old = absmalloc ((strlen (oldname) + 2) * sizeof (char),
"cell_chgwksname:old");
+ sprintf (old, "%s!", oldname);
+
+- pos = strcasestr (cell->formula, old);
++ pos = trcasestr (cell->formula, old);
+ while (pos != NULL)
+ {
+ len = strlen (cell->formula);
+@@ -1523,7 +1483,7 @@ cell_chgwksname (Cell * cell, char *oldname, char *new
+ sprintf (newformula, "%s%s%s", cell->formula, newname, end);
+ absfree (cell->formula, "cell_chgwksname:cell->formula");
+ cell->formula = newformula;
+- end = strcasestr (cell->formula, old);
++ end = trcasestr (cell->formula, old);
+ if (end > cell->formula + i)
+ pos = end;
+ else
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/math/abs/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile 3 Apr 2005 16:14:44 -0000 1.2
+++ patches/patch-Makefile 7 Apr 2020 09:21:30 -0000
@@ -1,13 +1,13 @@
---- Makefile.orig Wed Nov 15 20:59:20 2000
-+++ Makefile Sun Apr 3 18:06:11 2005
+--- Makefile.orig Mon Nov 12 00:54:35 2001
++++ Makefile Mon Apr 6 13:56:26 2020
@@ -1,7 +1,7 @@
CURRENT_DIR = .
--SUBDIRS = Xpm ABV X11 Kernel Plot Database Fig Interface X11/xedit SAMCEF
+-SUBDIRS = Xpm ABV X11 Kernel Plot Database Fig Interface X11/xedit
+SUBDIRS = ABV X11 Kernel Plot Database Fig Interface X11/xedit SAMCEF
- SUBDIRS2 = ABV X11 Kernel Plot Database Fig Interface
+ SUBDIRS2 = ABV X11 Kernel Plot Database Fig Interface
MAKE = make
@@ -10,7 +10,7 @@ MAKE = make
#for silicon: LIBS = -lXaw -lX11 -lm -lXt -lXmu -lXext
@@ -17,8 +17,10 @@
+LIBS = -L${X11BASE}/lib -lXaw -lXpm -lX11 -lm -lXt -lXmu -lXext
#for hp DEFINE = -D_HPUX_SOURCE
- DEFINE =
-@@ -19,10 +19,10 @@ CFLAGS = -O2
+ #for AIX DEFINE = -D_AIX_SOURCE
+@@ -18,11 +18,11 @@
+-CFLAGS = '-O2 -Wall '
++CFLAGS = -O2
#for hp IncludeDir = /usr/contrib/X11R6/include
#for net-BSD IncludeDir = /usr/X11R6/include
@@ -26,22 +28,23 @@
+IncludeDir = ${X11BASE}/include
#for hp Ccompiler = c89
--Ccompiler = cc
+-Ccompiler = cc
+Ccompiler = ${CC}
all::
rm -f ./abs;\
-@@ -34,10 +34,10 @@ all::
- $(MAKE) TOPCFLAGS=$(CFLAGS) IncludeDir=$(IncludeDir)
Ccompiler=$(Ccompiler) DEFINE=$(DEFINE) all); \
+@@ -35,10 +35,10 @@ all::
+- $(MAKE) TOPCFLAGS=$(CFLAGS) IncludeDir=$(IncludeDir)
Ccompiler=$(Ccompiler) DEFINE=$(DEFINE) ); \
++ $(MAKE) TOPCFLAGS="$(CFLAGS)" IncludeDir="$(IncludeDir)"
Ccompiler="$(Ccompiler)" DEFINE="$(DEFINE)" all); \
fi \
done
- cc -o abs ./Plot/*.o ./ABV/*.o \
+ ${CC} -o abs ./Plot/*.o ./ABV/*.o \
Fig/*.o Interface/*.o X11/xedit/*.o \
-- ./Kernel/*.o ./X11/*.o ./Database/*.o ./Xpm/libxpm.a\
+- ./Kernel/*.o ./X11/*.o ./Database/*.o ./Xpm/libxpm.a \
- $(LIBS) $(DEFINE)
+ ./Kernel/*.o ./X11/*.o ./Database/*.o \
-+ ${LIBS} ${DEFINE}
++ ${LIBS} ${DEFINE}
Index: patches/patch-X11_button_h
===================================================================
RCS file: /cvs/ports/math/abs/patches/patch-X11_button_h,v
retrieving revision 1.2
diff -u -p -r1.2 patch-X11_button_h
--- patches/patch-X11_button_h 3 Apr 2005 16:14:44 -0000 1.2
+++ patches/patch-X11_button_h 7 Apr 2020 09:21:30 -0000
@@ -1,6 +1,6 @@
--- X11/button.h.orig Wed Nov 15 22:10:42 2000
+++ X11/button.h Sun Apr 3 18:06:11 2005
-@@ -28,7 +28,7 @@ Concact: a...@ping.be or a...@pi.be
+@@ -52,7 +52,7 @@
#define WIDGET_BUTTON_H
#include "param.h"
Index: patches/patch-X11_popnindex_h
===================================================================
RCS file: /cvs/ports/math/abs/patches/patch-X11_popnindex_h,v
retrieving revision 1.2
diff -u -p -r1.2 patch-X11_popnindex_h
--- patches/patch-X11_popnindex_h 3 Apr 2005 16:14:44 -0000 1.2
+++ patches/patch-X11_popnindex_h 7 Apr 2020 09:21:30 -0000
@@ -1,6 +1,6 @@
--- X11/popnindex.h.orig Wed Nov 15 22:10:42 2000
+++ X11/popnindex.h Sun Apr 3 18:06:11 2005
-@@ -29,7 +29,7 @@ Concact: a...@ping.be or a...@pi.be
+@@ -53,7 +53,7 @@
#include <stdio.h>
#include "param.h"
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/math/abs/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 20 May 2018 08:21:35 -0000 1.3
+++ pkg/PLIST 7 Apr 2020 09:21:30 -0000
@@ -11,6 +11,7 @@ share/examples/abs/example.abs
share/examples/abs/file.abs
share/examples/abs/font.abs
share/examples/abs/fractal.abs
+share/examples/abs/function.abs
share/examples/abs/graphics.abs
share/examples/abs/if.abs
share/examples/abs/life.abs
