Date: Fri, 24 Apr 2015 09:17:50 -0500
From: Peter Bui <pnutzh4x0r@gmail.com>
To: Natanael Copa <ncopa@alpinelinux.org>
Cc: alpine-aports@lists.alpinelinux.org
Subject: Re: [alpine-aports] [PATCH] main/mdocml: add patch to support
 manpages with *p extension
Message-ID: <20150424141750.GT1735@weasel>
References: <1422769860-16242-1-git-send-email-pnutzh4x0r@gmail.com>
 <20150312164613.66be823b@ncopa-desktop.alpinelinux.org>
Precedence: list
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="b5gNqxB1S1yM7hjW"
Content-Disposition: inline
In-Reply-To: <20150312164613.66be823b@ncopa-desktop.alpinelinux.org>
User-Agent: Mutt/1.5.23 (2014-03-12)


--b5gNqxB1S1yM7hjW
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Thu, Mar 12, 2015 at 04:46:13PM +0100, Natanael Copa wrote:
> Sorry late response. Been on vacation.
> 
> On Sat, 31 Jan 2015 23:51:00 -0600
> Peter Bui <pnutzh4x0r@gmail.com> wrote:
> 
> > mdocml only stores the section name in its database and not the file's
> > extension.  This is problematic for files such as
> > /usr/share/man/man1/ls.1p since mdocml will try to use the section name
> > (i.e. 1) as the file extension in the buildnames function, which will
> > yield a file not found error when you try to do 'man ls'.
> > 
> > This patch modifies mdocml's database by adding a fsec field to the
> > mlinks table.  This is then used to record the file section and thus
> > allows for more reliable building of the manpage path.
> > 
> > With this patch, it is now possible to run 'man ls' with mdocml.
> 
> Have you reported this upsteam?
> 
> I don't want change the database schema without upstreams blessing.
> 
> I saw they have a new release coming up with support for running the
> 'man' command without any db. Do you think that will solve the issue?
> 

mdocml 1.13.3 appears to fix this problem.  Attached is a diff that
updates the package to this version.

-- 
Peter Bui

--b5gNqxB1S1yM7hjW
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="mdocml.patch"

diff --git a/main/mdocml/APKBUILD b/main/mdocml/APKBUILD
index 0d67767..5ec750b 100644
--- a/main/mdocml/APKBUILD
+++ b/main/mdocml/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer:  Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mdocml
-pkgver=1.13.2
-pkgrel=2
+pkgver=1.13.3
+pkgrel=1
 pkgdesc="mdoc/man compiler"
 url="http://mdocml.bsd.lv/"
 arch="all"
@@ -13,7 +13,6 @@ triggers="$pkgname.trigger=/usr/share/man/*"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-man"
 source="http://mdocml.bsd.lv/snapshots/mdocml-$pkgver.tar.gz
 	shared-libmandoc.patch
 	man.conf
 	"
 
@@ -53,15 +52,12 @@ man() {
 	mkdir -p "$subpkgdir"
 }
 
-md5sums="831ba06ef06bccdf35346fc3310263a5  mdocml-1.13.2.tar.gz
-d249cec65ed75006ca610b9c8b01ba66  shared-libmandoc.patch
+md5sums="7be80e1116a11abe2aabd6b2f04434ef  mdocml-1.13.3.tar.gz
+034890db61abd1d96ef00a74a07f87fc  shared-libmandoc.patch
 6e893bef0cf680eec807b230e6619d27  man.conf"
-sha256sums="9074755da96e8afbf9634d7ffa29c1decda2f642e13d9d844f26cd1e06d9716b  mdocml-1.13.2.tar.gz
-9f5a864d993e3f061161756017fcfb9906f68223298ebe7b44f1168beed85d79  shared-libmandoc.patch
+sha256sums="23ccab4800d50bf4c327979af5d4aa1a6a2dc490789cb67c4c3ac1bd40b8cad8  mdocml-1.13.3.tar.gz
+6d5e88ee40dfa1eda33c40e16b0567719465e4dcc14aa73b16f3308f4e518b52  shared-libmandoc.patch
 3381c6ceb99e7db1404fdb44419040c3b441a251d594292e53545b5e4e378e2b  man.conf"
