Fri Apr 1 11:20:58 2016 UTC ()
Support PKGMANDIR.  Add patch comments.


(jperkin)
diff -r1.17 -r1.18 pkgsrc/mail/safecat/Makefile
diff -r1.8 -r1.9 pkgsrc/mail/safecat/distinfo
diff -r1.2 -r1.3 pkgsrc/mail/safecat/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/mail/safecat/patches/patch-hier.c
cvs diff -r1.17 -r1.18 pkgsrc/mail/safecat/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/safecat/Makefile 2014/01/04 10:10:15 1.17
+++ pkgsrc/mail/safecat/Makefile 2016/04/01 11:20:58 1.18
@@ -1,22 +1,29 @@ @@ -1,22 +1,29 @@
1# $NetBSD: Makefile,v 1.17 2014/01/04 10:10:15 seb Exp $ 1# $NetBSD: Makefile,v 1.18 2016/04/01 11:20:58 jperkin Exp $
2# 2#
3 3
4DISTNAME= safecat-1.13 4DISTNAME= safecat-1.13
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= mail 6CATEGORIES= mail
7MASTER_SITES= http://jeenyus.net/~budney/linux/software/safecat/ 7MASTER_SITES= http://jeenyus.net/~budney/linux/software/safecat/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.jeenyus.net/linux/software/safecat.html 10HOMEPAGE= http://www.jeenyus.net/linux/software/safecat.html
11COMMENT= Write data safely to a maildir 11COMMENT= Write data safely to a maildir
12 12
13MAKE_JOBS_SAFE= no 13MAKE_JOBS_SAFE= no
14 14
15DJB_RESTRICTED= NO 15DJB_RESTRICTED= NO
16BUILD_TARGETS= install instcheck 16BUILD_TARGETS= install instcheck
17DJB_CONFIG_HOME= conf-root 17DJB_CONFIG_HOME= conf-root
18 18
19MAKE_FLAGS+= DESTDIR=${DESTDIR:Q} 19MAKE_FLAGS+= DESTDIR=${DESTDIR:Q}
20 20
 21SUBST_CLASSES+= pkgmandir
 22SUBST_STAGE.pkgmandir= pre-configure
 23SUBST_FILES.pkgmandir= hier.c
 24SUBST_VARS.pkgmandir= PKGMANDIR
 25
 26INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
 27
21.include "../../mk/djbware.mk" 28.include "../../mk/djbware.mk"
22.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/mail/safecat/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/safecat/distinfo 2015/11/03 23:27:20 1.8
+++ pkgsrc/mail/safecat/distinfo 2016/04/01 11:20:58 1.9
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.8 2015/11/03 23:27:20 agc Exp $ 1$NetBSD: distinfo,v 1.9 2016/04/01 11:20:58 jperkin Exp $
2 2
3SHA1 (safecat-1.13.tar.gz) = 07b42cb06490abeacefce9429a1dbf96caa1629b 3SHA1 (safecat-1.13.tar.gz) = 07b42cb06490abeacefce9429a1dbf96caa1629b
4RMD160 (safecat-1.13.tar.gz) = 614df1d43d13a638ab30a2921b66d78f3fafc4c6 4RMD160 (safecat-1.13.tar.gz) = 614df1d43d13a638ab30a2921b66d78f3fafc4c6
5SHA512 (safecat-1.13.tar.gz) = e6f7401b55a61f70715b3d222c8286c0125c5e7b3b132e5e8d3c8573a6c45dba75b29a459c7e93d7c0760300f0a62635d8ea4eacde9b0b1ff7637b3f6c63e210 5SHA512 (safecat-1.13.tar.gz) = e6f7401b55a61f70715b3d222c8286c0125c5e7b3b132e5e8d3c8573a6c45dba75b29a459c7e93d7c0760300f0a62635d8ea4eacde9b0b1ff7637b3f6c63e210
6Size (safecat-1.13.tar.gz) = 33953 bytes 6Size (safecat-1.13.tar.gz) = 33953 bytes
7SHA1 (patch-aa) = 2e06a02df248b91e2b1fda9f783c53a10081b196 7SHA1 (patch-aa) = 269073a9aa0d0b4814a2a0dd889396a575f51c20
8SHA1 (patch-ab) = 59b4876e127ebffdbd3cad83a37e3971d9736e8f 8SHA1 (patch-ab) = 59b4876e127ebffdbd3cad83a37e3971d9736e8f
9SHA1 (patch-hier.c) = c6825043a97e94d1748852a867bd0f87f2175297 9SHA1 (patch-hier.c) = b4483673a6eb3a2c55da096a1b01a3a5a9a053a9
cvs diff -r1.2 -r1.3 pkgsrc/mail/safecat/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/mail/safecat/patches/Attic/patch-aa 2007/01/15 11:01:24 1.2
+++ pkgsrc/mail/safecat/patches/Attic/patch-aa 2016/04/01 11:20:58 1.3
@@ -1,14 +1,17 @@ @@ -1,14 +1,17 @@
1$NetBSD: patch-aa,v 1.2 2007/01/15 11:01:24 schmonz Exp $ 1$NetBSD: patch-aa,v 1.3 2016/04/01 11:20:58 jperkin Exp $
 2
 3Support arm.
 4
