Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 17 Jan 2014 19:54:14 +0000 (UTC)
From:      Marcus von Appen <mva@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r340098 - in head/games/rt2-demo: . files
Message-ID:  <201401171954.s0HJsEsg050664@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mva
Date: Fri Jan 17 19:54:14 2014
New Revision: 340098
URL: http://svnweb.freebsd.org/changeset/ports/340098
QAT: https://qat.redports.org/buildarchive/r340098/

Log:
  - Enable stagedir support

Modified:
  head/games/rt2-demo/Makefile   (contents, props changed)
  head/games/rt2-demo/files/do-install   (contents, props changed)
  head/games/rt2-demo/pkg-plist   (contents, props changed)

Modified: head/games/rt2-demo/Makefile
==============================================================================
--- head/games/rt2-demo/Makefile	Fri Jan 17 19:48:56 2014	(r340097)
+++ head/games/rt2-demo/Makefile	Fri Jan 17 19:54:14 2014	(r340098)
@@ -17,8 +17,7 @@ NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 USE_LINUX=	yes
 
-NO_STAGE=	yes
 do-install:
-		@${SH} ${FILESDIR}/do-install ${PREFIX} ${DISTDIR}
+		@${SH} ${FILESDIR}/do-install ${STAGEDIR} ${PREFIX} ${DISTDIR}
 
 .include <bsd.port.mk>

Modified: head/games/rt2-demo/files/do-install
==============================================================================
--- head/games/rt2-demo/files/do-install	Fri Jan 17 19:48:56 2014	(r340097)
+++ head/games/rt2-demo/files/do-install	Fri Jan 17 19:54:14 2014	(r340098)
@@ -1,17 +1,18 @@
 #!/bin/sh
 
 PATH=/bin:/usr/bin
-PREFIX=$1
-DISTDIR=$2
-BINDIR=${PREFIX}/bin
-LIBDIR=${PREFIX}/lib/rt2_demo
+DESTDIR=$1
+PREFIX=$2
+DISTDIR=$3
+BINDIR=bin
+LIBDIR=lib/rt2_demo
 
 set -e
 
-mkdir -p ${LIBDIR}/
+mkdir -p ${DESTDIR}${PREFIX}/${LIBDIR}/
 SKIP=`strings ${DISTDIR}/rt2-demo.run | head -10 | grep ^skip= | cut -d= -f2`
 tail +$SKIP ${DISTDIR}/rt2-demo.run | \
-	tar -C ${LIBDIR}/ -xz -f - --exclude rt2_demo --exclude rt2_demo.ppc
+	tar -C ${DESTDIR}${PREFIX}/${LIBDIR}/ -xz -f - --exclude rt2_demo --exclude rt2_demo.ppc
 
-brandelf -t Linux ${LIBDIR}/rt2_demo.x86
-ln -sf ${LIBDIR}/rt2_demo.x86 ${BINDIR}/rt2_demo
+brandelf -t Linux ${DESTDIR}${PREFIX}/${LIBDIR}/rt2_demo.x86
+ln -sf ${PREFIX}/${LIBDIR}/rt2_demo.x86 ${DESTDIR}${PREFIX}/${BINDIR}/rt2_demo

Modified: head/games/rt2-demo/pkg-plist
==============================================================================
--- head/games/rt2-demo/pkg-plist	Fri Jan 17 19:48:56 2014	(r340097)
+++ head/games/rt2-demo/pkg-plist	Fri Jan 17 19:54:14 2014	(r340098)
@@ -1,3 +1,4 @@
+bin/rt2_demo
 lib/rt2_demo/Manual/Imagesm/C101_raise_lower.jpg
 lib/rt2_demo/Manual/Imagesm/C102_paint_terrain.jpg
 lib/rt2_demo/Manual/Imagesm/C103_fill_terrain.jpg



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