summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhubertf <hubertf@pkgsrc.org>2001-02-24 02:09:27 +0000
committerhubertf <hubertf@pkgsrc.org>2001-02-24 02:09:27 +0000
commita5bbac3e9351e2973e9ef0c195e1f2505c0f82ce (patch)
tree70727e784d3f7afb94af5abbe85e19fdb1b18fa7
parent77bde4476f7786a6de67d27d193ad235ae99dad2 (diff)
downloadpkgsrc-a5bbac3e9351e2973e9ef0c195e1f2505c0f82ce.tar.gz
First round of cleaning up INSTALL usage:
INSTALL -d => INSTALL_*_DIR INSTALL => INSTALL_* Beware that only invocations are changed that don't set special values for owner, mode or group! Cleanup suggested by zuntum@IRC
-rw-r--r--chat/icb/Makefile4
-rw-r--r--emulators/linuxppc_lib/Makefile8
-rw-r--r--graphics/freetype2/Makefile4
-rw-r--r--japanese/ipadic/Makefile5
-rw-r--r--mail/xmailbox/Makefile4
-rw-r--r--net/arla/Makefile6
-rw-r--r--net/netperf/Makefile9
-rw-r--r--security/xdm-krb4/Makefile4
8 files changed, 21 insertions, 23 deletions
diff --git a/chat/icb/Makefile b/chat/icb/Makefile
index a3815ef2f7a..495d2afccc3 100644
--- a/chat/icb/Makefile
+++ b/chat/icb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/16 13:51:24 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/24 02:09:27 hubertf Exp $
#
# Note: The file ftp://ftp.icb.net/pub/icb/icb-0.9grok2.tar.gz is way
@@ -21,7 +21,7 @@ do-configure:
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/icb/icb ${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKSRC}/icbserverdb ${PREFIX}/libdata
- ${INSTALL} -d ${PREFIX}/libdata/icb
+ ${INSTALL_DATA_DIR} ${PREFIX}/libdata/icb
${INSTALL_SCRIPT} ${WRKSRC}/sample.icbrc \
${WRKSRC}/contrib/bartender \
${WRKSRC}/contrib/confuse \
diff --git a/emulators/linuxppc_lib/Makefile b/emulators/linuxppc_lib/Makefile
index 806a08e91f5..14452152682 100644
--- a/emulators/linuxppc_lib/Makefile
+++ b/emulators/linuxppc_lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 18:38:19 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/24 02:09:28 hubertf Exp $
DISTNAME= linuxppc_lib-2000.q4.1
CATEGORIES= emulators
@@ -68,7 +68,7 @@ do-install:
fi; \
if [ "x$$files" != "x" ] ; then \
${ECHO} "$$files" ; \
- ${INSTALL} -c -o root -g wheel -m 644 $$files $$target/ ; \
+ ${INSTALL_DATA} $$files $$target/ ; \
${ECHO} $$files | ${SED} 's|${WRKSRC}|${EMUL_LINUX}|g' | \
${TR} ' ' '\n' >> ${WRKDIR}/PLIST_DYNAMIC ; \
fi; \
@@ -95,14 +95,14 @@ do-install:
fi; \
if [ "x$$files" != "x" ] ; then \
${ECHO} "$$files" ; \
- ${INSTALL} -c -o root -g wheel -m 755 $$files $$target/ ; \
+ ${INSTALL_SCRIPT} $$files $$target/ ; \
${ECHO} $$files | ${SED} 's|${WRKSRC}|${EMUL_LINUX}|g' | \
${TR} ' ' '\n' >> ${WRKDIR}/PLIST_DYNAMIC ; \
fi ; \
${ECHO} $$target | ${SED} 's|${PREFIX}/|@dirrm |' >> \
${WRKDIR}/PLIST_DYNAMIC ; \
done;
- ${INSTALL} -c -o root -g wheel -m 755 ${WRKSRC}/sbin/ldconfig \
+ ${INSTALL_SCRIPT} ${WRKSRC}/sbin/ldconfig \
${PREFIX}/sbin/ldconfig-linux
${ECHO} "sbin/ldconfig-linux" >> ${WRKDIR}/PLIST_DYNAMIC
${TOUCH} ${PREFIX}/${EMUL_LINUX}/etc/ld.so.cache~
diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile
index 3084e1e8414..5bb979eb2c3 100644
--- a/graphics/freetype2/Makefile
+++ b/graphics/freetype2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 15:22:19 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/02/24 02:09:28 hubertf Exp $
#
DISTNAME= freetype-2.0.1
@@ -31,7 +31,7 @@ do-configure:
cd ${WRKSRC}/builds/unix && ${SETENV} \
CC="${CC}" CFLAGS="${CFLAGS}" \
CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
- INSTALL="`${TYPE} ${INSTALL} | ${AWK} '{ print $$NF }'` -c -o ${BINOWN} -g ${BINGRP}" \
+ INSTALL="${INSTALL_PROGRAM}" \
INSTALL_DATA="${INSTALL_DATA}" \
INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
diff --git a/japanese/ipadic/Makefile b/japanese/ipadic/Makefile
index e920c39fd65..4d5cb2ca283 100644
--- a/japanese/ipadic/Makefile
+++ b/japanese/ipadic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/16 15:25:18 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/24 02:09:28 hubertf Exp $
#
DISTNAME= ipadic-2.4.1
@@ -17,8 +17,7 @@ USE_LIBTOOL= # defined
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
post-install:
- ${INSTALL} -c -m ${NONBINMODE} -o ${BINOWN} -g ${BINGRP} \
- ${WRKSRC}/chasenrc \
+ ${INSTALL_DATA} ${WRKSRC}/chasenrc \
${LOCALBASE}/share/chasen/dic/ipadic/chasenrc.example
test -f ${LOCALBASE}/etc/chasenrc || \
${INSTALL} -c -m ${NONBINMODE} -o ${BINOWN} -g ${BINGRP} \
diff --git a/mail/xmailbox/Makefile b/mail/xmailbox/Makefile
index 2a8a8ab8c0e..366091ab8ca 100644
--- a/mail/xmailbox/Makefile
+++ b/mail/xmailbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 18:25:10 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/02/24 02:09:28 hubertf Exp $
#
DISTNAME= xmailbox-2.5
@@ -15,7 +15,7 @@ MAKE_ENV+= INSTALL_PROGRAM='${INSTALL_PROGRAM}'
MAKE_ENV+= INSTALL_MAN='${INSTALL_MAN}'
post-install:
- ${INSTALL} -d -m 555 -o ${BINOWN} -g ${BINGRP} ${PREFIX}/share/xmailbox
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/xmailbox
cd ${WRKSRC}/icons && ${INSTALL_DATA} \
0xmail1.xpm 1xmail1.xpm 2xmail1.xpm 3xmail1.xpm 4xmail1.xpm \
5xmail1.xpm xmail1.xpm xnomail1.xpm \
diff --git a/net/arla/Makefile b/net/arla/Makefile
index bee531c6e86..2d7d0a7b6e7 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/02/17 18:18:33 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2001/02/24 02:09:29 hubertf Exp $
#
DISTNAME= arla-0.34.5
@@ -107,9 +107,9 @@ post-install:
@${SED} -e 's|@PREFIX@|${PREFIX}|g' \
< ${FILESDIR}/lkm.conf \
> ${PREFIX}/share/examples/arla/lkm.conf
- @${INSTALL} -c -o root -g wheel -m 444 \
+ @${INSTALL_DATA} \
${FILESDIR}/services ${PREFIX}/share/examples/arla
- @${INSTALL} -c -o root -g wheel -m 444 \
+ @${INSTALL_DATA} \
${FILESDIR}/fstab ${PREFIX}/share/examples/arla
@${SED} -e 's|@PREFIX@|${PREFIX}|' ${FILESDIR}/arlad.sh \
> ${PREFIX}/etc/rc.d/arlad
diff --git a/net/netperf/Makefile b/net/netperf/Makefile
index 1664bd8a664..43c090776ba 100644
--- a/net/netperf/Makefile
+++ b/net/netperf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 18:19:14 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/02/24 02:09:29 hubertf Exp $
# KAME Id: Makefile,v 1.3 2000/01/21 12:34:29 itojun Exp
#
@@ -17,7 +17,6 @@ COMMENT= Rick Jones' network performance benchmarking package
MAKEFILE= makefile
MAN1= netperf.1 netserver.1
-MINSTALL= ${INSTALL} ${COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
BUILD_DEFS+= USE_INET6
.include "../../mk/bsd.prefs.mk"
@@ -28,11 +27,11 @@ CFLAGS+= -DDO_IPV6
post-install:
strip ${PREFIX}/netperf/netperf
strip ${PREFIX}/netperf/netserver
- ${MINSTALL} ${WRKSRC}/netperf.man ${PREFIX}/man/man1/netperf.1
- ${MINSTALL} ${WRKSRC}/netserver.man ${PREFIX}/man/man1/netserver.1
+ ${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
- ${MINSTALL} ${WRKSRC}/netperf.ps ${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/security/xdm-krb4/Makefile b/security/xdm-krb4/Makefile
index b3f1a4aeb04..977e7801c5b 100644
--- a/security/xdm-krb4/Makefile
+++ b/security/xdm-krb4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/17 17:50:16 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/02/24 02:09:29 hubertf Exp $
#
DISTNAME= xdm-krb4-3.3.6.2
@@ -27,7 +27,7 @@ pre-install:
post-install:
-${MKDIR} ${PREFIX}/etc/rc.d
- ${INSTALL} -c -o root -g wheel -m 444 \
+ ${INSTALL_DATA} \
${WRKDIR}/xdm-krb4.sh \
${PREFIX}/etc/rc.d/xdm-krb4