Date: Tue, 29 Mar 2022 21:33:41 GMT From: Joerg Wunsch <joerg@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 8c5fee5f1451 - main - emulators/pcemu: Fix obsolete (and now broken) font handling Message-ID: <202203292133.22TLXfKH035842@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by joerg: URL: https://cgit.FreeBSD.org/ports/commit/?id=8c5fee5f1451cf305deeffa377d410aa178e3afc commit 8c5fee5f1451cf305deeffa377d410aa178e3afc Author: Joerg Wunsch <joerg@FreeBSD.org> AuthorDate: 2022-03-29 21:31:35 +0000 Commit: Joerg Wunsch <joerg@FreeBSD.org> 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 <bsd.port.mk> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203292133.22TLXfKH035842>