math/jacal: Update version 1c4=>1c7

- Remove USES=perl5
- Add USES=makeinfo
- Clean the patches

Relnotes:	https://people.csail.mit.edu/jaffer/JACAL_ANNOUNCE.txt

8 files changed, 44 insertions, 71 deletions

diff --git a/math/jacal/Makefile b/math/jacal/Makefile
index ebe841e14f4d..2895a1a6d0a5 100644
--- a/math/jacal/Makefile
+++ b/math/jacal/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	jacal
-PORTVERSION=	1c4
-PORTREVISION=	2
+PORTVERSION=	1c7
 CATEGORIES=	math
 MASTER_SITES=	http://groups.csail.mit.edu/mac/ftpdir/scm/
 
@@ -15,18 +14,18 @@ LICENSE=	GPLv3
 RUN_DEPENDS=	scm:lang/scm \
 		${LOCALBASE}/share/slib/require.scm:lang/slib
 
-WRKSRC=		${WRKDIR}/jacal
+USES=		gmake makeinfo zip
+
+HAS_CONFIGURE=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USES=		gmake perl5 zip
 NO_BUILD=	yes
 
 INFO=		jacal
 
-do-configure:
-	cd ${WRKSRC}; \
-	${FIND} . -type f -exec ${PERL} -spi -e 's|%%PREFIX%%|${PREFIX}|' {} ';'
-	cd ${WRKSRC}; \
-	./configure
+post-patch:
+	${FIND} ${WRKSRC} -type f -exec ${REINPLACE_CMD} -i '' -e 's|%%PREFIX%%|${PREFIX}|' {} \;
+	${CHMOD} +x ${WRKSRC}/configure
 
 post-install:
 	${SED} -i '' -e 's|${STAGEDIR}${PREFIX}|${PREFIX}|g' ${STAGEDIR}${PREFIX}/bin/jacal
diff --git a/math/jacal/distinfo b/math/jacal/distinfo
index 645d78a36992..6d2ca36b7d3c 100644
--- a/math/jacal/distinfo
+++ b/math/jacal/distinfo
@@ -1,2 +1,3 @@
-SHA256 (jacal-1c4.zip) = 78a8710a7a6b577299a2c06e93a31f0f2e3addc033f3891bf0b5052582cdbf14
-SIZE (jacal-1c4.zip) = 287013
+TIMESTAMP = 1585589405
+SHA256 (jacal-1c7.zip) = bf93157ffc4251b7da99f50815161060a180a61f0f25d4ec5dc2b41953d74519
+SIZE (jacal-1c7.zip) = 391026
diff --git a/math/jacal/files/patch-Makefile b/math/jacal/files/patch-Makefile
index 5e2e2013b12f..d366c93cb911 100644
--- a/math/jacal/files/patch-Makefile
+++ b/math/jacal/files/patch-Makefile
@@ -1,45 +1,15 @@
---- Makefile.orig	2012-03-28 01:06:27.000000000 +0600
-+++ Makefile	2012-03-28 01:06:39.000000000 +0600
-@@ -51,9 +51,6 @@
+--- Makefile.orig	2020-03-03 01:38:48 UTC
++++ Makefile
+@@ -25,7 +25,7 @@ SHELL = /bin/sh
+ INSTALL = install
+ INSTALL_PROGRAM = ${INSTALL}
+ INSTALL_DATA = ${INSTALL} -m 644
+-INSTALL_INFO = ginstall-info
++INSTALL_INFO = install-info
  
- # ./configure --distdir=${HOME}/dist/ --snapdir=${HOME}/pub/ --docdir=${HOME}/public_html/
- 
--config.status:
--	./configure
--Makefile: config.status
- include config.status
- 
- prevdocsdir = prevdocs/
-@@ -86,9 +83,6 @@
- 	mkdir -p $(DESTDIR)$(jacallibdir)
- 	mkdir -p $(DESTDIR)$(bindir)
- 	mkdir -p $(DESTDIR)$(infodir)
--	mkdir -p $(DESTDIR)$(htmldir)
--	mkdir -p $(DESTDIR)$(pdfdir)
--	mkdir -p $(DESTDIR)$(dvidir)
- 
- jacal.dvi: jacal.texi version.txi
- 	$(TEXI2DVI) -b -c $<
-@@ -142,16 +136,8 @@
- 	cd DOC/; pdflatex ratint.tex
- 	$(INSTALL_DATA) DOC/ratint.pdf $(DESTDIR)$(pdfdir)
- 
--jacal-$(VERSION).info: jacal.texi version.txi
--	$(MAKEINFO) $< --no-split -o $@
--jacal.info: jacal-$(VERSION).info
--	if [ -f $(prevdocsdir)jacal.info ];\
--	  then infobar $(prevdocsdir)jacal.info $< $@;\
--	  else cp jacal-$(VERSION).info jacal.info;fi
--$(DESTDIR)$(infodir)jacal.info:	jacal.info
--	$(INSTALL_DATA) $< $@
--	-$(INSTALL_INFO) $@ $(DESTDIR)$(infodir)dir
--	-rm $(DESTDIR)$(infodir)-jacal.info.gz
-+$(DESTDIR)$(infodir)jacal.info:        jacal.texi version.txi
-+	$(INSTALL_DATA) jacal.info $@
- install-info:	$(DESTDIR)$(infodir)jacal.info
- info:	install-info
- $(DESTDIR)$(infodir)jacal.info.gz: $(DESTDIR)$(infodir)jacal.info
-@@ -195,7 +181,6 @@
+ CHPAT = $(HOME)/bin/chpat
+ MAKEDEV = $(MAKE) -f $(HOME)/makefile.dev
+@@ -196,7 +196,6 @@ install-script: jacal.sh installdirs
  	$(INSTALL_DATA) go-scm $(DESTDIR)$(jacallibdir)go.scm
  	rm go-scm
  	echo '#! /bin/sh'			   > jacal-script
