Change conf.h, ...

5 files changed, 50 insertions, 124 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d19e2d0f4d9f..6fd7122cd11e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Feb 21 06:59:54 UTC 2018
+# Sat Oct 23 08:48:32 UTC 2021
 pkgbase = fbpad-git
 	pkgdesc = A small linux framebuffer virtual terminal.
-	pkgver = r271.66eb566
+	pkgver = r296.1d8d9f6
 	pkgrel = 1
 	url = http://repo.or.cz/w/fbpad.git
 	install = fbpad-git.install
@@ -14,22 +14,18 @@ pkgbase = fbpad-git
 	makedepends = ttf-dejavu
 	provides = fbpad
 	conflicts = fbpad
-	source = fbpad-git::git://repo.or.cz/fbpad.git
+	source = fbpad-git::git+git://repo.or.cz/fbpad.git
 	source = conf.h
 	source = fbpad-256.info
-	source = LICENSE
 	md5sums = SKIP
-	md5sums = efe9649ca617e55d526921b0a9105c9e
+	md5sums = 27b6253c85f2febfa3cf13fe973f4544
 	md5sums = 185b9d6ec1c539213226a3e2509c7ccd
-	md5sums = ec67f29a7dec10f86ef31515ed657a91
 	sha1sums = SKIP
-	sha1sums = 4cd6b4cbf2c25626c4e4d60b21726d0baf6092d8
+	sha1sums = dc4a15129d0e13cdd3994fc81da3c470383a6079
 	sha1sums = dbb816fe37faf0acb4e1a916d7493787c2b647fc
-	sha1sums = 76a535243054e1fdd9caaa46a1571cd381d74353
 	sha256sums = SKIP
-	sha256sums = 6f964a7b68108de13bcd4a8825a713c67a7a928a5f664406fd6e21fb0247178b
+	sha256sums = 2df7b23d2cbcb907d0a895541f5f3d3d5e0d5f4ec652a2b13b0da693a9762af0
 	sha256sums = fb8ae049aa7d41fb285cbf7aa4487b28014273ebcfceefb4d58fb07018312e9c
-	sha256sums = 0ea8d51c57a3a59ca57428b6fe9b47fdb1fde281fc1b095c9832872e85b09a72
 
 pkgname = fbpad-git
 
diff --git a/PKGBUILD b/PKGBUILD
index f98c27f0b99a..9427291e3f2d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,72 +1,62 @@
 # Contributor: Sara <sara at archlinux dot us>
 # Maintainer: aksr <aksr at t-com dot me>
 pkgname=fbpad-git
-pkgver=r271.66eb566
+pkgver=r296.1d8d9f6
 pkgrel=1
 pkgdesc="A small linux framebuffer virtual terminal."
 arch=('i686' 'x86_64')
 url="http://repo.or.cz/w/fbpad.git"
 license=('ISC')
-groups=()
-depends=()
 makedepends=('git' 'ft2tf' 'ttf-dejavu')
-optdepends=()
-provides=('fbpad')
-conflicts=('fbpad')
-replaces=()
-backup=()
-options=()
+provides=("${pkgname%-*}")
+conflicts=("${pkgname%-*}")
 install=${pkgname}.install
