Maintainer springcleaning of his Makefiles

PR:		ports/45513,ports/45512,ports/45511
Submitted by:	Dave Glowacki <dglo@hyde.ssec.wisc.edu>

4 files changed, 97 insertions, 63 deletions

diff --git a/java/jakarta-oro/Makefile b/java/jakarta-oro/Makefile
index 5b297befe7a4..dd872ab09e07 100644
--- a/java/jakarta-oro/Makefile
+++ b/java/jakarta-oro/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	jakarta-oro
 PORTVERSION=	2.0.6
 CATEGORIES=	java
-MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-oro/release/v${PORTVERSION}/
+MASTER_SITES=	http://jakarta.apache.org/builds/${PORTNAME}/release/v${PORTVERSION}/
 
 MAINTAINER=	dglo@ssec.wisc.edu
 
@@ -19,25 +19,36 @@ NEED_JAVAC=	YES
 
 PLIST=	${WRKDIR}/PLIST
 
-post-extract:
-	@${CP} ${.CURDIR}/pkg-plist ${WRKDIR}/PLIST
+JAVALIBNAME=	${PORTNAME}-${PORTVERSION}
+APIDOCSDIR=	${DOCSDIR}/${JAVALIBNAME}
+
+pre-install:
+	@${RM} -f ${PLIST}
+	@${TOUCH} ${PLIST}
 
 do-build:
