Date: Mon, 8 Mar 2004 14:41:10 +0100 (CET) From: Herve Quiroz <herve.quiroz@esil.univ-mrs.fr> To: FreeBSD-gnats-submit@FreeBSD.org Subject: java/63928: Update port: java/jakarta-commons-logging [PATCH] Message-ID: <200403081341.i28DfANJ017389@arabica.esil.univ-mrs.fr> Resent-Message-ID: <200403081350.i28Do7GE056993@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 63928 >Category: java >Synopsis: Update port: java/jakarta-commons-logging [PATCH] >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-java >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Mar 08 05:50:06 PST 2004 >Closed-Date: >Last-Modified: >Originator: Herve Quiroz <herve.quiroz@esil.univ-mrs.fr> >Release: FreeBSD 5.2.1-RELEASE i386 >Organization: >Environment: System: FreeBSD arabica.esil.univ-mrs.fr 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE #0: Fri Feb 27 11:36:17 CET 2004 root@arabica.esil.univ-mrs.fr:/usr/obj/usr/src/sys/ASSIMILATED i386 >Description: Changes: - Now using PORTDOCS macro for automated PLIST build (should fix the deinstall issue) - Now using OPTIONS macro for dependency setting: - WITH_LOG4J: Enable Jakarta Log4j log factory (default: on) - WITH_LOGKIT: Enable Avalon LogKit log factory (default: off) - WITH_JDK14LOG: Enable JDK 1.4 log factory (default: off) - Changed Ant target 'dist' to 'compile' (to produce only JAR when NOPORTDOCS is set) - Now using Ant target 'javadoc' (see above) - Fixed an issue with shared JARs not in classpath (by setting ANT_INCLUDE_SHARED_JARS=YES) NOTE: The OPTIONS macro will not ensure that optional components will not be built (they will be if the right dependency is already installed) but rather that dependencies are correctly set. NOTE2: I was thinking of using a PKGNAMESUFFIX according to optional dependencies. Here are my two cents on the subject: - '-minimal' when everything in turned off - '-all' when everything inturned on - a minus-separated list of optional comonents (eg: '-log4j-logkit' or '-jdk14') otherwise NOTE3: I think we should really do something for the ANT_INCLUDE_SHARED_JARS issue. Maybe defining ANT macros in bsd.java.mk 2.0 would be fine. A PR is on the way: http://www.freebsd.org/cgi/query-pr.cgi?pr=59997 >How-To-Repeat: >Fix: diff -ur jakarta-commons-logging.original/Makefile jakarta-commons-logging/Makefile --- jakarta-commons-logging.original/Makefile Mon Mar 8 01:51:36 2004 +++ jakarta-commons-logging/Makefile Mon Mar 8 03:14:16 2004 @@ -15,18 +15,36 @@ MAINTAINER= znerd@FreeBSD.org COMMENT= Generic logging wrapper library -BUILD_DEPENDS= ${ANT}:${PORTSDIR}/devel/apache-ant \ - ${LOCALBASE}/share/java/classes/log4j.jar:${PORTSDIR}/java/jakarta-log4j +BUILD_DEPENDS= ${ANT}:${PORTSDIR}/devel/apache-ant -USE_JAVA= 1.2+ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src +OPTIONS= LOG4J "Enable Jakarta Log4j log factory" on \ + LOGKIT "Enable Avalon LogKit log factory" off \ + JDK14LOG "Enable JDK 1.4 log factory" off + +.include <bsd.port.pre.mk> + +.if defined(WITH_JDK14LOG) +USE_JAVA= 1.4+ +.else +USE_JAVA= 1.2+ +.endif + +.if defined(WITH_LOG4J) +BUILD_DEPENDS+= ${LOCALBASE}/share/java/classes/log4j.jar:${PORTSDIR}/java/jakarta-log4j +.endif + +.if defined(WITH_LOGKIT) +BUILD_DEPENDS+= ${LOCALBASE}/share/java/classes/logkit.jar:${PORTSDIR}/java/avalon-logkit +.endif + PLIST_SUB+= T=${TARGET_DIR:S/^${PREFIX}\///} ANT?= ${LOCALBASE}/bin/ant -.if defined(NOPORTDOCS) -ANT_TARGET= dist -.else -ANT_TARGET= dist +ANT_TARGET= compile +.if !defined(NOPORTDOCS) +ANT_TARGET= javadoc +PORTDOCS= * .endif JAVASHAREDIR= ${PREFIX}/share/java JARDIR= ${JAVASHAREDIR}/classes @@ -37,11 +55,11 @@ @${CP} ${PORTSDIR}/java/jakarta-commons-beanutils/files/LICENSE ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src/ do-build: - @cd ${WRKSRC} && ${ANT} ${ANT_TARGET} + @cd ${WRKSRC} && ${SETENV} ANT_INCLUDE_SHARED_JARS=YES ${ANT} ${ANT_TARGET} do-install: @${ECHO} -n ">> Installing JAR as ${JARDIR}/${DESTJARFILE}..." - @${CP} ${WRKSRC}/dist/${JARFILE} ${JARDIR}/${DESTJARFILE} + @${CP} ${WRKSRC}/target/${JARFILE} ${JARDIR}/${DESTJARFILE} @${ECHO} " [ DONE ]" .if !defined(NOPORTDOCS) @@ -51,4 +69,4 @@ @${ECHO} " [ DONE ]" .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff -ur jakarta-commons-logging.original/pkg-plist jakarta-commons-logging/pkg-plist --- jakarta-commons-logging.original/pkg-plist Mon Mar 8 01:51:36 2004 +++ jakarta-commons-logging/pkg-plist Mon Mar 8 03:11:34 2004 @@ -1,37 +1 @@ -share/doc/commons-logging/org/apache/commons/logging/impl/SimpleLog.html -share/doc/commons-logging/org/apache/commons/logging/impl/package-tree.html -share/doc/commons-logging/org/apache/commons/logging/impl/package-frame.html -share/doc/commons-logging/org/apache/commons/logging/impl/Jdk14Logger.html -share/doc/commons-logging/org/apache/commons/logging/impl/Log4JCategoryLog.html -share/doc/commons-logging/org/apache/commons/logging/impl/Log4jFactory.html -share/doc/commons-logging/org/apache/commons/logging/impl/Log4JLogger.html -share/doc/commons-logging/org/apache/commons/logging/impl/LogFactoryImpl.html -share/doc/commons-logging/org/apache/commons/logging/impl/LogKitLogger.html -share/doc/commons-logging/org/apache/commons/logging/impl/NoOpLog.html -share/doc/commons-logging/org/apache/commons/logging/impl/package-summary.html -share/doc/commons-logging/org/apache/commons/logging/package-tree.html -share/doc/commons-logging/org/apache/commons/logging/package-frame.html -share/doc/commons-logging/org/apache/commons/logging/Log.html -share/doc/commons-logging/org/apache/commons/logging/LogFactory.html -share/doc/commons-logging/org/apache/commons/logging/LogSource.html -share/doc/commons-logging/org/apache/commons/logging/package-summary.html -share/doc/commons-logging/org/apache/commons/logging/LogConfigurationException.html -share/doc/commons-logging/serialized-form.html -share/doc/commons-logging/packages.html -share/doc/commons-logging/package-list -share/doc/commons-logging/overview-tree.html -share/doc/commons-logging/overview-summary.html -share/doc/commons-logging/overview-frame.html -share/doc/commons-logging/index.html -share/doc/commons-logging/index-all.html -share/doc/commons-logging/help-doc.html -share/doc/commons-logging/deprecated-list.html -share/doc/commons-logging/stylesheet.css -share/doc/commons-logging/allclasses-frame.html share/java/classes/commons-logging.jar -@dirrm share/doc/commons-logging/org/apache/commons/logging/impl -@dirrm share/doc/commons-logging/org/apache/commons/logging -@dirrm share/doc/commons-logging/org/apache/commons -@dirrm share/doc/commons-logging/org/apache -@dirrm share/doc/commons-logging/org -@dirrm share/doc/commons-logging >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200403081341.i28DfANJ017389>