diff options
| author | Herve Quiroz <hq@FreeBSD.org> | 2004-08-25 15:36:57 +0000 |
|---|---|---|
| committer | Herve Quiroz <hq@FreeBSD.org> | 2004-08-25 15:36:57 +0000 |
| commit | 926132766aeda63abeda66d942fa1ca9f44a6ca7 (patch) | |
| tree | 9fc8dc48b30bb9c8af6ee6c494cd4d7e33680f5c /textproc | |
| parent | - Fix "make validate" problem when textproc/xhtml-basic is (diff) | |
- Unbreak port by patching build.xml
- bsd.java.mk 2.0 compliance
- ${CP} -> ${INSTALL_DATA}
- ${ECHO} -> ${ECHO_MSG}
- Use USE_ANT
- Use PLIST_FILES to remove pkg-plist
- Finer tuning of CLASSPATH (only xincluder.jar, not the whole ${JAVAJARDIR}
content)
PR: 70364
Submitted by: me
Approved by: glewis (mentor)
Notes
Notes:
svn path=/head/; revision=117261
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/ant-xinclude-task/Makefile | 37 | ||||
| -rw-r--r-- | textproc/ant-xinclude-task/files/patch-build.xml | 11 | ||||
| -rw-r--r-- | textproc/ant-xinclude-task/pkg-plist | 1 |
3 files changed, 28 insertions, 21 deletions
diff --git a/textproc/ant-xinclude-task/Makefile b/textproc/ant-xinclude-task/Makefile index dfb74956cd47..94263031dcfa 100644 --- a/textproc/ant-xinclude-task/Makefile +++ b/textproc/ant-xinclude-task/Makefile @@ -14,35 +14,32 @@ PKGNAMEPREFIX= ant- MAINTAINER= znerd@FreeBSD.org COMMENT= XInclude task for Jakarta Ant -BUILD_DEPENDS= ${ANT}:${PORTSDIR}/devel/apache-ant \ - ${JAVASHAREDIR}/classes/xincluder.jar:${PORTSDIR}/textproc/xincluder +BUILD_DEPENDS= ${JAVAJARDIR}/xincluder.jar:${PORTSDIR}/textproc/xincluder -BROKEN= Install fails +USE_JAVA= yes +JAVA_VERSION= 1.1+ +USE_ANT= yes -USE_JAVA= 1.1+ - -ANT?= ${LOCALBASE}/bin/ant -.if defined(NOPORTDOCS) -ANT_TARGET= jar -.else -ANT_TARGET= jar apidocs +ALL_TARGET= jar +.if !defined(NOPORTDOCS) +ALL_TARGET+= apidocs PORTDOCS= * .endif +MAKE_ENV+= CLASSPATH=${JAVAJARDIR}/xincluder.jar -do-build: - cd ${WRKSRC} && ${SETENV} ANT_INCLUDE_SHARED_JARS=YES ${ANT} ${ANT_TARGET} +PLIST_FILES+= %%JAVAJARDIR%%/${PORTNAME}.jar do-install: - - @${ECHO} -n ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..." - @${CP} ${WRKSRC}/build/${PORTNAME}.jar ${JAVAJARDIR}/ - @${ECHO} " [ DONE ]" + @${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..." + @${MKDIR} ${JAVAJARDIR} + @${INSTALL_DATA} ${WRKSRC}/build/${PORTNAME}.jar ${JAVAJARDIR}/ + @${ECHO_MSG} " [ DONE ]" .if !defined(NOPORTDOCS) - @${ECHO} -n ">> Installing documentation in ${DOCSDIR}..." - @${MKDIR} ${DOCSDIR} - @${CP} -r ${WRKSRC}/build/apidocs/* ${DOCSDIR} - @${ECHO} " [ DONE ]" + @${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..." + @cd ${WRKSRC}/build/apidocs && ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} ";" + @cd ${WRKSRC}/build/apidocs && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} ";" + @${ECHO_MSG} " [ DONE ]" .endif .include <bsd.port.mk> diff --git a/textproc/ant-xinclude-task/files/patch-build.xml b/textproc/ant-xinclude-task/files/patch-build.xml new file mode 100644 index 000000000000..ecc63dc1a554 --- /dev/null +++ b/textproc/ant-xinclude-task/files/patch-build.xml @@ -0,0 +1,11 @@ +--- build.xml.orig Thu Aug 12 12:17:41 2004 ++++ build.xml Thu Aug 12 12:20:10 2004 +@@ -144,8 +144,6 @@ + windowtitle="${javadoc.title}" + doctitle="${javadoc.title}" + bottom="${javadoc.footer}"> +- <link href="http://java.sun.com/j2se/${java.specification.version}/docs/api" /> +- <link href="http://people.FreeBSD.org/~znerd/ant15-apidocs" /> + </javadoc> + </target> + diff --git a/textproc/ant-xinclude-task/pkg-plist b/textproc/ant-xinclude-task/pkg-plist deleted file mode 100644 index 9012ce15c843..000000000000 --- a/textproc/ant-xinclude-task/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -share/java/classes/xinclude-task.jar |