teapot: fix build, deps; use https for sources, url

2 files changed, 44 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ed45e4b93e4b..04b19f12693f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 pkgbase = teapot
-	pkgdesc = Table Editor and Planner. A 3D curses based spreadsheet for mathy people.
+	pkgdesc = Table Editor and Planner: a 3D curses based spreadsheet for mathy people
 	pkgver = 2.3.0
-	pkgrel = 2
-	url = http://www.syntax-k.de/projekte/teapot/
+	pkgrel = 3
+	url = https://www.syntax-k.de/projekte/teapot
 	arch = i686
 	arch = x86_64
 	license = GPL3
 	makedepends = cmake
+	makedepends = fltk
+	makedepends = libtirpc
 	depends = ncurses
 	optdepends = fltk: for gui
-	conflicts = mesa-demos
-	source = http://www.syntax-k.de/projekte/teapot/teapot-2.3.0.tar.gz
-	source = http://www.syntax-k.de/projekte/teapot/Teapot-2.3.0-win32.zip
-	md5sums = ae59f90a5f70971703abccf0991dbd58
-	md5sums = e2a7a7efccc3478c3993325bc02275b3
+	source = https://www.syntax-k.de/projekte/teapot/teapot-2.3.0.tar.gz
+	source = https://www.syntax-k.de/projekte/teapot/Teapot-2.3.0-win32.zip
+	b2sums = e22e22573e0ca3b55718a12bed933b14e18ddf078a26a4fe9d782e62d28b2a6fe1603ff4c024f760dd4f5a4b31ac540086de6681f1db81bf64941018067c25ae
+	b2sums = dccb09c32a68211790edc85468b48389f66e69f312f3b033f83a833cb005ae6122a493ebaa73ec4f6873564cc446c3d26ed8fe0e26ad34953c484f7e2b551fb4
 
 pkgname = teapot
-
diff --git a/PKGBUILD b/PKGBUILD
index 6db92ec32b28..1c8896832eaf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,47 @@
-# Maintainer: Kyle Keen <keenerd@gmail.com>
+# Maintainer: éclairevoyant
+# Contributor: Kyle Keen <keenerd at gmail dot com>
+
 pkgname=teapot
 pkgver=2.3.0
-pkgrel=2
-pkgdesc="Table Editor and Planner.  A 3D curses based spreadsheet for mathy people."
+pkgrel=3
+pkgdesc="Table Editor and Planner: a 3D curses based spreadsheet for mathy people"
 arch=('i686' 'x86_64')
-#url="http://www.moria.de/~michael/teapot/"
-url="http://www.syntax-k.de/projekte/teapot/"
+url="https://www.syntax-k.de/projekte/teapot"
 license=('GPL3')
-depends=('ncurses')
+depends=(ncurses)
+makedepends=(cmake fltk libtirpc)
 optdepends=('fltk: for gui')
-makedepends=('cmake')
-conflicts=('mesa-demos')
-#source=(http://www.moria.de/~michael/$pkgname/$pkgname-$pkgver.tar.gz)
-source=(http://www.syntax-k.de/projekte/$pkgname/$pkgname-$pkgver.tar.gz
-        http://www.syntax-k.de/projekte/$pkgname/Teapot-$pkgver-win32.zip)
-md5sums=('ae59f90a5f70971703abccf0991dbd58'
-         'e2a7a7efccc3478c3993325bc02275b3')
+source=("$url/$pkgname-$pkgver.tar.gz"
+        "$url/Teapot-$pkgver-win32.zip")
+b2sums=('e22e22573e0ca3b55718a12bed933b14e18ddf078a26a4fe9d782e62d28b2a6fe1603ff4c024f760dd4f5a4b31ac540086de6681f1db81bf64941018067c25ae'
+        'dccb09c32a68211790edc85468b48389f66e69f312f3b033f83a833cb005ae6122a493ebaa73ec4f6873564cc446c3d26ed8fe0e26ad34953c484f7e2b551fb4')
+
+prepare() {
+	sed -i 's|include("${FLTK_USE_FILE}")|include_directories("${FLTK_INCLUDE_DIRS}")|' \
+		$pkgname-$pkgver/CMakeLists.txt
+}
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr CMakeLists.txt 
-  make teapot
+	export CFLAGS+=" -I/usr/include/tirpc"
+	# missing symbols when --as-needed is used
+	export LDFLAGS+=" -Wl,--no-as-needed -ltirpc"
+	cmake -B build -S $pkgname-$pkgver \
+		-DCMAKE_INSTALL_PREFIX=/usr
+	make -C build teapot
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  # todo, patch make install to not require Lyx
-  #make DESTDIR="$pkgdir" install
-  install -Dm755 teapot "$pkgdir/usr/bin/teapot"
-  mkdir -p  "$pkgdir/usr/share/teapot/"
-  find "$srcdir/Teapot-$pkgver-win32/" -type f -exec chmod -x '{}' \;
-  cp -r "$srcdir/Teapot-$pkgver-win32/share/doc/teapot/"  "$pkgdir/usr/share/"
-  cp -r "$srcdir/$pkgname-$pkgver/examples/" "$pkgdir/usr/share/teapot"
-  install -Dm644 teapot.1 "$pkgdir/usr/share/man/man1/teapot.1"
-}
+	install -Dm755 build/teapot -t "$pkgdir/usr/bin/"
+
+	pushd $pkgname-$pkgver
+	install -Dm644 teapot.1 -t "$pkgdir/usr/share/man/man1/"
+	mkdir "$pkgdir/usr/share/teapot/"
+	cp -r examples -t "$pkgdir/usr/share/teapot/"
+	popd
 
+	pushd Teapot-$pkgver-win32
+	find . -type f -exec chmod -x '{}' \;
+	cp -r share/doc/teapot -t "$pkgdir/usr/share/"
+	popd
+}