[arch-commits] Commit in cmatrix/repos/community-x86_64 (4 files)
Andreas Radke
andyrtr at archlinux.org
Mon Jun 29 18:57:42 UTC 2020
Date: Monday, June 29, 2020 @ 18:57:42
Author: andyrtr
Revision: 656438
archrelease: copy trunk to community-x86_64
Added:
cmatrix/repos/community-x86_64/PKGBUILD
(from rev 656437, cmatrix/trunk/PKGBUILD)
cmatrix/repos/community-x86_64/cmatrix-tty
(from rev 656437, cmatrix/trunk/cmatrix-tty)
Deleted:
cmatrix/repos/community-x86_64/PKGBUILD
cmatrix/repos/community-x86_64/cmatrix-tty
-------------+
PKGBUILD | 119 ++++++++++++++++++++++++++++------------------------------
cmatrix-tty | 78 +++++++++++++++++++-------------------
2 files changed, 97 insertions(+), 100 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-06-29 18:57:32 UTC (rev 656437)
+++ PKGBUILD 2020-06-29 18:57:42 UTC (rev 656438)
@@ -1,61 +0,0 @@
-# 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"
-}
Copied: cmatrix/repos/community-x86_64/PKGBUILD (from rev 656437, cmatrix/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-06-29 18:57:42 UTC (rev 656438)
@@ -0,0 +1,58 @@
+# Maintainer: Kyle Keen <keenerd at gmail.com>
+# Contributor: Jonathan Steel <jsteel at archlinux.org>
+
+pkgname=cmatrix
+pkgver=2.0
+pkgrel=2
+pkgdesc="A curses-based scrolling 'Matrix'-like screen"
+arch=('x86_64')
+url="https://www.asty.org/cmatrix/"
+license=('GPL3')
+depends=('ncurses')
+# source already ships prebuild fonts - no need to add more deps to satisfy cmake
+makedepends=('cmake')
+optdepends=('kbd: cmatrix-tty custom font'
+ 'xterm: cmatrix-tty custom font')
+# "https://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() {
+ mkdir build
+}
+
+build() {
+ cd build
+ cmake ../$pkgname-$pkgver \
+ -D CMAKE_BUILD_TYPE=Release \
+ -D CMAKE_INSTALL_PREFIX=/usr \
+ #-D CONSOLE_FONTS_DIRS=/usr/share/kbd/consolefonts \
+ #-D X_FONTS_DIRS=/usr/share/fonts/misc \
+ #-D UNIX=true
+ make
+}
+
+package() {
+ # only the binary has a target to install
+ make -C build DESTDIR="$pkgdir" install
+
+ cd $pkgname-$pkgver
+
+ # install X font
+ install -D -m644 mtx.pcf "$pkgdir"/usr/share/fonts/misc/mtx.pcf
+
+ # install console font
+ install -D -m644 matrix.fnt "$pkgdir"/usr/share/kbd/consolefonts/matrix.fnt
+ install -D -m644 matrix.psf.gz "$pkgdir"/usr/share/kbd/consolefonts/matrix.psf.gz
+
+ # todo: fix the pretty wrapper
+ #install -Dm755 "$srcdir/cmatrix-tty" "$pkgdir/usr/bin/cmatrix-tty"
+
+ 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 2020-06-29 18:57:32 UTC (rev 656437)
+++ cmatrix-tty 2020-06-29 18:57:42 UTC (rev 656438)
@@ -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 656437, cmatrix/trunk/cmatrix-tty)
===================================================================
--- cmatrix-tty (rev 0)
+++ cmatrix-tty 2020-06-29 18:57:42 UTC (rev 656438)
@@ -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