From fe56ae81900e4b8be4c78d3981e19b116d211971 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Tue, 20 Sep 2016 22:40:46 +0200 Subject: [PATCH] plan9port: fix xd, move to /usr/lib/plan9, drop hardening from 9c flags. --- srcpkgs/plan9port/files/plan9.sh | 2 +- srcpkgs/plan9port/patches/xd-runewise.patch | 3 ++- srcpkgs/plan9port/template | 14 ++++++++------ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/srcpkgs/plan9port/files/plan9.sh b/srcpkgs/plan9port/files/plan9.sh index f8236d9a5d1..19fe19df738 100644 --- a/srcpkgs/plan9port/files/plan9.sh +++ b/srcpkgs/plan9port/files/plan9.sh @@ -1,2 +1,2 @@ -export PLAN9=/usr/share/plan9 +export PLAN9=/usr/lib/plan9 export PATH=$PATH:$PLAN9/bin diff --git a/srcpkgs/plan9port/patches/xd-runewise.patch b/srcpkgs/plan9port/patches/xd-runewise.patch index 2e92a84b1a8..ce8c58a1b1b 100644 --- a/srcpkgs/plan9port/patches/xd-runewise.patch +++ b/srcpkgs/plan9port/patches/xd-runewise.patch @@ -18,7 +18,8 @@ +++ src/cmd/xd.c 2015-02-11 14:03:14.000000000 +0100 @@ -5,6 +5,7 @@ unsigned char odata[16]; - unsigned char data[16]; +-unsigned char data[16]; ++unsigned char data[32]; int ndata; +int nread; unsigned long addr; diff --git a/srcpkgs/plan9port/template b/srcpkgs/plan9port/template index 2ea601594cc..f91a7ced570 100644 --- a/srcpkgs/plan9port/template +++ b/srcpkgs/plan9port/template @@ -1,10 +1,10 @@ # Template file for 'plan9port' pkgname=plan9port version=20160418 -revision=3 +revision=4 _githash=35d43924484b88b9816e40d2f6bff4547f3eec47 wrksrc="${pkgname}-${_githash}" -hostmakedepends="which perl" +hostmakedepends="perl" 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="Christian Neukirchen " @@ -33,13 +33,15 @@ do_build() { ./INSTALL } do_install() { - xargs -a lib/moveplan9.files -d'\n' sed -i "s#$wrksrc#/usr/share/plan9#" + xargs -a lib/moveplan9.files -d'\n' sed -i "s#$wrksrc#/usr/lib/plan9#" vinstall $FILESDIR/plan9.sh 644 etc/profile.d vlicense LICENSE - vmkdir usr/share - cp -a $wrksrc $DESTDIR/usr/share/plan9 - cd $DESTDIR/usr/share/plan9 + vmkdir usr/lib + cp -a $wrksrc $DESTDIR/usr/lib/plan9 + cd $DESTDIR/usr/lib/plan9 rm -f install.{log,sum} + + sed -i -e "s|\(-specs=.*hardened-ld\)||g" -e "s|\(-specs=.*hardened-cc1\)||g" $DESTDIR/usr/lib/plan9/config $DESTDIR/usr/lib/plan9/LOCAL.config }