Cleanup MKDIR usage => INSTALL_*_DIR

XXX need to teach pkglint to be more picky about this

15 files changed, 43 insertions, 41 deletions

diff --git a/security/crack/Makefile b/security/crack/Makefile
index e3af4712111..18a3de7f863 100644
--- a/security/crack/Makefile
+++ b/security/crack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/02/17 17:49:41 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2001/02/25 04:18:12 hubertf Exp $
 # FreeBSD Id: ports/security/crack/Makefile,v 1.11 1999/09/04 19:24:50 obrien Exp
 
 DISTNAME=	crack5.0
@@ -31,18 +31,20 @@ do-build:
 	(cd ${WRKSRC} ; ./Crack -makeonly)
 
 do-install:
-	@${MKDIR} ${PREFIX}/libexec/crack
+	@${INSTALL_DATA_DIR} ${PREFIX}/libexec/crack
 	@${CHMOD} go-rwx ${PREFIX}/libexec/crack
-	@${MKDIR} ${PREFIX}/share/crack/conf
+	@${INSTALL_DATA_DIR} ${PREFIX}/share/crack/conf
 	@${CHMOD} go-rwx ${PREFIX}/share/crack
-	@${MKDIR} ${PREFIX}/share/crack/dict
-	@${MKDIR} ${PREFIX}/share/doc/crack
-	@${MKDIR} ${PREFIX}/share/crack/extra ${PREFIX}/share/crack/run
-	@${MKDIR} ${PREFIX}/share/crack/scripts
-	@${MKDIR} ${PREFIX}/share/crack/dict/1 ${PREFIX}/share/crack/dict/2 \
-		${PREFIX}/share/crack/dict/3
-	@${MKDIR} ${PREFIX}/share/crack/run
-	@${MKDIR} ${PREFIX}/crack/run/dict
+	@${INSTALL_DATA_DIR} ${PREFIX}/share/crack/dict
+	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/crack
+	@${INSTALL_DATA_DIR} ${PREFIX}/share/crack/extra \
+			     ${PREFIX}/share/crack/run
+	@${INSTALL_DATA_DIR} ${PREFIX}/share/crack/scripts
+	@${INSTALL_DATA_DIR} ${PREFIX}/share/crack/dict/1\
+			     ${PREFIX}/share/crack/dict/2 \
+		             ${PREFIX}/share/crack/dict/3
+	@${INSTALL_DATA_DIR} ${PREFIX}/share/crack/run
+	@${INSTALL_DATA_DIR} ${PREFIX}/crack/run/dict
 	${INSTALL_SCRIPT} ${WRKSRC}/Crack ${PREFIX}/sbin
 	@${SED} 's|@@PREFIX@@|${PREFIX}|g' < ${WRKSRC}/Reporter > \
 	    ${PREFIX}/sbin/Reporter
diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile
index 0fa069c1bef..eafdc134354 100644
--- a/security/kth-krb4/Makefile
+++ b/security/kth-krb4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/17 17:49:47 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/02/25 04:18:12 hubertf Exp $
 #
 
 DISTNAME=		krb4-1.0.1
@@ -21,7 +21,7 @@ post-patch:
 	@${MV} ${WRKSRC}/lib/kafs/kafs.h.sed ${WRKSRC}/lib/kafs/kafs.h
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/examples/kth-krb4
+	@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/kth-krb4
 	${INSTALL_DATA} ${WRKSRC}/etc/krb.conf ${PREFIX}/share/examples/kth-krb4
 	${INSTALL_DATA} ${WRKSRC}/etc/krb.realms ${PREFIX}/share/examples/kth-krb4
 	${INSTALL_DATA} ${WRKSRC}/etc/inetd.conf.changes ${PREFIX}/share/examples/kth-krb4
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 2abe39aa03f..843569bcd31 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2001/02/20 18:04:17 hubertf Exp $
+# $NetBSD: Makefile,v 1.30 2001/02/25 04:18:12 hubertf Exp $
 #
 
-DISTNAME=		openssl-0.9.5a
+DISTNAME=		openssl-0.9.6
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.openssl.org/source/ \
 			ftp://ftp.uni-trier.de/pub/unix/security/openssl/
diff --git a/security/pgp2/Makefile b/security/pgp2/Makefile
index e0902e445c7..e02a4ea311c 100644
--- a/security/pgp2/Makefile
+++ b/security/pgp2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2001/02/22 07:43:08 tron Exp $
+# $NetBSD: Makefile,v 1.30 2001/02/25 04:18:12 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/08/27 13:06:01 ache Exp
 #
 
@@ -82,7 +82,7 @@ do-build:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pgp ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKDIR}/doc/pgp.1 ${PREFIX}/man/man1
-	-${MKDIR} ${PGPLIB}
+	${INSTALL_DATA_DIR} ${PGPLIB}
 	cd ${WRKDIR}/doc && ${INSTALL_DATA} pgpdoc1.txt pgpdoc2.txt ${PGPLIB}
 	cd ${WRKDIR} && \
 		${INSTALL_DATA} de.hlp en.hlp es.hlp fr.hlp pgp.hlp ${PGPLIB}
