diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2019-08-25 00:16:07 -0300 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-08-26 09:12:59 +0000 |
| commit | a33e421da04f54e4a9398da416982720bbae84eb (patch) | |
| tree | 5e1c41572146a29b0b4baa19852f5ac79bfda2c4 /main | |
| parent | b9db7fe667705f60848dc816237d6958de7fe534 (diff) | |
| download | aports-a33e421da04f54e4a9398da416982720bbae84eb.tar.bz2 aports-a33e421da04f54e4a9398da416982720bbae84eb.tar.xz | |
main/mdocml: upgrade to 1.14.5
Diffstat (limited to 'main')
| -rw-r--r-- | main/mdocml/APKBUILD | 31 | ||||
| -rw-r--r-- | main/mdocml/pager.patch | 27 | ||||
| -rw-r--r-- | main/mdocml/shared-libmandoc.patch | 23 |
3 files changed, 27 insertions, 54 deletions
diff --git a/main/mdocml/APKBUILD b/main/mdocml/APKBUILD index 96e7d2b633..21adba681f 100644 --- a/main/mdocml/APKBUILD +++ b/main/mdocml/APKBUILD @@ -1,13 +1,12 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mdocml _pkgname=mandoc -pkgver=1.14.3 -pkgrel=3 +pkgver=1.14.5 +pkgrel=0 pkgdesc="mdoc/man compiler" url="http://mdocml.bsd.lv/" arch="all" -license="BSD" -depends="" +license="ISC and BSD-2-Clause and BSD-3-Clause" makedepends="zlib-dev" checkdepends="perl" install="$pkgname.post-deinstall" @@ -15,7 +14,6 @@ triggers="$pkgname-apropos.trigger=/usr/share/man/*" subpackages="$pkgname-doc $pkgname-dev man::noarch $pkgname-apropos $pkgname-soelim" source="http://mdocml.bsd.lv/snapshots/$_pkgname-$pkgver.tar.gz shared-libmandoc.patch - pager.patch outdated-warn-disable.patch " @@ -24,15 +22,15 @@ prepare() { default_prepare cd "$builddir" - cat >configure.local<<EOF -PREFIX=/usr -MANDIR=/usr/share/man -LIBDIR=/usr/lib -CFLAGS="$CFLAGS" -UTF8_LOCALE="en_US.UTF-8" -MANPATH_DEFAULT="/usr/share/man:/usr/local/man" -LN="ln -sf" -EOF + cat >configure.local<<-__EOF__ + PREFIX=/usr + MANDIR=/usr/share/man + LIBDIR=/usr/lib + CFLAGS="$CFLAGS" + UTF8_LOCALE="en_US.UTF-8" + MANPATH_DEFAULT="/usr/share/man:/usr/local/man" + LN="ln -sf" +__EOF__ } build() { @@ -75,7 +73,6 @@ soelim() { "$subpkgdir"/usr/bin/ } -sha512sums="cd638fbacb068fcd6191f2a4e941effc010e3ebf06a3e32847b892c2e561771d03d5bca8fbdf8434d6491f4b68df3f443e2568b79193b7342044fba476fcd30b mandoc-1.14.3.tar.gz -d127e635dfb54f9a88a28a8312f23495ec1e9356202e03ccfad1f7528f26f1cbfa7fc2c7b20c262523941d661fa7ba570a64a63c23f3e7fffc954d00bd5769c7 shared-libmandoc.patch -04947a275df99298591c2a46fb81b74c7c3fcb9f3cf8fb718cf1e32eeae5409e90a3bca89e542f8aa1b30792e837fd3d716303a636d1a3ec165fbb9529546a64 pager.patch +sha512sums="848f290847f3095757f25647e6d73eb7044018b145bf6f9dc8b5db164b1421911efdc5b3b9022ec3a2c5af9687a84d5acedee810f2bd2f7caaa9242dadb2cc52 mandoc-1.14.5.tar.gz +b1bd2c197584948cc8bab2310e759b8942b9f9479254ffb5a8223cfa6ba03c9e1a4d402c5440b8d9f962be9a020287d3dd8556592c17f2b46f15f405d9d373cb shared-libmandoc.patch ced05e8b57fb9705c6d8d8570cd6b06ad187511a4c243ac2dbc34064aa164ca49e0c877160134161dcb98ebd5e61a5c23d5741f03ef95903ff56193dd07f36a1 outdated-warn-disable.patch" diff --git a/main/mdocml/pager.patch b/main/mdocml/pager.patch deleted file mode 100644 index b887c8c120..0000000000 --- a/main/mdocml/pager.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- mdocml-1.13.4/main.c.orig -+++ mdocml-1.13.4/main.c -@@ -1042,7 +1042,7 @@ - if (pager == NULL || *pager == '\0') - pager = getenv("PAGER"); - if (pager == NULL || *pager == '\0') -- pager = "more -s"; -+ pager = "/bin/more -s"; - cp = mandoc_strdup(pager); - - /* -@@ -1063,15 +1063,6 @@ - break; - } - -- /* For less(1), use the tag file. */ -- -- if ((cmdlen = strlen(argv[0])) >= 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 819968ee6d..0327138382 100644 --- a/main/mdocml/shared-libmandoc.patch +++ b/main/mdocml/shared-libmandoc.patch @@ -1,8 +1,10 @@ ---- mandoc-1.14.2/Makefile.orig -+++ mandoc-1.14.2/Makefile -@@ -347,9 +347,13 @@ - mdoc.h.html \ - roff.h.html +diff --git a/Makefile b/Makefile +index f4e2954..d153224 100644 +--- a/Makefile ++++ b/Makefile +@@ -367,9 +367,13 @@ WWW_INCS = eqn.h.html \ + tbl_int.h.html \ + tbl_parse.h.html +LIBMANDOC = libmandoc.so +MANDOCLIB = -L. -lmandoc @@ -14,7 +16,7 @@ # === DEPENDENCY HANDLING ============================================== -@@ -372,7 +376,7 @@ +@@ -392,7 +396,7 @@ distclean: clean rm -f Makefile.local config.h config.h.old config.log config.log.old clean: @@ -23,7 +25,7 @@ rm -f mandoc $(MAIN_OBJS) rm -f man.cgi $(CGI_OBJS) rm -f mandocd catman catman.o $(MANDOCD_OBJS) -@@ -411,11 +415,11 @@ +@@ -431,11 +435,11 @@ base-install: mandoc demandoc soelim $(INSTALL_MAN) makewhatis.8 \ $(DESTDIR)$(MANDIR)/man8/$(BINM_MAKEWHATIS).8 @@ -34,10 +36,10 @@ mkdir -p $(DESTDIR)$(MANDIR)/man3 - $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR) + $(INSTALL_LIB) $(LIBMANDOC) $(DESTDIR)$(LIBDIR) - $(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.h roff.h \ - $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_LIB) eqn.h man.h mandoc.h mandoc_aux.h mandoc_parse.h \ + mdoc.h roff.h tbl.h $(DESTDIR)$(INCLUDEDIR) $(INSTALL_MAN) mandoc.3 mandoc_escape.3 mandoc_malloc.3 \ -@@ -488,23 +492,23 @@ +@@ -511,23 +515,23 @@ Makefile.local config.h: configure $(TESTSRCS) @echo "$@ is out of date; please run ./configure" @exit 1 @@ -71,3 +73,4 @@ soelim: $(SOELIM_OBJS) $(CC) -o $@ $(LDFLAGS) $(SOELIM_OBJS) + |