diff options
author | jlam <jlam@pkgsrc.org> | 2002-02-06 16:58:11 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2002-02-06 16:58:11 +0000 |
commit | 7046abc822c457a46356fad85e66757b13c0841d (patch) | |
tree | 0314060661b2a2c2c29d92417a77330da29f157e | |
parent | d93fe0cd603b60e69ea77059d773740a1d6c4733 (diff) | |
download | pkgsrc-7046abc822c457a46356fad85e66757b13c0841d.tar.gz |
Changes instances where BSD_INSTALL_* were used by targets in the Makefile
into the equivalent INSTALL_*. This is fallout from the change in
revision 1.915 that removed ${MAKE_ENV} from the environment for a
recursive make.
-rw-r--r-- | audio/rio/Makefile | 6 | ||||
-rw-r--r-- | devel/bmake/Makefile | 8 | ||||
-rw-r--r-- | devel/hdf5/Makefile | 4 | ||||
-rw-r--r-- | devel/idiff/Makefile | 4 | ||||
-rw-r--r-- | devel/mk-files/Makefile | 6 | ||||
-rw-r--r-- | devel/pwlib/Makefile | 6 | ||||
-rw-r--r-- | devel/unidiff/Makefile | 8 | ||||
-rw-r--r-- | emulators/hercules/Makefile | 6 | ||||
-rw-r--r-- | emulators/swarm/Makefile | 6 | ||||
-rw-r--r-- | net/LaBrea/Makefile | 6 | ||||
-rw-r--r-- | net/openh323/Makefile | 6 | ||||
-rw-r--r-- | pkgtools/pkgmanpages/Makefile | 4 | ||||
-rw-r--r-- | security/tct/Makefile | 24 | ||||
-rw-r--r-- | sysutils/tits/Makefile | 4 | ||||
-rw-r--r-- | www/galeon/Makefile | 4 | ||||
-rw-r--r-- | x11/modeline/Makefile | 4 |
16 files changed, 53 insertions, 53 deletions
diff --git a/audio/rio/Makefile b/audio/rio/Makefile index 1af55df0e2b..311b1d8092d 100644 --- a/audio/rio/Makefile +++ b/audio/rio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/02/25 04:17:37 hubertf Exp $ +# $NetBSD: Makefile,v 1.6 2002/02/06 16:58:11 jlam Exp $ # DISTNAME= rio007 @@ -18,9 +18,9 @@ WRKSRC= ${WRKDIR}/rio107 MAKEFILE= makefile do-install: - ${BSD_INSTALL_PROGRAM} ${WRKSRC}/rio ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/rio ${PREFIX}/bin ${INSTALL_DATA_DIR} ${PREFIX}/share/rio - ${BSD_INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/rio + ${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/devel/bmake/Makefile b/devel/bmake/Makefile index 02c539c4e1f..17d4f385488 100644 --- a/devel/bmake/Makefile +++ b/devel/bmake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/10/18 21:41:06 sjg Exp $ +# $NetBSD: Makefile,v 1.4 2002/02/06 16:58:12 jlam Exp $ # DISTNAME= bmake-3.1.12 @@ -21,8 +21,8 @@ do-build: cd ${WRKSRC} && MAKESYSPATH=${makesyspath} make -f makefile.boot bootstrap do-install: - ${BSD_INSTALL_PROGRAM} ${WRKSRC}/bmake ${PREFIX}/bin - ${BSD_INSTALL_MAN} ${WRKSRC}/bmake.cat1 ${PREFIX}/man/cat1/bmake.0 - ${BSD_INSTALL_MAN} ${WRKSRC}/bmake.1 ${PREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/bmake ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/bmake.cat1 ${PREFIX}/man/cat1/bmake.0 + ${INSTALL_MAN} ${WRKSRC}/bmake.1 ${PREFIX}/man/man1 .include "../../mk/bsd.pkg.mk" diff --git a/devel/hdf5/Makefile b/devel/hdf5/Makefile index 1b73f4015f1..79dc3ffbca7 100644 --- a/devel/hdf5/Makefile +++ b/devel/hdf5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/05/12 05:47:25 tron Exp $ +# $NetBSD: Makefile,v 1.12 2002/02/06 16:58:12 jlam Exp $ DISTNAME= hdf5-1.4.1 CATEGORIES= devel @@ -17,7 +17,7 @@ USE_LIBTOOL= #defined LTCONFIG_OVERRIDE= ${WRKSRC}/bin/ltconfig pre-install: - ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} \ + ${LIBTOOL} --mode=install ${INSTALL_DATA} \ ${WRKSRC}/tools/lib/libh5tools.la ${PREFIX}/lib post-install: diff --git a/devel/idiff/Makefile b/devel/idiff/Makefile index 885f08b68db..d96f7066460 100644 --- a/devel/idiff/Makefile +++ b/devel/idiff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/03/22 10:04:36 agc Exp $ +# $NetBSD: Makefile,v 1.2 2002/02/06 16:58:13 jlam Exp $ # DISTNAME= idiff-1.0 @@ -10,6 +10,6 @@ HOMEPAGE= http://www.darwinsys.com/freeware/ COMMENT= Interactive front-end to diff(1) do-install: - ${BSD_INSTALL_PROGRAM} ${WRKSRC}/idiff ${PREFIX}/bin/idiff + ${INSTALL_PROGRAM} ${WRKSRC}/idiff ${PREFIX}/bin/idiff .include "../../mk/bsd.pkg.mk" diff --git a/devel/mk-files/Makefile b/devel/mk-files/Makefile index b22ec7de6c7..e2d6270f6e3 100644 --- a/devel/mk-files/Makefile +++ b/devel/mk-files/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/10/19 16:37:49 sjg Exp $ +# $NetBSD: Makefile,v 1.4 2002/02/06 16:58:13 jlam Exp $ # DISTNAME= mk-1.2.5 @@ -37,10 +37,10 @@ ${WRKDIR}/.PLIST_SRC: ${PKGDIR}/PLIST do-install: .if ${OPSYS} != "NetBSD" - ${BSD_INSTALL_DATA} ${WRKSRC}/`uname -s`.sys.mk ${PREFIX}/share/mk/sys.mk + ${INSTALL_DATA} ${WRKSRC}/`uname -s`.sys.mk ${PREFIX}/share/mk/sys.mk .endif for f in ${MKFILES}; do \ - ${BSD_INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/share/mk/; \ + ${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/share/mk/; \ done .include "../../mk/bsd.pkg.mk" diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile index fb947456d5e..25cfb3f8bad 100644 --- a/devel/pwlib/Makefile +++ b/devel/pwlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/09/27 23:17:57 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2002/02/06 16:58:13 jlam Exp $ # DISTNAME= pwlib_min_1.1pl17 @@ -38,9 +38,9 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/include/ptclib ${PREFIX}/include/ptlib/unix/ptlib cd ${WRKSRC}/include; \ for f in `find . -name CVS -prune -o -type f ! -name "*.orig" -print` ; \ - do ${BSD_INSTALL_DATA} $$f ${PREFIX}/include/`dirname $$f`; done + do ${INSTALL_DATA} $$f ${PREFIX}/include/`dirname $$f`; done ${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 + do ${INSTALL_DATA} $$f ${PREFIX}/share/pwlib/make; done .include "../../mk/bsd.pkg.mk" diff --git a/devel/unidiff/Makefile b/devel/unidiff/Makefile index 3ff60bf8bc5..971e41d9146 100644 --- a/devel/unidiff/Makefile +++ b/devel/unidiff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/10/18 10:23:36 agc Exp $ +# $NetBSD: Makefile,v 1.2 2002/02/06 16:58:14 jlam Exp $ # DISTNAME= part01 @@ -17,8 +17,8 @@ EXTRACT_CMD= zcat ${DOWNLOADED_DISTFILE} | gunshar WRKSRC= ${WRKDIR} do-install: - ${BSD_INSTALL_PROGRAM} ${WRKSRC}/unify ${PREFIX}/bin - ${BSD_INSTALL_PROGRAM} ${WRKSRC}/unipatch ${PREFIX}/bin - ${BSD_INSTALL_MAN} ${WRKSRC}/unify.1 ${PREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/unify ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/unipatch ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/unify.1 ${PREFIX}/man/man1 .include "../../mk/bsd.pkg.mk" diff --git a/emulators/hercules/Makefile b/emulators/hercules/Makefile index 64dec5a43f3..60a23a65807 100644 --- a/emulators/hercules/Makefile +++ b/emulators/hercules/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/11/29 01:12:32 hubertf Exp $ +# $NetBSD: Makefile,v 1.10 2002/02/06 16:58:14 jlam Exp $ DISTNAME= hercules-2.11 PKGREVISION= 1 @@ -18,7 +18,7 @@ MAKE_ENV+= HOST_ARCH=${MACHINE_ARCH} pre-install: ${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/ + ${INSTALL_DATA} ${WRKSRC}/hercules.cnf ${PREFIX}/share/examples/hercules/ + ${INSTALL_DATA} ${WRKSRC}/zzsa.cnf ${PREFIX}/share/examples/hercules/ .include "../../mk/bsd.pkg.mk" diff --git a/emulators/swarm/Makefile b/emulators/swarm/Makefile index d0c8fd8f07f..05213d79223 100644 --- a/emulators/swarm/Makefile +++ b/emulators/swarm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/09/14 22:18:22 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2002/02/06 16:58:14 jlam Exp $ # DISTNAME= swarm-0.57 @@ -12,8 +12,8 @@ COMMENT= Software arm6 core emulator WRKSRC= ${WRKDIR}/swarm/src do-install: - ${BSD_INSTALL_PROGRAM} ${WRKSRC}/swarm ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/swarm ${PREFIX}/bin ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/swarm - ${BSD_INSTALL_DATA} ${WRKSRC}/../doc/swarm.pdf ${PREFIX}/share/doc/swarm + ${INSTALL_DATA} ${WRKSRC}/../doc/swarm.pdf ${PREFIX}/share/doc/swarm .include "../../mk/bsd.pkg.mk" diff --git a/net/LaBrea/Makefile b/net/LaBrea/Makefile index 509e2964dd6..b37ce6908a9 100644 --- a/net/LaBrea/Makefile +++ b/net/LaBrea/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/11/07 16:31:26 agc Exp $ +# $NetBSD: Makefile,v 1.3 2002/02/06 16:58:15 jlam Exp $ # DISTNAME= LaBrea @@ -17,8 +17,8 @@ post-extract: ${SED} -e 's/.$$//' -e 's|LaBrea.README|${PREFIX}/share/doc/LaBrea|g' LaBrea.c.in > LaBrea.c do-install: - ${BSD_INSTALL_PROGRAM} ${WRKSRC}/LaBrea ${PREFIX}/sbin - ${BSD_INSTALL_DATA} ${WRKSRC}/LaBrea.README ${PREFIX}/share/doc/LaBrea + ${INSTALL_PROGRAM} ${WRKSRC}/LaBrea ${PREFIX}/sbin + ${INSTALL_DATA} ${WRKSRC}/LaBrea.README ${PREFIX}/share/doc/LaBrea .include "../../devel/libnet/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/openh323/Makefile b/net/openh323/Makefile index 26c54362fa7..77d27363bdb 100644 --- a/net/openh323/Makefile +++ b/net/openh323/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/12/30 20:51:33 agc Exp $ +# $NetBSD: Makefile,v 1.6 2002/02/06 16:58:15 jlam Exp $ # DISTNAME= openh323_1.1beta3 @@ -36,8 +36,8 @@ do-build: post-install: cd ${WRKSRC}/include; for f in \*.h ; \ - do ${BSD_INSTALL_DATA} $$f ${PREFIX}/include; done + do ${INSTALL_DATA} $$f ${PREFIX}/include; done -${INSTALL_DATA_DIR} ${PREFIX}/share/openh323 - cd ${WRKSRC}; ${BSD_INSTALL_DATA} openh323u.mak ${PREFIX}/share/openh323 + cd ${WRKSRC}; ${INSTALL_DATA} openh323u.mak ${PREFIX}/share/openh323 .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/pkgmanpages/Makefile b/pkgtools/pkgmanpages/Makefile index 4d27571f02d..0a3482af092 100644 --- a/pkgtools/pkgmanpages/Makefile +++ b/pkgtools/pkgmanpages/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:42 agc Exp $ +# $NetBSD: Makefile,v 1.5 2002/02/06 16:58:15 jlam Exp $ # DISTNAME= pkgmanpages-19991222 @@ -19,6 +19,6 @@ PREFIX= /usr/share .endif do-install: - ${BSD_INSTALL_MAN} ${WRKSRC}/packages.7 ${PREFIX}/man/man7 + ${INSTALL_MAN} ${WRKSRC}/packages.7 ${PREFIX}/man/man7 .include "../../mk/bsd.pkg.mk" diff --git a/security/tct/Makefile b/security/tct/Makefile index f3ac81e6897..f478195fa62 100644 --- a/security/tct/Makefile +++ b/security/tct/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/01/09 11:15:32 agc Exp $ +# $NetBSD: Makefile,v 1.7 2002/02/06 16:58:15 jlam Exp $ # DISTNAME= tct-1.09 @@ -16,30 +16,30 @@ REPLACE_PERL+= extras/bdf extras/ils2mac extras/realpath REPLACE_PERL+= lazarus/lazarus do-install: - ${BSD_INSTALL_PROGRAM_DIR} ${LOCALBASE}/tct/bin + ${INSTALL_PROGRAM_DIR} ${LOCALBASE}/tct/bin cd ${WRKSRC}/bin && \ for f in grave-robber mactime; do \ - ${BSD_INSTALL_SCRIPT} $$f ${LOCALBASE}/tct/bin; \ + ${INSTALL_SCRIPT} $$f ${LOCALBASE}/tct/bin; \ done; \ for f in file icat ils lastcomm major_minor md5 pcat timeout unrm; do \ - ${BSD_INSTALL_PROGRAM} $$f ${LOCALBASE}/tct/bin; \ + ${INSTALL_PROGRAM} $$f ${LOCALBASE}/tct/bin; \ done cd ${WRKSRC}/extras && \ for f in bdf ils2mac realpath; do \ - ${BSD_INSTALL_SCRIPT} $$f ${LOCALBASE}/tct/bin; \ + ${INSTALL_SCRIPT} $$f ${LOCALBASE}/tct/bin; \ done - ${BSD_INSTALL_SCRIPT} ${WRKSRC}/lazarus/lazarus ${LOCALBASE}/tct/bin - ${BSD_INSTALL_PROGRAM_DIR} ${LOCALBASE}/tct/etc - cd ${WRKSRC}/etc && ${BSD_INSTALL_DATA} magic ${LOCALBASE}/tct/etc + ${INSTALL_SCRIPT} ${WRKSRC}/lazarus/lazarus ${LOCALBASE}/tct/bin + ${INSTALL_PROGRAM_DIR} ${LOCALBASE}/tct/etc + cd ${WRKSRC}/etc && ${INSTALL_DATA} magic ${LOCALBASE}/tct/etc ${INSTALL_DATA_DIR} ${LOCALBASE}/share/doc/tct cd ${WRKSRC}/docs && \ for f in README design-notes grave-robber.README lazarus.README mac.README; do \ - ${BSD_INSTALL_DATA} $$f ${LOCALBASE}/share/doc/tct; \ + ${INSTALL_DATA} $$f ${LOCALBASE}/share/doc/tct; \ done ${INSTALL_DATA_DIR} ${PERL5_SITEARCH} - cd ${WRKSRC}/lib && ${BSD_INSTALL_DATA} *.pl ${PERL5_SITEARCH} - ${BSD_INSTALL_PROGRAM_DIR} ${LOCALBASE}/tct/conf - cd ${WRKSRC}/conf && ${BSD_INSTALL_DATA} paths.pl *.cf ${LOCALBASE}/tct/conf + cd ${WRKSRC}/lib && ${INSTALL_DATA} *.pl ${PERL5_SITEARCH} + ${INSTALL_PROGRAM_DIR} ${LOCALBASE}/tct/conf + cd ${WRKSRC}/conf && ${INSTALL_DATA} paths.pl *.cf ${LOCALBASE}/tct/conf .include "../../lang/perl5/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/tits/Makefile b/sysutils/tits/Makefile index 94aacf58370..2a1c22bcc2c 100644 --- a/sysutils/tits/Makefile +++ b/sysutils/tits/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/03/03 14:07:19 scw Exp $ +# $NetBSD: Makefile,v 1.5 2002/02/06 16:58:15 jlam Exp $ # DISTNAME= tits-1.0.2 @@ -19,6 +19,6 @@ post-patch: ${SED} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/tits.8.in > ${WRKSRC}/tits.8 post-install: - ${BSD_INSTALL_DATA} ${WRKSRC}/tits.conf ${PREFIX}/share/examples/ + ${INSTALL_DATA} ${WRKSRC}/tits.conf ${PREFIX}/share/examples/ .include "../../mk/bsd.pkg.mk" diff --git a/www/galeon/Makefile b/www/galeon/Makefile index 276e8e8b46e..ba46b61a780 100644 --- a/www/galeon/Makefile +++ b/www/galeon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2001/12/29 14:39:04 abs Exp $ +# $NetBSD: Makefile,v 1.23 2002/02/06 16:58:16 jlam Exp $ DISTNAME= galeon-1.0.2 CATEGORIES= www @@ -54,6 +54,6 @@ post-install: ${CHOWN} ${BINOWN} ${PREFIX}/bin/galeon ${CHGRP} ${BINGRP} ${PREFIX}/bin/galeon ${CHMOD} ${BINMODE} ${PREFIX}/bin/galeon - ${BSD_INSTALL_PROGRAM_DIR} ${PREFIX}/lib/galeon + ${INSTALL_PROGRAM_DIR} ${PREFIX}/lib/galeon .include "../../mk/bsd.pkg.mk" diff --git a/x11/modeline/Makefile b/x11/modeline/Makefile index aeffdaebd1b..bba1ca622c5 100644 --- a/x11/modeline/Makefile +++ b/x11/modeline/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/04/19 11:39:31 agc Exp $ +# $NetBSD: Makefile,v 1.5 2002/02/06 16:58:16 jlam Exp $ DISTNAME= modeline_vfr.c PKGNAME= modeline-20001121 @@ -20,6 +20,6 @@ do-build: cd ${WRKSRC}; ${CC} ${CFLAGS} ${DISTNAME} -o ${DISTNAME:S/.c//} do-install: - ${BSD_INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME:S/.c//} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME:S/.c//} ${PREFIX}/bin .include "../../mk/bsd.pkg.mk" |