- Update to 4.1

- Use SUB_FILES to configure the launcher shell script
- Set JAVA_VERSION in the launcher
- STYLEDIR -> DATADIR (%%DATADIR%% already in SUB_LIST and PLIST_SUB)

PR:		93339
Submitted by:	me
Approved by:	maintainer

4 files changed, 20 insertions, 23 deletions

diff --git a/java/java-checkstyle/Makefile b/java/java-checkstyle/Makefile
index e29f12cf7160..bdd5db2050d1 100644
--- a/java/java-checkstyle/Makefile
+++ b/java/java-checkstyle/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	checkstyle
-PORTVERSION=	3.5
-PORTREVISION=	1
+PORTVERSION=	4.1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -27,26 +26,24 @@ USE_JIKES=	no
 
 PLIST=	${WRKDIR}/PLIST
 
-STYLEDIR=	${JAVASHAREDIR}/${PORTNAME}
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
 PLIST_FILES=	bin/checkstyle %%JAVAJARDIR%%/${PORTNAME}.jar %%JAVAJARDIR%%/${PORTNAME}-optional.jar \
-		${STYLEDIR:S,${PREFIX}/,,}/examples/conf/sun_checks.xml
+		%%DATADIR%%/examples/conf/sun_checks.xml
 .if !defined(NOPORTDOCS)
 BUILDDIR=	${WRKSRC}/target/dist/${PORTNAME}-${PORTVERSION}
-PORTDOCS=	README LICENSE* TODO RIGHTS* docs
+PORTDOCS=	README LICENSE* RIGHTS* docs
 .endif
 
-do-configure:
-	@${SED} -e 's,%%LOCALBASE%%,${LOCALBASE},g ; s,%%JAVAJARDIR%%,${JAVAJARDIR},g' \
-		${FILESDIR}/checkstyle.sh > ${WRKSRC}/checkstyle
+SUB_FILES=	checkstyle.sh
 
 pre-install:
 	@${RM} -f ${PLIST}
 	@${TOUCH} ${PLIST}
 	@${FIND} ${BUILDDIR}/contrib/ -type f -print | \
-		${SED} "s,^${BUILDDIR}/contrib,${STYLEDIR:S,${PREFIX}/,,}," >> ${PLIST}
+		${SED} "s,^${BUILDDIR}/contrib,${DATADIR:S,${PREFIX}/,,}," >> ${PLIST}
 	@${FIND} ${BUILDDIR}/contrib/ -type d -print | ${SORT} -r | \
-		${SED} -e "s,^${BUILDDIR}/contrib,@dirrm ${STYLEDIR:S,${PREFIX}/,,}," >> ${PLIST}
+		${SED} -e "s,^${BUILDDIR}/contrib,@dirrm ${DATADIR:S,${PREFIX}/,,}," >> ${PLIST}
 
 do-install: do-install-jar do-install-data do-install-apidocs \
 		do-install-script
@@ -57,10 +54,10 @@ do-install-jar:
 	@${INSTALL_DATA} ${BUILDDIR}/${PORTNAME}-optional-${PORTVERSION}.jar ${JAVAJARDIR}/${PORTNAME}-optional.jar
 
 do-install-data:
-	@${MKDIR} ${STYLEDIR}
-	@${CP} -r ${BUILDDIR}/contrib/* ${STYLEDIR}
-	@${CHOWN} -h -R ${SHAREOWN}:${SHAREGRP} ${STYLEDIR}
-	@${INSTALL_DATA} ${WRKSRC}/sun_checks.xml ${STYLEDIR}/examples/conf/
+	@${MKDIR} ${DATADIR}
+	@${CP} -r ${BUILDDIR}/contrib/* ${DATADIR}
+	@${CHOWN} -h -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
+	@${INSTALL_DATA} ${WRKSRC}/sun_checks.xml ${DATADIR}/examples/conf/
 
 do-install-apidocs:
 .if !defined(NOPORTDOCS)
@@ -72,6 +69,6 @@ do-install-apidocs:
 .endif
 
 do-install-script:
-	@${INSTALL_SCRIPT} ${WRKSRC}/checkstyle ${PREFIX}/bin/checkstyle
+	@${INSTALL_SCRIPT} ${WRKDIR}/checkstyle.sh ${PREFIX}/bin/checkstyle
 
 .include <bsd.port.mk>
diff --git a/java/java-checkstyle/distinfo b/java/java-checkstyle/distinfo
index c18e7946b4df..83617e7ab27b 100644
--- a/java/java-checkstyle/distinfo
+++ b/java/java-checkstyle/distinfo
@@ -1,3 +1,3 @@
-MD5 (checkstyle-src-3.5.tar.gz) = 868736a6617d58bbc4efcf85984423fd
-SHA256 (checkstyle-src-3.5.tar.gz) = f72fc6724699c617b544cc9b4925a0e568106c8c445da43775d5451becccf2d2
-SIZE (checkstyle-src-3.5.tar.gz) = 1962069
+MD5 (checkstyle-src-4.1.tar.gz) = 96b430fe5087b4f62fa78804475ee2ea
+SHA256 (checkstyle-src-4.1.tar.gz) = 0ea1c7fea315a8321a826ccf8e4fa9b12542d79a9d6da5f79def8c77f9e5fddb
+SIZE (checkstyle-src-4.1.tar.gz) = 2877441
diff --git a/java/java-checkstyle/files/checkstyle.sh b/java/java-checkstyle/files/checkstyle.sh
deleted file mode 100644
index d3796e75e80e..000000000000
--- a/java/java-checkstyle/files/checkstyle.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-%%LOCALBASE%%/bin/java -cp "%%JAVAJARDIR%%/checkstyle.jar:%%JAVAJARDIR%%/checkstyle-optional.jar" com.puppycrawl.tools.checkstyle.Main "$@"
diff --git a/java/java-checkstyle/files/checkstyle.sh.in b/java/java-checkstyle/files/checkstyle.sh.in
new file mode 100644
index 000000000000..d78dce28be03
--- /dev/null
+++ b/java/java-checkstyle/files/checkstyle.sh.in
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "%%JAVAJARDIR%%/checkstyle.jar:%%JAVAJARDIR%%/checkstyle-optional.jar" com.puppycrawl.tools.checkstyle.Main "$@"