From 6b731eecdf600d8d435d129bf2838e3babb77c56 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Mon, 29 Dec 2014 10:47:41 +0000 Subject: [PATCH] main/mdocml: build shared, add 'man' and trigger for db --- main/mdocml/APKBUILD | 50 ++++++++++++++--------- main/mdocml/man.conf | 55 +++++++++++++++++++++++++ main/mdocml/man.sh | 57 -------------------------- main/mdocml/mdocml.post-deinstall | 3 ++ main/mdocml/mdocml.trigger | 4 ++ main/mdocml/shared-libmandoc.patch | 65 ++++++++++++++++++++++++++++++ 6 files changed, 157 insertions(+), 77 deletions(-) create mode 100644 main/mdocml/man.conf delete mode 100644 main/mdocml/man.sh create mode 100644 main/mdocml/mdocml.post-deinstall create mode 100644 main/mdocml/mdocml.trigger create mode 100644 main/mdocml/shared-libmandoc.patch diff --git a/main/mdocml/APKBUILD b/main/mdocml/APKBUILD index 4ddc9c2e099..a221a8b96a4 100644 --- a/main/mdocml/APKBUILD +++ b/main/mdocml/APKBUILD @@ -1,53 +1,63 @@ # Maintainer: Natanael Copa pkgname=mdocml pkgver=1.13.2 -pkgrel=0 +pkgrel=1 pkgdesc="mdoc/man compiler" url="http://mdocml.bsd.lv/" arch="all" license="BSD" depends= -makedepends= -install= +makedepends="sqlite-dev" +install="$pkgname.post-deinstall" +triggers="$pkgname.trigger=/usr/share/man/*" subpackages="$pkgname-doc $pkgname-dev $pkgname-man" -source="http://mdocml.bsd.lv/snapshots/mdocml-$pkgver.tar.gz man.sh" +source="http://mdocml.bsd.lv/snapshots/mdocml-$pkgver.tar.gz + shared-libmandoc.patch + man.conf + " _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" - ./configure || return 1 + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done + cat >configure.local<&2 - MANPATH=/usr/share/man -fi - -case $# in -1) - pagearg=$1 ;; -2) - section=man$1 - pagearg=$2 ;; -*) - echo "Usage: man [section] " - exit -esac - -paths=`echo "$MANPATH" | tr ":" " "` -pagefile=`find $paths | grep "/$section" | grep "/$pagearg\." | sort | head -n1` - -if [ -z "$pagefile" ]; then - echo -n No manual entry for $pagearg - [ $section ] && echo -n " in section $1 of the manual." - echo - exit -fi - -[ "$PAGER" ] || PAGER=less -tty -s <&1 || PAGER=cat - -MANWIDTH=${MANWIDTH:-78} -if [ $MANWIDTH = 0 ]; then - MANWIDTH=$(($(stty size | awk '{print $2}') - 2)) -fi - -case "$pagefile" in -*.bz2) - exec bzcat "$pagefile" | mandoc -Tutf8 -Owidth=$MANWIDTH | "$PAGER" ;; -*.gz) - exec zcat "$pagefile" | mandoc -Tutf8 -Owidth=$MANWIDTH | "$PAGER" ;; -*) - exec mandoc -Tutf8 -Owidth=$MANWIDTH "$pagefile" | "$PAGER" ;; -esac - -paths= -pagefile= -pagearg= -section= diff --git a/main/mdocml/mdocml.post-deinstall b/main/mdocml/mdocml.post-deinstall new file mode 100644 index 00000000000..77b2574d861 --- /dev/null +++ b/main/mdocml/mdocml.post-deinstall @@ -0,0 +1,3 @@ +#!/bin/sh + +exec rm -f /usr/share/man/mandoc.db diff --git a/main/mdocml/mdocml.trigger b/main/mdocml/mdocml.trigger new file mode 100644 index 00000000000..0f64443e698 --- /dev/null +++ b/main/mdocml/mdocml.trigger @@ -0,0 +1,4 @@ +#!/bin/sh + +rm -f /usr/share/man/mandoc.db +exec /usr/sbin/makewhatis -a /usr/share/man diff --git a/main/mdocml/shared-libmandoc.patch b/main/mdocml/shared-libmandoc.patch new file mode 100644 index 00000000000..9763c6da539 --- /dev/null +++ b/main/mdocml/shared-libmandoc.patch @@ -0,0 +1,65 @@ +--- ./Makefile.orig ++++ ./Makefile +@@ -262,9 +262,15 @@ + WWW_OBJS = mdocml.tar.gz \ + mdocml.sha256 + ++#LIBMANDOC = libmandoc.a ++#MANDICLIB = $(LIBMANDOC) ++LIBMANDOC = libmandoc.so ++MANDOCLIB = -L. -lmandoc ++ + # === USER CONFIGURATION =============================================== + + include Makefile.local ++CFLAGS += -fPIC + + # === DEPENDENCY HANDLING ============================================== + +@@ -291,7 +297,7 @@ + rm -f Makefile.local config.h config.h.old config.log config.log.old + + clean: +- rm -f libmandoc.a $(LIBMANDOC_OBJS) $(COMPAT_OBJS) ++ rm -f $(LIBMANDOC) $(LIBMANDOC_OBJS) $(COMPAT_OBJS) + rm -f mandoc $(BASE_OBJS) $(DB_OBJS) + rm -f man.cgi $(CGI_OBJS) + rm -f manpage $(MANPAGE_OBJS) +@@ -308,7 +314,7 @@ + mkdir -p $(DESTDIR)$(MANDIR)/man3 + mkdir -p $(DESTDIR)$(MANDIR)/man7 + $(INSTALL_PROGRAM) mandoc demandoc $(DESTDIR)$(BINDIR) +- $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR) ++ $(INSTALL_LIB) $(LIBMANDOC) $(DESTDIR)$(LIBDIR) + $(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.h \ + $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_MAN) mandoc.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1 +@@ -361,17 +367,20 @@ + libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS) + $(AR) rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS) + +-mandoc: $(MAIN_OBJS) libmandoc.a +- $(CC) $(LDFLAGS) -o $@ $(MAIN_OBJS) libmandoc.a $(DBLIB) ++libmandoc.so: $(COMPAT_OBJS) $(LIBMANDOC_OBJS) ++ $(CC) $(LDFLAGS) -shared -o $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS) + +-manpage: $(MANPAGE_OBJS) libmandoc.a +- $(CC) $(LDFLAGS) -o $@ $(MANPAGE_OBJS) libmandoc.a $(DBLIB) ++mandoc: $(MAIN_OBJS) $(LIBMANDOC) ++ $(CC) $(LDFLAGS) -o $@ $(MAIN_OBJS) $(MANDOCLIB) $(DBLIB) + +-man.cgi: $(CGI_OBJS) libmandoc.a +- $(CC) $(LDFLAGS) $(STATIC) -o $@ $(CGI_OBJS) libmandoc.a $(DBLIB) ++manpage: $(MANPAGE_OBJS) $(LIBMANDOC) ++ $(CC) $(LDFLAGS) -o $@ $(MANPAGE_OBJS) $(MANDOCLIB) $(DBLIB) + +-demandoc: $(DEMANDOC_OBJS) libmandoc.a +- $(CC) $(LDFLAGS) -o $@ $(DEMANDOC_OBJS) libmandoc.a ++man.cgi: $(CGI_OBJS) $(LIBMANDOC) ++ $(CC) $(LDFLAGS) $(STATIC) -o $@ $(CGI_OBJS) $(MANDOCLIB) $(DBLIB) ++ ++demandoc: $(DEMANDOC_OBJS) $(LIBMANDOC) ++ $(CC) $(LDFLAGS) -o $@ $(DEMANDOC_OBJS) $(MANDOCLIB) + + # --- maintainer targets --- +