Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 6 Nov 2011 04:30:38 GMT
From:      Rob Farmer <rfarmer@predatorlabs.net>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/162323: [maintainer] [patch] java/jrosetta
Message-ID:  <201111060430.pA64Uc7P060658@red.freebsd.org>
Resent-Message-ID: <201111060440.pA64e6uw008402@freefall.freebsd.org>

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

>Number:         162323
>Category:       ports
>Synopsis:       [maintainer] [patch] java/jrosetta
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 06 04:40:06 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Rob Farmer
>Release:        9.0-RC1
>Organization:
>Environment:
FreeBSD sapphire.predatorlabs.net 9.0-RC1 FreeBSD 9.0-RC1 #0: Sat Nov  5 19:52:05 PDT 2011     rfarmer@sapphire.predatorlabs.net:/usr/obj/usr/src/sys/SAPPHIRE  amd64
>Description:
Avoid pointyhat failure from maven downloading files during the build by using the pre-compiled jar, unless WITH_COMPILE is set
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/java/jrosetta/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	1 Nov 2011 17:18:30 -0000	1.3
+++ Makefile	6 Nov 2011 01:48:29 -0000
@@ -7,27 +7,41 @@
 
 PORTNAME=	jrosetta
 PORTVERSION=	1.0.4
+PORTREVISION=	1
 CATEGORIES=	java devel
-MASTER_SITES=	http://maven.artenum.com/content/groups/public/com/artenum/${PORTNAME}/${PORTVERSION}/ \
-		http://www.predatorlabs.net/dl/
-EXTRACT_SUFX=	-sources.jar
 
 MAINTAINER=	rfarmer@predatorlabs.net
 COMMENT=	API for building a graphical console in Swing
 
-BUILD_DEPENDS=	mvn:${PORTSDIR}/devel/maven3
-
-USE_ZIP=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.5+
-JAVA_BUILD=	yes
 JAVA_RUN=	yes
 
 PLIST_FILES=	%%JAVAJARDIR%%/jrosetta-api.jar \
 		%%JAVAJARDIR%%/jrosetta-engine.jar
 
+.if defined(WITH_COMPILE)
+MASTER_SITES=	http://maven.artenum.com/content/groups/public/com/artenum/${PORTNAME}/${PORTVERSION}/
+EXTRACT_SUFX=	-sources.jar
+
+BUILD_DEPENDS=	mvn:${PORTSDIR}/devel/maven3
+JAVA_BUILD=	yes
+USE_ZIP=	yes
+
+MANUAL_PACKAGE_BUILD=	maven fetches files during build target
+
 OUTPUT=		${WRKDIR}/m2/com/artenum/jrosetta
+.else
+MASTER_SITES=	http://maven.artenum.com/content/groups/public/com/artenum/${PORTNAME}/${PORTNAME}-api/${PORTVERSION}/:1 \
+		http://maven.artenum.com/content/groups/public/com/artenum/${PORTNAME}/${PORTNAME}-engine/${PORTVERSION}/:2
+DISTFILES=	${PORTNAME}-api-${PORTVERSION}.jar:1 \
+		${PORTNAME}-engine-${PORTVERSION}.jar:2
+EXTRACT_ONLY=
 
+NO_BUILD=	yes
+.endif
+
+.if defined(WITH_COMPILE)
 post-patch:
 	${MKDIR} ${WRKDIR}/m2
 	${CP} ${FILESDIR}/settings.xml ${WRKDIR}
@@ -35,11 +49,19 @@
 
 do-build:
 	(cd ${WRKSRC} && ${LOCALBASE}/bin/mvn -gs "${WRKDIR}/settings.xml" clean install)
+.endif
 
 do-install:
+.if defined(WITH_COMPILE)
 	${INSTALL_DATA} ${OUTPUT}/jrosetta-api/${PORTVERSION}/jrosetta-api-${PORTVERSION}.jar \
 		${JAVAJARDIR}/jrosetta-api.jar
 	${INSTALL_DATA} ${OUTPUT}/jrosetta-engine/${PORTVERSION}/jrosetta-engine-${PORTVERSION}.jar \
 		${JAVAJARDIR}/jrosetta-engine.jar
+.else
+	${INSTALL_DATA} ${DISTDIR}/jrosetta-api-${PORTVERSION}.jar \
+		${JAVAJARDIR}/jrosetta-api.jar
+	${INSTALL_DATA} ${DISTDIR}/jrosetta-engine-${PORTVERSION}.jar \
+		${JAVAJARDIR}/jrosetta-engine.jar
+.endif
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/java/jrosetta/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	26 Oct 2011 02:30:38 -0000	1.3
+++ distinfo	6 Nov 2011 01:29:41 -0000
@@ -1,2 +1,6 @@
 SHA256 (jrosetta-1.0.4-sources.jar) = 23c1631769a8715110af1b8449d0e810f8161d9a609d69fb2fe8546903ebfd9b
 SIZE (jrosetta-1.0.4-sources.jar) = 94931
+SHA256 (jrosetta-api-1.0.4.jar) = 45703efaed9b4eb46830814ca5c5b19220021064a65ed225daa5b74a95c38044
+SIZE (jrosetta-api-1.0.4.jar) = 17189
+SHA256 (jrosetta-engine-1.0.4.jar) = 291e5c5fd8e7335e9ef8b241ae8ee0b3acd7936fc2fe83a632d12e66acd2380e
+SIZE (jrosetta-engine-1.0.4.jar) = 51630


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



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