svn commit: r349002 - head/lang/linux-j

[Steve Wills]

Author: swills
Date: Mon Mar 24 14:07:36 2014
New Revision: 349002
URL: http://svnweb.freebsd.org/changeset/ports/349002
QAT: https://qat.redports.org/buildarchive/r349002/

Log:
  - Stagify
  - Add license
  
  PR:		ports/187611
  Submitted by:	Johannes Jost Meixner <xmj at chaot.net>

Modified:
  head/lang/linux-j/Makefile
  head/lang/linux-j/pkg-plist

Modified: head/lang/linux-j/Makefile
==============================================================================
--- head/lang/linux-j/Makefile	Mon Mar 24 14:06:56 2014	(r349001)
+++ head/lang/linux-j/Makefile	Mon Mar 24 14:07:36 2014	(r349002)
@@ -13,35 +13,40 @@ DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
 MAINTAINER=	ports at 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
 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:
+	${MV} ${STAGEDIR}${PREFIX}/man/man1/jconsole.1 ${STAGEDIR}${PREFIX}/man/man1/j-jconsole.1
 
 post-install:
 .if !defined(BATCH)

Modified: head/lang/linux-j/pkg-plist
==============================================================================
--- head/lang/linux-j/pkg-plist	Mon Mar 24 14:06:56 2014	(r349001)
+++ head/lang/linux-j/pkg-plist	Mon Mar 24 14:07:36 2014	(r349002)
@@ -1688,6 +1688,7 @@ lib/j/user/projects/projects.txt
 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