summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD40
-rw-r--r--configure.local16
-rw-r--r--mdocml-makefile.patch35
4 files changed, 45 insertions, 64 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0b98fb0e678..25282be82dd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,16 @@
-# Generated by mksrcinfo v8
-# Mon Dec 28 17:03:45 UTC 2015
pkgbase = mandoc
pkgdesc = A suite of tools compiling mdoc from the OpenBSD project
- pkgver = 1.9.9
+ pkgver = 1.13.4
pkgrel = 1
url = http://mdocml.bsd.lv/
- arch = x86_64
arch = i686
- license = ISC
- depends = glibc
- source = http://mdocml.bsd.lv/snapshots/mdocml-1.9.9.tar.gz
- source = mdocml-makefile.patch
- md5sums = d54e4b67308b44f895aa09c79cc6762c
- md5sums = 585956c2741ed2b29dce9a103161cffb
+ arch = x86_64
+ license = custom: ISC
+ depends = sqlite
+ source = http://mdocml.bsd.lv/snapshots/mdocml-1.13.4.tar.gz
+ source = configure.local
+ sha256sums = 0a55c1addb188071d6f784599303656b8465e98ec6b2f4f264e12fb96d79e0ef
+ sha256sums = 3821922c5cbafb93f48f8224befbd61c48f7742f46ef608b652cb545c46f8f87
pkgname = mandoc
diff --git a/PKGBUILD b/PKGBUILD
index d4fc917e843..c281b3379dd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,31 @@
-# Maintainer: Matheus de Alcantara <matheus.de.alcantara@gmail.com>
+# Maintainer: Ralph Holmes <ybden@ybden.com>
+# Contributor: Matheus de Alcantara <matheus.de.alcantara@gmail.com>
pkgname=mandoc
-pkgver=1.9.9
+pkgver=1.13.4
pkgrel=1
-pkgdesc="A suite of tools compiling mdoc from the OpenBSD project"
-arch=('x86_64' 'i686')
+pkgdesc='A suite of tools compiling mdoc from the OpenBSD project'
+arch=('i686' 'x86_64')
url='http://mdocml.bsd.lv/'
-license=('ISC')
-source=("http://mdocml.bsd.lv/snapshots/mdocml-${pkgver}.tar.gz"
- 'mdocml-makefile.patch')
-md5sums=('d54e4b67308b44f895aa09c79cc6762c'
- '585956c2741ed2b29dce9a103161cffb')
-depends=('glibc')
+license=('custom: ISC')
+depends=('sqlite')
+source=("http://mdocml.bsd.lv/snapshots/mdocml-$pkgver.tar.gz"
+ 'configure.local')
+sha256sums=('0a55c1addb188071d6f784599303656b8465e98ec6b2f4f264e12fb96d79e0ef'
+ '3821922c5cbafb93f48f8224befbd61c48f7742f46ef608b652cb545c46f8f87')
-prepare () {
- cd ${srcdir}/mdocml-${pkgver}
- patch < ${srcdir}/mdocml-makefile.patch
+prepare() {
+ cp "$srcdir"/configure.local mdocml-$pkgver
}
-build () {
- cd ${srcdir}/mdocml-${pkgver}
- make PREFIX=/usr/
+build() {
+ cd mdocml-$pkgver
+ ./configure
+ make
}
-package () {
- cd ${srcdir}/mdocml-${pkgver}
- make install DESTDIR=${pkgdir} PREFIX=/usr/
+package() {
+ cd mdocml-$pkgver
+ make -j1 install DESTDIR="$pkgdir"
+ install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}
diff --git a/configure.local b/configure.local
new file mode 100644
index 00000000000..2de54855c32
--- /dev/null
+++ b/configure.local
@@ -0,0 +1,16 @@
+PREFIX=/usr
+SBINDIR=$PREFIX/bin
+MANDIR=$PREFIX/share/man
+
+MANM_MAN=mandoc_man
+MANM_MDOC=mandoc_mdoc
+MANM_ROFF=mandoc_roff
+MANM_EQN=mandoc_eqn
+MANM_TBL=mandoc_tbl
+
+BINM_MAN=mman
+BINM_SOELIM=msoelim
+BINM_APROPOS=mapropos
+BINM_WHATIS=mwhatis
+
+CFLAGS="$CFLAGS -O2"
diff --git a/mdocml-makefile.patch b/mdocml-makefile.patch
deleted file mode 100644
index 8a10eb5b05e..00000000000
--- a/mdocml-makefile.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- Makefile 2009-10-20 16:34:06.000000000 -0200
-+++ Makefile.patch 2015-12-28 13:35:09.767019569 -0200
-@@ -3,11 +3,12 @@
- BINDIR = $(PREFIX)/bin
- INCLUDEDIR = $(PREFIX)/include
- LIBDIR = $(PREFIX)/lib
--MANDIR = $(PREFIX)/man
-+MANDIR = $(PREFIX)/share/man
- INSTALL_PROGRAM = install -m 0755
- INSTALL_DATA = install -m 0444
- INSTALL_LIB = install -m 0644
- INSTALL_MAN = $(INSTALL_DATA)
-+DESTDIR = /
-
- VERSION = 1.9.9
- VDATE = 21 October 2009
-@@ -99,12 +100,12 @@
- install -m 0444 mdocml-$(VERSION).md5 $(PREFIX)/snapshots/mdocml.md5
-
- install:
-- mkdir -p $(BINDIR)
-- mkdir -p $(MANDIR)/man1
-- mkdir -p $(MANDIR)/man7
-- $(INSTALL_PROGRAM) mandoc $(BINDIR)
-- $(INSTALL_MAN) mandoc.1 $(MANDIR)/man1
-- $(INSTALL_MAN) mdoc.7 $(MANDIR)/man7
-+ mkdir -p $(DESTDIR)$(BINDIR)
-+ mkdir -p $(DESTDIR)$(MANDIR)/man1
-+ #mkdir -p $(DESTDIR)$(MANDIR)/man7
-+ $(INSTALL_PROGRAM) mandoc $(DESTDIR)$(BINDIR)
-+ $(INSTALL_MAN) mandoc.1 $(DESTDIR)$(MANDIR)/man1
-+ #$(INSTALL_MAN) mdoc.7 $(DESTDIR)$(MANDIR)/man7
-
- uninstall:
- rm -f $(BINDIR)/mandoc