java/66061: Maintainer update for java/jakarta-regexp

[Dave Glowacki]

>Number:         66061
>Category:       java
>Synopsis:       Maintainer update for java/jakarta-regexp
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-java
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 28 13:10:12 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:
	Fix things to work with the latest version of bsd.java.mk,
	and finish converting to a dynamically generated plist.
>How-To-Repeat:
>Fix:


Remove jakarta-regexp/pkg-plist

diff -ru jakarta-regexp.old/Makefile jakarta-regexp/Makefile
--- jakarta-regexp.old/Makefile	Sat Jan 24 12:39:00 2004
+++ jakarta-regexp/Makefile	Wed Apr 28 14:39:07 2004
@@ -6,6 +6,7 @@
 
 PORTNAME=	jakarta-regexp
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	java
 MASTER_SITES=	http://www.apache.org/dist/jakarta/regexp/binaries/ \
 		http://ftp.epix.net/apache/jakarta/regexp/binaries/
@@ -16,41 +17,39 @@
 BUILD_DEPENDS=	${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant
 
 USE_JAVA=	1.2+
-NEED_JAVAC=	YES
 
 PLIST=	${WRKDIR}/PLIST
 
 JAVALIBNAME=	${PORTNAME}-${PORTVERSION}
-APIDOCSDIR=	${DOCSDIR}/${JAVALIBNAME}
 
-pre-install:
-	@${RM} -f ${PLIST}
-	@${TOUCH} ${PLIST}
+.if !defined(NOPORTDOCS)
+PORTDOCS=      *
+.endif
 
 do-build:
 	@if [ ! -f ${WRKSRC}/lib ]; then ${MKDIR} ${WRKSRC}/lib; fi
 	@cd ${WRKSRC} && \
 		${SETENV} JAVA_HOME=${JAVA_HOME} ant -Djakarta-site2.dir=${WRKSRC} test package
 
+pre-install:
+	@${RM} -f ${PLIST}
+	@${TOUCH} ${PLIST}
+	@${ECHO} ${JAVAJARDIR}/${PORTNAME}.jar | \
+		${SED} "s,${PREFIX}/*,," >> ${PLIST}
+	@${ECHO} "@unexec ${RMDIR} ${JAVAJARDIR} 2>/dev/null || true" | \
+		${SED} "s,${PREFIX}/*,," >> ${PLIST}
+
 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-apidocs:
 .if !defined(NOPORTDOCS)
-	@${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,^, at dirrm ,g" >> ${PLIST}
+	@${MKDIR} ${DOCSDIR}
+	@${CP} -r ${WRKSRC}/docs/api/* ${DOCSDIR}
+	@${CHOWN} -h -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>

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