Index: head/lang/clojure/files/clojure-bin.in
===================================================================
--- head/lang/clojure/files/clojure-bin.in	(revision 475014)
+++ head/lang/clojure/files/clojure-bin.in	(nonexistent)
@@ -1,5 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "%%JAVAJARDIR%%/jline.jar:%%JAVAJARDIR%%/clojure.jar:%%JAVAJARDIR%%/swank-clojure-1.4.2.jar:$CLASSPATH" %%CLOJURE_JLINE_RUNNER%% clojure.main "$@"

Property changes on: head/lang/clojure/files/clojure-bin.in
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/lang/clojure/Makefile
===================================================================
--- head/lang/clojure/Makefile	(revision 475014)
+++ head/lang/clojure/Makefile	(revision 475015)
@@ -1,41 +1,39 @@
 # Created by: ijliao
 # $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 <bsd.port.options.mk>
-
-.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 <bsd.port.mk>
Index: head/lang/clojure/distinfo
===================================================================
--- head/lang/clojure/distinfo	(revision 475014)
+++ head/lang/clojure/distinfo	(revision 475015)
@@ -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
Index: head/lang/clojure/pkg-plist
===================================================================
--- head/lang/clojure/pkg-plist	(nonexistent)
+++ head/lang/clojure/pkg-plist	(revision 475015)
@@ -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

Property changes on: head/lang/clojure/pkg-plist
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property