plan9port: update to 20220813

This commit is contained in:
mmnmnnmnmm 2022-08-18 13:08:14 +01:00 committed by Leah Neukirchen
parent a19e8b214a
commit 0668cee44c
2 changed files with 41 additions and 8 deletions

View file

@ -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

View file

@ -1,8 +1,8 @@
# Template file for 'plan9port' # Template file for 'plan9port'
pkgname=plan9port pkgname=plan9port
version=20210324 version=20220813
revision=1 revision=1
_githash=88a87fadae6629932d9c160f53ad5d79775f8f94 _githash=93f814360076ccf28d33c9cb909fca7200ba4a7d
wrksrc="${pkgname}-${_githash}" wrksrc="${pkgname}-${_githash}"
hostmakedepends="perl which" hostmakedepends="perl which"
makedepends="libX11-devel libXt-devel libXext-devel freetype-devel fontconfig-devel" 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" custom:Bigelow & Holmes Inc and URW++ GmbH, Bitstream-Vera"
homepage="https://9fans.github.io/plan9port/" homepage="https://9fans.github.io/plan9port/"
distfiles="https://github.com/9fans/plan9port/archive/${_githash}.tar.gz" distfiles="https://github.com/9fans/plan9port/archive/${_githash}.tar.gz"
checksum=d4b873a094035024fe54282a7fdd652255b73b51c4fd78ae7701746d1e3e8f38 checksum=b89174eff5aa5034b6c1cf4e7839ab13a388d90810c64e9b59fc94cf07766c07
nocross=yes nocross=yes
CFLAGS="-fcommon" CFLAGS="-fcommon"
@ -26,8 +26,6 @@ post_extract() {
-i src/cmd/faces/mkfile \ -i src/cmd/faces/mkfile \
-i src/cmd/mkfile -i src/cmd/mkfile
vsed -e 's/-lX11$/& $LDFLAGS/g' -i src/cmd/rio/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() { do_build() {
@ -36,12 +34,10 @@ do_build() {
echo "LDFLAGS='$LDFLAGS'" >>LOCAL.config echo "LDFLAGS='$LDFLAGS'" >>LOCAL.config
vsed -e 's/-O2/$CFLAGS/' -i bin/9c vsed -e 's/-O2/$CFLAGS/' -i bin/9c
NPROC=$XBPS_MAKEJOBS ./INSTALL NPROC=$XBPS_MAKEJOBS ./INSTALL -r /usr/lib/plan9
} }
do_install() { do_install() {
xargs -a lib/moveplan9.files -d'\n' sed -i "s#$wrksrc#/usr/lib/plan9#"
vinstall $FILESDIR/plan9.sh 644 etc/profile.d vinstall $FILESDIR/plan9.sh 644 etc/profile.d
vlicense LICENSE vlicense LICENSE
vlicense src/cmd/bzip2/LICENSE LICENSE.bzip2 vlicense src/cmd/bzip2/LICENSE LICENSE.bzip2