Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 6 Feb 2014 07:25:16 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r342945 - head/java/javavmwrapper
Message-ID:  <201402060725.s167PGXk092077@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Thu Feb  6 07:25:16 2014
New Revision: 342945
URL: http://svnweb.freebsd.org/changeset/ports/342945
QAT: https://qat.redports.org/buildarchive/r342945/

Log:
  Support stage

Modified:
  head/java/javavmwrapper/Makefile
  head/java/javavmwrapper/pkg-plist

Modified: head/java/javavmwrapper/Makefile
==============================================================================
--- head/java/javavmwrapper/Makefile	Thu Feb  6 07:23:50 2014	(r342944)
+++ head/java/javavmwrapper/Makefile	Thu Feb  6 07:25:16 2014	(r342945)
@@ -18,19 +18,12 @@ NO_WRKSUBDIR=	yes
 
 PKGINSTALL=	${WRKDIR}/pkg-install
 
-MAN1=		checkvms.1 javavm.1 manvm.1 registervm.1 unregistervm.1
-MAN5=		javavm_opts.conf.5 javavms.5
-
 SRC=		${.CURDIR}/src
 SCRIPTS=	classpath javavmwrapper
 # This is normally defined by bsd.java.mk when USE_JAVA is defined, but
 # we can't do that here since it would result in a circular dependency
 JAVALIBDIR=	${LOCALBASE}/share/java/classes
 
-NO_STAGE=	yes
-do-fetch:
-	@${DO_NADA}
-
 do-configure:
 .for _script in ${SCRIPTS}
 	${SED} -e 's|%%PREFIX%%|${PREFIX}|;' \
@@ -39,7 +32,7 @@ do-configure:
 .endfor
 	${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|;' \
 		${FILESDIR}/pkg-install.in > ${PKGINSTALL}
-.for _man in checkvms.1 javavm.1 manvm.1 registervm.1 ${MAN5}
+.for _man in checkvms.1 javavm.1 manvm.1 registervm.1 javavm_opts.conf.5 javavms.5
 	${SED} -e 's|%%PREFIX%%|${PREFIX}|;' \
 	       -e 's|%%LOCALBASE%%|${LOCALBASE}|;' \
 	       -e 's|%%PORTSDIR%%|${PORTSDIR}|;' \
@@ -47,25 +40,17 @@ do-configure:
 .endfor
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/classpath.sh ${PREFIX}/bin/classpath
-	${INSTALL_SCRIPT} ${WRKDIR}/javavmwrapper.sh ${PREFIX}/bin/javavm
-	${LN} -sf ${PREFIX}/bin/javavm ${PREFIX}/bin/checkvms
-	${LN} -sf ${PREFIX}/bin/javavm ${PREFIX}/bin/manvm
-	${LN} -sf ${PREFIX}/bin/javavm ${PREFIX}/bin/registervm
-	${LN} -sf ${PREFIX}/bin/javavm ${PREFIX}/bin/unregistervm
-.for _man in checkvms.1 javavm.1 manvm.1 registervm.1
-	${INSTALL_MAN} ${WRKDIR}/${_man} ${MAN1PREFIX}/man/man1
-.endfor
+	${INSTALL_SCRIPT} ${WRKDIR}/classpath.sh ${STAGEDIR}${PREFIX}/bin/classpath
+	${INSTALL_SCRIPT} ${WRKDIR}/javavmwrapper.sh ${STAGEDIR}${PREFIX}/bin/javavm
+	${LN} -sf javavm ${STAGEDIR}${PREFIX}/bin/checkvms
+	${LN} -sf javavm ${STAGEDIR}${PREFIX}/bin/manvm
+	${LN} -sf javavm ${STAGEDIR}${PREFIX}/bin/registervm
+	${LN} -sf javavm ${STAGEDIR}${PREFIX}/bin/unregistervm
+	${INSTALL_MAN} ${WRKDIR}/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKDIR}/registervm.1 \
-		${MAN1PREFIX}/man/man1/unregistervm.1
-.for _man in ${MAN5}
-	${INSTALL_MAN} ${WRKDIR}/${_man} ${MAN5PREFIX}/man/man5
-.endfor
+		${STAGEDIR}${MAN1PREFIX}/man/man1/unregistervm.1
+	${INSTALL_MAN} ${WRKDIR}/*.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
 	${INSTALL_DATA} ${FILESDIR}/javavm_opts.conf.dist \
-		${PREFIX}/etc/javavm_opts.conf.dist
-
-post-install:
-	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \
-		POST-INSTALL
+		${STAGEDIR}${PREFIX}/etc/javavm_opts.conf.dist
 
 .include <bsd.port.mk>

Modified: head/java/javavmwrapper/pkg-plist
==============================================================================
--- head/java/javavmwrapper/pkg-plist	Thu Feb  6 07:23:50 2014	(r342944)
+++ head/java/javavmwrapper/pkg-plist	Thu Feb  6 07:25:16 2014	(r342945)
@@ -5,3 +5,10 @@ bin/manvm
 bin/registervm
 bin/unregistervm
 etc/javavm_opts.conf.dist
+man/man1/checkvms.1.gz
+man/man1/javavm.1.gz
+man/man1/manvm.1.gz
+man/man1/registervm.1.gz
+man/man1/unregistervm.1.gz
+man/man5/javavm_opts.conf.5.gz
+man/man5/javavms.5.gz



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