From ernst@zaphod.euronet.nl  Fri Apr 25 08:54:02 2003
Return-Path: <ernst@zaphod.euronet.nl>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 28C2837B401; Fri, 25 Apr 2003 08:54:02 -0700 (PDT)
Received: from zaphod.euronet.nl (zaphod.euronet.nl [194.134.168.213])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 13DE143F85; Fri, 25 Apr 2003 08:54:01 -0700 (PDT)
	(envelope-from ernst@zaphod.euronet.nl)
Received: from zaphod.euronet.nl (localhost [127.0.0.1])
	by zaphod.euronet.nl (8.12.9/8.12.9) with ESMTP id h3PEMR4G034341;
	Fri, 25 Apr 2003 16:22:27 +0200 (CEST)
	(envelope-from ernst@zaphod.euronet.nl)
Received: (from ernst@localhost)
	by zaphod.euronet.nl (8.12.9/8.12.9/Submit) id h3PEMRqk034340;
	Fri, 25 Apr 2003 16:22:27 +0200 (CEST)
Message-Id: <200304251422.h3PEMRqk034340@zaphod.euronet.nl>
Date: Fri, 25 Apr 2003 16:22:27 +0200 (CEST)
From: Ernst de Haan <znerd@freebsd.org>
Reply-To: Ernst de Haan <znerd@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: kevlo@freebsd.org
Subject: Port textproc/xerces-j should be updated from 2.2.0 to 2.4.0
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         51415
>Category:       ports
>Synopsis:       Port textproc/xerces-j should be updated from 2.2.0 to 2.4.0
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    linimon
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 25 09:00:28 PDT 2003
>Closed-Date:    Thu Apr 08 22:55:33 PDT 2004
>Last-Modified:  Thu Apr 08 22:55:33 PDT 2004
>Originator:     Ernst de Haan
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
FreeBSD Project
>Environment:
System: FreeBSD zaphod.euronet.nl 4.8-STABLE FreeBSD 4.8-STABLE #14: Tue Apr 22 11:40:33 CEST 2003 root@zaphod.euronet.nl:/usr/obj/usr/src/sys/ZAPHOD i386
>Description:
Current version of Xerces-J is 2.4.0, while 2.2.0 is still in ports.

See:
http://xml.apache.org/xerces2-j/index.html
>How-To-Repeat:
>Fix:
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->kevlo 
Responsible-Changed-By: adamw 
Responsible-Changed-When: Fri Apr 25 13:17:42 PDT 2003 
Responsible-Changed-Why:  
I'm not sure that a PR filed to nag kevlo is going to help, 
but he's the maintainer so he gets the "Responsible:". 

http://www.freebsd.org/cgi/query-pr.cgi?pr=51415 