2--- tryulong32.c.orig 2000-02-28 23:10:12.000000000 -0500 5--- tryulong32.c.orig 2000-02-28 23:10:12.000000000 -0500
3+++ tryulong32.c 6+++ tryulong32.c
4@@ -1,5 +1,8 @@ 7@@ -1,5 +1,8 @@
5 void main() 8 void main()
6 { 9 {
7+#ifdef __arm__ 10+#ifdef __arm__
8+ _exit(0); 11+ _exit(0);
9+#else 12+#else
10 unsigned long u; 13 unsigned long u;
11 u = 1; 14 u = 1;
12 u += u; u += u; u += u; u += u; u += u; u += u; u += u; u += u; 15 u += u; u += u; u += u; u += u; u += u; u += u; u += u; u += u;
13@@ -8,4 +11,5 @@ void main() 16@@ -8,4 +11,5 @@ void main()
14 u += u; u += u; u += u; u += u; u += u; u += u; u += u; u += u; 17 u += u; u += u; u += u; u += u; u += u; u += u; u += u; u += u;
cvs diff -r1.1 -r1.2 pkgsrc/mail/safecat/patches/patch-hier.c (expand / switch to unified diff)

--- pkgsrc/mail/safecat/patches/patch-hier.c 2012/03/14 23:16:29 1.1
+++ pkgsrc/mail/safecat/patches/patch-hier.c 2016/04/01 11:20:58 1.2
@@ -1,14 +1,22 @@ @@ -1,14 +1,22 @@
1$NetBSD: patch-hier.c,v 1.1 2012/03/14 23:16:29 joerg Exp $ 1$NetBSD: patch-hier.c,v 1.2 2016/04/01 11:20:58 jperkin Exp $
2 2
3--- hier.c.orig 2012-03-13 17:44:57.000000000 +0000 3Use PKGMANDIR.
 4
 5--- hier.c.orig 2001-04-14 11:09:54.000000000 +0000
4+++ hier.c 6+++ hier.c
5@@ -9,9 +9,6 @@ void hier() 7@@ -7,11 +7,8 @@ void hier()
 8 c(auto_home,"bin","safecat",-1,-1,0755);
 9 c(auto_home,"bin","maildir",-1,-1,0755);
6  10
7 d(auto_home,"man",-1,-1,02755); 11- d(auto_home,"man",-1,-1,02755);
8 d(auto_home,"man/man1",-1,-1,02755); 12- d(auto_home,"man/man1",-1,-1,02755);
9- d(auto_home,"man/cat1",-1,-1,02755); 13- d(auto_home,"man/cat1",-1,-1,02755);
10 c(auto_home,"man/man1","safecat.1",-1,-1,0644); 14- c(auto_home,"man/man1","safecat.1",-1,-1,0644);
11- c(auto_home,"man/cat1","safecat.0",-1,-1,0644); 15- c(auto_home,"man/cat1","safecat.0",-1,-1,0644);
12 c(auto_home,"man/man1","maildir.1",-1,-1,0644); 16- c(auto_home,"man/man1","maildir.1",-1,-1,0644);
13- c(auto_home,"man/cat1","maildir.0",-1,-1,0644); 17- c(auto_home,"man/cat1","maildir.0",-1,-1,0644);
 18+ d(auto_home,"@PKGMANDIR@",-1,-1,02755);
 19+ d(auto_home,"@PKGMANDIR@/man1",-1,-1,02755);
 20+ c(auto_home,"@PKGMANDIR@/man1","safecat.1",-1,-1,0644);
 21+ c(auto_home,"@PKGMANDIR@/man1","maildir.1",-1,-1,0644);
14 } 22 }