From nobody Tue Mar 29 21:33:41 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 36AE21A489F7; Tue, 29 Mar 2022 21:33:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KSjVZ1sSQz3mqQ; Tue, 29 Mar 2022 21:33:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648589622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IpxPJGoPsGLm6tNvgTsi3vC/lvLc5Gno8xN2+XRYGIw=; b=mJVlpyaafmp7j/py6SzLGdEAmnXLmffjedOd99D/u5UeHMODgwS5RGqNYr53fDZuBtgRKd v25nFS3mAntAY0PG6icrCzjMP1qGEg2ASsNCxhhpnaiyUJwBuaZam7hpPSvQbSOjEDMnNr 9IMQvsfWWk3bjky+bTFU4nNsxzvwhpdnnikjTUcY0rscWhR3OR5xrMZCowD06GMGafj6vY x4cmrKvtfnzvWQCQZEI1nfg1qO01101s7h1H98t5GHtPB8Lve6YDmDcJHRvsDwD58UuPvn z68wYpZkIcn/cR0u5PvFmV2eHxJLARLJWeQ7wwsW5tNac679cSm7k7WscrsUTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C090226727; Tue, 29 Mar 2022 21:33:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22TLXfg0035843; Tue, 29 Mar 2022 21:33:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22TLXfKH035842; Tue, 29 Mar 2022 21:33:41 GMT (envelope-from git) Date: Tue, 29 Mar 2022 21:33:41 GMT Message-Id: <202203292133.22TLXfKH035842@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joerg Wunsch Subject: git: 8c5fee5f1451 - main - emulators/pcemu: Fix obsolete (and now broken) font handling List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: joerg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8c5fee5f1451cf305deeffa377d410aa178e3afc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648589622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IpxPJGoPsGLm6tNvgTsi3vC/lvLc5Gno8xN2+XRYGIw=; b=Pvas7eNLQpkZPojPVKhGDQm2c3Wuiw+GAsllPLLDPABHpmUfPqQn3KbQIl9PelOL4JUr6H 0O3n8AN6YEBrKWgMoKWV21pYoUhsYVDX/B19TAJB2/wugWHAy73y44oaiU9+gAt2OY+FvM czC4C8UG/LkoGCo93oopVASgqI3/rdqkSI7IYCrzw+nHMcXh1nhHh/OtgPspkVO5JxtQpV MuYpfAb79tEFyYICtAlMJQyTIS5q8B2WT10wYwNm8ec6K/OyCXYlAZepbkfD+4WRJ9qBKw EsfN2XE7RRhHuUOS+9kEjtZNQb0A+7c5qRoE9O9gHWMgIYi6LgoeMPrb8G5c0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648589622; a=rsa-sha256; cv=none; b=SLIBKZ9VYep7l/fB4BF2ddbowPbzvoXPo6GinppOf/KSHKMAhq9aUgOieCiaIf5B/BkhCS LfLtnE3q2eNFOCB9oic6jPk72JWPRiBBhsQuTKk07KzQtRt41qXmDAIm2ErnPKWOh/glR1 f02JS1oXwEZ+vZs02ffq76BE41VJTT5YJhQI095ytc4iD9lRcWu1HHHIcfDaFvww9X65v5 AI+LqU11MAyjb3QUbQ1+qXTTXCNMD/i/lioG5mVazMZs71xHKBWdVedvGDOZF3Sbtg3ZOo pc+HaU8Z6xzUf2LtuArn7U7eAuVlGvJENKtK0IrDaPvrzW1JIQuxezrgmXyJEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by joerg: URL: https://cgit.FreeBSD.org/ports/commit/?id=8c5fee5f1451cf305deeffa377d410aa178e3afc commit 8c5fee5f1451cf305deeffa377d410aa178e3afc Author: Joerg Wunsch AuthorDate: 2022-03-29 21:31:35 +0000 Commit: Joerg Wunsch CommitDate: 2022-03-29 21:33:38 +0000 emulators/pcemu: Fix obsolete (and now broken) font handling Replace the now obsolete @fcfontdir keyword in the plist by the appropriate handling with USES=fonts. Reported by: pkg-fallout --- emulators/pcemu/Makefile | 6 +++--- emulators/pcemu/files/patch-aa | 4 ++-- emulators/pcemu/pkg-plist | 3 +-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/emulators/pcemu/Makefile b/emulators/pcemu/Makefile index 35b84a1364b3..09ec607f0950 100644 --- a/emulators/pcemu/Makefile +++ b/emulators/pcemu/Makefile @@ -2,7 +2,7 @@ PORTNAME= pcemu PORTVERSION= 1.01b -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= emulators MASTER_SITES= LOCAL/joerg DISTNAME= pcemu1.01alpha @@ -13,10 +13,10 @@ COMMENT= 8086 PC emulator, by David Hedley BUILD_DEPENDS= bdftopcf:x11-fonts/bdftopcf RUN_DEPENDS= mkfontscale:x11-fonts/mkfontscale -USES= dos2unix xorg +USES= dos2unix xorg fonts USE_XORG= x11 xext DOS2UNIX_FILES= programs/config.sys -MAKE_ENV= FILESDIR=${FILESDIR} STAGEDIR=${STAGEDIR} +MAKE_ENV= FILESDIR=${FILESDIR} STAGEDIR=${STAGEDIR} FONTSDIR=${FONTSDIR} MAKE_ARGS= CC="${CC}" .include diff --git a/emulators/pcemu/files/patch-aa b/emulators/pcemu/files/patch-aa index 91ccc06dbd69..58a0d5051b9e 100644 --- a/emulators/pcemu/files/patch-aa +++ b/emulators/pcemu/files/patch-aa @@ -42,7 +42,7 @@ + install: pcemu bootstrapper + -mkdir -p ${STAGEDIR}/${LOCALPREFIX}/lib/pcemu \ + ${STAGEDIR}/${LOCALPREFIX}/lib/pcemu/doc \ -+ ${STAGEDIR}/${LOCALPREFIX}/lib/pcemu/font \ ++ ${STAGEDIR}${FONTSDIR} \ + ${STAGEDIR}/${LOCALPREFIX}/lib/pcemu/C \ + ${STAGEDIR}/${LOCALPREFIX}/bin + install -c -s pcemu ${STAGEDIR}/${LOCALPREFIX}/bin/ @@ -54,7 +54,7 @@ + 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 ++ bdftopcf vga.bdf | compress > ${STAGEDIR}${FONTSDIR}/vga.pcf.Z + install -c -m 644 programs/vga50.com programs/config.sys \ + programs/dumpdisk.exe programs/lredir.exe programs/emufs.sys \ + ${STAGEDIR}/${LOCALPREFIX}/lib/pcemu/C diff --git a/emulators/pcemu/pkg-plist b/emulators/pcemu/pkg-plist index fdfbbe0e70b1..481dcda71527 100644 --- a/emulators/pcemu/pkg-plist +++ b/emulators/pcemu/pkg-plist @@ -6,11 +6,10 @@ lib/pcemu/doc/TODO lib/pcemu/doc/README.FreeBSD lib/pcemu/doc/lredir.readme lib/pcemu/doc/report.ps.gz -lib/pcemu/font/vga.pcf.Z +%%FONTSDIR%%/vga.pcf.Z lib/pcemu/C/vga50.com lib/pcemu/C/config.sys lib/pcemu/C/dumpdisk.exe lib/pcemu/C/lredir.exe lib/pcemu/C/emufs.sys lib/pcemu/DriveA -@fcfontsdir lib/pcemu/font