diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2019-11-26 21:46:12 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2019-11-26 21:46:12 +0000 |
| commit | 5a52a082347653e46a7330eb60d51230c01183ef (patch) | |
| tree | 175d5bf406b7321a3c965d241cd3f2b32e2c8ca1 /java/javahelp | |
| parent | news/tin: take maintainer (diff) | |
Clean up after java/openjdk6 and java/openjdk6-jre removal
java/openjdk6 support was removed from Mk/bsd.java.mk (r512662) and
java/openjdk6 and java/openjdk6-jre were removed from the ports tree
(r512663). Now this patch completely removes remaining stuff from the
ports tree.
PR: 241953 (exp-run)
Reviewed by: glewis
Approved by: portmgr (antoine)
Differential Revision: https://reviews.freebsd.org/D22342
Notes
Notes:
svn path=/head/; revision=518482
Diffstat (limited to 'java/javahelp')
| -rw-r--r-- | java/javahelp/Makefile | 5 | ||||
| -rw-r--r-- | java/javahelp/files/jhindexer.in | 2 | ||||
| -rw-r--r-- | java/javahelp/files/jhsearch.in | 2 |
3 files changed, 1 insertions, 8 deletions
diff --git a/java/javahelp/Makefile b/java/javahelp/Makefile index a9ebff59daa4..ab5cb9912587 100644 --- a/java/javahelp/Makefile +++ b/java/javahelp/Makefile @@ -3,6 +3,7 @@ PORTNAME= javahelp PORTVERSION= 2.0.05.20170719 +PORTREVISION= 1 CATEGORIES= java devel MAINTAINER= makc@FreeBSD.org @@ -19,7 +20,6 @@ GH_TAGNAME= 3ca862d USE_JAVA= yes USE_ANT= yes -JAVA_VER= 1.${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} TOMCAT_VER?= 8.5 TOMCAT_PORT= www/tomcat${TOMCAT_VER:S/.0//:S/.//} TOMCAT_DIR= ${LOCALBASE}/apache-tomcat-${TOMCAT_VER} @@ -30,14 +30,11 @@ MAKE_ARGS= -Djsp-jar=${TOMCAT_jsp} \ -Dfile.reference.jsp-api.jar=${TOMCAT_jsp} \ -Dservlet-jar=${TOMCAT_servlet} \ -Dfile.reference.servlet-api.jar=${TOMCAT_servlet} \ - -Djavac.target=${JAVA_VER} \ - -Ddefault.javac.target=${JAVA_VER} \ -Dtomcat-zip-present=true BUILD_WRKSRC= ${WRKSRC}/javahelp_nbproject SUB_FILES= jhindexer \ jhsearch -SUB_LIST= JAVA_VER=${JAVA_VER}+ do-install: ${INSTALL_SCRIPT} ${WRKDIR}/jhindexer ${WRKDIR}/jhsearch ${STAGEDIR}${PREFIX}/bin/ diff --git a/java/javahelp/files/jhindexer.in b/java/javahelp/files/jhindexer.in index 59ee27424484..48334eb3025c 100644 --- a/java/javahelp/files/jhindexer.in +++ b/java/javahelp/files/jhindexer.in @@ -1,5 +1,3 @@ #!/bin/sh -export JAVA_VERSION=%%JAVA_VER%% - exec java -cp %%JAVALIBDIR%%/jhall.jar com.sun.java.help.search.Indexer "$@" diff --git a/java/javahelp/files/jhsearch.in b/java/javahelp/files/jhsearch.in index 36c5a2ff8258..d6cc3d45df6c 100644 --- a/java/javahelp/files/jhsearch.in +++ b/java/javahelp/files/jhsearch.in @@ -1,5 +1,3 @@ #!/bin/sh -export JAVA_VERSION=%%JAVA_VER%% - exec java -cp %%JAVALIBDIR%%/jhall.jar com.sun.java.help.search.QueryEngine "$@" |