From dglo@glowacki.dyndns.org  Wed Apr 28 12:56:39 2004
Return-Path: <dglo@glowacki.dyndns.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id EFE9316A4CF
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 28 Apr 2004 12:56:38 -0700 (PDT)
Received: from glowacki.dyndns.org (mdsnwi13-vlan436-33.dsl.tds.net [66.222.30.33])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7709643D1F
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 28 Apr 2004 12:56:38 -0700 (PDT)
	(envelope-from dglo@glowacki.dyndns.org)
Received: from glowacki.dyndns.org (localhost [127.0.0.1])
	by glowacki.dyndns.org (8.12.11/8.12.11) with ESMTP id i3SJub6l094450
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 28 Apr 2004 14:56:38 -0500 (CDT)
	(envelope-from dglo@glowacki.dyndns.org)
Received: (from dglo@localhost)
	by glowacki.dyndns.org (8.12.11/8.12.11/Submit) id i3SJubkm094449;
	Wed, 28 Apr 2004 14:56:37 -0500 (CDT)
	(envelope-from dglo)
Message-Id: <200404281956.i3SJubkm094449@glowacki.dyndns.org>
Date: Wed, 28 Apr 2004 14:56:37 -0500 (CDT)
From: Dave Glowacki <dglo@glowacki.dyndns.org>
Reply-To: Dave Glowacki <dglo@glowacki.dyndns.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Maintainer update for java/jakarta-oro
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         66060
>Category:       java
>Synopsis:       Maintainer update for java/jakarta-oro
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-java
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 28 13:00:48 PDT 2004
>Closed-Date:    Mon May 17 18:28:33 PDT 2004
>Last-Modified:  Mon May 17 18:28:33 PDT 2004
>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@glowacki.dyndns.org:/usr/obj/usr/src/sys/EUSEBIUS i386


	
>Description:
	Update to latest version of java/jakarta-oro (and hopefully
	do things correctly for the latest version of bsd.java.mk)

	This patch also gets rid of the last vestiges of the static
	plist, so the committer needs to remove jakarta-oro/pkg-plist
>How-To-Repeat:
>Fix:


Remove jakarta-oro/pkg-plist

diff -ru jakarta-oro.old/Makefile jakarta-oro/Makefile
--- jakarta-oro.old/Makefile	Sat Jan 24 12:39:00 2004
+++ jakarta-oro/Makefile	Wed Apr 28 13:58:47 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	jakarta-oro
-PORTVERSION=	2.0.7
+PORTVERSION=	2.0.8
 CATEGORIES=	java
 MASTER_SITES=	http://jakarta.apache.org/builds/${PORTNAME}/release/v${PORTVERSION}/ \
 		http://ftp.epix.net/apache/jakarta/oro/binaries/
@@ -17,40 +17,38 @@
 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:
 	@cd ${WRKSRC} && \
 		${SETENV} JAVA_HOME=${JAVA_HOME} ant jar javadocs
 
+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,^,@dirrm ,g" >> ${PLIST}
+	@${MKDIR} ${DOCSDIR}
+	@${CP} -r ${WRKSRC}/docs/api/* ${DOCSDIR}
+	@${CHOWN} -h -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff -ru jakarta-oro.old/distinfo jakarta-oro/distinfo
--- jakarta-oro.old/distinfo	Sun Apr 11 20:17:27 2004
+++ jakarta-oro/distinfo	Wed Apr 28 13:41:59 2004
@@ -1,2 +1,2 @@
-MD5 (jakarta-oro-2.0.7.tar.gz) = 5fdeff2f0386131027ad9ff282061dbf
-SIZE (jakarta-oro-2.0.7.tar.gz) = 342625
+MD5 (jakarta-oro-2.0.8.tar.gz) = 6f7690c6ba9750e3cbb8ebd10078a79a
+SIZE (jakarta-oro-2.0.8.tar.gz) = 345304

>Release-Note:
>Audit-Trail:

From: Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
To: Dave Glowacki <dglo@glowacki.dyndns.org>
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: java/66060: Maintainer update for java/jakarta-oro
Date: Thu, 29 Apr 2004 11:13:20 +0200

 On Wed, Apr 28, 2004 at 02:56:37PM -0500, Dave Glowacki wrote:
 > 	Update to latest version of java/jakarta-oro (and hopefully
 > 	do things correctly for the latest version of bsd.java.mk)
 >  
 >  USE_JAVA=	1.2+
 > -NEED_JAVAC=	YES
 >  
 
 I'm not on my box to test your patch but just a quick note:
 
 For bsd.java.mk 2.0 compliance,
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.2+
 
 NOTE: The same goes for your other PR...
 
 Herve
State-Changed-From-To: open->closed 
State-Changed-By: linimon 
State-Changed-When: Mon May 17 18:28:24 PDT 2004 
State-Changed-Why:  
Committed, thanks. 

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