Sat Aug 19 00:21:25 2017 UTC ()
lang/inform: Install manpages into ${PKGMANDIR}.

Modify the Makefile patch to set MANDIR, the location of the
installed manpages, to point to ${PKGMANDIR}.


(jlam)
diff -r1.8 -r1.9 pkgsrc/lang/inform/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/inform/patches/patch-Makefile

cvs diff -r1.8 -r1.9 pkgsrc/lang/inform/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/inform/distinfo 2017/07/24 03:18:54 1.8
+++ pkgsrc/lang/inform/distinfo 2017/08/19 00:21:25 1.9
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.8 2017/07/24 03:18:54 maya Exp $ 1$NetBSD: distinfo,v 1.9 2017/08/19 00:21:25 jlam Exp $
2 2
3SHA1 (inform-6.33-6.12.1.tar.gz) = b6f944d0c7377b58fc0a7c8980846755d2c53be2 3SHA1 (inform-6.33-6.12.1.tar.gz) = b6f944d0c7377b58fc0a7c8980846755d2c53be2
4RMD160 (inform-6.33-6.12.1.tar.gz) = 100eb4aba874df6f7a3a9d5e47781d5d11af5d7f 4RMD160 (inform-6.33-6.12.1.tar.gz) = 100eb4aba874df6f7a3a9d5e47781d5d11af5d7f
5SHA512 (inform-6.33-6.12.1.tar.gz) = 6eaff617fad8ebc63663113b75f81cc0209e32472435abc4773db0ddacef9117a6cbf2fe9525a8ef7028302bc297144b6ec38b2b4d6bf0406472d2490b15d345 5SHA512 (inform-6.33-6.12.1.tar.gz) = 6eaff617fad8ebc63663113b75f81cc0209e32472435abc4773db0ddacef9117a6cbf2fe9525a8ef7028302bc297144b6ec38b2b4d6bf0406472d2490b15d345
6Size (inform-6.33-6.12.1.tar.gz) = 742439 bytes 6Size (inform-6.33-6.12.1.tar.gz) = 742439 bytes
7SHA1 (patch-Makefile) = aee3d31890f689438aa05d12666d265553e22c84 7SHA1 (patch-Makefile) = 498cc5ea03599a9d8f9848e13d543ecf530d0f6f

cvs diff -r1.1 -r1.2 pkgsrc/lang/inform/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/lang/inform/patches/patch-Makefile 2017/07/24 03:18:54 1.1
+++ pkgsrc/lang/inform/patches/patch-Makefile 2017/08/19 00:21:25 1.2
@@ -1,29 +1,39 @@ @@ -1,29 +1,39 @@
1$NetBSD: patch-Makefile,v 1.1 2017/07/24 03:18:54 maya Exp $ 1$NetBSD: patch-Makefile,v 1.2 2017/08/19 00:21:25 jlam Exp $
2 2
3Allow overriding PREFIX 3Allow overriding PREFIX
4DESTDIR support 4DESTDIR support
 5PKGMANDIR support
5 6
6--- Makefile.orig 2016-06-04 03:25:08.000000000 +0000 7--- Makefile.orig 2016-06-04 03:25:08.000000000 +0000
7+++ Makefile 8+++ Makefile
8@@ -2,7 +2,7 @@ CC = gcc 9@@ -2,7 +2,7 @@ CC = gcc
9  10
10 #OPTS = -g -Wall -Wextra 11 #OPTS = -g -Wall -Wextra
11  12
12-PREFIX = /usr/local 13-PREFIX = /usr/local
13+PREFIX ?= /usr/local 14+PREFIX ?= /usr/local
14 MAN_PREFIX = $(PREFIX) 15 MAN_PREFIX = $(PREFIX)
15  16
16 COMPVERSION = 6.33 17 COMPVERSION = 6.33
 18@@ -15,7 +15,7 @@ distdir = $(DISTNAME)
 19 LIBDIR = $(PREFIX)/share/$(BINNAME)/lib
 20 INCLUDEDIR = $(PREFIX)/share/$(BINNAME)/include
 21 MANPAGE = $(NAME).1
 22-MANDIR = $(MAN_PREFIX)/man/man1
 23+MANDIR = $(MAN_PREFIX)/$(PKGMANDIR)/man1
 24
 25 DEFINES= -DInclude_Directory=\"$(INCLUDEDIR),$(LIBDIR)\" -DTemporary_Directory=\"/tmp\"
 26
17@@ -63,18 +63,18 @@ strip: $(BINNAME) 27@@ -63,18 +63,18 @@ strip: $(BINNAME)
18 strip $(BINNAME) 28 strip $(BINNAME)
19  29
20 install: $(BINNAME) lib 30 install: $(BINNAME) lib
21- install -d -m 755 $(BINDIR) 31- install -d -m 755 $(BINDIR)
22- install -c -m 755 $(BINNAME) $(BINDIR) 32- install -c -m 755 $(BINNAME) $(BINDIR)
23- install -d -m 755 $(LIBDIR) 33- install -d -m 755 $(LIBDIR)
24- install -c -m 644 $(wildcard lib/*) $(LIBDIR) 34- install -c -m 644 $(wildcard lib/*) $(LIBDIR)
25- install -d -m 755 $(INCLUDEDIR) 35- install -d -m 755 $(INCLUDEDIR)
26- install -c -m 644 $(wildcard include/*) $(INCLUDEDIR) 36- install -c -m 644 $(wildcard include/*) $(INCLUDEDIR)
27- install -d -m 755 $(MANDIR) 37- install -d -m 755 $(MANDIR)
28- install -c -m 644 $(MANPAGE) $(MANDIR) 38- install -c -m 644 $(MANPAGE) $(MANDIR)
29- install -d -m 755 $(DEMODIR) 39- install -d -m 755 $(DEMODIR)