diff --git a/security/pgp5/Makefile b/security/pgp5/Makefile
index 90b570551ff..83e971b1b9a 100644
--- a/security/pgp5/Makefile
+++ b/security/pgp5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/02/17 17:50:02 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2001/02/25 04:18:13 hubertf Exp $
 #
 
 DISTNAME=	pgp50i-unix-src
@@ -49,7 +49,7 @@ post-patch:
 	${MV} ${WRKSRC}/man/pgp.1 ${WRKSRC}/man/pgp5.1
 
 post-install:
-	-${MKDIR} ${PGPLIB}
+	${INSTALL_DATA_DIR} ${PGPLIB}
 	${INSTALL_DATA} ${WRKSRC}/language50.txt ${PGPLIB}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/py-crypto/Makefile b/security/py-crypto/Makefile
index 85ba74be35a..84b16236fcc 100644
--- a/security/py-crypto/Makefile
+++ b/security/py-crypto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/02/17 17:50:05 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2001/02/25 04:18:13 hubertf Exp $
 
 DISTNAME=	pycrypt100
 PKGNAME=	py-crypto-1.0.0
@@ -40,7 +40,7 @@ do-build:
 		${WRKSRC}/Lib
 
 do-install:
-	${MKDIR} ${PREFIX}/lib/python1.5/site-packages
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/python1.5/site-packages
 	(cd ${WRKSRC}/Lib ; ${INSTALL_DATA} *.py *.pyc *.pyo \
 		${PREFIX}/lib/python1.5/site-packages)
 	(cd ${WRKSRC}/src ; ${INSTALL_DATA} *.so \
diff --git a/security/racoon/Makefile b/security/racoon/Makefile
index 7da5c3e0b61..1cd74947e2e 100644
--- a/security/racoon/Makefile
+++ b/security/racoon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2001/02/22 02:12:32 itojun Exp $
+# $NetBSD: Makefile,v 1.32 2001/02/25 04:18:13 hubertf Exp $
 #
 
 DISTNAME=	racoon-20010222a
@@ -43,11 +43,11 @@ pre-configure:
 	(cd ${WRKSRC}/../libipsec; ${MAKE})
 
 post-install:
-	${MKDIR} ${PREFIX}/share/doc/racoon
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/racoon
 	for i in FAQ README.certificate; do \
 		${INSTALL_DATA} ${WRKSRC}/doc/$$i ${PREFIX}/share/doc/racoon; \
 	done
-	${MKDIR} ${PREFIX}/share/examples/racoon
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/racoon
 	${INSTALL_DATA} ${WRKSRC}/samples/racoon.conf.sample \
 		${PREFIX}/share/examples/racoon
 
diff --git a/security/rc5des/Makefile b/security/rc5des/Makefile
index 86d7fe99771..e7148ad4b81 100644
--- a/security/rc5des/Makefile
+++ b/security/rc5des/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/17 17:50:06 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/02/25 04:18:13 hubertf Exp $
 #
 
 DISTNAME=		rc5-mlg-004
@@ -32,7 +32,7 @@ do-build:
 #	cd ${WRKSRC}; ${RM} -f master.ini.orig master.ini.in rc5.sh.orig
 
 do-install:
-	${MKDIR} ${PREFIX}/RC5
+	${INSTALL_DATA_DIR} ${PREFIX}/RC5
 	cd ${WRKSRC}; ${PAX} -r -w . ${PREFIX}/RC5
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/rsaref/Makefile b/security/rsaref/Makefile
index 7d0321fd03e..de481e5d4dc 100644
--- a/security/rsaref/Makefile
+++ b/security/rsaref/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/02/17 17:50:07 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2001/02/25 04:18:13 hubertf Exp $
 #
 
 DISTNAME=		rsaref
@@ -31,7 +31,7 @@ do-configure:
 	@${RM} -f ${WRKDIR}/source/rsaref && ${LN} -sf . ${WRKDIR}/source/rsaref
 
 do-install:
-	${MKDIR} ${PREFIX}/include/rsaref ${PREFIX}/share/doc/rsaref
+	${INSTALL_DATA_DIR} ${PREFIX}/include/rsaref ${PREFIX}/share/doc/rsaref
 	cd ${WRKSRC} && ${LIBTOOL} ${INSTALL_DATA} librsaref.la ${PREFIX}/lib
 .for file in des.h global.h md2.h md5.h rsa.h rsaref.h
 	${INSTALL_DATA} ${WRKDIR}/source/${file} ${PREFIX}/include/rsaref/
diff --git a/security/smtpd/Makefile b/security/smtpd/Makefile
index 50316d58f50..e84bee46c0c 100644
--- a/security/smtpd/Makefile
+++ b/security/smtpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 17:50:08 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/02/25 04:18:14 hubertf Exp $
 #
 
 DISTNAME=	smtpd-2.0
@@ -14,7 +14,7 @@ COMMENT=	Store and forward SMTP proxy
 SPOOL=		/var/spool/smtpd
 
 pre-install:
-		-${MKDIR} ${SPOOL}/etc
+		-${INSTALL_DATA_DIR} ${SPOOL}/etc
 		for f in antirelay_check_rules_example antispam_check_rules.example smtpd_check_rules.example ; do ${INSTALL_DATA} ${WRKSRC}/$$f ${SPOOL}/etc; done
 		${CHOWN} -R uucp.mail ${SPOOL}
 		${CHMOD} -R g=,o= ${SPOOL}
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index e95d93547c1..ce6cb9a8d35 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2001/02/17 17:50:09 wiz Exp $
+# $NetBSD: Makefile,v 1.88 2001/02/25 04:18:14 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
 #
 
@@ -192,7 +192,7 @@ post-build:
 	fi
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/examples/ssh
+	@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ssh
 	@${MKDIR} ${WRKDIR}${SSH_CONF_DIR}
 	(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
 		-f ${MAKEFILE} install_prefix=${WRKDIR} install-configs)
diff --git a/security/ssh6/Makefile b/security/ssh6/Makefile
index 11ad3a73d4e..1472ee45223 100644
--- a/security/ssh6/Makefile
+++ b/security/ssh6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/02/17 17:50:10 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2001/02/25 04:18:14 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
 #
 
@@ -187,7 +187,7 @@ post-build:
 	fi
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/examples/ssh
+	@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ssh
 	@${MKDIR} ${WRKDIR}${SSH_CONF_DIR}
 	(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
 		-f ${MAKEFILE} install_prefix=${WRKDIR} install-configs)
diff --git a/security/tcp_wrappers/Makefile b/security/tcp_wrappers/Makefile
index 3e0aef6855b..930aebd8d2d 100644
--- a/security/tcp_wrappers/Makefile
+++ b/security/tcp_wrappers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:50:13 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/02/25 04:18:14 hubertf Exp $
 
 DISTNAME= 	tcp_wrappers_7.6-ipv6.1
 PKGNAME=	tcp_wrappers-7.6.1
@@ -18,7 +18,7 @@ MAKE_ENV+=	IPV6=-DHAVE_IPV6
 .endif
 
 do-install:
-	${MKDIR} ${PREFIX}/share/doc/tcp_wrappers
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tcp_wrappers
 	cd ${WRKSRC} && \
 	${INSTALL_PROGRAM} tcpdmatch try-from safe_finger tcpdchk \
 	  ${PREFIX}/bin && \
diff --git a/security/tripwire/Makefile b/security/tripwire/Makefile
index 4b71a89463e..11458aed07b 100644
--- a/security/tripwire/Makefile
+++ b/security/tripwire/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/17 17:50:14 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/02/25 04:18:15 hubertf Exp $
 #
 
 DISTNAME=       tripwire-1.2
@@ -23,8 +23,8 @@ post-patch:
 PRE_ROOT_CMD=	${CHMOD} -R go+rwx ${WRKDIR}
 
 post-install:
-	${MKDIR} ${PREFIX}/share/doc/tripwire ${PREFIX}/etc/tripwire/databases
-	${INSTALL_MAN} ${WRKSRC}/docs/designdoc.ps ${PREFIX}/share/doc/tripwire
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tripwire ${PREFIX}/etc/tripwire/databases
+	${INSTALL_DATA} ${WRKSRC}/docs/designdoc.ps ${PREFIX}/share/doc/tripwire
 	${SED} -e 's|@localbase@|${LOCALBASE}|g' -e 's|@x11base@|${X11BASE}|g' \
 		${FILESDIR}/tw.conf.${LOWER_OPSYS} > ${PREFIX}/etc/tripwire/tripwire.conf
 
diff --git a/security/xdm-krb4/Makefile b/security/xdm-krb4/Makefile
index 977e7801c5b..af83536f816 100644
--- a/security/xdm-krb4/Makefile
+++ b/security/xdm-krb4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/02/24 02:09:29 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2001/02/25 04:18:15 hubertf Exp $
 #
 
 DISTNAME=		xdm-krb4-3.3.6.2
@@ -26,7 +26,7 @@ pre-install:
 		>${WRKDIR}/xdm-krb4.sh
 
 post-install:
-	-${MKDIR} ${PREFIX}/etc/rc.d
+	${INSTALL_DATA_DIR} ${PREFIX}/etc/rc.d
 	${INSTALL_DATA}                                                       \
 		${WRKDIR}/xdm-krb4.sh                                         \
 		${PREFIX}/etc/rc.d/xdm-krb4