summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Gregoratto2019-05-05 17:00:09 +1000
committerStephen Gregoratto2019-05-05 17:00:09 +1000
commite2aa13409d4b0e32f224724e7179dc213e5387ea (patch)
tree0779279e3746bed7da1437933474d78df225d449
parent27ab5e1e8a7b77734988aa5f20bf68e039622099 (diff)
downloadaur-docbook2mdoc.tar.gz
Update to 1.1.0, promote libbsd as proper dep
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD12
-rw-r--r--docbook2mdoc.patch33
3 files changed, 33 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0dd12e54ce5..1ac8b4a7152 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
pkgbase = docbook2mdoc
pkgdesc = DocBook refentry to mdoc(7) converter
- pkgver = 1.0.0
- pkgrel = 1
+ pkgver = 1.1.0
+ pkgrel = 0
url = https://mandoc.bsd.lv/docbook2mdoc/
arch = i686
arch = x86_64
arch = armv6h
arch = armv7h
license = custom: ISC
- makedepends = libbsd
- source = https://mandoc.bsd.lv/docbook2mdoc//snapshots/docbook2mdoc-1.0.0.tgz
+ depends = libbsd
+ source = https://mandoc.bsd.lv/docbook2mdoc//snapshots/docbook2mdoc-1.1.0.tgz
source = docbook2mdoc.patch
- sha256sums = 940b774abfc9fb60c8d9cf46cecbf704c5a60fbb4f6ca85073fdfda26706629c
- sha256sums = c2570e46266fe64d6493095ec29da1b77919bc7fcc314e1d40e9a383e3a7a796
+ sha256sums = 9fc6411cf041ff10e76f19a50a142075a8df9d343f248e20d8fc98bf8e547c71
+ sha256sums = da7090a483da4a7298dedd26bf59d5ac0b749f2d445c49f831e2dd5049f471f2
pkgname = docbook2mdoc
diff --git a/PKGBUILD b/PKGBUILD
index 5938b5503aa..afa5e1d7b3e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,16 @@
# Maintainer: Stephen Gregoratto <dev@sgregoratto.me>
pkgname=docbook2mdoc
-pkgver=1.0.0
-pkgrel=1
+pkgver=1.1.0
+pkgrel=0
pkgdesc='DocBook refentry to mdoc(7) converter'
+url='https://mandoc.bsd.lv/docbook2mdoc/'
license=('custom: ISC')
arch=('i686' 'x86_64' 'armv6h' 'armv7h')
-url='https://mandoc.bsd.lv/docbook2mdoc/'
-makedepends=('libbsd')
+depends=('libbsd')
source=("$url/snapshots/$pkgname-$pkgver.tgz"
"$pkgname.patch")
-sha256sums=('940b774abfc9fb60c8d9cf46cecbf704c5a60fbb4f6ca85073fdfda26706629c'
- 'c2570e46266fe64d6493095ec29da1b77919bc7fcc314e1d40e9a383e3a7a796')
+sha256sums=('9fc6411cf041ff10e76f19a50a142075a8df9d343f248e20d8fc98bf8e547c71'
+ 'da7090a483da4a7298dedd26bf59d5ac0b749f2d445c49f831e2dd5049f471f2')
prepare() {
cd "$pkgname-$pkgver"
diff --git a/docbook2mdoc.patch b/docbook2mdoc.patch
index 1c74bd039c3..1399b0f520d 100644
--- a/docbook2mdoc.patch
+++ b/docbook2mdoc.patch
@@ -1,17 +1,26 @@
-Chunk 1-2: Correct prefix/dirs for Arch
-Chunk 3: Enable libbsd TAILQ_.*_SAFE macros
-diff -ura docbook2mdoc-1.0.0-old/Makefile docbook2mdoc-1.0.0-new/Makefile
---- docbook2mdoc-1.0.0-old/Makefile 2019-04-18 04:31:23.000000000 +1000
-+++ docbook2mdoc-1.0.0-new/Makefile 2019-04-18 21:30:56.454641858 +1000
+Chunk 1,3: Correct prefix/dirs for Arch
+Chunk 2,4: Compile/link with libbsd
+diff -ura docbook2mdoc-1.1.0-old/Makefile docbook2mdoc-1.1.0-new/Makefile
+--- docbook2mdoc-1.1.0-old/Makefile 2019-05-02 23:37:55.000000000 +1000
++++ docbook2mdoc-1.1.0-new/Makefile 2019-05-05 16:43:54.608788611 +1000
@@ -1,7 +1,7 @@
- VERSION = 1.0.0
+ VERSION = 1.1.0
CFLAGS += -g -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
WWWPREFIX = /var/www/vhosts/mdocml.bsd.lv/htdocs/docbook2mdoc
-PREFIX = /usr/local
+PREFIX = /usr
- HEADS = node.h parse.h macro.h format.h
- SRCS = node.c parse.c macro.c docbook2mdoc.c tree.c main.c
+ HEADS = xmalloc.h node.h parse.h reorg.h macro.h format.h
+ SRCS = xmalloc.c node.c parse.c reorg.c macro.c docbook2mdoc.c tree.c main.c
+@@ -11,7 +11,7 @@
+ all: docbook2mdoc
+
+ docbook2mdoc: $(OBJS)
+- $(CC) -g -o $@ $(OBJS)
++ $(CC) -lbsd -g -o $@ $(OBJS)
+
+ statistics: statistics.o xmalloc.o
+ $(CC) -g -o $@ statistics.o xmalloc.o
@@ -20,9 +20,9 @@
install: all
@@ -20,13 +29,13 @@ diff -ura docbook2mdoc-1.0.0-old/Makefile docbook2mdoc-1.0.0-new/Makefile
+ mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
install -m 0755 docbook2mdoc $(DESTDIR)$(PREFIX)/bin
- install -m 0444 docbook2mdoc.1 $(DESTDIR)$(PREFIX)/man/man1
-+ install -m 0444 docbook2mdoc.1 $(DESTDIR)$(PREFIX)/share/man/man1
++ install -m 0644 docbook2mdoc.1 $(DESTDIR)$(PREFIX)/share/man/man1
installwww: www
mkdir -p $(WWWPREFIX)/snapshots
-diff -ura docbook2mdoc-1.0.0-old/node.h docbook2mdoc-1.0.0-new/node.h
---- docbook2mdoc-1.0.0-old/node.h 2019-04-18 04:31:23.000000000 +1000
-+++ docbook2mdoc-1.0.0-new/node.h 2019-04-18 21:17:26.519395568 +1000
+diff -ura docbook2mdoc-1.1.0-old/node.h docbook2mdoc-1.1.0-new/node.h
+--- docbook2mdoc-1.1.0-old/node.h 2019-05-02 23:37:55.000000000 +1000
++++ docbook2mdoc-1.1.0-new/node.h 2019-05-05 16:43:10.234451546 +1000
@@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.