Subject: [alpine-aports] [PATCH 1/1] main/txt2man: upgrade to 1.6.0

From: Daniel Sabogal <[email-masked]>
Date: Sun, 28 Aug 2016 13:02:04 -0400

---
 main/txt2man/APKBUILD         | 41 +++++++++++++++--------------------------
 main/txt2man/fixbashism.patch | 14 --------------
 main/txt2man/makefile.patch   |  6 +++---
 3 files changed, 18 insertions(+), 43 deletions(-)
 delete mode 100644 main/txt2man/fixbashism.patch

diff --git a/main/txt2man/APKBUILD b/main/txt2man/APKBUILD
index 72079b7..0d674a0 100644
--- a/main/txt2man/APKBUILD
+++ b/main/txt2man/APKBUILD
@@ -1,42 +1,31 @@
 # Contributor: Natanael Copa <[email-masked]>
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=txt2man
-pkgver=1.5.6
+pkgver=1.6.0
 pkgrel=0
 pkgdesc="Convert flat ASCII text to man page format"
-url="http://mvertes.free.fr/txt2man/"
+url="https://github.com/mvertes/txt2man"
 arch="noarch"
-license="GPLv2+"
+license="GPL2+"
 depends="gawk"
 makedepends=
-install=""
 subpackages="$pkgname-doc"
-source="http://mvertes.free.fr/download/txt2man-$pkgver.tar.gz
-	fixbashism.patch
+source="$pkgname-$pkgver.tar.gz::https://github.com/mvertes/$pkgname/archive/$pkgname-$pkgver.tar.gz
 	makefile.patch"
 
-_builddir="$srcdir"/txt2man-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	make
-}
+builddir="$srcdir/$pkgname-$pkgname-$pkgver"
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" prefix=/usr mandir=/usr/share/man \
+	make -C "$builddir" \
+		DESTDIR="$pkgdir" \
+		prefix=/usr \
+		mandir=/usr/share/man \
 		install || return 1
 }
 
-md5sums="f301b3dc1872fab1b7740f9f69ff281b  txt2man-1.5.6.tar.gz
-586f2e01dde9ef07a2734866797f8646  fixbashism.patch
-311fe2373e54b15eda845467ce68cd72  makefile.patch"
+md5sums="71f4a1758f19759f8f7d20bd92d53fda  txt2man-1.6.0.tar.gz
+ef7f2806d60d1c987644e7f9f507da01  makefile.patch"
+sha256sums="f6939e333a12e1ecceccaa547b58f4bf901a580cd2d8f822f8c292934c920c99  txt2man-1.6.0.tar.gz
+e695ef0ffc8fa535f03cbc3993de618383e93d0c735feea2128c74463b85e083  makefile.patch"
+sha512sums="7ec2cc0bb685d890cf06504d4faacf7a02c5a321963effb71ff63b7310f64f092e666c055c1dbdb699958a62272fe4dc0f31f3947ca6895aa425753a11b75379  txt2man-1.6.0.tar.gz
+e91ad93ddd646b06cb75c26e666e5122934172d25513424f04b9f56ce9cd57f1327f9c53c3d59002d76765c272aced5d75e0b48318d3b82d447560c3a031ef58  makefile.patch"
diff --git a/main/txt2man/fixbashism.patch b/main/txt2man/fixbashism.patch
deleted file mode 100644
index f31059d..0000000
--- a/main/txt2man/fixbashism.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./bookman.orig
-+++ ./bookman
-@@ -83,9 +83,9 @@
- shift $(($OPTIND - 1))
- date=${date:-$(date +'%d %B %Y')}
- 
--[[ $1 ]] || set -- $(while read; do echo $REPLY; done)
-+[ -n "$1" ] || set -- $(while read REPLY; do echo $REPLY; done)
- 
--[[ $outfile ]] && post="$post >$outfile"
-+[ -n "$outfile" ] && post="$post >$outfile"
- 
- {
- 	# Compute table of content from postscript output.
diff --git a/main/txt2man/makefile.patch b/main/txt2man/makefile.patch
index 617d4b0..47e99e4 100644
--- a/main/txt2man/makefile.patch
+++ b/main/txt2man/makefile.patch
@@ -5,16 +5,16 @@
  prefix ?= /usr/local
 +bindir ?= $(prefix)/bin
 +mandir ?= $(prefix)/share/man
- version = txt2man-1.5.6
+ version = txt2man-1.6.0
  BIN = src2man bookman txt2man
  MAN1 = src2man.1 txt2man.1 bookman.1
 @@ -7,9 +9,9 @@
  all: $(MAN1)
  
  install: $(MAN1)
--	mkdir -p $(prefix)/bin $(prefix)/man/man1
+-	mkdir -p $(prefix)/bin $(prefix)/share/man/man1
 -	cp $(BIN) $(prefix)/bin/
--	cp $(MAN1) $(prefix)/man/man1
+-	cp $(MAN1) $(prefix)/share/man/man1
 +	mkdir -p $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
 +	cp $(BIN) $(DESTDIR)$(bindir)
 +	cp $(MAN1) $(DESTDIR)$(mandir)/man1
-- 
2.8.3

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---