ports/69015: [MAINTAINER] textproc/xerces-j: change default behavior and update pkg-descr

[Herve Quiroz]

The following reply was made to PR ports/69015; it has been noted by GNATS.

From: Herve Quiroz <herve.quiroz at esil.univ-mrs.fr>
To: FreeBSD-gnats-submit at FreeBSD.org
Cc:  
Subject: Re: ports/69015: [MAINTAINER] textproc/xerces-j: change default behavior and update pkg-descr
Date: Tue, 13 Jul 2004 20:35:38 +0200

 --Kj7319i9nmIyA2yE
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 Just a quick fix: ECHO_CMD should be ECHO_MSG
 
 
 --Kj7319i9nmIyA2yE
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="mypatch.diff"
 
 --- Makefile.orig	Tue Jul 13 20:14:39 2004
 +++ Makefile	Tue Jul 13 20:14:18 2004
 @@ -7,6 +7,7 @@
  
  PORTNAME=	xerces-j
  PORTVERSION=	2.6.2
 +PORTREVISION=	1
  CATEGORIES=	textproc java
  MASTER_SITES=	${MASTER_SITE_APACHE_XML}
  MASTER_SITE_SUBDIR=	xerces-j/source
 @@ -23,7 +24,7 @@
  WRKSRC=		${WRKDIR}/xerces-${PORTVERSION:S/./_/g}
  
  OPTIONS=	DEPRECATED_JARS "build/install the deprecated JARs" on \
 -		SAMPLES_JAR "build/install the samples" off
 +		SAMPLES "build/install the samples" on
  
  .include <bsd.port.pre.mk>
  
 @@ -35,11 +36,11 @@
  .endif
  
  JARFILES+=	xercesImpl.jar xml-apis.jar
 -.if defined(WITH_DEPRECATED_JARS)
 +.if !defined(WITHOUT_DEPRECATED_JARS)
  ANT_TARGETS+=	deprecatedjars
  JARFILES+=	xerces.jar xmlParserAPIs.jar resolver.jar
  .endif
 -.if defined(WITH_SAMPLES_JAR)
 +.if !defined(WITHOUT_SAMPLES)
  JARFILES+=	xercesSamples.jar
  .endif
  
 @@ -51,24 +52,39 @@
  	@cd ${WRKSRC} && ${MV} ../tools .
  
  do-build:
 -	@cd ${WRKSRC} && ${SETENV} CLASSPATH=`echo ${TOOLS_JARFILES:S,^,tools/,} | ${TR} " " ":"` ${ANT} ${ANT_TARGETS}
 +	@cd ${WRKSRC} && \
 +		${SETENV} CLASSPATH=`echo ${TOOLS_JARFILES:S,^,tools/,} | \
 +		${TR} " " ":"` ${ANT} ${ANT_TARGETS}
  
  do-install:
 -	@${ECHO_CMD} -n ">> Installing JAR files in ${JAVAJARDIR}..."
 +	@${ECHO_MSG} -n ">> Installing JAR files in ${JAVAJARDIR}..."
  	@${MKDIR} ${JAVAJARDIR}
  .for JARFILE in ${JARFILES}
 -	@cd ${WRKSRC}/build && ${CP} ${JARFILE} ${JAVAJARDIR}/
 -	@${ECHO_CMD} -n " ${JARFILE}"
 +	@cd ${WRKSRC}/build && ${INSTALL_DATA} ${JARFILE} ${JAVAJARDIR}/${JARFILE}
 +	@${ECHO_MSG} -n " ${JARFILE}"
  .endfor
 -	@${ECHO_CMD} " [ DONE ]"
 +	@${ECHO_MSG} " [ DONE ]"
  .if !defined(NOPORTDOCS)
 -	@${ECHO_CMD} -n ">> Installing documentation in ${DOCSDIR}..."
 -	@${MKDIR} ${DOCSDIR}
 -.for DOCFILE in ${PORTDOCS}
 -	@cd ${WRKSRC}/build/docs/javadocs && ${CP} -r ${DOCFILE} ${DOCSDIR}/
 -	@${ECHO_CMD} -n " ${DOCFILE}"
 -.endfor
 -	@${ECHO_CMD} " [ DONE ]"
 +	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
 +	@cd ${WRKSRC}/build/docs/javadocs && \
 +		${FIND} ${PORTDOCS} -type d -exec ${MKDIR} "${DOCSDIR}/{}" \; && \
 +		${FIND} ${PORTDOCS} -not -type d -exec ${INSTALL_DATA} "{}" "${DOCSDIR}/{}" \;
 +	@${ECHO_MSG} " [ DONE ]"
 +.endif
 +.if !defined(WITHOUT_SAMPLES)
 +	@${ECHO_MSG} -n ">> Installing samples in ${EXAMPLESDIR}..."
 +	@cd ${WRKSRC}/samples && \
 +		${FIND} . -type d -exec ${MKDIR} "${EXAMPLESDIR}/{}" \; && \
 +		${FIND} . -not -type d -exec ${INSTALL_DATA} "{}" "${EXAMPLESDIR}/{}" \;
 +	@${ECHO_MSG} " [ DONE ]"
 +.endif
 +
 +.if !defined(WITHOUT_SAMPLES)
 +post-install:
 +	@${FIND} -s ${WRKSRC}/samples -not -type d | \
 +		${SED} -ne 's,^${WRKSRC}/samples,${EXAMPLESDIR:S,${PREFIX}/,,},p' >> ${TMPPLIST}
 +	@${FIND} -s -d ${WRKSRC}/samples -type d | \
 +		${SED} -ne 's,^${WRKSRC}/samples, at dirrm ${EXAMPLESDIR:S,${PREFIX}/,,},p' >> ${TMPPLIST}
  .endif
  
  .include <bsd.port.post.mk>
 
 --Kj7319i9nmIyA2yE--