- Update to 4.3.0

- Handles conflicts with textproc/xerces-j
- Fixed download location
- bsd.java.mk 2.0 compliant
- Removed pkg-plist (38K)
- Install samples
- Updated pkg-descr
- Respect NOPORTDOCS

PR:		ports/69055
Submitted by:	Herve Quiroz

1 files changed, 51 insertions, 11 deletions

diff --git a/textproc/xml4j/Makefile b/textproc/xml4j/Makefile
index 03a0d7dde78c..84a35f82259c 100644
--- a/textproc/xml4j/Makefile
+++ b/textproc/xml4j/Makefile
@@ -6,25 +6,65 @@
 #
 
 PORTNAME=	xml4j
-PORTVERSION=	3.1.1
+PORTVERSION=	4.3.0
 CATEGORIES=	textproc
-MASTER_SITES=	http://www.alphaworks.ibm.com/aw.nsf/download/xml4j/
-DISTNAME=	XML4J-J-bin.${PORTVERSION}
+MASTER_SITES=	http://dl.alphaworks.ibm.com/technologies/xml4j/
+DISTNAME=	XML4J-bin.${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XML for Java parser
 
-WRKSRC=		${WRKDIR}/XML4J-3_1_1
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/./_/g}
+USE_JAVA=	yes
+JAVA_VERSION=	1.2+
 NO_BUILD=	YES
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
-JAVASUBDIR=	jdk1.1.8
-DIR=		${PREFIX}/share/java
+CONFLICTS=	xerces-j-2.*
+
+SAMPLES=	dom sax simpletype socket ui xni xs
+PORTDOCS=	*.html graphics images javadocs resources
+JARFILES=	resolver.jar xercesImpl.jar xercesSamples.jar xml-apis.jar xmlParserAPIs.jar
+DATAFILES=	personal-schema.xml personal.dtd personal.xml personal.xsd
+
+PLIST_FILES=	${JARFILES:S,^,%%JAVAJARDIR%%/,} \
+		${DATAFILES:S,^,%%DATADIR%%/,}
+PLIST_DIRS=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${DIR}/classes
-	@(cd ${WRKSRC} && ${INSTALL_DATA} xml4j.jar xerces.jar xercesSamples.jar ${DIR}/classes)
-	@${MKDIR} ${DIR}/xml4j
-	@(cd ${WRKSRC} && ${INSTALL_DATA} Readme.html ${DIR}/xml4j)
-	@(cd ${WRKSRC} && ${CP} -R data docs ${DIR}/xml4j)
+	@${MKDIR} ${JAVAJARDIR}
+	@${ECHO_MSG} -n ">> Installing JAR in ${JAVAJARDIR}..."
+	@cd ${WRKSRC} && \
+		${INSTALL_DATA} ${JARFILES} ${JAVAJARDIR}/
+	@${ECHO_MSG} " [ DONE ]"
+	@${ECHO_MSG} -n ">> Installing data in ${DATADIR}..."
+	@${MKDIR} ${DATADIR}
+	@cd ${WRKSRC}/data && \
+		${INSTALL_DATA} ${DATAFILES} ${DATADIR}/
+	@${ECHO_MSG} " [ DONE ]"
+.if !defined(NOPORTDOCS)
+	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
+	@${MKDIR} ${DOCSDIR}
+	@cd ${WRKSRC}/docs && \
+		${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${DOCSDIR}/{} \;
+	@cd ${WRKSRC}/docs && \
+		${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
+	@${ECHO_MSG} " [ DONE ]"
+	@${ECHO_MSG} -n ">> Installing samples in ${EXAMPLESDIR}..."
+	@${MKDIR} ${EXAMPLESDIR}
+	@cd ${WRKSRC}/samples && \
+		${FIND} ${SAMPLES} -type d -exec ${MKDIR} ${EXAMPLESDIR}/{} \;
+	@cd ${WRKSRC}/samples && \
+		${FIND} ${SAMPLES} -type f -exec ${INSTALL_DATA} {} ${EXAMPLESDIR}/{} \;
+	@${ECHO_MSG} " [ DONE ]"
+.endif
+
+.if !defined(NOPORTDOCS)
+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,@dirrm ${EXAMPLESDIR:S,${PREFIX}/,,},p' >> ${TMPPLIST}
+.endif
 
 .include <bsd.port.mk>