3 files changed, 31 insertions, 25 deletions

diff --git a/textproc/xerces-j/Makefile b/textproc/xerces-j/Makefile
index c739ea6ccfd5..f3b05c45ce26 100644
--- a/textproc/xerces-j/Makefile
+++ b/textproc/xerces-j/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xerces-j
-PORTVERSION=	2.6.2
-PORTREVISION=	1
+PORTVERSION=	2.7.1
 CATEGORIES=	textproc java
 MASTER_SITES=	${MASTER_SITE_APACHE_XML}
 MASTER_SITE_SUBDIR=	xerces-j/source
@@ -27,21 +26,22 @@ WRKSRC=		${WRKDIR}/xerces-${PORTVERSION:S/./_/g}
 OPTIONS=	DEPRECATED_JARS "build/install the deprecated JARs" on \
 		SAMPLES "build/install the samples" on
 
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
+
 .include <bsd.port.pre.mk>
 
 ALL_TARGET=	jars
 .if !defined(NOPORTDOCS)
-ALL_TARGET+=	javadocs #docs
-PORTDOCS=	api dom3-api other xerces2 xni xs
+ALL_TARGET+=	javadocs docs
+PORTDOCS=	*
 .endif
 
 JARFILES+=	xercesImpl.jar xml-apis.jar
 .if !defined(WITHOUT_DEPRECATED_JARS)
 ALL_TARGET+=	deprecatedjars
-JARFILES+=	xerces.jar xmlParserAPIs.jar resolver.jar
-.endif
-.if !defined(WITHOUT_SAMPLES)
-JARFILES+=	xercesSamples.jar
+DEPRECATED_JARFILES=	xerces.jar xercesSamples.jar
+PLIST_FILES+=	${DEPRECATED_JARFILES:S,^,%%DATADIR%%/deprecated/,}
+PLIST_DIRS+=	%%DATADIR%%/deprecated %%DATADIR%%
 .endif
 
 PLIST_FILES+=	${JARFILES:S,^,%%JAVAJARDIR%%/,}
@@ -55,17 +55,25 @@ post-extract:
 
 do-install:
 	@${ECHO_MSG} -n ">> Installing JAR files in ${JAVAJARDIR}..."
-	@${MKDIR} ${JAVAJARDIR}
 .for JARFILE in ${JARFILES}
 	@cd ${WRKSRC}/build && ${INSTALL_DATA} ${JARFILE} ${JAVAJARDIR}/${JARFILE}
 	@${ECHO_MSG} -n " ${JARFILE}"
 .endfor
 	@${ECHO_MSG} " [ DONE ]"
+.if !defined(WITHOUT_DEPRECATED_JARS)
+	@${ECHO_MSG} -n ">> Installing deprecated JAR files in ${DATADIR}/deprecated/..."
+	@${MKDIR} ${DATADIR}/deprecated
+.for JARFILE in ${DEPRECATED_JARFILES}
+	@cd ${WRKSRC}/build && ${INSTALL_DATA} ${JARFILE} ${DATADIR}/deprecated/${JARFILE}
+	@${ECHO_MSG} -n " ${JARFILE}"
+.endfor
+	@${ECHO_MSG} " [ DONE ]"
+.endif
 .if !defined(NOPORTDOCS)
 	@${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}/{}" \;
+	@cd ${WRKSRC}/build/docs/ && \
+		${FIND} . -type d -exec ${MKDIR} "${DOCSDIR}/{}" \; && \
+		${FIND} . -not -type d -exec ${INSTALL_DATA} "{}" "${DOCSDIR}/{}" \;
 	@${ECHO_MSG} " [ DONE ]"
 .endif
 .if !defined(WITHOUT_SAMPLES)
diff --git a/textproc/xerces-j/distinfo b/textproc/xerces-j/distinfo
index 394301a793d2..6cbdfd1c89e3 100644
--- a/textproc/xerces-j/distinfo
+++ b/textproc/xerces-j/distinfo
@@ -1,4 +1,6 @@
-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
+MD5 (Xerces-J-src.2.7.1.tar.gz) = 487701cad13bcf87cec21ed2d782ca45
+SHA256 (Xerces-J-src.2.7.1.tar.gz) = c0fc556874508b70e31a0a202d1c3e189a0904a6c62563837cdb8b1d9202fd48
+SIZE (Xerces-J-src.2.7.1.tar.gz) = 1688121
+MD5 (Xerces-J-tools.2.7.1.tar.gz) = 62848744d8277b597f073fdfecd35967
+SHA256 (Xerces-J-tools.2.7.1.tar.gz) = ab67e5693612598417b3582623cc7b34cb54fbdedafd4831d9b3ca6a8b2583c1
+SIZE (Xerces-J-tools.2.7.1.tar.gz) = 3947427
diff --git a/textproc/xerces-j/pkg-descr b/textproc/xerces-j/pkg-descr
index 12b9b566ae0b..4e1e7c446f81 100644
--- a/textproc/xerces-j/pkg-descr
+++ b/textproc/xerces-j/pkg-descr
@@ -1,7 +1,8 @@
-The Xerces Java Parser supports XML 1.0 recommendation and contains advanced
-parser functionality, such as XML Schema, DOM Level 2 version 1.0, and SAX
-Version 2, in addition to supporting the industry-standard DOM Level 1 and SAX
-version 1 APIs.
+The Xerces Java Parser is a complete implementation of the parser related
+portions of JAXP 1.3 and also brings Xerces into compliance with SAX 2.0.2, the
+DOM Level 3 Core and Load/Save W3C Recommendations, the XML Inclusions
+(XInclude) Version 1.0 W3C Recommendation and the XML Schema 1.0 Structures and
+Datatypes Second Edition W3C Recommendations.
 
 Xerces2 is the next generation of high performance, fully compliant XML parsers
 in the Apache Xerces family. This version of Xerces introduces the Xerces
@@ -12,9 +13,4 @@ The Apache Xerces2 parser is the reference implementation of XNI but other
 parser components, configurations, and parsers can be written using the Xerces
 Native Interface.
 
-Xerces2 also provides an experimental implementation of the Document Object
-Model Level 3 Core and Load/Save Proposed Recommendations and provides a
-partial implementation of the XML Inclusions (XInclude) W3C Working Draft in
-Last Call. It also provides support for OASIS XML Catalogs.
-
 WWW: http://xml.apache.org/xerces2-j/