Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 Dec 2010 23:27:51 -0800 (PST)
From:      Greg Lewis <glewis@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        hq@FreeBSD.org
Subject:   ports/152767: [PATCH] java/jakarta-commons-cli: update to 1.2
Message-ID:  <201012020727.oB27Rpea042006@misty.eyesbeyond.com>
Resent-Message-ID: <201012020730.oB27UBtv019091@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         152767
>Category:       ports
>Synopsis:       [PATCH] java/jakarta-commons-cli: update to 1.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 02 07:30:11 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Greg Lewis
>Release:        FreeBSD 8.1-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD misty.eyesbeyond.com 8.1-RELEASE-p1 FreeBSD 8.1-RELEASE-p1 #0: Mon Nov 15 22:55:42 PST 2010
>Description:
- Update to 1.2

Herve, I haven't yet tested the packages that depend on commons-cli.  Is
the best test just to start them up?  I assume that use commons-cli for
command line option parsing.  Please let me know if there is a better
test I can do.

Also, I changed to using the pre-compiled JAR since 1.2 required Maven
to build and I wasn't sure how much infrastructure we have in place to
do that yet.  We can do the compile from source instead if that is
feasible (although I'm beginning to wonder about the point of it, since
the source is included in the binary distribution if you want to examine
it).

Port maintainer (hq@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- jakarta-commons-cli-1.2,1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /var/fcvs/ports/java/jakarta-commons-cli/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile	6 Jun 2008 13:38:38 -0000	1.14
+++ Makefile	2 Dec 2010 07:13:37 -0000
@@ -6,53 +6,44 @@
 #
 
 PORTNAME=	commons-cli
-PORTVERSION=	1.0
-PORTREVISION=	2
+PORTVERSION=	1.2
 PORTEPOCH=	1
 CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}
+MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_BINARIES}
 MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
 PKGNAMEPREFIX=	jakarta-
-DISTNAME=	cli-${PORTVERSION}-src
+DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
 MAINTAINER=	hq@FreeBSD.org
 COMMENT=	Java library for command line arguments and options
 
-BUILD_DEPENDS=	${JAVALIBDIR}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang
+LICENSE=	ASL
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.2+
+NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USE_ANT=	yes
-MAKE_ENV+=	ANT_INCLUDE_SHARED_JARS=YES
-MAKE_ARGS=	-Dnoget=yes
-ALL_TARGET=	jar
-.if !defined(NOPORTDOCS)
-ALL_TARGET+=	javadoc
-.endif
-
-JARFILE=	${PORTNAME}-${PORTVERSION}-beta-2-dev.jar
+JARFILE=	${PORTNAME}-${PORTVERSION}.jar
 DESTJARFILE=	${PORTNAME}.jar
 PLIST_FILES=	%%JAVAJARDIR%%/${DESTJARFILE}
 .if !defined(NOPORTDOCS)
-PORTDOCS=	apidocs LICENSE.txt
+PORTDOCS=	*
+DOC_FILES=	LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
 .endif
 
-post-extract:
-	@${MKDIR} ${WRKSRC}/lib
-
 do-install:
 	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${DESTJARFILE}..."
-	@${INSTALL_DATA} ${WRKSRC}/target/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE}
+	@${INSTALL_DATA} ${WRKSRC}/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE}
 	@${ECHO_MSG} " [ DONE ]"
 .if !defined(NOPORTDOCS)
 	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
-	@cd ${WRKSRC}/target/docs \
-	  && ${FIND} apidocs -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \
-	  && ${FIND} apidocs -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
-	@${INSTALL_DATA} ${WRKSRC}/LICENSE.txt ${DOCSDIR}/
+	@-${MKDIR} ${DOCSDIR}
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} apidocs ${DOCSDIR}
+.for f in ${DOC_FILES}
+	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
+.endfor
 	@${ECHO_MSG} " [ DONE ]"
 .endif
 
Index: distinfo
===================================================================
RCS file: /var/fcvs/ports/java/jakarta-commons-cli/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	22 Jan 2006 12:39:51 -0000	1.3
+++ distinfo	2 Dec 2010 07:08:47 -0000
@@ -1,3 +1,2 @@
-MD5 (cli-1.0-src.tar.gz) = ba34d585046b1f17dacbb13b377f4255
-SHA256 (cli-1.0-src.tar.gz) = fa4bf0850c896a9d5679f30d9921a98b3d262678019433f36ef810235ae58ec8
-SIZE (cli-1.0-src.tar.gz) = 37046
+SHA256 (commons-cli-1.2-bin.tar.gz) = e95cea88b09740527c240f289ffa9c1ca99af207b0e9d9cb9ebf451624894858
+SIZE (commons-cli-1.2-bin.tar.gz) = 412084
--- jakarta-commons-cli-1.2,1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201012020727.oB27Rpea042006>