summaryrefslogtreecommitdiff
path: root/source/ap
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2020-12-28 20:13:50 +0000
committerEric Hameleers <alien@slackware.com>2020-12-28 23:59:56 +0100
commiteae3926cf3efec6fbc3ce2b7df32c2ac37f90c77 (patch)
treea45091162ea1a5d7a058dee5abb93b26047670f7 /source/ap
parent45d4b225c605681c5d3570a2dc96140db758e9fb (diff)
downloadcurrent-eae3926cf3efec6fbc3ce2b7df32c2ac37f90c77.tar.gz
Mon Dec 28 20:13:50 UTC 202020201228201350
a/eudev-3.2.9-x86_64-3.txz: Rebuilt. Blacklist the snd-pcsp module. Thanks to Paulo2. Fix typo in watchdog.conf: ebc_c384_wdt -> ebc-c384_wdt. Thanks to Robby Workman. ap/terminus-font-4.49-noarch-1.txz: Upgraded. extra/brltty/brltty-6.2-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/ap')
-rw-r--r--source/ap/terminus-font/terminus-font.Makefile.paths.diff24
-rwxr-xr-xsource/ap/terminus-font/terminus-font.SlackBuild19
2 files changed, 23 insertions, 20 deletions
diff --git a/source/ap/terminus-font/terminus-font.Makefile.paths.diff b/source/ap/terminus-font/terminus-font.Makefile.paths.diff
index aeee814e..811f2226 100644
--- a/source/ap/terminus-font/terminus-font.Makefile.paths.diff
+++ b/source/ap/terminus-font/terminus-font.Makefile.paths.diff
@@ -1,15 +1,17 @@
---- ./Makefile.orig 2011-07-12 11:13:12.000000000 -0500
-+++ ./Makefile 2013-02-19 14:37:14.604914231 -0600
-@@ -81,9 +81,9 @@
- n12: $(PCF_N12)
+--- ./Makefile.orig 2020-12-23 14:15:36.000000000 -0600
++++ ./Makefile 2020-12-28 12:15:35.339015286 -0600
+@@ -85,10 +85,10 @@
+ all: $(PSF) $(PCF)
- DESTDIR =
--prefix = /usr/local
--psfdir = $(prefix)/share/consolefonts
--x11dir = $(prefix)/share/fonts/terminus
-+prefix = /usr
-+psfdir = $(prefix)/share/kbd/consolefonts
-+x11dir = $(prefix)/share/fonts/misc
+ DESTDIR =
+-prefix = /usr/local
+-psfdir = $(prefix)/share/consolefonts
+-x11dir = $(prefix)/share/fonts/terminus
+-otbdir = $(prefix)/share/fonts/terminus
++prefix = /usr
++psfdir = $(prefix)/share/kbd/consolefonts
++x11dir = $(prefix)/share/fonts/misc
++otbdir = $(prefix)/share/fonts/misc
install: $(PSF) $(PCF)
mkdir -p $(DESTDIR)$(psfdir)
diff --git a/source/ap/terminus-font/terminus-font.SlackBuild b/source/ap/terminus-font/terminus-font.SlackBuild
index 6c100d00..f167007a 100755
--- a/source/ap/terminus-font/terminus-font.SlackBuild
+++ b/source/ap/terminus-font/terminus-font.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=terminus-font
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -78,14 +78,15 @@ find . \
-exec chmod 644 {} \+
make || exit 1
-make install install-pcf-8bit install-psf-ref install-psf-vgaw DESTDIR=$PKG || exit 1
-
-# Install also the otb version (supported by the newer pango)
-mkdir -p $PKG/usr/share/fonts/misc
-for i in 12 14 16 18 20 22 24 26 28 32; do
- fonttosfnt -o $PKG/usr/share/fonts/misc/ter-u${i}b.otb ter-u${i}b.pcf
- fonttosfnt -o $PKG/usr/share/fonts/misc/ter-u${i}n.otb ter-u${i}n.pcf
-done
+make install install-pcf-8bit install-psf-ref install-psf-vgaw install-otb DESTDIR=$PKG || exit 1
+
+# This is done by "install-otb", but we'll leave it here as a reference.
+## Install also the otb version (supported by the newer pango)
+#mkdir -p $PKG/usr/share/fonts/misc
+#for i in 12 14 16 18 20 22 24 26 28 32; do
+# fonttosfnt -o $PKG/usr/share/fonts/misc/ter-u${i}b.otb ter-u${i}b.pcf
+# fonttosfnt -o $PKG/usr/share/fonts/misc/ter-u${i}n.otb ter-u${i}n.pcf
+#done
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
cp -a \