Update pmd to 5.0.4

Pass maintainership to submitter

PR:		ports/173241
PR:		ports/177236
PR:		ports/178291
Submitted by:	Danilo Egea Gondolfo
Approved by:	miwi (mentor)

7 files changed, 39 insertions, 191 deletions

diff --git a/devel/pmd/Makefile b/devel/pmd/Makefile
index aaf1b5779e0a..26668bcdb8cb 100644
--- a/devel/pmd/Makefile
+++ b/devel/pmd/Makefile
@@ -2,53 +2,38 @@
 # $FreeBSD$
 
 PORTNAME=	pmd
-PORTVERSION=	3.7
-PORTREVISION=	2
+PORTVERSION=	5.0.4
 CATEGORIES=	devel java
-MASTER_SITES=	SF/${PORTNAME}/OldFiles
-DISTNAME=	${PORTNAME}-src-${PORTVERSION}
+MASTER_SITES=	SF
+DISTNAME=	${PORTNAME}-bin-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	danilogondolfo@gmail.com
 COMMENT=	Static analysis tool for Java source code
 
-BUILD_DEPENDS=	${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit
+LICENSE=	BSD
 
 USE_ZIP=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
-USE_ANT=	yes
-
-MAKE_ARGS=	-cp ${JAVALIBDIR}/junit.jar
-
+NO_BUILD=	yes
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
+PORTDOCS=	*
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-BUILD_WRKSRC=	${WRKSRC}/bin
+post-patch:
+	@${REINPLACE_CMD} -e 's|#!/bin/bash|#!/bin/sh|' \
+		-e 's|LIB_DIR=$$(pwd -P)|LIB_DIR=${DATADIR}|' ${WRKSRC}/bin/run.sh
 
-.if !defined(NOPORTDOCS)
-PORTDOCS=	*
-.endif
+.include <bsd.port.options.mk>
 
 do-install:
-.for script in bgastviewer.sh cpd.sh designer.sh pmd.sh
-	${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" \
-	  -e "s|%%JAVA_VERSION%%|${JAVA_VERSION}|" \
-	  -e "s|%%LOCALBASE%%|${LOCALBASE}|" \
-	  ${INSTALL_WRKSRC}/bin/${script}
-.endfor
-	${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/bin/bgastviewer.sh ${PREFIX}/bin/bgastviewer
-	${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/bin/cpd.sh ${PREFIX}/bin/cpd
-	${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/bin/designer.sh ${PREFIX}/bin/pmd_designer
-	${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/bin/pmd.sh ${PREFIX}/bin/pmd
-	${MKDIR} ${DATADIR}
-	cd ${INSTALL_WRKSRC}/lib \
-	  && ${FIND} . -type f -exec ${INSTALL_DATA} \{} ${DATADIR}/ \;
-.if !defined(NOPORTDOCS)
-	cd ${INSTALL_WRKSRC}/docs \
-	  && ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/\{} \; \
-	  && ${FIND} . -type f -exec ${INSTALL_DATA} \{} ${DOCSDIR}/\{} \;
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/run.sh ${PREFIX}/bin/pmd
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/lib/* ${DATADIR}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pmd/distinfo b/devel/pmd/distinfo
index 739a135f692d..18e104b10699 100644
--- a/devel/pmd/distinfo
+++ b/devel/pmd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pmd-src-3.7.zip) = a35de76cd8049fd91b3c4e2031b7b03f849e03e2facba1e32ea1cb27cacdb5ff
-SIZE (pmd-src-3.7.zip) = 10756798
+SHA256 (pmd-bin-5.0.4.zip) = 7a95be0f5ff208ff1b9d028d70f1db9530403f98d47fb579b6b977d17ac7ef9d
+SIZE (pmd-bin-5.0.4.zip) = 19023399
diff --git a/devel/pmd/files/patch-bgastviewer.sh b/devel/pmd/files/patch-bgastviewer.sh
deleted file mode 100644
index de89ce0ce5ad..000000000000
--- a/devel/pmd/files/patch-bgastviewer.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-$FreeBSD$
-
-. Use JARs from ${DATADIR}
-. Use javavmwrapper
-
---- bin/bgastviewer.sh.orig	Fri May 26 05:37:58 2006
-+++ bin/bgastviewer.sh	Fri Jul  7 21:46:32 2006
-@@ -1 +1,9 @@
--java -cp ../build:../lib/jakarta-oro-2.0.8.jar:../lib/pmd-3.7.jar:../lib/xercesImpl-2.6.2.jar:../lib/xmlParserAPIs-2.6.2.jar:../lib/jaxen-1.1-beta-7.jar net.sourceforge.pmd.util.viewer.Viewer
-+#!/bin/sh
-+
-+JARS=`/bin/ls -1 %%DATADIR%%/*jar`
-+CLASSPATH=""
-+for jar in $JARS; do
-+  CLASSPATH="$CLASSPATH:$jar"
-+done
-+
-+JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -cp $CLASSPATH net.sourceforge.pmd.util.viewer.Viewer
diff --git a/devel/pmd/files/patch-cpd.sh b/devel/pmd/files/patch-cpd.sh
deleted file mode 100644
index e26966e52dc1..000000000000
--- a/devel/pmd/files/patch-cpd.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-$FreeBSD$
-
-. Use JARs from ${DATADIR}
-. Use javavmwrapper
-
---- bin/cpd.sh.orig	Mon Apr 17 23:28:11 2006
-+++ bin/cpd.sh	Tue Jul 11 07:47:13 2006
-@@ -20,26 +20,8 @@
- 				exit 1
- fi
- 
--
--SCRIPT_DIR=`dirname $0`
--CWD="$PWD"
--
--cd "$SCRIPT_DIR/../lib"
--LIB_DIR=`pwd -P`
--
- classpath=$CLASSPATH
--
--build_dir="$SCRIPT_DIR/../build"
--
--if [ -d "$build_dir" ]; then
--				cd "$build_dir"
--				build_dir=`pwd -P`
--				classpath=$classpath:$build_dir
--fi
--
--cd "$CWD"
--
--for jarfile in `ls $LIB_DIR/*.jar`; do
-+for jarfile in `ls %%DATADIR%%/*.jar`; do
- 				classpath=$classpath:$jarfile
- done
- 
-@@ -62,4 +44,4 @@
- 
- # echo "CLASSPATH: $classpath"
- 
--java $HEAPSIZE -cp $classpath net.sourceforge.pmd.cpd.CPD --minimum-tokens $MINIMUM_TOKENS --files $DIRECTORY --language $LANGUAGE
-+JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" $HEAPSIZE -cp $classpath net.sourceforge.pmd.cpd.CPD --minimum-tokens $MINIMUM_TOKENS --files $DIRECTORY --language $LANGUAGE
diff --git a/devel/pmd/files/patch-designer.sh b/devel/pmd/files/patch-designer.sh
deleted file mode 100644
index 563f15a132bd..000000000000
--- a/devel/pmd/files/patch-designer.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-$FreeBSD$
-
-. Use /bin/sh rather than /bin/bash
-. Use JARs from ${DATADIR}
-. Use javavmwrapper
-
---- bin/designer.sh.orig	Fri Jan 28 17:13:49 2005
-+++ bin/designer.sh	Tue Jul 11 08:00:06 2006
-@@ -1,24 +1,7 @@
--#!/bin/bash
--
--SCRIPT_DIR=`dirname $0`
--CWD="$PWD"
--
--cd "$SCRIPT_DIR/../lib"
--LIB_DIR=`pwd -P`
-+#!/bin/sh
- 
- classpath=$CLASSPATH
--
--build_dir="$SCRIPT_DIR/../build"
--
--if [ -d "$build_dir" ]; then
--    cd "$build_dir"
--    build_dir=`pwd -P`
--    classpath=$classpath:$build_dir
--fi
--
--cd "$CWD"
--
--for jarfile in `ls $LIB_DIR/*.jar`; do
-+for jarfile in `ls %%DATADIR%%/*.jar`; do
-     classpath=$classpath:$jarfile
- done
- 
-@@ -31,4 +14,4 @@
- 
- # echo "CLASSPATH: $classpath"
- 
--java -cp $classpath net.sourceforge.pmd.util.designer.Designer
-+JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -cp $classpath net.sourceforge.pmd.util.designer.Designer
diff --git a/devel/pmd/files/patch-pmd.sh b/devel/pmd/files/patch-pmd.sh
deleted file mode 100644
index 0bcdf128e96e..000000000000
--- a/devel/pmd/files/patch-pmd.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-$FreeBSD$
-
-. Use /bin/sh rather than /bin/bash
-. Use JARs from ${DATADIR}
-. Use javavmwrapper
-
---- bin/pmd.sh.orig	Fri Jan 28 17:13:49 2005
-+++ bin/pmd.sh	Tue Jul 11 08:00:10 2006
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- if [ -z "$3" ]; then
-     script=`basename $0`
-@@ -7,25 +7,8 @@
-     exit 1
- fi
- 
--SCRIPT_DIR=`dirname $0`
--CWD="$PWD"
--
--cd "$SCRIPT_DIR/../lib"
--LIB_DIR=`pwd -P`
--
- classpath=$CLASSPATH
--
--build_dir="$SCRIPT_DIR/../build"
--
--if [ -d "$build_dir" ]; then
--    cd "$build_dir"
--    build_dir=`pwd -P`
--    classpath=$classpath:$build_dir
--fi
--
--cd "$CWD"
--
--for jarfile in `ls $LIB_DIR/*.jar`; do
-+for jarfile in `ls %%DATADIR%%/*.jar`; do
-     classpath=$classpath:$jarfile
- done
- 
-@@ -38,4 +21,4 @@
- 
- # echo "CLASSPATH: $classpath"
- 
--java -cp $classpath net.sourceforge.pmd.PMD $FILE $FORMAT $RULESETFILES
-+JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -cp $classpath net.sourceforge.pmd.PMD $FILE $FORMAT $RULESETFILES
diff --git a/devel/pmd/pkg-plist b/devel/pmd/pkg-plist
index 0ee5d5aac4a3..c0df2ec7b2a9 100644
--- a/devel/pmd/pkg-plist
+++ b/devel/pmd/pkg-plist
@@ -1,11 +1,21 @@
-bin/bgastviewer
-bin/cpd
 bin/pmd
-bin/pmd_designer
-%%DATADIR%%/jakarta-oro-2.0.8.jar
-%%DATADIR%%/jaxen-1.1-beta-7.jar
-%%DATADIR%%/pmd-3.7.jar
-%%DATADIR%%/pmd-src-3.7.jar
-%%DATADIR%%/xercesImpl-2.6.2.jar
+%%DATADIR%%/ant-1.8.1.jar
+%%DATADIR%%/ant-launcher-1.8.1.jar
+%%DATADIR%%/ant-testutil-1.7.1.jar
+%%DATADIR%%/asm-3.2.jar
+%%DATADIR%%/commons-io-2.2.jar
+%%DATADIR%%/dom4j-1.6.1.jar
+%%DATADIR%%/javacc-4.1.jar
+%%DATADIR%%/jaxen-1.1.1.jar
+%%DATADIR%%/jcommander-1.27.jar
+%%DATADIR%%/jdom-1.0.jar
+%%DATADIR%%/junit-4.4.jar
+%%DATADIR%%/pmd-5.0.4.jar
+%%DATADIR%%/rhino-1.7R3.jar
+%%DATADIR%%/saxon-9.1.0.8-dom.jar
+%%DATADIR%%/saxon-9.1.0.8.jar
+%%DATADIR%%/xercesImpl-2.9.1.jar
+%%DATADIR%%/xml-apis-1.3.02.jar
 %%DATADIR%%/xmlParserAPIs-2.6.2.jar
+%%DATADIR%%/xom-1.0.jar
 @dirrm %%DATADIR%%