Cleanup MKDIR usage => INSTALL_*_DIR

XXX need to teach pkglint to be more picky about this

23 files changed, 64 insertions, 68 deletions

diff --git a/x11/Xaw-Xpm/Makefile b/x11/Xaw-Xpm/Makefile
index 5572e49fb3f..b1f4d468fdd 100644
--- a/x11/Xaw-Xpm/Makefile
+++ b/x11/Xaw-Xpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/02/17 17:06:12 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2001/02/25 04:18:25 hubertf Exp $
 #
 
 DISTNAME=		Xaw-XPM-1.1
@@ -17,10 +17,10 @@ USE_IMAKE=		YES
 USE_XPM=		YES
 
 post-install:
-	${MKDIR} ${PREFIX}/share/doc/Xaw-Xpm
-	${MKDIR} ${PREFIX}/share/pixmaps
-	${CP} ${WRKSRC}/README-XPM ${PREFIX}/share/doc/Xaw-Xpm
-	${CP} ${WRKSRC}/defaults-XawXpm ${PREFIX}/share/doc/Xaw-Xpm
-	${CP} ${WRKSRC}/pixmaps/*.xpm ${PREFIX}/share/pixmaps
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/Xaw-Xpm
+	${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/README-XPM ${PREFIX}/share/doc/Xaw-Xpm
+	${INSTALL_DATA} ${WRKSRC}/defaults-XawXpm ${PREFIX}/share/doc/Xaw-Xpm
+	${INSTALL_DATA} ${WRKSRC}/pixmaps/*.xpm ${PREFIX}/share/pixmaps
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/Xaw3d/Makefile b/x11/Xaw3d/Makefile
index d4f904143e3..0d50571fc7e 100644
--- a/x11/Xaw3d/Makefile
+++ b/x11/Xaw3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2001/02/17 17:06:13 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2001/02/25 04:18:25 hubertf Exp $
 #
 
 DISTNAME=	Xaw3d-1.5
@@ -19,8 +19,8 @@ post-extract:
 	@(cd ${WRKSRC}; ${LN} -s .. X11)
 
 post-install:
-	${MKDIR} ${PREFIX}/share/doc/Xaw3d
-	${CP} ${WRKSRC}/README.XAW3D ${PREFIX}/share/doc/Xaw3d
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/Xaw3d
+	${INSTALL_DATA} ${WRKSRC}/README.XAW3D ${PREFIX}/share/doc/Xaw3d
 	@if [ -f ${WRKSRC}/libXaw3d.a ]; then			\
 		${CP} ${PKGDIR}/PLIST ${PLIST_SRC};		\
 	else							\
diff --git a/x11/filerunner/Makefile b/x11/filerunner/Makefile
index be942ab82b3..ec395665978 100644
--- a/x11/filerunner/Makefile
+++ b/x11/filerunner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/02/17 17:06:19 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2001/02/25 04:18:26 hubertf Exp $
 # $FreeBSD Id: Makefile,v 1.12 1998/02/24 21:43:11 jseger Exp
 #
 
@@ -20,7 +20,7 @@ post-extract:
 	${CP} ${WRKSRC}/Makefiles/Makefile.netbsd_gcc ${WRKSRC}/Makefile
 
 do-install:
-	${MKDIR} ${PREFIX}/lib/FileRunner/bitmaps
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/FileRunner/bitmaps
 	${INSTALL_SCRIPT} ${WRKSRC}/fr ${PREFIX}/lib/FileRunner
 	${LN} -sf ${PREFIX}/lib/FileRunner/fr ${PREFIX}/bin
 .for FILE in FAQ HISTORY QuickStart.txt Tips Users_Guide.txt chmod.tcl cmd.tcl config.tcl dialog_about.tcl ext.so font.tcl ftp.tcl http.tcl tclIndex
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 0ee14266f56..bd46f189714 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/02/17 17:06:22 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2001/02/25 04:18:26 hubertf Exp $
 
 DISTNAME=	gdm-2.0beta4
 PKGNAME=	gdm-2.0b4
@@ -99,7 +99,7 @@ post-install:
 	  fi; \
 	fi; \
 	TARGET=${GDMCFGDIR}/${FILE:C/.*://}; \
-	${MKDIR} `dirname $$TARGET`; \
+	${INSTALL_DATA_DIR} `dirname $$TARGET`; \
 	${ECHO} "installing $$SOURCE as $$TARGET"; \
 	if [ -x $$SOURCE ]; then \
 	  ${INSTALL_SCRIPT} $$SOURCE $$TARGET; \
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 51b18dd142c..0b1ee68ea27 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2001/02/17 17:06:24 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2001/02/25 04:18:26 hubertf Exp $
 
 DISTNAME=		gnome-libs-1.2.8
 CATEGORIES=		x11 gnome
@@ -62,9 +62,9 @@ pre-build:
 		${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} gnomesupport.h
 
 post-install:
-	${MKDIR} ${PREFIX}/etc/CORBA/servers
+	${INSTALL_DATA_DIR} ${PREFIX}/etc/CORBA/servers
 	${TOUCH} ${PREFIX}/etc/CORBA/servers/.directory
-	${MKDIR} ${LOCALSTATEDIR}
+	${INSTALL_DATA_DIR} ${LOCALSTATEDIR}
 	${TEST} ${PREFIX} = ${LOCALBASE} || \
 	${LN} -fs ${PREFIX}/share/aclocal/libart.m4 \
 		${LOCALBASE}/share/aclocal/libart.m4
diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile
index a87f15948c5..5e4a7c2e204 100644
--- a/x11/kdebase/Makefile
+++ b/x11/kdebase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2001/02/17 17:06:33 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2001/02/25 04:18:26 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp
 
 DISTNAME=	kdebase-1.1.2
@@ -77,7 +77,7 @@ post-install:
 	@(cd ${PREFIX}; ${FIND} ${PLIST_DIRS} -type d | sort -r | \
 	    ${SED} "s/^/\@dirrm /" >>${PLIST_SRC})
 .for DIR in ${KDE_DIRS}
-	@${MKDIR} ${PREFIX}/${DIR}
+	@${INSTALL_DATA_DIR} ${PREFIX}/${DIR}
 	@${ECHO} "@exec mkdir -p %D/${DIR}" >>${PLIST_SRC}
 	@${ECHO} "@dirrm ${DIR}" >>${PLIST_SRC}
 .endfor
diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile
index ba4d11c071c..2c11b2caa99 100644
--- a/x11/openmotif/Makefile
+++ b/x11/openmotif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/17 17:06:37 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/02/25 04:18:26 hubertf Exp $
 # FreeBSD: /c/ncvs/ports/x11-toolkits/open-motif/Makefile,v 1.18 2000/10/09 01:40:02 asami Exp 
 # OpenBSD: Makefile,v 1.5 2000/10/23 16:08:12 espie Exp 
 
@@ -55,7 +55,6 @@ post-build:
 # Install the manpages.
 post-install:
 	for i in man1 man3 man5 ; do cd ${WRKSRC}/doc/man/$$i; \
-	    ${MKDIR} ${PREFIX}/man/$$i; \
 	    for m in *.[135]; do ${INSTALL_MAN} $$m ${PREFIX}/man/$$i; done; \
 	done
 
diff --git a/x11/qtarch/Makefile b/x11/qtarch/Makefile
index d5d738da61e..d6736200acd 100644
--- a/x11/qtarch/Makefile
+++ b/x11/qtarch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/02/17 17:06:43 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2001/02/25 04:18:27 hubertf Exp $
 #
 
 DISTNAME=	qtarch-2.1-1
@@ -23,10 +23,10 @@ PATH=		${QTDIR}/bin:$$PATH
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/qtarch ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/share/qtarch
-	${MKDIR} ${PREFIX}/share/qtarch/help
+	${INSTALL_DATA_DIR} ${PREFIX}/share/qtarch
+	${INSTALL_DATA_DIR} ${PREFIX}/share/qtarch/help
 	${INSTALL_DATA} ${WRKSRC}/help/* ${PREFIX}/share/qtarch/help
-	${MKDIR} ${PREFIX}/share/qtarch/doc
+	${INSTALL_DATA_DIR} ${PREFIX}/share/qtarch/doc
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/qtarch/doc
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qwt/Makefile b/x11/qwt/Makefile
index 2b5ea60a9ac..12523f9f2e4 100644
--- a/x11/qwt/Makefile
+++ b/x11/qwt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/17 17:06:44 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/02/25 04:18:27 hubertf Exp $
 
 DISTNAME=	qwtlib-0.2
 CATEGORIES=	x11
@@ -23,7 +23,7 @@ do-configure:
 do-install:
 	@${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/src/libqwt.la \
 	  ${PREFIX}/lib
-	${MKDIR} ${PREFIX}/include/qwt
+	${INSTALL_DATA_DIR} ${PREFIX}/include/qwt
 	${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/include/qwt
 	${INSTALL_DATA} ${WRKSRC}/doc/man/* ${PREFIX}/man/man3
 
diff --git a/x11/ruby-Tk-mixedcase/Makefile b/x11/ruby-Tk-mixedcase/Makefile
index 2568f1c61a1..27b8f8d1efa 100644
--- a/x11/ruby-Tk-mixedcase/Makefile
+++ b/x11/ruby-Tk-mixedcase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/02/17 17:06:46 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2001/02/25 04:18:27 hubertf Exp $
 # FreeBSD Id: ports/x11-toolkits/rubytk/Makefile,v 1.3 1999/08/31 02:59:34 peter Exp
 
 DISTNAME=	ruby-1.4.6
@@ -52,7 +52,7 @@ do-install:
 .for dir in ${EXTS}
 	@${ECHO_MSG} "Installing in ${dir}..."
 	@cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET}
-	${MKDIR} ${PREFIX}/share/examples/ruby/${dir}
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ruby/${dir}
 	${INSTALL_DATA} ${WRKSRC}/${dir}/sample/* ${PREFIX}/share/examples/ruby/${dir}
 .endfor
 
diff --git a/x11/swing/Makefile b/x11/swing/Makefile
index 82807889e12..bf065e69e42 100644
--- a/x11/swing/Makefile
+++ b/x11/swing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/02/17 17:06:48 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2001/02/25 04:18:27 hubertf Exp $
 
 DISTNAME=	swing1_1_1
 PKGNAME=	swing-1.1.1
@@ -39,12 +39,7 @@ ROOT_GROUP?=	wheel
 TEMPDIR?=	/tmp
 TEMPFILE!=echo ${TEMPDIR}/swing.location.$$$$
 
-pre-fetch:
-	if [ ! -x ${LOCALBASE}/bin/urlget ]; \
-	then \
-		${ECHO} '==> Installing urlget to fetch swing' ; \
-		${MAKE} ${MAKEFLAGS} install-build-depends ; \
-	fi
+pre-fetch: install-build-depends
 
 do-fetch:
 	-if [ ! -f ${DISTDIR}/${DISTFILES} ] ; then \
@@ -61,7 +56,7 @@ do-fetch:
 	fi
 
 do-install:
-	${MKDIR} ${PREFIX}/lib/java/swing
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/java/swing
 	${INSTALL_DATA} -c -m 644 ${WRKSRC}/swingall.jar ${PREFIX}/lib/java
 	${INSTALL_DATA} -c -m 644 ${WRKSRC}/beaninfo.jar ${PREFIX}/lib/java/swing
 	${INSTALL_DATA} -c -m 644 ${WRKSRC}/mac.jar ${PREFIX}/lib/java/swing
@@ -69,13 +64,13 @@ do-install:
 	${INSTALL_DATA} -c -m 644 ${WRKSRC}/multi.jar ${PREFIX}/lib/java/swing
 	${INSTALL_DATA} -c -m 644 ${WRKSRC}/swing.jar ${PREFIX}/lib/java/swing
 	${INSTALL_DATA} -c -m 644 ${WRKSRC}/windows.jar ${PREFIX}/lib/java/swing
-	${MKDIR} ${PREFIX}/share/doc/java/swing
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/swing
 	cd ${WRKSRC}/doc ; ${GTAR} pcf - . | ( cd ${PREFIX}/share/doc/java/swing ; ${GTAR} pvxf - )
 	${INSTALL_DATA} -c -m 644 ${WRKSRC}/CHANGES.txt ${PREFIX}/share/doc/java/swing
 	${INSTALL_DATA} -c -m 644 ${WRKSRC}/LICENSE.txt ${PREFIX}/share/doc/java/swing
 	${INSTALL_DATA} -c -m 644 ${WRKSRC}/README.html ${PREFIX}/share/doc/java/swing
 	${INSTALL_DATA} -c -m 644 ${WRKSRC}/README.txt ${PREFIX}/share/doc/java/swing
-	${MKDIR} ${PREFIX}/share/examples/java/swing
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/swing
 	cd ${WRKSRC}/examples ; ${GTAR} pcf - . | ( cd ${PREFIX}/share/examples/java/swing ; ${GTAR} pvxf - )
 	${CHOWN} -R root:${ROOT_GROUP} ${PREFIX}/share/doc/java/swing \
 		${PREFIX}/share/examples/java/swing
diff --git a/x11/tix/Makefile b/x11/tix/Makefile
index f3d2d8b84d5..90ac1f1c8f4 100644
--- a/x11/tix/Makefile
+++ b/x11/tix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/02/17 17:06:48 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2001/02/25 04:18:27 hubertf Exp $
 # $FreeBSD Id: Makefile,v 1.15 1998/03/17 07:55:17 tg Exp
 
 DISTNAME=	Tix4.1.0.006
@@ -30,11 +30,10 @@ pre-configure:
 post-install:
 	@(cd ${WRKSRC}/.. && \
 	    ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} -f ${MAKEFILE} ${INSTALL_TARGET})
-	@${MKDIR} ${PREFIX}/man/man1
 	@${MV} ${PREFIX}/man/mann/tixwish.1 ${PREFIX}/man/man1
 	@${LN} -sf ${PREFIX}/bin/tixwish4.1.8.0 ${PREFIX}/bin/tixwish
 .for dir in generic unix
-	@${MKDIR} ${PREFIX}/include/tix/${dir}
+	@${INSTALL_DATA_DIR} ${PREFIX}/include/tix/${dir}
 	${INSTALL_DATA} ${WRKSRC}/../../${dir}/*.h ${PREFIX}/include/tix/${dir}
 .endfor
 	${RM} ${PREFIX}/include/tix/generic/tix.h
diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index 6b425ddf750..3c3e5a5ee66 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/17 17:06:49 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/02/25 04:18:28 hubertf Exp $
 
 DISTNAME=	tk8.3.2
 PKGNAME=	tk-8.3.2
@@ -23,9 +23,9 @@ USE_LIBTOOL=	yes
 post-install:
 	${RM} -f ${PREFIX}/bin/wish
 	cd ${PREFIX}/bin && ${LN} -s wish8.3 wish
-	${MKDIR} ${PREFIX}/include/tk
-	${MKDIR} ${PREFIX}/include/tk/generic
-	${MKDIR} ${PREFIX}/include/tk/unix
+	${INSTALL_DATA_DIR} ${PREFIX}/include/tk
+	${INSTALL_DATA_DIR} ${PREFIX}/include/tk/generic
+	${INSTALL_DATA_DIR} ${PREFIX}/include/tk/unix
 	${INSTALL_DATA} ${WRKSRC}/../generic/default.h ${PREFIX}/include/tk/generic
 	${INSTALL_DATA} ${WRKSRC}/../generic/tk.h ${PREFIX}/include/tk/generic
 	${INSTALL_DATA} ${WRKSRC}/../generic/tk3d.h ${PREFIX}/include/tk/generic
diff --git a/x11/type1inst/Makefile b/x11/type1inst/Makefile
index 848d10d01f0..986fd362dcb 100644
--- a/x11/type1inst/Makefile
+++ b/x11/type1inst/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/17 17:06:51 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/02/25 04:18:28 hubertf Exp $
 #
 
 DISTNAME=		type1inst-0.6.1
@@ -25,7 +25,7 @@ do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/type1inst ${X11PREFIX}/bin
 	@${INSTALL_SCRIPT} ${WRKSRC}/t1embed ${X11PREFIX}/bin
 	@${INSTALL_MAN} ${WRKSRC}/type1inst.man ${X11PREFIX}/man/man1/type1inst.1
-	@${MKDIR} ${X11PREFIX}/share/doc/type1inst
+	@${INSTALL_DATA_DIR} ${X11PREFIX}/share/doc/type1inst
 	@${INSTALL_DATA} ${WRKSRC}/README ${X11PREFIX}/share/doc/type1inst
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xbanner/Makefile b/x11/xbanner/Makefile
index 9d9b93fc5ec..d497161160a 100644
--- a/x11/xbanner/Makefile
+++ b/x11/xbanner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/17 17:06:59 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/02/25 04:18:28 hubertf Exp $
 
 DISTNAME=		XBanner1.31
 PKGNAME=		xbanner-1.31
@@ -15,7 +15,7 @@ USE_XPM=		YES
 NO_INSTALL_MANPAGES=	YES
 
 post-install:
-	@${MKDIR} ${X11PREFIX}/share/doc/xbanner
+	@${INSTALL_DATA_DIR} ${X11PREFIX}/share/doc/xbanner
 	for f in Changes.txt Credits.txt Resource_Reference.html	\
 		XBanner_Users_Manual.html email.gif fonttips.html	\
 		index.html red_line.gif rnd_doc.html stars.gif		\
diff --git a/x11/xdaemon/Makefile b/x11/xdaemon/Makefile
index 0bc113df624..55ff43702a6 100644
--- a/x11/xdaemon/Makefile
+++ b/x11/xdaemon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/17 17:07:03 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/02/25 04:18:28 hubertf Exp $
 
 DISTNAME=	xdaemon-1.0
 CATEGORIES=	games x11
@@ -6,10 +6,13 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 DISTFILES=	${PIX} Daemon.README
 
 MAINTAINER=	hubertf@netbsd.org
+HOMEPAGE=	http://www.netbsd.org/
 COMMENT=	The BSD Daemon sticking on your desktop (like xteddy)
 
 DEPENDS+=	xteddy-1.*:../xteddy
 
+CONFLICT+=	xdaemon-2.*
+
 DIST_SUBDIR=xdaemon
 PIX=	xdaemon_bw.xbm		xdaemon2_bw.xbm \
 	xdaemon_color.xpm	xdaemon2_color.xpm \
diff --git a/x11/xdm3d/Makefile b/x11/xdm3d/Makefile
index cfd9902b767..3e9466d158c 100644
--- a/x11/xdm3d/Makefile
+++ b/x11/xdm3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/17 17:07:04 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/02/25 04:18:28 hubertf Exp $
 
 DISTNAME=		xdm3d-1.0
 CATEGORIES=		x11
@@ -16,7 +16,7 @@ PLIST_SRC=		${WRKDIR}/PLIST-src
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xdm ${PREFIX}/bin/xdm3d
-	${MKDIR} ${PREFIX}/share/xdm3d
+	${INSTALL_DATA_DIR} ${PREFIX}/share/xdm3d
 	${INSTALL_DATA} ${X11BASE}/lib/X11/xdm/GiveConsole ${PREFIX}/share/xdm3d
 	${INSTALL_DATA} ${X11BASE}/lib/X11/xdm/TakeConsole ${PREFIX}/share/xdm3d
 	${INSTALL_DATA} ${X11BASE}/lib/X11/xdm/Xaccess ${PREFIX}/share/xdm3d
@@ -31,7 +31,7 @@ do-install:
 	fi;								\
 	${SED} "$$sedexpr" ${PKGDIR}/PLIST > ${PLIST_SRC}
 	${INSTALL_PROGRAM} ${X11BASE}/lib/X11/xdm/chooser ${PREFIX}/share/xdm3d
-	${MKDIR} ${PREFIX}/share/xdm3d/authdir
+	${INSTALL_DATA_DIR} ${PREFIX}/share/xdm3d/authdir
 	${CHMOD} 700 ${PREFIX}/share/xdm3d/authdir
 	${SED} -e 's@/usr/X11R6/lib/X11/xdm@${PREFIX}/share/xdm3d@' < \
 		${X11BASE}/lib/X11/xdm/xdm-config > \
diff --git a/x11/xephem/Makefile b/x11/xephem/Makefile
index 416bb6ff586..6eb38f2fb00 100644
--- a/x11/xephem/Makefile
+++ b/x11/xephem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/02/23 18:46:05 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2001/02/25 04:18:29 hubertf Exp $
 
 DISTNAME=	xephem-3.4
 CATEGORIES=	x11
@@ -30,7 +30,7 @@ PERL_SCRIPTS= astorb2edb.pl mpcorb2edb.pl tle2edb.pl
 post-install:
 	${SED} s,@PREFIX@,${PREFIX}, ${FILESDIR}/XEphem.ad > ${WRKDIR}/XEphem
 	${INSTALL_DATA} ${WRKDIR}/XEphem ${PREFIX}/lib/X11/app-defaults
-	${MKDIR} ${PREFIX}/share/xephem/tools
+	${INSTALL_DATA_DIR} ${PREFIX}/share/xephem/tools
 	(cd ${WRKSRC}; ${CP} -R auxil catalogs fifos fits \
 	 ${PREFIX}/share/xephem)
 	(cd ${WRKSRC}/tools; ${INSTALL_DATA} README \
diff --git a/x11/xfstt/Makefile b/x11/xfstt/Makefile
index 5b0630e48c8..d35c7b4785f 100644
--- a/x11/xfstt/Makefile
+++ b/x11/xfstt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/18 04:34:15 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2001/02/25 04:18:29 hubertf Exp $
 #
 
 DISTNAME=		xfstt-1.1
@@ -24,7 +24,7 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xfstt ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/xfstt.1x ${PREFIX}/man/man1/xfstt.1
-	${MKDIR} ${PREFIX}/share/doc/xfstt
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xfstt
 	${INSTALL_DATA} ${WRKSRC}/FAQ ${PREFIX}/share/doc/xfstt
 	${INSTALL_DATA} ${WRKSRC}/CHANGES ${PREFIX}/share/doc/xfstt
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/xfstt
diff --git a/x11/xmove/Makefile b/x11/xmove/Makefile
index fdd2ca4c2b0..41294c22d9f 100644
--- a/x11/xmove/Makefile
+++ b/x11/xmove/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/17 17:07:19 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/02/25 04:18:29 hubertf Exp $
 #
 
 DISTNAME=	xmove.2.0beta2
@@ -20,7 +20,7 @@ pre-configure:
 	${CP} ${WRKSRC}/man/man1/xmovectrl.1 ${WRKSRC}/xmovectrl/xmovectrl.man
 
 post-install:
-	@${MKDIR} ${XMOVEDOCDIR}
+	@${INSTALL_DATA_DIR} ${XMOVEDOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/features.txt ${XMOVEDOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/limitations.txt ${XMOVEDOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/using_xmove.txt ${XMOVEDOCDIR}
diff --git a/x11/xpns/Makefile b/x11/xpns/Makefile
index ab77d9db952..0de28931f2b 100644
--- a/x11/xpns/Makefile
+++ b/x11/xpns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/02/17 17:07:23 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2001/02/25 04:18:30 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/06/29 09:38:20 obrien Exp
 #
 
@@ -18,14 +18,14 @@ MAKEFILE=	makefile
 ALL_TARGET=	pns
 
 do-install:
-	${MKDIR} ${PREFIX}/lib/xpns
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/xpns
 	${INSTALL_PROGRAM} ${WRKSRC}/pns ${PREFIX}/lib/xpns/
 	${INSTALL_DATA} ${WRKSRC}/pns.hlp ${PREFIX}/lib/xpns/
 	${INSTALL_DATA} ${WRKSRC}/pns.shell ${PREFIX}/lib/xpns/
 	${INSTALL_SCRIPT} ${WRKSRC}/xpns ${PREFIX}/bin/xpns
 
 post-install:
-	${MKDIR} ${PREFIX}/share/doc/xpns
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xpns
 	${CP} ${WRKSRC}/*.net ${PREFIX}/share/doc/xpns/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xscribble/Makefile b/x11/xscribble/Makefile
index c81d918d513..478c1352458 100644
--- a/x11/xscribble/Makefile
+++ b/x11/xscribble/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 17:07:24 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/02/25 04:18:30 hubertf Exp $
 
 DISTNAME=	xscribble
 PKGNAME=	xscribble-20000616
@@ -14,7 +14,7 @@ USE_IMAKE=	YES
 NO_INSTALL_MANPAGES=	YES
 
 post-install:
-	${MKDIR} ${PREFIX}/share/examples/xscribble
-	${CP} ${WRKSRC}/classifiers/*.cl ${PREFIX}/share/examples/xscribble
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/xscribble
+	${INSTALL_DATA} ${WRKSRC}/classifiers/*.cl ${PREFIX}/share/examples/xscribble
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xteddy/Makefile b/x11/xteddy/Makefile
index 58fbf95ed0d..78bd73b05d6 100644
--- a/x11/xteddy/Makefile
+++ b/x11/xteddy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 17:07:26 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/02/25 04:18:30 hubertf Exp $
 
 DISTNAME=	xteddy-1.1
 CATEGORIES=	x11 games
@@ -13,7 +13,7 @@ USE_XPM=	YES
 GNU_CONFIGURE=	YES
 
 pre-install:
-	${MKDIR} ${PREFIX}/share/xteddy
-	${MKDIR} ${PREFIX}/share/xteddy/pixmaps
+	${INSTALL_DATA_DIR} ${PREFIX}/share/xteddy
+	${INSTALL_DATA_DIR} ${PREFIX}/share/xteddy/pixmaps
 
 .include "../../mk/bsd.pkg.mk"