[arch-commits] Commit in cmatrix/repos/community-x86_64 (4 files)

Kyle Keen kkeen at archlinux.org
Fri Apr 19 01:41:07 UTC 2019


    Date: Friday, April 19, 2019 @ 01:41:06
  Author: kkeen
Revision: 452013

archrelease: copy trunk to community-x86_64

Added:
  cmatrix/repos/community-x86_64/PKGBUILD
    (from rev 452012, cmatrix/trunk/PKGBUILD)
  cmatrix/repos/community-x86_64/cmatrix-tty
    (from rev 452012, cmatrix/trunk/cmatrix-tty)
Deleted:
  cmatrix/repos/community-x86_64/PKGBUILD
  cmatrix/repos/community-x86_64/cmatrix-tty

-------------+
 PKGBUILD    |  112 +++++++++++++++++++++++++++++++---------------------------
 cmatrix-tty |   78 ++++++++++++++++++++--------------------
 2 files changed, 100 insertions(+), 90 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-19 01:40:53 UTC (rev 452012)
+++ PKGBUILD	2019-04-19 01:41:06 UTC (rev 452013)
@@ -1,51 +0,0 @@
-# Maintainer: Kyle Keen <keenerd at gmail.com>
-# Contributor: Jonathan Steel <jsteel at archlinux.org>
-
-pkgname=cmatrix
-pkgver=1.2
-pkgrel=1
-pkgdesc="A curses-based scrolling 'Matrix'-like screen"
-arch=('x86_64')
-url="http://www.asty.org/cmatrix/"
-license=('GPL3')
-depends=('ncurses')
-makedepends=('fontconfig')
-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"
-        "cmatrix-tty")
-md5sums=('f74707c4237dc2f33a7fce9dea8395ca'
-         '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}
-}
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  CPPFLAGS="-D_FORTIFY_SOURCE=0" ./configure \
-    --prefix=/usr --mandir=/usr/share/man
-
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  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"
-  rm -f "$pkgdir/usr/share/fonts/misc/fonts.dir"
-
-  for i in AUTHORS NEWS COPYING README ChangeLog INSTALL; do
-    install -Dm644 $i "$pkgdir/usr/share/doc/$pkgname/$i"
-  done
-}

Copied: cmatrix/repos/community-x86_64/PKGBUILD (from rev 452012, cmatrix/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-04-19 01:41:06 UTC (rev 452013)
@@ -0,0 +1,61 @@
+# Maintainer: Kyle Keen <keenerd at gmail.com>
+# Contributor: Jonathan Steel <jsteel at archlinux.org>
+
+pkgname=cmatrix
+pkgver=2.0
+pkgrel=1
+pkgdesc="A curses-based scrolling 'Matrix'-like screen"
+arch=('x86_64')
+url="http://www.asty.org/cmatrix/"
+license=('GPL3')
+depends=('ncurses')
+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/v$pkgver.tar.gz"
+        "cmatrix-tty")
+md5sums=('c2aee6d44c4d46df6f16dca2a3dc18ad'
+         '6bb2431c23350cb2082e14b6ba761760')
+
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  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
+
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver/build"
+
+  make DESTDIR="$pkgdir" install
+
+  # 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"
+}

Deleted: cmatrix-tty
===================================================================
--- cmatrix-tty	2019-04-19 01:40:53 UTC (rev 452012)
+++ cmatrix-tty	2019-04-19 01:41:06 UTC (rev 452013)
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-# a basic script for maximum pretty
-
-# X-based modes
-if [[ -n "$DISPLAY" && -x /usr/bin/aterm ]]; then
-  exec aterm -fn mtx -e cmatrix -abox
-  exit
-fi
-if [[ -n "$DISPLAY" && -x /usr/bin/xterm ]]; then
-  exec xterm -fn mtx -en iso1252 -e cmatrix -abx
-  exit
-fi
-
-# safe mode
-if [[ "$TERM" != "linux" ]]; then
-    exec cmatrix -abo
-    exit
-fi
-
-# custom font mode
-setfont matrix
-cmatrix -abol
-
-# and put the font back, if possible
-default_font=""
-if [[ -f /etc/vconsole.conf ]]; then
-    while IFS='=' read -r k v; do
-        if [ "${k# *}" = FONT ]; then
-             default_font="$v"
-        fi
-    done < /etc/vconsole.conf
-fi
-if [[ -n "$default_font" ]]; then
-    setfont "$default_font"
-else
-    echo "No font in vconsole.conf, could not restore."
-fi
-

Copied: cmatrix/repos/community-x86_64/cmatrix-tty (from rev 452012, cmatrix/trunk/cmatrix-tty)
===================================================================
--- cmatrix-tty	                        (rev 0)
+++ cmatrix-tty	2019-04-19 01:41:06 UTC (rev 452013)
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# a basic script for maximum pretty
+
+# X-based modes
+if [[ -n "$DISPLAY" && -x /usr/bin/aterm ]]; then
+  exec aterm -fn mtx -e cmatrix -abox
+  exit
+fi
+if [[ -n "$DISPLAY" && -x /usr/bin/xterm ]]; then
+  exec xterm -fn mtx -en iso1252 -e cmatrix -abx
+  exit
+fi
+
+# safe mode
+if [[ "$TERM" != "linux" ]]; then
+    exec cmatrix -abo
+    exit
+fi
+
+# custom font mode
+setfont matrix
+cmatrix -abol
+
+# and put the font back, if possible
+default_font=""
+if [[ -f /etc/vconsole.conf ]]; then
+    while IFS='=' read -r k v; do
+        if [ "${k# *}" = FONT ]; then
+             default_font="$v"
+        fi
+    done < /etc/vconsole.conf
+fi
+if [[ -n "$default_font" ]]; then
+    setfont "$default_font"
+else
+    echo "No font in vconsole.conf, could not restore."
+fi
+


More information about the arch-commits mailing list