diff options
author | schmonz <schmonz> | 2012-04-15 00:20:49 +0000 |
---|---|---|
committer | schmonz <schmonz> | 2012-04-15 00:20:49 +0000 |
commit | 1d36169dc64612095360c6ce33da3b3f75ac1dab (patch) | |
tree | 52f996bdbb59132fc65a794e8e6bd9bcc4298b17 /mail | |
parent | e73515b7fd34cdf48f301a787dbfe3df3e889124 (diff) | |
download | pkgsrc-1d36169dc64612095360c6ce33da3b3f75ac1dab.tar.gz |
Merge patch-hier.c into patch-aa. Quell pkglint:
* Add comments for each patch (and move some comments from Makefile).
* Define LICENSE explicitly.
Diffstat (limited to 'mail')
-rw-r--r-- | mail/serialmail/Makefile | 8 | ||||
-rw-r--r-- | mail/serialmail/distinfo | 9 | ||||
-rw-r--r-- | mail/serialmail/patches/patch-aa | 22 | ||||
-rw-r--r-- | mail/serialmail/patches/patch-ab | 6 | ||||
-rw-r--r-- | mail/serialmail/patches/patch-ac | 4 | ||||
-rw-r--r-- | mail/serialmail/patches/patch-hier.c | 28 |
6 files changed, 29 insertions, 48 deletions
diff --git a/mail/serialmail/Makefile b/mail/serialmail/Makefile index e451c0945a4..29a0569bc31 100644 --- a/mail/serialmail/Makefile +++ b/mail/serialmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2012/04/07 13:17:10 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2012/04/15 00:20:49 schmonz Exp $ # DISTNAME= serialmail-0.75 @@ -9,6 +9,7 @@ MASTER_SITES= http://cr.yp.to/software/ MAINTAINER= schmonz@NetBSD.org HOMEPAGE= http://cr.yp.to/serialmail.html COMMENT= Tools for passing mail across serial links +LICENSE= djb-nonlicense PKG_DESTDIR_SUPPORT= user-destdir @@ -17,10 +18,7 @@ DEPENDS+= qmail>=1.03nb7:../../mail/qmail INSTALLATION_DIRS= share/doc/${PKGBASE} # We change conf-home from the default "/usr/local" and don't -# provide compatibility symlinks. We also patch to install docs -# following hier(7), to set reasonable permissions on standard -# pkgsrc directories, and to avoid overwriting the "setlock" binary -# provided by sysutils/daemontools. +# provide compatibility symlinks. We also apply patches. DJB_RESTRICTED= YES SUBST_FILES.djbware+= leapsecs_read.c diff --git a/mail/serialmail/distinfo b/mail/serialmail/distinfo index ce3b59eccdc..609b130b06e 100644 --- a/mail/serialmail/distinfo +++ b/mail/serialmail/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.4 2012/04/07 13:17:10 joerg Exp $ +$NetBSD: distinfo,v 1.5 2012/04/15 00:20:49 schmonz Exp $ SHA1 (serialmail-0.75.tar.gz) = 76f8d5ae698cff25b3227e51cc99fff1f4a8b137 RMD160 (serialmail-0.75.tar.gz) = 2d12152b9c7d007f76b4d129c2795cd192ba9f83 Size (serialmail-0.75.tar.gz) = 55079 bytes -SHA1 (patch-aa) = 0ccbe27149addddcd839ed71cc07b68d7473100b -SHA1 (patch-ab) = af02dc2acf416ae63f93de08bdafdad80faebc12 -SHA1 (patch-ac) = 7802bf7b955883b274dcb9429e1bf12c34dd6bd9 -SHA1 (patch-hier.c) = 289676e7494b30bfc45b7a742320bd8fac06674b +SHA1 (patch-aa) = 3b4afee3080a7e82cfb57d159e723c6837eca790 +SHA1 (patch-ab) = e9325df21f6dd114c0bc9327708c82f8b692c1d5 +SHA1 (patch-ac) = fd4af9ee031be8f3d2467dc7f94faeacc65bba85 diff --git a/mail/serialmail/patches/patch-aa b/mail/serialmail/patches/patch-aa index 95a2a6916b4..bc6a4384bbd 100644 --- a/mail/serialmail/patches/patch-aa +++ b/mail/serialmail/patches/patch-aa @@ -1,8 +1,11 @@ -$NetBSD: patch-aa,v 1.1.1.1 2005/04/21 01:00:29 schmonz Exp $ +$NetBSD: patch-aa,v 1.2 2012/04/15 00:20:49 schmonz Exp $ ---- hier.c.orig 1998-11-14 21:28:23.000000000 -0500 +Install docs following hier(7), don't install catpages, set reasonable +permissions, and avoid overwriting "setlock" from sysutils/daemontools. + +--- hier.c.orig 1998-11-15 02:28:23.000000000 +0000 +++ hier.c -@@ -2,21 +2,20 @@ +@@ -2,36 +2,27 @@ void hier() { @@ -20,7 +23,6 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/04/21 01:00:29 schmonz Exp $ + 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,"man/cat1",-1,-1,0755); c(auto_home,"bin","serialqmtp",-1,-1,0755); c(auto_home,"bin","serialsmtp",-1,-1,0755); @@ -30,11 +32,15 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/04/21 01:00:29 schmonz Exp $ - c(auto_home,"bin","setlock",-1,-1,0755); c(auto_home,"man/man1","serialqmtp.1",-1,-1,0644); - c(auto_home,"man/cat1","serialqmtp.0",-1,-1,0644); -@@ -28,10 +27,8 @@ void hier() - c(auto_home,"man/cat1","maildirsmtp.0",-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/cat1","serialsmtp.0",-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/cat1","maildirsmtp.0",-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/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); diff --git a/mail/serialmail/patches/patch-ab b/mail/serialmail/patches/patch-ab index fdac909641b..94cccf0d996 100644 --- a/mail/serialmail/patches/patch-ab +++ b/mail/serialmail/patches/patch-ab @@ -1,4 +1,8 @@ -$NetBSD: patch-ab,v 1.1 2008/07/30 10:54:10 schmonz Exp $ +$NetBSD: patch-ab,v 1.2 2012/04/15 00:20:49 schmonz Exp $ + +Fix to the included libtai, brought over from devel/libtai: + +#include <unistd.h> in leapsecs_read.c so we can read leapsecs.dat. --- leapsecs_read.c.orig 1998-09-04 22:33:37.000000000 -0400 +++ leapsecs_read.c diff --git a/mail/serialmail/patches/patch-ac b/mail/serialmail/patches/patch-ac index 9b891d64fd6..a9214daf7f0 100644 --- a/mail/serialmail/patches/patch-ac +++ b/mail/serialmail/patches/patch-ac @@ -1,4 +1,6 @@ -$NetBSD: patch-ac,v 1.1 2010/03/15 17:31:29 schmonz Exp $ +$NetBSD: patch-ac,v 1.2 2012/04/15 00:20:49 schmonz Exp $ + +DESTDIR support. --- Makefile.orig 1998-11-15 02:28:23.000000000 +0000 +++ Makefile diff --git a/mail/serialmail/patches/patch-hier.c b/mail/serialmail/patches/patch-hier.c deleted file mode 100644 index 5922840d55c..00000000000 --- a/mail/serialmail/patches/patch-hier.c +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-hier.c,v 1.1 2012/04/07 13:17:11 joerg Exp $ - ---- hier.c.orig 2012-04-07 11:39:37.000000000 +0000 -+++ hier.c -@@ -9,7 +9,6 @@ void hier() - 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,"man/cat1",-1,-1,0755); - - c(auto_home,"bin","serialqmtp",-1,-1,0755); - c(auto_home,"bin","serialsmtp",-1,-1,0755); -@@ -18,15 +17,10 @@ void hier() - c(auto_home,"bin","maildirserial",-1,-1,0755); - - 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/cat1","serialsmtp.0",-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/cat1","maildirsmtp.0",-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,"share/doc/serialmail","FROMISP",-1,-1,0644); - c(auto_home,"share/doc/serialmail","TOISP",-1,-1,0644); |