From owner-freebsd-java@FreeBSD.ORG Tue Jan 20 06:20:52 2004 Return-Path: Delivered-To: freebsd-java@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 79B8116A4CE for ; Tue, 20 Jan 2004 06:20:52 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A304543D3F for ; Tue, 20 Jan 2004 06:20:14 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i0KEKEFR058287 for ; Tue, 20 Jan 2004 06:20:14 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i0KEKE5S058286; Tue, 20 Jan 2004 06:20:14 -0800 (PST) (envelope-from gnats) Date: Tue, 20 Jan 2004 06:20:14 -0800 (PST) Message-Id: <200401201420.i0KEKE5S058286@freefall.freebsd.org> To: freebsd-java@FreeBSD.org From: Herve Quiroz Subject: Re: java/61357: Fix port: java/jakarta-commons-cli X-BeenThere: freebsd-java@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Herve Quiroz List-Id: Porting Java to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Jan 2004 14:20:52 -0000 The following reply was made to PR java/61357; it has been noted by GNATS. From: Herve Quiroz To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: Re: java/61357: Fix port: java/jakarta-commons-cli Date: Tue, 20 Jan 2004 15:17:42 +0100 --17pEHd4RhPHOinZp Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 --17pEHd4RhPHOinZp Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="port-commons-cli-PORTDOCS.diff" diff -ur jakarta-commons-cli.original/Makefile jakarta-commons-cli/Makefile --- jakarta-commons-cli.original/Makefile Mon Jan 19 01:25:07 2004 +++ jakarta-commons-cli/Makefile Mon Jan 19 01:36:43 2004 @@ -35,9 +35,13 @@ JARFILE= ${PORTNAME}-${PORTVERSION}-beta-2-dev.jar DESTJARFILE= ${PORTNAME}.jar +.if !defined(NOPORTDOCS) +PORTDOCS= ${WRKSRC}/target/docs/apidocs +.endif + do-build: @${MKDIR} ${WRKSRC}/lib - @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}..." diff -ur jakarta-commons-cli.original/pkg-plist jakarta-commons-cli/pkg-plist --- jakarta-commons-cli.original/pkg-plist Mon Jan 19 01:25:07 2004 +++ jakarta-commons-cli/pkg-plist Mon Jan 19 01:37:01 2004 @@ -1,59 +1 @@ -share/doc/commons-cli/org/apache/commons/cli/class-use/MissingOptionException.html -share/doc/commons-cli/org/apache/commons/cli/class-use/OptionGroup.html -share/doc/commons-cli/org/apache/commons/cli/class-use/Parser.html -share/doc/commons-cli/org/apache/commons/cli/class-use/BasicParser.html -share/doc/commons-cli/org/apache/commons/cli/class-use/ParseException.html -share/doc/commons-cli/org/apache/commons/cli/class-use/UnrecognizedOptionException.html -share/doc/commons-cli/org/apache/commons/cli/class-use/HelpFormatter.html -share/doc/commons-cli/org/apache/commons/cli/class-use/HelpFormatter.StringBufferComparator.html -share/doc/commons-cli/org/apache/commons/cli/class-use/OptionBuilder.html -share/doc/commons-cli/org/apache/commons/cli/class-use/AlreadySelectedException.html -share/doc/commons-cli/org/apache/commons/cli/class-use/MissingArgumentException.html -share/doc/commons-cli/org/apache/commons/cli/class-use/GnuParser.html -share/doc/commons-cli/org/apache/commons/cli/class-use/Options.html -share/doc/commons-cli/org/apache/commons/cli/class-use/PosixParser.html -share/doc/commons-cli/org/apache/commons/cli/class-use/Option.html -share/doc/commons-cli/org/apache/commons/cli/class-use/CommandLine.html -share/doc/commons-cli/org/apache/commons/cli/class-use/PatternOptionBuilder.html -share/doc/commons-cli/org/apache/commons/cli/class-use/CommandLineParser.html -share/doc/commons-cli/org/apache/commons/cli/class-use/TypeHandler.html -share/doc/commons-cli/org/apache/commons/cli/package-use.html -share/doc/commons-cli/org/apache/commons/cli/package-summary.html -share/doc/commons-cli/org/apache/commons/cli/package-tree.html -share/doc/commons-cli/org/apache/commons/cli/package-frame.html -share/doc/commons-cli/org/apache/commons/cli/CommandLineParser.html -share/doc/commons-cli/org/apache/commons/cli/BasicParser.html -share/doc/commons-cli/org/apache/commons/cli/CommandLine.html -share/doc/commons-cli/org/apache/commons/cli/GnuParser.html -share/doc/commons-cli/org/apache/commons/cli/HelpFormatter.html -share/doc/commons-cli/org/apache/commons/cli/HelpFormatter.StringBufferComparator.html -share/doc/commons-cli/org/apache/commons/cli/Option.html -share/doc/commons-cli/org/apache/commons/cli/OptionBuilder.html -share/doc/commons-cli/org/apache/commons/cli/OptionGroup.html -share/doc/commons-cli/org/apache/commons/cli/Options.html -share/doc/commons-cli/org/apache/commons/cli/Parser.html -share/doc/commons-cli/org/apache/commons/cli/PatternOptionBuilder.html -share/doc/commons-cli/org/apache/commons/cli/PosixParser.html -share/doc/commons-cli/org/apache/commons/cli/TypeHandler.html -share/doc/commons-cli/org/apache/commons/cli/AlreadySelectedException.html -share/doc/commons-cli/org/apache/commons/cli/MissingArgumentException.html -share/doc/commons-cli/org/apache/commons/cli/MissingOptionException.html -share/doc/commons-cli/org/apache/commons/cli/ParseException.html -share/doc/commons-cli/org/apache/commons/cli/UnrecognizedOptionException.html -share/doc/commons-cli/serialized-form.html -share/doc/commons-cli/packages.html -share/doc/commons-cli/package-list -share/doc/commons-cli/overview-tree.html -share/doc/commons-cli/index.html -share/doc/commons-cli/index-all.html -share/doc/commons-cli/help-doc.html -share/doc/commons-cli/deprecated-list.html -share/doc/commons-cli/stylesheet.css -share/doc/commons-cli/allclasses-frame.html share/java/classes/commons-cli.jar -@dirrm share/doc/commons-cli/org/apache/commons/cli/class-use -@dirrm share/doc/commons-cli/org/apache/commons/cli -@dirrm share/doc/commons-cli/org/apache/commons -@dirrm share/doc/commons-cli/org/apache -@dirrm share/doc/commons-cli/org -@dirrm share/doc/commons-cli --17pEHd4RhPHOinZp--