Improve DESTDIR support. Take MAINTAINER.

3 files changed, 42 insertions, 16 deletions

diff --git a/mail/safecat/Makefile b/mail/safecat/Makefile
index 8de1110ec94..b25f5656c98 100644
--- a/mail/safecat/Makefile
+++ b/mail/safecat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2017/07/26 02:27:20 schmonz Exp $
+# $NetBSD: Makefile,v 1.20 2017/07/27 02:11:52 schmonz Exp $
 #
 
 DISTNAME=		safecat-1.13
@@ -6,18 +6,16 @@ PKGREVISION=		1
 CATEGORIES=		mail
 MASTER_SITES=		http://jeenyus.net/~budney/linux/software/safecat/
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
+MAINTAINER=		schmonz@NetBSD.org
 HOMEPAGE=		http://www.jeenyus.net/linux/software/safecat.html
 COMMENT=		Write data safely to a maildir
 
 MAKE_JOBS_SAFE=		no
 
 DJB_RESTRICTED=		NO
-BUILD_TARGET=		install instcheck
+DJB_BUILD_TARGETS+=	install instcheck
 DJB_CONFIG_HOME=	conf-root
 
-MAKE_FLAGS+=		DESTDIR=${DESTDIR:Q}
-
 SUBST_CLASSES+=		pkgmandir
 SUBST_STAGE.pkgmandir=	pre-configure
 SUBST_FILES.pkgmandir=	hier.c
diff --git a/mail/safecat/distinfo b/mail/safecat/distinfo
index 4670d4d0105..c01bbd4a973 100644
--- a/mail/safecat/distinfo
+++ b/mail/safecat/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2017/07/26 02:27:20 schmonz Exp $
+$NetBSD: distinfo,v 1.11 2017/07/27 02:11:52 schmonz Exp $
 
 SHA1 (safecat-1.13.tar.gz) = 07b42cb06490abeacefce9429a1dbf96caa1629b
 RMD160 (safecat-1.13.tar.gz) = 614df1d43d13a638ab30a2921b66d78f3fafc4c6
 SHA512 (safecat-1.13.tar.gz) = e6f7401b55a61f70715b3d222c8286c0125c5e7b3b132e5e8d3c8573a6c45dba75b29a459c7e93d7c0760300f0a62635d8ea4eacde9b0b1ff7637b3f6c63e210
 Size (safecat-1.13.tar.gz) = 33953 bytes
 SHA1 (patch-aa) = 269073a9aa0d0b4814a2a0dd889396a575f51c20
-SHA1 (patch-ab) = bfbbdfd34e1b97adccfd36709b5bdd69b6dbd615
+SHA1 (patch-ab) = f19e2acb2cb917277f01a5063ef01199d2338a3c
 SHA1 (patch-hier.c) = b4483673a6eb3a2c55da096a1b01a3a5a9a053a9
diff --git a/mail/safecat/patches/patch-ab b/mail/safecat/patches/patch-ab
index 3282bfc97f0..d8c8d50705e 100644
--- a/mail/safecat/patches/patch-ab
+++ b/mail/safecat/patches/patch-ab
@@ -1,20 +1,48 @@
-$NetBSD: patch-ab,v 1.2 2017/07/26 02:27:20 schmonz Exp $
+$NetBSD: patch-ab,v 1.3 2017/07/27 02:11:52 schmonz Exp $
 
-  Allow installation to DESTDIR (taken from safecat-buildroot.patch in
-  the archive).
+DESTDIR support.
 
 --- Makefile.orig	2004-08-17 00:50:09.000000000 +0000
 +++ Makefile
-@@ -31,7 +31,7 @@ compile auto-str.c substdio.h readwrite.
+@@ -29,6 +29,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_home `head -1 conf-destdir` > auto_destdir.c
++
++auto_destdir.o: \
++compile auto_destdir.c
++	./compile auto_destdir.c
++
  auto_home.c: \
  auto-str conf-root
--	./auto-str auto_home `head -1 conf-root` > auto_home.c
-+	./auto-str auto_home $(DESTDIR)`head -1 conf-root` > auto_home.c
+ 	./auto-str auto_home `head -1 conf-root` > auto_home.c
+@@ -103,9 +111,9 @@ compile hier.c auto_home.h
+ 	./compile hier.c
  
- auto_home.o: \
- compile auto_home.c
-@@ -123,7 +123,7 @@ compile instcheck.c strerr.h error_no.h 
+ install: \
+-load install.o hier.o auto_home.o strerr.a substdio.a open.a error.a \
++load install.o hier.o auto_destdir.o strerr.a substdio.a open.a error.a \
+ str.a
+-	./load install hier.o auto_home.o strerr.a substdio.a \
++	./load install hier.o auto_destdir.o strerr.a substdio.a \
+ 	open.a error.a str.a
+ 
+ install.o: \
+@@ -114,8 +122,8 @@ exit.h buffer.h
+ 	./compile install.c
+ 
+ instcheck: \
+-load instcheck.o hier.o auto_home.o strerr.a substdio.a error.a str.a
+-	./load instcheck hier.o auto_home.o strerr.a substdio.a \
++load instcheck.o hier.o auto_destdir.o strerr.a substdio.a error.a str.a
++	./load instcheck hier.o auto_destdir.o strerr.a substdio.a \
+ 	error.a str.a
+ 
+ instcheck.o: \
+@@ -123,7 +131,7 @@ compile instcheck.c strerr.h error_no.h 
  	./compile instcheck.c
  
  it: \