[arch-commits] Commit in metapixel/trunk (PKGBUILD fix-manpage-path.patch)

[Balló György]

    Date: Friday, January 26, 2018 @ 22:47:15
  Author: bgyorgy
Revision: 287291

upgpkg: metapixel 1.0.2-9

Fix man page installation path (FS#44543)

Added:
  metapixel/trunk/fix-manpage-path.patch
Modified:
  metapixel/trunk/PKGBUILD

------------------------+
 PKGBUILD               |   11 ++++++++---
 fix-manpage-path.patch |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-26 22:15:58 UTC (rev 287290)
+++ PKGBUILD	2018-01-26 22:47:15 UTC (rev 287291)
@@ -4,7 +4,7 @@
 
 pkgname=metapixel
 pkgver=1.0.2
-pkgrel=8
+pkgrel=9
 pkgdesc='A program for generating photomosaics.'
 arch=('x86_64')
 url='http://www.complang.tuwien.ac.at/schani/metapixel/'
@@ -12,8 +12,10 @@
 depends=('giflib' 'libjpeg' 'libpng' 'perl' 'glib2')
 makedepends=('git' 'docbook-xsl')
 source=("git://github.com/schani/metapixel.git#commit=4ad7be9e82"
+        "fix-manpage-path.patch"
         "metapixel-giflib-5.1.0-compat.patch")
 md5sums=('SKIP'
+         '166d31ddce400bcc4f7d16a8fc399c0a'
          'b959c6d1b14064aee3a73ae568a82555')
 
 prepare() {
@@ -22,6 +24,9 @@
   git submodule init
   git submodule update
 
+  # Fix man page installation path (FS#44543)
+  patch -p1 -i ../fix-manpage-path.patch
+
   cd rwimg
   patch -p1 -i ../../metapixel-giflib-5.1.0-compat.patch
 }
@@ -31,7 +36,7 @@
 
   # Build librwimg first, make dependencies seem to be bugged.
   make librwimg
-  make MANPAGE_XSL="/usr/share/xml/docbook/xsl-stylesheets-1.79.1/manpages/docbook.xsl"
+  make MANPAGE_XSL="/usr/share/xml/docbook/xsl-stylesheets-*/manpages/docbook.xsl"
 }
 
 package() {
@@ -39,5 +44,5 @@
   
   install -dm0755 "${pkgdir}/usr/share/man/man1"
 
-  make PREFIX="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man/man1" install
+  make PREFIX="${pkgdir}/usr" install
 }

Added: fix-manpage-path.patch
===================================================================
--- fix-manpage-path.patch	                        (rev 0)
+++ fix-manpage-path.patch	2018-01-26 22:47:15 UTC (rev 287291)
@@ -0,0 +1,35 @@
+From b19b164aa0ecff48824a21976b71f954dcff527b Mon Sep 17 00:00:00 2001
+From: Pierre Neidhardt <ambrevar at gmail.com>
+Date: Sat, 11 Apr 2015 10:27:16 +0200
+Subject: [PATCH] Makefile: Fix man page installation path
+
+Latest FHS replaces /usr/man by /usr/share/man.
+
+If folder `man1` does not exist, `$(INSTALL) metapixel.1 $(MANDIR)/man1` will
+install the man page as `man1`, hence the -D flag to force folder creation.
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index e40e0e1..dc1ccaf 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,7 +3,7 @@ INSTALL = install
+ MANPAGE_XSL = /usr/share/xml/docbook/stylesheet/nwalsh/current/manpages/docbook.xsl
+ 
+ BINDIR = $(PREFIX)/bin
+-MANDIR = $(PREFIX)/man
++MANDIR = $(PREFIX)/share/man
+ 
+ VERSION = 1.1.0
+ 
+@@ -66,7 +66,7 @@ install : metapixel metapixel.1
+ 	$(INSTALL) -d $(BINDIR)
+ 	$(INSTALL) metapixel $(BINDIR)
+ 	$(INSTALL) metapixel-prepare $(BINDIR)
+-	$(INSTALL) metapixel.1 $(MANDIR)/man1
++	$(INSTALL) -D metapixel.1 $(MANDIR)/man1/metapixel.1
+ #	$(INSTALL) imagesize $(BINDIR)
+ #	$(INSTALL) sizesort $(BINDIR)
+