From a5d126f540aaa6a801423e27709e0e9e455f2bdb Mon Sep 17 00:00:00 2001 From: Herve Quiroz Date: Thu, 9 Dec 2004 13:43:09 +0000 Subject: - Fix build: required JDK version is 1.4+ [1] - Link API documention with Jaxen API and JDK Standard API, if installed - Rephrase some statement to calm portlint Reported by: krion via pointyhat [1] --- textproc/jaxup/Makefile | 19 ++++++++++++++++--- textproc/jaxup/files/patch-build.xml | 13 +++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 textproc/jaxup/files/patch-build.xml diff --git a/textproc/jaxup/Makefile b/textproc/jaxup/Makefile index c21006e6d046..57fa0671c752 100644 --- a/textproc/jaxup/Makefile +++ b/textproc/jaxup/Makefile @@ -24,7 +24,7 @@ USE_ZIP= yes WRKSRC= ${WRKDIR}/${PORTNAME} USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.4+ DATADIR= ${JAVASHAREDIR}/${PORTNAME} @@ -42,6 +42,19 @@ PLIST_DIRS= %%DATADIR%% PORTDOCS= LICENSE.txt api index.html jaxup_files xupdate-wd.html xupdate-wd_files .endif +.include + +.if !defined(NOPORTDOCS) +JDK_API!= (${FIND} -s ${LOCALBASE}/share/doc/jdk1.[4-5] -maxdepth 1 -name api -type d 2>/dev/null || ${TRUE}) | ${TAIL} -n 1 +.if ${JDK_API} != "" +MAKE_ARGS+= -Dj2se.apidocs="${JDK_API}" +.endif +JAXEN_API!= (${FIND} -s ${LOCALBASE}/share/doc/jaxen -maxdepth 1 -name javadoc -type d 2>/dev/null || ${TRUE}) | ${TAIL} -n 1 +.if ${JAXEN_API} != "" +MAKE_ARGS+= -Djaxen.apidocs="${JAXEN_API}" +.endif +.endif + post-extract: @${CP} ${FILESDIR}/build.xml ${WRKSRC}/ @${CP} ${FILESDIR}/DOMXUpdater.java ${WRKDIR}/ @@ -55,7 +68,7 @@ post-build: cd ${WRKDIR} && ${JAR} -cmf MANIFEST jaxup-xupdater.jar DOMXUpdater.class do-install: - @${ECHO_MSG} -n ">> Installing JAR file as ${JAVAJARDIR}/${PORTNAME}.jar..." + @${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..." @${MKDIR} ${JAVAJARDIR} @${INSTALL_DATA} ${WRKSRC}/build/lib/${PORTNAME}.jar ${JAVAJARDIR}/ @${ECHO_MSG} " [ DONE ]" @@ -74,4 +87,4 @@ do-install: @${ECHO_MSG} " [ DONE ]" .endif -.include +.include diff --git a/textproc/jaxup/files/patch-build.xml b/textproc/jaxup/files/patch-build.xml new file mode 100644 index 000000000000..a1c00e37c6b8 --- /dev/null +++ b/textproc/jaxup/files/patch-build.xml @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- build.xml.orig Thu Dec 9 14:14:21 2004 ++++ build.xml Thu Dec 9 14:16:44 2004 +@@ -57,6 +57,8 @@ + + + ++ ++ + + + -- cgit v1.2.3