[pkgsrc/trunk]: pkgsrc/lang/clojure clojure: Update to 1.10.1.469

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/lang/clojure clojure: Update to 1.10.1.469
From: fox <fox%pkgsrc.org@localhost>
Date: Mon, 06 Apr 2020 12:08:06 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/44dfca823a74
branches:  trunk
changeset: 415525:44dfca823a74
user:      fox <fox%pkgsrc.org@localhost>
date:      Tue Oct 08 23:40:37 2019 +0000

description:
clojure: Update to 1.10.1.469

Changes since 1.8.0:

https://github.com/clojure/clojure/blob/master/changes.md#changes-to-clojure-in-version-19
https://github.com/clojure/clojure/blob/master/changes.md#changes-to-clojure-in-version-110
https://github.com/clojure/clojure/blob/master/changes.md#changes-to-clojure-in-version-1101

Submitted by: Sunil Nimmagadda (sunil%nimmagadda.net@localhost)

ok maya@

diffstat:

 lang/clojure/MESSAGE      |   6 ---
 lang/clojure/Makefile     |  65 ++++++++++++++++------------------
 lang/clojure/PLIST        |  87 +++-------------------------------------------
 lang/clojure/distinfo     |  10 ++--
 lang/clojure/files/clj.sh |  36 -------------------
 5 files changed, 42 insertions(+), 162 deletions(-)

diffs (246 lines):

diff -r 0ee4539bed1b -r 44dfca823a74 lang/clojure/MESSAGE
--- a/lang/clojure/MESSAGE      Tue Oct 08 22:17:47 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2012/05/04 11:51:30 ryoon Exp $
-
-To enable additional modules, you should create .clojure file
-in your working directory, not in home directory.
-===========================================================================
diff -r 0ee4539bed1b -r 44dfca823a74 lang/clojure/Makefile
--- a/lang/clojure/Makefile     Tue Oct 08 22:17:47 2019 +0000
+++ b/lang/clojure/Makefile     Tue Oct 08 23:40:37 2019 +0000
@@ -1,55 +1,50 @@
-# $NetBSD: Makefile,v 1.7 2019/07/23 20:33:51 sevan Exp $
+# $NetBSD: Makefile,v 1.8 2019/10/08 23:40:37 fox Exp $
 
-DISTNAME=      clojure-1.8.0
+DISTNAME=      clojure-tools-1.10.1.469
+PKGNAME=       clojure-1.10.1.469
 CATEGORIES=    lang
-MASTER_SITES=  http://repo1.maven.org/maven2/org/clojure/clojure/${PKGVERSION_NOREV}/
-EXTRACT_SUFX=  .zip
+MASTER_SITES=  https://download.clojure.org/install/
 
 MAINTAINER=    ryoon%NetBSD.org@localhost
 HOMEPAGE=      https://clojure.org/
 COMMENT=       Dynamic programming language that targets the Java VM
 LICENSE=       epl-v1.0
 
+DEPENDS+=      rlwrap-[0-9]*:../../misc/rlwrap
+
 NO_BUILD=      yes
 USE_JAVA=      run
-USE_JAVA2=     1.5
-USE_LANGUAGES= # none
-USE_TOOLS+=    pax
+USE_JAVA2=     8
+USE_TOOLS+=    bash
+
+REPLACE_BASH+= clj
+REPLACE_BASH+= clojure
 
 INSTALLATION_DIRS=     bin \
-                       share/doc/${PKGNAME_NOREV} \
-                       lib/java/clojure \
-                       share/examples/${PKGNAME_NOREV}
+                       clojure \
+                       clojure/libexec \
+                       ${PKGMANDIR}/man1
 
-CLOJURE_DOCS=  changes.md epl-v10.html readme.txt \
-               doc/clojure/pprint/CommonLispFormat.markdown \
-               doc/clojure/pprint/PrettyPrinting.markdown
+WRKSRC=        ${WRKDIR}/clojure-tools
 