-source=("$pkgname::git://repo.or.cz/fbpad.git"
-        'conf.h' 'fbpad-256.info' 'LICENSE')
+source=("$pkgname::git+git://repo.or.cz/fbpad.git"
+	'conf.h' 'fbpad-256.info')
 noextract=()
 md5sums=('SKIP'
-         'efe9649ca617e55d526921b0a9105c9e'
-         '185b9d6ec1c539213226a3e2509c7ccd'
-         'ec67f29a7dec10f86ef31515ed657a91')
+         '27b6253c85f2febfa3cf13fe973f4544'
+         '185b9d6ec1c539213226a3e2509c7ccd')
 sha1sums=('SKIP'
-          '4cd6b4cbf2c25626c4e4d60b21726d0baf6092d8'
-          'dbb816fe37faf0acb4e1a916d7493787c2b647fc'
-          '76a535243054e1fdd9caaa46a1571cd381d74353')
+          'dc4a15129d0e13cdd3994fc81da3c470383a6079'
+          'dbb816fe37faf0acb4e1a916d7493787c2b647fc')
 sha256sums=('SKIP'
-            '6f964a7b68108de13bcd4a8825a713c67a7a928a5f664406fd6e21fb0247178b'
-            'fb8ae049aa7d41fb285cbf7aa4487b28014273ebcfceefb4d58fb07018312e9c'
-            '0ea8d51c57a3a59ca57428b6fe9b47fdb1fde281fc1b095c9832872e85b09a72')
+            '2df7b23d2cbcb907d0a895541f5f3d3d5e0d5f4ec652a2b13b0da693a9762af0'
+            'fb8ae049aa7d41fb285cbf7aa4487b28014273ebcfceefb4d58fb07018312e9c')
 
 pkgver() {
-  cd $srcdir/$pkgname
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	cd $srcdir/$pkgname
+	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
-  cd $srcdir/$pkgname
-  ## Custom config.h
-  cp $srcdir/conf.h conf.h
+	cd $srcdir/$pkgname
+	## Custom config.h
+	cp $srcdir/conf.h conf.h
 }
 
 build() {
-  cd $srcdir/$pkgname
-  make
+	cd $srcdir/$pkgname
+	make
 }
 
 package() {
-  cd $srcdir/$pkgname
-  install -Dm755 ../$pkgname/fbpad $pkgdir/usr/bin/fbpad
-  install -Dm644 ../$pkgname/README $pkgdir/usr/share/doc/${pkgname%-*}/README
-  install -Dm644 ../LICENSE $pkgdir/usr/share/licenses/${pkgname%-*}/LICENSE
-  ## Compile terminfo
-  mkdir -p $pkgdir/usr/share/terminfo
-  tic -x -o $pkgdir/usr/share/terminfo $srcdir/fbpad-256.info
+	cd $srcdir/$pkgname
+	install -Dm755 ../$pkgname/fbpad $pkgdir/usr/bin/fbpad
+	install -Dm644 ../$pkgname/README $pkgdir/usr/share/doc/${pkgname%-*}/README
+	install -Dm644 ../LICENSE $pkgdir/usr/share/licenses/${pkgname%-*}/LICENSE
+	## Compile terminfo
+	mkdir -p $pkgdir/usr/share/terminfo
+	tic -x -o $pkgdir/usr/share/terminfo $srcdir/fbpad-256.info
 
-  ## Setup fonts
-  if [ -x /usr/bin/fbpad-mkfn ]; then FT2TF="fbpad-mkfn -h20 -w10"; SZ="17h120v100b0a1"; else FT2TF=ft2tf; SZ=6; fi
-  $FT2TF /usr/share/fonts/TTF/DejaVuSansMono.ttf:$SZ         > $srcdir/font-r.tf
-  $FT2TF /usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf:$SZ > $srcdir/font-i.tf
-  $FT2TF /usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf:$SZ    > $srcdir/font-b.tf
+	## Setup fonts
+	if [ -x /usr/bin/fbpad-mkfn ]; then FT2TF="fbpad-mkfn -h20 -w10"; SZ="17h120v100b0a1"; else FT2TF=ft2tf; SZ=6; fi
+	$FT2TF /usr/share/fonts/TTF/DejaVuSansMono.ttf:$SZ > $srcdir/font-r.tf
+	$FT2TF /usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf:$SZ > $srcdir/font-i.tf
+	$FT2TF /usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf:$SZ > $srcdir/font-b.tf
 
-  ## Install fonts
-  install -Dm644 ../font-r.tf $pkgdir/usr/share/${pkgname%-*}/font-r.tf
-  install -Dm644 ../font-i.tf $pkgdir/usr/share/${pkgname%-*}/font-i.tf
-  install -Dm644 ../font-b.tf $pkgdir/usr/share/${pkgname%-*}/font-b.tf
+	## Install fonts
+	install -Dm644 ../font-r.tf $pkgdir/usr/share/${pkgname%-*}/font-r.tf
+	install -Dm644 ../font-i.tf $pkgdir/usr/share/${pkgname%-*}/font-i.tf
+	install -Dm644 ../font-b.tf $pkgdir/usr/share/${pkgname%-*}/font-b.tf
 }