From: Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
To: freebsd-gnats-submit@FreeBSD.org, znerd@FreeBSD.org
Cc: Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
Subject: Re: ports/51415: Port textproc/xerces-j should be updated from 2.2.0 to 2.4.0 [PATCH]
Date: Wed, 24 Mar 2004 20:40:48 +0100

 Here is a patch to upgrade the port to the latest version (2.6.2):
 
 - Updated to version 2.6.2
 - Now using JAVAJARDIR instead of JAVASHAREDIR/classes
 - Now using PORTDOCS macro (to reduce pkg-plist size and fix the apidocs
   deinstall issue with some JDKs)
 - Now using PLIST_FILES macro (thus no more pkg-plist)
 - Now using MASTER_SITE_APACHE_XML/MASTER_SITE_SUBDIR
 - Now using OPTIONS macro for a more flexible build/install:
   - WITH_DEPRECATED_JARS: build and install deprecated JARs (default:
 	on, as some ports may depend on it)
   - WITH_SAMPLES_JAR: build and install samples (default: off)
 
 NOTE: Upgrading this port has been rather complex because of Xerces-J
 weird packing format.
 
 NOTE2: the 'docs' ant target is still commented but not for the same
 reason as before. The stylebook JAR file is bundled within the
 Xerces-J-tools but it tries to use the DISPLAY while building the docs
 (?!). So chances are the port will fail as root won't have DISPLAY
 correctly set. Need some feedback on this one though, because I suspect
 some property (System or Ant) could disable this behavior.
 
 NOTE3: be sure to remove completely pkg-plist as it is no longer needed.
 
 NOTE4: no SIZE info. sorry for that.
 
 Herve
 
 
 
 diff -ur xerces-j.original/Makefile xerces-j/Makefile
 --- xerces-j.original/Makefile	Wed Mar 24 02:21:22 2004
 +++ xerces-j/Makefile	Wed Mar 24 02:23:10 2004
 @@ -6,11 +6,11 @@
  #
  
  PORTNAME=	xerces-j
 -PORTVERSION=	2.2.0
 -PORTREVISION=	1
 +PORTVERSION=	2.6.2
  CATEGORIES=	textproc java
 -MASTER_SITES=	http://xml.apache.org/dist/xerces-j/old_xerces2/
 -DISTNAME=	Xerces-J-src.${PORTVERSION}
 +MASTER_SITES=	${MASTER_SITE_APACHE_XML}
 +MASTER_SITE_SUBDIR=	xerces-j/source
 +DISTFILES=	Xerces-J-src.${PORTVERSION}${EXTRACT_SUFX} Xerces-J-tools.${PORTVERSION}${EXTRACT_SUFX}
  
  MAINTAINER=	kevlo@FreeBSD.org
  COMMENT=	XML parser for Java
 @@ -20,32 +20,53 @@
  USE_JAVA=	1.3+
  
  WRKSRC=		${WRKDIR}/xerces-${PORTVERSION:S/./_/g}
 +
 +OPTIONS=	DEPRECATED_JARS "build/install the deprecated JARs" on \
 +			SAMPLES_JAR "build/install the samples" off
 +
 +.include <bsd.port.pre.mk>
 +
  ANT?=		${LOCALBASE}/bin/ant
 -.if defined(NOPORTDOCS)
 -ANT_TARGETS=	jar apijar
 -.else
 -ANT_TARGETS=	jar apijar javadocs
 -# We should install other documentation too, but
 -# we have no stylebook port yet
 -#
 -# ANT_TARGETS=	jar apijar docs javadocs
 +ANT_TARGETS=	jars
 +.if !defined(NOPORTDOCS)
 +ANT_TARGETS+=	javadocs #docs
 +PORTDOCS=	api dom3-api other xerces2 xni xs
 +.endif
 +
 +JARFILES+=	xercesImpl.jar xml-apis.jar
 +.if defined(WITH_DEPRECATED_JARS)
 +ANT_TARGETS+=	deprecatedjars
 +JARFILES+=	xerces.jar xmlParserAPIs.jar resolver.jar
 +.endif
 +.if defined(WITH_SAMPLES_JAR)
 +JARFILES+=	xercesSamples.jar
  .endif
 -JAVASHAREDIR=	${PREFIX}/share/java
 -JARDIR=		${JAVASHAREDIR}/classes
 -JARFILES=	xercesImpl.jar xmlParserAPIs.jar
 +
 +PLIST_FILES+=	${JARFILES:S,^,${JAVAJARDIR:S,${PREFIX},,}/,}
 +
 +TOOLS_JARFILES=	resolver.jar stylebook-1.0-b2.jar bin/xjavac.jar
 +
 +post-extract:
 +	@cd ${WRKSRC} && ${MV} ../tools .
  
  do-build:
 -	@cd ${WRKSRC} && ${ANT} ${ANT_TARGETS}
 +	@cd ${WRKSRC} && ${SETENV} CLASSPATH=`echo ${TOOLS_JARFILES:S,^,tools/,} | ${TR} " " ":"` ${ANT} ${ANT_TARGETS}
  
  do-install:
 -	@${ECHO} -n ">> Installing JAR files in ${JARDIR}..."
 -	@cd ${WRKSRC}/build && ${CP} ${JARFILES} ${JARDIR}/
 +	@${ECHO} -n ">> Installing JAR files in ${JAVAJARDIR}..."
 +.for JARFILE in ${JARFILES}
 +	@cd ${WRKSRC}/build && ${CP} ${JARFILE} ${JAVAJARDIR}/
 +	@${ECHO} -n " ${JARFILE}"
 +.endfor
  	@${ECHO} " [ DONE ]"
  .if !defined(NOPORTDOCS)
  	@${ECHO} -n ">> Installing documentation in ${DOCSDIR}..."
  	@${MKDIR} ${DOCSDIR}
 -	@${CP} -r ${WRKSRC}/build/docs/javadocs/* ${DOCSDIR}
 +.for DIR in ${PORTDOCS}
 +	@cd ${WRKSRC}/build/docs/javadocs && ${CP} -r ${DIR} ${DOCSDIR}/
 +	@${ECHO} -n " ${DIR}"
 +.endfor
  	@${ECHO} " [ DONE ]"
  .endif
  
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 diff -ur xerces-j.original/distinfo xerces-j/distinfo
 --- xerces-j.original/distinfo	Wed Mar 24 02:21:22 2004
 +++ xerces-j/distinfo	Wed Mar 24 02:21:29 2004
 @@ -1 +1,2 @@
 -MD5 (Xerces-J-src.2.2.0.tar.gz) = a8ed81677a7f9c17160d4a9a6a5dcdc6
 +MD5 (Xerces-J-src.2.6.2.tar.gz) = cfd536b8d72f8ebe3465ae35f5e3775d
 +MD5 (Xerces-J-tools.2.6.2.tar.gz) = 55ba4b71ae95acf7d50c4bc0d796ee76
 Only in xerces-j.original: pkg-plist

From: Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
To: freebsd-gnats-submit@FreeBSD.org, znerd@FreeBSD.org
Cc:  
Subject: Re: ports/51415: Port textproc/xerces-j should be updated from 2.2.0 to 2.4.0
Date: Sat, 3 Apr 2004 23:18:06 +0200

 Some additional changes:
 
 - bsd.java.mk 2.0 compliant
 - ECHO -> ECHO_CMD
 - explicit mkdir JAVAJARDIR (just in case)
 - SIZE info :)
 - indent tweaking (I used 4 chars wide indents with the previoux patch)
 
 
 
 diff -ur xerces-j.original/Makefile xerces-j/Makefile
 --- xerces-j.original/Makefile	Sat Apr  3 22:52:47 2004
 +++ xerces-j/Makefile	Sat Apr  3 23:05:09 2004
 @@ -6,46 +6,69 @@
  #
  
  PORTNAME=	xerces-j
 -PORTVERSION=	2.2.0
 -PORTREVISION=	1
 +PORTVERSION=	2.6.2
  CATEGORIES=	textproc java
 -MASTER_SITES=	http://xml.apache.org/dist/xerces-j/old_xerces2/
 -DISTNAME=	Xerces-J-src.${PORTVERSION}
 +MASTER_SITES=	${MASTER_SITE_APACHE_XML}
 +MASTER_SITE_SUBDIR=	xerces-j/source
 +DISTFILES=	Xerces-J-src.${PORTVERSION}${EXTRACT_SUFX} Xerces-J-tools.${PORTVERSION}${EXTRACT_SUFX}
  
  MAINTAINER=	kevlo@FreeBSD.org
  COMMENT=	XML parser for Java
  
  BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/apache-ant
  
 -USE_JAVA=	1.3+
 +USE_JAVA=	yes
 +JAVA_VERSION=	1.3+
  
  WRKSRC=		${WRKDIR}/xerces-${PORTVERSION:S/./_/g}
 +
 +OPTIONS=	DEPRECATED_JARS "build/install the deprecated JARs" on \
 +		SAMPLES_JAR "build/install the samples" off
 +
 +.include <bsd.port.pre.mk>
 +
  ANT?=		${LOCALBASE}/bin/ant
 -.if defined(NOPORTDOCS)
 -ANT_TARGETS=	jar apijar
 -.else
 -ANT_TARGETS=	jar apijar javadocs
 -# We should install other documentation too, but
 -# we have no stylebook port yet
 -#
 -# ANT_TARGETS=	jar apijar docs javadocs
 +ANT_TARGETS=	jars
 +.if !defined(NOPORTDOCS)
 +ANT_TARGETS+=	javadocs #docs
 +PORTDOCS=	api dom3-api other xerces2 xni xs
 +.endif
 +
 +JARFILES+=	xercesImpl.jar xml-apis.jar
 +.if defined(WITH_DEPRECATED_JARS)
 +ANT_TARGETS+=	deprecatedjars
 +JARFILES+=	xerces.jar xmlParserAPIs.jar resolver.jar
 +.endif
 +.if defined(WITH_SAMPLES_JAR)
 +JARFILES+=	xercesSamples.jar
  .endif
 -JAVASHAREDIR=	${PREFIX}/share/java
 -JARDIR=		${JAVASHAREDIR}/classes
 -JARFILES=	xercesImpl.jar xmlParserAPIs.jar
 +
 +PLIST_FILES+=	${JARFILES:S,^,${JAVAJARDIR:S,${PREFIX},,}/,}
 +
 +TOOLS_JARFILES=	resolver.jar stylebook-1.0-b2.jar bin/xjavac.jar
 +
 +post-extract:
 +	@cd ${WRKSRC} && ${MV} ../tools .
  
  do-build:
 -	@cd ${WRKSRC} && ${ANT} ${ANT_TARGETS}
 +	@cd ${WRKSRC} && ${SETENV} CLASSPATH=`echo ${TOOLS_JARFILES:S,^,tools/,} | ${TR} " " ":"` ${ANT} ${ANT_TARGETS}
  
  do-install:
 -	@${ECHO} -n ">> Installing JAR files in ${JARDIR}..."
 -	@cd ${WRKSRC}/build && ${CP} ${JARFILES} ${JARDIR}/
 -	@${ECHO} " [ DONE ]"
 +	@${ECHO_CMD} -n ">> Installing JAR files in ${JAVAJARDIR}..."
 +	@${MKDIR} ${JAVAJARDIR}
 +.for JARFILE in ${JARFILES}
 +	@cd ${WRKSRC}/build && ${CP} ${JARFILE} ${JAVAJARDIR}/
 +	@${ECHO_CMD} -n " ${JARFILE}"
 +.endfor
 +	@${ECHO_CMD} " [ DONE ]"
  .if !defined(NOPORTDOCS)
 -	@${ECHO} -n ">> Installing documentation in ${DOCSDIR}..."
 +	@${ECHO_CMD} -n ">> Installing documentation in ${DOCSDIR}..."
  	@${MKDIR} ${DOCSDIR}
 -	@${CP} -r ${WRKSRC}/build/docs/javadocs/* ${DOCSDIR}
 -	@${ECHO} " [ DONE ]"
 +.for DOCFILE in ${PORTDOCS}
 +	@cd ${WRKSRC}/build/docs/javadocs && ${CP} -r ${DOCFILE} ${DOCSDIR}/
 +	@${ECHO_CMD} -n " ${DOCFILE}"
 +.endfor
 +	@${ECHO_CMD} " [ DONE ]"
  .endif
  
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 diff -ur xerces-j.original/distinfo xerces-j/distinfo
 --- xerces-j.original/distinfo	Sat Apr  3 22:52:47 2004
 +++ xerces-j/distinfo	Sat Apr  3 22:54:03 2004
 @@ -1,2 +1,4 @@
 -MD5 (Xerces-J-src.2.2.0.tar.gz) = a8ed81677a7f9c17160d4a9a6a5dcdc6
 -SIZE (Xerces-J-src.2.2.0.tar.gz) = 1434016
 +MD5 (Xerces-J-src.2.6.2.tar.gz) = cfd536b8d72f8ebe3465ae35f5e3775d
 +SIZE (Xerces-J-src.2.6.2.tar.gz) = 1612086
 +MD5 (Xerces-J-tools.2.6.2.tar.gz) = 55ba4b71ae95acf7d50c4bc0d796ee76
 +SIZE (Xerces-J-tools.2.6.2.tar.gz) = 3713041
 Only in xerces-j.original: pkg-plist

From: Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
To: freebsd-gnats-submit@FreeBSD.org, znerd@FreeBSD.org
Cc:  
Subject: Re: ports/51415: Port textproc/xerces-j should be updated from 2.2.0 to 2.4.0
Date: Thu, 8 Apr 2004 14:37:39 +0200

 Ernst,
 
 Kevlo has just drop maintainership of this port [1]. I am willing to take
 over this maintainership as I already provided this patch...
 
 Herve
 
 
 [1] http://www.freebsd.org/cgi/cvsweb.cgi/ports/textproc/xerces-j/Makefile
Responsible-Changed-From-To: kevlo->linimon 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Thu Apr 8 21:01:42 PDT 2004 
Responsible-Changed-Why:  
Help this port to find a new maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=51415 
State-Changed-From-To: open->closed 
State-Changed-By: linimon 
State-Changed-When: Thu Apr 8 22:55:09 PDT 2004 
State-Changed-Why:  
Committed, thanks.  Submitter is now the new maintainer. 

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