- Update to 1c2

- Pass maintainership to submitter

PR:		166456
Submitted by:	Muhammad Moinur Rahman <5u623l20@gmail.com>

5 files changed, 102 insertions, 20 deletions

diff --git a/math/jacal/Makefile b/math/jacal/Makefile
index 746e9867c1af..d7bd36887551 100644
--- a/math/jacal/Makefile
+++ b/math/jacal/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=	jacal
-PORTVERSION=	1b7
-PORTREVISION=	1
+PORTVERSION=	1c2
 CATEGORIES=	math
-MASTER_SITES=	http://groups.csail.mit.edu/mac/ftpdir/scm/OLD/
-DISTNAME=	jacal1b7
+MASTER_SITES=	http://groups.csail.mit.edu/mac/ftpdir/scm/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	5u623l20@gmail.com
 COMMENT=	Symbolic mathematics program written in Scheme
 
-RUN_DEPENDS=	scm:${PORTSDIR}/lang/scm
+RUN_DEPENDS=	scm:${PORTSDIR}/lang/scm \
+		${LOCALBASE}/share/slib/require.scm:${PORTSDIR}/lang/slib
 
 WRKSRC=		${WRKDIR}/jacal
 
@@ -25,9 +24,12 @@ USE_PERL5=	yes
 NO_BUILD=	yes
 
 MAN1=		jacal.1
+INFO=		jacal
 
 do-configure:
 	cd ${WRKSRC}; \
-	${FIND} . -type f -exec perl -spi -e 's|%%PREFIX%%|${PREFIX}|' {} ';'
+	${FIND} . -type f -exec ${PERL} -spi -e 's|%%PREFIX%%|${PREFIX}|' {} ';'
+	cd ${WRKSRC}; \
+	./configure
 
 .include <bsd.port.mk>
diff --git a/math/jacal/distinfo b/math/jacal/distinfo
index cf95023ee86e..828b26a736f3 100644
--- a/math/jacal/distinfo
+++ b/math/jacal/distinfo
@@ -1,2 +1,2 @@
-SHA256 (jacal1b7.zip) = 8337d56cc1aef2204263c0382c97a7f354002312fb7732d3f18bae0b6fe6de9e
-SIZE (jacal1b7.zip) = 262344
+SHA256 (jacal-1c2.zip) = 8bf0b52fe694927df26d896e81eb8ed6d9e9f79aac68f552b429616ad64adb9d
+SIZE (jacal-1c2.zip) = 285025
diff --git a/math/jacal/files/patch-Makefile b/math/jacal/files/patch-Makefile
index 643cdc63d10e..47cc843384ca 100644
--- a/math/jacal/files/patch-Makefile
+++ b/math/jacal/files/patch-Makefile
@@ -1,11 +1,71 @@
---- Makefile.orig	Thu Nov 23 09:57:49 2006
-+++ Makefile	Thu Nov 23 09:58:00 2006
-@@ -36,7 +36,7 @@
- RELEASE = 1
- 
- rpm_prefix=$(HOME)/rpmbuild/
--prefix = /usr/local/
-+prefix = %%PREFIX%%/
- exec_prefix = $(prefix)
- # directory where `make install' will put executable.
- bindir = $(exec_prefix)bin/
+--- Makefile.orig	2012-03-28 01:06:27.000000000 +0600
++++ Makefile	2012-03-28 01:06:39.000000000 +0600
+@@ -19,7 +19,6 @@
+ INSTALL = install
+ INSTALL_PROGRAM = ${INSTALL}
+ INSTALL_DATA = ${INSTALL} -m 644
+-INSTALL_INFO = ginstall-info
+ 
+ CHPAT = $(HOME)/bin/chpat
+ MAKEDEV = $(MAKE) -f $(HOME)/makefile.dev
+@@ -45,9 +44,6 @@
+ 
+ # ./configure --distdir=${HOME}/dist/ --snapdir=${HOME}/pub/ --docdir=${HOME}/public_html/
+ 
+-config.status:
+-	./configure
+-Makefile: config.status
+ include config.status
+ 
+ prevdocsdir = prevdocs/
+@@ -80,9 +76,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 $<
+@@ -100,10 +93,8 @@
+ install-pdf: jacal.pdf installdirs
+ 	$(INSTALL_DATA) $< $(DESTDIR)$(pdfdir)
+ 
+-jacal_toc.html: jacal.texi version.txi
+-	$(TEXI2HTML) $<
+-html: jacal_toc.html
+-$(DESTDIR)$(htmldir)jacal_toc.html: jacal_toc.html
++$(DESTDIR)$(htmldir)jacal_toc.html: jacal.texi version.txi
++	        $(TEXI2HTML) $<
+ 	-rm -f jacal_stoc.html
+ 	if [ -f $(prevdocsdir)jacal_toc.html ]; \
+ 	  then hitch $(prevdocsdir)jacal_\*.html jacal_\*.html \
+@@ -124,16 +115,9 @@
+ 	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
++	                $(MAKEINFO) $< --no-split -o jacal.info
++	$(INSTALL_DATA) jacal.info $@
+ install-info:	$(DESTDIR)$(infodir)jacal.info
+ info:	install-info
+ $(DESTDIR)$(infodir)jacal.info.gz: $(DESTDIR)$(infodir)jacal.info
+@@ -177,7 +161,6 @@
+ 	$(INSTALL_DATA) go-scm $(DESTDIR)$(jacallibdir)go.scm
+ 	rm go-scm
+ 	echo '#! /bin/sh'			   > jacal-script
+-	grep -h ^SCHEME_LIBRARY_PATH= `which slib`>> jacal-script
+ 	echo export SCHEME_LIBRARY_PATH		  >> jacal-script
+ 	echo JACALDIR=$(DESTDIR)$(jacallibdir)	  >> jacal-script
+ 	echo VERSION=$(VERSION)			  >> jacal-script
diff --git a/math/jacal/files/patch-configure b/math/jacal/files/patch-configure
new file mode 100644
index 000000000000..3798e19720d7
--- /dev/null
+++ b/math/jacal/files/patch-configure
@@ -0,0 +1,19 @@
+--- configure.orig	2012-03-28 02:16:29.000000000 +0600
++++ configure	2012-03-28 02:17:23.000000000 +0600
+@@ -52,14 +52,14 @@
+ bindir='${exec_prefix}bin/'
+ sbindir='${exec_prefix}sbin/'
+ libexecdir='${exec_prefix}libexec/'
+-datarootdir='${prefix}share/'
++datarootdir='${prefix}'
+ datadir='${datarootdir}'
+ sysconfdir='${prefix}etc/'
+ sharedstatedir='${prefix}com/'
+ localstatedir='${prefix}var/'
+ includedir='${prefix}include/'
+ oldincludedir='/usr/include/'
+-docdir='${datarootdir}doc/${PACKAGE_TARNAME}/'
++docdir='${datarootdir}share/doc/${PACKAGE_TARNAME}/'
+ infodir='${datarootdir}info/'
+ htmldir='${docdir}'
+ dvidir='${docdir}'
diff --git a/math/jacal/pkg-plist b/math/jacal/pkg-plist
index b1c802e74db5..7b185a6b61c4 100644
--- a/math/jacal/pkg-plist
+++ b/math/jacal/pkg-plist
@@ -16,6 +16,7 @@ lib/jacal/grammar.scm
 lib/jacal/hensel.scm
 lib/jacal/hist.scm
 lib/jacal/info.scm
+lib/jacal/interpolate.scm
 lib/jacal/jacalcat
 lib/jacal/math.scm
 lib/jacal/modeinit.scm