- Update to 1c3

- Add LICENSE
- Support STAGEDIR
- While I'm here, pet stage-qa: fix STAGEDIR-prefix

Changes:	http://cvs.savannah.gnu.org/viewvc/*checkout*/jacal/jacal/ChangeLog
PR:		188157
Submitted by:	Muhammad Moinur Rahman <5u623l20@gmail.com> (maintainer)

5 files changed, 25 insertions, 41 deletions

diff --git a/math/jacal/Makefile b/math/jacal/Makefile
index 47409acad517..1423d6bec032 100644
--- a/math/jacal/Makefile
+++ b/math/jacal/Makefile
@@ -2,13 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	jacal
-PORTVERSION=	1c2
+PORTVERSION=	1c3
 CATEGORIES=	math
 MASTER_SITES=	http://groups.csail.mit.edu/mac/ftpdir/scm/
 
 MAINTAINER=	5u623l20@gmail.com
 COMMENT=	Symbolic mathematics program written in Scheme
 
+LICENSE=	GPLv3
+
 RUN_DEPENDS=	scm:${PORTSDIR}/lang/scm \
 		${LOCALBASE}/share/slib/require.scm:${PORTSDIR}/lang/slib
 
@@ -17,14 +19,15 @@ WRKSRC=		${WRKDIR}/jacal
 USES=		gmake perl5 zip
 NO_BUILD=	yes
 
-MAN1=		jacal.1
 INFO=		jacal
 
-NO_STAGE=	yes
 do-configure:
 	cd ${WRKSRC}; \
 	${FIND} . -type f -exec ${PERL} -spi -e 's|%%PREFIX%%|${PREFIX}|' {} ';'
 	cd ${WRKSRC}; \
 	./configure
 
+post-install:
+	${SED} -i '' -e 's|${STAGEDIR}${PREFIX}|${PREFIX}|g' ${STAGEDIR}${PREFIX}/bin/jacal
+
 .include <bsd.port.mk>
diff --git a/math/jacal/distinfo b/math/jacal/distinfo
index 828b26a736f3..adac95cee066 100644
--- a/math/jacal/distinfo
+++ b/math/jacal/distinfo
@@ -1,2 +1,2 @@
-SHA256 (jacal-1c2.zip) = 8bf0b52fe694927df26d896e81eb8ed6d9e9f79aac68f552b429616ad64adb9d
-SIZE (jacal-1c2.zip) = 285025
+SHA256 (jacal-1c3.zip) = 3ef253980ed303e30a3be4bb1e5a39aaa957e040d65d55d5b891483c7e22f9c3
+SIZE (jacal-1c3.zip) = 287032
diff --git a/math/jacal/files/patch-Makefile b/math/jacal/files/patch-Makefile
index 47cc843384ca..d198631ae19d 100644
--- a/math/jacal/files/patch-Makefile
+++ b/math/jacal/files/patch-Makefile
@@ -1,14 +1,6 @@
 --- 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 @@
+@@ -51,9 +51,6 @@
  
  # ./configure --distdir=${HOME}/dist/ --snapdir=${HOME}/pub/ --docdir=${HOME}/public_html/
  
@@ -18,7 +10,7 @@
  include config.status
  
  prevdocsdir = prevdocs/
-@@ -80,9 +76,6 @@
+@@ -86,9 +83,6 @@
  	mkdir -p $(DESTDIR)$(jacallibdir)
  	mkdir -p $(DESTDIR)$(bindir)
  	mkdir -p $(DESTDIR)$(infodir)
@@ -28,20 +20,7 @@
  
  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 @@
+@@ -142,16 +136,9 @@
  	cd DOC/; pdflatex ratint.tex
  	$(INSTALL_DATA) DOC/ratint.pdf $(DESTDIR)$(pdfdir)
  
@@ -55,13 +34,13 @@
 -	$(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
++$(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 @@
+@@ -195,7 +182,6 @@
  	$(INSTALL_DATA) go-scm $(DESTDIR)$(jacallibdir)go.scm
  	rm go-scm
  	echo '#! /bin/sh'			   > jacal-script
diff --git a/math/jacal/files/patch-jacal.sh b/math/jacal/files/patch-jacal.sh
index a57ebf4f0ca4..edb60583b6d6 100644
--- a/math/jacal/files/patch-jacal.sh
+++ b/math/jacal/files/patch-jacal.sh
@@ -1,11 +1,11 @@
 --- jacal.sh.orig	Wed Jun 22 03:52:36 2005
 +++ jacal.sh	Mon Jul 11 08:02:25 2005
-@@ -98,6 +98,8 @@
- 	  SCHEME_LIBRARY_PATH=/usr/local/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;;
+@@ -107,6 +107,8 @@
+ 		SCHEME_LIBRARY_PATH=/usr/local/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/pkg-plist b/math/jacal/pkg-plist
index 7b185a6b61c4..ed95f261f9e7 100644
--- a/math/jacal/pkg-plist
+++ b/math/jacal/pkg-plist
@@ -6,6 +6,7 @@ lib/jacal/Makefile
 lib/jacal/builtin.scm
 lib/jacal/combin.scm
 lib/jacal/debug.scm
+lib/jacal/decompose.scm
 lib/jacal/elim.scm
 lib/jacal/ext.scm
 lib/jacal/factors.scm
@@ -31,4 +32,5 @@ lib/jacal/unparse.scm
 lib/jacal/uv-hensel.scm
 lib/jacal/vect.scm
 lib/jacal/view.scm
+man/man1/jacal.1.gz
 @dirrm lib/jacal