diff options
260 files changed, 687 insertions, 695 deletions
diff --git a/audio/cmp3/Makefile b/audio/cmp3/Makefile index 81b76a004c0..beb3b7b7f76 100644 --- a/audio/cmp3/Makefile +++ b/audio/cmp3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/16 13:30:34 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/02/25 04:17:35 hubertf Exp $ # FreeBSD: ports/audio/cmp3/Makefile,v 1.13 2001/02/04 21:12:44 olgeni Exp # @@ -21,7 +21,7 @@ NEED_NCURSES= YES do-install: ${INSTALL_PROGRAM} ${WRKSRC}/cmp3 ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/rnmp3 ${PREFIX}/bin - @${MKDIR} ${PREFIX}/share/doc/cmp3 + @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cmp3 ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/cmp3 ${INSTALL_DATA} ${WRKSRC}/cmp3rc ${PREFIX}/share/doc/cmp3/sample.cmp3rc diff --git a/audio/eawpatches/Makefile b/audio/eawpatches/Makefile index ef72f23be8d..4af26475693 100644 --- a/audio/eawpatches/Makefile +++ b/audio/eawpatches/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/16 13:30:35 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/02/25 04:17:36 hubertf Exp $ # DISTNAME= eawpats-full-10 @@ -24,7 +24,7 @@ NO_BUILD= yes do-install: if [ ! -d ${PREFIX}/share/timidity ]; then \ - ${MKDIR} ${PREFIX}/share/timidity; \ + ${INSTALL_DATA_DIR} ${PREFIX}/share/timidity; \ fi cd ${PREFIX}/share/timidity && \ unrar x -o+ -inul ${DISTDIR}/${DISTNAME} diff --git a/audio/guspatches/Makefile b/audio/guspatches/Makefile index c5602062964..7406bdfda08 100644 --- a/audio/guspatches/Makefile +++ b/audio/guspatches/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/20 11:40:07 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:17:36 hubertf Exp $ # DISTNAME= dgguspat @@ -27,7 +27,7 @@ do-build: ${WRKDIR}/timidity.cfg do-install: - ${MKDIR} ${PREFIX}/share/timidity + ${INSTALL_DATA_DIR} ${PREFIX}/share/timidity cd ${PREFIX}/share/timidity && unzip -oqL ${DISTDIR}/${DISTFILES} ${INSTALL_DATA} ${FILESDIR}/midia.cfg ${PREFIX}/share/timidity ${INSTALL_DATA} ${WRKDIR}/gravis.cfg ${PREFIX}/share/timidity diff --git a/audio/musicbox/Makefile b/audio/musicbox/Makefile index d19f46b99ab..6cb4b271753 100644 --- a/audio/musicbox/Makefile +++ b/audio/musicbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/02/16 13:30:48 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2001/02/25 04:17:36 hubertf Exp $ DISTNAME= musicbox-1.01p2 CATEGORIES= audio @@ -20,7 +20,7 @@ PATH= ${QT1DIR}/qt1/bin:$$PATH do-install: ${INSTALL_PROGRAM} ${WRKSRC}/musicbox ${PREFIX}/bin - ${MKDIR} ${PREFIX}/share/doc/musicbox + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/musicbox ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/musicbox/README .include "../../mk/bsd.pkg.mk" diff --git a/audio/rio/Makefile b/audio/rio/Makefile index decb463ea1f..1af55df0e2b 100644 --- a/audio/rio/Makefile +++ b/audio/rio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/16 13:30:48 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/02/25 04:17:37 hubertf Exp $ # DISTNAME= rio007 @@ -19,7 +19,7 @@ MAKEFILE= makefile do-install: ${BSD_INSTALL_PROGRAM} ${WRKSRC}/rio ${PREFIX}/bin - ${MKDIR} ${PREFIX}/share/rio + ${INSTALL_DATA_DIR} ${PREFIX}/share/rio ${BSD_INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/rio ${SED} -e 's|@AWK@|${AWK}|g' ${FILESDIR}/find-lpt-port > ${PREFIX}/bin/find-lpt-port ${CHMOD} 755 ${PREFIX}/bin/find-lpt-port diff --git a/audio/snd/Makefile b/audio/snd/Makefile index d00300e0c69..8af37697593 100644 --- a/audio/snd/Makefile +++ b/audio/snd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2001/02/16 13:30:49 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2001/02/25 04:17:37 hubertf Exp $ # DISTNAME= snd @@ -22,7 +22,7 @@ MAKE_ENV+= MOTIFBASE=${MOTIFBASE} do-install: cd ${WRKSRC} ; ${INSTALL_PROGRAM} snd ${PREFIX}/bin cd ${WRKSRC} ; ${INSTALL_DATA} Snd.ad ${PREFIX}/lib/X11/app-defaults/Snd - ${MKDIR} ${PREFIX}/share/doc/snd + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snd cd ${WRKSRC} ; ${INSTALL_DATA} *.gif *.html *.txt README.Snd ${PREFIX}/share/doc/snd .include "../../mk/bsd.pkg.mk" diff --git a/audio/tracker/Makefile b/audio/tracker/Makefile index d9061ae71dc..d7960ab4d7b 100644 --- a/audio/tracker/Makefile +++ b/audio/tracker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/02/16 13:30:51 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2001/02/25 04:17:37 hubertf Exp $ # FreeBSD Id: Makefile,v 1.29 1996/12/20 23:46:22 ache Exp # @@ -31,7 +31,7 @@ pre-install: ${RM} -f tracker.info *.orig post-install: - -${MKDIR} ${PREFIX}/share/doc/tracker + -${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tracker ${CP} -R ${WRKSRC}/Docs/* ${PREFIX}/share/doc/tracker .include "../../mk/bsd.pkg.mk" diff --git a/audio/xamp/Makefile b/audio/xamp/Makefile index 453e74daab4..bf8327bec4e 100644 --- a/audio/xamp/Makefile +++ b/audio/xamp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/02/16 13:30:52 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2001/02/25 04:17:37 hubertf Exp $ # FreeBSD: ports/audio/xamp/Makefile,v 1.5 1999/08/25 04:36:22 obrien Exp # @@ -35,11 +35,11 @@ SKIN_DIR= ${PREFIX}/lib/X11/xamp do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xamp ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/xamp.1 ${PREFIX}/man/man1 - @${MKDIR} ${SKIN_DIR}/bfamp-xamp + @${INSTALL_DATA_DIR} ${SKIN_DIR}/bfamp-xamp ${INSTALL_DATA} ${WRKDIR}/bfamp-xamp/*.bmp ${SKIN_DIR}/bfamp-xamp - @${MKDIR} ${SKIN_DIR}/chrome-xamp + @${INSTALL_DATA_DIR} ${SKIN_DIR}/chrome-xamp ${INSTALL_DATA} ${WRKDIR}/chrome-xamp/*.bmp ${SKIN_DIR}/chrome-xamp - @${MKDIR} ${SKIN_DIR}/mmxxamp-xamp + @${INSTALL_DATA_DIR} ${SKIN_DIR}/mmxxamp-xamp ${INSTALL_DATA} ${WRKDIR}/mmxxamp-xamp/*.bmp ${SKIN_DIR}/mmxxamp-xamp .include "../../mk/bsd.pkg.mk" diff --git a/audio/xmradio/Makefile b/audio/xmradio/Makefile index ea3c2be9e1b..89a71f16b21 100644 --- a/audio/xmradio/Makefile +++ b/audio/xmradio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/02/16 13:30:54 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2001/02/25 04:17:37 hubertf Exp $ DISTNAME= xmradio-1.0 CATEGORIES= audio @@ -18,7 +18,7 @@ USE_IMAKE= YES USE_XPM= YES post-install: - ${MKDIR} ${PREFIX}/share/doc/xmradio + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xmradio ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xmradio .include "../../mk/bsd.pkg.mk" diff --git a/benchmarks/dhrystone/Makefile b/benchmarks/dhrystone/Makefile index 4cbc789f65b..6884297ecbf 100644 --- a/benchmarks/dhrystone/Makefile +++ b/benchmarks/dhrystone/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/02/16 13:37:47 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2001/02/25 04:17:37 hubertf Exp $ DISTNAME= dhry2.1 PKGNAME= dhrystone-2.1 @@ -14,9 +14,9 @@ NO_WRKSUBDIR= yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/dry2 ${PREFIX}/bin/dry2 ${INSTALL_PROGRAM} ${WRKSRC}/dry2reg ${PREFIX}/bin/dry2reg - ${MKDIR} ${PREFIX}/share/doc/dhrystone - ${INSTALL_MAN} ${WRKSRC}/clarify.doc ${PREFIX}/share/doc/dhrystone - ${INSTALL_MAN} ${WRKSRC}/Rationale ${PREFIX}/share/doc/dhrystone + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dhrystone + ${INSTALL_DATA} ${WRKSRC}/clarify.doc ${PREFIX}/share/doc/dhrystone + ${INSTALL_DATA} ${WRKSRC}/Rationale ${PREFIX}/share/doc/dhrystone benchmark: -@${ECHO} 5000000 | ${WRKSRC}/dry2 | tee ${WRKSRC}/dry.out diff --git a/benchmarks/xengine/Makefile b/benchmarks/xengine/Makefile index 913fa20f631..93f8bee1b8f 100644 --- a/benchmarks/xengine/Makefile +++ b/benchmarks/xengine/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/16 13:37:59 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:17:38 hubertf Exp $ # FreeBSD Id: ports/benchmarks/xengine/Makefile,v 1.9 2000/02/02 22:31:24 mharo Exp DISTNAME= xengine-1.0.1 @@ -23,8 +23,8 @@ pre-patch: @cd ${WRKSRC} ; ${PATCH} ${PATCH_DIST_ARGS} < xengine.patch1 post-install: - @${MKDIR} ${PREFIX}/share/doc/xengine - @${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/xengine + @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xengine + @${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xengine @${ECHO} "" @${ECHO} "Example value:" @${ECHO} " 1067 RPMs with P100, Winner 2000PRO/X, resolution: 1152x900" diff --git a/comms/gkermit/Makefile b/comms/gkermit/Makefile index 8d7100f459f..bd483f184d1 100644 --- a/comms/gkermit/Makefile +++ b/comms/gkermit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/16 13:56:13 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:17:38 hubertf Exp $ # DISTNAME= gkermit @@ -17,7 +17,7 @@ NO_WRKSUBDIR= yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gkermit ${PREFIX}/bin/gkermit; \ ${INSTALL_MAN} ${WRKSRC}/gkermit.nr ${PREFIX}/man/man1/gkermit.1; \ - ${MKDIR} ${PREFIX}/share/doc/gkermit + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gkermit ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gkermit .include "../../mk/bsd.pkg.mk" diff --git a/comms/modemd/Makefile b/comms/modemd/Makefile index 7bf58c100b0..5c30f6e329c 100644 --- a/comms/modemd/Makefile +++ b/comms/modemd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/02/16 13:56:18 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2001/02/25 04:17:38 hubertf Exp $ DISTNAME= modemd-970221 PKGNAME= modemd-19970221 @@ -11,6 +11,6 @@ COMMENT= Replacement getty for dialup ttys and a modem server MANCOMPRESSED_IF_MANZ= yes pre-install: - ${MKDIR} ${PREFIX}/share/examples/modemd + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/modemd .include "../../mk/bsd.pkg.mk" diff --git a/comms/pilotmgr/Makefile b/comms/pilotmgr/Makefile index 227d46b2a14..2fade23cfbf 100644 --- a/comms/pilotmgr/Makefile +++ b/comms/pilotmgr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/02/16 13:56:20 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2001/02/25 04:17:38 hubertf Exp $ DISTNAME= pilotmgr-1.107p2 CATEGORIES= comms @@ -31,7 +31,7 @@ post-extract: @${CHMOD} +x ${WRKSRC}/Setup do-install: - ${MKDIR} ${PM_PERL_DIR} ${PM_DOC_DIR} + ${INSTALL_DATA_DIR} ${PM_PERL_DIR} ${PM_DOC_DIR} for FILE in ${WRKSRC}/*.pm; do \ ${INSTALL_DATA} $$FILE ${PM_PERL_DIR}; \ done @@ -39,7 +39,7 @@ do-install: ${LN} -fs ${PM_PERL_DIR}/PilotMgr.pm ${PREFIX}/bin/PilotManager cd ${WRKSRC}; \ for DIR in lib/*; do \ - ${MKDIR} ${PM_PERL_DIR}/$$DIR; \ + ${INSTALL_DATA_DIR} ${PM_PERL_DIR}/$$DIR; \ for FILE in $$DIR/*; do \ ${INSTALL_DATA} $$FILE ${PM_PERL_DIR}/$$DIR; \ done; \ diff --git a/comms/snooper/Makefile b/comms/snooper/Makefile index da99c6e668d..89a178ed4d1 100644 --- a/comms/snooper/Makefile +++ b/comms/snooper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/02/16 13:56:24 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2001/02/25 04:17:38 hubertf Exp $ # FreeBSD Id: Makefile,v 1.3 1998/08/13 09:20:41 itojun Exp $ DISTNAME= snooper-19991202 @@ -15,7 +15,7 @@ pre-build: cd ${WRKSRC} ; ${MAKE} depend post-install: - ${MKDIR} ${PREFIX}/share/doc/snooper + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snooper ${INSTALL_DATA} ${WRKSRC}/../README ${PREFIX}/share/doc/snooper .include "../../mk/bsd.pkg.mk" diff --git a/converters/psiconv/Makefile b/converters/psiconv/Makefile index 371b922fab9..24399d7770a 100644 --- a/converters/psiconv/Makefile +++ b/converters/psiconv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/02/16 13:59:27 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2001/02/25 04:17:39 hubertf Exp $ # DISTNAME= psiconv-0.6.1 @@ -25,7 +25,7 @@ CONFIGURE_ENV+= CPPFLAGS="`${MAGICK_CONFIG} --cppflags` -DIMAGEMAGICK" \ LIBS="${LIBS} `${MAGICK_CONFIG} --libs`" post-install: - ${MKDIR} ${PREFIX}/share/doc/psiconv + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/psiconv .for file in ascii html html4 ${INSTALL_DATA} ${WRKSRC}/docs/${file} ${PREFIX}/share/doc/psiconv .endfor diff --git a/converters/txt2html/Makefile b/converters/txt2html/Makefile index 38e5ac06409..e45f984e7dd 100644 --- a/converters/txt2html/Makefile +++ b/converters/txt2html/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/16 13:59:28 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/02/25 04:17:39 hubertf Exp $ DISTNAME= txt2html-1.28 CATEGORIES= converters www @@ -17,7 +17,7 @@ do-configure: do-install: ${INSTALL_SCRIPT} ${WRKSRC}/txt2html ${PREFIX}/bin - -${MKDIR} ${PREFIX}/share/txt2html + -${INSTALL_DATA_DIR} ${PREFIX}/share/txt2html ${INSTALL_DATA} ${WRKSRC}/txt2html.dict ${PREFIX}/share/txt2html ${INSTALL_DATA} ${WRKSRC}/sample.foot ${PREFIX}/share/txt2html ${INSTALL_DATA} ${WRKSRC}/sample.html ${PREFIX}/share/txt2html diff --git a/converters/uudeview/Makefile b/converters/uudeview/Makefile index a2f74b805af..bb7231c4071 100644 --- a/converters/uudeview/Makefile +++ b/converters/uudeview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/02/16 13:59:29 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2001/02/25 04:17:39 hubertf Exp $ # FreeBSD Id: Makefile,v 1.15 1998/02/18 22:19:58 hoek Exp # @@ -16,12 +16,12 @@ GNU_CONFIGURE= Yes CONFIGURE_ARGS= --enable-inews=inews --disable-tcl CONFIGURE_ENV= LDFLAGS=-s -PORTDOCDIR?= share/doc/uudeview +PORTDOCDIR= ${PREFIX}/share/doc/uudeview post-install: @${ECHO_MSG} "===> Copying documents to ${PREFIX}/${PORTDOCDIR}" - @${MKDIR} ${PREFIX}/${PORTDOCDIR} - @${INSTALL_MAN} ${WRKSRC}/HOWTO ${PREFIX}/${PORTDOCDIR} - @${INSTALL_MAN} ${FILESDIR}/porting.notes ${PREFIX}/${PORTDOCDIR} + @${INSTALL_DATA_DIR} ${PORTDOCDIR} + @${INSTALL_DATA} ${WRKSRC}/HOWTO ${PORTDOCDIR} + @${INSTALL_DATA} ${FILESDIR}/porting.notes ${PORTDOCDIR} .include "../../mk/bsd.pkg.mk" diff --git a/converters/xdeview/Makefile b/converters/xdeview/Makefile index 605b5a56080..77eae72e757 100644 --- a/converters/xdeview/Makefile +++ b/converters/xdeview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/02/16 13:59:32 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2001/02/25 04:17:39 hubertf Exp $ # FreeBSD Id: Makefile,v 1.11 1998/02/24 21:43:45 jseger Exp # @@ -25,13 +25,13 @@ CONFIGURE_ENV= LDFLAGS=-s\ ALL_TARGET= xdeview INSTALL_TARGET= install-tcl -PORTDOCDIR?= share/doc/xdeview +PORTDOCDIR= ${PREFIX}/share/doc/xdeview DOCFILES= ${FILESDIR}/porting.notes ${WRKSRC}/HOWTO post-install: - @${ECHO_MSG} "===> Copying documents to ${PREFIX}/${PORTDOCDIR}" - @${MKDIR} ${PREFIX}/${PORTDOCDIR} - ${INSTALL_MAN} ${DOCFILES} ${PREFIX}/${PORTDOCDIR} - ${INSTALL_MAN} ${WRKSRC}/man/xdeview.1 ${PREFIX}/man/man1 + @${ECHO_MSG} "===> Copying documents to ${PORTDOCDIR}" + @${INSTALL_DATA_DIR} ${PORTDOCDIR} + ${INSTALL_DATA} ${DOCFILES} ${PORTDOCDIR} + ${INSTALL_DATA} ${WRKSRC}/man/xdeview.1 ${PREFIX}/man/man1 .include "../../mk/bsd.pkg.mk" diff --git a/cross/bfd-crunchide/Makefile b/cross/bfd-crunchide/Makefile index 33fb1167f75..11533da179c 100644 --- a/cross/bfd-crunchide/Makefile +++ b/cross/bfd-crunchide/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/16 14:04:54 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/02/25 04:17:39 hubertf Exp $ DISTNAME= bfd-crunchide-1.0 CATEGORIES= cross @@ -28,6 +28,6 @@ do-extract: ${WRKSRC} pre-install: - @if [ ! -d ${PREFIX}/bin ]; then ${MKDIR} ${PREFIX}/bin; fi + @if [ ! -d ${PREFIX}/bin ]; then ${INSTALL_PROGRAM_DIR} ${PREFIX}/bin; fi .include "../../mk/bsd.pkg.mk" diff --git a/cross/bfd-mdsetimage/Makefile b/cross/bfd-mdsetimage/Makefile index f525e7eae31..958872fd5fb 100644 --- a/cross/bfd-mdsetimage/Makefile +++ b/cross/bfd-mdsetimage/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/16 14:04:55 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/02/25 04:17:40 hubertf Exp $ DISTNAME= bfd-mdsetimage-1.0 CATEGORIES= cross @@ -28,6 +28,6 @@ do-extract: ${WRKSRC} pre-install: - @if [ ! -d ${PREFIX}/bin ]; then ${MKDIR} ${PREFIX}/bin; fi + @if [ ! -d ${PREFIX}/bin ]; then ${INSTALL_PROGRAM_DIR} ${PREFIX}/bin; fi .include "../../mk/bsd.pkg.mk" diff --git a/databases/geneweb/Makefile b/databases/geneweb/Makefile index c6a07874d55..cea9241ecdc 100644 --- a/databases/geneweb/Makefile +++ b/databases/geneweb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/16 14:17:24 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/02/25 04:17:40 hubertf Exp $ # DISTNAME= geneweb-3.07 @@ -32,12 +32,12 @@ post-build: >${WRKDIR}/geneweb.sh do-install: - ${MKDIR} ${PREFIX}/share/examples/geneweb - ${MKDIR} ${PREFIX}/share/doc/geneweb - ${MKDIR} ${PREFIX}/share/geneweb/etc - ${MKDIR} ${PREFIX}/share/geneweb/images - ${MKDIR} ${PREFIX}/share/geneweb/lang - ${MKDIR} ${PREFIX}/share/geneweb/setup + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/geneweb + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/geneweb + ${INSTALL_DATA_DIR} ${PREFIX}/share/geneweb/etc + ${INSTALL_DATA_DIR} ${PREFIX}/share/geneweb/images + ${INSTALL_DATA_DIR} ${PREFIX}/share/geneweb/lang + ${INSTALL_DATA_DIR} ${PREFIX}/share/geneweb/setup cd ${WRKSRC}/distribution/gw && \ ${INSTALL_PROGRAM} gwd ${PREFIX}/libexec && \ ${INSTALL_PROGRAM} consang ${PREFIX}/bin && \ diff --git a/databases/jdbc-postgresql/Makefile b/databases/jdbc-postgresql/Makefile index ed07b8e2653..87c8ad07ff6 100644 --- a/databases/jdbc-postgresql/Makefile +++ b/databases/jdbc-postgresql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/16 14:17:27 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2001/02/25 04:17:40 hubertf Exp $ # DISTNAME= postgresql-7.0.3 @@ -29,12 +29,12 @@ CLASSPATH:= ${CLASSPATH}:. HELP_FILES= README README_6.3 Implementation CHANGELOG do-install: - ${MKDIR} ${PREFIX}/lib/java + ${INSTALL_DATA_DIR} ${PREFIX}/lib/java ${INSTALL_DATA} ${WRKSRC}/postgresql.jar ${PREFIX}/lib/java - ${MKDIR} ${PREFIX}/share/examples/java/jdbc-postgresql + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/jdbc-postgresql ${INSTALL_DATA} ${WRKSRC}/example/*.java ${PREFIX}/share/examples/java/jdbc-postgresql - ${MKDIR} ${PREFIX}/share/doc/java/jdbc-postgresql - ${MKDIR} ${PREFIX}/share/doc/java/jdbc-postgresql/api + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/jdbc-postgresql + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/jdbc-postgresql/api .for X in ${HELP_FILES} ${INSTALL_DATA} ${WRKSRC}/${X} ${PREFIX}/share/doc/java/jdbc-postgresql .endfor diff --git a/devel/boost/Makefile b/devel/boost/Makefile index efb5aa0a812..22feebd64fa 100644 --- a/devel/boost/Makefile +++ b/devel/boost/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/02/16 14:38:19 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2001/02/25 04:17:40 hubertf Exp $ DISTNAME= boost_all PKGNAME= boost-1.18.1 @@ -54,7 +54,7 @@ post-build: do-install: cd ${WRKSRC}; ${LIBTOOL} ${INSTALL_DATA} libboost.la ${LIBDIR} ${CP} -R ${WRKSRC}/boost ${PREFIX}/include - ${MKDIR} ${HTMLDIR} + ${INSTALL_DATA_DIR} ${HTMLDIR} ${INSTALL_DATA} \ ${WRKSRC}/c++boost.gif \ ${WRKSRC}/index.htm \ diff --git a/devel/cdecl/Makefile b/devel/cdecl/Makefile index 41784fe7636..2741fdb556b 100644 --- a/devel/cdecl/Makefile +++ b/devel/cdecl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/16 14:38:19 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:17:40 hubertf Exp $ # DISTNAME= cdecl-2.5 @@ -16,7 +16,7 @@ COMMENT= utility to explain and compose C and C++ declarations DEPENDS+= readline>=4.0:../../devel/readline post-install: - @${MKDIR} ${PREFIX}/share/doc/cdecl + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cdecl ${INSTALL_DATA} ${WRKSRC}/testset* ${PREFIX}/share/doc/cdecl .include "../../mk/bsd.pkg.mk" diff --git a/devel/cfitsio/Makefile b/devel/cfitsio/Makefile index c5b871d3e14..5ff86536b6a 100644 --- a/devel/cfitsio/Makefile +++ b/devel/cfitsio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/16 14:38:20 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/02/25 04:17:41 hubertf Exp $ DISTNAME= cfitsio2037 PKGNAME= cfitsio-2.0.37 @@ -21,7 +21,7 @@ post-build: cmp testprog.fit testprog.std do-install: - ${MKDIR} ${PREFIX}/share/doc/cfitsio + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cfitsio cd ${WRKSRC}; \ ${LIBTOOL} ${INSTALL_DATA} libcfitsio.la ${PREFIX}/lib; \ ${INSTALL_DATA} *.h ${PREFIX}/include; \ diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile index 12b38962f31..4a8a3d5b6bb 100644 --- a/devel/ddd/Makefile +++ b/devel/ddd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2001/02/17 18:28:12 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2001/02/25 04:17:41 hubertf Exp $ # $FreeBSD Id: Makefile,v 1.5 1998/02/19 09:43:16 obrien Exp # @@ -35,7 +35,7 @@ post-configure: ${ECHO} "LIBXM = ${MOTIFLIB}" >> ${WRKSRC}/ddd/Makefile post-install: - @${MKDIR} ${PREFIX}/share/doc/ddd + @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ddd ${INSTALL_DATA} ${WRKSRC}/PROBLEMS ${PREFIX}/share/doc/ddd ${INSTALL_DATA} ${WRKSRC}/doc/README ${PREFIX}/share/doc/ddd ${INSTALL_DATA} ${WRKSRC}/doc/ddd-paper.ps ${PREFIX}/share/doc/ddd diff --git a/devel/glade/Makefile b/devel/glade/Makefile index 16d437a984c..21ae4442f6d 100644 --- a/devel/glade/Makefile +++ b/devel/glade/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2001/02/16 14:38:26 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2001/02/25 04:17:41 hubertf Exp $ # FreeBSD Id: Makefile,v 1.10 1998/11/18 17:35:16 vanilla Exp # @@ -22,16 +22,16 @@ CONFIGURE_ENV+= LOCALEDIR=${LOCALEDIR} PLIST_SUBST+= LOCALEDIR=${LOCALEDIR} post-install: - ${MKDIR} ${PREFIX}/share/doc/glade - ${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/glade - ${INSTALL_MAN} ${WRKSRC}/TODO ${PREFIX}/share/doc/glade - ${INSTALL_MAN} ${WRKSRC}/doc/developer.txt ${PREFIX}/share/doc/glade - ${INSTALL_MAN} ${WRKSRC}/doc/file_format.txt ${PREFIX}/share/doc/glade - ${INSTALL_MAN} ${WRKSRC}/doc/generic.txt ${PREFIX}/share/doc/glade - ${INSTALL_MAN} ${WRKSRC}/doc/manual.txt ${PREFIX}/share/doc/glade - ${INSTALL_MAN} ${WRKSRC}/doc/notes.txt ${PREFIX}/share/doc/glade - ${INSTALL_MAN} ${WRKSRC}/doc/portability.txt ${PREFIX}/share/doc/glade - ${INSTALL_MAN} ${WRKSRC}/doc/source_code.txt ${PREFIX}/share/doc/glade + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/glade + ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/glade + ${INSTALL_DATA} ${WRKSRC}/TODO ${PREFIX}/share/doc/glade + ${INSTALL_DATA} ${WRKSRC}/doc/developer.txt ${PREFIX}/share/doc/glade + ${INSTALL_DATA} ${WRKSRC}/doc/file_format.txt ${PREFIX}/share/doc/glade + ${INSTALL_DATA} ${WRKSRC}/doc/generic.txt ${PREFIX}/share/doc/glade + ${INSTALL_DATA} ${WRKSRC}/doc/manual.txt ${PREFIX}/share/doc/glade + ${INSTALL_DATA} ${WRKSRC}/doc/notes.txt ${PREFIX}/share/doc/glade + ${INSTALL_DATA} ${WRKSRC}/doc/portability.txt ${PREFIX}/share/doc/glade + ${INSTALL_DATA} ${WRKSRC}/doc/source_code.txt ${PREFIX}/share/doc/glade .include "../../mk/bsd.prefs.mk" diff --git a/devel/global/Makefile b/devel/global/Makefile index 44c780be34c..89b1bdac5fb 100644 --- a/devel/global/Makefile +++ b/devel/global/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/02/16 14:38:27 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2001/02/25 04:17:41 hubertf Exp $ # DISTNAME= global-4.0.1 @@ -20,6 +20,6 @@ MAKE_ENV+= LINTLIBDIR="${PREFIX}/libdata/lint" MAKE_ENV+= BINDIR="${PREFIX}/bin" pre-install: - @if [ ! -d ${PREFIX}/libdata/lint ];then ${MKDIR} ${PREFIX}/libdata/lint;fi + @if [ ! -d ${PREFIX}/libdata/lint ];then ${INSTALL_DATA_DIR} ${PREFIX}/libdata/lint;fi .include "../../mk/bsd.pkg.mk" diff --git a/devel/jakarta-ant/Makefile b/devel/jakarta-ant/Makefile index 4869bfe823f..206b6cf96ee 100644 --- a/devel/jakarta-ant/Makefile +++ b/devel/jakarta-ant/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/16 14:38:32 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:17:42 hubertf Exp $ DISTNAME= jakarta-ant PKGNAME= jakarta-ant-3.1 @@ -25,10 +25,10 @@ post-build: do-install: ${INSTALL_SCRIPT} ${WRKSRC}/bin/ant ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/bin/antRun ${PREFIX}/bin - -${MKDIR} ${PREFIX}/lib/java + -${INSTALL_DATA_DIR} ${PREFIX}/lib/java ${INSTALL_DATA} ${WRKSRC}/lib/xml.jar ${PREFIX}/lib/java ${INSTALL_DATA} ${WRKSRC}/lib/ant.jar ${PREFIX}/lib/java - ${MKDIR} ${PREFIX}/share/doc/java/ant + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/ant ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/java/ant ${INSTALL_DATA} ${WRKSRC}/docs/index.html ${PREFIX}/share/doc/java/ant diff --git a/devel/libg++/Makefile b/devel/libg++/Makefile index fbb89ee6d03..458dcaeb040 100644 --- a/devel/libg++/Makefile +++ b/devel/libg++/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/02/16 14:38:35 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2001/02/25 04:17:42 hubertf Exp $ # DISTNAME= libg++-${GXXVERSION} @@ -23,7 +23,7 @@ do-configure: @${CP} ${FILESDIR}/Makefile ${WRKSRC} pre-install: - ${MKDIR} ${PREFIX}/include/g++/gen + ${INSTALL_DATA_DIR} ${PREFIX}/include/g++/gen post-install: ${INSTALL_SCRIPT} ${WRKSRC}/genclass ${PREFIX}/bin/ diff --git a/devel/m4/Makefile b/devel/m4/Makefile index 925fc0fdefb..a045ae3ea26 100644 --- a/devel/m4/Makefile +++ b/devel/m4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/02/16 14:38:41 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2001/02/25 04:17:42 hubertf Exp $ # FreeBSD Id: Makefile,v 1.7 1997/06/16 08:22:35 max Exp # @@ -14,7 +14,7 @@ CONFIGURE_ARGS= --program-prefix=g INFO_FILES= m4.info post-install: - @${MKDIR} ${PREFIX}/share/examples/gm4 + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gm4 ${INSTALL_DATA} ${WRKSRC}/examples/*.m4 ${PREFIX}/share/examples/gm4 .include "../../mk/bsd.pkg.mk" diff --git a/devel/mit-pthreads/Makefile b/devel/mit-pthreads/Makefile index 05e081092ed..c51e3e66d76 100644 --- a/devel/mit-pthreads/Makefile +++ b/devel/mit-pthreads/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2001/02/16 14:38:42 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2001/02/25 04:17:42 hubertf Exp $ # DISTNAME= pthreads-1_60_beta6 @@ -30,7 +30,7 @@ post-configure: @${ECHO} "#define HAVE_SYSCALL_SIGSUSPEND 1" >> ${WRKSRC}/config.h pre-install: - ${MKDIR} ${PREFIX}/pthreads + ${INSTALL_DATA_DIR} ${PREFIX}/pthreads post-install: @${RM} -f ${PREFIX}/pthreads/lib/libpthread_pic.a diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile index 83909f00f52..1026ace3f79 100644 --- a/devel/pwlib/Makefile +++ b/devel/pwlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/16 14:38:58 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2001/02/25 04:17:42 hubertf Exp $ # DISTNAME= pwlib_min_1.1pl17 @@ -35,10 +35,10 @@ do-build: do-install: cd ${WRKSRC}; env PWLIBDIR=`pwd` ${GMAKE} install; - ${MKDIR} ${PREFIX}/include/ptclib ${PREFIX}/include/ptlib/unix/ptlib + ${INSTALL_DATA_DIR} ${PREFIX}/include/ptclib ${PREFIX}/include/ptlib/unix/ptlib cd ${WRKSRC}/include; for f in `find . -name CVS -prune -o -type f -print` ; \ do ${BSD_INSTALL_DATA} $$f ${PREFIX}/include/`dirname $$f`; done - ${MKDIR} ${PREFIX}/share/pwlib/make + ${INSTALL_DATA_DIR} ${PREFIX}/share/pwlib/make cd ${WRKSRC}/make; for f in unix.mak common.mak lib.mak ptlib.mak ; \ do ${BSD_INSTALL_DATA} $$f ${PREFIX}/share/pwlib/make; done diff --git a/devel/rdp/Makefile b/devel/rdp/Makefile index bf34dc0c195..70fcd03ae32 100644 --- a/devel/rdp/Makefile +++ b/devel/rdp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/20 11:40:09 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2001/02/25 04:17:43 hubertf Exp $ DISTNAME= rdp1_5 PKGNAME= rdp-1.5 @@ -19,7 +19,7 @@ NO_CONFIGURE= yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/rdp ${PREFIX}/bin - -${MKDIR} ${PREFIX}/share/doc/rdp + -${INSTALL_DATA_DIR} ${PREFIX}/share/doc/rdp ${INSTALL_DATA} ${WRKSRC}/rdp_doc/rdp_case.ps ${PREFIX}/share/doc/rdp ${INSTALL_DATA} ${WRKSRC}/rdp_doc/rdp_supp.ps ${PREFIX}/share/doc/rdp ${INSTALL_DATA} ${WRKSRC}/rdp_doc/rdp_tut.ps ${PREFIX}/share/doc/rdp diff --git a/devel/stooop/Makefile b/devel/stooop/Makefile index 6c0a2d2effe..fbead19a92e 100644 --- a/devel/stooop/Makefile +++ b/devel/stooop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/16 14:39:04 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/02/25 04:17:43 hubertf Exp $ DISTNAME= stooop-4.1.1 CATEGORIES= x11 tcl @@ -15,11 +15,11 @@ NO_CONFIGURE= yes NO_BUILD= yes do-install: - ${MKDIR} ${PREFIX}/lib/tcl/stooop + ${INSTALL_DATA_DIR} ${PREFIX}/lib/tcl/stooop ${INSTALL_DATA} ${WRKSRC}/pkgIndex.tcl ${PREFIX}/lib/tcl/stooop ${INSTALL_DATA} ${WRKSRC}/stooop.tcl ${PREFIX}/lib/tcl/stooop ${INSTALL_DATA} ${WRKSRC}/switched.tcl ${PREFIX}/lib/tcl/stooop - ${MKDIR} ${PREFIX}/share/doc/tcl/stooop + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tcl/stooop ${INSTALL_DATA} ${WRKSRC}/stooop.htm ${PREFIX}/share/doc/tcl/stooop ${INSTALL_DATA} ${WRKSRC}/switched.htm ${PREFIX}/share/doc/tcl/stooop diff --git a/devel/tavrasm/Makefile b/devel/tavrasm/Makefile index ff3c33e26c3..262ff988878 100644 --- a/devel/tavrasm/Makefile +++ b/devel/tavrasm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/16 14:39:04 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/02/25 04:17:43 hubertf Exp $ # DISTNAME= tavrasm @@ -19,7 +19,7 @@ MAKEFILE= makefile DIST_SUBDIR= ${PKGNAME} do-install: - ${MKDIR} ${PREFIX}/share/doc/tavrasm + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tavrasm ${INSTALL_DATA} ${WRKSRCTOP}/README ${PREFIX}/share/doc/tavrasm/README ${INSTALL_PROGRAM} ${WRKSRC}/tavrasm ${PREFIX}/bin diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile index a6623e6f85c..9d6407076c0 100644 --- a/devel/tkcvs/Makefile +++ b/devel/tkcvs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2001/02/16 14:39:05 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2001/02/25 04:17:43 hubertf Exp $ # FreeBSD Id: Makefile,v 1.12 1998/02/24 21:43:24 jseger Exp # @@ -22,7 +22,7 @@ do-install: (cd ${WRKSRC}/tkcvs; ${SETENV} ${MAKE_ENV} ${SH} ./doinstall) post-install: - ${MKDIR} ${PREFIX}/share/doc/tkcvs + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tkcvs ${INSTALL_DATA} ${WRKSRC}/README.tkcvs ${PREFIX}/share/doc/tkcvs/ ${INSTALL_DATA} ${WRKSRC}/tkdiff/README ${PREFIX}/share/doc/tkcvs/README.tkdiff diff --git a/devel/unproven-pthreads/Makefile b/devel/unproven-pthreads/Makefile index fb2dd606d8c..202f0b1f6cd 100644 --- a/devel/unproven-pthreads/Makefile +++ b/devel/unproven-pthreads/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2001/02/16 14:39:05 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2001/02/25 04:17:43 hubertf Exp $ # DISTNAME= unproven-pthreads-0.17 @@ -19,7 +19,7 @@ MAKE_ENV+= NOLINT=1 NOPROFILE=1 OBJECT_FMT=${OBJECT_FMT} CONFIGURE_ARGS+= --prefix=${PREFIX}/pthreads pre-install: - ${MKDIR} ${PREFIX}/pthreads + ${INSTALL_DATA_DIR} ${PREFIX}/pthreads post-install: @${RM} -f ${PREFIX}/pthreads/lib/libpthread_pic.a diff --git a/devel/w32api/Makefile b/devel/w32api/Makefile index 9491e33fe81..8d0b35b2e07 100644 --- a/devel/w32api/Makefile +++ b/devel/w32api/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/16 14:39:06 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/02/25 04:17:43 hubertf Exp $ DISTNAME= w32api-0.4-20001122-bjy PKGNAME= w32api-0.4nb2 @@ -24,7 +24,7 @@ BUILD_DEPENDS+= ${PREFIX}/cross/i386-netbsdpe/bin/gcc:../../cross/i386-netbsdpe do-build: do-install: - ${MKDIR} ${PREFIX}/cross/i386-netbsdpe/include + ${INSTALL_DATA_DIR} ${PREFIX}/cross/i386-netbsdpe/include ${CP} ${WRKSRC}/include/*.h ${PREFIX}/cross/i386-netbsdpe/include .include "../../mk/bsd.pkg.mk" diff --git a/editors/biew/Makefile b/editors/biew/Makefile index 968784f5817..e4b6850ebce 100644 --- a/editors/biew/Makefile +++ b/editors/biew/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/16 14:40:49 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/02/25 04:17:44 hubertf Exp $ # DISTNAME= biew-520 @@ -18,7 +18,7 @@ USE_GMAKE= YES MAKEFILE= makefile do-install: - ${MKDIR} ${PREFIX}/share/biew/ ${PREFIX}/share/doc/biew/ + ${INSTALL_DATA_DIR} ${PREFIX}/share/biew/ ${PREFIX}/share/doc/biew/ ${INSTALL_PROGRAM} ${WRKSRC}/biew ${PREFIX}/bin/ ${INSTALL_DATA} ${WRKSRC}/bin_rc/biew.hlp ${PREFIX}/share/biew/ ${INSTALL_DATA} ${WRKSRC}/bin_rc/standard.skn ${PREFIX}/share/biew/ diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile index de976381846..69f7bd771ba 100644 --- a/editors/nedit/Makefile +++ b/editors/nedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/02/16 14:40:52 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2001/02/25 04:17:44 hubertf Exp $ DISTNAME= nedit-5.1.1-src PKGNAME= nedit-5.1.1 @@ -22,7 +22,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/source/${PROGRAM} ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/${PROGRAM}.man ${PREFIX}/man/man1/${PROGRAM}.1 .endfor - ${MKDIR} ${PREFIX}/share/doc/nedit + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nedit ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/nedit .include "../../mk/bsd.pkg.mk" diff --git a/editors/ng/Makefile b/editors/ng/Makefile index ff57aeeab9e..aa1c60b4ff1 100644 --- a/editors/ng/Makefile +++ b/editors/ng/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/16 14:40:52 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:17:44 hubertf Exp $ DISTNAME= ng-1.4 CATEGORIES= editors japanese @@ -33,7 +33,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ng ${PREFIX}/bin/ post-install: - ${MKDIR} ${PREFIX}/share/doc/ng + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ng ${INSTALL_DATA} ${WRKSRC}/docs/Ng.FAQ ${PREFIX}/share/doc/ng/Ng.FAQ.euc-jp ${INSTALL_DATA} ${WRKSRC}/docs/Ng.doc ${PREFIX}/share/doc/ng/Ng.doc.euc-jp ${INSTALL_DATA} ${WRKSRC}/docs/Ng.ref ${PREFIX}/share/doc/ng/Ng.ref.euc-jp diff --git a/editors/xcoral/Makefile b/editors/xcoral/Makefile index 5edeacdaaaf..9516c2fc0fb 100644 --- a/editors/xcoral/Makefile +++ b/editors/xcoral/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/02/16 14:40:55 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2001/02/25 04:17:44 hubertf Exp $ # FreeBSD Id: Makefile,v 1.6 1999/01/26 02:16:00 steve Exp # @@ -22,11 +22,11 @@ LIBFILES= DEPEND README cmd.sc color.sc comments.sc compare-win.sc \ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xcoral ${PREFIX}/bin - @${MKDIR} ${PREFIX}/lib/xcoral + @${INSTALL_DATA_DIR} ${PREFIX}/lib/xcoral .for FILE in ${LIBFILES} ${INSTALL_DATA} ${WRKSRC}/SmacLib/${FILE} ${PREFIX}/lib/xcoral .endfor - @${MKDIR} ${PREFIX}/share/doc/xcoral/HTML/icons + @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xcoral/HTML/icons ${CP} -r ${WRKSRC}/Doc/* ${PREFIX}/share/doc/xcoral .include "../../mk/bsd.pkg.mk" diff --git a/editors/xemacs-packages/Makefile b/editors/xemacs-packages/Makefile index 26a5d8243bc..43084ec70dc 100644 --- a/editors/xemacs-packages/Makefile +++ b/editors/xemacs-packages/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/02/20 13:37:18 tron Exp $ +# $NetBSD: Makefile,v 1.15 2001/02/25 04:17:44 hubertf Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1999/06/22 22:16:53 gj Exp DISTNAME= xemacs-packages @@ -43,7 +43,7 @@ PLIST_SUBST+= ELSUFX= .endif do-install: - @${MKDIR} ${PREFIX}/lib/xemacs/xemacs-packages + @${INSTALL_DATA_DIR} ${PREFIX}/lib/xemacs/xemacs-packages .for DISTFILE in ${DISTFILES} @${ECHO_MSG} -n "Extracting ${DISTFILE} ... " @${GTAR} xCzf ${PREFIX}/lib/xemacs/xemacs-packages \ diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile index ccdb8e3d66e..c2d1fd1ac0b 100644 --- a/editors/xemacs/Makefile +++ b/editors/xemacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2001/02/20 13:04:30 tron Exp $ +# $NetBSD: Makefile,v 1.31 2001/02/25 04:17:45 hubertf Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1997/09/03 19:27:57 gj Exp DISTNAME= xemacs-21.1.14 @@ -89,7 +89,7 @@ pre-configure: post-install: @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/${DISTNAME} - @${MKDIR} ${PREFIX}/lib/xemacs + @${INSTALL_DATA_DIR} ${PREFIX}/lib/xemacs @if [ "X${MANZ}" != X"" ]; then \ ${WRKSRC}/lib-src/gzip-el.sh ${PREFIX}/lib/${DISTNAME}; \ fi diff --git a/emulators/fmsx/Makefile b/emulators/fmsx/Makefile index 879fe0101ad..9a1c3580280 100644 --- a/emulators/fmsx/Makefile +++ b/emulators/fmsx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/17 18:38:17 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/02/25 04:17:45 hubertf Exp $ DISTNAME= fMSX22.tar PKGNAME= fmsx-2.2 @@ -27,9 +27,9 @@ DEFS+= -DMITSHM -D${CUR_DEPTH} -DSOUND -DSUN_AUDIO MAKE_ENV= DEFS="${DEFS}" pre-install: - @${MKDIR} ${PREFIX}/share/fmsx \ + @${INSTALL_DATA_DIR} ${PREFIX}/share/fmsx \ && ${CHMOD} a+rx ${PREFIX}/share/fmsx - @${MKDIR} ${PREFIX}/share/doc/html/fmsx \ + @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/fmsx \ && ${CHMOD} a+rx ${PREFIX}/share/doc/html/fmsx # Makefile of fMSX doesn't have install target. @@ -37,7 +37,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/fmsx ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/rddsk ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/wrdsk ${PREFIX}/bin - ${MKDIR} ${PREFIX}/share/fmsx + ${INSTALL_DATA_DIR} ${PREFIX}/share/fmsx ${INSTALL_DATA} ${WRKSRC}/CYRILLIC.FNT ${PREFIX}/share/fmsx ${INSTALL_DATA} ${WRKSRC}/ITALIC.FNT ${PREFIX}/share/fmsx ${INSTALL_DATA} ${WRKSRC}/DISK.ROM ${PREFIX}/share/fmsx @@ -48,7 +48,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/MSX2P.ROM ${PREFIX}/share/fmsx ${INSTALL_DATA} ${WRKSRC}/MSX2PEXT.ROM ${PREFIX}/share/fmsx ${INSTALL_DATA} ${WRKSRC}/PAINTER.ROM ${PREFIX}/share/fmsx - ${MKDIR} ${PREFIX}/share/doc/fmsx + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fmsx ${INSTALL_DATA} ${WRKSRC}/fMSX.html ${PREFIX}/share/doc/fmsx .include "../../mk/bsd.pkg.mk" diff --git a/emulators/hercules-images/Makefile b/emulators/hercules-images/Makefile index 93dd89af38d..47b50c70cee 100644 --- a/emulators/hercules-images/Makefile +++ b/emulators/hercules-images/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/02/22 16:45:49 agc Exp $ +# $NetBSD: Makefile,v 1.2 2001/02/25 04:17:45 hubertf Exp $ DISTNAME= mftr33 PKGNAME= hercules-images-20010222 @@ -16,7 +16,7 @@ EXTRACT_ONLY= WRKSRC= ${WRKDIR} do-install: - ${MKDIR} ${PREFIX}/share/data/hercules + ${INSTALL_DATA_DIR} ${PREFIX}/share/data/hercules cd ${PREFIX}/share/data/hercules; \ (${GZCAT} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ; dd if=/dev/zero bs=10k count=2) | ${PAX} -r diff --git a/emulators/hercules/Makefile b/emulators/hercules/Makefile index da6958138c8..cbc3f087c2e 100644 --- a/emulators/hercules/Makefile +++ b/emulators/hercules/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/22 16:49:35 agc Exp $ +# $NetBSD: Makefile,v 1.5 2001/02/25 04:17:45 hubertf Exp $ DISTNAME= hercules-2.11 CATEGORIES= emulators @@ -15,7 +15,7 @@ USE_GMAKE= yes MAKEFILE= makefile pre-install: - ${MKDIR} ${PREFIX}/share/examples/hercules + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/hercules ${BSD_INSTALL_DATA} ${WRKSRC}/hercules.cnf ${PREFIX}/share/examples/hercules/ ${BSD_INSTALL_DATA} ${WRKSRC}/zzsa.cnf ${PREFIX}/share/examples/hercules/ diff --git a/emulators/linuxppc_lib/Makefile b/emulators/linuxppc_lib/Makefile index c4b50e8b1e0..fdd41e5c35d 100644 --- a/emulators/linuxppc_lib/Makefile +++ b/emulators/linuxppc_lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/24 18:08:35 manu Exp $ +# $NetBSD: Makefile,v 1.5 2001/02/25 04:17:45 hubertf Exp $ DISTNAME= linuxppc_lib-2000.q4.2 CATEGORIES= emulators @@ -44,7 +44,7 @@ do-build: #do nothing do-install: ${RM} -f ${WRKDIR}/PLIST_DYNAMIC - ${MKDIR} ${PREFIX}/${EMUL_LINUX} + ${INSTALL_DATA_DIR} ${PREFIX}/${EMUL_LINUX} ${RPM2PKG} -d ${PREFIX} -f ${WRKDIR}/PLIST_DYNAMIC -p emul/linux ${RPMARGS} ${TOUCH} ${PREFIX}/${EMUL_LINUX}/etc/ld.so.cache~ ${CP} ${FILESDIR}/ld.so.conf ${PREFIX}/${EMUL_LINUX}/etc/ld.so.conf diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile index 926b35958d7..6d6f67a19c5 100644 --- a/emulators/spim/Makefile +++ b/emulators/spim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/02/17 18:38:23 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2001/02/25 04:17:46 hubertf Exp $ # FreeBSD Id: Makefile,v 1.5 1997/10/10 06:53:35 obrien Exp # @@ -24,11 +24,11 @@ pre-configure: @${RM} -f ${WRKSRC}/y.tab.* pre-install: - @${MKDIR} ${PREFIX}/share/spim && ${CHMOD} a+rx ${PREFIX}/share/spim + @${INSTALL_DATA_DIR} ${PREFIX}/share/spim && ${CHMOD} a+rx ${PREFIX}/share/spim post-install: @${ECHO} "Installing spim/xspim documentation" - @${MKDIR} ${PREFIX}/share/doc/spim \ + @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/spim \ && ${CHMOD} a+rx ${PREFIX}/share/doc/spim ${INSTALL_DATA} ${WRKSRC}/Documentation/spim.ps \ ${PREFIX}/share/doc/spim diff --git a/emulators/suse_base/Makefile b/emulators/suse_base/Makefile index 09eb1bf36b1..30f9907b5d6 100644 --- a/emulators/suse_base/Makefile +++ b/emulators/suse_base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2001/02/17 18:38:25 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2001/02/25 04:17:46 hubertf Exp $ DISTNAME= suse_base-${SUSE_VERSION}nb2 CATEGORIES= emulators @@ -33,7 +33,7 @@ do-install: for FILE in ${WRKDIR}/*.sh; do \ ${INSTALL_SCRIPT} $$FILE ${PREFIX}/sbin/`basename $$FILE .sh`; \ done - ${MKDIR} ${EMULDIR}/dev + ${INSTALL_DATA_DIR} ${EMULDIR}/dev ${LN} -fs /dev/sound ${EMULDIR}/dev/dsp ${LN} -fs /dev/null ${EMULDIR}/dev/null @${CP} ${WRKDIR}/PLIST ${PLIST_SRC} diff --git a/emulators/swarm/Makefile b/emulators/swarm/Makefile index 24dae7bd14e..0f2b333b7a8 100644 --- a/emulators/swarm/Makefile +++ b/emulators/swarm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/17 18:38:31 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/02/25 04:17:47 hubertf Exp $ DISTNAME= swarm-0.26 CATEGORIES= emulators @@ -12,7 +12,7 @@ WRKSRC= ${WRKDIR}/swarm/src do-install: ${BSD_INSTALL_PROGRAM} ${WRKSRC}/swarm ${PREFIX}/bin - ${MKDIR} ${PREFIX}/share/doc/swarm + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/swarm ${BSD_INSTALL_DATA} ${WRKSRC}/../doc/swarm.pdf ${PREFIX}/share/doc/swarm .include "../../mk/bsd.pkg.mk" diff --git a/emulators/xbeeb/Makefile b/emulators/xbeeb/Makefile index 8610b6ee234..32a509e2697 100644 --- a/emulators/xbeeb/Makefile +++ b/emulators/xbeeb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/02/17 18:38:34 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2001/02/25 04:17:47 hubertf Exp $ # DISTNAME= xbeeb-0.3.6 @@ -41,10 +41,10 @@ do-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/xbeeb ${PREFIX}/bin/xbeeb ${INSTALL_MAN} ${MAN_PAGE} ${PREFIX}/man/man1/xbeeb.1 - ${MKDIR} ${PREFIX}/${XBEEBROOT} - ${MKDIR} ${PREFIX}/${XBEEBROOT}/roms - ${MKDIR} ${PREFIX}/${XBEEBROOT}/docs - ${MKDIR} ${PREFIX}/lib/X11/fonts/xbeeb + ${INSTALL_DATA_DIR} ${PREFIX}/${XBEEBROOT} + ${INSTALL_DATA_DIR} ${PREFIX}/${XBEEBROOT}/roms + ${INSTALL_DATA_DIR} ${PREFIX}/${XBEEBROOT}/docs + ${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fonts/xbeeb ${INSTALL_DATA} ${WRKSRC}/roms/xdfs0.70.rom ${PREFIX}/${XBEEBROOT}/roms/xdfs0.70.rom for docfile in ${WRKSRC}/doc/*; do \ ${INSTALL_DATA} $$docfile ${PREFIX}/${XBEEBROOT}/docs; \ diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile index d6cbc5c0de7..2a196f5907c 100644 --- a/emulators/xmame/Makefile +++ b/emulators/xmame/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2001/02/17 18:38:36 wiz Exp $ +# $NetBSD: Makefile,v 1.42 2001/02/25 04:17:47 hubertf Exp $ # DISTNAME= xmame-0.37b6.1 @@ -63,7 +63,7 @@ do-install: ${PREFIX}/bin/xmame) (cd ${WRKSRC}/doc && ${INSTALL_MAN} xmame.6 \ ${PREFIX}/man/man6/xmame.6) - ${MKDIR} ${ROMPATH} + ${INSTALL_DATA_DIR} ${ROMPATH} (cd ${WRKSRC}/doc && ${INSTALL_DATA} xmamerc ${ROMPATH}/xmamerc) @${ECHO} Remember to set ROMPATH to ${ROMPATH}. diff --git a/finance/xfinans/Makefile b/finance/xfinans/Makefile index 582963e189d..6195829c60e 100644 --- a/finance/xfinans/Makefile +++ b/finance/xfinans/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/16 14:46:35 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/02/25 04:17:47 hubertf Exp $ # DISTNAME= xfinans-5.9 @@ -18,8 +18,8 @@ post-patch: ${TOUCH} ${WRKSRC}/xfinans.man post-install: - ${MKDIR} ${PREFIX}/share/examples/Xfinans - ${MKDIR} ${PREFIX}/share/doc/Xfinans + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/Xfinans + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/Xfinans ${CP} ${WRKSRC}/../XFinans.defaults ${PREFIX}/lib/X11/app-defaults/XFinans ${CP} ${WRKSRC}/../*.acc ${PREFIX}/share/examples/Xfinans ${CP} ${WRKSRC}/../xfin.ps ${PREFIX}/share/doc/Xfinans diff --git a/fonts/jisx0208fonts/Makefile b/fonts/jisx0208fonts/Makefile index 023d7d9e362..2b38e8285fd 100644 --- a/fonts/jisx0208fonts/Makefile +++ b/fonts/jisx0208fonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/02/16 14:46:06 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2001/02/25 04:17:47 hubertf Exp $ # DISTNAME= jisx0208fonts-20010112 @@ -94,10 +94,10 @@ PATCHDIR= ${.CURDIR}/NO-EXIST .endif pre-install: - [ -d ${FONTDIR} ] || ${MKDIR} ${FONTDIR} + [ -d ${FONTDIR} ] || ${INSTALL_DATA_DIR} ${FONTDIR} post-install: - ${MKDIR} ${PREFIX}/share/doc/jisx0208fonts + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jisx0208fonts ${INSTALL_DATA} ${WRKDIR}/knj10-1.1/README \ ${PREFIX}/share/doc/jisx0208fonts/README.naga10-1.1 ${INSTALL_DATA} ${FILESDIR}/README.kappa20 \ diff --git a/fonts/jisx0213fonts/Makefile b/fonts/jisx0213fonts/Makefile index 6ec656a15d4..fe1939ac2cf 100644 --- a/fonts/jisx0213fonts/Makefile +++ b/fonts/jisx0213fonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/16 14:46:07 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/02/25 04:17:48 hubertf Exp $ # DISTNAME= jisx0213fonts-0.0 @@ -31,7 +31,7 @@ do-build: done) do-install: - ${MKDIR} ${FONTDIR} + ${INSTALL_DATA_DIR} ${FONTDIR} for i in ${PCFGZ}; do \ ${INSTALL_DATA} ${WRKSRC}/$$i ${FONTDIR}; \ done diff --git a/fonts/ksc5601fonts/Makefile b/fonts/ksc5601fonts/Makefile index 83bf21db09c..7ca4c5c6f27 100644 --- a/fonts/ksc5601fonts/Makefile +++ b/fonts/ksc5601fonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/16 14:46:08 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:17:48 hubertf Exp $ # DISTNAME= ksc5601fonts-20001029 @@ -91,7 +91,7 @@ post-build: .endif pre-install: - [ -d ${FONTDIR} ] || ${MKDIR} ${FONTDIR} + [ -d ${FONTDIR} ] || ${INSTALL_DATA_DIR} ${FONTDIR} post-install: (cd ${FONTDIR}; mkfontdir) diff --git a/games/battalion/Makefile b/games/battalion/Makefile index 3c36e58952b..f05f04ed4ac 100644 --- a/games/battalion/Makefile +++ b/games/battalion/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2001/02/16 15:10:43 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2001/02/25 04:17:48 hubertf Exp $ # DISTNAME= battalion @@ -22,11 +22,11 @@ do-install: ${INSTALL} -c -s -o root -g games -m 2755 ${WRKSRC}/battalion ${PREFIX}/bin cd ${WRKDIR} && \ ${GZCAT} ${DISTDIR}/battalionSUN4.tar.gz | ${GTAR} xmf - - ${MKDIR} ${PREFIX}/share/battalion/HELP - ${MKDIR} ${PREFIX}/share/battalion/battalion.data/DATA - ${MKDIR} ${PREFIX}/share/battalion/battalion.data/MUSIC - ${MKDIR} ${PREFIX}/share/battalion/battalion.data/SOUNDS - ${MKDIR} ${PREFIX}/share/battalion/battalion.data/TEXTURES + ${INSTALL_DATA_DIR} ${PREFIX}/share/battalion/HELP + ${INSTALL_DATA_DIR} ${PREFIX}/share/battalion/battalion.data/DATA + ${INSTALL_DATA_DIR} ${PREFIX}/share/battalion/battalion.data/MUSIC + ${INSTALL_DATA_DIR} ${PREFIX}/share/battalion/battalion.data/SOUNDS + ${INSTALL_DATA_DIR} ${PREFIX}/share/battalion/battalion.data/TEXTURES ${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/DATA/* ${PREFIX}/share/battalion/battalion.data/DATA ${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/MUSIC/* ${PREFIX}/share/battalion/battalion.data/MUSIC ${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/SOUNDS/* ${PREFIX}/share/battalion/battalion.data/SOUNDS diff --git a/games/civctp-demo/Makefile b/games/civctp-demo/Makefile index 0ee397fa355..57b4e3eb5a1 100644 --- a/games/civctp-demo/Makefile +++ b/games/civctp-demo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/16 15:10:43 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:17:48 hubertf Exp $ # DISTNAME= civctp-demo-10251999 @@ -47,8 +47,8 @@ do-build: # The executable must be in the same directory as the data. do-install: - ${MKDIR} ${LIBDIR} - ${MKDIR} ${SHAREDIR} + ${INSTALL_DATA_DIR} ${LIBDIR} + ${INSTALL_DATA_DIR} ${SHAREDIR} ${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh ${PREFIX}/bin/${BINNAME} ${INSTALL_PROGRAM} ${WRKSRC}/bin/${BINTYPE}/${DISTBINNAME} ${LIBDIR}/${BINNAME} ${INSTALL_DATA} ${WRKSRC}/README ${SHAREDIR}/${BINNAME}-README diff --git a/games/crossfire-cli/Makefile b/games/crossfire-cli/Makefile index 2f057b53d74..d2abfafcee6 100644 --- a/games/crossfire-cli/Makefile +++ b/games/crossfire-cli/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/16 15:10:46 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/02/25 04:17:48 hubertf Exp $ # DISTNAME= crossfire-client-0.95.8 @@ -33,7 +33,7 @@ pre-build: cd ${WRKSRC} && ${MAKE} soundsdef.h post-install: - @${MKDIR} ${LOCALBASE}/share/cfclient + @${INSTALL_DATA_DIR} ${LOCALBASE}/share/cfclient cd ${LOCALBASE}/share/cfclient && \ ${GZCAT} ${DISTDIR}/${CF_SND} | ${GTAR} xmf - cd ${LOCALBASE}/share/cfclient && \ diff --git a/games/eus-demo/Makefile b/games/eus-demo/Makefile index 0db455053e6..94203ffcd88 100644 --- a/games/eus-demo/Makefile +++ b/games/eus-demo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/16 15:10:47 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:17:49 hubertf Exp $ # DISTNAME= eus-demo @@ -47,8 +47,8 @@ do-build: # The executable must be in the same directory as the data. do-install: - ${MKDIR} ${LIBDIR} - ${MKDIR} ${SHAREDIR} + ${INSTALL_DATA_DIR} ${LIBDIR} + ${INSTALL_DATA_DIR} ${SHAREDIR} ${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh ${PREFIX}/bin/${BINNAME} ${INSTALL_PROGRAM} ${WRKSRC}/bin/${BINTYPE}/${DISTBINNAME} ${LIBDIR}/${BINNAME} ${INSTALL_DATA} ${WRKSRC}/README ${SHAREDIR}/${BINNAME}-README diff --git a/games/freeciv-manual/Makefile b/games/freeciv-manual/Makefile index c37bca35d8c..aa0e6b2c0b8 100644 --- a/games/freeciv-manual/Makefile +++ b/games/freeciv-manual/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/16 15:10:48 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:17:49 hubertf Exp $ # DISTNAME= manual-1.8.1-2 @@ -14,7 +14,7 @@ NO_BUILD= YES WRKSRC= ${WRKDIR}/manual do-install: - ${MKDIR} ${PREFIX}/share/doc/html/freeciv/img + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/freeciv/img cd ${WRKSRC} && \ ${INSTALL_DATA} *.html ${PREFIX}/share/doc/html/freeciv cd ${WRKSRC}/img && \ diff --git a/games/galaxa/Makefile b/games/galaxa/Makefile index 92c9a5430e0..54551f6228e 100644 --- a/games/galaxa/Makefile +++ b/games/galaxa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/16 15:10:49 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2001/02/25 04:17:49 hubertf Exp $ # DISTNAME= galaxa.0.1 @@ -15,7 +15,7 @@ MAKEFILE= makefile USE_X11BASE= yes pre-install: - ${MKDIR} ${PREFIX}/share/doc/galaxa + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/galaxa ${CP} ${WRKSRC}/README.txt ${PREFIX}/share/doc/galaxa .include "../../mk/bsd.pkg.mk" diff --git a/games/icbm3d/Makefile b/games/icbm3d/Makefile index 11e8f4ed1cc..634d80f3c24 100644 --- a/games/icbm3d/Makefile +++ b/games/icbm3d/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/02/16 15:10:52 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2001/02/25 04:17:49 hubertf Exp $ # DISTNAME= icbm3d.0.3 @@ -15,7 +15,7 @@ MAKEFILE= makefile USE_X11BASE= yes pre-install: - ${MKDIR} ${PREFIX}/share/doc/icbm3d - ${CP} ${WRKSRC}/README.txt ${PREFIX}/share/doc/icbm3d + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/icbm3d + ${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/icbm3d .include "../../mk/bsd.pkg.mk" diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile index 48b3a447937..ff5c4797276 100644 --- a/games/mirrormagic/Makefile +++ b/games/mirrormagic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/02/16 15:10:54 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2001/02/25 04:17:49 hubertf Exp $ # DISTNAME= mirrormagic-1.3 @@ -15,8 +15,8 @@ USE_XPM= YES do-install: ${INSTALL_PROGRAM} -o bin -g games -m 2755 ${WRKSRC}/mirrormagic ${X11PREFIX}/bin - ${MKDIR} ${X11PREFIX}/share/mirrormagic/sounds - ${MKDIR} ${X11PREFIX}/share/mirrormagic/graphics + ${INSTALL_DATA_DIR} ${X11PREFIX}/share/mirrormagic/sounds + ${INSTALL_DATA_DIR} ${X11PREFIX}/share/mirrormagic/graphics ${CHOWN} bin:games ${X11PREFIX}/share/mirrormagic ${CHMOD} 775 ${X11PREFIX}/share/mirrormagic ${INSTALL_DATA} ${WRKSRC}/sounds/* ${X11PREFIX}/share/mirrormagic/sounds diff --git a/games/omega/Makefile b/games/omega/Makefile index 7960319e264..01ac22a2bf3 100644 --- a/games/omega/Makefile +++ b/games/omega/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/02/16 15:10:56 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2001/02/25 04:17:50 hubertf Exp $ DISTNAME= omega-0.90-pa4 PKGNAME= omega-0.90.4 @@ -21,7 +21,7 @@ do-install: @ ${INSTALL_PROGRAM} -o games -g games -m 4711 ${WRKSRC}/omega \ ${PREFIX}/bin/Omega @ ${INSTALL_MAN} ${WRKSRC}/docs/omega.6 ${PREFIX}/man/man6 - @ ${MKDIR} ${PREFIX}/share/omega + @ ${INSTALL_DATA_DIR} ${PREFIX}/share/omega @ ${INSTALL_DATA} ${WRKSRC}/lib/* ${PREFIX}/share/omega @ ${RM} ${PREFIX}/share/omega/license.old @ ${CHMOD} 0600 ${PREFIX}/share/omega/omega.hi @@ -30,7 +30,7 @@ do-install: @ ${CHOWN} -R games:games ${PREFIX}/share/omega post-install: - @ ${MKDIR} ${PREFIX}/share/doc/omega + @ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/omega .for file in buglist.txt docs/compile.all docs/readme.1st docs/omega.txt docs/readme3 docs/readme4 @ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/omega .endfor diff --git a/games/pysol/Makefile b/games/pysol/Makefile index 4f3611f47f1..3d8055a5b71 100644 --- a/games/pysol/Makefile +++ b/games/pysol/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/02/16 15:10:56 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2001/02/25 04:17:50 hubertf Exp $ # FreeBSD Id: ports/games/pysol/Makefile,v 1.20 1999/12/08 11:01:01 tg Exp DISTNAME= pysol-4.10 @@ -21,7 +21,7 @@ do-install: ${SED} -e "s|@pkgdatadir@|${PREFIX}/share/pysol|" < ${WRKSRC}/pysol > ${PREFIX}/bin/pysol ${CHMOD} +x ${PREFIX}/bin/pysol ${INSTALL_DATA} ${WRKSRC}/pysol.6 ${PREFIX}/man/man6 - @${MKDIR} ${PREFIX}/share/pysol + @${INSTALL_DATA_DIR} ${PREFIX}/share/pysol (cd ${WRKSRC}/data; tar cf - *) | \ (cd ${PREFIX}/share/pysol; tar xf -) (cd ${WRKDIR}/${CARDSETS}/data; tar cf - *) | \ diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile index b5e1e82169f..3de05047e77 100644 --- a/games/rocksndiamonds/Makefile +++ b/games/rocksndiamonds/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/16 15:10:58 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:17:50 hubertf Exp $ # DISTNAME= rocksndiamonds-1.4.0 @@ -18,11 +18,11 @@ do-install: ${INSTALL_PROGRAM} -o games -g games -m 2755 \ ${WRKSRC}/rocksndiamonds ${PREFIX}/bin/ ${INSTALL_MAN} ${WRKSRC}/rocksndiamonds.1 ${PREFIX}/man/man1/ - ${MKDIR} ${PREFIX}/share/rocksndiamonds + ${INSTALL_DATA_DIR} ${PREFIX}/share/rocksndiamonds cd ${WRKSRC} && ${PAX} -r -w sounds graphics levels \ ${PREFIX}/share/rocksndiamonds/ ${CHOWN} -R games:games ${PREFIX}/share/rocksndiamonds - ${MKDIR} ${SCORE_PATH}/scores + ${INSTALL_DATA_DIR} ${SCORE_PATH}/scores ${CHMOD} 755 ${SCORE_PATH} ${CHMOD} 775 ${SCORE_PATH}/scores .for directory in classic_boulderdash classic_emerald_mine \ @@ -33,7 +33,7 @@ do-install: rnd_martin_herrmann rnd_pavel_machek rnd_tobias_authmann \ rnd_visa_hastrup rnd_warwick_allison rnd_stephan_beyer \ bd_boulderdash_16 bd_boulderdash_2 bd_xbd - ${MKDIR} ${SCORE_PATH}/scores/${directory} \ + ${INSTALL_DATA_DIR} ${SCORE_PATH}/scores/${directory} \ && ${CHMOD} 775 ${SCORE_PATH}/scores/${directory} .endfor ${CHOWN} -R games:games ${SCORE_PATH} diff --git a/games/xbomber/Makefile b/games/xbomber/Makefile index 4b8f64ccc57..5a276dc3c63 100644 --- a/games/xbomber/Makefile +++ b/games/xbomber/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/02/16 15:11:01 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2001/02/25 04:17:50 hubertf Exp $ # DISTNAME= xbomber.0.8 @@ -15,7 +15,7 @@ MAKEFILE= makefile USE_X11BASE= yes pre-install: - ${MKDIR} ${PREFIX}/share/doc/xbomber - ${CP} ${WRKSRC}/README.txt ${PREFIX}/share/doc/xbomber + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xbomber + ${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/xbomber .include "../../mk/bsd.pkg.mk" diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile index 451ccfa9389..2c0e4272c5d 100644 --- a/games/xdoom/Makefile +++ b/games/xdoom/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/02/16 15:11:01 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2001/02/25 04:17:50 hubertf Exp $ DISTNAME= linuxdoom-1.10 PKGNAME= xdoom-1.10nb1 @@ -32,7 +32,7 @@ do-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME}/linux/linuxxdoom ${PREFIX}/bin/xdoom ${INSTALL_PROGRAM} ${WRKSRC}/sndserv/linux/sndserver ${PREFIX}/bin/sndserver - ${MKDIR} ${PREFIX}/share/doom + ${INSTALL_DATA_DIR} ${PREFIX}/share/doom ${GUNZIP_CMD} -c ${DISTDIR}/doom-1.8.wad.gz > ${PREFIX}/share/doom/doom1.wad .include "../../mk/bsd.pkg.mk" diff --git a/games/xemeraldia/Makefile b/games/xemeraldia/Makefile index 16e6856ce01..40597341916 100644 --- a/games/xemeraldia/Makefile +++ b/games/xemeraldia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/16 15:11:02 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:17:50 hubertf Exp $ # FreeBSD Id: ports/games/xemeraldia/Makefile,v 1.17 1999/12/10 19:24:55 steve Exp DISTNAME= xemeraldia-0.3 @@ -21,7 +21,7 @@ MAKE_ENV+= GAMES_DIR="${GAMES_DIR}" PLIST_SUBST= GAMES_DIR="${GAMES_DIR}" post-install: - @${MKDIR} ${PREFIX}/${GAMES_DIR}/xemeraldia + @${INSTALL_DATA_DIR} ${PREFIX}/${GAMES_DIR}/xemeraldia @${TOUCH} ${PREFIX}/${GAMES_DIR}/xemeraldia/xemeraldia.scores @${CHMOD} 666 ${PREFIX}/${GAMES_DIR}/xemeraldia/xemeraldia.scores diff --git a/games/xworm/Makefile b/games/xworm/Makefile index 7c8e4eb93b5..a844eb6ccf2 100644 --- a/games/xworm/Makefile +++ b/games/xworm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/02/16 15:11:06 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2001/02/25 04:17:51 hubertf Exp $ # FreeBSD Id: Makefile,v 1.3 1998/08/05 09:31:04 asami Exp # @@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/XWorm do-install: @ ${INSTALL_PROGRAM} ${WRKSRC}/xworm ${PREFIX}/bin - @ ${MKDIR} ${PREFIX}/share/xworm + @ ${INSTALL_DATA_DIR} ${PREFIX}/share/xworm .for file in font grid raw ${INSTALL_DATA} ${WRKSRC}/xworm.${file} ${PREFIX}/share/xworm .endfor diff --git a/graphics/alevt/Makefile b/graphics/alevt/Makefile index fcf5398010f..0bd96475bb9 100644 --- a/graphics/alevt/Makefile +++ b/graphics/alevt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/16 15:22:15 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:17:51 hubertf Exp $ DISTNAME= alevt-1.6.0 CATEGORIES= graphics @@ -18,6 +18,6 @@ USE_X11BASE= YES USE_GMAKE= YES pre-install: - ${MKDIR} ${PREFIX}/share/pixmaps + ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps .include "../../mk/bsd.pkg.mk" diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile index 118b2a9ec83..cdf7e9071e2 100644 --- a/graphics/giram/Makefile +++ b/graphics/giram/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/02/16 15:22:22 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2001/02/25 04:17:51 hubertf Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1999/06/19 17:38:24 cpiazza Exp $ DISTNAME= Giram-0.1.2 @@ -26,7 +26,7 @@ CONFIGURE_ENV= GTK_CONFIG="${GTKDIR}/bin/gtk-config" \ ALL_TARGET= install-strip post-install: - @${MKDIR} ${PREFIX}/share/examples/Giram + @${INSTALL_DATA_DIR} ${PREFIX}/share/examples/Giram ${INSTALL_DATA} ${WRKSRC}/SampleScenes/* ${PREFIX}/share/examples/Giram/ .include "../../mk/bsd.pkg.mk" diff --git a/graphics/mgl/Makefile b/graphics/mgl/Makefile index a4461a66df8..e8df467cf0b 100644 --- a/graphics/mgl/Makefile +++ b/graphics/mgl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/02/16 15:22:27 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2001/02/25 04:17:51 hubertf Exp $ DISTNAME= mgl2-alpha-019 PKGNAME= mgl-0.1.9a @@ -69,17 +69,17 @@ post-install: @${TOUCH} ${PREFIX}/sbin/calibconf @${TOUCH} ${PREFIX}/sbin/calibdata-update # - @${MKDIR} ${PREFIX}/share/mgl2 + @${INSTALL_DATA_DIR} ${PREFIX}/share/mgl2 .for i in ${MGLFONTUTILS} @${INSTALL_DATA} ${WRKSRC}/bin/${i} ${PREFIX}/share/mgl2 .endfor @${RM} -f -r ${PREFIX}/share/doc/mgl2 - @${MKDIR} ${PREFIX}/share/doc/mgl2 - @${MKDIR} ${PREFIX}/share/doc/mgl2/memo - @${MKDIR} ${PREFIX}/share/doc/mgl2/mgterm - @${MKDIR} ${PREFIX}/share/doc/mgl2/mil - @${MKDIR} ${PREFIX}/share/doc/mgl2/bin - @${MKDIR} ${PREFIX}/share/doc/mgl2/doc + @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgl2 + @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgl2/memo + @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgl2/mgterm + @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgl2/mil + @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgl2/bin + @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgl2/doc .for i in ${MGLDOCS} @${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/mgl2/doc/ .endfor diff --git a/graphics/mpeg2codec/Makefile b/graphics/mpeg2codec/Makefile index cb8627065ab..eb328b9563d 100644 --- a/graphics/mpeg2codec/Makefile +++ b/graphics/mpeg2codec/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/16 15:22:27 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/02/25 04:17:52 hubertf Exp $ DISTNAME= mpeg2vidcodec_v12 PKGNAME= mpeg2codec-1.2 @@ -18,10 +18,10 @@ do-install: ${WRKSRC}/src/mpeg2dec/mpeg2decode \ ${WRKSRC}/src/mpeg2enc/mpeg2encode \ ${PREFIX}/bin - ${MKDIR} ${PREFIX}/share/doc/mpeg2codec + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mpeg2codec ${INSTALL_DATA} ${WRKSRC}/doc/mpeg2enc.doc \ ${PREFIX}/share/doc/mpeg2codec - ${MKDIR} ${PREFIX}/share/mpeg2codec + ${INSTALL_DATA_DIR} ${PREFIX}/share/mpeg2codec ${INSTALL_DATA} ${WRKSRC}/par/* ${PREFIX}/share/mpeg2codec .include "../../mk/bsd.pkg.mk" diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile index abd4a238ae7..7250b5e72db 100644 --- a/graphics/pstoedit/Makefile +++ b/graphics/pstoedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/16 15:22:32 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2001/02/25 04:17:52 hubertf Exp $ DISTNAME= pstoedit_3_20 PKGNAME= pstoedit-3.20 @@ -36,7 +36,7 @@ DOCDIR= ${PREFIX}/share/pstoedit/doc DOCSRC= ${WRKSRC}/.. post-install: - ${MKDIR} ${DOCDIR} + ${INSTALL_DATA_DIR} ${DOCDIR} ${INSTALL_DATA} ${DOCSRC}/*.htm ${DOCDIR} ${INSTALL_DATA} ${DOCSRC}/readme.txt ${DOCDIR} diff --git a/graphics/rayshade/Makefile b/graphics/rayshade/Makefile index 1537f1bfb17..82afa9d6a50 100644 --- a/graphics/rayshade/Makefile +++ b/graphics/rayshade/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/02/16 15:22:33 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2001/02/25 04:17:52 hubertf Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1998/05/26 04:04:11 mph Exp # @@ -31,10 +31,10 @@ do-install: ${RANLIB} ${PREFIX}/lib/libray.a ${INSTALL_DATA} ${WRKSRC}/libshade/libshade.a ${PREFIX}/lib ${RANLIB} ${PREFIX}/lib/libshade.a - ${MKDIR} ${PREFIX}/share/doc/rayshade + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/rayshade ${INSTALL_DATA} ${WRKSRC}/Doc/Guide/* ${PREFIX}/share/doc/rayshade ${INSTALL_DATA} ${WRKSRC}/Doc/quickref.txt ${PREFIX}/share/doc/rayshade - ${MKDIR} ${PREFIX}/share/examples/rayshade + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/rayshade ${INSTALL_DATA} ${WRKSRC}/Examples/* ${PREFIX}/share/examples/rayshade .include "../../mk/bsd.pkg.mk" diff --git a/graphics/sketch/Makefile b/graphics/sketch/Makefile index ca93279dff3..e12c19cc912 100644 --- a/graphics/sketch/Makefile +++ b/graphics/sketch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/02/16 15:22:33 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2001/02/25 04:17:52 hubertf Exp $ # FreeBSD Id: Makefile,v 1.4 1999/05/19 09:41:06 tg Exp $ DISTNAME= sketch-0.6.3 @@ -30,15 +30,15 @@ do-build: @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} python setup.py build) do-install: - ${MKDIR} ${SKETCHDIR} + ${INSTALL_DATA_DIR} ${SKETCHDIR} .for dir in Filter Pax Plugins Resources Script Sketch (cd ${WRKSRC}; ${GTAR} -c -f - --exclude-from=${FILESDIR}/excludelist ${dir}) | \ (cd ${SKETCHDIR}/; ${GTAR} xf -) .endfor (cd ${WRKSRC}; ${INSTALL_SCRIPT} finishinst.py sk2ps.py sketch.py ${SKETCHDIR}) - ${MKDIR} ${SKETCHDOCDIR} + ${INSTALL_DATA_DIR} ${SKETCHDOCDIR} (cd ${WRKSRC}; ${GTAR} cf - ${SKETCHDOCS}) | (cd ${SKETCHDOCDIR}; ${GTAR} xf -) - ${MKDIR} ${SKETCHEXDIR} + ${INSTALL_DATA_DIR} ${SKETCHEXDIR} (cd ${WRKSRC}/Examples; ${GTAR} cf - .) | (cd ${SKETCHEXDIR}; ${GTAR} xf -) (cd ${SKETCHDIR}; python finishinst.py) ${SED} -e "s|@PREFIX@|${PREFIX}|g" < ${FILESDIR}/sketch.in > ${PREFIX}/bin/sketch diff --git a/graphics/tkpiechart/Makefile b/graphics/tkpiechart/Makefile index 7c75d895d13..b7efb1322dd 100644 --- a/graphics/tkpiechart/Makefile +++ b/graphics/tkpiechart/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/16 15:22:34 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2001/02/25 04:17:52 hubertf Exp $ DISTNAME= tkpiechart-5.4 CATEGORIES= graphics @@ -24,7 +24,7 @@ post-patch: ${CHMOD} a+x ${WRKSRC}/instapkg.tcl do-install: - ${MKDIR} ${PREFIX}/lib/tcl/tkpiechart + ${INSTALL_DATA_DIR} ${PREFIX}/lib/tcl/tkpiechart cd ${WRKSRC}; ./instapkg.tcl ${PREFIX}/lib/tcl/tkpiechart .include "../../mk/bsd.pkg.mk" diff --git a/graphics/urt/Makefile b/graphics/urt/Makefile index e36a444a3e8..a8711344964 100644 --- a/graphics/urt/Makefile +++ b/graphics/urt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2001/02/16 15:22:34 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2001/02/25 04:17:52 hubertf Exp $ # FreeBSD Id: Makefile,v 1.6 1998/02/11 08:48:26 tg Exp DISTNAME= urt @@ -28,7 +28,7 @@ MAKEFILE= makefile ALL_TARGET= post-install: - ${MKDIR} ${PREFIX}/share/doc/urt ${PREFIX}/share/examples/urt + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/urt ${PREFIX}/share/examples/urt cd ${PREFIX}/share/doc/urt && (\ ${GTAR} xf ${DISTDIR}/urt-doc.tar; \ cd doc; \ diff --git a/graphics/xplot/Makefile b/graphics/xplot/Makefile index 31d33107d1f..9a777f70d09 100644 --- a/graphics/xplot/Makefile +++ b/graphics/xplot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/02/16 15:22:37 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2001/02/25 04:17:53 hubertf Exp $ # DISTNAME= xplot-0.90 @@ -15,7 +15,7 @@ DOCFILES= ANNOUNCE README README.tcp_plots demo.0 demo.1 demo.2 \ demo.3 demo.4 demo.5 demo.6 demo.7 post-install: - ${MKDIR} ${PREFIX}/share/doc/xplot + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xplot .for file in ${DOCFILES} ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/xplot .endfor diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile index 20407d0a220..98cf65ab0cb 100644 --- a/graphics/xv/Makefile +++ b/graphics/xv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2001/02/16 15:22:37 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2001/02/25 04:17:53 hubertf Exp $ # FreeBSD Id: Makefile,v 1.14 1997/07/03 07:37:08 asami Exp # @@ -41,7 +41,7 @@ pre-build: .endif post-install: - ${MKDIR} ${PREFIX}/share/doc/xv + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xv ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xv ${INSTALL_DATA} ${WRKSRC}/docs/xvdocs.ps ${PREFIX}/share/doc/xv diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile index 1d958a21da7..f67d52dde6e 100644 --- a/japanese/canna-server/Makefile +++ b/japanese/canna-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/02/16 15:25:12 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2001/02/25 04:17:53 hubertf Exp $ DISTNAME= Canna35b2 PKGNAME= Canna-server-3.5b2 @@ -65,7 +65,7 @@ post-build: post-install: @${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL @${INSTALL_SCRIPT} ${STARTUP_SCRIPT_SRC} ${PREFIX}/${STARTUP_SCRIPT} - @${MKDIR} ${CANNA_SPOOL} + @${INSTALL_DATA_DIR} ${CANNA_SPOOL} @${CHMOD} ${CANNA_MODE} ${CANNA_SPOOL} @${CHOWN} ${CANNAOWNER}:${CANNAGROUP} ${CANNA_SPOOL} diff --git a/japanese/chasen-base/Makefile b/japanese/chasen-base/Makefile index 3d381ee2ccf..1bcc30c15ef 100644 --- a/japanese/chasen-base/Makefile +++ b/japanese/chasen-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/23 15:03:45 taca Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:17:53 hubertf Exp $ # DISTNAME= chasen-${CHASEN_VERSION} @@ -16,7 +16,7 @@ USE_LIBTOOL= # defined LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig post-install: - ${MKDIR} ${LOCALBASE}/share/chasen/dic + ${INSTALL_DATA_DIR} ${LOCALBASE}/share/chasen/dic .include "Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/japanese/grep/Makefile b/japanese/grep/Makefile index 0fde41c4504..8876849091d 100644 --- a/japanese/grep/Makefile +++ b/japanese/grep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/16 15:25:16 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:17:53 hubertf Exp $ # FreeBSD Id: Makefile,v 1.10 1999/01/27 07:41:16 fenner Exp $ DISTNAME= grep-2.0 @@ -14,7 +14,7 @@ GNU_CONFIGURE= yes PATCH_STRIP= -p1 post-install: - ${MKDIR} ${PREFIX}/share/doc/ja-grep + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ja-grep ${INSTALL_DATA} ${WRKSRC}/README.MB ${PREFIX}/share/doc/ja-grep .include "../../mk/bsd.pkg.mk" diff --git a/japanese/micq/Makefile b/japanese/micq/Makefile index 721809fb8d0..64d83e39b64 100644 --- a/japanese/micq/Makefile +++ b/japanese/micq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/16 15:25:23 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2001/02/25 04:17:54 hubertf Exp $ DISTNAME= micq-0.4.3 PKGNAME= ja-${DISTNAME} @@ -21,7 +21,7 @@ BROKEN= ${PKGNAME} requires fixes for remote buffer overflow\ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/micq ${PREFIX}/bin/jmicq - ${MKDIR} ${PREFIX}/share/doc/ja-micq + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ja-micq ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ja-micq .include "../../mk/bsd.pkg.mk" diff --git a/japanese/namazu1/Makefile b/japanese/namazu1/Makefile index 573cb09844d..71ad011d7a6 100644 --- a/japanese/namazu1/Makefile +++ b/japanese/namazu1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/02/16 15:25:23 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2001/02/25 04:17:54 hubertf Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1999/03/31 11:52:07 flathill Exp $ DISTNAME= namazu-1.3.0.11 @@ -54,7 +54,7 @@ post-build: post-install: @cd ${WRKSRC}; ${MAKE} install_cgi @${INSTALL_SCRIPT} ${WRKDIR}/bnamazu ${LOCALBASE}/bin - @${TEST} -d ${LOCALBASE}/etc/namazu || ${MKDIR} ${LOCALBASE}/etc/namazu + @${TEST} -d ${LOCALBASE}/etc/namazu || ${INSTALL_DATA_DIR} ${LOCALBASE}/etc/namazu @${SH} ${WRKDIR}/INSTALL ${PKGNAME} POST-INSTALL .include "../../mk/bsd.pkg.mk" diff --git a/japanese/namazu2/Makefile b/japanese/namazu2/Makefile index 4ce41806e6d..fbe2e2f0697 100644 --- a/japanese/namazu2/Makefile +++ b/japanese/namazu2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/16 15:25:24 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/02/25 04:17:54 hubertf Exp $ # FreeBSD Id: ports/japanese/namazu2/Makefile,v 1.16 2000/10/26 20:56:25 knu Exp DISTNAME= namazu-2.0.5 @@ -47,7 +47,7 @@ post-build: done post-install: - @${TEST} -d ${LOCALBASE}/etc/namazu || ${MKDIR} ${LOCALBASE}/etc/namazu + @${TEST} -d ${LOCALBASE}/etc/namazu || ${INSTALL_DATA_DIR} ${LOCALBASE}/etc/namazu @${SH} ${WRKDIR}/INSTALL ${PKGNAME} POST-INSTALL .include "../../mk/bsd.pkg.mk" diff --git a/japanese/skkinput/Makefile b/japanese/skkinput/Makefile index d70f21ada13..6f3da0af027 100644 --- a/japanese/skkinput/Makefile +++ b/japanese/skkinput/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/02/16 15:25:30 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2001/02/25 04:17:54 hubertf Exp $ DISTNAME= skkinput-2.03 CATEGORIES= japanese @@ -25,7 +25,7 @@ post-build: post-install: ${INSTALL_MAN} ${WRKSRC}/skkinput.man ${PREFIX}/man/ja_JP.EUC/man1/skkinput.1 - ${MKDIR} ${PREFIX}/share/doc/skkinput + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/skkinput ${INSTALL_DATA} ${WRKSRC}/README.jis ${PREFIX}/share/doc/skkinput ${INSTALL_DATA} ${WRKSRC}/FAQ.jis ${PREFIX}/share/doc/skkinput ${INSTALL_DATA} ${WRKSRC}/BUGS.jis ${PREFIX}/share/doc/skkinput diff --git a/japanese/skkserv/Makefile b/japanese/skkserv/Makefile index 06362247dbb..a03b91dfabd 100644 --- a/japanese/skkserv/Makefile +++ b/japanese/skkserv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/16 15:25:31 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2001/02/25 04:17:54 hubertf Exp $ DISTNAME= skk9.6 PKGNAME= skkserv-3.9.4nb1 @@ -52,7 +52,7 @@ post-build: post-install: ${INSTALL_SCRIPT} ${WRKDIR}/skkserv.sh ${PREFIX}/etc/rc.d/skkserv - ${MKDIR} ${PREFIX}/share/skk + ${INSTALL_DATA_DIR} ${PREFIX}/share/skk ${INSTALL_DATA} ${WRKDIR}/SKK-JISYO.L ${PREFIX}/share/skk/SKK-JISYO.L ${INSTALL_DATA} ${WRKSRC}/skkserv/README ${PREFIX}/share/skk/README.skkserv ${INSTALL_DATA} ${WRKSRC}/jisyo-tools/README.1st ${PREFIX}/share/skk/README.1st.jisyo-tools diff --git a/japanese/vflib-lib/Makefile b/japanese/vflib-lib/Makefile index 490a6e043b0..35624b39141 100644 --- a/japanese/vflib-lib/Makefile +++ b/japanese/vflib-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/16 15:25:32 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:17:55 hubertf Exp $ PKGNAME= ja-vflib-lib-${VFLIB_VERSION} @@ -21,7 +21,7 @@ post-build: post-install: ${MV} ${PREFIX}/share/VFlib/${VFLIB_VERSION}/VF.h ${PREFIX}/include - ${MKDIR} ${PREFIX}/share/VFlib/${VFLIB_VERSION} + ${INSTALL_DATA_DIR} ${PREFIX}/share/VFlib/${VFLIB_VERSION} cd ${WRKSRC}; ${INSTALL_DATA} COPYING COPYING.LIB README.txt.JP_EUC \ ${PREFIX}/share/VFlib/${VFLIB_VERSION} cd ${WRKSRC}; ${PAX} -rw jTeX ${PREFIX}/share/VFlib/${VFLIB_VERSION} diff --git a/lang/baci/Makefile b/lang/baci/Makefile index 37d020e0099..b89e8b2ef31 100644 --- a/lang/baci/Makefile +++ b/lang/baci/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/17 09:06:58 agc Exp $ +# $NetBSD: Makefile,v 1.5 2001/02/25 04:17:55 hubertf Exp $ # DISTNAME= bacisrc @@ -27,8 +27,8 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/disasm/badis ${LOCALBASE}/bin ${INSTALL_PROGRAM} ${WRKSRC}/interp/bainterp ${LOCALBASE}/bin ${INSTALL_PROGRAM} ${WRKSRC}/pascomp/bapas ${LOCALBASE}/bin - ${MKDIR} ${LOCALBASE}/share/doc/baci - ${CP} ${WRKDIR}/bacidoc/* ${LOCALBASE}/share/doc/baci + ${INSTALL_DATA_DIR} ${LOCALBASE}/share/doc/baci + ${INSTALL_DATA} ${WRKDIR}/bacidoc/* ${LOCALBASE}/share/doc/baci ${CP} ${PKGDIR}/PLIST ${WRKDIR} .include "../../mk/bsd.pkg.mk" diff --git a/lang/brandybasic/Makefile b/lang/brandybasic/Makefile index 098bdec8ef3..ae176f7eee1 100644 --- a/lang/brandybasic/Makefile +++ b/lang/brandybasic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/17 09:06:59 agc Exp $ +# $NetBSD: Makefile,v 1.3 2001/02/25 04:17:55 hubertf Exp $ # DISTNAME= b105 @@ -19,8 +19,8 @@ EXAMPLEDIR= ${PREFIX}/share/examples/brandy MAKEFILE= makefile do-install: - ${MKDIR} ${DOCDIR} - ${MKDIR} ${EXAMPLEDIR} + ${INSTALL_DATA_DIR} ${DOCDIR} + ${INSTALL_DATA_DIR} ${EXAMPLEDIR} cd ${WRKSRC}/docs && ${GTAR} -cf - `ls |grep -v .orig` | (cd ${DOCDIR} && tar xf -) cd ${WRKSRC}/examples && ${GTAR} -cf - [a-z]* | (cd ${EXAMPLEDIR} && tar xf -) ${INSTALL_PROGRAM} ${WRKSRC}/brandy ${PREFIX}/bin/brandy diff --git a/lang/cint/Makefile b/lang/cint/Makefile index fbc35119287..946cea58ac2 100644 --- a/lang/cint/Makefile +++ b/lang/cint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/17 09:07:02 agc Exp $ +# $NetBSD: Makefile,v 1.7 2001/02/25 04:17:55 hubertf Exp $ DISTNAME= cint5.14 PKGNAME= cint-5.14.40 @@ -23,7 +23,7 @@ do-build: esac do-install: - ${MKDIR} ${PREFIX}/cint + ${INSTALL_DATA_DIR} ${PREFIX}/cint ${INSTALL_PROGRAM} ${WRKDIR}/cint ${PREFIX}/cint ${INSTALL_PROGRAM} ${WRKDIR}/makecint ${PREFIX}/cint ${SED} "s;XXXPREFIXXXX;${PREFIX};g" <${FILESDIR}/cint.sh >${PREFIX}/bin/cint @@ -32,7 +32,7 @@ do-install: ${INSTALL_DATA} ${WRKDIR}/MAKEINFO ${PREFIX}/cint ${CP} -r ${WRKDIR}/include ${WRKDIR}/stl ${PREFIX}/cint ${RM} ${PREFIX}/cint/include/Makeit ${PREFIX}/cint/include/make* - ${MKDIR} ${PREFIX}/cint/lib + ${INSTALL_DATA_DIR} ${PREFIX}/cint/lib ${CP} -r ${WRKDIR}/lib/prec_stl ${PREFIX}/cint/lib ${INSTALL_DATA} ${WRKDIR}/G__ci.h ${PREFIX}/cint diff --git a/lang/gforth/Makefile b/lang/gforth/Makefile index 2ce575a1169..62e61e2dfd5 100644 --- a/lang/gforth/Makefile +++ b/lang/gforth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/02/17 09:07:09 agc Exp $ +# $NetBSD: Makefile,v 1.9 2001/02/25 04:17:55 hubertf Exp $ DISTNAME= gforth-0.5.0 CATEGORIES= lang @@ -26,6 +26,6 @@ post-build: ${SED} -e "s/@KERNEL_FI@/$$k/g" <${PKGDIR}/PLIST >${PLIST_SRC} pre-install: - ${MKDIR} ${PREFIX}/share/emacs/site-lisp + ${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp .include "../../mk/bsd.pkg.mk" diff --git a/lang/minischeme/Makefile b/lang/minischeme/Makefile index e23ab691cdc..d5d4bfdae17 100644 --- a/lang/minischeme/Makefile +++ b/lang/minischeme/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/17 09:07:20 agc Exp $ +# $NetBSD: Makefile,v 1.3 2001/02/25 04:17:56 hubertf Exp $ DISTNAME= minischeme PKGNAME= minischeme-0.85 @@ -13,7 +13,7 @@ post-extract: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/miniscm ${PREFIX}/bin - ${MKDIR} ${PREFIX}/share/minischeme + ${INSTALL_DATA_DIR} ${PREFIX}/share/minischeme for i in init.scm nextleaf.scm tools.scm; do \ ${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/minischeme; \ done diff --git a/lang/moscow_ml/Makefile b/lang/moscow_ml/Makefile index 6b9e3e6e62a..86a33bc71e5 100644 --- a/lang/moscow_ml/Makefile +++ b/lang/moscow_ml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/02/17 09:07:20 agc Exp $ +# $NetBSD: Makefile,v 1.14 2001/02/25 04:17:56 hubertf Exp $ DISTNAME= mos20src PKGNAME= moscow_ml-2.00 @@ -16,7 +16,7 @@ BUILD_DEPENDS+= ${PERL5}:../../lang/perl5-base ALL_TARGET= clean world post-install: - ${MKDIR} ${PREFIX}/share/examples/moscow_ml + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/moscow_ml ${CP} -R ${WRKDIR}/mosml/examples/* ${PREFIX}/share/examples/moscow_ml ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/examples/moscow_ml ${CHMOD} -R ugo+r ${PREFIX}/share/examples/moscow_ml diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile index 8292048ecd0..c5865eca4de 100644 --- a/lang/ruby/Makefile +++ b/lang/ruby/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2001/02/17 09:07:27 agc Exp $ +# $NetBSD: Makefile,v 1.19 2001/02/25 04:17:56 hubertf Exp $ # DISTNAME= ruby-1.4.6 @@ -40,9 +40,9 @@ post-patch: post-install: strip ${PREFIX}/bin/ruby - ${MKDIR} ${PREFIX}/share/examples/ruby + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ruby ${INSTALL_DATA} ${WRKSRC}/sample/* ${PREFIX}/share/examples/ruby - ${MKDIR} ${PREFIX}/share/examples/ruby/misc + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ruby/misc ${INSTALL_DATA} ${WRKSRC}/misc/* ${PREFIX}/share/examples/ruby/misc .include "../../mk/bsd.pkg.mk" diff --git a/lang/sml-nj/Makefile b/lang/sml-nj/Makefile index da03f0a76e7..8c0f041c232 100644 --- a/lang/sml-nj/Makefile +++ b/lang/sml-nj/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/17 09:07:30 agc Exp $ +# $NetBSD: Makefile,v 1.7 2001/02/25 04:17:56 hubertf Exp $ # FreeBSD Id: ports/lang/sml-nj/Makefile,v 1.9 1999/08/25 06:35:27 obrien Exp DISTNAME= ${SML_VERSION}-bin.${BOX}-unix @@ -74,7 +74,7 @@ do-build: # 6. copy the aliases in ./lib changing WRKDIR to SML_LIBDIR # 7. install links to executables in $PREFIX/bin do-install: - ${MKDIR} ${SML_BASE} ${SML_BINDIR} ${SML_LIBDIR} + ${INSTALL_DATA_DIR} ${SML_BASE} ${SML_BINDIR} ${SML_LIBDIR} ${GTAR} -C ${WRKDIR} -cf - bin | ${GTAR} -C ${SML_BASE} -xf - ${RM} -f ${SML_BINDIR}/.run-sml ${SED} -e "s,^BIN_DIR=.*\$$,BIN_DIR=${SML_BINDIR}," \ diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile index 1e3b83233fc..cc9e88f4314 100644 --- a/lang/squeak/Makefile +++ b/lang/squeak/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/02/17 09:07:31 agc Exp $ +# $NetBSD: Makefile,v 1.11 2001/02/25 04:17:56 hubertf Exp $ # DISTNAME= Squeak2.7-src @@ -27,7 +27,7 @@ pre-configure: cd ${WRKSRC}/conf; ${LOCALBASE}/bin/autoconf do-install: - ${MKDIR} ${PREFIX}/share/squeak + ${INSTALL_DATA_DIR} ${PREFIX}/share/squeak ${INSTALL_PROGRAM} ${WRKSRC}/`${WRKSRC}/conf/config.guess`/squeak ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/ReadMe.txt ${PREFIX}/share/squeak for f in Squeak2.7.changes Squeak2.7.image SqueakV2.sources ; do \ diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile index b7b9de816e9..7772f700901 100644 --- a/lang/tcl/Makefile +++ b/lang/tcl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/17 09:07:34 agc Exp $ +# $NetBSD: Makefile,v 1.7 2001/02/25 04:17:56 hubertf Exp $ # DISTNAME= tcl8.3.2 @@ -24,9 +24,9 @@ INSTALL_TARGET= install post-install: cd ${PREFIX}/bin && ${LN} -s tclsh8.3 tclsh - ${MKDIR} ${PREFIX}/include/tcl - ${MKDIR} ${PREFIX}/include/tcl/unix - ${MKDIR} ${PREFIX}/include/tcl/generic + ${INSTALL_DATA_DIR} ${PREFIX}/include/tcl + ${INSTALL_DATA_DIR} ${PREFIX}/include/tcl/unix + ${INSTALL_DATA_DIR} ${PREFIX}/include/tcl/generic ${INSTALL_DATA} ${WRKSRC}/tclUnixPort.h ${PREFIX}/include/tcl/unix ${INSTALL_DATA} ${WRKSRC}/../generic/tcl.h ${PREFIX}/include/tcl/generic ${INSTALL_DATA} ${WRKSRC}/../generic/tclCompile.h ${PREFIX}/include/tcl/generic diff --git a/lang/umb-scheme/Makefile b/lang/umb-scheme/Makefile index cfa1b090dd1..54a49854a15 100644 --- a/lang/umb-scheme/Makefile +++ b/lang/umb-scheme/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/17 09:07:37 agc Exp $ +# $NetBSD: Makefile,v 1.3 2001/02/25 04:17:57 hubertf Exp $ DISTNAME= umb-scheme-2.12 CATEGORIES= lang @@ -18,7 +18,7 @@ post-patch: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/scheme ${PREFIX}/bin - ${MKDIR} ${PREFIX}/lib/umb-scheme + ${INSTALL_DATA_DIR} ${PREFIX}/lib/umb-scheme ${INSTALL_DATA} ${WRKSRC}/prelude.scheme ${PREFIX}/lib/umb-scheme ${INSTALL_MAN} ${WRKSRC}/scheme.1 ${PREFIX}/man/man1 diff --git a/lang/vscm/Makefile b/lang/vscm/Makefile index c2d583132fa..44eba8961cb 100644 --- a/lang/vscm/Makefile +++ b/lang/vscm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/17 09:07:38 agc Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:17:57 hubertf Exp $ DISTNAME= vscmV0r4 PKGNAME= vscm-0.4 @@ -19,7 +19,7 @@ post-patch: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/scheme ${PREFIX}/bin - ${MKDIR} ${PREFIX}/lib/vscm + ${INSTALL_DATA_DIR} ${PREFIX}/lib/vscm ${INSTALL_DATA} ${WRKSRC}/.scheme-boot ${PREFIX}/lib/vscm/scheme-boot ${MKDIR} ${PREFIX}/share/examples/vscm for i in README INSTALL DESCRIPTION; do \ diff --git a/mail/exim/Makefile b/mail/exim/Makefile index bbe6e5b903f..3ef47d40eac 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2001/02/17 18:24:45 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2001/02/25 04:17:58 hubertf Exp $ DISTNAME= exim-3.20 CATEGORIES= mail net @@ -23,8 +23,8 @@ pre-configure: > ${WRKSRC}/Local/Makefile pre-install: - ${MKDIR} ${PREFIX}/etc/exim - ${MKDIR} /var/log/exim + ${INSTALL_DATA_DIR} ${PREFIX}/etc/exim + ${INSTALL_DATA_DIR} /var/log/exim ${CHMOD} 750 /var/log/exim strip ${WRKSRC}/build*/exim strip ${WRKSRC}/build*/exim_dbmbuild @@ -34,7 +34,6 @@ pre-install: strip ${WRKSRC}/build*/exim_lock post-install: - ${MKDIR} ${PREFIX}/etc/rc.d ${SED} -e 's:@PREFIX@:${PREFIX}:' \ < ${FILESDIR}/exim.sh \ > ${PREFIX}/etc/rc.d/exim @@ -45,9 +44,8 @@ post-install: ${SED} -e 's:@PREFIX@:${PREFIX}:' \ < ${FILESDIR}/mailer.conf.exim \ > ${PREFIX}/etc/exim/mailer.conf.exim - ${MKDIR} ${PREFIX}/man/man8 ${CP} ${FILESDIR}/exim.8 ${PREFIX}/man/man8/exim.8 - ${MKDIR} ${PREFIX}/share/doc/exim + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/exim ${RM} ${WRKDIR}/exim-html-3.20/doc/html/spec ${CP} -R ${WRKDIR}/exim-html-3.20/doc/html/* ${PREFIX}/share/doc/exim diff --git a/mail/mailagent/Makefile b/mail/mailagent/Makefile index dcb273a5ad9..f935c2bed4f 100644 --- a/mail/mailagent/Makefile +++ b/mail/mailagent/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/02/17 18:24:50 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2001/02/25 04:17:58 hubertf Exp $ # FreeBSD: ports/mail/mailagent/Makefile,v 1.28 1999/08/31 06:47:24 mharo Exp # @@ -35,8 +35,8 @@ pre-extract: ${FALSE}; fi post-install: - @${MKDIR} ${PREFIX}/share/examples/mailagent - @${MKDIR} ${PREFIX}/share/examples/mailagent/misc + @${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mailagent + @${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mailagent/misc ${CP} -pR ${WRKSRC}/misc/* ${PREFIX}/share/examples/mailagent/misc @${LN} -fs ${PREFIX}/lib/mailagent/examples \ ${PREFIX}/share/examples/mailagent/agent diff --git a/mail/mailwrapper/Makefile b/mail/mailwrapper/Makefile index c7f52148254..7c750b732dd 100644 --- a/mail/mailwrapper/Makefile +++ b/mail/mailwrapper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/02/17 18:24:52 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2001/02/25 04:17:58 hubertf Exp $ DISTNAME= mailwrapper-19990412 CATEGORIES= mail @@ -26,7 +26,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/mailer.conf ${PREFIX}/etc/mailer.conf.default ${TEST} -e ${MAILER_CONF} || \ ${LN} -s ${PREFIX}/etc/mailer.conf.default /etc/mailer.conf - ${MKDIR} ${LIBEXECDIR} + ${INSTALL_DATA_DIR} ${LIBEXECDIR} ${MV} -i ${SENDMAIL} ${LIBEXECDIR} </dev/null 2>/dev/null || ${TRUE} ${LN} -fs ${PREFIX}/sbin/mailwrapper /usr/bin/mailq ${LN} -fs ${PREFIX}/sbin/mailwrapper /usr/bin/newaliases diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index e717c6960dd..ba700bf9d9c 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/02/17 18:25:01 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2001/02/25 04:17:58 hubertf Exp $ DISTNAME= snapshot-20010204 PKGNAME= postfix-20010204 @@ -56,7 +56,7 @@ post-build: <${FILESDIR}/mailer.conf >${WRKDIR}/mailer.conf.postfix pre-install: - ${MKDIR} /etc/postfix ${PREFIX}/share/postfix \ + ${INSTALL_DATA_DIR} /etc/postfix ${PREFIX}/share/postfix \ ${PREFIX}/share/doc/postfix ${PREFIX}/libexec/postfix ${CHOWN} root:wheel ${PREFIX}/share/postfix ${PREFIX}/libexec/postfix ${CHMOD} 755 ${PREFIX}/share/postfix ${PREFIX}/libexec/postfix @@ -65,7 +65,7 @@ pre-install: post-install: ${INSTALL_DATA} ${WRKDIR}/mailer.conf.postfix ${PREFIX}/etc ${LN} -sf ${PREFIX}/share/postfix/postfix-script /etc/postfix - -${MKDIR} ${POSTFIX_SPOOL} + -${INSTALL_DATA_DIR} ${POSTFIX_SPOOL} ${CHMOD} 755 ${POSTFIX_SPOOL} ${TEST} -f /etc/postfix/main.cf || \ ${INSTALL_DATA} ${PREFIX}/share/postfix/main.cf /etc/postfix diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 511b9a1a607..70494158876 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2001/02/17 18:25:00 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2001/02/25 04:17:59 hubertf Exp $ DISTNAME= postfix-19991231-pl13 PKGNAME= postfix-19991231pl13 @@ -61,7 +61,7 @@ post-build: <${FILESDIR}/mailer.conf >${WRKDIR}/mailer.conf.postfix pre-install: - ${MKDIR} /etc/postfix ${PREFIX}/share/postfix \ + ${INSTALL_DATA_DIR} /etc/postfix ${PREFIX}/share/postfix \ ${PREFIX}/share/doc/postfix ${PREFIX}/libexec/postfix ${CHOWN} root:wheel ${PREFIX}/share/postfix ${PREFIX}/libexec/postfix ${CHMOD} 755 ${PREFIX}/share/postfix ${PREFIX}/libexec/postfix @@ -69,7 +69,7 @@ pre-install: post-install: ${INSTALL_DATA} ${WRKDIR}/mailer.conf.postfix ${PREFIX}/etc ${LN} -sf ${PREFIX}/share/postfix/postfix-script /etc/postfix - -${MKDIR} ${POSTFIX_SPOOL} + -${INSTALL_DATA_DIR} ${POSTFIX_SPOOL} ${CHMOD} 755 ${POSTFIX_SPOOL} ${TEST} -f /etc/postfix/main.cf || ${INSTALL_DATA} ${PREFIX}/share/postfix/main.cf /etc/postfix ${TEST} -f /etc/postfix/master.cf || ${INSTALL_DATA} ${PREFIX}/share/postfix/master.cf /etc/postfix diff --git a/mail/rblcheck/Makefile b/mail/rblcheck/Makefile index 9c26e310b6e..61cb3af21c1 100644 --- a/mail/rblcheck/Makefile +++ b/mail/rblcheck/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/02/17 18:25:03 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2001/02/25 04:17:59 hubertf Exp $ # FreeBSD: ports/mail/rblcheck/Makefile,v 1.6 1999/08/25 06:50:47 obrien Exp # @@ -17,7 +17,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/rblcheck ${PREFIX}/bin .if !defined(NOPORTDOCS) dst=${PREFIX}/share/doc/rblcheck; \ - ${MKDIR} $$dst; \ + ${INSTALL_DATA_DIR} $$dst; \ for i in ${DOCS}; do \ ${INSTALL_DATA} ${WRKSRC}/docs/$$i $$dst; \ done diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index cde731183a9..bdcffa8a4d6 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2001/02/17 18:25:04 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2001/02/25 04:17:59 hubertf Exp $ DISTNAME= sendmail.8.11.2 PKGNAME= sendmail-8.11.2 @@ -98,7 +98,7 @@ post-build: .endif pre-install: - ${MKDIR} ${PREFIX}/libexec/sendmail + ${INSTALL_DATA_DIR} ${PREFIX}/libexec/sendmail post-install: ${INSTALL_DATA} ${WRKDIR}/mailer.conf.sendmail ${PREFIX}/etc diff --git a/mail/sendmail88/Makefile b/mail/sendmail88/Makefile index f3d9ae30501..b4c7b26ac2a 100644 --- a/mail/sendmail88/Makefile +++ b/mail/sendmail88/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/17 18:25:05 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:17:59 hubertf Exp $ DISTNAME= sendmail.8.8.8 PKGNAME= sendmail-8.8.8 @@ -123,7 +123,7 @@ do-configure: done pre-install: - ${MKDIR} ${PREFIX}/libexec/sendmail ${M4DIR} ${M4DIR}/cf \ + ${INSTALL_DATA_DIR} ${PREFIX}/libexec/sendmail ${M4DIR} ${M4DIR}/cf \ ${M4DIR}/domain ${M4DIR}/feature ${M4DIR}/hack ${M4DIR}/m4 \ ${M4DIR}/mailer ${M4DIR}/ostype ${M4DIR}/siteconfig \ ${M4DIR}/mailer ${M4DIR}/sh diff --git a/mail/smtpfeed/Makefile b/mail/smtpfeed/Makefile index c59f44287f5..56d5131ca29 100644 --- a/mail/smtpfeed/Makefile +++ b/mail/smtpfeed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/02/17 18:25:05 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2001/02/25 04:17:59 hubertf Exp $ # Based on FreeBSD Id: Makefile,v 1.27 1999/04/03 08:25:18 itojun Exp # @@ -37,7 +37,7 @@ CONFIGURE_ARGS+=--enable-ipv6 post-install: .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCDIR} + ${INSTALL_DATA_DIR} ${DOCDIR} for i in ${DOCS}; do \ ${INSTALL_DATA} ${WRKSRC}/$$i ${DOCDIR}; \ done diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile index 97bd6c8c984..fdd0a8b2f06 100644 --- a/mail/xfmail/Makefile +++ b/mail/xfmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/02/17 18:25:10 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2001/02/25 04:18:00 hubertf Exp $ # DISTNAME= xfmail-1.3 @@ -24,7 +24,7 @@ USE_XPM= YES GNU_CONFIGURE= YES post-install: - ${MKDIR} ${PREFIX}/share/doc/xfmail + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xfmail ${INSTALL_DATA} ${WRKSRC}/Copyright ${PREFIX}/share/doc/xfmail .include "../../mk/bsd.pkg.mk" diff --git a/math/abacus/Makefile b/math/abacus/Makefile index 580e587049b..b02b4ca485e 100644 --- a/math/abacus/Makefile +++ b/math/abacus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/02/17 18:22:11 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2001/02/25 04:18:00 hubertf Exp $ # FreeBSD Id: Makefile,v 1.3 1998/09/25 10:07:44 asami Exp # @@ -32,21 +32,21 @@ pre-patch: do-install: @ ${SED} s!@PREFIX@!${PREFIX}!g ${WRKSRC}/abacus >${WRKSRC}/abacus.sh @ ${INSTALL_SCRIPT} ${WRKSRC}/abacus.sh ${PREFIX}/bin/abacus - @ ${MKDIR} ${PREFIX}/share/abacus - @ ${MKDIR} ${PREFIX}/share/abacus/display + @ ${INSTALL_DATA_DIR} ${PREFIX}/share/abacus + @ ${INSTALL_DATA_DIR} ${PREFIX}/share/abacus/display @ ${INSTALL_DATA} ${WRKSRC}/display/*.tcl ${PREFIX}/share/abacus/display - @ ${MKDIR} ${PREFIX}/share/abacus/graphics + @ ${INSTALL_DATA_DIR} ${PREFIX}/share/abacus/graphics @ ${INSTALL_DATA} ${WRKSRC}/graphics/*.tcl ${PREFIX}/share/abacus/graphics - @ ${MKDIR} ${PREFIX}/share/abacus/runlib + @ ${INSTALL_DATA_DIR} ${PREFIX}/share/abacus/runlib @ ${INSTALL_DATA} ${WRKSRC}/runlib/*.tcl ${PREFIX}/share/abacus/runlib @ ${INSTALL_DATA} ${WRKSRC}/runlib/version ${PREFIX}/share/abacus/runlib - @ ${MKDIR} ${PREFIX}/share/abacus/runlib/bitmaps + @ ${INSTALL_DATA_DIR} ${PREFIX}/share/abacus/runlib/bitmaps @ ${INSTALL_DATA} ${WRKSRC}/runlib/bitmaps/* ${PREFIX}/share/abacus/runlib/bitmaps - @ ${MKDIR} ${PREFIX}/share/abacus/tcl_interf + @ ${INSTALL_DATA_DIR} ${PREFIX}/share/abacus/tcl_interf @ ${INSTALL_PROGRAM} ${WRKSRC}/tcl_interf/nxlc ${PREFIX}/share/abacus/tcl_interf - @ ${MKDIR} ${PREFIX}/share/examples/abacus + @ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/abacus @ ${INSTALL_DATA} ${WRKSRC}/regressive/* ${PREFIX}/share/examples/abacus - @ ${MKDIR} ${PREFIX}/share/doc/abacus + @ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/abacus @ ${INSTALL_DATA} ${WRKSRC}/doc/abacus.ps ${PREFIX}/share/doc/abacus @ ${INSTALL_DATA} ${WRKSRC}/doc/abacus.1 ${PREFIX}/man/man1 diff --git a/math/octave/Makefile b/math/octave/Makefile index 95af792ad6a..df98cefe24d 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2001/02/17 18:22:32 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2001/02/25 04:18:01 hubertf Exp $ # FreeBSD Id: Makefile,v 1.18 1998/09/27 20:10:45 steve Exp DISTNAME= octave-2.0.16 @@ -29,7 +29,7 @@ INFO_FILES= liboctave.info octave.info LIBOCTAVE_INFO= liboctave.info liboctave.info-1 liboctave.info-2 liboctave.info-3 post-install: - ${MKDIR} ${PREFIX}/share/octave/2.0.16/doc + ${INSTALL_DATA_DIR} ${PREFIX}/share/octave/2.0.16/doc .for file in ${LIBOCTAVE_INFO} ${INSTALL_DATA} ${WRKSRC}/doc/liboctave/${file} ${PREFIX}/info .endfor diff --git a/math/xldlas/Makefile b/math/xldlas/Makefile index 149d253f07c..456ead307aa 100644 --- a/math/xldlas/Makefile +++ b/math/xldlas/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/02/17 18:22:47 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2001/02/25 04:18:01 hubertf Exp $ # FreeBSD Id: Makefile,v 1.5 1998/09/26 23:18:07 steve Exp # @@ -23,7 +23,7 @@ USE_X11BASE= yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xldlas ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/xldlas.1 ${PREFIX}/man/man1 - ${MKDIR} ${PREFIX}/share/xldlas + ${INSTALL_DATA_DIR} ${PREFIX}/share/xldlas ${CP} -R ${WRKSRC}/help ${PREFIX}/share/xldlas .include "../../mk/bsd.pkg.mk" diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile index 477a61ba0a2..18c6f2c788a 100644 --- a/misc/astrolog/Makefile +++ b/misc/astrolog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/02/17 18:08:51 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2001/02/25 04:18:01 hubertf Exp $ # FreeBSD Id: Makefile,v 1.12 1997/08/10 22:31:15 fenner Exp # @@ -24,7 +24,7 @@ ALL_TARGET= astrolog NO_WRKSUBDIR= yes do-install: - -@${MKDIR} ${PREFIX}/lib/astrolog + -@${INSTALL_DATA_DIR} ${PREFIX}/lib/astrolog cd ${DISTDIR}/${DIST_SUBDIR} && \ ${INSTALL_DATA} ${EPHEM} ${PREFIX}/lib/astrolog cd ${WRKSRC} && \ @@ -34,7 +34,7 @@ do-install: ${INSTALL_DATA} astrolog.dat ${PREFIX}/lib/astrolog; \ fi cd ${WRKSRC} && ${INSTALL_PROGRAM} astrolog ${PREFIX}/bin - -@${MKDIR} ${PREFIX}/share/doc/astrolog + -@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/astrolog cd ${WRKSRC} && \ ${INSTALL_DATA} Helpfile.530 ${PREFIX}/share/doc/astrolog cd ${WRKSRC} && \ diff --git a/misc/dotfile/Makefile b/misc/dotfile/Makefile index ff99270f85d..d8d5365e863 100644 --- a/misc/dotfile/Makefile +++ b/misc/dotfile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/02/17 18:08:58 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2001/02/25 04:18:01 hubertf Exp $ # FreeBSD Id: Makefile,v 1.5 1997/04/20 13:19:30 wosch Exp # @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes NO_BUILD= post-install: - ${MKDIR} ${PREFIX}/share/doc/${PKGNAME} + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PKGNAME} cd ${WRKSRC}/Doc && ${GTAR} cf - . | ( cd ${PREFIX}/share/doc/${PKGNAME} && ${GTAR} xf - ) ${CHOWN} -R root:${ROOT_GROUP} ${PREFIX}/share/doc/${PKGNAME} diff --git a/misc/fd/Makefile b/misc/fd/Makefile index 9bbd517e5c8..a5024c4b3a1 100644 --- a/misc/fd/Makefile +++ b/misc/fd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/02/17 18:09:01 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2001/02/25 04:18:01 hubertf Exp $ # FreeBSD: ports/misc/fd/Makefile,v 1.14 1999/08/25 07:21:37 obrien Exp # @@ -21,7 +21,7 @@ do-configure: ${SED} 's/\(distributor = \)NULL/\1"${MAINTAINER}"/' $$v.orig > $$v post-install: - @${MKDIR} ${PREFIX}/share/doc/fd + @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fd @for i in ${DOCS}; do \ ${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/fd; \ done diff --git a/misc/git/Makefile b/misc/git/Makefile index 4af88b45faf..6d015aa5104 100644 --- a/misc/git/Makefile +++ b/misc/git/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/02/17 18:09:03 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2001/02/25 04:18:02 hubertf Exp $ # FreeBSD Id: Makefile,v 1.8 1996/11/21 11:54:39 asami Exp # @@ -20,7 +20,7 @@ pre-install: (cd ${WRKSRC}/term ; ${PATCH} --quiet -p0 <${FILESDIR}/gitrc.cons25.patch ) post-install: - ${MKDIR} ${PREFIX}/share/doc + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc ${MV} ${PREFIX}/lib/git/html ${PREFIX}/share/doc/git .include "../../mk/bsd.pkg.mk" diff --git a/misc/jitterbug/Makefile b/misc/jitterbug/Makefile index 8d8b1a7e442..350f91fb5a1 100644 --- a/misc/jitterbug/Makefile +++ b/misc/jitterbug/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/02/17 18:09:08 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2001/02/25 04:18:02 hubertf Exp $ DISTNAME= jitterbug-1.6.2 WRKSRC= ${WRKDIR}/${PKGNAME}/source @@ -170,8 +170,8 @@ pre-install: ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL do-install: - ${MKDIR} ${PREFIX}/${JB_CONFIGDIR} - -${MKDIR} ${PREFIX}/${JB_DATADIR} + ${INSTALL_DATA_DIR} ${PREFIX}/${JB_CONFIGDIR} + -${INSTALL_DATA_DIR} ${PREFIX}/${JB_DATADIR} ${INSTALL} -c -o ${JB_USER} -g ${JB_GROUP} -m 644 \ ${CONFIGDIR}/footer.html ${PREFIX}/${JB_CONFIGDIR} [ -f ${PREFIX}/${JB_DATADIR}/footer.html ] || \ @@ -202,23 +202,23 @@ do-install: [ -f ${PREFIX}/${JB_DATADIR}/users ] || \ ${INSTALL} -c -o ${JB_USER} -g ${JB_GROUP} -m 644 \ ${CONFIGDIR}/users ${PREFIX}/${JB_DATADIR} - -${MKDIR} ${PREFIX}/${CGIBINDIR} + -${INSTALL_PROGRAM_DIR} ${PREFIX}/${CGIBINDIR} ${INSTALL} -c -o root -g nobody -m 4710 \ ${WRKSRC}/jitterbug ${PREFIX}/${CGIBINDIR}/${JB_PACKAGE} ${LN} -f ${PREFIX}/${CGIBINDIR}/${JB_PACKAGE} ${PREFIX}/${CGIBINDIR}/${JB_PACKAGE}.private ${CHOWN} root ${PREFIX}/${CGIBINDIR}/${JB_PACKAGE}.private ${CHGRP} nobody ${PREFIX}/${CGIBINDIR}/${JB_PACKAGE}.private ${CHMOD} 4710 ${PREFIX}/${CGIBINDIR}/${JB_PACKAGE}.private - ${MKDIR} ${PREFIX}/${JB_USER}/bin + ${INSTALL_PROGRAM_DIR} ${PREFIX}/${JB_USER}/bin ${INSTALL} -c -o ${JB_USER} -g ${JB_GROUP} -m 755 \ ${WRKSRC}/new_message ${PREFIX}/${JB_USER}/bin ${INSTALL} -c -o ${JB_USER} -g ${JB_GROUP} -m 644 \ ${WRKSRC}/jitterbug ${PREFIX}/${JB_USER}/bin - ${MKDIR} ${PREFIX}/${JB_USER}/etc + ${INSTALL_DATA_DIR} ${PREFIX}/${JB_USER}/etc [ -f ${PREFIX}/${JB_USER}/etc ] || \ ${INSTALL} -c -o ${JB_USER} -g ${JB_GROUP} -m 755 \ ${WRKDIR}/jitterbug.auth ${PREFIX}/${JB_USER}/etc - ${MKDIR} ${PREFIX}/${JB_USER}/doc + ${INSTALL_DATA_DIR} ${PREFIX}/${JB_USER}/doc ${INSTALL} -c -o ${JB_USER} -g ${JB_GROUP} -m 644 \ ${MESSAGE} ${PREFIX}/${JB_USER}/doc/POSTINSTALL ${INSTALL} -c -o ${JB_USER} -g ${JB_GROUP} -m 644 \ @@ -239,7 +239,7 @@ do-install: >${PREFIX}/${JB_CONFIGDIR}/jitterbug.config ${CHOWN} -R ${JB_USER} ${PREFIX}/${JB_USER} ${CHGRP} -R ${JB_GROUP} ${PREFIX}/${JB_USER} - -${MKDIR} ${PREFIX}/etc/jitterbug + -${INSTALL_DATA_DIR} ${PREFIX}/etc/jitterbug [ -f ${PREFIX}/etc/jitterbug/${JB_PACKAGE} ] || \ ${INSTALL} -c -o ${JB_USER} -g ${JB_GROUP} -m 644 \ ${PREFIX}/${JB_CONFIGDIR}/jitterbug.config \ diff --git a/misc/root/Makefile b/misc/root/Makefile index bfdcb65318c..06756e42eaf 100644 --- a/misc/root/Makefile +++ b/misc/root/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/02/17 18:09:21 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2001/02/25 04:18:02 hubertf Exp $ DISTNAME= root_v2.23.08.source PKGNAME= root-2.23 @@ -20,14 +20,14 @@ MAKE_ENV= LD_LIBRARY_PATH=${WRKDIR}/lib ROOTSYS=${WRKDIR} do-configure: ${CP} ${FILESDIR}/Makefile.netbsd ${WRKDIR}/src - ${MKDIR} ${WRKDIR}/bin - ${MKDIR} ${WRKDIR}/lib - ${CP} ${PREFIX}/cint/MAKEINFO ${WRKDIR}/cint - ${CP} ${PREFIX}/cint/include/iosenum.h ${WRKDIR}/cint/include + ${INSTALL_PROGRAM_DIR} ${WRKDIR}/bin + ${INSTALL_DATA_DIR} ${WRKDIR}/lib + ${INSTALL_DATA} ${PREFIX}/cint/MAKEINFO ${WRKDIR}/cint + ${INSTALL_DATA} ${PREFIX}/cint/include/iosenum.h ${WRKDIR}/cint/include do-install: - ${MKDIR} ${PREFIX}/root - ${MKDIR} ${PREFIX}/root/include + ${INSTALL_DATA_DIR} ${PREFIX}/root + ${INSTALL_DATA_DIR} ${PREFIX}/root/include (cd ${WRKDIR}/src; ${CP} *.h MAIN_rmain.cxx ${PREFIX}/root/include) (cd ${WRKDIR}; tar cf - lib bin cint)|(cd ${PREFIX}/root;tar xf -) ${SED} "s;XXXPREFIXXXX;${PREFIX};g" <${FILESDIR}/root.sh >${PREFIX}/bin/root diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile index d9bf92a9be2..db5f2682d32 100644 --- a/misc/rpm/Makefile +++ b/misc/rpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2001/02/17 18:09:22 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2001/02/25 04:18:02 hubertf Exp $ # DISTNAME= rpm-2.5.4 @@ -17,7 +17,7 @@ USE_GMAKE= yes USE_LIBINTL= yes pre-install: - ${MKDIR} ${PREFIX}/include/rpm + ${INSTALL_DATA_DIR} ${PREFIX}/include/rpm post-install: ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL diff --git a/misc/sci/Makefile b/misc/sci/Makefile index 1ad56d3549e..65fd564d0bd 100644 --- a/misc/sci/Makefile +++ b/misc/sci/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/02/17 18:09:23 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2001/02/25 04:18:02 hubertf Exp $ # DISTNAME= sci-0.5.6 @@ -12,7 +12,7 @@ COMMENT= Curses based data entry via templates GNU_CONFIGURE= # Yupp post-install: - ${MKDIR} ${PREFIX}/share/doc/sci ${PREFIX}/share/examples/sci + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sci ${PREFIX}/share/examples/sci for i in COPYING README INSTALL NEWS ; do \ ${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/sci ; \ done diff --git a/misc/screen/Makefile b/misc/screen/Makefile index 2561693590f..011f5229bbe 100644 --- a/misc/screen/Makefile +++ b/misc/screen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2001/02/17 18:09:23 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2001/02/25 04:18:03 hubertf Exp $ # FreeBSD Id: Makefile,v 1.17 1997/06/16 06:39:51 max Exp # @@ -16,7 +16,7 @@ INFO_FILES= screen.info PLIST_SUBST= DISTNAME=${DISTNAME} post-install: - @${MKDIR} ${PREFIX}/share/examples/screen + @${INSTALL_DATA_DIR} ${PREFIX}/share/examples/screen ${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc ${PREFIX}/share/examples/screen/screenrc .include "../../mk/bsd.pkg.mk" diff --git a/misc/zorro/Makefile b/misc/zorro/Makefile index a718862e4cf..00460694e96 100644 --- a/misc/zorro/Makefile +++ b/misc/zorro/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/02/17 18:09:31 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2001/02/25 04:18:03 hubertf Exp $ # FreeBSD Id: Makefile,v 1.9 1997/11/22 19:55:25 jseger Exp # @@ -21,7 +21,7 @@ post-patch: do-install: ${INSTALL_SCRIPT} ${WRKSRC}/zorro ${PREFIX}/bin/zorro - ${MKDIR} ${PREFIX}/share/zorro + ${INSTALL_DATA_DIR} ${PREFIX}/share/zorro ${INSTALL_DATA} ${WRKSRC}/DOTzorrorc ${PREFIX}/share/zorro @${ECHO} "" @${ECHO} "Take a look at ${PREFIX}/share/zorro/DOTzorrorc" diff --git a/net/airportbasestationconfig/Makefile b/net/airportbasestationconfig/Makefile index 9f1719fc9a5..93862518369 100644 --- a/net/airportbasestationconfig/Makefile +++ b/net/airportbasestationconfig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/17 18:18:31 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:18:03 hubertf Exp $ DISTNAME= configurator PKGNAME= ${BINNAME}-1.2.2 @@ -32,7 +32,7 @@ do-build: ${ECHO} "exec java -jar ${LIBDIR}/${BINNAME}.jar" >>${BINNAME} do-install: - ${MKDIR} ${DOCDIR} ${LIBDIR} + ${INSTALL_DATA_DIR} ${DOCDIR} ${LIBDIR} cd ${WRKSRC} && \ ${INSTALL_SCRIPT} ${BINNAME} ${PREFIX}/bin && \ ${INSTALL_DATA} ${BINNAME}.jar ${LIBDIR} && \ diff --git a/net/arla/Makefile b/net/arla/Makefile index 2d7d0a7b6e7..c2d44995321 100644 --- a/net/arla/Makefile +++ b/net/arla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/02/24 02:09:29 hubertf Exp $ +# $NetBSD: Makefile,v 1.15 2001/02/25 04:18:03 hubertf Exp $ # DISTNAME= arla-0.34.5 @@ -93,7 +93,7 @@ post-install: ${ECHO} "Arla cache dir (${CACHEDIR}) already exists"; \ else \ ${ECHO} "Creating arla cache directory ${CACHEDIR}"; \ - ${MKDIR} ${CACHEDIR}; \ + ${INSTALL_DATA_DIR} ${CACHEDIR}; \ ${CHMOD} 700 ${CACHEDIR}; \ ${CHOWN} root ${CACHEDIR}; \ fi @@ -103,7 +103,7 @@ post-install: ${ECHO} "Creating /sbin/mount_xfs"; \ ${LN} -s ${PREFIX}/bin/mount_xfs /sbin/mount_xfs; \ fi - @-${MKDIR} ${PREFIX}/share/examples/arla + @-${INSTALL_DATA_DIR} ${PREFIX}/share/examples/arla @${SED} -e 's|@PREFIX@|${PREFIX}|g' \ < ${FILESDIR}/lkm.conf \ > ${PREFIX}/share/examples/arla/lkm.conf diff --git a/net/arpwatch/Makefile b/net/arpwatch/Makefile index 31250997fde..e9999494750 100644 --- a/net/arpwatch/Makefile +++ b/net/arpwatch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/02/17 18:18:34 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2001/02/25 04:18:03 hubertf Exp $ # DISTNAME= arpwatch-2.1a4 @@ -19,7 +19,7 @@ pre-patch: post-install: ${INSTALL_MAN} ${WRKSRC}/arpwatch.8 ${PREFIX}/man/man8 ${INSTALL_MAN} ${WRKSRC}/arpsnmp.8 ${PREFIX}/man/man8 - @${TEST} -e /var/db/arpwatch || ${MKDIR} /var/db/arpwatch + @${INSTALL_DATA_DIR} /var/db/arpwatch ${TOUCH} /var/db/arpwatch/arp.dat ${INSTALL_DATA} ${WRKSRC}/ethercodes.dat ${PREFIX}/etc diff --git a/net/batchftp/Makefile b/net/batchftp/Makefile index cc9e0c4b977..3363ebd6c0b 100644 --- a/net/batchftp/Makefile +++ b/net/batchftp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/17 18:18:34 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:18:04 hubertf Exp $ DISTNAME= batchftp102 PKGNAME= batchftp-1.02 @@ -14,6 +14,6 @@ post-extract: ${LN} -fs ${FILESDIR}/Makefile ${WRKSRC} pre-install: - ${MKDIR} ${PREFIX}/share/doc/batchftp + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/batchftp .include "../../mk/bsd.pkg.mk" diff --git a/net/bind8/Makefile b/net/bind8/Makefile index 1359f765391..0fe5000f312 100644 --- a/net/bind8/Makefile +++ b/net/bind8/Makefile @@ -1,5 +1,5 @@ # -# $NetBSD: Makefile,v 1.6 2001/02/17 18:18:36 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2001/02/25 04:18:04 hubertf Exp $ # # FreeBSD Id: Makefile,v 1.12 1999/06/28 21:25:07 billf Exp # @@ -25,7 +25,7 @@ post-build: post-install: @(cd ${WRKDIR}/doc/man && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) - ${MKDIR} ${PREFIX}/share/doc/bind8 + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bind8 ${INSTALL_DATA} ${WRKDIR}/doc/html/* ${PREFIX}/share/doc/bind8 .include "../../mk/bsd.pkg.mk" diff --git a/net/bind9-current/Makefile b/net/bind9-current/Makefile index 116d8fc5918..147170ed3d4 100644 --- a/net/bind9-current/Makefile +++ b/net/bind9-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/02/17 18:18:37 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2001/02/25 04:18:04 hubertf Exp $ # DISTNAME= bind-${BIND_VERSION} @@ -40,11 +40,11 @@ post-build: PLIST_SRC= ${WRKDIR}/PLIST post-install: - ${MKDIR} ${PREFIX}/share/doc/bind9 - ${MKDIR} ${PREFIX}/share/doc/bind9/arm - ${MKDIR} ${PREFIX}/share/doc/bind9/draft - ${MKDIR} ${PREFIX}/share/doc/bind9/misc - ${MKDIR} ${PREFIX}/share/doc/bind9/rfc + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bind9 + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bind9/arm + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bind9/draft + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bind9/misc + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bind9/rfc ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/bind9 ${INSTALL_DATA} ${WRKSRC}/doc/arm/* ${PREFIX}/share/doc/bind9/arm ${INSTALL_DATA} ${WRKSRC}/doc/draft/* ${PREFIX}/share/doc/bind9/draft diff --git a/net/bind9/Makefile b/net/bind9/Makefile index d0bc16e35e4..96ab79c2eb1 100644 --- a/net/bind9/Makefile +++ b/net/bind9/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2001/02/17 18:18:36 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2001/02/25 04:18:04 hubertf Exp $ # DISTNAME= bind-${BIND_VERSION} @@ -43,11 +43,11 @@ post-build: PLIST_SRC= ${WRKDIR}/PLIST post-install: - ${MKDIR} ${PREFIX}/share/doc/bind9 - ${MKDIR} ${PREFIX}/share/doc/bind9/arm - ${MKDIR} ${PREFIX}/share/doc/bind9/draft - ${MKDIR} ${PREFIX}/share/doc/bind9/misc - ${MKDIR} ${PREFIX}/share/doc/bind9/rfc + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bind9 + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bind9/arm + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bind9/draft + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bind9/misc + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bind9/rfc ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/bind9 ${INSTALL_DATA} ${WRKSRC}/doc/arm/* ${PREFIX}/share/doc/bind9/arm ${INSTALL_DATA} ${WRKSRC}/doc/draft/* ${PREFIX}/share/doc/bind9/draft diff --git a/net/bing/Makefile b/net/bing/Makefile index 91e47c82368..383e74d804c 100644 --- a/net/bing/Makefile +++ b/net/bing/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/02/17 18:18:37 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2001/02/25 04:18:04 hubertf Exp $ # FreeBSD Id: Makefile,v 1.2 1997/10/13 09:14:49 tg Exp # @@ -13,7 +13,7 @@ MAKE_ENV+= INSTALL_MAN="${INSTALL_MAN}" MAKE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" post-install: - @${MKDIR} ${PREFIX}/share/doc/bing + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bing ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/bing .include "../../mk/bsd.pkg.mk" diff --git a/net/cia/Makefile b/net/cia/Makefile index ffbed6c222b..33efffd3a72 100644 --- a/net/cia/Makefile +++ b/net/cia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/17 18:18:40 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:18:05 hubertf Exp $ DISTNAME= cia-20000716 CATEGORIES= net @@ -13,9 +13,9 @@ EXAMPLES_DIR= ${PREFIX}/share/examples/cia MAKE_ENV+= BINDIR="${PREFIX}/bin" post-install: - ${MKDIR} ${DOC_DIR} + ${INSTALL_DATA_DIR} ${DOC_DIR} ${INSTALL_DATA} ${WRKSRC}/doc/README ${DOC_DIR} - ${MKDIR} ${EXAMPLES_DIR} + ${INSTALL_DATA_DIR} ${EXAMPLES_DIR} ${INSTALL_DATA} ${WRKSRC}/ipstat/examples/*.cfg ${EXAMPLES_DIR} .include "../../mk/bsd.pkg.mk" diff --git a/net/delegate/Makefile b/net/delegate/Makefile index 0eeed21200f..09154e42707 100644 --- a/net/delegate/Makefile +++ b/net/delegate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2001/02/17 18:18:46 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2001/02/25 04:18:05 hubertf Exp $ # FreeBSD Id: Makefile,v 1.14 1998/11/09 09:24:20 max Exp # @@ -39,7 +39,7 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/delegate ${INSTALL_DATA} ${WRKSRC}/doc/Manual.htm \ ${PREFIX}/share/doc/delegate/manual.html - @${MKDIR} ${PREFIX}/share/doc/delegate + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/delegate ${INSTALL_DATA} ${WRKSRC}/doc/tutor-en.htm \ ${PREFIX}/share/doc/delegate/tutorial-en.html ${INSTALL_DATA} ${WRKSRC}/doc/tutor-jp.htm \ diff --git a/net/gnut/Makefile b/net/gnut/Makefile index 870160a44f1..2ab421ad562 100644 --- a/net/gnut/Makefile +++ b/net/gnut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/02/24 23:48:57 christos Exp $ +# $NetBSD: Makefile,v 1.11 2001/02/25 04:18:05 hubertf Exp $ # DISTNAME= gnut-0.4.20 @@ -43,7 +43,7 @@ GNUTDOCS= TUTORIAL \ gnut.html post-install: - ${MKDIR} ${GNUTDOCDIR} + ${INSTALL_DATA_DIR} ${GNUTDOCDIR} for i in ${GNUTDOCS}; do \ ${INSTALL_DATA} ${WRKSRC}/doc/$$i ${GNUTDOCDIR}; \ done diff --git a/net/gtksamba/Makefile b/net/gtksamba/Makefile index 1a3f0892e22..1f62d56586a 100644 --- a/net/gtksamba/Makefile +++ b/net/gtksamba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/02/17 18:18:56 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2001/02/25 04:18:05 hubertf Exp $ # DISTNAME= gtksamba-0.3.2pl1 @@ -17,7 +17,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= CFLAGS="-DPREFIX='\"${PREFIX}\"' ${CFLAGS}" post-install: - @ ${MKDIR} ${PREFIX}/share/doc/gtksamba + @ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gtksamba .for file in COPYING README TODO ChangeLog @ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/gtksamba .endfor diff --git a/net/mirror/Makefile b/net/mirror/Makefile index 4f1acb6a8c9..c49c943af85 100644 --- a/net/mirror/Makefile +++ b/net/mirror/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/02/17 18:19:07 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2001/02/25 04:18:05 hubertf Exp $ # FreeBSD Id: Makefile,v 1.6 1996/12/01 01:22:54 obrien Exp # @@ -19,7 +19,7 @@ SCRIPTS_ENV+= PERL5=${PERL5} # on the files, please look at scripts/configure first. pre-install: - ${MKDIR} ${PREFIX}/lib/mirror + ${INSTALL_DATA_DIR} ${PREFIX}/lib/mirror post-install: @if [ ! -f ${PREFIX}/lib/mirror/mirror.defaults ]; then \ diff --git a/net/mrt/Makefile b/net/mrt/Makefile index e7f6bdcc841..a5bae503122 100644 --- a/net/mrt/Makefile +++ b/net/mrt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/17 18:19:08 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/02/25 04:18:06 hubertf Exp $ # DISTNAME= mrt-2.2.2a-Aug11 @@ -21,7 +21,7 @@ post-extract: post-install: ${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC} - ${MKDIR} ${PREFIX}/share/examples/mrt + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mrt ${INSTALL_DATA} ${WRKSRC}/programs/*/*.conf \ ${PREFIX}/share/examples/mrt (cd ${PREFIX}; ${FIND} share/examples/mrt -type f -print \ diff --git a/net/nap/Makefile b/net/nap/Makefile index b6e64f9a9e9..b9ed49adb44 100644 --- a/net/nap/Makefile +++ b/net/nap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/17 18:19:10 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:18:06 hubertf Exp $ DISTNAME= nap-1.4.3 CATEGORIES= net @@ -14,7 +14,7 @@ GNU_CONFIGURE= YES CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include post-install: - ${MKDIR} ${PREFIX}/share/doc/nap ${PREFIX}/share/examples/nap + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nap ${PREFIX}/share/examples/nap ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/nap ${INSTALL_DATA} ${WRKSRC}/nap.conf.dist \ ${PREFIX}/share/examples/nap/nap.conf diff --git a/net/netperf/Makefile b/net/netperf/Makefile index 43c090776ba..9df08b47476 100644 --- a/net/netperf/Makefile +++ b/net/netperf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/02/24 02:09:29 hubertf Exp $ +# $NetBSD: Makefile,v 1.6 2001/02/25 04:18:06 hubertf Exp $ # KAME Id: Makefile,v 1.3 2000/01/21 12:34:29 itojun Exp # @@ -30,7 +30,7 @@ post-install: ${INSTALL_MAN} ${WRKSRC}/netperf.man ${PREFIX}/man/man1/netperf.1 ${INSTALL_MAN} ${WRKSRC}/netserver.man ${PREFIX}/man/man1/netserver.1 .if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/netperf + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/netperf ${INSTALL_MAN} ${WRKSRC}/netperf.ps ${PREFIX}/share/doc/netperf ${GZIP_CMD} -9nf ${PREFIX}/share/doc/netperf/netperf.ps .endif diff --git a/net/nocol/Makefile b/net/nocol/Makefile index 9196be45536..085a336b256 100644 --- a/net/nocol/Makefile +++ b/net/nocol/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/02/17 18:19:18 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2001/02/25 04:18:06 hubertf Exp $ # DISTNAME= nocol-4.3.1 @@ -41,7 +41,7 @@ post-patch: post-install: # Ensure webnocol audio and images files are available if needed # - ${MKDIR} ${PREFIX}/share/nocol/gifs + ${INSTALL_DATA_DIR} ${PREFIX}/share/nocol/gifs for f in critical.wav error.wav warning.wav ; do \ ${INSTALL_DATA} ${WRKSRC}/webnocol/$$f ${PREFIX}/share/nocol; \ diff --git a/net/openh323/Makefile b/net/openh323/Makefile index 5051b983406..1251671a493 100644 --- a/net/openh323/Makefile +++ b/net/openh323/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/17 18:19:20 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:18:06 hubertf Exp $ # DISTNAME= openh323_1.1beta3 @@ -37,7 +37,7 @@ do-build: post-install: cd ${WRKSRC}/include; for f in \*.h ; \ do ${BSD_INSTALL_DATA} $$f ${PREFIX}/include; done - -${MKDIR} ${PREFIX}/share/openh323 + -${INSTALL_DATA_DIR} ${PREFIX}/share/openh323 cd ${WRKSRC}; ${BSD_INSTALL_DATA} openh323u.mak ${PREFIX}/share/openh323 .include "../../mk/bsd.pkg.mk" diff --git a/net/p5-SNMP/Makefile b/net/p5-SNMP/Makefile index 85a13ea1b8f..cc990990b16 100644 --- a/net/p5-SNMP/Makefile +++ b/net/p5-SNMP/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/02/17 18:19:24 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2001/02/25 04:18:07 hubertf Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1997/06/27 01:53:13 jfitz Exp # @@ -30,7 +30,7 @@ post-build: post-install: @${INSTALL_DATA} ${WRKSRC}/README ${PERL5_SITELIB}/README.SNMP - @${MKDIR} ${PREFIX}/share/examples/p5-SNMP + @${INSTALL_DATA_DIR} ${PREFIX}/share/examples/p5-SNMP @for i in ${PLFILES} ; do ${INSTALL_SCRIPT} ${WRKDIR}/$$i ${PREFIX}/share/examples/p5-SNMP/$$i ; done test: diff --git a/net/ra-pna-proxy/Makefile b/net/ra-pna-proxy/Makefile index 51828fc7da0..a4c14e8cf19 100644 --- a/net/ra-pna-proxy/Makefile +++ b/net/ra-pna-proxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/17 18:19:30 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2001/02/25 04:18:07 hubertf Exp $ DISTNAME= raproxy3.0b1 PKGNAME= ra-pna-proxy-3.0b1 @@ -41,7 +41,7 @@ post-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/raproxy ${PREFIX}/libexec/${PROGNAME} ${INSTALL_MAN} ${WRKSRC}/${PROGNAME}.8 ${PREFIX}/man/man8 - ${MKDIR} ${PREFIX}/share/doc/${PROGNAME} + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PROGNAME} ${INSTALL_DATA} ${WRKSRC}/license.txt ${PREFIX}/share/doc/${PROGNAME} .include "../../mk/bsd.pkg.mk" diff --git a/net/ra-rtsp-proxy/Makefile b/net/ra-rtsp-proxy/Makefile index d78578d21f8..4ccf7ba6c7d 100644 --- a/net/ra-rtsp-proxy/Makefile +++ b/net/ra-rtsp-proxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/02/17 18:19:30 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2001/02/25 04:18:07 hubertf Exp $ DISTNAME= rtspd-src-1.0.0.0 PKGNAME= ra-rtsp-proxy-1.0.0.0nb1 @@ -39,7 +39,7 @@ do-install: ${INSTALL_SCRIPT} ${WRKDIR}/rtspd.sh ${PREFIX}/etc/rc.d/rtspd ${INSTALL_MAN} ${WRKSRC}/rtspd.8 ${PREFIX}/man/man8 ${INSTALL_PROGRAM} ${WRKSRC}/rtspd ${PREFIX}/sbin - ${MKDIR} ${PREFIX}/share/doc/ra-rtsp-proxy + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ra-rtsp-proxy ${INSTALL_DATA} ${WRKSRC}/license.txt ${PREFIX}/share/doc/ra-rtsp-proxy @${SED} -e 's#/usr/local#${PREFIX}#g' <${WRKSRC}/README \ >${PREFIX}/share/doc/ra-rtsp-proxy/README diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile index 969b40247e7..58460ceca9f 100644 --- a/net/rp-pppoe/Makefile +++ b/net/rp-pppoe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/02/20 07:49:03 tron Exp $ +# $NetBSD: Makefile,v 1.13 2001/02/25 04:18:07 hubertf Exp $ DISTNAME= rp-pppoe-2.6 CATEGORIES= net @@ -14,7 +14,7 @@ GNU_CONFIGURE= YES CONFIGURE_ENV+= PPPD=${PPPD} post-install: - ${MKDIR} ${PREFIX}/share/examples/rp-pppoe + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/rp-pppoe ${INSTALL_DATA} ${WRKSRC}/pppoe.conf ${WRKSRC}/pppoe-server-options \ ${PREFIX}/share/examples/rp-pppoe diff --git a/net/rsync/Makefile b/net/rsync/Makefile index 18d2af33bfb..68eeb933196 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2001/02/17 18:19:33 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2001/02/25 04:18:07 hubertf Exp $ DISTNAME= rsync-2.4.6 CATEGORIES= net @@ -32,7 +32,7 @@ CONFIGURE_ARGS= --disable-ipv6 post-install: @strip ${PREFIX}/bin/rsync - @${MKDIR} ${PREFIX}/share/doc/rsync + @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/rsync ${INSTALL_DATA} ${WRKSRC}/tech_report.tex ${PREFIX}/share/doc/rsync .include "../../mk/bsd.pkg.mk" diff --git a/net/rumba/Makefile b/net/rumba/Makefile index d53b3949a28..0f37f6870f7 100644 --- a/net/rumba/Makefile +++ b/net/rumba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/02/17 18:19:34 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2001/02/25 04:18:08 hubertf Exp $ # $FreeBSD Id: Makefile,v 1.2 1997/07/21 19:28:46 max Exp # @@ -27,7 +27,7 @@ post-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/rumba ${PREFIX}/sbin ${INSTALL_PROGRAM} ${WRKDIR}/unrumba/unrumba ${PREFIX}/sbin - ${MKDIR} ${PREFIX}/share/doc/rumba + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/rumba ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/rumba/README ${INSTALL_MAN} ${WRKSRC}/smbmount.8 ${PREFIX}/man/man8/rumba.8 diff --git a/net/samba/Makefile b/net/samba/Makefile index 11163370c97..e79aacfed28 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2001/02/17 18:19:35 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2001/02/25 04:18:08 hubertf Exp $ DISTNAME= samba-2.0.7-ja-1.3 PKGNAME= samba-2.0.7.1.3 @@ -83,7 +83,7 @@ post-install: # Install Samba examples. # - ${MKDIR} ${PREFIX}/share/examples/samba + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/samba ${CP} -R ${WRKDIR}/${DISTNAME}/examples/* ${PREFIX}/share/examples/samba ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/examples/samba ${CHMOD} -R ugo-w ${PREFIX}/share/examples/samba diff --git a/net/tcpillust/Makefile b/net/tcpillust/Makefile index cdb71c5b8fe..46e044170e8 100644 --- a/net/tcpillust/Makefile +++ b/net/tcpillust/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/02/17 18:19:44 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2001/02/25 04:18:08 hubertf Exp $ # $FreeBSD: ports/net/tcpillust/Makefile,v 1.1.1.1 2000/07/29 06:26:00 sada Exp $ # @@ -24,11 +24,11 @@ DOCS= README SAMPLES= tcpclient.log tcpserver.log post-install: - ${MKDIR} ${PREFIX}/share/doc/tcpillust + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tcpillust for i in ${DOCS}; do \ ${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/tcpillust; \ done - ${MKDIR} ${PREFIX}/share/doc/tcpillust/sample + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tcpillust/sample for i in ${SAMPLES}; do \ ${INSTALL_DATA} ${WRKSRC}/sample/$$i ${PREFIX}/share/doc/tcpillust/sample; \ done diff --git a/net/tcptrace/Makefile b/net/tcptrace/Makefile index c096e4c1683..9b06c98c13c 100644 --- a/net/tcptrace/Makefile +++ b/net/tcptrace/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/02/17 18:19:45 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2001/02/25 04:18:08 hubertf Exp $ # FreeBSD Id: Makefile,v 1.3 1997/07/19 19:43:36 fenner Exp # @@ -21,7 +21,7 @@ DOCFILES= COPYRIGHT README README.tput_graphs do-install: ${INSTALL_PROGRAM} ${WRKSRC}/tcptrace ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/tcptrace.man ${PREFIX}/man/man1/tcptrace.1 - ${MKDIR} ${PREFIX}/share/doc/tcptrace + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tcptrace .for file in ${DOCFILES} ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/tcptrace .endfor diff --git a/net/trafshow/Makefile b/net/trafshow/Makefile index 510d84b9043..f3c8aa8d095 100644 --- a/net/trafshow/Makefile +++ b/net/trafshow/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/17 18:19:47 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2001/02/25 04:18:08 hubertf Exp $ # $FreeBSD: ports/net/trafshow/Makefile,v 1.14 2000/06/28 12:53:15 alex Exp $ # @@ -22,7 +22,7 @@ pre-configure: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/trafshow ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/trafshow.1 ${PREFIX}/man/man1 - ${MKDIR} ${PREFIX}/share/examples/trafshow + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/trafshow ${INSTALL_DATA} ${WRKSRC}/.trafshow \ ${PREFIX}/share/examples/trafshow/trafshow diff --git a/net/ucd-snmp-current/Makefile b/net/ucd-snmp-current/Makefile index 6557596a706..b5dfb9b5e74 100644 --- a/net/ucd-snmp-current/Makefile +++ b/net/ucd-snmp-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/17 18:19:49 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2001/02/25 04:18:09 hubertf Exp $ # DISTNAME= ucd-snmp-4.0.1 @@ -41,7 +41,7 @@ pre-configure: # Need to run INSTALL script as this doesn't happen automagically from pkgsrc. post-install: - @${MKDIR} ${PREFIX}/share/examples/ucd-snmp + @${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ucd-snmp @for F in ${WRKSRC}/etc/* ; do \ ${INSTALL_DATA} $$F ${PREFIX}/share/examples/ucd-snmp ; \ done diff --git a/net/ucd-snmp/Makefile b/net/ucd-snmp/Makefile index c41594b7aee..487de68c3f0 100644 --- a/net/ucd-snmp/Makefile +++ b/net/ucd-snmp/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.30 2001/02/17 18:19:49 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2001/02/25 04:18:09 hubertf Exp $ # FreeBSD Id: Makefile,v 1.18 1998/04/06 20:50:31 andreas Exp # -DISTNAME= ucd-snmp-4.1.2 +DISTNAME= ucd-snmp-4.2 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=net-snmp/} \ ftp://ucd-snmp.ucdavis.edu/ \ @@ -58,7 +58,7 @@ post-build: ${SED} 's,@PREFIX@,${PREFIX},g' < ${FILESDIR}/snmptrapd.sh > ${WRKDIR}/snmptrapd post-install: - ${MKDIR} ${PREFIX}/share/examples/ucd-snmp + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ucd-snmp ${INSTALL_DATA} ${WRKSRC}/EXAMPLE.conf ${PREFIX}/share/examples/ucd-snmp ${INSTALL_DATA_DIR} ${PREFIX}/lib/snmp/dlmod ${INSTALL_SCRIPT} ${WRKDIR}/snmpd ${PREFIX}/etc/rc.d diff --git a/net/vnc/Makefile b/net/vnc/Makefile index c59df863b11..4748aeba0d2 100644 --- a/net/vnc/Makefile +++ b/net/vnc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2001/02/17 18:19:52 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2001/02/25 04:18:10 hubertf Exp $ # FreeBSD Id: Makefile,v 1.2 1998/03/19 01:54:59 msmith Exp # @@ -35,7 +35,7 @@ post-install: < ${WRKSRC}/vncserver \ > ${WRKSRC}/vncserver.local ${INSTALL_SCRIPT} ${WRKSRC}/vncserver.local ${PREFIX}/bin/vncserver - ${MKDIR} ${PREFIX}/share/doc/vnc + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vnc cd ${WRKDIR}; \ ${INSTALL_DATA} *.GIF *.css *.gif *.jpg *.htm *.html *.pdf \ ${PREFIX}/share/doc/vnc diff --git a/net/vncviewer/Makefile b/net/vncviewer/Makefile index f12898d661e..a57c23a1bb3 100644 --- a/net/vncviewer/Makefile +++ b/net/vncviewer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/17 18:19:53 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:18:10 hubertf Exp $ # FreeBSD Id: Makefile,v 1.2 1998/03/19 01:54:59 msmith Exp # @@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/vnc_unixsrc do-install: ${INSTALL_PROGRAM} ${WRKSRC}/vncviewer/vncviewer ${PREFIX}/bin/vncviewer - ${MKDIR} ${PREFIX}/share/doc/vncviewer + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vncviewer ${INSTALL_DATA} ${WRKSRC}/vncviewer/README ${PREFIX}/share/doc/vncviewer/README .include "../../mk/bsd.pkg.mk" diff --git a/net/zephyr/Makefile b/net/zephyr/Makefile index a341cfb62f5..a9004d0d009 100644 --- a/net/zephyr/Makefile +++ b/net/zephyr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2001/02/17 18:20:01 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2001/02/25 04:18:10 hubertf Exp $ # DISTNAME= zephyr-2.0.4 @@ -27,10 +27,10 @@ ZEPHYR_DOCDIR= ${PREFIX}/share/doc/zephyr ZEPHYR_DOCS= INSTALL NOTES OPERATING README USING post-install: - ${MKDIR} ${ZEPHYR_RCDIR} + ${INSTALL_DATA_DIR} ${ZEPHYR_RCDIR} ${SED} -e 's|@prefix@|'${PREFIX}'|g' < ${FILESDIR}/zhm.sh > ${WRKDIR}/zhm.sh ${INSTALL_SCRIPT} ${WRKDIR}/zhm.sh ${ZEPHYR_RCDIR}/zhm - ${MKDIR} ${ZEPHYR_DOCDIR} + ${INSTALL_DATA_DIR} ${ZEPHYR_DOCDIR} for file in ${ZEPHYR_DOCS} ; do \ ${INSTALL_DATA} ${WRKSRC}/$$file ${ZEPHYR_DOCDIR} ; \ done diff --git a/news/inn/Makefile b/news/inn/Makefile index 8f188dd02d4..744020ec6ca 100644 --- a/news/inn/Makefile +++ b/news/inn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2001/02/17 17:54:47 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2001/02/25 04:18:10 hubertf Exp $ DISTNAME= inn-2.3.1 CATEGORIES= news @@ -70,12 +70,12 @@ post-build: done pre-install: - ${MKDIR} ${INN_DATA_DIR} ${PREFIX}/etc/nntp ${PREFIX}/inn + ${INSTALL_DATA_DIR} ${INN_DATA_DIR} ${PREFIX}/etc/nntp ${PREFIX}/inn post-install: ${RM} -f ${PREFIX}/bin/inews ${LN} -s ../inn/bin/inews ${PREFIX}/bin/inews - ${MKDIR} ${PREFIX}/share/examples/inn + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/inn for FILE in `ls -1 ${WRKSRC}/samples/* | \ ${EGREP} -v '(Makefile|.*\.(in|orig)$$)'`; do \ ${INSTALL_DATA} $$FILE ${PREFIX}/share/examples/inn; \ diff --git a/news/suck/Makefile b/news/suck/Makefile index ea1b8bc3c85..88b9d8a6f41 100644 --- a/news/suck/Makefile +++ b/news/suck/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/02/17 17:54:51 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2001/02/25 04:18:10 hubertf Exp $ # DISTNAME= suck-4.2.2 @@ -30,7 +30,7 @@ post-patch: @${MV} ${WRKSRC}/Makefile.tmp ${WRKSRC}/Makefile.in post-install: - ${MKDIR} ${LOCALBASE}/share/examples/suck + ${INSTALL_DATA_DIR} ${LOCALBASE}/share/examples/suck ${CP} ${WRKSRC}/sample/* ${LOCALBASE}/share/examples/suck ${CHMOD} 644 ${LOCALBASE}/share/examples/suck/* diff --git a/news/xrn/Makefile b/news/xrn/Makefile index 85d97141ab6..eeba8fd3a4f 100644 --- a/news/xrn/Makefile +++ b/news/xrn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/17 17:54:53 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:18:11 hubertf Exp $ # DISTNAME= 9.01 @@ -17,7 +17,7 @@ USE_IMAKE= yes NO_WRKSUBDIR= yes pre-install: - ${MKDIR} ${X11PREFIX}/share/doc/xrn + ${INSTALL_DATA_DIR} ${X11PREFIX}/share/doc/xrn for f in COMMON-PROBLMS COPYRIGHT CREDITS ChangeLog; do \ ${INSTALL_DATA} ${WRKSRC}/$$f ${X11PREFIX}/share/doc/xrn; \ done diff --git a/print/acroread/Makefile b/print/acroread/Makefile index 566842b6c6a..5bd6fef1264 100644 --- a/print/acroread/Makefile +++ b/print/acroread/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2001/02/17 17:51:36 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2001/02/25 04:18:11 hubertf Exp $ # FreeBSD Id: Makefile,v 1.13 1999/04/08 07:49:18 dima Exp $ PKGNAME= acroread-4.05 @@ -9,7 +9,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.adobe.com/prodindex/acrobat/readstep.html COMMENT= View, distribute and print PDF documents -IS_INTERACTIVE= YES +#HF#IS_INTERACTIVE= YES RESTRICTED= "Original installer required to redistribute." NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} @@ -68,7 +68,7 @@ PLIST_SRC= ${PKGDIR}/PLIST.pre \ NS_PLUGINS_DIR= ${PREFIX}/lib/netscape/plugins do-install: - @${MKDIR} ${PREFIX}/Acrobat4 + @${INSTALL_DATA_DIR} ${PREFIX}/Acrobat4 @( ${ECHO} accept ) | PAGER=${CAT} ReadInstallDir=${PREFIX}/Acrobat4 ${WRKSRC}/INSTALL post-install: diff --git a/print/acroread3/Makefile b/print/acroread3/Makefile index b5dd87cabcb..94c714f53e0 100644 --- a/print/acroread3/Makefile +++ b/print/acroread3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/02/17 17:51:36 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2001/02/25 04:18:11 hubertf Exp $ PKGNAME= acroread3-3.01 CATEGORIES= print @@ -67,7 +67,7 @@ pre-install: # ${SED} -e 's|@PLATFORM@|${PLATFORM}|g' ${PKGDIR}/PLIST > ${PLIST_SRC} do-install: - @${MKDIR} ${PREFIX}/Acrobat3 + @${INSTALL_DATA_DIR} ${PREFIX}/Acrobat3 @${ECHO} accept | PAGER=${CAT} ReadInstallDir=${PREFIX}/Acrobat3 ${WRKSRC}/INSTALL post-install: diff --git a/print/magicfilter/Makefile b/print/magicfilter/Makefile index b488e6d0fd6..c64d9550850 100644 --- a/print/magicfilter/Makefile +++ b/print/magicfilter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2001/02/17 17:51:48 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2001/02/25 04:18:11 hubertf Exp $ DISTNAME= magicfilter-1.2 CATEGORIES= print @@ -27,7 +27,7 @@ PAPERSIZE?= A4 post-install: @${CP} ${PKGDIR}/PLIST ${PLIST_SRC} - @${MKDIR} ${PREFIX}/${FILTER_DIR} + @${INSTALL_DATA_DIR} ${PREFIX}/${FILTER_DIR} @(cd ${WRKSRC}/filters; \ paper=`${ECHO} ${PAPERSIZE} | ${TR} '[A-Z]' '[a-z]'`; \ for FILTER in *-filter; do \ diff --git a/print/teTeX-share/Makefile b/print/teTeX-share/Makefile index 2ff961eec79..44acbcc4866 100644 --- a/print/teTeX-share/Makefile +++ b/print/teTeX-share/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/02/17 17:51:56 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2001/02/25 04:18:11 hubertf Exp $ # DISTNAME= teTeX-texmf-1.0.2 @@ -25,7 +25,7 @@ do-install: @${ECHO} " ** Get yourself a shower and a big mug of coffee," @${ECHO} " ** this will take _very_ long!" @${ECHO} "" - ${MKDIR} ${PREFIX}/share/texmf + ${INSTALL_DATA_DIR} ${PREFIX}/share/texmf ${GTAR} -plzx \ -C ${PREFIX}/share/texmf \ -X ${FILESDIR}/exclude \ diff --git a/print/teTeX-sharesrc/Makefile b/print/teTeX-sharesrc/Makefile index 8b0659ca2b3..8139695104e 100644 --- a/print/teTeX-sharesrc/Makefile +++ b/print/teTeX-sharesrc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/02/17 17:51:57 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2001/02/25 04:18:12 hubertf Exp $ # FreeBSD Id: Makefile,v 1.20 1997/08/05 06:56:41 tg Exp # @@ -26,7 +26,7 @@ do-install: @${ECHO} "Extracting ${DISTFILES} to ${PREFIX}/share/texmf/source" @${ECHO} " Get yourself a shower and a mug of coffee, this will take long!" @${ECHO} "" - ${MKDIR} ${PREFIX}/share/texmf + ${INSTALL_DATA_DIR} ${PREFIX}/share/texmf ${GTAR} plzxCf ${PREFIX}/share/texmf ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} .include "../../mk/bsd.pkg.mk" 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 diff --git a/shells/esh/Makefile b/shells/esh/Makefile index 5d0f8cecaee..e3745629594 100644 --- a/shells/esh/Makefile +++ b/shells/esh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/17 17:40:19 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:18:15 hubertf Exp $ # DISTNAME= esh-0.8 @@ -21,7 +21,7 @@ do-install: .endif ${INSTALL_DATA} ${WRKSRC}/emacs/esh-mode.el ${PREFIX}/share/emacs/site-lisp ${INSTALL_DATA} ${WRKSRC}/doc/esh.info ${PREFIX}/info - ${MKDIR} ${PREFIX}/share/doc/esh + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/esh @for i in esh.html esh_toc.html ; do \ ${INSTALL_DATA} ${WRKSRC}/doc/$$i ${PREFIX}/share/doc/esh/$$i; done diff --git a/sysutils/amanda-server/Makefile b/sysutils/amanda-server/Makefile index f28c870af33..b436b588d9d 100644 --- a/sysutils/amanda-server/Makefile +++ b/sysutils/amanda-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/02/17 17:42:10 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2001/02/25 04:18:15 hubertf Exp $ # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp # @@ -26,8 +26,8 @@ CONFIGURE_ARGS+= --without-client BUILD_DEFS+= AMANDA_USER AMANDA_SMB AMANDA_VAR # post-install: -# ${MKDIR} ${PREFIX}/share/doc/amanda -# ${MKDIR} ${PREFIX}/share/examples/amanda +# ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/amanda +# ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/amanda # for i in ${WRKDIR}/${DISTNAME}/docs/* ; do \ # ${INSTALL_DATA} $$i ${PREFIX}/share/doc/amanda; \ # done diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile index 9d5d33f31b1..d815f9fddf0 100644 --- a/sysutils/lsof/Makefile +++ b/sysutils/lsof/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2001/02/17 17:42:15 wiz Exp $ +# $NetBSD: Makefile,v 1.36 2001/02/25 04:18:15 hubertf Exp $ # FreeBSD Id: Makefile,v 1.19 1998/03/08 06:44:48 obrien Exp # @@ -51,7 +51,7 @@ do-install: ${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m 2755 ${REAL_GROUP} \ ${WRKSRC}/lsof ${PREFIX}/sbin ${INSTALL_MAN} ${WRKSRC}/lsof.man ${PREFIX}/man/man1/lsof.1 - @${MKDIR} ${PREFIX}/share/lsof + @${INSTALL_DATA_DIR} ${PREFIX}/share/lsof ${INSTALL_SCRIPT} ${WRKSRC}/scripts/* ${PREFIX}/share/lsof @${CHMOD} 0444 ${PREFIX}/share/lsof/00* diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile index a9c4fb76ee6..224c780a2ef 100644 --- a/sysutils/ups-nut/Makefile +++ b/sysutils/ups-nut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/17 17:42:21 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/02/25 04:18:15 hubertf Exp $ # DISTNAME= nut-0.44.2 @@ -67,8 +67,8 @@ post-install: >${LOCALBASE}/etc/rc.d/upsd @${CHMOD} 0755 ${LOCALBASE}/etc/rc.d/upsd @${INSTALL} -d -o ${NUT_USER} -g ${NUT_GROUP} -m 0770 /var/db/nut - @if ! [ -d ${NUT_DOCDIR} ]; then ${MKDIR} ${NUT_DOCDIR}; fi - @if ! [ -d ${NUT_DOCDIR}/cables ]; then ${MKDIR} ${NUT_DOCDIR}/cables; fi + ${INSTALL_DATA_DIR} ${NUT_DOCDIR} + ${INSTALL_DATA_DIR} ${NUT_DOCDIR}/cables ${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${NUT_DOCDIR}/cables ${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${NUT_DOCDIR} ${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${NUT_DOCDIR} diff --git a/textproc/dict-server/Makefile b/textproc/dict-server/Makefile index 78234797673..7baffa89905 100644 --- a/textproc/dict-server/Makefile +++ b/textproc/dict-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/17 17:37:20 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/02/25 04:18:16 hubertf Exp $ DISTNAME= dictd-1.4.9 PKGNAME= dict-server-1.4.9 @@ -46,7 +46,7 @@ LEXICONS= easton.dict.dz \ post-install: ${SED} "s#/usr/lib/dict#${PREFIX}/share/dictd#" \ ${WRKSRC}/dictd.conf >${PREFIX}/etc/dictd.conf - ${MKDIR} ${PREFIX}/share/dictd + ${INSTALL_DATA_DIR} ${PREFIX}/share/dictd .for FILE in ${LEXICONS} ${INSTALL_DATA} ${WRKDIR}/${FILE} ${PREFIX}/share/dictd .endfor diff --git a/textproc/docbook/Makefile b/textproc/docbook/Makefile index 431028f3245..27cb92897f5 100644 --- a/textproc/docbook/Makefile +++ b/textproc/docbook/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/02/17 17:37:20 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2001/02/25 04:18:16 hubertf Exp $ # FreeBSD Id: Makefile,v 1.4 1998/06/27 05:19:35 asami Exp # @@ -28,7 +28,7 @@ INSTDIR= ${PREFIX}/share/sgml/docbook ISOCAT= ${PREFIX}/share/sgml/iso8879/catalog pre-install: - @[ -d ${INSTDIR}/2.4.1 ] || ${MKDIR} ${INSTDIR}/2.4.1 + ${INSTALL_DATA_DIR} ${INSTDIR}/2.4.1 @[ -d ${INSTDIR}/3.0 ] || ${MKDIR} ${INSTDIR}/3.0 @[ -d ${INSTDIR}/3.1 ] || ${MKDIR} ${INSTDIR}/3.1 @[ -d ${INSTDIR}/4.0 ] || ${MKDIR} ${INSTDIR}/4.0 diff --git a/textproc/dsssl-docbook-modular/Makefile b/textproc/dsssl-docbook-modular/Makefile index 33331c46d31..3d4b7236b71 100644 --- a/textproc/dsssl-docbook-modular/Makefile +++ b/textproc/dsssl-docbook-modular/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/02/17 17:37:22 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2001/02/25 04:18:16 hubertf Exp $ # FreeBSD Id: Makefile,v 1.17 1999/04/24 09:25:32 kuriyama Exp DISTNAME= db157 @@ -24,7 +24,7 @@ do-build: @${RM} -Rf ${WRKSRC}/docsrc pre-install: - @[ -d ${INSTDIR} ] || ${MKDIR} ${INSTDIR} + ${INSTALL_DATA_DIR} ${INSTDIR} # @${FIND} ${WRKDIR} -name '*~' -exec ${RM} {} \; # @${FIND} ${WRKDIR} -name '*.orig' -exec ${RM} {} \; diff --git a/textproc/fop/Makefile b/textproc/fop/Makefile index 2b440a5086f..9c26837ffa8 100644 --- a/textproc/fop/Makefile +++ b/textproc/fop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/02/17 17:37:23 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2001/02/25 04:18:16 hubertf Exp $ # # Note: we currently use the pre-built (-bin) distribution of FOP, # because although FOP runs fine under JDK 1.1, JDK 1.2 or greater is @@ -24,7 +24,7 @@ post-extract: @${FIND} -d ${WRKSRC} -type d -name CVS -exec ${RM} -rf '{}' \; do-install: - ${MKDIR} ${PREFIX}/lib/java + ${INSTALL_DATA_DIR} ${PREFIX}/lib/java ${INSTALL_DATA} ${WRKSRC}/fop_bin_0_13_0.jar ${PREFIX}/lib/java/fop.jar ${MKDIR} ${PREFIX}/share/doc/java/fop cd ${WRKSRC}/docs ; ${GTAR} pcf - . | ( cd ${PREFIX}/share/doc/java/fop ; ${GTAR} pvxf - ) diff --git a/textproc/glimpse/Makefile b/textproc/glimpse/Makefile index a33b4b538bc..6bb80487d08 100644 --- a/textproc/glimpse/Makefile +++ b/textproc/glimpse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/02/17 17:37:24 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2001/02/25 04:18:16 hubertf Exp $ # FreeBSD Id: Makefile,v 1.12 1997/07/17 19:29:07 andreas Exp # @@ -27,7 +27,7 @@ post-configure: ${WRKSRC}/libtemplate/include/autoconf.h post-install: - ${MKDIR} ${PREFIX}/share/doc/glimpse + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/glimpse ${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${PREFIX}/share/doc/glimpse ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/glimpse ${INSTALL_PROGRAM} ${WRKSRC}/index/wgconvert ${PREFIX}/bin diff --git a/textproc/iso12083/Makefile b/textproc/iso12083/Makefile index 08a24dd928d..a69133c4666 100644 --- a/textproc/iso12083/Makefile +++ b/textproc/iso12083/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/17 17:37:27 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:18:17 hubertf Exp $ # FreeBSD Id: Makefile,v 1.2 1998/06/27 05:19:39 asami Exp # @@ -23,7 +23,7 @@ EXTRACT_ONLY= # empty INSTDIR= ${PREFIX}/share/sgml/iso12083 pre-install: - @[ -d ${INSTDIR} ] || ${MKDIR} ${INSTDIR} + ${INSTALL_DATA_DIR} ${INSTDIR} do-install: @for i in ${DISTFILES}; do \ diff --git a/textproc/iso8879/Makefile b/textproc/iso8879/Makefile index 40dfca15105..e35632415a2 100644 --- a/textproc/iso8879/Makefile +++ b/textproc/iso8879/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/20 11:40:10 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2001/02/25 04:18:17 hubertf Exp $ # FreeBSD Id: Makefile,v 1.9 1999/02/11 16:01:16 jfieber Exp # @@ -20,7 +20,7 @@ NO_WRKSUBDIR= yes INSTDIR= ${PREFIX}/share/sgml/iso8879 pre-install: - @[ -d ${INSTDIR} ] || ${MKDIR} ${INSTDIR} + ${MKDIR} ${INSTDIR} do-install: @unzip -a -q -o ${DISTDIR}/${DISTFILES} -d ${INSTDIR} diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile index ea33098f6dc..45803287f57 100644 --- a/textproc/jade/Makefile +++ b/textproc/jade/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/17 17:37:29 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:18:17 hubertf Exp $ # FreeBSD Id: Makefile,v 1.15 1999/01/31 11:15:57 dirk Exp # @@ -23,7 +23,7 @@ post-install: .for i in jade nsgmls sgmlnorm spam spent sx strip ${PREFIX}/bin/$i .endfor - ${MKDIR} ${PREFIX}/include/sp + ${INSTALL_DATA_DIR} ${PREFIX}/include/sp ${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/include/sp ${MKDIR} ${PREFIX}/share/doc/jade ${INSTALL_DATA} ${WRKSRC}/doc/*.htm ${PREFIX}/share/doc/jade diff --git a/textproc/sp/Makefile b/textproc/sp/Makefile index 9bc11b8b32d..2ef64943b7c 100644 --- a/textproc/sp/Makefile +++ b/textproc/sp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/02/17 17:37:42 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2001/02/25 04:18:17 hubertf Exp $ # DISTNAME= sp-1.3.4 @@ -21,7 +21,7 @@ CONFLICTS+= opensp-* MAKE_ENV+= INSTALL="${INSTALL}" post-install: - ${MKDIR} ${PREFIX}/share/doc/sp ${PREFIX}/share/sgml/dtd + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sp ${PREFIX}/share/sgml/dtd cd ${WRKSRC}/doc; for n in *.htm ; do ${INSTALL_DATA} $$n ${PREFIX}/share/doc/sp/$n ; done cd ${WRKSRC}/pubtext; for n in * ; do ${INSTALL_DATA} $$n ${PREFIX}/share/sgml/dtd/$n ; done cd ${WRKSRC}/lib; ${INSTALL_DATA} libsp.a ${PREFIX}/lib/libsp.a diff --git a/textproc/t1lib/Makefile b/textproc/t1lib/Makefile index 25c6ca1e8ee..6fa07a13580 100644 --- a/textproc/t1lib/Makefile +++ b/textproc/t1lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/02/17 17:37:43 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2001/02/25 04:18:17 hubertf Exp $ # DISTNAME= t1lib-1.0.1 @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/T1-1.0.1 ALL_TARGET= without_doc post-install: - ${MKDIR} ${PREFIX}/share/t1lib + ${INSTALL_DATA_DIR} ${PREFIX}/share/t1lib cd ${WRKSRC}; \ ${PAX} -rw Fonts ${PREFIX}/share/t1lib; \ ${CHMOD} go+r ${PREFIX}/share/t1lib/Fonts/enc/IsoLatin2.enc; \ diff --git a/textproc/tcl-dom/Makefile b/textproc/tcl-dom/Makefile index 76bff8ce374..f4be8a95fc0 100644 --- a/textproc/tcl-dom/Makefile +++ b/textproc/tcl-dom/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/17 17:37:44 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/02/25 04:18:18 hubertf Exp $ # DISTNAME= TclDOM-1.6 @@ -19,11 +19,11 @@ NO_CONFIGURE= NO_BUILD= do-install: - ${MKDIR} ${PREFIX}/lib/tcl/TclDOM + ${INSTALL_DATA_DIR} ${PREFIX}/lib/tcl/TclDOM ${INSTALL_DATA} ${WRKSRC}/pkgIndex.tcl ${PREFIX}/lib/tcl/TclDOM ${INSTALL_DATA} ${WRKSRC}/dom.tcl ${PREFIX}/lib/tcl/TclDOM ${INSTALL_DATA} ${WRKSRC}/dommap.tcl ${PREFIX}/lib/tcl/TclDOM - ${MKDIR} ${PREFIX}/share/doc/tcl/TclDOM + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tcl/TclDOM ${INSTALL_DATA} ${WRKSRC}/docs/reference.html ${PREFIX}/share/doc/tcl/TclDOM ${INSTALL_DATA} ${WRKSRC}/changes ${PREFIX}/share/doc/tcl/TclDOM diff --git a/textproc/tcl-xml/Makefile b/textproc/tcl-xml/Makefile index b430de01330..e873f033041 100644 --- a/textproc/tcl-xml/Makefile +++ b/textproc/tcl-xml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/17 17:37:45 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:18:18 hubertf Exp $ # DISTNAME= TclXML-1.2 @@ -19,11 +19,11 @@ NO_CONFIGURE= NO_BUILD= do-install: - ${MKDIR} ${PREFIX}/lib/tcl/TclXML + ${INSTALL_DATA_DIR} ${PREFIX}/lib/tcl/TclXML ${INSTALL_DATA} ${WRKSRC}/pkgIndex.tcl ${PREFIX}/lib/tcl/TclXML ${INSTALL_DATA} ${WRKSRC}/sgml.tcl ${PREFIX}/lib/tcl/TclXML ${INSTALL_DATA} ${WRKSRC}/xml.tcl ${PREFIX}/lib/tcl/TclXML - ${MKDIR} ${PREFIX}/share/doc/tcl/TclXML + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tcl/TclXML ${INSTALL_DATA} ${WRKSRC}/docs/reference.html ${PREFIX}/share/doc/tcl/TclXML ${INSTALL_DATA} ${WRKSRC}/changes ${PREFIX}/share/doc/tcl/TclXML diff --git a/textproc/xalan-j/Makefile b/textproc/xalan-j/Makefile index 2e5bf63d8fb..6c8da96758c 100644 --- a/textproc/xalan-j/Makefile +++ b/textproc/xalan-j/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/02/17 17:37:56 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2001/02/25 04:18:18 hubertf Exp $ # # Note: we currently use the pre-built (-bin) distribution of Xalan-J, # because although Xalan runs fine under JDK 1.1, JDK 1.2 or greater is @@ -25,10 +25,10 @@ NO_WRKSUBDIR= do-install: ${INSTALL_DATA} ${WRKSRC}/xalan.jar ${PREFIX}/lib/java ${INSTALL_DATA} ${WRKSRC}/bsf.jar ${PREFIX}/lib/java - ${MKDIR} ${PREFIX}/share/doc/java/xalan + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/xalan cd ${WRKSRC}/docs ; ${GTAR} pcf - . | ( cd ${PREFIX}/share/doc/java/xalan ; ${GTAR} pvxf - ) ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/java/xalan - ${MKDIR} ${PREFIX}/share/examples/java/xalan + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/xalan cd ${WRKSRC}/samples ; ${GTAR} pcf - . | ( cd ${PREFIX}/share/examples/java/xalan ; ${GTAR} pvxf - ) ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/examples/java/xalan diff --git a/textproc/xerces-j/Makefile b/textproc/xerces-j/Makefile index 737606b918f..9aa078cc3b7 100644 --- a/textproc/xerces-j/Makefile +++ b/textproc/xerces-j/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/02/17 17:37:57 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2001/02/25 04:18:18 hubertf Exp $ # # Note: we currently use the pre-built (-bin) distribution of Xerces-J, # because although Xerces runs fine under JDK 1.1, JDK 1.2 or greater is @@ -22,12 +22,12 @@ USE_JAVA= yes WRKSRC= ${WRKDIR}/xerces-1_2_0 do-install: - ${MKDIR} ${PREFIX}/lib/java + ${INSTALL_DATA_DIR} ${PREFIX}/lib/java ${INSTALL_DATA} ${WRKSRC}/xerces.jar ${PREFIX}/lib/java - ${MKDIR} ${PREFIX}/share/doc/java/xerces + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/xerces cd ${WRKSRC}/docs ; ${GTAR} pcf - . | ( cd ${PREFIX}/share/doc/java/xerces ; ${GTAR} pvxf - ) ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/java/xerces - ${MKDIR} ${PREFIX}/share/examples/java/xerces + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/xerces ${INSTALL_DATA} ${WRKSRC}/xercesSamples.jar ${PREFIX}/share/examples/java/xerces cd ${WRKSRC}/data ; ${GTAR} pcf - . | ( cd ${PREFIX}/share/examples/java/xerces ; ${GTAR} pvxf - ) ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/examples/java/xerces diff --git a/textproc/xp/Makefile b/textproc/xp/Makefile index c04280b37de..d877e699ea5 100644 --- a/textproc/xp/Makefile +++ b/textproc/xp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/17 17:37:58 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:18:18 hubertf Exp $ # DISTNAME= xp @@ -24,9 +24,9 @@ post-extract: ${RM} -r ${WRKDIR}/docs/api/CVS ${WRKDIR}/docs/api/images/CVS do-install: - ${MKDIR} ${PREFIX}/lib/java + ${INSTALL_DATA_DIR} ${PREFIX}/lib/java ${INSTALL_DATA} ${WRKDIR}/xp.jar ${PREFIX}/lib/java - ${MKDIR} ${PREFIX}/share/doc/java/xp + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/xp cd ${WRKDIR}/docs ; ${GTAR} pcf - . | ( cd ${PREFIX}/share/doc/java/xp ; ${GTAR} pvxf - ) ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/java/xp diff --git a/textproc/xt/Makefile b/textproc/xt/Makefile index b25dbd9d0a2..a2b21b8f8c3 100644 --- a/textproc/xt/Makefile +++ b/textproc/xt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/17 17:37:59 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:18:18 hubertf Exp $ # DISTNAME= xt @@ -24,13 +24,13 @@ post-extract: cd ${WRKDIR} && ${LOCALBASE}/bin/unzip -x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} do-install: - ${MKDIR} ${PREFIX}/lib/java + ${INSTALL_DATA_DIR} ${PREFIX}/lib/java ${INSTALL_DATA} ${WRKDIR}/xt.jar ${PREFIX}/lib/java ${INSTALL_DATA} -c ${WRKDIR}/sax.jar ${PREFIX}/lib/java - ${MKDIR} ${PREFIX}/share/doc/java/xt + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/xt ${INSTALL_DATA} -c ${WRKDIR}/copying.txt ${PREFIX}/share/doc/java/xt ${INSTALL_DATA} -c ${WRKDIR}/xt.htm ${PREFIX}/share/doc/java/xt - ${MKDIR} ${PREFIX}/share/examples/java/xt + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/xt cd ${WRKDIR}/demo ; ${GTAR} pcf - . | ( cd ${PREFIX}/share/examples/java/xt ; ${GTAR} pvxf - ) ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/examples/java/xt diff --git a/time/asclock-gtk/Makefile b/time/asclock-gtk/Makefile index 4880a4b11fc..3995a762104 100644 --- a/time/asclock-gtk/Makefile +++ b/time/asclock-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/17 17:31:59 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/02/25 04:18:19 hubertf Exp $ # DISTNAME= asclock-gtk-2.1.10beta @@ -34,7 +34,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/asclock ${PREFIX}/bin/asclock-gtk ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/asclock-gtk ${INSTALL_DATA} ${WRKSRC}/README.THEMES ${PREFIX}/share/doc/asclock-gtk - ${MKDIR} ${PREFIX}/share/asclock-gtk + ${INSTALL_DATA_DIR} ${PREFIX}/share/asclock-gtk ${CP} -R ${WRKSRC}/themes/* ${PREFIX}/share/asclock-gtk ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/asclock-gtk diff --git a/time/asclock-xlib/Makefile b/time/asclock-xlib/Makefile index 2c26036625c..af52b61684b 100644 --- a/time/asclock-xlib/Makefile +++ b/time/asclock-xlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/17 17:31:59 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/02/25 04:18:19 hubertf Exp $ # DISTNAME= asclock-xlib-2.0.11 @@ -27,7 +27,7 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/asclock-xlib cd ${WRKSRC}; ${INSTALL_DATA} COPYING README.THEMES \ ${PREFIX}/share/doc/asclock-xlib - ${MKDIR} ${PREFIX}/share/asclock-xlib + ${INSTALL_DATA_DIR} ${PREFIX}/share/asclock-xlib ${CP} -R ${WRKSRC}/themes/* ${PREFIX}/share/asclock-xlib ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/asclock-xlib diff --git a/time/cal/Makefile b/time/cal/Makefile index 5f51bdcd2c6..79e7cf478f7 100644 --- a/time/cal/Makefile +++ b/time/cal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/17 17:32:00 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/02/25 04:18:19 hubertf Exp $ # FreeBSD Id: Makefile,v 1.5 1997/05/12 06:33:23 max Exp # @@ -16,7 +16,7 @@ ALL_TARGET= cal do-install: ${INSTALL_PROGRAM} ${WRKSRC}/cal ${PREFIX}/bin/cal ${INSTALL_MAN} ${WRKSRC}/cal.1 ${PREFIX}/man/man1/cal.1 - @${MKDIR} ${PREFIX}/etc/cal + @${INSTALL_DATA_DIR} ${PREFIX}/etc/cal @${CHMOD} 0755 ${PREFIX}/etc/cal if [ ! -f ${PREFIX}/etc/cal/calcol ]; then ${INSTALL_DATA} ${WRKDIR}/cal-3.5/cal.col ${PREFIX}/etc/cal/calcol; fi if [ ! -f ${PREFIX}/etc/cal/caldat ]; then ${INSTALL_DATA} ${WRKDIR}/cal-3.5/cal.dat ${PREFIX}/etc/cal/caldat; fi diff --git a/time/emiclock/Makefile b/time/emiclock/Makefile index efa67b090b5..dc5609c6348 100644 --- a/time/emiclock/Makefile +++ b/time/emiclock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/17 17:32:02 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/02/25 04:18:19 hubertf Exp $ # DISTNAME= emiclock-2.0.2 @@ -23,7 +23,7 @@ post-patch: .endif post-install: - ${MKDIR} ${PREFIX}/lib/X11/ja_JP.eucJP/app-defaults + ${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/ja_JP.eucJP/app-defaults ${INSTALL_DATA} ${WRKSRC}/resources/R6/EUC/EmiClock.ad \ ${PREFIX}/lib/X11/ja_JP.eucJP/app-defaults/EmiClock diff --git a/time/plan/Makefile b/time/plan/Makefile index 0f47aa21bcb..94cc3fbb691 100644 --- a/time/plan/Makefile +++ b/time/plan/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/17 17:32:07 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/02/25 04:18:19 hubertf Exp $ # DISTNAME= plan-1.8.4 @@ -15,7 +15,7 @@ USE_MOTIF= YES ALL_TARGET= netbsd pre-install: - ${MKDIR} ${X11PREFIX}/libexec/plan ${X11PREFIX}/share/plan \ + ${INSTALL_DATA_DIR} ${X11PREFIX}/libexec/plan ${X11PREFIX}/share/plan \ ${X11PREFIX}/share/plan/holiday ${RM} -f ${WRKDIR}/${DISTNAME}/holiday/holiday_*.orig ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/holiday/holiday_* ${X11PREFIX}/share/plan/holiday diff --git a/time/titrax/Makefile b/time/titrax/Makefile index c6996b114b1..015929e395c 100644 --- a/time/titrax/Makefile +++ b/time/titrax/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/17 17:32:11 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/02/25 04:18:20 hubertf Exp $ # DISTNAME= titrax-1.98 @@ -18,6 +18,6 @@ post-patch: < ${WRKSRC}/Imakefile.bak > ${WRKSRC}/Imakefile pre-install: - ${MKDIR} ${X11PREFIX}/libexec/titrax + ${INSTALL_DATA_DIR} ${X11PREFIX}/libexec/titrax .include "../../mk/bsd.pkg.mk" diff --git a/wm/ethemes/Makefile b/wm/ethemes/Makefile index f0a655ca8dc..0cb12e69217 100644 --- a/wm/ethemes/Makefile +++ b/wm/ethemes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:35 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/02/25 04:18:20 hubertf Exp $ DISTNAME= ethemes-0.1 CATEGORIES= x11 wm @@ -40,7 +40,7 @@ E_THEMES?= Absolute_E-DR16-199911060830.etheme \ do-install: .for FILE in ${E_THEMES} NAME=`echo ${FILE} | ${SED} -e s/-DR16.*//` ; \ - ${MKDIR} ${PREFIX}/${E_DATADIR}/$$NAME ; \ + ${INSTALL_DATA_DIR} ${PREFIX}/${E_DATADIR}/$$NAME ; \ ${GTAR} -C ${PREFIX}/${E_DATADIR}/$$NAME \ -xzf ${DISTDIR}/${DIST_SUBDIR}/${FILE} .endfor diff --git a/wm/fvwm1/Makefile b/wm/fvwm1/Makefile index 26361185981..f4610412f01 100644 --- a/wm/fvwm1/Makefile +++ b/wm/fvwm1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/17 17:21:36 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:18:20 hubertf Exp $ # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp # @@ -34,8 +34,8 @@ post-extract: <${WRKSRC}/modules/GoodStuff/Imakefile.orig >${WRKSRC}/modules/GoodStuff/Imakefile post-install: - @${MKDIR} ${PREFIX}/lib/X11/fvwm/pixmaps - @${MKDIR} ${PREFIX}/lib/X11/fvwm/bitmaps + @${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fvwm/pixmaps + @${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fvwm/bitmaps ${INSTALL_DATA} ${WRKSRC}/fvwm_icons/*.xpm \ ${PREFIX}/lib/X11/fvwm/pixmaps ${INSTALL_DATA} ${WRKSRC}/fvwm_icons/*.xbm \ diff --git a/wm/sawfish-replibs/Makefile b/wm/sawfish-replibs/Makefile index 1fbebc64cc7..71d37d7adc9 100644 --- a/wm/sawfish-replibs/Makefile +++ b/wm/sawfish-replibs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:45 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/02/25 04:18:21 hubertf Exp $ # PKGNAME= sawfish-replibs-${SF_VERS} @@ -10,7 +10,7 @@ do-build: ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} client.la do-install: - ${MKDIR} ${PREFIX}/libexec/rep/${MACHINE_GNU_PLATFORM}/sawfish + ${INSTALL_DATA_DIR} ${PREFIX}/libexec/rep/${MACHINE_GNU_PLATFORM}/sawfish cd ${WRKSRC}/src && \ ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install-client-la diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile index d45ddcf3b3d..73c4df581b6 100644 --- a/wm/sawfish/Makefile +++ b/wm/sawfish/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/17 17:21:44 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/02/25 04:18:21 hubertf Exp $ # PKGNAME= sawfish-${SF_VERS} @@ -28,9 +28,9 @@ LOCALEDIR= share .endif post-install: - ${MKDIR} ${PREFIX}/share/sawfish/themes + ${INSTALL_DATA_DIR} ${PREFIX}/share/sawfish/themes ${TOUCH} ${PREFIX}/share/sawfish/themes/.directory - ${MKDIR} ${PREFIX}/share/sawfish/sounds + ${INSTALL_DATA_DIR} ${PREFIX}/share/sawfish/sounds ${TOUCH} ${PREFIX}/share/sawfish/sounds/.directory .include "../../wm/sawfish/Makefile.common" diff --git a/wm/uwm/Makefile b/wm/uwm/Makefile index c2f93da2682..766c691f40f 100644 --- a/wm/uwm/Makefile +++ b/wm/uwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:48 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/02/25 04:18:21 hubertf Exp $ DISTNAME= X.V11R3uwm PKGNAME= uwm-19881027 @@ -20,7 +20,7 @@ post-patch: >${WRKSRC}/uwm.man post-install: - ${MKDIR} ${PREFIX}/lib/X11/uwm + ${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/uwm ${INSTALL_DATA} ${WRKSRC}/default.uwmrc ${PREFIX}/lib/X11/uwm/system.uwmrc .include "../../mk/bsd.pkg.mk" diff --git a/wm/wmthemes/Makefile b/wm/wmthemes/Makefile index ea40f1be921..e7a195fe681 100644 --- a/wm/wmthemes/Makefile +++ b/wm/wmthemes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/17 17:21:53 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:18:21 hubertf Exp $ DISTNAME= wmthemes-0.62nb1 CATEGORIES= x11 wm @@ -45,7 +45,7 @@ do-install: for DIR in *.themed; do \ if [ -d "$$DIR" ] && [ -n "`ls "$$DIR"`" ]; then \ ${ECHO} "Installing \"$${DIR%.*}\" theme."; \ - ${MKDIR} "${PREFIX}/${WM_DATADIR}/Themes/$$DIR"; \ + ${INSTALL_DATA_DIR} "${PREFIX}/${WM_DATADIR}/Themes/$$DIR"; \ cd "${WRKSRC}/$$DIR"; \ for FILE in *; do \ ${INSTALL_DATA} "$$FILE" "${PREFIX}/${WM_DATADIR}/Themes/$$DIR"; \ diff --git a/wm/wmx/Makefile b/wm/wmx/Makefile index 1d5c175eb09..040d3b3df4a 100644 --- a/wm/wmx/Makefile +++ b/wm/wmx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:54 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/02/25 04:18:21 hubertf Exp $ DISTNAME= wmx-5 PKGNAME= wmx-5.0 @@ -24,9 +24,9 @@ do-configure: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wmx ${PREFIX}/bin - ${MKDIR} ${PREFIX}/share/doc/wmx + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wmx ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/wmx ${INSTALL_DATA} ${WRKSRC}/README.contrib ${PREFIX}/share/doc/wmx - ${MKDIR} ${PREFIX}/etc/wmx + ${INSTALL_DATA_DIR} ${PREFIX}/etc/wmx .include "../../mk/bsd.pkg.mk" 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} 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" |