diff options
| author | Tim Biermann <tbier@posteo.de> | 2021-04-20 20:19:57 +0000 |
|---|---|---|
| committer | Tim Biermann <tbier@posteo.de> | 2021-04-20 20:32:20 +0000 |
| commit | 5196ce358a697d8615207d84d0077a708ef843ab (patch) | |
| tree | 3b7910baf356fd41b7cbdce07dc8f273452e026e /boxes | |
| parent | e36f930ea6f5b1f3b90f6fca6a2faf4105918276 (diff) | |
| download | contrib-5196ce358a697d8615207d84d0077a708ef843ab.tar.gz contrib-5196ce358a697d8615207d84d0077a708ef843ab.tar.xz | |
boxes: 2.0.0 -> 2.1.0
Diffstat (limited to 'boxes')
| -rw-r--r-- | boxes/.signature | 7 | ||||
| -rw-r--r-- | boxes/Pkgfile | 11 | ||||
| -rw-r--r-- | boxes/makefile.patch | 24 |
3 files changed, 36 insertions, 6 deletions
diff --git a/boxes/.signature b/boxes/.signature index 7cacba0d9..8ea60ff62 100644 --- a/boxes/.signature +++ b/boxes/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3zv3NfimM+qdRAi8wmQadC4qK+l3pNfOoa2ALhYmO2OIpuym/b/DQJ548bDB7iCsg0/MVy7njsHFhkSssTWYEw0= -SHA256 (Pkgfile) = 49b171d5d8fd123be935a9406d28c58e3843929d04d544fc6370233b10ca5ad3 +RWSagIOpLGJF34p9Xyny+7IIJvv9/osGKMyQIaCcQS/Pi4fcguIgfk7ULYCMd+mozC7AoKQ2mHXV/Y1RkYO07aXvIFybLH6bkQ0= +SHA256 (Pkgfile) = b541af15a26c542e6db852e8a8dfc69f1a649fb46bcacfc8e768b20b4fce5b39 SHA256 (.footprint) = 699f8f611fa0fd17ee163f74cbe37d300c3ebf89a6e77b43f310f93a01fd9d28 -SHA256 (boxes-2.0.0.tar.gz) = 952c85eccde42d23252dfe590d6f296a2179297ad1c54745330fb794907f5ad9 +SHA256 (boxes-2.1.0.tar.gz) = ac17d568ad6fa2be2be386f2d4e9ee30f7356712a9076bd05c88bb8644dd328b +SHA256 (makefile.patch) = 866ae932b115238aacda2cfea9d9c20291e9d06a378e71298c9fc8e8923363de diff --git a/boxes/Pkgfile b/boxes/Pkgfile index f042abc05..3c4e8a0c1 100644 --- a/boxes/Pkgfile +++ b/boxes/Pkgfile @@ -4,15 +4,20 @@ # Depends on: libpcre2 libunistring name=boxes -version=2.0.0 +version=2.1.0 release=1 -source=(https://github.com/ascii-boxes/boxes/archive/v$version/$name-$version.tar.gz) +source=(https://github.com/ascii-boxes/boxes/archive/v$version/$name-$version.tar.gz + makefile.patch) build () { cd $name-$version + + patch -Np1 -i $SRC/makefile.patch sed -i -e "s|^GLOBALCONF.*|GLOBALCONF = /usr/share/boxes/config|" Makefile + make - install -D src/boxes $PKG/usr/bin/boxes + + install -D out/boxes $PKG/usr/bin/boxes install -D doc/boxes.1 $PKG/usr/share/man/man1/boxes.1 install -D boxes-config $PKG/usr/share/boxes/config } diff --git a/boxes/makefile.patch b/boxes/makefile.patch new file mode 100644 index 000000000..b7dc894b5 --- /dev/null +++ b/boxes/makefile.patch @@ -0,0 +1,24 @@ +From d1a1cf158016f24ee9d4785e3e07b82329964d0f Mon Sep 17 00:00:00 2001 +From: Thomas Jensen <boxes@thomasjensen.com> +Date: Tue, 20 Apr 2021 21:27:22 +0200 +Subject: [PATCH] Declare our src/Makefile as serial #79 + +because for some reason, make exhibits very strange behavior +when executing it in parallel jobs +--- + src/Makefile | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/Makefile b/src/Makefile +index 6a6fc8f..3f61aa7 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -39,6 +39,8 @@ ORIG_FILES = $(ORIG_SRC) $(ORIG_HDR) + + .PHONY: check_dir clean build debug package flags_unix flags_win32 flags_ + ++.NOTPARALLEL: ++ + check_dir: + @if [ "$(shell pwd | sed -e 's/^.*\///')" != "out" ] ; then \ + echo ERROR: Please call make from the top level directory. ; \ |