From owner-svn-ports-all@freebsd.org Fri Jul 20 13:53:47 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B0421104664D; Fri, 20 Jul 2018 13:53:47 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 615947D8FD; Fri, 20 Jul 2018 13:53:47 +0000 (UTC) (envelope-from tobik@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 424FC110E7; Fri, 20 Jul 2018 13:53:47 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6KDrlbs086696; Fri, 20 Jul 2018 13:53:47 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6KDrkcI086693; Fri, 20 Jul 2018 13:53:46 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201807201353.w6KDrkcI086693@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Fri, 20 Jul 2018 13:53:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475015 - in head/lang/clojure: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/lang/clojure: . files X-SVN-Commit-Revision: 475015 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jul 2018 13:53:47 -0000 Author: tobik Date: Fri Jul 20 13:53:46 2018 New Revision: 475015 URL: https://svnweb.freebsd.org/changeset/ports/475015 Log: lang/clojure: Update to 1.9.0.381 Move the port to install the new offical Clojure command line tools instead of custom scripts. Changes: https://github.com/clojure/clojure/blob/clojure-1.9.0/changes.md PR: 224251 Approved by: Jens Grassel (maintainer) Added: head/lang/clojure/pkg-plist (contents, props changed) Deleted: head/lang/clojure/files/ Modified: head/lang/clojure/Makefile head/lang/clojure/distinfo Modified: head/lang/clojure/Makefile ============================================================================== --- head/lang/clojure/Makefile Fri Jul 20 13:36:28 2018 (r475014) +++ head/lang/clojure/Makefile Fri Jul 20 13:53:46 2018 (r475015) @@ -2,40 +2,38 @@ # $FreeBSD$ PORTNAME= clojure -PORTVERSION= 1.8.0 +PORTVERSION= 1.9.0.381 CATEGORIES= lang lisp java -MASTER_SITES= http://repo1.maven.org/maven2/org/clojure/clojure/${PORTVERSION}/ -EXTRACT_SUFX= .jar -EXTRACT_ONLY= # empty +MASTER_SITES= https://download.clojure.org/install/ +DISTNAME= clojure-tools-${PORTVERSION} MAINTAINER= jan0sch@mykolab.com COMMENT= Dynamic programming language for the JVM LICENSE= EPL +RUN_DEPENDS= bash:shells/bash \ + rlwrap:devel/rlwrap + USE_JAVA= yes -JAVA_VERSION= 1.6+ +JAVA_VERSION= 1.8+ +NO_ARCH= yes NO_BUILD= yes -SUB_FILES= clojure-bin -OPTIONS_DEFINE= JLINE -OPTIONS_DEFAULT= JLINE -JLINE_DESC= jline support for the REPL +PLIST_SUB= PORTVERSION=${PORTVERSION} +WRKSRC= ${WRKDIR}/clojure-tools -PLIST_FILES= bin/clojure \ - %%JAVAJARDIR%%/clojure.jar +post-patch: + @${REINPLACE_CMD} 's,PREFIX,${DATADIR},g' \ + ${WRKSRC}/clojure -.include - -.if ${PORT_OPTIONS:MJLINE} -RUN_DEPENDS+= jline>=0.9.91:devel/jline -CLOJURE_JLINE_RUNNER=jline.ConsoleRunner -.endif - -SUB_LIST+= CLOJURE_JLINE_RUNNER=${CLOJURE_JLINE_RUNNER} - do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/clojure-bin ${STAGEDIR}${PREFIX}/bin/clojure - ${INSTALL_DATA} ${DISTDIR}/${DISTFILES} ${STAGEDIR}${JAVAJARDIR}/clojure.jar + @${MKDIR} ${STAGEDIR}${DATADIR}/libexec ${STAGEDIR}${PREFIX}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/clojure-tools-${PORTVERSION}.jar \ + ${STAGEDIR}${DATADIR}/libexec + cd ${WRKSRC} && ${INSTALL_DATA} deps.edn example-deps.edn \ + ${STAGEDIR}${DATADIR} + cd ${WRKSRC} && ${INSTALL_SCRIPT} clojure clj ${STAGEDIR}${PREFIX}/bin + cd ${WRKSRC} && ${INSTALL_MAN} clojure.1 clj.1 ${STAGEDIR}${PREFIX}/man/man1 .include Modified: head/lang/clojure/distinfo ============================================================================== --- head/lang/clojure/distinfo Fri Jul 20 13:36:28 2018 (r475014) +++ head/lang/clojure/distinfo Fri Jul 20 13:53:46 2018 (r475015) @@ -1,2 +1,3 @@ -SHA256 (clojure-1.8.0.jar) = 061a7f1fe4f1a6c68852a1e2f407966e9058feb0d77c870f0725e7606fd360a8 -SIZE (clojure-1.8.0.jar) = 3622815 +TIMESTAMP = 1530516962 +SHA256 (clojure-tools-1.9.0.381.tar.gz) = f1266ba95784e594bb9b643258b417ef03b0e24b995ddb3a7514ae6daa7458a1 +SIZE (clojure-tools-1.9.0.381.tar.gz) = 19518634 Added: head/lang/clojure/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/clojure/pkg-plist Fri Jul 20 13:53:46 2018 (r475015) @@ -0,0 +1,7 @@ +bin/clj +bin/clojure +man/man1/clj.1.gz +man/man1/clojure.1.gz +%%DATADIR%%/libexec/clojure-tools-%%PORTVERSION%%.jar +%%DATADIR%%/deps.edn +%%DATADIR%%/example-deps.edn