Date: Thursday, May 3, 2018 @ 21:35:19 Author: eschwartz Revision: 318896
upgpkg: llpp 27-1 upstream release, etc. Restore a removed part of the build system, which I need since I'm obviously not using build.sh Update the original Makefile (still going strong after all this time!) to also build the manpages. Wow, that was terribly hard... Modified: llpp/trunk/Makefile llpp/trunk/PKGBUILD ----------+ Makefile | 13 ++++++++++--- PKGBUILD | 10 ++++++---- 2 files changed, 16 insertions(+), 7 deletions(-) Modified: Makefile =================================================================== --- Makefile 2018-05-03 20:15:56 UTC (rev 318895) +++ Makefile 2018-05-03 21:35:19 UTC (rev 318896) @@ -24,12 +24,14 @@ SRC = utils.ml keys.ml wsi.ml parser.ml config.ml main.ml OBJ = help.cmx ${SRC:.ml=.cmx} MOD = unix.cmxa str.cmxa lablgl.cmxa +SRCMANS = $(wildcard man/*.man) +MANS = ${SRCMANS:.man=.1} DISTFILES := Makefile ${SRC} link.c glfont.c keysym2ucs.c wsi.mli DISTFILES += mkhelp.sh KEYS README BUILDING -DISTFILES += misc/ +DISTFILES += misc/ man/ -all: llpp +all: llpp ${MANS} llpp: ${OBJ} link.o ${CAMLOPT} -o $@ ${CAMLFLAGS} link.o -cclib '${LDFLAGS}' ${MOD} ${OBJ} @@ -61,10 +63,13 @@ .mli.cmi: ${CAMLOPT} -c -o $@ ${CAMLFLAGS} $< +%.1: %.man man/asciidoc.conf + a2x -d manpage -f manpage --asciidoc-opts="-f man/asciidoc.conf --out-file=$@.xml" $< + .PHONY: all clean dist install clean: - ${RM} llpp link.o help.ml ${OBJ} ${OBJ:.cmx=.cmi} ${OBJ:.cmx=.o} + ${RM} llpp link.o help.ml ${OBJ} ${OBJ:.cmx=.cmi} ${OBJ:.cmx=.o} ${MANS} ${MANS:.1=.xml} dist: clean mkdir llpp-${VERSION} @@ -74,6 +79,8 @@ install: install -Dm755 llpp ${DESTDIR}${PREFIX}/bin/llpp + install -Dm644 -t ${DESTDIR}${PREFIX}/share/man/man1 man/*.1 install -Dm755 misc/llppac ${DESTDIR}${PREFIX}/bin/llppac + install -Dm755 misc/llpphtml ${DESTDIR}${PREFIX}/bin/llpphtml install -Dm644 misc/llpp.desktop ${DESTDIR}${PREFIX}/share/applications/llpp.desktop install -Dm644 README ${DESTDIR}${PREFIX}/share/licenses/llpp/README Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-05-03 20:15:56 UTC (rev 318895) +++ PKGBUILD 2018-05-03 21:35:19 UTC (rev 318896) @@ -3,8 +3,8 @@ # Contributor: earnestly pkgname=llpp -pkgver=26b.r109.ge27b9bb -_commit=e27b9bb90449cbb48fb11de0ada03cbc8226009e +pkgver=27 +_commit=87faa123127cc0746c28531874af7aaef1feb574 pkgrel=1 pkgdesc='opengl accelerated pdf viewer based on mupdf' arch=('x86_64') @@ -18,7 +18,7 @@ 'librsvg: llppac svg conversion' 'imagemagick: llppac image conversion' 'llpp-gc: clean nonextant history items') -makedepends=('git' 'ocaml' 'ocaml-lablgl' 'libmupdf' 'camlp4') +makedepends=('git' 'asciidoc' 'ocaml' 'ocaml-lablgl' 'libmupdf' 'camlp4') # llpp seems to go through build systems like fasion, holomorph has provided a # very nice Makefile for building this software which has served well for @@ -36,7 +36,7 @@ 'Makefile') sha256sums=('SKIP' '29a9550c6502c9de7db14f2f61edc6b77c7ebee9f1de8b865d4e1b219b9ae377' - '8c4df5ee65db53e87e01b81628f1dba7673d4ce9a2a5ccc5328f0e9053ac63ce') + '5cc71dfe8fb7f5d79c445f3c65ae92b48ff2d22e4bdb48408504a13b1ebd09b2') pkgver() { cd "${srcdir}"/${pkgname} @@ -47,6 +47,8 @@ prepare() { cd "${srcdir}"/${pkgname} + git revert --no-commit d4e7393edc61e94fe3e7a1482601da1f86b3f959 + patch -Np1 -i "${srcdir}"/no-quit-on-escape.patch }