ports/66059: Maintainer update for java/java-checkstyle

[Dave Glowacki]

>Number:         66059
>Category:       ports
>Synopsis:       Maintainer update for java/java-checkstyle
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 28 13:00:43 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Dave Glowacki
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
System: FreeBSD glowacki.dyndns.org 4.9-STABLE FreeBSD 4.9-STABLE #16: Mon Mar 22 12:45:10 CST 2004 dglo at glowacki.dyndns.org:/usr/obj/usr/src/sys/EUSEBIUS i386


	
>Description:
	Maintainer update of java/java-checkstyle
>How-To-Repeat:
>Fix:


diff -ru java-checkstyle.old/Makefile java-checkstyle/Makefile
--- java-checkstyle.old/Makefile	Fri Apr 16 11:15:25 2004
+++ java-checkstyle/Makefile	Wed Apr 28 13:57:41 2004
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	checkstyle
-PORTVERSION=	3.2
-PORTREVISION=	1
+PORTVERSION=	3.4
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,18 +19,22 @@
 BUILD_DEPENDS=	${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant
 
 USE_JAVA=	1.4+
-NEED_JAVAC=	YES
 
 PLIST=	${WRKDIR}/PLIST
 
 JAVALIBNAME=	${PORTNAME}-${PORTVERSION}
-APIDOCSDIR=	${DOCSDIR}/javadoc
 STYLEDIR=	${JAVASHAREDIR}/${PORTNAME}
 
 .if !defined(NOPORTDOCS)
+BUILTDOCSDIR=	${WRKSRC}/target/dist/${PORTNAME}-${PORTVERSION}
+BUILTDOCS=	README LICENSE* TODO RIGHTS* docs
 PORTDOCS=	*
 .endif
 
+do-build:
+	@cd ${WRKSRC} && \
+		${SETENV} JAVA_HOME=${JAVA_HOME} ant build.bindist
+
 pre-install:
 	@${RM} -f ${PLIST}
 	@${TOUCH} ${PLIST}
@@ -50,16 +53,12 @@
 		${SED} "s,${WRKSRC}/target/dist/${PORTNAME}-${PORTVERSION}/contrib/,${STYLEDIR}/," | \
 		${SED} -e "s,${PREFIX}/*,," -e "s,^, at dirrm ,g" >> ${PLIST}
 
-do-build:
-	@cd ${WRKSRC} && \
-		${SETENV} JAVA_HOME=${JAVA_HOME} ant build.bindist
-
 do-install: do-install-jar do-install-data do-install-apidocs
 
 do-install-jar:
 	@${MKDIR} ${JAVAJARDIR}
 	@${INSTALL_DATA} ${WRKSRC}/target/dist/${PORTNAME}-${PORTVERSION}/${PORTNAME}-all-${PORTVERSION}.jar ${JAVAJARDIR}/${PORTNAME}.jar
-	@${INSTALL_DATA} ${WRKSRC}/target/dist/${PORTNAME}-${PORTVERSION}/${PORTNAME}-${PORTVERSION}-optional.jar ${JAVAJARDIR}/${PORTNAME}-optional.jar
+	@${INSTALL_DATA} ${WRKSRC}/target/dist/${PORTNAME}-${PORTVERSION}/${PORTNAME}-optional-${PORTVERSION}.jar ${JAVAJARDIR}/${PORTNAME}-optional.jar
 
 do-install-data:
 	@${MKDIR} ${STYLEDIR}
@@ -67,11 +66,11 @@
 
 do-install-apidocs:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${APIDOCSDIR}
-	@(cd ${WRKSRC}/target/dist/${PORTNAME}-${PORTVERSION} && \
-		${TAR} -c --exclude '*.jar' --exclude contrib -f - .) | \
-		(cd ${APIDOCSDIR} && ${TAR} --unlink -x -f -)
-	@${CHOWN} -h -R ${SHAREOWN}:${SHAREGRP} ${APIDOCSDIR}
+	@${MKDIR} ${DOCSDIR}
+.for DOCFILE in ${BUILTDOCS}
+	@${CP} -r ${BUILTDOCSDIR}/${DOCFILE} ${DOCSDIR}/
+.endfor
+	@${CHOWN} -h -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff -ru java-checkstyle.old/distinfo java-checkstyle/distinfo
--- java-checkstyle.old/distinfo	Sun Apr 11 20:17:27 2004
+++ java-checkstyle/distinfo	Wed Apr 28 11:58:29 2004
@@ -1,2 +1,2 @@
-MD5 (checkstyle-src-3.2.tar.gz) = 8ce757fb53069f2eab098c454cc5b7d5
-SIZE (checkstyle-src-3.2.tar.gz) = 1273992
+MD5 (checkstyle-src-3.4.tar.gz) = 39b7e55c7e2103b485e061ab5e42c292
+SIZE (checkstyle-src-3.4.tar.gz) = 1323474

>Release-Note:
>Audit-Trail:
>Unformatted: