From owner-svn-ports-head@freebsd.org Mon Mar 30 20:47:22 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4B74E266EA1; Mon, 30 Mar 2020 20:47:22 +0000 (UTC) (envelope-from bofh@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48rkzX4L14z41kK; Mon, 30 Mar 2020 20:47:20 +0000 (UTC) (envelope-from bofh@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0460323BD4; Mon, 30 Mar 2020 20:47:12 +0000 (UTC) (envelope-from bofh@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02UKlCWa095238; Mon, 30 Mar 2020 20:47:12 GMT (envelope-from bofh@FreeBSD.org) Received: (from bofh@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02UKlB8s095230; Mon, 30 Mar 2020 20:47:11 GMT (envelope-from bofh@FreeBSD.org) Message-Id: <202003302047.02UKlB8s095230@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bofh set sender to bofh@FreeBSD.org using -f From: Muhammad Moinur Rahman Date: Mon, 30 Mar 2020 20:47:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529919 - in head/math/jacal: . files X-SVN-Group: ports-head X-SVN-Commit-Author: bofh X-SVN-Commit-Paths: in head/math/jacal: . files X-SVN-Commit-Revision: 529919 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Mar 2020 20:47:22 -0000 Author: bofh Date: Mon Mar 30 20:47:10 2020 New Revision: 529919 URL: https://svnweb.freebsd.org/changeset/ports/529919 Log: 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 Modified: head/math/jacal/Makefile head/math/jacal/distinfo head/math/jacal/files/patch-Makefile head/math/jacal/files/patch-configure head/math/jacal/files/patch-jacal.info head/math/jacal/files/patch-jacal.sh head/math/jacal/files/patch-jacal.texi head/math/jacal/pkg-plist Modified: head/math/jacal/Makefile ============================================================================== --- head/math/jacal/Makefile Mon Mar 30 20:44:30 2020 (r529918) +++ head/math/jacal/Makefile Mon Mar 30 20:47:10 2020 (r529919) @@ -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 -USES= gmake perl5 zip +HAS_CONFIGURE= yes +WRKSRC= ${WRKDIR}/${PORTNAME} + 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 Modified: head/math/jacal/distinfo ============================================================================== --- head/math/jacal/distinfo Mon Mar 30 20:44:30 2020 (r529918) +++ head/math/jacal/distinfo Mon Mar 30 20:47:10 2020 (r529919) @@ -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 Modified: head/math/jacal/files/patch-Makefile ============================================================================== --- head/math/jacal/files/patch-Makefile Mon Mar 30 20:44:30 2020 (r529918) +++ head/math/jacal/files/patch-Makefile Mon Mar 30 20:47:10 2020 (r529919) @@ -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 Modified: head/math/jacal/files/patch-configure ============================================================================== --- head/math/jacal/files/patch-configure Mon Mar 30 20:44:30 2020 (r529918) +++ head/math/jacal/files/patch-configure Mon Mar 30 20:47:10 2020 (r529919) @@ -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}' Modified: head/math/jacal/files/patch-jacal.info ============================================================================== --- head/math/jacal/files/patch-jacal.info Mon Mar 30 20:44:30 2020 (r529918) +++ head/math/jacal/files/patch-jacal.info Mon Mar 30 20:47:10 2020 (r529919) @@ -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 | Modified: head/math/jacal/files/patch-jacal.sh ============================================================================== --- head/math/jacal/files/patch-jacal.sh Mon Mar 30 20:44:30 2020 (r529918) +++ head/math/jacal/files/patch-jacal.sh Mon Mar 30 20:47:10 2020 (r529919) @@ -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;; Modified: head/math/jacal/files/patch-jacal.texi ============================================================================== --- head/math/jacal/files/patch-jacal.texi Mon Mar 30 20:44:30 2020 (r529918) +++ head/math/jacal/files/patch-jacal.texi Mon Mar 30 20:47:10 2020 (r529919) @@ -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 Modified: head/math/jacal/pkg-plist ============================================================================== --- head/math/jacal/pkg-plist Mon Mar 30 20:44:30 2020 (r529918) +++ head/math/jacal/pkg-plist Mon Mar 30 20:47:10 2020 (r529919) @@ -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