From d8a57debadc39c243a1344c58593fc8ccfb1def0 Mon Sep 17 00:00:00 2001 From: mmnmnnmnmm Date: Thu, 18 Aug 2022 13:08:14 +0100 Subject: [PATCH] plan9port: update to 20220813 --- srcpkgs/plan9port/patches/lookman.patch | 37 +++++++++++++++++++++++++ srcpkgs/plan9port/template | 12 +++----- 2 files changed, 41 insertions(+), 8 deletions(-) create mode 100644 srcpkgs/plan9port/patches/lookman.patch diff --git a/srcpkgs/plan9port/patches/lookman.patch b/srcpkgs/plan9port/patches/lookman.patch new file mode 100644 index 00000000000000..4e9260259553cf --- /dev/null +++ b/srcpkgs/plan9port/patches/lookman.patch @@ -0,0 +1,37 @@ +--- a/INSTALL ++++ b/INSTALL +@@ -183,6 +183,9 @@ if $doinstall; then + echo "* NOT renaming hard-coded /usr/local/plan9 paths." + echo "* NOT building web manual." + else ++ cd $PLAN9/man ++ mk indices ++ mk lookman.index + echo "* Renaming hard-coded /usr/local/plan9 paths..." + cd $PLAN9 + sh lib/moveplan9.sh +--- a/man/mkfile ++++ b/man/mkfile +@@ -7,5 +7,5 @@ indices:V: + done + + lookman.index:V: +- ./mkindex ++ 9 rc ./mkindex + +--- a/man/mkindex ++++ b/man/mkindex +@@ -4,11 +4,11 @@ + + # creates the index used by lookman + >lookman.index +-for(i in $PLAN9/man/man[0-9]*/[a-z0-9:]*.[0-9]*){ ++for(i in man[0-9]*/[a-z0-9:]*.[0-9]*){ + deroff -w_ < $i | + tr 'A-Z' 'a-z' | + sort -u | + comm -23 - junkwords | +- sed 's@$@ '$i'@' >>lookman.index # stick file name on end of line ++ sed 's@$@ '$PLAN9_TARGET/man/$i'@' >>lookman.index # stick file name on end of line + } + sort -o lookman.index lookman.index diff --git a/srcpkgs/plan9port/template b/srcpkgs/plan9port/template index 9b750e3997c875..d323a577838595 100644 --- a/srcpkgs/plan9port/template +++ b/srcpkgs/plan9port/template @@ -1,8 +1,8 @@ # Template file for 'plan9port' pkgname=plan9port -version=20210324 +version=20220813 revision=1 -_githash=88a87fadae6629932d9c160f53ad5d79775f8f94 +_githash=93f814360076ccf28d33c9cb909fca7200ba4a7d wrksrc="${pkgname}-${_githash}" hostmakedepends="perl which" makedepends="libX11-devel libXt-devel libXext-devel freetype-devel fontconfig-devel" @@ -12,7 +12,7 @@ license="MIT, bzip2-1.0.6, Public Domain, custom:Bigelow & Holmes, custom:Bigelow & Holmes Inc and URW++ GmbH, Bitstream-Vera" homepage="https://9fans.github.io/plan9port/" distfiles="https://github.com/9fans/plan9port/archive/${_githash}.tar.gz" -checksum=d4b873a094035024fe54282a7fdd652255b73b51c4fd78ae7701746d1e3e8f38 +checksum=b89174eff5aa5034b6c1cf4e7839ab13a388d90810c64e9b59fc94cf07766c07 nocross=yes CFLAGS="-fcommon" @@ -26,8 +26,6 @@ post_extract() { -i src/cmd/faces/mkfile \ -i src/cmd/mkfile vsed -e 's/-lX11$/& $LDFLAGS/g' -i src/cmd/rio/mkfile - sed -i "s,/usr/local/plan9,/usr/lib/plan9,g" \ - $(grep -lr /usr/local/plan9) } do_build() { @@ -36,12 +34,10 @@ do_build() { echo "LDFLAGS='$LDFLAGS'" >>LOCAL.config vsed -e 's/-O2/$CFLAGS/' -i bin/9c - NPROC=$XBPS_MAKEJOBS ./INSTALL + NPROC=$XBPS_MAKEJOBS ./INSTALL -r /usr/lib/plan9 } do_install() { - xargs -a lib/moveplan9.files -d'\n' sed -i "s#$wrksrc#/usr/lib/plan9#" - vinstall $FILESDIR/plan9.sh 644 etc/profile.d vlicense LICENSE vlicense src/cmd/bzip2/LICENSE LICENSE.bzip2