-SUBST_CLASSES+=                java
-SUBST_STAGE.java=      pre-install
-SUBST_MESSAGE.java=    Set Java
-SUBST_FILES.java=      clj.sh
-SUBST_SED.java=                -e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g'
-SUBST_VARS.java=       SH
+SUBST_CLASSES+=                set-java
+SUBST_STAGE.set-java=  pre-configure
+SUBST_MESSAGE.set-java=        Setting JAVA_HOME path.
+SUBST_FILES.set-java=  clojure
+SUBST_SED.set-java=    -e '/^JAVA_CMD=/s,java,${PKG_JAVA_HOME}/bin/java,'
 
-pre-patch:
-       ${INSTALL_DATA} ${FILESDIR}/clj.sh ${WRKSRC}
+SUBST_CLASSES+=                set-base
+SUBST_STAGE.set-base=  pre-configure
+SUBST_MESSAGE.set-base=        Setting package base path.
+SUBST_FILES.set-base=  clojure
+SUBST_SED.set-base=    -e 's,PREFIX,${PREFIX}/clojure,g'
 
 do-install:
-       ${INSTALL_DATA} ${WRKSRC}/${PKGNAME_NOREV}.jar \
-               ${DESTDIR}${PREFIX}/lib/java/clojure/clojure.jar
-
-       cd ${WRKSRC}/test/clojure && pax -rw -pmp test_clojure \
-               ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV}/
-       ${INSTALL_DATA} ${WRKSRC}/test/clojure/test_helper.clj \
-               ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV}
-
-.for f in ${CLOJURE_DOCS}
-       ${INSTALL_DATA} ${WRKSRC}/${f} \
-               ${DESTDIR}${PREFIX}/share/doc/${PKGNAME_NOREV}
-.endfor
-
-       ${INSTALL_SCRIPT} ${WRKSRC}/clj.sh ${DESTDIR}${PREFIX}/bin/clj
+       ${INSTALL_DATA} ${WRKSRC}/*.edn ${DESTDIR}${PREFIX}/clojure
+       ${INSTALL_DATA} ${WRKSRC}/*.jar ${DESTDIR}${PREFIX}/clojure/libexec
+       ${INSTALL_MAN} ${WRKSRC}/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_SCRIPT} ${WRKSRC}/clj ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_SCRIPT} ${WRKSRC}/clojure ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/java-env.mk"
 .include "../../mk/java-vm.mk"
diff -r 0ee4539bed1b -r 44dfca823a74 lang/clojure/PLIST
--- a/lang/clojure/PLIST        Tue Oct 08 22:17:47 2019 +0000
+++ b/lang/clojure/PLIST        Tue Oct 08 23:40:37 2019 +0000
@@ -1,81 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2019/07/23 20:33:51 sevan Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/10/08 23:40:37 fox Exp $
 bin/clj
-lib/java/clojure/clojure.jar
-share/doc/${PKGNAME}/CommonLispFormat.markdown
-share/doc/${PKGNAME}/PrettyPrinting.markdown
-share/doc/${PKGNAME}/changes.md
-share/doc/${PKGNAME}/epl-v10.html
-share/doc/${PKGNAME}/readme.txt
-share/examples/${PKGNAME}/test_clojure/agents.clj
-share/examples/${PKGNAME}/test_clojure/annotations.clj
-share/examples/${PKGNAME}/test_clojure/annotations/java_5.clj
-share/examples/${PKGNAME}/test_clojure/annotations/java_6.clj
-share/examples/${PKGNAME}/test_clojure/api.clj
-share/examples/${PKGNAME}/test_clojure/atoms.clj
-share/examples/${PKGNAME}/test_clojure/clojure_set.clj
-share/examples/${PKGNAME}/test_clojure/clojure_walk.clj
-share/examples/${PKGNAME}/test_clojure/clojure_xml.clj
-share/examples/${PKGNAME}/test_clojure/clojure_zip.clj
-share/examples/${PKGNAME}/test_clojure/compilation.clj
-share/examples/${PKGNAME}/test_clojure/compilation/examples.clj
-share/examples/${PKGNAME}/test_clojure/compilation/line_number_examples.clj
-share/examples/${PKGNAME}/test_clojure/compilation/load_ns.clj
-share/examples/${PKGNAME}/test_clojure/control.clj
-share/examples/${PKGNAME}/test_clojure/data.clj
-share/examples/${PKGNAME}/test_clojure/data_structures.clj
-share/examples/${PKGNAME}/test_clojure/data_structures_interop.clj
-share/examples/${PKGNAME}/test_clojure/def.clj
-share/examples/${PKGNAME}/test_clojure/delays.clj
-share/examples/${PKGNAME}/test_clojure/edn.clj
-share/examples/${PKGNAME}/test_clojure/errors.clj
-share/examples/${PKGNAME}/test_clojure/evaluation.clj
-share/examples/${PKGNAME}/test_clojure/fn.clj
-share/examples/${PKGNAME}/test_clojure/for.clj
-share/examples/${PKGNAME}/test_clojure/genclass.clj
-share/examples/${PKGNAME}/test_clojure/genclass/examples.clj
-share/examples/${PKGNAME}/test_clojure/generators.clj
-share/examples/${PKGNAME}/test_clojure/java/io.clj
-share/examples/${PKGNAME}/test_clojure/java/javadoc.clj
-share/examples/${PKGNAME}/test_clojure/java/shell.clj
-share/examples/${PKGNAME}/test_clojure/java_interop.clj
-share/examples/${PKGNAME}/test_clojure/keywords.clj
-share/examples/${PKGNAME}/test_clojure/logic.clj
-share/examples/${PKGNAME}/test_clojure/macros.clj
-share/examples/${PKGNAME}/test_clojure/main.clj
-share/examples/${PKGNAME}/test_clojure/metadata.clj
-share/examples/${PKGNAME}/test_clojure/multimethods.clj
-share/examples/${PKGNAME}/test_clojure/ns_libs.clj
-share/examples/${PKGNAME}/test_clojure/numbers.clj
-share/examples/${PKGNAME}/test_clojure/other_functions.clj
-share/examples/${PKGNAME}/test_clojure/parallel.clj
-share/examples/${PKGNAME}/test_clojure/pprint.clj
-share/examples/${PKGNAME}/test_clojure/pprint/test_cl_format.clj
-share/examples/${PKGNAME}/test_clojure/pprint/test_helper.clj
-share/examples/${PKGNAME}/test_clojure/pprint/test_pretty.clj
-share/examples/${PKGNAME}/test_clojure/predicates.clj
-share/examples/${PKGNAME}/test_clojure/printer.clj
-share/examples/${PKGNAME}/test_clojure/protocols.clj
-share/examples/${PKGNAME}/test_clojure/protocols/examples.clj
-share/examples/${PKGNAME}/test_clojure/protocols/hash_collisions.clj
-share/examples/${PKGNAME}/test_clojure/protocols/more_examples.clj
-share/examples/${PKGNAME}/test_clojure/reader.cljc
-share/examples/${PKGNAME}/test_clojure/reducers.clj
-share/examples/${PKGNAME}/test_clojure/reflect.clj
-share/examples/${PKGNAME}/test_clojure/refs.clj
-share/examples/${PKGNAME}/test_clojure/repl.clj
-share/examples/${PKGNAME}/test_clojure/repl/example.clj
-share/examples/${PKGNAME}/test_clojure/rt.clj
-share/examples/${PKGNAME}/test_clojure/sequences.clj
-share/examples/${PKGNAME}/test_clojure/serialization.clj
-share/examples/${PKGNAME}/test_clojure/server.clj
-share/examples/${PKGNAME}/test_clojure/special.clj
-share/examples/${PKGNAME}/test_clojure/string.clj
-share/examples/${PKGNAME}/test_clojure/test.clj
-share/examples/${PKGNAME}/test_clojure/test_fixtures.clj
-share/examples/${PKGNAME}/test_clojure/transducers.clj
-share/examples/${PKGNAME}/test_clojure/transients.clj
-share/examples/${PKGNAME}/test_clojure/try_catch.clj
-share/examples/${PKGNAME}/test_clojure/vars.clj
-share/examples/${PKGNAME}/test_clojure/vectors.clj
-share/examples/${PKGNAME}/test_clojure/volatiles.clj
-share/examples/${PKGNAME}/test_helper.clj
+bin/clojure
+clojure/deps.edn
+clojure/example-deps.edn
+clojure/libexec/clojure-tools-${PKGVERSION}.jar
+man/man1/clj.1
+man/man1/clojure.1
diff -r 0ee4539bed1b -r 44dfca823a74 lang/clojure/distinfo
--- a/lang/clojure/distinfo     Tue Oct 08 22:17:47 2019 +0000
+++ b/lang/clojure/distinfo     Tue Oct 08 23:40:37 2019 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2019/07/23 20:33:51 sevan Exp $
+$NetBSD: distinfo,v 1.5 2019/10/08 23:40:37 fox Exp $
 
-SHA1 (clojure-1.8.0.zip) = 93e9dd5559225d219b557b418bfcabd5c2a2ade6
-RMD160 (clojure-1.8.0.zip) = e447a3e7e81ace291b3c75ecca4742ed98f5f8e5
-SHA512 (clojure-1.8.0.zip) = fda661310f5b52045e87701146415eae57c1c5b1fa1968f64b7e214bc386fe49e3df5bccb53aeab3234631d07c969e3e716b0ee83528c9226f505abb205a2dbd
-Size (clojure-1.8.0.zip) = 5017209 bytes
+SHA1 (clojure-tools-1.10.1.469.tar.gz) = 33b42797609740c6c4a3d478ce07aae94d130ab0
+RMD160 (clojure-tools-1.10.1.469.tar.gz) = 163f9bad72ccfdd122480f06f6b56f7d16c357d9
+SHA512 (clojure-tools-1.10.1.469.tar.gz) = b74654f2e0382332fa2ea514ad2022153419726fa2e63f9b0fe791832b6817508fdd8009f06798c8a36b19351925ad1808e999fab6e6165512e957aed37d5d6a
+Size (clojure-tools-1.10.1.469.tar.gz) = 19750978 bytes
diff -r 0ee4539bed1b -r 44dfca823a74 lang/clojure/files/clj.sh
--- a/lang/clojure/files/clj.sh Tue Oct 08 22:17:47 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-#!@SH@
-
-# clj - Clojure launcher script
-# Borrowed from https://trac.macports.org/changeset/69628
-
-cljjar='lib/java/clojure/clojure.jar'
-cljclass='clojure.main'
-
-dir=$0
-while [ -h "$dir" ]; do
-  ls=`ls -ld "$dir"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  
-  if expr "$link" : '/.*' > /dev/null; then
-    dir="$link"
-  else
-    dir=`dirname "$dir"`"/$link"
-  fi
-done
-
-dir=`dirname $dir`
-dir=`cd "$dir" > /dev/null && pwd`
-cljjar="$dir/../$cljjar"
-cp="${PWD}:${cljjar}"
-
-# Add extra jars as specified by `.clojure` file
-# Borrowed from <http://github.com/mreid/clojure-framework>
-if [ -f .clojure ]; then
-  cp=$cp:`cat .clojure`
-fi
-
-if [ -z "$1" ]; then
-  exec @JAVA_HOME@/bin/java -classpath $cp $cljclass
-else
-  exec @JAVA_HOME@/bin/java -classpath $cp $cljclass $*
-fi
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc note update of sysutils/u-boot and addition of sys...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated lang/clojure to 1.10.1.469
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc note update of sysutils/u-boot and addition of sys...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated lang/clojure to 1.10.1.469
Indexes:
Home | Main Index | Thread Index | Old Index