-	@(cd ${WRKSRC}; ${SETENV} JAVA_HOME=${JAVA_HOME} ant jar javadocs)
+	@cd ${WRKSRC} && \
+		${SETENV} JAVA_HOME=${JAVA_HOME} ant jar javadocs
+
+do-install: do-install-jar do-install-apidocs
+
+do-install-jar:
+	@${MKDIR} ${JAVAJARDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar ${JAVAJARDIR}/${PORTNAME}.jar
+	@${ECHO} ${JAVAJARDIR}/${PORTNAME}.jar | \
+		${SED} "s,${PREFIX}/*,," >> ${PLIST}
+	@${ECHO} "@unexec ${RMDIR} ${JAVAJARDIR} 2>/dev/null || true" | \
+		${SED} "s,${PREFIX}/*,," >> ${PLIST}
 
-do-install:
-	@${MKDIR} ${PREFIX}/share/java/classes
-	@${INSTALL_DATA} ${WRKSRC}/jakarta-oro-${PORTVERSION}.jar ${LOCALBASE}/share/java/classes/jakarta-oro.jar
+do-install-apidocs:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@(cd ${WRKSRC}/docs/api && ${TAR} -c -f - .) \
-		| (cd ${DOCSDIR} && ${TAR} --unlink -x -f -)
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
-	@cd ${PREFIX} \
-		&& ${FIND} share/doc/jakarta-oro -type f -print >> ${PLIST}
-	@cd ${PREFIX} \
-		&& ${FIND} share/doc/jakarta-oro -type d -print | sort -r | \
-		${SED} "s,^,@dirrm ,g" >> ${PLIST}
+	@${MKDIR} ${APIDOCSDIR}
+	@${CP} -r ${WRKSRC}/docs/api/* ${APIDOCSDIR}
+	@${CHOWN} -h -R ${SHAREOWN}:${SHAREGRP} ${APIDOCSDIR}
+	@${FIND} ${APIDOCSDIR} -type f -print | \
+		${SED} "s,${PREFIX}/*,," >> ${PLIST}
+	@${FIND} ${APIDOCSDIR} -type d -print | sort -r | \
+		${SED} -e "s,${PREFIX}/*,," -e "s,^,@dirrm ,g" >> ${PLIST}
 .endif
 
 .include <bsd.port.mk>
diff --git a/java/jakarta-regexp/Makefile b/java/jakarta-regexp/Makefile
index e71322808f6c..fb8a87eeae4a 100644
--- a/java/jakarta-regexp/Makefile
+++ b/java/jakarta-regexp/Makefile
@@ -7,31 +7,47 @@
 PORTNAME=	jakarta-regexp
 PORTVERSION=	1.2
 CATEGORIES=	java
-MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-regexp/release/v${PORTVERSION}/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	http://jakarta.apache.org/builds/${PORTNAME}/release/v${PORTVERSION}/
 
 MAINTAINER=	dglo@ssec.wisc.edu
 
-BUILD_DEPENDS=	${JAVA_HOME}/bin/javac:${PORTSDIR}/java/jdk12
-RUN_DEPENDS=	${JAVA_HOME}/bin/java:${PORTSDIR}/java/jdk12
+BUILD_DEPENDS=	${LOCALBASE}/bin/ant:${PORTSDIR}/devel/jakarta-ant
 
-JAVA_HOME?=	${LOCALBASE}/jdk1.2.2
+USE_JAVA=	1.2+
+NEED_JAVAC=	YES
+
+PLIST=	${WRKDIR}/PLIST
+
+JAVALIBNAME=	${PORTNAME}-${PORTVERSION}
+APIDOCSDIR=	${DOCSDIR}/${JAVALIBNAME}
+
+pre-install:
+	@${RM} -f ${PLIST}
+	@${TOUCH} ${PLIST}
 
 do-build:
-	@cd ${WRKSRC}/build && PATH=$$PATH:${JAVA_HOME}/bin JAVA_HOME=${JAVA_HOME} ${SH} build-regexp.sh package
+	@cd ${WRKSRC}/build && \
+		${SETENV} PATH=$$PATH:${JAVA_HOME}/bin JAVA_HOME=${JAVA_HOME} ${SH} build-regexp.sh package
+
+do-install: do-install-jar do-install-apidocs
 
-do-install:
-	@${MKDIR} ${PREFIX}/share/java/classes
-	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar ${LOCALBASE}/share/java/classes/${PORTNAME}.jar
+do-install-jar:
+	@${MKDIR} ${JAVAJARDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar ${JAVAJARDIR}/${PORTNAME}.jar
+	@${ECHO} ${JAVAJARDIR}/${PORTNAME}.jar | \
+		${SED} "s,${PREFIX}/*,," >> ${PLIST}
+	@${ECHO} "@unexec ${RMDIR} ${JAVAJARDIR} 2>/dev/null || true" | \
+		${SED} "s,${PREFIX}/*,," >> ${PLIST}
 
-post-install:
+do-install-apidocs:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
-	@(cd ${WRKSRC}/docs/api && ${TAR} -c -f - .) \
-		| (cd ${PREFIX}/share/doc/${PORTNAME} && ${TAR} --unlink -x -f -)
-	@${CHOWN} -h -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/${PORTNAME} 
-	@(cd ${PREFIX} \
-		&& find share/doc/${PORTNAME} -type f -print >> ${TMPPLIST})
+	@${MKDIR} ${APIDOCSDIR}
+	@${CP} -r ${WRKSRC}/docs/api/* ${APIDOCSDIR}
+	@${CHOWN} -h -R ${SHAREOWN}:${SHAREGRP} ${APIDOCSDIR}
+	@${FIND} ${APIDOCSDIR} -type f -print | \
+		${SED} "s,${PREFIX}/*,," >> ${PLIST}
+	@${FIND} ${APIDOCSDIR} -type d -print | sort -r | \
+		${SED} -e "s,${PREFIX}/*,," -e "s,^,@dirrm ,g" >> ${PLIST}
 .endif
 
-.include <bsd.port.mk> END-of-jakarta-regexp/Makefile
+.include <bsd.port.mk>
diff --git a/java/jakarta-regexp/pkg-descr b/java/jakarta-regexp/pkg-descr
index 35fd1dace6df..00b0866dc117 100644
--- a/java/jakarta-regexp/pkg-descr
+++ b/java/jakarta-regexp/pkg-descr
@@ -1,3 +1,3 @@
 A 100% Pure Java Regular Expression package by Jonathan Locke.
 
-WWW: http://jakarta.apache.org/regexp/
\ No newline at end of file
+WWW: http://jakarta.apache.org/regexp/
diff --git a/java/java-checkstyle/Makefile b/java/java-checkstyle/Makefile
index 2758c2984d01..cf5cea5e96f4 100644
--- a/java/java-checkstyle/Makefile
+++ b/java/java-checkstyle/Makefile
@@ -22,40 +22,47 @@ NEED_JAVAC=	YES
 
 PLIST=	${WRKDIR}/PLIST
 
-CLASSES_SUBDIR=	share/java/classes
-STYLE_SUBDIR=	share/java/${PORTNAME}
+JAVALIBNAME=	${PORTNAME}-${PORTVERSION}
+APIDOCSDIR=	${DOCSDIR}/${JAVALIBNAME}
+STYLEDIR=	${JAVASHAREDIR}/${PORTNAME}
 
-post-extract:
-	@${TOUCH} ${WRKDIR}/PLIST
+pre-install:
+	@${RM} -f ${PLIST}
+	@${TOUCH} ${PLIST}
 
 do-build:
-	@(cd ${WRKSRC}; ${SETENV} JAVA_HOME=${JAVA_HOME} ant build.bindist)
-
-do-install:
-	@${MKDIR} ${PREFIX}/${CLASSES_SUBDIR}
-	@${INSTALL_DATA} ${WRKSRC}/target/dist/${PORTNAME}-${PORTVERSION}/${PORTNAME}-all-${PORTVERSION}.jar ${PREFIX}/${CLASSES_SUBDIR}/${PORTNAME}.jar
-	@${ECHO} ${CLASSES_SUBDIR}/${PORTNAME}.jar >> ${PLIST}
-	@${MKDIR} ${PREFIX}/${STYLE_SUBDIR}
-	@(cd ${WRKSRC}/target/dist/${PORTNAME}-${PORTVERSION}/contrib && \
-	  ${TAR} -c -f - .) \
-		| (cd ${PREFIX}/${STYLE_SUBDIR} && ${TAR} --unlink -x -f -)
-	@cd ${PREFIX} \
-		&& ${FIND} ${STYLE_SUBDIR} -type f -print >> ${PLIST}
-	@cd ${PREFIX} \
-		&& ${FIND} ${STYLE_SUBDIR} -type d -print | sort -r | \
-		${SED} "s,^,@dirrm ,g" >> ${PLIST}
+	@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
+	@${ECHO} ${JAVAJARDIR}/${PORTNAME}.jar | \
+		${SED} "s,${PREFIX}/*,," >> ${PLIST}
+	@${ECHO} "@unexec ${RMDIR} ${JAVAJARDIR} 2>/dev/null || true" | \
+		${SED} "s,${PREFIX}/*,," >> ${PLIST}
+
+do-install-data:
+	@${MKDIR} ${STYLEDIR}
+	@${CP} -r ${WRKSRC}/target/dist/${PORTNAME}-${PORTVERSION}/contrib/* ${STYLEDIR}
+	@${FIND} ${STYLEDIR} -type f -print | \
+		${SED} "s,${PREFIX}/*,," >> ${PLIST}
+	@${FIND} ${STYLEDIR} -type d -print | sort -r | \
+		${SED} -e "s,${PREFIX}/*,," -e "s,^,@dirrm ,g" >> ${PLIST}
+
+do-install-apidocs:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${APIDOCSDIR}
 	@(cd ${WRKSRC}/target/dist/${PORTNAME}-${PORTVERSION} && \
-	  ${TAR} -c --exclude '*.jar' --exclude contrib -f - .) \
-		| (cd ${DOCSDIR} && ${TAR} --unlink -x -f -)
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
-	@cd ${PREFIX} \
-		&& ${FIND} share/doc/${PORTNAME} -type f -print >> ${PLIST}
-	@cd ${PREFIX} \
-		&& ${FIND} share/doc/${PORTNAME} -type d -print | sort -r | \
-		${SED} "s,^,@dirrm ,g" >> ${PLIST}
+		${TAR} -c --exclude '*.jar' --exclude contrib -f - .) | \
+		(cd ${APIDOCSDIR} && ${TAR} --unlink -x -f -)
+	@${CHOWN} -h -R ${SHAREOWN}:${SHAREGRP} ${APIDOCSDIR}
+	@${FIND} ${APIDOCSDIR} -type f -print | \
+		${SED} "s,${PREFIX}/*,," >> ${PLIST}
+	@${FIND} ${APIDOCSDIR} -type d -print | sort -r | \
+		${SED} -e "s,${PREFIX}/*,," -e "s,^,@dirrm ,g" >> ${PLIST}
 .endif
-	@${ECHO} "@unexec ${RMDIR} %D/${CLASSES_SUBDIR} 2>/dev/null || true" >> ${PLIST}
 
 .include <bsd.port.mk>