-
diff --git a/conf.h b/conf.h
index b6e93e133110..f91d7f3789c6 100644
--- a/conf.h
+++ b/conf.h
@@ -1,8 +1,5 @@
-/* framebuffer device */
-#define FBDEV		"/dev/fb0"
-
 /* list of tags */
-#define TAGS		"xnlhtr01uiva-"
+#define TAGS		"xnlhtr01uiva "
 #define TAGS_SAVED	""
 
 /* programs mapped to m-c, m-m, m-e */
@@ -10,8 +7,8 @@
 #define EDITOR		{"vim"}
 #define MAIL		{"mutt"}
 
-/* fbval_t should match framebuffer depth */
-typedef unsigned int fbval_t;
+/* TERM variable for launched programs */
+#define TERM        "linux"
 
 /* tinyfont files for regular, italic, and bold fonts */
 #define FR		"/usr/share/fbpad/font-r.tf"
diff --git a/config.h b/config.h
deleted file mode 100644
index e50ccfa7500b..000000000000
--- a/config.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* framebuffer device */
-#define FBDEV		"/dev/fb0"
-
-/* list of tags */
-#define TAGS		"xnlhtr01uiva-"
-#define TAGS_SAVED	""
-
-/* programs mapped to m-c, m-m, m-e */
-#define SHELL		{"bash"}
-#define EDITOR		{"vim"}
-#define MAIL		{"mutt"}
-
-/* fbval_t should match framebuffer depth */
-typedef unsigned int fbval_t;
-
-/* tinyfont files for regular, italic, and bold fonts */
-#define FR		"/usr/share/fbpad/font.tf"
-#define FI		"/usr/share/fbpad/fonti.tf"
-#define FB		"/usr/share/fbpad/fontb.tf"
-
-/* foreground and background colors */
-#define FGCOLOR		0
-#define BGCOLOR		15
-
-/* where to write the screen shot */
-#define SCRSHOT		"/tmp/scr"
-
-/* lock command password; NULL disables locking */
-#define PASS		NULL
-
-/* optimized version of fb_val() */
-#define FB_VAL(r, g, b)	fb_val((r), (g), (b))
-
-/* black */
-#define COLOR0		0x000000
-#define COLOR8		0x555555
-/* red */
-#define COLOR1		0xaa0000
-#define COLOR9		0xff5555
-/* green */
-#define COLOR2		0x00aa00
-#define COLOR10		0x55ff55
-/* yellow */
-#define COLOR3		0xaa5500
-#define COLOR11		0xffff55
-/* blue */
-#define COLOR4		0x0000aa
-#define COLOR12		0x5555ff
-/* magenta */
-#define COLOR5		0xaa00aa
-#define COLOR13		0xff55ff
-/* cyan */
-#define COLOR6		0x00aaaa
-#define COLOR14		0x55ffff
-/* white */
-#define COLOR7		0xaaaaaa
-#define COLOR15		0xffffff
diff --git a/fbpad-git.install b/fbpad-git.install
index 499102b15a44..27db7f111920 100644
--- a/fbpad-git.install
+++ b/fbpad-git.install
@@ -1,9 +1,9 @@
 post_install(){
-  echo "==> To use fbpad, read /usr/share/doc/fbpad-git/README."
-  echo "==> Edit config.h in fbpad's PKGBUILD directory and"
-  echo "    rebuild package if you want to change settings."
-  echo "==> Add 'export TERM=fbpad-256' to your shell rc for"
-  echo "    256-color support."
-  echo "==> Add 'export NCURSES_NO_UTF8_ACS=1' to your shell rc"
-  echo "    if you are using dvtm."
+	echo "==> To use fbpad, read /usr/share/doc/fbpad-git/README."
+	echo "==> Edit conf.h in fbpad's PKGBUILD directory and"
+	echo "    rebuild package if you want to change settings."
+	echo "==> Add 'export TERM=fbpad-256' to your shell rc for"
+	echo "    256-color support."
+	echo "==> Add 'export NCURSES_NO_UTF8_ACS=1' to your shell rc"
+	echo "    if you are using dvtm."
 }