Summary: | Fix port: java/jakarta-commons-cli | ||||||
---|---|---|---|---|---|---|---|
Product: | Base System | Reporter: | Hervé Quiroz <herve.quiroz> | ||||
Component: | java | Assignee: | Ernst de Haan <znerd> | ||||
Status: | Closed FIXED | ||||||
Severity: | Affects Only Me | ||||||
Priority: | Normal | ||||||
Version: | 5.1-RELEASE | ||||||
Hardware: | Any | ||||||
OS: | Any | ||||||
Attachments: |
|
Description
Hervé Quiroz
2004-01-14 12:00:26 UTC
Okay, I have a fix with PORTDOCS macro (for Javadoc issues) and Ant classpath issues. Unfortunately, I'm too late to submit the patch right now. I'll commit tomorrow (hopefuly). Herve Here is the patch. What it changes: - use the PORTDOCS macro to build dynamically pkg-plist (no more Javadoc 1.3/1.4 issues hopefully, and pkg-plist is now one line long) - define the ANT_INCLUDE_SHARED_JARS variable so Ant now correctly gets JARs from ${JAVAJARDIR} No need for a binary port after all. Herve Responsible Changed From-To: freebsd-java->znerd Over to maintainer. State Changed From-To: open->feedback Does the maintainer approve of the changes in this PR? State Changed From-To: feedback->closed Committed, thanks! PORTDOCS must be relative to DOCSDIR. -Oliver On Fri, Apr 16, 2004 at 04:40:42AM +0200, Oliver Eikemeier wrote:
> PORTDOCS must be relative to DOCSDIR.
>
> -Oliver
Indeed.
Here is a patch:
- Fix PORTDOCS
- bsd.java.mk 2.0 compliant
- Removed pkg-plist
- Done some cleanning (PLIST_SUB statement)
Herve
diff -ur jakarta-commons-cli.original/Makefile jakarta-commons-cli/Makefile
--- jakarta-commons-cli.original/Makefile Fri Apr 16 08:50:05 2004
+++ jakarta-commons-cli/Makefile Fri Apr 16 08:56:10 2004
@@ -20,10 +20,10 @@
BUILD_DEPENDS= ${ANT}:${PORTSDIR}/devel/apache-ant \
${LOCALBASE}/share/java/classes/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang
-USE_JAVA= 1.2+
+USE_JAVA= yes
+JAVA_VERSION= 1.2+
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-PLIST_SUB+= T=${TARGET_DIR:S/^${PREFIX}\///}
ANT?= ${LOCALBASE}/bin/ant
.if defined(NOPORTDOCS)
ANT_TARGET= jar -Dnoget
@@ -34,9 +34,10 @@
JARDIR= ${JAVASHAREDIR}/classes
JARFILE= ${PORTNAME}-${PORTVERSION}-beta-2-dev.jar
DESTJARFILE= ${PORTNAME}.jar
+PLIST_FILES+= ${JAVAJARDIR:S,^${PREFIX}/,,}/${DESTJARFILE}
.if !defined(NOPORTDOCS)
-PORTDOCS= ${WRKSRC}/target/docs/apidocs
+PORTDOCS= apidocs LICENSE.txt
.endif
do-build:
@@ -51,7 +52,8 @@
.if !defined(NOPORTDOCS)
@${ECHO} -n ">> Installing documentation in ${DOCSDIR}..."
@${MKDIR} ${DOCSDIR}
- @${CP} -r ${WRKSRC}/target/docs/apidocs/* ${DOCSDIR}
+ @${CP} -r ${WRKSRC}/target/docs/apidocs ${DOCSDIR}/
+ @${CP} -r ${WRKSRC}/LICENSE.txt ${DOCSDIR}/
@${ECHO} " [ DONE ]"
.endif
Only in jakarta-commons-cli.original: pkg-plist
State Changed From-To: closed->open Re-opened. State Changed From-To: open->closed Committed, thanks! |