DESTDIR support.

4 files changed, 75 insertions, 2 deletions

diff --git a/mail/fastforward/Makefile b/mail/fastforward/Makefile
index d1a79176641..0204fb8df6d 100644
--- a/mail/fastforward/Makefile
+++ b/mail/fastforward/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2010/03/12 13:19:49 obache Exp $
+# $NetBSD: Makefile,v 1.20 2010/03/15 17:29:43 schmonz Exp $
 #
 
 DISTNAME=		fastforward-0.51
@@ -11,6 +11,8 @@ HOMEPAGE=		http://cr.yp.to/fastforward.html
 COMMENT=		Sendmail-style /etc/aliases support for qmail
 LICENSE=		public-domain
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=		qmail>=1.03nb7:../../mail/qmail
 
 CONFLICTS+=		esmtp>=1.2 postfix-[0-9]* sendmail-[0-9]*
diff --git a/mail/fastforward/distinfo b/mail/fastforward/distinfo
index fb7386c3a31..b8f8b4ca464 100644
--- a/mail/fastforward/distinfo
+++ b/mail/fastforward/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 09:59:22 agc Exp $
+$NetBSD: distinfo,v 1.3 2010/03/15 17:29:43 schmonz Exp $
 
 SHA1 (fastforward-0.51.tar.gz) = 5a20d2a60d2de791d9a7fbbe6ddb1fdca567053e
 RMD160 (fastforward-0.51.tar.gz) = 84518647b43f0d32dd4fde198dd4712896e8ed25
 Size (fastforward-0.51.tar.gz) = 40659 bytes
+SHA1 (patch-aa) = 6b0dfb2cf364fbc9eb86830585210c303a68ae5f
+SHA1 (patch-ab) = 8ec7eff525bbd1b216c47020adaa5af3daf72580
diff --git a/mail/fastforward/patches/patch-aa b/mail/fastforward/patches/patch-aa
new file mode 100644
index 00000000000..9905c4fa332
--- /dev/null
+++ b/mail/fastforward/patches/patch-aa
@@ -0,0 +1,43 @@
+$NetBSD: patch-aa,v 1.1 2010/03/15 17:29:43 schmonz Exp $
+
+--- 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: \
diff --git a/mail/fastforward/patches/patch-ab b/mail/fastforward/patches/patch-ab
new file mode 100644
index 00000000000..0297f505fe0
--- /dev/null
+++ b/mail/fastforward/patches/patch-ab
@@ -0,0 +1,26 @@
+$NetBSD: patch-ab,v 1.1 2010/03/15 17:29:43 schmonz Exp $
+
+--- hier.c.orig	1998-05-19 16:25:42.000000000 +0000
++++ hier.c
+@@ -5,8 +5,10 @@ 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,"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,"man",-1,-1,0755);
+   d(auto_qmail,"man/man1",-1,-1,0755);
+   d(auto_qmail,"man/cat1",-1,-1,0755);
+@@ -19,7 +21,7 @@ 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);