From owner-svn-ports-all@FreeBSD.ORG Fri Apr 11 18:44:17 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 647A8476; Fri, 11 Apr 2014 18:44:17 +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 461081FCA; Fri, 11 Apr 2014 18:44:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3BIiHPq087904; Fri, 11 Apr 2014 18:44:17 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3BIiGrj087902; Fri, 11 Apr 2014 18:44:16 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201404111844.s3BIiGrj087902@svn.freebsd.org> From: Dirk Meyer Date: Fri, 11 Apr 2014 18:44:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351026 - in head/emulators/stonx: . files 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.17 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: Fri, 11 Apr 2014 18:44:17 -0000 Author: dinoex Date: Fri Apr 11 18:44:16 2014 New Revision: 351026 URL: http://svnweb.freebsd.org/changeset/ports/351026 QAT: https://qat.redports.org/buildarchive/r351026/ Log: - use STAGEDIR Added: head/emulators/stonx/files/patch-Makefile.in (contents, props changed) Modified: head/emulators/stonx/Makefile Modified: head/emulators/stonx/Makefile ============================================================================== --- head/emulators/stonx/Makefile Fri Apr 11 18:41:00 2014 (r351025) +++ head/emulators/stonx/Makefile Fri Apr 11 18:44:16 2014 (r351026) @@ -18,7 +18,6 @@ BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11- RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir RESTRICTED= Contains ROM (C) by Atari -NO_STAGE= yes TOSIMG?= tos.img USE_XORG= x11 sm ice xext xextproto @@ -46,25 +45,21 @@ pre-build: post-install: .for f in ${ETCFILES} - ${INSTALL_DATA} ${WRKSRC}/etc/$f ${ETCDIR}/ + ${INSTALL_DATA} ${WRKSRC}/etc/$f ${STAGEDIR}${ETCDIR}/ .endfor @${ECHO_MSG} "===> Installing fonts" + ${MKDIR} ${STAGEDIR}${FNTDIR} .for f in ${FONTS} - ${INSTALL_DATA} ${WRKSRC}/data/$f ${FNTDIR}/ - ${GZIP_CMD} ${FNTDIR}/$f + ${INSTALL_DATA} ${WRKSRC}/data/$f ${STAGEDIR}${FNTDIR}/ + ${GZIP_CMD} ${STAGEDIR}${FNTDIR}/$f .endfor - mkfontdir ${FNTDIR} .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/docs/,} ${DOCSDIR}/ + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/docs/,} ${STAGEDIR}${DOCSDIR}/ .endif .if ${PORT_OPTIONS:MEXAMPLES} - ${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${DATA:S,^,${WRKSRC}/,} ${EXAMPLESDIR}/ -.endif -.if (defined(DISPLAY) && ${DISPLAY} != "") - xset fp+ ${FNTDIR} - xset fp rehash + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${DATA:S,^,${WRKSRC}/,} ${STAGEDIR}${EXAMPLESDIR}/ .endif .if !exists(${DISTDIR}/${TOSIMG}) Added: head/emulators/stonx/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/stonx/files/patch-Makefile.in Fri Apr 11 18:44:16 2014 (r351026) @@ -0,0 +1,63 @@ +--- Makefile.in.orig 2004-08-15 16:35:04.000000000 +0200 ++++ Makefile.in 2014-04-11 20:36:37.000000000 +0200 +@@ -19,7 +19,7 @@ + exec_prefix = @exec_prefix@ + SYSCONFDIR = @sysconfdir@/stonx + STONXDIR=@datadir@/stonx +-INSTBIN=@bindir@ ++INSTBIN=${DESTDIR}@bindir@ + DISTDIR=STonX-@version@ + + +@@ -199,32 +199,32 @@ + + install: + install -d -m 755 $(INSTBIN) +- install -d -m 755 $(SYSCONFDIR) +- install -d -m 755 $(STONXDIR) +- install -d -m 755 $(STONXDIR)/gemdos_c +- install -d -m 755 $(STONXDIR)/gemdos_c/mint ++ install -d -m 755 ${DESTDIR}$(SYSCONFDIR) ++ install -d -m 755 ${DESTDIR}$(STONXDIR) ++ install -d -m 755 ${DESTDIR}$(STONXDIR)/gemdos_c ++ install -d -m 755 ${DESTDIR}$(STONXDIR)/gemdos_c/mint + install -c -s stonx $(INSTBIN)/stonx + @if test -f stonvga ; then \ + install -c -s -m 755 stonvga $(INSTBIN)/stonvga; \ + fi +- install -c -m 0644 cartridge/cartridge.img $(STONXDIR)/cartridge.img +- install -c -m 0644 mint/atari/stonx.xfs $(STONXDIR)/gemdos_c/mint/stonx.xfs +- install -c -m 0644 atari/bench1.prg $(STONXDIR)/gemdos_c/bench1.prg +- install -c -m 0644 atari/final.tos $(STONXDIR)/gemdos_c/final.tos +- install -c -m 0644 etc/keysyms $(SYSCONFDIR)/keysyms +- @if test -f $(SYSCONFDIR)/stonxrc; then \ +- echo "$(SYSCONFDIR)/stonxrc already exists: Not creating a new one!" >&2; \ ++ install -c -m 0644 cartridge/cartridge.img ${DESTDIR}$(STONXDIR)/cartridge.img ++ install -c -m 0644 mint/atari/stonx.xfs ${DESTDIR}$(STONXDIR)/gemdos_c/mint/stonx.xfs ++ install -c -m 0644 atari/bench1.prg ${DESTDIR}$(STONXDIR)/gemdos_c/bench1.prg ++ install -c -m 0644 atari/final.tos ${DESTDIR}$(STONXDIR)/gemdos_c/final.tos ++ install -c -m 0644 etc/keysyms ${DESTDIR}$(SYSCONFDIR)/keysyms ++ @if test -f ${DESTDIR}$(SYSCONFDIR)/stonxrc; then \ ++ echo "${DESTDIR}$(SYSCONFDIR)/stonxrc already exists: Not creating a new one!" >&2; \ + else \ +- echo "Creating $(SYSCONFDIR)/stonxrc" >&2; \ +- echo "cartridge $(STONXDIR)/cartridge.img" > $(SYSCONFDIR)/stonxrc ; \ +- echo "tos $(STONXDIR)/tos.img" >> $(SYSCONFDIR)/stonxrc ; \ +- echo "fs C:$(STONXDIR)/gemdos_c" >> $(SYSCONFDIR)/stonxrc ; \ +- echo "vbl 2 refresh 2 chunky" >> $(SYSCONFDIR)/stonxrc ; \ +- echo "boot c" >> $(SYSCONFDIR)/stonxrc ; \ ++ echo "Creating ${DESTDIR}$(SYSCONFDIR)/stonxrc" >&2; \ ++ echo "cartridge $(STONXDIR)/cartridge.img" > ${DESTDIR}$(SYSCONFDIR)/stonxrc ; \ ++ echo "tos $(STONXDIR)/tos.img" >> ${DESTDIR}$(SYSCONFDIR)/stonxrc ; \ ++ echo "fs C:$(STONXDIR)/gemdos_c" >> ${DESTDIR}$(SYSCONFDIR)/stonxrc ; \ ++ echo "vbl 2 refresh 2 chunky" >> ${DESTDIR}$(SYSCONFDIR)/stonxrc ; \ ++ echo "boot c" >> ${DESTDIR}$(SYSCONFDIR)/stonxrc ; \ + fi + @if test -f data/tos.img ; then \ +- echo "install -c -m 0644 data/tos.img" $(STONXDIR)/tos.img ; \ +- install -c -m 0644 data/tos.img $(STONXDIR)/tos.img ; \ ++ echo "install -c -m 0644 data/tos.img" ${DESTDIR}$(STONXDIR)/tos.img ; \ ++ install -c -m 0644 data/tos.img ${DESTDIR}$(STONXDIR)/tos.img ; \ + else \ + echo "To complete installation you should copy a tos.img to:" ; \ + echo " " $(STONXDIR) ; \