Cleanup MKDIR usage => INSTALL_*_DIR

XXX need to teach pkglint to be more picky about this

19 files changed, 51 insertions, 55 deletions

diff --git a/www/Mosaic/Makefile b/www/Mosaic/Makefile
index bf00770bdf8..f32aef9caeb 100644
--- a/www/Mosaic/Makefile
+++ b/www/Mosaic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2001/02/17 17:21:37 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2001/02/25 04:18:22 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.15 1998/05/27 08:44:56 dburr Exp
 #
 
@@ -44,6 +44,6 @@ do-install:
 	${LN} -sf Mosaic ${PREFIX}/bin/mosaic
 	${INSTALL_DATA} ${WRKSRC}/app-defaults.color \
 		${PREFIX}/lib/X11/app-defaults/Mosaic
-	${MKDIR} ${PREFIX}/share/mosaic
+	${INSTALL_DATA_DIR} ${PREFIX}/share/mosaic
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/analog/Makefile b/www/analog/Makefile
index 3b5bf3d42a0..ee9c7771c71 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2001/02/17 17:21:41 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2001/02/25 04:18:22 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.15 1999/03/15 02:01:27 steve Exp
 
 DISTNAME=       analog-4.16
@@ -16,7 +16,8 @@ ALL_TARGET=	analog
 MAKE_ENV+=	PREFIX=${PREFIX}
 
 do-install:
