packaging cleanup

2 files changed, 24 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e5e6c6fe04cf..4f9491106425 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,12 @@
-# Generated by makepkg 4.2.1
-# Sat Jun 13 07:03:55 UTC 2015
 pkgbase = tcpstat
-	pkgdesc = network interface statistics, with output similar to vmstat(8)
+	pkgdesc = Network interface statistics, with output similar to vmstat(8)
 	pkgver = 1.5
-	pkgrel = 3
-	url = http://www.frenchfries.net/paul/tcpstat/
-	arch = i686
+	pkgrel = 4
+	url = https://frenchfries.net/paul/tcpstat
 	arch = x86_64
 	license = BSD
-	makedepends = coreutils
-	makedepends = gawk
-	makedepends = make
-	makedepends = gcc
-	makedepends = binutils
-	makedepends = glibc
-	makedepends = libpcap
-	depends = glibc
 	depends = libpcap
-	source = http://www.frenchfries.net/paul/tcpstat/tcpstat-1.5.tar.gz
-	md5sums = 93ca0ffb8f319ecf2e42ff925a7e6854
+	source = tcpstat-1.5.tar.gz::https://frenchfries.net/paul/tcpstat/tcpstat-1.5.tar.gz
+	sha256sums = 46fde9458cc5678264b0c5f2197f84ada9101951197fdeec5f04b0801fcff0ba
 
 pkgname = tcpstat
-
diff --git a/PKGBUILD b/PKGBUILD
index c7a4f1ff0a2d..cb5b7347f0c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,31 @@
+# Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
 # Contributor: Mark Smith <markzzzsmith@yahoo.com.au>
+
 pkgname=tcpstat
 pkgver=1.5
-pkgrel=3
-pkgdesc="network interface statistics, with output similar to vmstat(8)"
-arch=('i686' 'x86_64')
-url="http://www.frenchfries.net/paul/tcpstat/"
+pkgrel=4
+pkgdesc="Network interface statistics, with output similar to vmstat(8)"
+arch=('x86_64')
+url="https://frenchfries.net/paul/tcpstat"
 license=('BSD')
-depends=('glibc' 'libpcap')
-makedepends=('coreutils' 'gawk' 'make' 'gcc' 'binutils' 'glibc' 'libpcap')
-source=($url$pkgname-$pkgver.tar.gz)
-md5sums=('93ca0ffb8f319ecf2e42ff925a7e6854')
+depends=('libpcap')
+source=("$pkgname-$pkgver.tar.gz::$url/$pkgname-$pkgver.tar.gz")
+sha256sums=('46fde9458cc5678264b0c5f2197f84ada9101951197fdeec5f04b0801fcff0ba')
 
-build() {
+PURGE_TARGETS=('usr/share/man/man1/tcpprof.1')
 
-	cd "$srcdir/$pkgname-$pkgver"
+prepare() {
+	cd "$pkgname-$pkgver"
+	./configure --prefix=/usr --mandir=/usr/share/man/
+}
 
-	./configure --prefix=/usr
-	make
+build() {
+	cd "$pkgname-$pkgver"
+	make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
-	# tcpprof not built, so don't install manual page
-	rm $pkgdir/usr/man/man1/tcpprof.1
-
-	install -D -m444 LICENSE \
-		$pkgdir/usr/share/licenses/$pkgname/LICENSE
+	install -Dm444 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
 }