. Update to checkstyle 5.3.

. Switch to installing the prebuilt JAR.

3 files changed, 31 insertions, 47 deletions

diff --git a/java/java-checkstyle/Makefile b/java/java-checkstyle/Makefile
index 59026d85c6dd..ead8a72f93c8 100644
--- a/java/java-checkstyle/Makefile
+++ b/java/java-checkstyle/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	checkstyle
-PORTVERSION=	4.4
-PORTREVISION=	1
+PORTVERSION=	5.3
 CATEGORIES=	java devel
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	java-
-DISTNAME=	${PORTNAME}-src-${PORTVERSION}
+DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java style checker
@@ -19,56 +18,42 @@ COMMENT=	Java style checker
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
-USE_ANT=	yes
-ALL_TARGET=	build.bindist
-USE_JIKES=	no
+JAVA_VERSION=	1.5+
+NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-PLIST=	${WRKDIR}/PLIST
+JAR_FILE=	${PORTNAME}-${PORTVERSION}-all.jar
 
-DATADIR=	${JAVASHAREDIR}/${PORTNAME}
+PLIST_FILES=	bin/${PORTNAME} \
+		%%JAVAJARDIR%%/${PORTNAME}.jar
 
-PLIST_FILES=	bin/checkstyle %%JAVAJARDIR%%/${PORTNAME}.jar %%JAVAJARDIR%%/${PORTNAME}-optional.jar \
-		%%DATADIR%%/examples/conf/sun_checks.xml
-BUILDDIR=	${WRKSRC}/target/dist/${PORTNAME}-${PORTVERSION}
 .if !defined(NOPORTDOCS)
-PORTDOCS=	README LICENSE* RIGHTS* docs
+PORTDOCS=	*
 .endif
 
-SUB_FILES=	checkstyle.sh
-
-pre-install:
-	@${RM} -f ${PLIST}
-	@${TOUCH} ${PLIST}
-	@${FIND} ${BUILDDIR}/contrib/ -type f -print | \
-		${SED} "s,^${BUILDDIR}/contrib,${DATADIR:S,${PREFIX}/,,}," >> ${PLIST}
-	@${FIND} ${BUILDDIR}/contrib/ -type d -print | ${SORT} -r | \
-		${SED} -e "s,^${BUILDDIR}/contrib,@dirrm ${DATADIR:S,${PREFIX}/,,}," >> ${PLIST}
-
-do-install: do-install-jar do-install-data do-install-apidocs \
-		do-install-script
-
-do-install-jar:
-	@${MKDIR} ${JAVAJARDIR}
-	@${INSTALL_DATA} ${BUILDDIR}/${PORTNAME}-all-${PORTVERSION}.jar ${JAVAJARDIR}/${PORTNAME}.jar
-	@${INSTALL_DATA} ${BUILDDIR}/${PORTNAME}-optional-${PORTVERSION}.jar ${JAVAJARDIR}/${PORTNAME}-optional.jar
+.if !defined(NOPORTEXAMPLES)
+PORTEXAMPLES=	*
+.endif
 
-do-install-data:
-	@${MKDIR} ${DATADIR}
-	@${CP} -r ${BUILDDIR}/contrib/* ${DATADIR}
-	@${CHOWN} -h -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/sun_checks.xml ${DATADIR}/examples/conf/
+SUB_FILES=	${PORTNAME}.sh
 
-do-install-apidocs:
+do-install:
+	@-${MKDIR} ${JAVAJARDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${JAR_FILE} ${JAVAJARDIR}/${PORTNAME}.jar
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/bin/${PORTNAME}
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for DOCFILE in ${PORTDOCS}
-	@${CP} -r ${BUILDDIR}/${DOCFILE} ${DOCSDIR}/
+	@-${MKDIR} ${DOCSDIR}
+.for DOCFILE in LICENSE* README RIGHTS.antlr
+	@${INSTALL_DATA} ${WRKSRC}/${DOCFILE} ${DOCSDIR}/
 .endfor
-	@${CHOWN} -h -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} site ${DOCSDIR}
+.endif
+.if !defined(NOPORTEXAMPLES)
+	@-${MKDIR} ${EXAMPLESDIR}
+.for EXAMPLEFILE in checkstyle_checks import-control sun_checks suppressions
+	@${INSTALL_DATA} ${WRKSRC}/${EXAMPLEFILE}.xml ${EXAMPLESDIR}/
+.endfor
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} contrib ${EXAMPLESDIR}
 .endif
-
-do-install-script:
-	@${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 19402ffd479b..b2a0c46d4286 100644
--- a/java/java-checkstyle/distinfo
+++ b/java/java-checkstyle/distinfo
@@ -1,3 +1,2 @@
-MD5 (checkstyle-src-4.4.tar.gz) = bd2e832004cd3af1af19437ec561bea5
-SHA256 (checkstyle-src-4.4.tar.gz) = 7081074124e2dde062b06cbb489a1338e04623b986094e9b63f31c50be2f9f38
-SIZE (checkstyle-src-4.4.tar.gz) = 2567907
+SHA256 (checkstyle-5.3-bin.tar.gz) = 4e29f880fb0459e09f86c22dac4b37294937713480a2593c29d895f65bfcca03
+SIZE (checkstyle-5.3-bin.tar.gz) = 4591770
diff --git a/java/java-checkstyle/files/checkstyle.sh.in b/java/java-checkstyle/files/checkstyle.sh.in
index 86997fdc629b..0207a035ee0a 100644
--- a/java/java-checkstyle/files/checkstyle.sh.in
+++ b/java/java-checkstyle/files/checkstyle.sh.in
@@ -4,5 +4,5 @@
 
 JAVA_VERSION="%%JAVA_VERSION%%" \
 	exec "%%LOCALBASE%%/bin/java" \
-	-cp "%%JAVAJARDIR%%/checkstyle.jar:%%JAVAJARDIR%%/checkstyle-optional.jar" \
+	-cp "%%JAVAJARDIR%%/checkstyle.jar" \
 	com.puppycrawl.tools.checkstyle.Main "$@"