CVS commit: pkgsrc/mail/fastforward

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Sep  1 04:00:14 UTC 2017

Modified Files:
        pkgsrc/mail/fastforward: distinfo
Added Files:
        pkgsrc/mail/fastforward/patches: patch-Makefile patch-hier.c
Removed Files:
        pkgsrc/mail/fastforward/patches: patch-aa patch-ab

Log Message:
Modernize patch filenames.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/mail/fastforward/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/fastforward/patches/patch-Makefile \
    pkgsrc/mail/fastforward/patches/patch-hier.c
cvs rdiff -u -r1.3 -r0 pkgsrc/mail/fastforward/patches/patch-aa
cvs rdiff -u -r1.4 -r0 pkgsrc/mail/fastforward/patches/patch-ab

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

Modified files:

Index: pkgsrc/mail/fastforward/distinfo
diff -u pkgsrc/mail/fastforward/distinfo:1.8 pkgsrc/mail/fastforward/distinfo:1.9
--- pkgsrc/mail/fastforward/distinfo:1.8        Fri Sep  1 03:58:45 2017
+++ pkgsrc/mail/fastforward/distinfo    Fri Sep  1 04:00:14 2017
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2017/09/01 03:58:45 schmonz Exp $
+$NetBSD: distinfo,v 1.9 2017/09/01 04:00:14 schmonz Exp $
 
 SHA1 (fastforward-0.51.tar.gz) = 5a20d2a60d2de791d9a7fbbe6ddb1fdca567053e
 RMD160 (fastforward-0.51.tar.gz) = 84518647b43f0d32dd4fde198dd4712896e8ed25
 SHA512 (fastforward-0.51.tar.gz) = 7206f72dc7bb42d7e0cc63980eda7bc2b93c7ca6639db810f6d28476ab58d3e4bb6e441f4eef2149c5fe933c2f9effe2f2b3101d02cf9f6e922a678e7466b132
 Size (fastforward-0.51.tar.gz) = 40659 bytes
-SHA1 (patch-aa) = 2e7c9f1fac07c3f0acde3ea84d47348ed9a8dd68
-SHA1 (patch-ab) = 6747b72b7d651a7130e905f2246deb498599cb1a
+SHA1 (patch-Makefile) = 2e7c9f1fac07c3f0acde3ea84d47348ed9a8dd68
+SHA1 (patch-hier.c) = 6747b72b7d651a7130e905f2246deb498599cb1a

Added files:

