Prepare for switching to NO_MTREE=yes.

6 files changed, 21 insertions, 25 deletions

diff --git a/security/libdes/Makefile b/security/libdes/Makefile
index 006810d5ccc..2229e8d33ef 100644
--- a/security/libdes/Makefile
+++ b/security/libdes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/02/22 19:27:07 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/03/24 19:21:31 joerg Exp $
 
 DISTNAME=	libdes-4.04b
 CATEGORIES=	security
@@ -10,4 +10,6 @@ COMMENT=	Small DES (Data Encryption Standard) lib & standalone program
 WRKSRC=		${WRKDIR}/des
 CRYPTO=		YES
 
+INSTALLATION_DIRS=	bin include lib
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/libdes/PLIST b/security/libdes/PLIST
index 9c5fd4396ff..ed4576f257a 100644
--- a/security/libdes/PLIST
+++ b/security/libdes/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:16:50 zuntum Exp $
-lib/libdes.a
+@comment $NetBSD: PLIST,v 1.2 2007/03/24 19:21:31 joerg Exp $
 bin/libdes
-man/man3/libdes_crypt.3
-man/man1/libdes.1
 include/libdes.h
+lib/libdes.a
+man/man1/libdes.1
+man/man3/libdes_crypt.3
diff --git a/security/libident/Makefile b/security/libident/Makefile
index 36d413d50a1..02af3bb81c0 100644
--- a/security/libident/Makefile
+++ b/security/libident/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:30:34 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2007/03/24 19:21:31 joerg Exp $
 #
 
 DISTNAME=	libident-0.22
@@ -12,5 +12,6 @@ COMMENT=	Small library to interface to the ident protocol server (rfc1413)
 USE_LIBTOOL=	yes
 
 BUILD_TARGET=	netbsd
+INSTALLATION_DIRS=	include lib ${PKGMANDIR}/man3
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/msf/Makefile b/security/msf/Makefile
index 61747291c99..94f0ea98c1c 100644
--- a/security/msf/Makefile
+++ b/security/msf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/06/05 12:33:52 adrianp Exp $
+# $NetBSD: Makefile,v 1.12 2007/03/24 19:21:31 joerg Exp $
 #
 
 DISTNAME=	framework-2.6
@@ -46,21 +46,12 @@ PYTHON_PATCH_SCRIPTS=	payloads/external/WindowsSyscall.py \
 .include "../../lang/python/extension.mk"
 .endif
 
-do-install:
-	${INSTALL_DATA_DIR} ${MSFDIR}
-	${INSTALL_DATA_DIR} ${MSFDIR}/docs
-	${INSTALL_DATA_DIR} ${MSFDIR}/data
-	${INSTALL_DATA_DIR} ${MSFDIR}/encoders
-	${INSTALL_DATA_DIR} ${MSFDIR}/exploits
-	${INSTALL_DATA_DIR} ${MSFDIR}/extras
-	${INSTALL_DATA_DIR} ${MSFDIR}/lib
-	${INSTALL_DATA_DIR} ${MSFDIR}/nops
-	${INSTALL_DATA_DIR} ${MSFDIR}/payloads
-	${INSTALL_DATA_DIR} ${MSFDIR}/payloads/external
-	${INSTALL_DATA_DIR} ${MSFDIR}/sdk
-	${INSTALL_DATA_DIR} ${MSFDIR}/src
-	${INSTALL_DATA_DIR} ${MSFDIR}/tools
+INSTALLATION_DIRS=	share/msf/docs share/msf/data share/msf/encoders \
+			share/msf/exploits share/msf/extras share/msf/lib \
+			share/msf/nops share/msf/payloads/external \
+			share/msf/sdk share/msf/src share/msf/tools share/doc
 
+do-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/* ${MSFDIR}/docs
 	${INSTALL_DATA} ${WRKSRC}/encoders/*.pm ${MSFDIR}/encoders
 	${INSTALL_DATA} ${WRKSRC}/exploits/*.pm ${MSFDIR}/exploits
diff --git a/security/pam-pwauth_suid/Makefile b/security/pam-pwauth_suid/Makefile
index 09daa287f87..82aac71fc73 100644
--- a/security/pam-pwauth_suid/Makefile
+++ b/security/pam-pwauth_suid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/01/08 18:39:44 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2007/03/24 19:21:31 joerg Exp $
 
 DISTNAME=	pam-pwauth_suid-1.0
 CATEGORIES=	security
@@ -11,6 +11,8 @@ NO_CHECKSUM=	yes
 WRKSRC=		${WRKDIR}
 CFLAGS+=	-DPATH_HELPER=\"${PREFIX}/libexec/pwauth_suid_helper\"
 
+INSTALLATION_DIRS=	lib/security libexec
+
 do-extract:
 	${CP} ${FILESDIR}/pam_pwauth_suid.c ${FILESDIR}/pwauth_suid_helper.c \
 		${WRKSRC}
@@ -21,7 +23,6 @@ do-build:
 	 ${CC} ${CFLAGS} pwauth_suid_helper.c -o pwauth_suid_helper -lcrypt)
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/security
 	${INSTALL_DATA} ${WRKSRC}/pam_pwauth_suid.so.0 ${PREFIX}/lib/security
 	${INSTALL_PROGRAM} ${WRKSRC}/pwauth_suid_helper ${PREFIX}/libexec
 	${CHMOD} 04555 ${PREFIX}/libexec/pwauth_suid_helper
diff --git a/security/portsentry/Makefile b/security/portsentry/Makefile
index 68744cf3cf2..441e809b967 100644
--- a/security/portsentry/Makefile
+++ b/security/portsentry/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:30:37 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2007/03/24 19:21:31 joerg Exp $
 #
 
 DISTNAME=	portsentry-1.2
@@ -17,6 +17,8 @@ EGDIR=		${PREFIX}/share/examples/portsentry
 CONF_FILES=	${EGDIR}/portsentry.conf ${PKG_SYSCONFDIR}/portsentry.conf
 CONF_FILES+=	${EGDIR}/portsentry.ignore ${PKG_SYSCONFDIR}/portsentry.ignore
 
+INSTALLATION_DIRS=	share/doc/portsentry share/examples/portsentry
+
 post-patch:
 	@cd ${WRKSRC};							\
 	case ${OPSYS} in						\
@@ -33,7 +35,6 @@ post-patch:
 	done
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/portsentry
 	${INSTALL_DATA} ${WRKSRC}/README.install ${PREFIX}/share/doc/portsentry
 	${INSTALL_DATA} ${WRKSRC}/README.methods ${PREFIX}/share/doc/portsentry