From df1642c1cc7da31f2192af339f79a22232b584e5 Mon Sep 17 00:00:00 2001 From: mmnmnnmnmm <45293514+mmnmnnmnmm@users.noreply.github.com> Date: Sat, 13 Feb 2021 18:58:56 +0000 Subject: [PATCH] plan9port: update to 20210324 --- srcpkgs/plan9port/template | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/srcpkgs/plan9port/template b/srcpkgs/plan9port/template index 4b4c7efc1aa4..a39c1ee1c2cf 100644 --- a/srcpkgs/plan9port/template +++ b/srcpkgs/plan9port/template @@ -1,23 +1,20 @@ # Template file for 'plan9port' pkgname=plan9port -version=20200927 -revision=2 -_githash=291f7411783bf6871b253f3b15ce691eea7a257e +version=20210324 +revision=1 +_githash=88a87fadae6629932d9c160f53ad5d79775f8f94 wrksrc="${pkgname}-${_githash}" hostmakedepends="perl which" makedepends="libX11-devel libXt-devel libXext-devel freetype-devel fontconfig-devel" short_desc="Port of many Plan 9 programs to Unix-like operating systems" maintainer="Leah Neukirchen " -license="LPL-1.02" +license="MIT, bzip2-1.0.6, Public Domain, custom:Bigelow & Holmes, + custom:Bigelow & Holmes Inc and URW++ GmbH, custom:Bitstream Vera Fonts" homepage="https://9fans.github.io/plan9port/" distfiles="https://github.com/9fans/plan9port/archive/${_githash}.tar.gz" -checksum=4db90ed7859066d26a424ebde38b318bb6030ad9209cdbfb4f5fb32fb486a659 +checksum=d4b873a094035024fe54282a7fdd652255b73b51c4fd78ae7701746d1e3e8f38 nocross=yes -if [[ $XBPS_TARGET_MACHINE == *-musl ]]; then - makedepends+=" libucontext-devel" -fi - CFLAGS="-fcommon" post_extract() { @@ -32,23 +29,26 @@ post_extract() { sed -i "s,/usr/local/plan9,/usr/lib/plan9,g" \ $(grep -lr /usr/local/plan9) } + do_build() { CFLAGS+=' -D_DEFAULT_SOURCE' echo "CFLAGS='$CFLAGS'" >LOCAL.config echo "LDFLAGS='$LDFLAGS'" >>LOCAL.config vsed -e 's/-O2/$CFLAGS/' -i bin/9c - if [[ $XBPS_TARGET_MACHINE == *-musl ]]; then - # add libucontext to extralibs under linux - vsed -e '/^\textralibs=.*-lpthread"$/s/"$/ -lucontext"/' -i bin/9l - fi - ./INSTALL + NPROC=$XBPS_MAKEJOBS ./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 vlicense LICENSE + vlicense src/cmd/bzip2/LICENSE LICENSE.bzip2 + vlicense postscript/font/dejavu/LICENSE.dejavu + vlicense postscript/font/luxi/COPYRIGHT.BH + sed '1d' font/luc/NOTICE > NOTICE.BH + vlicense NOTICE.BH vmkdir usr/lib cp -a $wrksrc $DESTDIR/usr/lib/plan9