Index: pkgsrc/mail/fastforward/patches/patch-Makefile
diff -u /dev/null pkgsrc/mail/fastforward/patches/patch-Makefile:1.1
--- /dev/null   Fri Sep  1 04:00:14 2017
+++ pkgsrc/mail/fastforward/patches/patch-Makefile      Fri Sep  1 04:00:14 2017
@@ -0,0 +1,54 @@
+$NetBSD: patch-Makefile,v 1.1 2017/09/01 04:00:14 schmonz Exp $
+
+DESTDIR support, and don't build catpages.
+
+--- Makefile.orig      1998-05-19 16:25:42.000000000 +0000
++++ Makefile
+@@ -31,6 +31,14 @@ auto-str.o: \
+ compile auto-str.c substdio.h readwrite.h exit.h
+       ./compile auto-str.c
+ 
++auto_destdir.c: \
++auto-str conf-destdir
++      ./auto-str auto_qmail `head -1 conf-destdir` > auto_destdir.c
++
++auto_destdir.o: \
++compile auto_destdir.c
++      ./compile auto_destdir.c
++
+ auto_qmail.c: \
+ auto-str conf-qmail
+       ./auto-str auto_qmail `head -1 conf-qmail` > auto_qmail.c
+@@ -227,9 +235,9 @@ compile hier.c auto_qmail.h
+       ./compile hier.c
+ 
+ install: \
+-load install.o hier.o auto_qmail.o strerr.a substdio.a error.a open.a \
++load install.o hier.o auto_destdir.o strerr.a substdio.a error.a open.a \
+ str.a
+-      ./load install hier.o auto_qmail.o strerr.a substdio.a \
++      ./load install hier.o auto_destdir.o strerr.a substdio.a \
+       error.a open.a str.a 
+ 
+ install.o: \
+@@ -238,9 +246,9 @@ exit.h
+       ./compile install.c
+ 
+ instcheck: \
+-load instcheck.o hier.o auto_qmail.o strerr.a substdio.a error.a \
++load instcheck.o hier.o auto_destdir.o strerr.a substdio.a error.a \
+ str.a
+-      ./load instcheck hier.o auto_qmail.o strerr.a substdio.a \
++      ./load instcheck hier.o auto_destdir.o strerr.a substdio.a \
+       error.a str.a 
+ 
+ instcheck.o: \
+@@ -248,7 +256,7 @@ compile instcheck.c strerr.h error.h rea
+       ./compile instcheck.c
+ 
+ it: \
+-prog man
++prog
+ 
+ load: \
+ make-load warn-auto.sh systype
Index: pkgsrc/mail/fastforward/patches/patch-hier.c
diff -u /dev/null pkgsrc/mail/fastforward/patches/patch-hier.c:1.1
--- /dev/null   Fri Sep  1 04:00:14 2017
+++ pkgsrc/mail/fastforward/patches/patch-hier.c        Fri Sep  1 04:00:14 2017
@@ -0,0 +1,54 @@
+$NetBSD: patch-hier.c,v 1.1 2017/09/01 04:00:14 schmonz Exp $
+
+Install docs following hier(7), and don't install catpages.
+
+--- hier.c.orig        1998-05-19 16:25:42.000000000 +0000
++++ hier.c
+@@ -5,11 +5,12 @@ void hier()
+   h(auto_qmail,-1,-1,0755);
+ 
+   d(auto_qmail,"bin",-1,-1,0755);
+-  d(auto_qmail,"doc",-1,-1,0755);
+-  d(auto_qmail,"doc/fastforward",-1,-1,0755);
+-  d(auto_qmail,"man",-1,-1,0755);
+-  d(auto_qmail,"man/man1",-1,-1,0755);
+-  d(auto_qmail,"man/cat1",-1,-1,0755);
++  d(auto_qmail,"share",-1,-1,0755);
++  d(auto_qmail,"share/doc",-1,-1,0755);
++  d(auto_qmail,"share/doc/qmail",-1,-1,0755);
++  d(auto_qmail,"share/doc/qmail/fastforward",-1,-1,0755);
++  d(auto_qmail,"@PKGMANDIR@",-1,-1,0755);
++  d(auto_qmail,"@PKGMANDIR@/man1",-1,-1,0755);
+ 
+   c(auto_qmail,"bin","fastforward",-1,-1,0755);
+   c(auto_qmail,"bin","printforward",-1,-1,0755);
+@@ -19,21 +20,13 @@ void hier()
+   c(auto_qmail,"bin","setmaillist",-1,-1,0755);
+   c(auto_qmail,"bin","newinclude",-1,-1,0755);
+ 
+-  c(auto_qmail,"doc/fastforward","ALIASES",-1,-1,0644);
++  c(auto_qmail,"share/doc/qmail/fastforward","ALIASES",-1,-1,0644);
+ 
+-  c(auto_qmail,"man/man1","fastforward.1",-1,-1,0644);
+-  c(auto_qmail,"man/man1","printforward.1",-1,-1,0644);
+-  c(auto_qmail,"man/man1","setforward.1",-1,-1,0644);
+-  c(auto_qmail,"man/man1","newaliases.1",-1,-1,0644);
+-  c(auto_qmail,"man/man1","printmaillist.1",-1,-1,0644);
+-  c(auto_qmail,"man/man1","setmaillist.1",-1,-1,0644);
+-  c(auto_qmail,"man/man1","newinclude.1",-1,-1,0644);
+-
+-  c(auto_qmail,"man/cat1","fastforward.0",-1,-1,0644);
+-  c(auto_qmail,"man/cat1","printforward.0",-1,-1,0644);
+-  c(auto_qmail,"man/cat1","setforward.0",-1,-1,0644);
+-  c(auto_qmail,"man/cat1","newaliases.0",-1,-1,0644);
+-  c(auto_qmail,"man/cat1","printmaillist.0",-1,-1,0644);
+-  c(auto_qmail,"man/cat1","setmaillist.0",-1,-1,0644);
+-  c(auto_qmail,"man/cat1","newinclude.0",-1,-1,0644);
++  c(auto_qmail,"@PKGMANDIR@/man1","fastforward.1",-1,-1,0644);
++  c(auto_qmail,"@PKGMANDIR@/man1","printforward.1",-1,-1,0644);
++  c(auto_qmail,"@PKGMANDIR@/man1","setforward.1",-1,-1,0644);
++  c(auto_qmail,"@PKGMANDIR@/man1","newaliases.1",-1,-1,0644);
++  c(auto_qmail,"@PKGMANDIR@/man1","printmaillist.1",-1,-1,0644);
++  c(auto_qmail,"@PKGMANDIR@/man1","setmaillist.1",-1,-1,0644);
++  c(auto_qmail,"@PKGMANDIR@/man1","newinclude.1",-1,-1,0644);
+ }