[arch-commits] Commit in cmatrix/trunk (PKGBUILD)

[Kyle Keen]

    Date: Friday, April 19, 2019 @ 01:40:53
  Author: kkeen
Revision: 452012

upgpkg: cmatrix 2.0-1

Modified:
  cmatrix/trunk/PKGBUILD

----------+
 PKGBUILD |   38 ++++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-19 00:53:42 UTC (rev 452011)
+++ PKGBUILD	2019-04-19 01:40:53 UTC (rev 452012)
@@ -2,7 +2,7 @@
 # Contributor: Jonathan Steel <jsteel at archlinux.org>
 
 pkgname=cmatrix
-pkgver=1.2
+pkgver=2.0
 pkgrel=1
 pkgdesc="A curses-based scrolling 'Matrix'-like screen"
 arch=('x86_64')
@@ -9,43 +9,53 @@
 url="http://www.asty.org/cmatrix/"
 license=('GPL3')
 depends=('ncurses')
-makedepends=('fontconfig')
+makedepends=('fontconfig' 'cmake' 'kbd' 'xorg-fonts-alias')
 optdepends=('fontconfig: custom font'
             'kbd: cmatrix-tty custom font'
             'xterm: cmatrix-tty custom font')
 # "http://www.asty.org/$pkgname/dist/$pkgname-$pkgver.tar.gz"
-source=("cmatrix-$pkgver.tgz::https://github.com/abishekvashok/cmatrix/archive/$pkgver.tar.gz"
+source=("cmatrix-$pkgver.tgz::https://github.com/abishekvashok/cmatrix/archive/v$pkgver.tar.gz"
         "cmatrix-tty")
-md5sums=('f74707c4237dc2f33a7fce9dea8395ca'
+md5sums=('c2aee6d44c4d46df6f16dca2a3dc18ad'
          '6bb2431c23350cb2082e14b6ba761760')
 
 prepare() {
   cd "$pkgname-$pkgver"
-  sed -i 's|/usr/lib/kbd|/usr/share/kbd|' configure{.ac,} config.h.in cmatrix.spec.in Makefile.{in,am}
-  sed -i 's|/usr/lib/X11/fonts/misc|/usr/share/fonts/misc|' configure{.ac,} config.h.in Makefile.{in,am}
-  sed -i 's| /usr/| $(DESTDIR)/usr/|' Makefile.{in,am}
+
+  sed -i 's|/usr/bin/mkfontdir|/usr/bin/true|' CMakeLists.txt
+  sed -i 's|"share/fonts/X11/misc"|"share/fonts/misc"|' CMakeLists.txt
+  sed -i 's|"share/consolefonts"|"share/kbd/consolefonts"|' CMakeLists.txt
+
+  sed -i 's|defined(HAVE_SETFONT)|1|' cmatrix.c
 }
 
 build() {
   cd "$pkgname-$pkgver"
+  mkdir -p build
+  cd build
+  cmake -DCMAKE_INSTALL_PREFIX=/usr ..
 
-  CPPFLAGS="-D_FORTIFY_SOURCE=0" ./configure \
-    --prefix=/usr --mandir=/usr/share/man
+  #CPPFLAGS="-D_FORTIFY_SOURCE=0" ./configure \
+  #  --prefix=/usr --mandir=/usr/share/man
 
   make
 }
 
 package() {
-  cd "$pkgname-$pkgver"
+  cd "$pkgname-$pkgver/build"
 
-  install -d "$pkgdir/usr/share/fonts/misc/"
-  install -d "$pkgdir/usr/share/kbd/consolefonts/"
   make DESTDIR="$pkgdir" install
-  
-  install -Dm755 "$srcdir/cmatrix-tty" "$pkgdir/usr/bin/cmatrix-tty"
+
+  # manually install stuff that cmake is being annoying about
   rm -f "$pkgdir/usr/share/fonts/misc/fonts.dir"
+ 
+  # todo: fix the pretty wrapper 
+  #install -Dm755 "$srcdir/cmatrix-tty" "$pkgdir/usr/bin/cmatrix-tty"
 
+  cd ..
   for i in AUTHORS NEWS COPYING README ChangeLog INSTALL; do
     install -Dm644 $i "$pkgdir/usr/share/doc/$pkgname/$i"
   done
+
+  install -Dm644 cmatrix.1     "$pkgdir/usr/share/man/man1/cmatrix.1"
 }