Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 15 Mar 2014 20:35:32 +0200 (EET)
From:      Johannes Jost Meixner <xmj@chaot.net>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/187611: [PATCH] lang/linux-j: StageDir, License
Message-ID:  <4786022927842887140.enqueue@mx12.chaot.net>
Resent-Message-ID: <201403151840.s2FIe0WI063305@freefall.freebsd.org>

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

>Number:         187611
>Category:       ports
>Synopsis:       [PATCH] lang/linux-j: StageDir, License
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 15 18:40:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Johannes Jost Meixner
>Release:        FreeBSD 11.0-CURRENT amd64
>Organization:
Goldener Grund OUe
>Environment:
System: FreeBSD mx12.chaot.net 11.0-CURRENT FreeBSD 11.0-CURRENT #4: Sun Mar  9 15:34:03 EET
>Description:
- Stagify
- Add license from http://www.jsoftware.com/help/user/warranty.htm


portlint: ok
port test: ok
testport: ok
redports: https://redports.org/buildarchive/20140315182100-25068/

Generated with FreeBSD Port Tools 1.00.2014.03.12 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:

--- linux-j-504b.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 348367)
+++ Makefile	(working copy)
@@ -13,6 +13,11 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A general purpose programming language
 
+LICENSE=	JSoftware
+LICENSE_NAME=	JSoftware End User License Agreement
+LICENSE_FILE=	${FILESDIR}/license.txt
+LICENSE_PERMS=	auto-accept dist-mirror pkg-mirror
+
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
 
 USE_LINUX=	yes
@@ -19,29 +24,26 @@
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 
-ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS=	i386 amd64
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
-MAN1=		j-jconsole.1
-
 SUB_FILES=	j-jconsole.sh jw.sh
 SUB_LIST=	PORTVERSION=${PORTVERSION:S/b//g}
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/j-jconsole.sh ${PREFIX}/bin/j-jconsole
-	${INSTALL_SCRIPT} ${WRKSRC}/jw.sh ${PREFIX}/bin/jw
-	${INSTALL_MAN} ${WRKSRC}/j${PORTVERSION:S/b//g}/system/extras/help/man/jconsole.1 ${PREFIX}/man/man1/${MAN1}
-	@${MKDIR} ${PREFIX}/lib/j
+	${INSTALL_SCRIPT} ${WRKSRC}/j-jconsole.sh ${STAGEDIR}${PREFIX}/bin/j-jconsole
+	${INSTALL_SCRIPT} ${WRKSRC}/jw.sh ${STAGEDIR}${PREFIX}/bin/jw
+	${INSTALL_MAN} ${WRKSRC}/j${PORTVERSION:S/b//g}/system/extras/help/man/jconsole.1 ${STAGEDIR}${PREFIX}/man/man1/${MAN1}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/j
 	cd ${WRKSRC}/j${PORTVERSION:S/b//g} && \
 		${TAR} -cf - system user profile.ijs j.jar | \
-			${TAR} -xf - -C ${PREFIX}/lib/j
-	@${FIND} ${PREFIX}/lib/j/ -type f -exec ${CHMOD} ${SHAREMODE} {} \;
-	@${FIND} ${PREFIX}/lib/j/ -type f -exec ${CHOWN} ${SHAREOWN} {} \;
-	${INSTALL_PROGRAM} ${WRKSRC}/j${PORTVERSION:S/b//g}/jconsole ${PREFIX}/lib/j/jconsole
-	${BRANDELF} -t Linux ${PREFIX}/lib/j/jconsole
+			${TAR} -xf - -C ${STAGEDIR}${PREFIX}/lib/j
+	@${FIND} ${STAGEDIR}${PREFIX}/lib/j/ -type f -exec ${CHMOD} ${SHAREMODE} {} \;
+	@${FIND} ${STAGEDIR}${PREFIX}/lib/j/ -type f -exec ${CHOWN} ${SHAREOWN} {} \;
+	${INSTALL_PROGRAM} ${WRKSRC}/j${PORTVERSION:S/b//g}/jconsole ${STAGEDIR}${PREFIX}/lib/j/jconsole
+	${BRANDELF} -t Linux ${STAGEDIR}${PREFIX}/lib/j/jconsole
 
 post-install:
 .if !defined(BATCH)
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 348367)
+++ pkg-plist	(working copy)
@@ -1688,6 +1688,7 @@
 lib/j/user/user.txt
 lib/j/user/classes/classes.txt
 lib/j/profile.ijs
+man/man1/j-jconsole.1.gz
 @dirrm lib/j/system/classes/browse
 @dirrm lib/j/system/classes/cs
 @dirrm lib/j/system/classes/dict
--- linux-j-504b.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?4786022927842887140.enqueue>