[arch-commits] Commit in fortune-mod/repos/community-x86_64 (3 files)

[George Rawlinson]

    Date: Sunday, June 20, 2021 @ 03:45:20
  Author: grawlinson
Revision: 965805

archrelease: copy trunk to community-x86_64

Added:
  fortune-mod/repos/community-x86_64/PKGBUILD
    (from rev 965804, fortune-mod/trunk/PKGBUILD)
  fortune-mod/repos/community-x86_64/not-a-game.patch
    (from rev 965804, fortune-mod/trunk/not-a-game.patch)
Deleted:
  fortune-mod/repos/community-x86_64/PKGBUILD

------------------+
 PKGBUILD         |   98 +++++++++++++++++++++++++----------------------------
 not-a-game.patch |   13 +++++++
 2 files changed, 61 insertions(+), 50 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-20 03:44:18 UTC (rev 965804)
+++ PKGBUILD	2021-06-20 03:45:20 UTC (rev 965805)
@@ -1,50 +0,0 @@
-# Maintainer: Kyle Keen <keenerd at gmail.com>
-# Contributor: Kevin Piche <kevin at archlinux.org>
-# Contributor: Dale Blount <archlinux at dale.us>
-
-pkgname=fortune-mod
-pkgver=2.12.0
-pkgrel=1
-pkgdesc="The Fortune Cookie Program from BSD games"
-arch=('x86_64')
-url="https://www.shlomifish.org/open-source/projects/fortune-mod/"
-license=('BSD')
-depends=('recode')
-makedepends=('cmake' 'rinutils')
-source=("https://github.com/shlomif/fortune-mod/archive/fortune-mod-$pkgver.tar.gz")
-md5sums=('467b8071241e0e666a8a23f4a615e588')
-
-prepare() {
-  cd "$srcdir/fortune-mod-fortune-mod-$pkgver/fortune-mod"
-  # probably a better way to do this but it is baked in hard
-  sed -i 's|/games/|/|' CMakeLists.txt
-  sed -i 's|"sbin"|"bin"|' CMakeLists.txt
-  sed -i 's|"games"|"bin"|' CMakeLists.txt
-  sed -i 's|/games/fortunes|/fortune|' datfiles/{,off/}CMakeLists.txt
-}
-
-build() {
-  cd "$srcdir/fortune-mod-fortune-mod-$pkgver/fortune-mod"
-  mkdir -p build
-  cd build
-  cmake  .. \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DNO_OFFENSIVE=OFF \
-        -DLOCALDIR=/usr/share/fortune/ \
-        -DLOCALODIR=/usr/share/fortune/off/ \
-        -DCOOKIEDIR=/usr/share/fortune/ \
-        -DOCOOKIEDIR=/usr/share/fortune/off/
-  make REGEXDEFS='-DHAVE_REGEX_H -DPOSIX_REGEX -DHAVE_STDBOOL'
-}
-
-package() {
-  cd "$srcdir/fortune-mod-fortune-mod-$pkgver/fortune-mod/build"
-  make DESTDIR="$pkgdir" \
-       FORTDIR="$pkgdir/usr/bin" \
-       COOKIEDIR="$pkgdir/usr/share/fortune" \
-       BINDIR="$pkgdir/usr/bin" \
-       BINMANDIR="$pkgdir/usr/share/man/man1" \
-       FORTMANDIR="$pkgdir/usr/share/man/man6" install
-  rm "$pkgdir/usr/share/fortune/"{,off/}*.u8
-  install -Dm644 ../../LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}

Copied: fortune-mod/repos/community-x86_64/PKGBUILD (from rev 965804, fortune-mod/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-06-20 03:45:20 UTC (rev 965805)
@@ -0,0 +1,48 @@
+# Maintainer: Kyle Keen <keenerd at gmail.com>
+# Contributor: Kevin Piche <kevin at archlinux.org>
+# Contributor: Dale Blount <archlinux at dale.us>
+# Contributor: George Rawlinson <grawlinson at archlinux.org>
+
+pkgname=fortune-mod
+pkgver=3.6.1
+pkgrel=1
+pkgdesc="The Fortune Cookie Program from BSD games"
+arch=('x86_64')
+url="https://www.shlomifish.org/open-source/projects/fortune-mod/"
+license=('BSD')
+depends=('recode')
+makedepends=('cmake' 'rinutils')
+source=("https://github.com/shlomif/fortune-mod/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz"
+        'not-a-game.patch')
+b2sums=('0ff684ee8aaf5eaabd75f187a3bff533ab4ee6e66c47c57fc700d2671006c8dff42f732fde78b40516f8ee907a52fc1965fb0ff257b12563d645f97c5ebc0031'
+        '3af374f348d42bf649199a79afc18a8f0dace50d2b4c8aa090a1a54ccffcb65bf069d26f0d1d417a395c5a3574f7376c5ae1ec8b97dd2385d6b4b944643b1215')
+
+
+prepare() {
+  cd "$pkgname-$pkgver"
+  patch -p1 -i ../not-a-game.patch
+}
+
+build() {
+  cd "$pkgname-$pkgver"
+  cmake -B build -S . \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DNO_OFFENSIVE=OFF \
+        -DLOCALDIR=/usr/share/fortune/ \
+        -DLOCALODIR=/usr/share/fortune/off/ \
+        -DCOOKIEDIR=/usr/share/fortune/ \
+        -DOCOOKIEDIR=/usr/share/fortune/off/
+  make -C build
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  make -C build DESTDIR="$pkgdir" \
+       FORTDIR="$pkgdir/usr/bin" \
+       COOKIEDIR="$pkgdir/usr/share/fortune" \
+       BINDIR="$pkgdir/usr/bin" \
+       BINMANDIR="$pkgdir/usr/share/man/man1" \
+       FORTMANDIR="$pkgdir/usr/share/man/man6" install
+  rm "$pkgdir/usr/share/fortune/"{,off/}*.u8
+  install -Dm644 COPYING.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}

Copied: fortune-mod/repos/community-x86_64/not-a-game.patch (from rev 965804, fortune-mod/trunk/not-a-game.patch)
===================================================================
--- not-a-game.patch	                        (rev 0)
+++ not-a-game.patch	2021-06-20 03:45:20 UTC (rev 965805)
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 865e855..5a59370 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -154,7 +154,7 @@ ENDMACRO()
+ my_exe(
+     "fortune"
+     "fortune/fortune.c"
+-    "games"
++    "bin"
+ )
+ my_exe(
+