-sha512sums="7db73ff83be9acff50e8570de96591869c950dad8b350d119e57fcf39937a3272cf9d70397af2e21ec69877c5f81bc1c4e027910a4aef1033ff54b744904412c  mdocml-1.13.2.tar.gz
-fd69542e4f853827637a28f84e845aea447d63bcad51c9b45abb63ee1233a9c3a143a85016c75a9d596a2da5212460efad765ba8dd52de86e4aa1693da6617d5  shared-libmandoc.patch
+sha512sums="a3b7304e313b905b3575d79eb7ac861723e0ef3f700199c136abe4d4c698929e99ee0789bfc6e591224fb0006c709afe0e4c1bb578605a767c371ec7dee26024  mdocml-1.13.3.tar.gz
+9d25d3d09f127aafe4460240009dbed1094f65d9646d580dbff06c07d0828b23e29696fb88f2bfd78d49eda4f116e21d50f207688f3d5b98d395e9c7b5fbc4af  shared-libmandoc.patch
 0723c32ab70e5b1c77768ca78d7437b26bed19b90b27876b10cc463359c41332befc0105fc1e23ceae48de5a892f1aa7ac60ef7eb0b6b8f1616726c4300632fe  man.conf"
diff --git a/main/mdocml/shared-libmandoc.patch b/main/mdocml/shared-libmandoc.patch
index 9763c6d..abb5216 100644
--- a/main/mdocml/shared-libmandoc.patch
+++ b/main/mdocml/shared-libmandoc.patch
@@ -1,6 +1,6 @@
---- ./Makefile.orig
-+++ ./Makefile
-@@ -262,9 +262,15 @@
+--- ./Makefile.orig	2015-03-13 07:38:38.000000000 +0500
++++ ./Makefile	2015-04-24 08:49:39.410964552 +0500
+@@ -267,9 +267,15 @@
  WWW_OBJS	 = mdocml.tar.gz \
  		   mdocml.sha256
  
@@ -16,7 +16,7 @@
  
  # === DEPENDENCY HANDLING ==============================================
  
-@@ -291,7 +297,7 @@
+@@ -296,7 +302,7 @@
  	rm -f Makefile.local config.h config.h.old config.log config.log.old
  
  clean:
@@ -25,16 +25,16 @@
  	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
+@@ -314,7 +320,7 @@
  	mkdir -p $(DESTDIR)$(MANDIR)/man7
  	$(INSTALL_PROGRAM) mandoc demandoc $(DESTDIR)$(BINDIR)
+ 	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 \
  		$(DESTDIR)$(INCLUDEDIR)
  	$(INSTALL_MAN) mandoc.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1
-@@ -361,17 +367,20 @@
+@@ -366,17 +372,20 @@
  libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
  	$(AR) rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
  
@@ -42,22 +42,22 @@
 -	$(CC) $(LDFLAGS) -o $@ $(MAIN_OBJS) libmandoc.a $(DBLIB)
 +libmandoc.so: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
 +	$(CC) $(LDFLAGS) -shared -o $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
++
++mandoc: $(MAIN_OBJS) $(LIBMANDOC)
++	$(CC) $(LDFLAGS) -o $@ $(MAIN_OBJS) $(MANDOCLIB) $(DBLIB)
  
 -manpage: $(MANPAGE_OBJS) libmandoc.a
 -	$(CC) $(LDFLAGS) -o $@ $(MANPAGE_OBJS) libmandoc.a $(DBLIB)
-+mandoc: $(MAIN_OBJS) $(LIBMANDOC)
-+	$(CC) $(LDFLAGS) -o $@ $(MAIN_OBJS) $(MANDOCLIB) $(DBLIB)
++manpage: $(MANPAGE_OBJS) $(LIBMANDOC)
++	$(CC) $(LDFLAGS) -o $@ $(MANPAGE_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)
++man.cgi: $(CGI_OBJS) $(LIBMANDOC)
++	$(CC) $(LDFLAGS) $(STATIC) -o $@ $(CGI_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)
  

--b5gNqxB1S1yM7hjW--


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---