Add DESTDIR support.

3 files changed, 16 insertions, 13 deletions

diff --git a/security/cfs/Makefile b/security/cfs/Makefile
index 325c6cf57f5..6793c31aea4 100644
--- a/security/cfs/Makefile
+++ b/security/cfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2008/04/07 16:45:35 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2008/06/20 01:09:33 joerg Exp $
 
 DISTNAME=		cfs-1.4.1
 PKGREVISION=		6
@@ -9,6 +9,7 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.crypto.com/software/
 COMMENT=		Encrypting file system, using NFS as its interface
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 CRYPTO=			# defined
 
@@ -99,15 +100,15 @@ do-build:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV}				\
 		${SH} ${CFS_BUILD_SCRIPT} ${BUILD_TARGET}
 
-INSTALLATION_DIRS=	sbin ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 ${DOCDIR}
+INSTALLATION_DIRS=	bin sbin ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 ${DOCDIR}
 
 post-install:
 	cd ${WRKSRC}; for file in *.1; do				\
-		${INSTALL_MAN} $${file} ${PREFIX}/${PKGMANDIR}/man1/$${file};	\
+		${INSTALL_MAN} $${file} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/$${file};	\
 	done
 	cd ${WRKSRC}; for file in *.8; do				\
-		${INSTALL_MAN} $${file} ${PREFIX}/${PKGMANDIR}/man8/$${file};	\
+		${INSTALL_MAN} $${file} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/$${file};	\
 	done
-	${INSTALL_DATA} ${WRKSRC}/notes.ms ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/notes.ms ${DESTDIR}${DOCDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/cfs/distinfo b/security/cfs/distinfo
index 8df2d54ec6d..635c4cf559f 100644
--- a/security/cfs/distinfo
+++ b/security/cfs/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2006/08/05 13:30:26 adrianp Exp $
+$NetBSD: distinfo,v 1.12 2008/06/20 01:09:33 joerg Exp $
 
 SHA1 (cfs-1.4.1.tar.gz) = be3f73b233149477b739456498c71b120d5f2fb5
 RMD160 (cfs-1.4.1.tar.gz) = 0ced92fe9773c6ce6b6706e26de9e17e710e7e46
 Size (cfs-1.4.1.tar.gz) = 98943 bytes
-SHA1 (patch-aa) = c22350cfbcec8ad23bcafd6d9bc5017fb098d259
+SHA1 (patch-aa) = 7df79a1e84c0866edc11496a4b2cd438ed725936
 SHA1 (patch-ab) = 1ff2d2e32b87332ec66cc8f01299fa4b1ddac81a
 SHA1 (patch-ac) = 354290ff606fab97b73980e6e512f10ef1397f01
 SHA1 (patch-ad) = 2ed5967d59d8f91948b2dd9ed4b18c5073d63615
diff --git a/security/cfs/patches/patch-aa b/security/cfs/patches/patch-aa
index ef0467fb7eb..e89b3681ec3 100644
--- a/security/cfs/patches/patch-aa
+++ b/security/cfs/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2004/07/25 04:51:26 grant Exp $
+$NetBSD: patch-aa,v 1.6 2008/06/20 01:09:33 joerg Exp $
 
 --- Makefile.orig	2001-05-04 04:29:21.000000000 +1000
 +++ Makefile
@@ -53,17 +53,19 @@ $NetBSD: patch-aa,v 1.5 2004/07/25 04:51:26 grant Exp $
  
  admproto_clnt.c: admproto.x
  	rpcgen $(RPCOPTS) -l -o admproto_clnt.c admproto.x 
-@@ -359,10 +362,10 @@ printout: $(SRCS) cfs.h mcg.h safer.h ad
+@@ -359,10 +362,11 @@ printout: $(SRCS) cfs.h mcg.h safer.h ad
  	$(PRINTCMD) $(SRCS) cfs.h mcg.h safer.h admproto.h nfsproto.h
  
  install_cfs: cfsd cattach cdetach cmkdir
 -	install -m 0755 -c -o root cfsd $(ETCDIR)
 -	install -m 0755 -c -o root cattach cdetach cmkdir cpasswd cfssh \
-+	${BSD_INSTALL} -m 0755 -c -o root cfsd $(ETCDIR)
-+	${BSD_INSTALL} -m 0755 -c -o root cattach cdetach cmkdir cpasswd cfssh \
-                 cname ccat cmkkey $(BINDIR)
++	${BSD_INSTALL_PROGRAM} cfsd ${DESTDIR}$(ETCDIR)
++	${BSD_INSTALL_SCRIPT} cmkkey cfssh ${DESTDIR}$(BINDIR)
++	${BSD_INSTALL_SCRIPT} cattach cdetach cmkdir cpasswd \
+-                cname ccat cmkkey $(BINDIR)
++                cname ccat ${DESTDIR}$(BINDIR)
 -#	install -m 0755 i o $(BINDIR)
-+#	${BSD_INSTALL} -m 0755 i o $(BINDIR)
++#	${BSD_INSTALL_PROGRAM} i o ${DESTDIR}$(BINDIR)
  	@echo "Kill any running cfsd prior to restarting."
  	@echo "See the README file for more information."
  	@echo "Don't forget to install the man pages (*.[18])."