CVS commit: pkgsrc/mail/serialmail

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon Jan  2 03:33:52 UTC 2017

Modified Files:
        pkgsrc/mail/serialmail: Makefile distinfo
        pkgsrc/mail/serialmail/patches: patch-aa

Log Message:
Support PKGMANDIR.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/mail/serialmail/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/mail/serialmail/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/serialmail/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/serialmail/Makefile
diff -u pkgsrc/mail/serialmail/Makefile:1.8 pkgsrc/mail/serialmail/Makefile:1.9
--- pkgsrc/mail/serialmail/Makefile:1.8 Mon Oct  8 12:19:31 2012
+++ pkgsrc/mail/serialmail/Makefile     Mon Jan  2 03:33:52 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/10/08 12:19:31 asau Exp $
+# $NetBSD: Makefile,v 1.9 2017/01/02 03:33:52 schmonz Exp $
 #
 
 DISTNAME=              serialmail-0.75
@@ -21,5 +21,10 @@ DJB_RESTRICTED=              YES
 
 SUBST_FILES.djbware+=  leapsecs_read.c
 
+SUBST_CLASSES+=                paths
+SUBST_STAGE.paths=     do-configure
+SUBST_FILES.paths=     hier.c
+SUBST_SED.paths=       -e 's,@PKGMANDIR@,${PKGMANDIR},g'
+
 .include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/mail/serialmail/distinfo
diff -u pkgsrc/mail/serialmail/distinfo:1.6 pkgsrc/mail/serialmail/distinfo:1.7
--- pkgsrc/mail/serialmail/distinfo:1.6 Tue Nov  3 23:27:20 2015
+++ pkgsrc/mail/serialmail/distinfo     Mon Jan  2 03:33:52 2017
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 23:27:20 agc Exp $
+$NetBSD: distinfo,v 1.7 2017/01/02 03:33:52 schmonz Exp $
 
 SHA1 (serialmail-0.75.tar.gz) = 76f8d5ae698cff25b3227e51cc99fff1f4a8b137
 RMD160 (serialmail-0.75.tar.gz) = 2d12152b9c7d007f76b4d129c2795cd192ba9f83
 SHA512 (serialmail-0.75.tar.gz) = f0c7f14330b44f12f8e5f3590416d707bb2daaca84db8fcd236ae05855269005a726d946269c0cbb25f51238fba350420e0e3a1d57f0ab227c447fafcae497dc
 Size (serialmail-0.75.tar.gz) = 55079 bytes
-SHA1 (patch-aa) = 3b4afee3080a7e82cfb57d159e723c6837eca790
+SHA1 (patch-aa) = 489ae2af99233087fcfb56dd899fe7283401bf7e
 SHA1 (patch-ab) = e9325df21f6dd114c0bc9327708c82f8b692c1d5
 SHA1 (patch-ac) = fd4af9ee031be8f3d2467dc7f94faeacc65bba85

Index: pkgsrc/mail/serialmail/patches/patch-aa
diff -u pkgsrc/mail/serialmail/patches/patch-aa:1.2 pkgsrc/mail/serialmail/patches/patch-aa:1.3
--- pkgsrc/mail/serialmail/patches/patch-aa:1.2 Sun Apr 15 00:20:49 2012
+++ pkgsrc/mail/serialmail/patches/patch-aa     Mon Jan  2 03:33:52 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2012/04/15 00:20:49 schmonz Exp $
+$NetBSD: patch-aa,v 1.3 2017/01/02 03:33:52 schmonz Exp $
 
 Install docs following hier(7), don't install catpages, set reasonable
 permissions, and avoid overwriting "setlock" from sysutils/daemontools.
@@ -21,8 +21,8 @@ permissions, and avoid overwriting "setl
 +  d(auto_home,"bin",-1,-1,0755);
 +  d(auto_home,"share/doc",-1,-1,0755);
 +  d(auto_home,"share/doc/serialmail",-1,-1,0755);
-+  d(auto_home,"man",-1,-1,0755);
-+  d(auto_home,"man/man1",-1,-1,0755);
++  d(auto_home,"@PKGMANDIR@",-1,-1,0755);
++  d(auto_home,"@PKGMANDIR@/man1",-1,-1,0755);
  
    c(auto_home,"bin","serialqmtp",-1,-1,0755);
    c(auto_home,"bin","serialsmtp",-1,-1,0755);
@@ -31,18 +31,23 @@ permissions, and avoid overwriting "setl
    c(auto_home,"bin","maildirserial",-1,-1,0755);
 -  c(auto_home,"bin","setlock",-1,-1,0755);
  
-   c(auto_home,"man/man1","serialqmtp.1",-1,-1,0644);
+-  c(auto_home,"man/man1","serialqmtp.1",-1,-1,0644);
 -  c(auto_home,"man/cat1","serialqmtp.0",-1,-1,0644);
-   c(auto_home,"man/man1","serialsmtp.1",-1,-1,0644);
+-  c(auto_home,"man/man1","serialsmtp.1",-1,-1,0644);
 -  c(auto_home,"man/cat1","serialsmtp.0",-1,-1,0644);
-   c(auto_home,"man/man1","maildirqmtp.1",-1,-1,0644);
+-  c(auto_home,"man/man1","maildirqmtp.1",-1,-1,0644);
 -  c(auto_home,"man/cat1","maildirqmtp.0",-1,-1,0644);
-   c(auto_home,"man/man1","maildirsmtp.1",-1,-1,0644);
+-  c(auto_home,"man/man1","maildirsmtp.1",-1,-1,0644);
 -  c(auto_home,"man/cat1","maildirsmtp.0",-1,-1,0644);
-   c(auto_home,"man/man1","maildirserial.1",-1,-1,0644);
+-  c(auto_home,"man/man1","maildirserial.1",-1,-1,0644);
 -  c(auto_home,"man/cat1","maildirserial.0",-1,-1,0644);
 -  c(auto_home,"man/man1","setlock.1",-1,-1,0644);
 -  c(auto_home,"man/cat1","setlock.0",-1,-1,0644);
++  c(auto_home,"@PKGMANDIR@/man1","serialqmtp.1",-1,-1,0644);
++  c(auto_home,"@PKGMANDIR@/man1","serialsmtp.1",-1,-1,0644);
++  c(auto_home,"@PKGMANDIR@/man1","maildirqmtp.1",-1,-1,0644);
++  c(auto_home,"@PKGMANDIR@/man1","maildirsmtp.1",-1,-1,0644);
++  c(auto_home,"@PKGMANDIR@/man1","maildirserial.1",-1,-1,0644);
  
 -  c(auto_home,"doc/serialmail","FROMISP",-1,-1,0644);
 -  c(auto_home,"doc/serialmail","TOISP",-1,-1,0644);