From owner-svn-ports-all@FreeBSD.ORG Tue May 13 06:57:19 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7644F325; Tue, 13 May 2014 06:57:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 48B892388; Tue, 13 May 2014 06:57:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4D6vJbv015856; Tue, 13 May 2014 06:57:19 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4D6vJUK015855; Tue, 13 May 2014 06:57:19 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <201405130657.s4D6vJUK015855@svn.freebsd.org> From: Edwin Groothuis Date: Tue, 13 May 2014 06:57:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353919 - head/emulators/m2000 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 May 2014 06:57:19 -0000 Author: edwin Date: Tue May 13 06:57:18 2014 New Revision: 353919 URL: http://svnweb.freebsd.org/changeset/ports/353919 QAT: https://qat.redports.org/buildarchive/r353919/ Log: Fix staging Modified: head/emulators/m2000/Makefile Modified: head/emulators/m2000/Makefile ============================================================================== --- head/emulators/m2000/Makefile Tue May 13 06:47:53 2014 (r353918) +++ head/emulators/m2000/Makefile Tue May 13 06:57:18 2014 (r353919) @@ -46,7 +46,6 @@ USE_XORG= x11 xi SUB_FILES= m2000.sh PORTDOCS= M2000.txt -NO_STAGE= yes post-extract: ${MKDIR} ${WRKDIR}/tapeconv ${UNZIP_CMD} ${DISTDIR}/${DIST_SUBDIR}/tapeconv.zip -d ${WRKDIR}/tapeconv @@ -56,20 +55,20 @@ post-build: ${CC} -o ${WRKDIR}/tapeconv/PCM2CAS ${WRKDIR}/tapeconv/PCM2CAS.c do-install: - @${INSTALL_SCRIPT} ${WRKDIR}/m2000.sh ${PREFIX}/bin/m2000 - @${INSTALL_PROGRAM} ${WRKDIR}/tapeconv/PCM2CAS ${PREFIX}/bin/tapeconv - @${MKDIR} ${PREFIX}/share/m2000/ - @${INSTALL_PROGRAM} ${WRKSRC}/m2000 ${DATADIR} - @${INSTALL_DATA} ${WRKSRC}/P2000ROM.bin ${DATADIR} - @${INSTALL_DATA} ${WRKSRC}/Default.fnt ${DATADIR} - @${INSTALL_DATA} ${WRKSRC}/BASIC.bin ${DATADIR} + @${INSTALL_SCRIPT} ${WRKDIR}/m2000.sh ${STAGEDIR}${PREFIX}/bin/m2000 + @${INSTALL_PROGRAM} ${WRKDIR}/tapeconv/PCM2CAS ${STAGEDIR}${PREFIX}/bin/tapeconv + @${MKDIR} ${STAGEDIR}${PREFIX}/share/m2000/ + @${INSTALL_PROGRAM} ${WRKSRC}/m2000 ${STAGEDIR}${DATADIR} + @${INSTALL_DATA} ${WRKSRC}/P2000ROM.bin ${STAGEDIR}${DATADIR} + @${INSTALL_DATA} ${WRKSRC}/Default.fnt ${STAGEDIR}${DATADIR} + @${INSTALL_DATA} ${WRKSRC}/BASIC.bin ${STAGEDIR}${DATADIR} .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/M2000.txt ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/M2000.txt ${STAGEDIR}${DOCSDIR} .endif .for f in ${M2000TAPES} @${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/${f}.gz > ${WRKDIR}/${f} - @${INSTALL_DATA} ${WRKDIR}/${f} ${DATADIR} + @${INSTALL_DATA} ${WRKDIR}/${f} ${STAGEDIR}${DATADIR} .endfor post-install: