Support PKGMANDIR. Add patch comments.

4 files changed, 30 insertions, 12 deletions

diff --git a/mail/safecat/Makefile b/mail/safecat/Makefile
index b0422da1336..2dcb3f1d01f 100644
--- a/mail/safecat/Makefile
+++ b/mail/safecat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2014/01/04 10:10:15 seb Exp $
+# $NetBSD: Makefile,v 1.18 2016/04/01 11:20:58 jperkin Exp $
 #
 
 DISTNAME=		safecat-1.13
@@ -18,5 +18,12 @@ DJB_CONFIG_HOME=	conf-root
 
 MAKE_FLAGS+=		DESTDIR=${DESTDIR:Q}
 
+SUBST_CLASSES+=		pkgmandir
+SUBST_STAGE.pkgmandir=	pre-configure
+SUBST_FILES.pkgmandir=	hier.c
+SUBST_VARS.pkgmandir=	PKGMANDIR
+
+INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
+
 .include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/safecat/distinfo b/mail/safecat/distinfo
index c0471015c28..73c181a0e5f 100644
--- a/mail/safecat/distinfo
+++ b/mail/safecat/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 23:27:20 agc Exp $
+$NetBSD: distinfo,v 1.9 2016/04/01 11:20:58 jperkin Exp $
 
 SHA1 (safecat-1.13.tar.gz) = 07b42cb06490abeacefce9429a1dbf96caa1629b
 RMD160 (safecat-1.13.tar.gz) = 614df1d43d13a638ab30a2921b66d78f3fafc4c6
 SHA512 (safecat-1.13.tar.gz) = e6f7401b55a61f70715b3d222c8286c0125c5e7b3b132e5e8d3c8573a6c45dba75b29a459c7e93d7c0760300f0a62635d8ea4eacde9b0b1ff7637b3f6c63e210
 Size (safecat-1.13.tar.gz) = 33953 bytes
-SHA1 (patch-aa) = 2e06a02df248b91e2b1fda9f783c53a10081b196
+SHA1 (patch-aa) = 269073a9aa0d0b4814a2a0dd889396a575f51c20
 SHA1 (patch-ab) = 59b4876e127ebffdbd3cad83a37e3971d9736e8f
-SHA1 (patch-hier.c) = c6825043a97e94d1748852a867bd0f87f2175297
+SHA1 (patch-hier.c) = b4483673a6eb3a2c55da096a1b01a3a5a9a053a9
diff --git a/mail/safecat/patches/patch-aa b/mail/safecat/patches/patch-aa
index bdf67a83915..0ed28fc6266 100644
--- a/mail/safecat/patches/patch-aa
+++ b/mail/safecat/patches/patch-aa
@@ -1,4 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2007/01/15 11:01:24 schmonz Exp $
+$NetBSD: patch-aa,v 1.3 2016/04/01 11:20:58 jperkin Exp $
+
+Support arm.
+
 --- tryulong32.c.orig	2000-02-28 23:10:12.000000000 -0500
 +++ tryulong32.c
 @@ -1,5 +1,8 @@
diff --git a/mail/safecat/patches/patch-hier.c b/mail/safecat/patches/patch-hier.c
index f54c3586fc0..8602645e6d2 100644
--- a/mail/safecat/patches/patch-hier.c
+++ b/mail/safecat/patches/patch-hier.c
@@ -1,14 +1,22 @@
-$NetBSD: patch-hier.c,v 1.1 2012/03/14 23:16:29 joerg Exp $
+$NetBSD: patch-hier.c,v 1.2 2016/04/01 11:20:58 jperkin Exp $
 
---- hier.c.orig	2012-03-13 17:44:57.000000000 +0000
+Use PKGMANDIR.
+
+--- hier.c.orig	2001-04-14 11:09:54.000000000 +0000
 +++ hier.c
-@@ -9,9 +9,6 @@ void hier()
+@@ -7,11 +7,8 @@ void hier()
+   c(auto_home,"bin","safecat",-1,-1,0755);
+   c(auto_home,"bin","maildir",-1,-1,0755);
  
-   d(auto_home,"man",-1,-1,02755);
-   d(auto_home,"man/man1",-1,-1,02755);
+-  d(auto_home,"man",-1,-1,02755);
+-  d(auto_home,"man/man1",-1,-1,02755);
 -  d(auto_home,"man/cat1",-1,-1,02755);
-   c(auto_home,"man/man1","safecat.1",-1,-1,0644);
+-  c(auto_home,"man/man1","safecat.1",-1,-1,0644);
 -  c(auto_home,"man/cat1","safecat.0",-1,-1,0644);
-   c(auto_home,"man/man1","maildir.1",-1,-1,0644);
+-  c(auto_home,"man/man1","maildir.1",-1,-1,0644);
 -  c(auto_home,"man/cat1","maildir.0",-1,-1,0644);
++  d(auto_home,"@PKGMANDIR@",-1,-1,02755);
++  d(auto_home,"@PKGMANDIR@/man1",-1,-1,02755);
++  c(auto_home,"@PKGMANDIR@/man1","safecat.1",-1,-1,0644);
++  c(auto_home,"@PKGMANDIR@/man1","maildir.1",-1,-1,0644);
  }