diff --git a/math/jacal/files/patch-configure b/math/jacal/files/patch-configure
index a7545bd0f195..b58d28f31623 100644
--- a/math/jacal/files/patch-configure
+++ b/math/jacal/files/patch-configure
@@ -1,4 +1,4 @@
---- configure.orig	2011-10-24 02:30:35 UTC
+--- configure.orig	2020-03-30 18:09:26 UTC
 +++ configure
 @@ -67,7 +67,7 @@ pdfdir='${docdir}'
  psdir='${docdir}'
diff --git a/math/jacal/files/patch-jacal.info b/math/jacal/files/patch-jacal.info
index 8abff08ba546..fcdc538bc2fe 100644
--- a/math/jacal/files/patch-jacal.info
+++ b/math/jacal/files/patch-jacal.info
@@ -1,14 +1,14 @@
---- ./jacal.info.orig	Mon Dec  1 04:55:18 2003
-+++ ./jacal.info	Mon Feb 14 21:46:12 2005
-@@ -213,9 +213,9 @@
+--- jacal.info.orig	2020-03-30 19:59:43 UTC
++++ jacal.info
+@@ -201,9 +201,9 @@ interactive session.
  This may involve setting up that implementation's initialization file or
- LOADing a `.init' file from the `slib' directory.  Then type:
+ LOADing a '.init' file from the 'slib' directory.  Then type:
  
 -     (slib:load "/usr/local/lib/jacal/math")
 +     (slib:load "%%PREFIX%%/lib/jacal/math")
  
--where `/usr/local/lib/jacal/' is a path to the JACAL directory.  JACAL
-+where `%%PREFIX%%/lib/jacal/' is a path to the JACAL directory.  JACAL
+-where '/usr/local/lib/jacal/' is a path to the JACAL directory.  JACAL
++where '%%PREFIX%%/lib/jacal/' is a path to the JACAL directory.  JACAL
  should then print:
  
-      JACAL version 1b4, Copyright 1989-1999, 2002 Aubrey Jaffer               |
+      JACAL version 1c7, Copyright 1989-2020 Aubrey Jaffer                     |
diff --git a/math/jacal/files/patch-jacal.sh b/math/jacal/files/patch-jacal.sh
index edb60583b6d6..feea5807e8d4 100644
--- a/math/jacal/files/patch-jacal.sh
+++ b/math/jacal/files/patch-jacal.sh
@@ -1,11 +1,13 @@
---- jacal.sh.orig	Wed Jun 22 03:52:36 2005
-+++ jacal.sh	Mon Jul 11 08:02:25 2005
-@@ -107,6 +107,8 @@
- 		SCHEME_LIBRARY_PATH=/usr/local/lib/slib/
+--- jacal.sh.orig	2020-03-30 18:18:24 UTC
++++ jacal.sh
+@@ -103,8 +103,8 @@ case $implementation in
+ 	fi
+ 	fi
+ 	if [ -z "${SCHEME_LIBRARY_PATH}" ]; then
+-	    if [ -d /usr/local/lib/slib/ ]; then
+-		SCHEME_LIBRARY_PATH=/usr/local/lib/slib/
++	    if [ -d %%PREFIX%%/lib/slib/ ]; then
++		SCHEME_LIBRARY_PATH=%%PREFIX%%/lib/slib/
  	    elif [ -d /usr/share/slib/ ]; then
  		SCHEME_LIBRARY_PATH=/usr/share/slib/
-+	    elif [ -d %%PREFIX%%/lib/slib/ ]; then
-+		export SCHEME_LIBRARY_PATH=%%PREFIX%%/lib/slib/
  	    fi
- 	    export SCHEME_LIBRARY_PATH
- 	fi;;
diff --git a/math/jacal/files/patch-jacal.texi b/math/jacal/files/patch-jacal.texi
index 5eaa2dd8e7b5..b10e736380b3 100644
--- a/math/jacal/files/patch-jacal.texi
+++ b/math/jacal/files/patch-jacal.texi
@@ -1,6 +1,6 @@
---- ./jacal.texi.orig	Sun Nov 30 22:29:33 2003
-+++ ./jacal.texi	Mon Feb 14 21:44:19 2005
-@@ -344,11 +344,11 @@
+--- jacal.texi.orig	2020-03-30 18:15:54 UTC
++++ jacal.texi
+@@ -266,11 +266,11 @@ This may involve setting up that implementation's init
  LOADing a @samp{.init} file from the @file{slib} directory.  Then type:
  
  @example
diff --git a/math/jacal/pkg-plist b/math/jacal/pkg-plist
index 9d2363efc610..a6f325978522 100644
--- a/math/jacal/pkg-plist
+++ b/math/jacal/pkg-plist
@@ -3,6 +3,7 @@ lib/jacal/COPYING
 lib/jacal/English.scm
 lib/jacal/HELP
 lib/jacal/Makefile
+lib/jacal/anti-diff.scm
 lib/jacal/builtin.scm
 lib/jacal/combin.scm
 lib/jacal/debug.scm