From ae43f02b3cdfb0f944bf352fa81911324ec594fb Mon Sep 17 00:00:00 2001 From: Daniel Sabogal Date: Sun, 14 Aug 2016 13:09:10 -0400 Subject: main/mdocml: upgrade to 1.13.4 --- main/mdocml/APKBUILD | 45 +++++++++++++--------------- main/mdocml/default-pager.patch | 11 ------- main/mdocml/pager.patch | 27 +++++++++++++++++ main/mdocml/shared-libmandoc.patch | 60 +++++++++++++++++++------------------- 4 files changed, 77 insertions(+), 66 deletions(-) delete mode 100644 main/mdocml/default-pager.patch create mode 100644 main/mdocml/pager.patch diff --git a/main/mdocml/APKBUILD b/main/mdocml/APKBUILD index 096b5700805..c266fefdd7d 100644 --- a/main/mdocml/APKBUILD +++ b/main/mdocml/APKBUILD @@ -1,32 +1,27 @@ # Maintainer: Natanael Copa pkgname=mdocml -pkgver=1.13.3 -pkgrel=6 +pkgver=1.13.4 +pkgrel=0 pkgdesc="mdoc/man compiler" url="http://mdocml.bsd.lv/" arch="all" license="BSD" -depends= -makedepends="sqlite-dev" +depends="" +makedepends="sqlite-dev zlib-dev" install="$pkgname.post-deinstall" triggers="$pkgname-apropos.trigger=/usr/share/man/*" subpackages="$pkgname-doc $pkgname-dev man $pkgname-apropos" -source="http://mdocml.bsd.lv/snapshots/mdocml-$pkgver.tar.gz +source="http://mdocml.bsd.lv/snapshots/$pkgname-$pkgver.tar.gz shared-libmandoc.patch - default-pager.patch + pager.patch mdocml-apropos.trigger man.conf " -_builddir="$srcdir"/$pkgname-$pkgver - +builddir="$srcdir"/$pkgname-$pkgver prepare() { - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done + default_prepare || return 1 + cd "$builddir" cat >configure.local<= 4) { +- cp = argv[0] + cmdlen - 4; +- if (strcmp(cp, "less") == 0) { +- argv[argc++] = mandoc_strdup("-T"); +- argv[argc++] = tag_files->tfn; +- } +- } + argv[argc++] = tag_files->ofn; + argv[argc] = NULL; + diff --git a/main/mdocml/shared-libmandoc.patch b/main/mdocml/shared-libmandoc.patch index c7df2fdb9aa..9f1029f4a23 100644 --- a/main/mdocml/shared-libmandoc.patch +++ b/main/mdocml/shared-libmandoc.patch @@ -1,13 +1,11 @@ ---- ./Makefile.orig -+++ ./Makefile -@@ -267,9 +267,15 @@ +--- mdocml-1.13.4/Makefile.orig ++++ mdocml-1.13.4/Makefile +@@ -311,9 +311,13 @@ WWW_OBJS = mdocml.tar.gz \ mdocml.sha256 -+#LIBMANDOC = libmandoc.a -+#MANDICLIB = $(LIBMANDOC) -+LIBMANDOC = libmandoc.so -+MANDOCLIB = -L. -lmandoc ++LIBMANDOC = libmandoc.so ++MANDOCLIB = -L. -lmandoc + # === USER CONFIGURATION =============================================== @@ -16,7 +14,7 @@ # === DEPENDENCY HANDLING ============================================== -@@ -296,7 +302,7 @@ +@@ -340,7 +344,7 @@ rm -f Makefile.local config.h config.h.old config.log config.log.old clean: @@ -25,41 +23,43 @@ rm -f mandoc $(BASE_OBJS) $(DB_OBJS) rm -f man.cgi $(CGI_OBJS) rm -f manpage $(MANPAGE_OBJS) -@@ -314,7 +320,7 @@ - mkdir -p $(DESTDIR)$(MANDIR)/man7 +@@ -360,7 +364,7 @@ $(INSTALL_PROGRAM) mandoc demandoc $(DESTDIR)$(BINDIR) + $(INSTALL_PROGRAM) soelim $(DESTDIR)$(BINDIR)/$(BINM_SOELIM) ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_MAN) - $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR) + $(INSTALL_LIB) $(LIBMANDOC) $(DESTDIR)$(LIBDIR) - $(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.h \ + $(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.h roff.h \ $(DESTDIR)$(INCLUDEDIR) $(INSTALL_MAN) mandoc.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1 -@@ -366,17 +372,20 @@ - libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS) - $(AR) rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS) +@@ -405,20 +409,20 @@ + @echo "$@ is out of date; please run ./configure" + @exit 1 --mandoc: $(MAIN_OBJS) libmandoc.a -- $(CC) $(LDFLAGS) -o $@ $(MAIN_OBJS) libmandoc.a $(DBLIB) +-libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS) +- ar rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS) +libmandoc.so: $(COMPAT_OBJS) $(LIBMANDOC_OBJS) -+ $(CC) $(LDFLAGS) -shared -o $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS) ++ $(CC) $(LDFLAGS) -shared -o $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS) $(LDADD) --manpage: $(MANPAGE_OBJS) libmandoc.a -- $(CC) $(LDFLAGS) -o $@ $(MANPAGE_OBJS) libmandoc.a $(DBLIB) +-mandoc: $(MAIN_OBJS) libmandoc.a +- $(CC) -o $@ $(LDFLAGS) $(MAIN_OBJS) libmandoc.a $(LDADD) +mandoc: $(MAIN_OBJS) $(LIBMANDOC) -+ $(CC) $(LDFLAGS) -o $@ $(MAIN_OBJS) $(MANDOCLIB) $(DBLIB) ++ $(CC) -o $@ $(LDFLAGS) $(MAIN_OBJS) $(MANDOCLIB) $(LDADD) --man.cgi: $(CGI_OBJS) libmandoc.a -- $(CC) $(LDFLAGS) $(STATIC) -o $@ $(CGI_OBJS) libmandoc.a $(DBLIB) +-manpage: $(MANPAGE_OBJS) libmandoc.a +- $(CC) -o $@ $(LDFLAGS) $(MANPAGE_OBJS) libmandoc.a $(LDADD) +manpage: $(MANPAGE_OBJS) $(LIBMANDOC) -+ $(CC) $(LDFLAGS) -o $@ $(MANPAGE_OBJS) $(MANDOCLIB) $(DBLIB) ++ $(CC) -o $@ $(LDFLAGS) $(MANPAGE_OBJS) $(MANDOCLIB) $(LDADD) --demandoc: $(DEMANDOC_OBJS) libmandoc.a -- $(CC) $(LDFLAGS) -o $@ $(DEMANDOC_OBJS) libmandoc.a +-man.cgi: $(CGI_OBJS) libmandoc.a +- $(CC) $(STATIC) -o $@ $(LDFLAGS) $(CGI_OBJS) libmandoc.a $(LDADD) +man.cgi: $(CGI_OBJS) $(LIBMANDOC) -+ $(CC) $(LDFLAGS) $(STATIC) -o $@ $(CGI_OBJS) $(MANDOCLIB) $(DBLIB) -+ -+demandoc: $(DEMANDOC_OBJS) $(LIBMANDOC) -+ $(CC) $(LDFLAGS) -o $@ $(DEMANDOC_OBJS) $(MANDOCLIB) ++ $(CC) $(STATIC) -o $@ $(LDFLAGS) $(CGI_OBJS) $(MANDOCLIB) $(LDADD) - # --- maintainer targets --- +-demandoc: $(DEMANDOC_OBJS) libmandoc.a +- $(CC) -o $@ $(LDFLAGS) $(DEMANDOC_OBJS) libmandoc.a $(LDADD) ++demandoc: $(DEMANDOC_OBJS) $(LIBMANDOC) ++ $(CC) -o $@ $(LDFLAGS) $(DEMANDOC_OBJS) $(MANDOCLIB) $(LDADD) + soelim: $(SOELIM_OBJS) + $(CC) -o $@ $(LDFLAGS) $(SOELIM_OBJS) -- cgit v1.2.3