From dglo@hyde.ssec.wisc.edu  Tue Nov 19 22:29:48 2002
Return-Path: <dglo@hyde.ssec.wisc.edu>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7250837B401
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 19 Nov 2002 22:29:48 -0800 (PST)
Received: from hyde.ssec.wisc.edu (hyde.ssec.wisc.edu [128.104.109.251])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EAA7643E42
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 19 Nov 2002 22:29:47 -0800 (PST)
	(envelope-from dglo@hyde.ssec.wisc.edu)
Received: from hyde.ssec.wisc.edu (localhost [127.0.0.1])
	by hyde.ssec.wisc.edu (8.10.2+Sun/8.10.2) with ESMTP id gAK6TYK23556
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 20 Nov 2002 00:29:34 -0600 (CST)
Message-Id: <200211200629.gAK6TYK23556@hyde.ssec.wisc.edu>
Date: Wed, 20 Nov 2002 00:29:34 -0600
From: Dave Glowacki <dglo@hyde.ssec.wisc.edu>
To: FreeBSD-gnats-submit@freebsd.org
Subject: MAINTAINER UPDATE: Update Makefile for java/jakarta-oro
X-Send-Pr-Version: 3.113

>Number:         45512
>Category:       ports
>Synopsis:       MAINTAINER UPDATE: Update Makefile for java/jakarta-oro
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 19 22:30:01 PST 2002
>Closed-Date:    Fri Nov 22 15:51:57 PST 2002
>Last-Modified:  Fri Nov 22 15:51:57 PST 2002
>Originator:     Dave Glowacki
>Release:        FreeBSD 4.7-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD eusebius.glowacki.org 4.7-PRERELEASE FreeBSD 4.7-PRERELEASE #1: Fri Sep 6 16:22:07 CDT 2002 dglo@eusebius.glowacki.org:/usr/src/sys/compile/EUSEBIUS i386


	
>Description:
	I've cleaned up the Makefiles on all the Java ports I maintain
	so that they're all as identical as possible.
>How-To-Repeat:
>Fix:

Remove java/jakarta-oro/pkg-plist and apply this patch.

diff -ru jakarta-oro/Makefile jakarta-oro/Makefile
--- jakarta-oro/Makefile	Wed Aug 28 20:19:43 2002
+++ jakarta-oro/Makefile	Tue Nov 19 23:44:47 2002
@@ -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 @@
 
 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>
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: edwin 
State-Changed-When: Fri Nov 22 15:51:32 PST 2002 
State-Changed-Why:  
Commited, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=45513 
State-Changed-From-To: open->closed 
State-Changed-By: edwin 
State-Changed-When: Fri Nov 22 15:51:32 PST 2002 
State-Changed-Why:  
Commited, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=45512 
>Unformatted:
