From owner-svn-ports-head@FreeBSD.ORG Sat Aug 9 08:03:37 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 077AEBD0 for ; Sat, 9 Aug 2014 08:03:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DBB522C7A for ; Sat, 9 Aug 2014 08:03:36 +0000 (UTC) Received: from joerg (uid 548) (envelope-from joerg@FreeBSD.org) id 20e6 by svn.freebsd.org (DragonFly Mail Agent v0.9+); Sat, 09 Aug 2014 08:03:36 +0000 From: Joerg Wunsch Date: Sat, 9 Aug 2014 08:03:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364407 - in head/emulators/pcemu: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e5d5d8.20e6.1bb286e5@svn.freebsd.org> X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Aug 2014 08:03:37 -0000 Author: joerg Date: Sat Aug 9 08:03:35 2014 New Revision: 364407 URL: http://svnweb.freebsd.org/changeset/ports/364407 QAT: https://qat.redports.org/buildarchive/r364407/ Log: Add stage support. Fix a bug when running in a 64-bit environment that made it crash immediately. Added: head/emulators/pcemu/files/patch-ag (contents, props changed) Deleted: head/emulators/pcemu/files/patch-af Modified: head/emulators/pcemu/Makefile head/emulators/pcemu/files/patch-aa head/emulators/pcemu/pkg-plist Modified: head/emulators/pcemu/Makefile ============================================================================== --- head/emulators/pcemu/Makefile Sat Aug 9 07:52:10 2014 (r364406) +++ head/emulators/pcemu/Makefile Sat Aug 9 08:03:35 2014 (r364407) @@ -5,21 +5,11 @@ PORTNAME= pcemu PORTVERSION= 1.01b PORTREVISION= 3 CATEGORIES= emulators -# -# This could in theory become a chicken-and-egg problem. Anyway, -# wcarchive is well connected, and the distfile hasn't been changed -# for years now. -MASTER_SITES+= ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/ -# -# interface business GmbH is not so well connected, but Joerg's got -# direct access there. -MASTER_SITES+= ftp://ftp.interface-business.de/pub/outgoing/ -# -# This is the original master site, but better use a well-connected server -MASTER_SITES+= ftp://ftp.cs.bris.ac.uk/pub/users/hedley/ +MASTER_SITES= ${MASTER_SITE_LOCAL} +MASTER_SITE_SUBDIR= joerg DISTNAME= pcemu1.01alpha -MAINTAINER= ports@FreeBSD.org +MAINTAINER= joerg@FreeBSD.org COMMENT= 8086 PC emulator, by David Hedley BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf @@ -27,8 +17,7 @@ RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-f mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale USE_XORG= x11 xext -MAKE_ENV= FILESDIR=${FILESDIR} +MAKE_ENV= FILESDIR=${FILESDIR} STAGEDIR=${STAGEDIR} MAKE_ARGS= CC="${CC}" -NO_STAGE= yes .include Modified: head/emulators/pcemu/files/patch-aa ============================================================================== --- head/emulators/pcemu/files/patch-aa Sat Aug 9 07:52:10 2014 (r364406) +++ head/emulators/pcemu/files/patch-aa Sat Aug 9 08:03:35 2014 (r364407) @@ -40,22 +40,22 @@ + + #mode 0666 is required for DriveA, alas + install: pcemu bootstrapper -+ -mkdir ${LOCALPREFIX}/lib/pcemu \ -+ ${LOCALPREFIX}/lib/pcemu/doc \ -+ ${LOCALPREFIX}/lib/pcemu/font \ -+ ${LOCALPREFIX}/lib/pcemu/C \ -+ ${LOCALPREFIX}/bin -+ install -c -s -o bin -g bin pcemu ${LOCALPREFIX}/bin/ ++ -mkdir -p ${STAGEDIR}/${LOCALPREFIX}/lib/pcemu \ ++ ${STAGEDIR}/${LOCALPREFIX}/lib/pcemu/doc \ ++ ${STAGEDIR}/${LOCALPREFIX}/lib/pcemu/font \ ++ ${STAGEDIR}/${LOCALPREFIX}/lib/pcemu/C \ ++ ${STAGEDIR}/${LOCALPREFIX}/bin ++ install -c -s -o bin -g bin pcemu ${STAGEDIR}/${LOCALPREFIX}/bin/ + install -c -m 666 bootstrap/display.bin \ -+ ${LOCALPREFIX}/lib/pcemu/DriveA ++ ${STAGEDIR}/${LOCALPREFIX}/lib/pcemu/DriveA + install -c -m 644 BUGS CHANGES README TODO bootstrap/README.FreeBSD \ + programs/lredir.readme \ -+ ${LOCALPREFIX}/lib/pcemu/doc/ -+ rm -f ${LOCALPREFIX}/lib/pcemu/doc/report.ps.gz -+ gzip --best < report.ps > ${LOCALPREFIX}/lib/pcemu/doc/report.ps.gz -+ rm -f ${LOCALPREFIX}/lib/pcemu/font/vga.pcf.Z -+ bdftopcf vga.bdf | compress > ${LOCALPREFIX}/lib/pcemu/font/vga.pcf.Z -+ mkfontdir ${LOCALPREFIX}/lib/pcemu/font ++ ${STAGEDIR}/${LOCALPREFIX}/lib/pcemu/doc/ ++ rm -f ${STAGEDIR}/${LOCALPREFIX}/lib/pcemu/doc/report.ps.gz ++ gzip --best < report.ps > ${STAGEDIR}/${LOCALPREFIX}/lib/pcemu/doc/report.ps.gz ++ rm -f ${STAGEDIR}/${LOCALPREFIX}/lib/pcemu/font/vga.pcf.Z ++ bdftopcf vga.bdf | compress > ${STAGEDIR}/${LOCALPREFIX}/lib/pcemu/font/vga.pcf.Z ++ mkfontdir ${STAGEDIR}/${LOCALPREFIX}/lib/pcemu/font + install -c -m 644 programs/vga50.com programs/config.sys \ + programs/dumpdisk.exe programs/lredir.exe programs/emufs.sys \ -+ ${LOCALPREFIX}/lib/pcemu/C ++ ${STAGEDIR}/${LOCALPREFIX}/lib/pcemu/C Added: head/emulators/pcemu/files/patch-ag ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/pcemu/files/patch-ag Sat Aug 9 08:03:35 2014 (r364407) @@ -0,0 +1,31 @@ +--- xstuff.c~ 2014-08-09 05:59:27.430098652 +0200 ++++ xstuff.c 2014-08-09 09:31:04.953397768 +0200 +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + + #include "icon.h" + #include "xstuff.h" +--- mfs.h~ 2014-08-09 05:59:27.458114679 +0200 ++++ mfs.h 2014-08-09 09:28:43.352221269 +0200 +@@ -364,7 +364,7 @@ + /* ### Split next difinition into read (..._r) and write (..._w) ### */ + #define cds_rootlen_r(cds) (Read2Bytes(u_short,&cds[cds_rootlen_off])) + #define cds_rootlen_w(cds,x) (Write2Bytes(&cds[cds_rootlen_off], x)) +-#define drive_cds(dd) ((cds_t)(((int)cds_base)+(cds_record_size*(dd)))) ++#define drive_cds(dd) ((cds_t)(((char *)cds_base)+(cds_record_size*(dd)))) + + #define CDS_FLAG_REMOTE 0x8000 + #define CDS_FLAG_READY 0x4000 +--- mfs.c~ 2014-08-09 05:59:27.413113444 +0200 ++++ mfs.c 2014-08-09 09:30:14.864291464 +0200 +@@ -519,6 +519,7 @@ + + + struct mydirect *dos_readdir(DIR *); ++int calculate_drive_pointers(int dd); + + #if DOSEMU + int Modified: head/emulators/pcemu/pkg-plist ============================================================================== --- head/emulators/pcemu/pkg-plist Sat Aug 9 07:52:10 2014 (r364406) +++ head/emulators/pcemu/pkg-plist Sat Aug 9 08:03:35 2014 (r364407) @@ -15,4 +15,7 @@ lib/pcemu/C/dumpdisk.exe lib/pcemu/C/lredir.exe lib/pcemu/C/emufs.sys lib/pcemu/DriveA -@unexec rm -rf %D/lib/pcemu +@dirrmtry lib/pcemu/C +@dirrmtry lib/pcemu/doc +@dirrmtry lib/pcemu/font +@dirrmtry lib/pcemu