-	${MKDIR} ${PREFIX}/share/doc/analog ${PREFIX}/lib/analog/lang \
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/analog \
+	  ${PREFIX}/lib/analog/lang \
 	  ${PREFIX}/lib/analog/images
 	${INSTALL_DATA} ${WRKSRC}/docs/* ${PREFIX}/share/doc/analog
 	${INSTALL_DATA} ${WRKSRC}/images/* ${PREFIX}/lib/analog/images
diff --git a/www/ap-dtcl/Makefile b/www/ap-dtcl/Makefile
index 0a6bff94ba0..1401fbb0cb9 100644
--- a/www/ap-dtcl/Makefile
+++ b/www/ap-dtcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/02/17 17:21:47 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2001/02/25 04:18:22 hubertf Exp $
 
 DISTNAME=	mod_dtcl-0.8.12
 PKGNAME=	ap-dtcl-0.8.12
@@ -23,12 +23,12 @@ do-build:
 
 do-install:
 	@cd ${WRKSRC} && ${PREFIX}/sbin/apxs -i mod_dtcl.so
-	-${MKDIR} ${PREFIX}/share/doc/mod_dtcl
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_dtcl
 	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${PREFIX}/share/doc/mod_dtcl
 	${INSTALL_DATA} ${WRKSRC}/docs/*.gif ${PREFIX}/share/doc/mod_dtcl
 	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${PREFIX}/share/doc/mod_dtcl
-	-${MKDIR} ${PREFIX}/share/examples/mod_dtcl
-	-${MKDIR} ${PREFIX}/share/examples/mod_dtcl/tests
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mod_dtcl
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mod_dtcl/tests
 	${INSTALL_DATA} ${WRKSRC}/tests/README ${PREFIX}/share/examples/mod_dtcl/tests
 	${INSTALL_DATA} ${WRKSRC}/tests/dtcl-test.ttml ${PREFIX}/share/examples/mod_dtcl/tests
 	${INSTALL_DATA} ${WRKSRC}/tests/dtcl.test ${PREFIX}/share/examples/mod_dtcl/tests
diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile
index 969ae89e006..81d1c9f930f 100644
--- a/www/cocoon/Makefile
+++ b/www/cocoon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/17 17:22:02 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/02/25 04:18:22 hubertf Exp $
 
 DISTNAME=	Cocoon-1.8
 PKGNAME=	cocoon-1.8
@@ -55,10 +55,10 @@ do-build:
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/bin/cocoon.jar ${PREFIX}/lib/java
 	${INSTALL_DATA} ${WRKSRC}/lib/turbine-pool.jar ${PREFIX}/lib/java
-	${MKDIR} ${PREFIX}/share/doc/java/cocoon
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/cocoon
 	cd ${WRKSRC}/docs ; ${GTAR} pcf - . | ( cd ${PREFIX}/share/doc/java/cocoon ; ${GTAR} pvxf - )
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/java/cocoon
-	${MKDIR} ${PREFIX}/share/examples/java/cocoon/WEB-INF
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/cocoon/WEB-INF
 	${INSTALL_DATA} ${FILESDIR}/web.xml ${PREFIX}/share/examples/java/cocoon/WEB-INF
 	${INSTALL_DATA} ${WRKSRC}/conf/cocoon.properties ${PREFIX}/share/examples/java/cocoon/WEB-INF
 	cd ${WRKSRC}/samples ; ${GTAR} pcf - . | ( cd ${PREFIX}/share/examples/java/cocoon ; ${GTAR} pvxf - )
diff --git a/www/htdig/Makefile b/www/htdig/Makefile
index 55795d5c8b5..ebccec7926a 100644
--- a/www/htdig/Makefile
+++ b/www/htdig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/02/17 17:22:07 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2001/02/25 04:18:22 hubertf Exp $
 #
 
 DISTNAME=	htdig-3.1.5
@@ -24,7 +24,7 @@ post-install:
 	fi
 	${PREFIX}/bin/htfuzzy -v synonyms
 	${PREFIX}/bin/htfuzzy -v endings
-	${MKDIR} /var/db/htdig
+	${INSTALL_DATA_DIR} /var/db/htdig
 
 .include "../../mk/bsd.prefs.mk"
 .if defined(EXTRACT_USING_PAX)
diff --git a/www/ijb/Makefile b/www/ijb/Makefile
index 0887c3781df..b4dc4282e9f 100644
--- a/www/ijb/Makefile
+++ b/www/ijb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:22:08 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/25 04:18:23 hubertf Exp $
 #
 
 DISTNAME=	ijb20
@@ -14,7 +14,7 @@ COMMENT=	The Internet Junkbuster Proxy blocks unwanted banner ads and cookies
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/junkbuster ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/junkbuster.1 ${PREFIX}/man/man1
-	${MKDIR} ${PREFIX}/share/examples/junkbuster
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/junkbuster
 	${INSTALL_DATA} ${WRKSRC}/junkbstr.ini ${PREFIX}/share/examples/junkbuster/junkbuster.ini
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/jakarta-tomcat/Makefile b/www/jakarta-tomcat/Makefile
index 59384b90774..4b8ce7bc592 100644
--- a/www/jakarta-tomcat/Makefile
+++ b/www/jakarta-tomcat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/02/17 17:22:09 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2001/02/25 04:18:23 hubertf Exp $
 
 DISTNAME=	jakarta-tomcat.src
 PKGNAME=	jakarta-tomcat-3.1.1
@@ -36,7 +36,7 @@ do-build:
 	cd ${WRKSRC} && ${SH} ./build.sh
 
 do-install:
-	${MKDIR} ${JAKARTA_HOME}/tomcat
+	${INSTALL_DATA_DIR} ${JAKARTA_HOME}/tomcat
 	cd ${WRKSRC} && ${SH} ./build.sh dist
 	${CHMOD} +x ${JAKARTA_HOME}/tomcat/bin/*.sh
 	${RM} ${JAKARTA_HOME}/tomcat/bin/*.bat
diff --git a/www/jsdk20/Makefile b/www/jsdk20/Makefile
index 430c31ff01a..5f85f7c28ef 100644
--- a/www/jsdk20/Makefile
+++ b/www/jsdk20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/02/17 17:22:09 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2001/02/25 04:18:23 hubertf Exp $
 # STOP!  Don't update this to a later version of this software.
 # The JSDK and Apache Jakarta projects have merged, making the
 # jakarta-tomcat package the current version of this software.
@@ -37,12 +37,7 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 TEMPDIR?=	/tmp
 TEMPFILE!=echo ${TEMPDIR}/jsdk20.location.$$$$
 
-pre-fetch:
-	if [ ! -x ${LOCALBASE}/bin/urlget ]; \
-	then \
-		${ECHO} '==> Installing urlget to fetch jsdk20' ; \
-		${MAKE} ${MAKEFLAGS} install-build-depends ; \
-	fi
+pre-fetch: install-build-depends
 
 do-fetch:
 	-if [ ! -f ${DISTDIR}/${DISTFILES} ] ; \
@@ -60,13 +55,13 @@ do-fetch:
 	fi
 
 do-install:
-	${MKDIR} ${PREFIX}/lib/java
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/java
 	${INSTALL_DATA} -c -m 644 ${WRKSRC}/lib/jsdk.jar ${PREFIX}/lib/java
-	${MKDIR} ${PREFIX}/share/doc/java/jsdk20
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/jsdk20
 	cd ${WRKSRC}/doc ; ${GTAR} pcf - . | ( cd ${PREFIX}/share/doc/java/jsdk20 ; ${GTAR} pvxf - )
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/java/jsdk20
 	${INSTALL_DATA} -c -m 644 ${WRKSRC}/README ${PREFIX}/share/doc/java/jsdk20
-	${MKDIR} ${PREFIX}/share/examples/java/jsdk20
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/jsdk20
 	cd ${WRKSRC}/examples ; ${GTAR} pcf - . | ( cd ${PREFIX}/share/examples/java/jsdk20 ; ${GTAR} pvxf - )
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/examples/java/jsdk20
 
diff --git a/www/jssi/Makefile b/www/jssi/Makefile
index 9ac68f181d6..14926c98c91 100644
--- a/www/jssi/Makefile
+++ b/www/jssi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/17 17:22:11 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/02/25 04:18:23 hubertf Exp $
 
 DISTNAME=	ApacheJSSI-1.1.2
 PKGNAME=	jssi-1.1.2
@@ -25,7 +25,7 @@ post-build:
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/ApacheJSSI.jar ${PREFIX}/lib/java/ApacheJSSI.jar
-	${MKDIR} ${PREFIX}/share/doc/java/jssi
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/jssi
 	(cd ${WRKSRC}/../../docs ; ${GTAR} pcf - .) | \
 		(cd ${PREFIX}/share/doc/java/jssi ; ${GTAR} pxvf -)
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/java/jssi
diff --git a/www/navigator/Makefile.common b/www/navigator/Makefile.common
index 9948040505c..d1fde6117dc 100644
--- a/www/navigator/Makefile.common
+++ b/www/navigator/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2001/01/11 07:03:04 tron Exp $
+# $NetBSD: Makefile.common,v 1.27 2001/02/25 04:18:23 hubertf Exp $
 #
 # Common include file for communicator and navigator packages
 
@@ -105,7 +105,7 @@ PLIST_SRC=	${PKGDIR}/PLIST.pre \
 PLIST_SUBST+=	NS_VERS=${NS_VERS} LDAP_VERS=${LDAP_VERS} BINNAME=${BINNAME}
 
 do-install:
-	${MKDIR} ${MOZILLA_HOME}/java/classes
+	${INSTALL_DATA_DIR} ${MOZILLA_HOME}/java/classes
 	${INSTALL_SCRIPT} ${WRKSRC}/vreg ${MOZILLA_HOME}
 .for file in ifc11.jar iiop10.jar jae40.jar java40.jar jio40.jar jsd10.jar \
     ldap${LDAP_VERS}.jar resource.jar scd10.jar
diff --git a/www/php3/Makefile b/www/php3/Makefile
index 6609831df9d..66555871da8 100644
--- a/www/php3/Makefile
+++ b/www/php3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/02/17 17:22:28 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2001/02/25 04:18:23 hubertf Exp $
 #
 
 DISTNAME=	php-${PHP_VERSION}
@@ -59,7 +59,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/convertor/convertor \
 		${PREFIX}/bin/php2convert
 	if [ ! -d ${PREFIX}/libexec/cgi-bin ]; then \
-	  ${MKDIR}  ${PREFIX}/libexec/cgi-bin ; fi
+	  ${INSTALL_PROGRAM_DIR}  ${PREFIX}/libexec/cgi-bin ; fi
 	${LN} -sf ../../bin/php ${PREFIX}/libexec/cgi-bin/php
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/php3
 	${INSTALL_DATA_DIR} ${PREFIX}/share/php3
diff --git a/www/spfc/Makefile b/www/spfc/Makefile
index 6d1b66559c7..97961a82f88 100644
--- a/www/spfc/Makefile
+++ b/www/spfc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 17:22:37 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/02/25 04:18:24 hubertf Exp $
 
 DISTNAME=	spfc-0.2.0
 CATEGORIES=	www
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/spfc-0.2.0/src/
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/../bin/spfc.jar ${PREFIX}/lib/java
-	${MKDIR} ${PREFIX}/share/doc/java/spfc
+	${INSTALL_PROGRAM_DIR} ${PREFIX}/share/doc/java/spfc
 	(cd ${WRKSRC}/../docs ; ${GTAR} pcf - .) | \
 		(cd ${PREFIX}/share/doc/java/spfc ; ${GTAR} pxvf -)
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/java/spfc
diff --git a/www/squid/Makefile b/www/squid/Makefile
index 765e900e477..00885024e26 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2001/02/17 17:22:38 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2001/02/25 04:18:24 hubertf Exp $
 
 DISTNAME=	squid-2.3.STABLE4-src
 PKGNAME=	squid-2.3s4nb3
@@ -67,9 +67,9 @@ post-build:
 
 pre-install:
 	@-rm -f ${WRKDIR}/PLIST.share
-	@${MKDIR} ${PREFIX}/share/squid
-	@${MKDIR} ${PREFIX}/share/squid/errors
-	@${MKDIR} ${PREFIX}/share/squid/icons
+	@${INSTALL_DATA_DIR} ${PREFIX}/share/squid
+	@${INSTALL_DATA_DIR} ${PREFIX}/share/squid/errors
+	@${INSTALL_DATA_DIR} ${PREFIX}/share/squid/icons
 	@(							\
 	cd ${WRKSRC}/errors/English;				\
 	ls ERR_* | ${SED} -e 's@^@share/squid/errors/@';		\
@@ -85,7 +85,7 @@ pre-install:
 	) > ${WRKDIR}/PLIST.share
 
 post-install:
-	${MKDIR} /var/squid
+	${INSTALL_DATA_DIR} /var/squid
 	${INSTALL} -d -o nobody /var/squid/logs
 	cd ${WRKSRC}/src; ${MAKE} install-pinger
 	${INSTALL_SCRIPT} ${WRKDIR}/squid.sh ${PREFIX}/etc/rc.d/squid
diff --git a/www/swish-e/Makefile b/www/swish-e/Makefile
index 74de0148bb3..a862f0b70ad 100644
--- a/www/swish-e/Makefile
+++ b/www/swish-e/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/17 17:22:40 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/02/25 04:18:24 hubertf Exp $
 # FreeBSD Id: ports/www/swish-e/Makefile,v 1.3 1999/08/31 02:43:18 peter Exp
 
 DISTNAME=       swish-efiles.1.3.2
@@ -15,7 +15,7 @@ USE_GMAKE=	yes
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/swish-e ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/share/examples/swish-e
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/swish-e
 	${INSTALL_DATA} ${WRKSRC}/user.config ${PREFIX}/share/examples/swish-e
 	${INSTALL_DATA} ${WRKSRC}/test.html ${PREFIX}/share/examples/swish-e
 	${INSTALL_DATA} ${WRKSRC}/swishspider ${PREFIX}/share/examples/swish-e
diff --git a/www/tcl-cgi/Makefile b/www/tcl-cgi/Makefile
index e3fb38eff52..9ab649619e5 100644
--- a/www/tcl-cgi/Makefile
+++ b/www/tcl-cgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/17 17:22:40 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/02/25 04:18:24 hubertf Exp $
 #
 
 DISTNAME=	cgi.tcl
@@ -18,8 +18,8 @@ DIST_SUBDIR=	${PKGNAME}
 GNU_CONFIGURE=	yes
 
 post-install:
-	${MKDIR} ${PREFIX}/share/doc/tcl/cgi-tcl
-	${MKDIR} ${PREFIX}/share/examples/tcl/cgi-tcl
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tcl/cgi-tcl
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/tcl/cgi-tcl
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/tcl/cgi-tcl
 	${INSTALL_DATA} ${WRKSRC}/example/* ${PREFIX}/share/examples/tcl/cgi-tcl
 
diff --git a/www/tidy/Makefile b/www/tidy/Makefile
index 7ddb7c7409f..3b5ad5216d2 100644
--- a/www/tidy/Makefile
+++ b/www/tidy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 17:22:42 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/02/25 04:18:25 hubertf Exp $
 # FreeBSD Id: ports/www/tidy/Makefile,v 1.15 2000/02/16 00:08:36 mharo Exp
 
 DISTNAME=	tidy4aug00
@@ -19,9 +19,9 @@ do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/tidy ${PREFIX}/bin/tidy
 	@${INSTALL_MAN}	${WRKSRC}/man_page.txt	${PREFIX}/man/man1/tidy.1
 	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
-	@${MKDIR} ${PREFIX}/share/doc/tidy
+	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tidy
 .for docfile in ${DOCFILES}
-	@${INSTALL_MAN} ${WRKSRC}/${docfile} ${PREFIX}/share/doc/tidy
+	@${INSTALL_DATA} ${WRKSRC}/${docfile} ${PREFIX}/share/doc/tidy
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/w3c-httpd/Makefile b/www/w3c-httpd/Makefile
index 4d1d4fc25a5..c217ce7438b 100644
--- a/www/w3c-httpd/Makefile
+++ b/www/w3c-httpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/17 17:22:43 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/02/25 04:18:25 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.19 1999/01/08 19:59:26 fenner Exp
 
 DISTNAME=	w3c-httpd-3.0A
@@ -23,7 +23,7 @@ pre-configure:
 .endif
 
 do-install:
-	${MKDIR} ${PREFIX}/etc/w3c-httpd ${PREFIX}/share/w3c-httpd
+	${INSTALL_DATA_DIR} ${PREFIX}/etc/w3c-httpd ${PREFIX}/share/w3c-httpd
 	${CP} -R ${WRKSRC}/server_root/icons ${PREFIX}/share/w3c-httpd
 	${CP} ${WRKSRC}/server_root/config/*.conf ${PREFIX}/etc/w3c-httpd
 	${INSTALL_PROGRAM} ${WRKSRC}/Daemon/${OSNAME}/httpd ${PREFIX}/sbin/w3c-httpd
diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index ab2488b7c71..4354a1473e2 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2001/02/17 17:22:48 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2001/02/25 04:18:25 hubertf Exp $
 
 DISTNAME=	wwwoffle-2.6
 CATEGORIES=	www
@@ -33,10 +33,10 @@ post-build:
 	  >${WRKDIR}/wwwoffle.sh
 
 pre-install:
-	${MKDIR} ${PREFIX}/etc/wwwoffle
+	${INSTALL_DATA_DIR} ${PREFIX}/etc/wwwoffle
 	if [ -d /var/wwwoffle ]; then \
 	  ${RM} -rf /var/wwwoffle/html.old; \
-	  ${MKDIR} /var/wwwoffle/http; \
+	  ${INSTALL_DATA_DIR} /var/wwwoffle/http; \
 	fi
 
 post-install:
diff --git a/www/zope/Makefile b/www/zope/Makefile
index 672cd567b0e..98f112b97d4 100644
--- a/www/zope/Makefile
+++ b/www/zope/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/02/17 17:22:48 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2001/02/25 04:18:25 hubertf Exp $
 #
 
 DISTNAME=	Zope-2.2.2-src
@@ -30,7 +30,7 @@ do-configure:
 
 do-install:
 	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
-	${MKDIR} ${ZOPEDIR}
+	${INSTALL_DATA_DIR} ${ZOPEDIR}
 	(cd ${WRKSRC}; ${PAX} -r -w -s'/.*\.[cho]$$//' . ${ZOPEDIR})
 	${PREFIX}/bin/python \
 		${PREFIX}/lib/python2.0/compileall.py ${ZOPEDIR}