aboutsummaryrefslogtreecommitdiffstats
path: root/emulators
diff options
context:
space:
mode:
authorMarcel Moolenaar <marcel@FreeBSD.org>2000-01-10 21:04:34 +0800
committerMarcel Moolenaar <marcel@FreeBSD.org>2000-01-10 21:04:34 +0800
commit4443946f48e97d5633ef3200f9cadd931516562f (patch)
tree43a4fdd665235102a92219ed32f6bb5b42e730e0 /emulators
parenta70a9da5b4656f165b031f17450576a49e0d0800 (diff)
downloadfreebsd-ports-4443946f48e97d5633ef3200f9cadd931516562f.tar.gz
freebsd-ports-4443946f48e97d5633ef3200f9cadd931516562f.tar.zst
freebsd-ports-4443946f48e97d5633ef3200f9cadd931516562f.zip
Install packages with -U instead of -i. This should minimize the
problems people have when they install the port without removing the previously installed version.
Notes
Notes: svn path=/head/; revision=24621
Diffstat (limited to 'emulators')
-rw-r--r--emulators/linux_base-6/Makefile10
-rw-r--r--emulators/linux_base-62/Makefile10
-rw-r--r--emulators/linux_base-8/Makefile10
-rw-r--r--emulators/linux_base-rh-9/Makefile10
-rw-r--r--emulators/linux_base-suse-9.1/Makefile10
-rw-r--r--emulators/linux_base-suse-9.2/Makefile10
-rw-r--r--emulators/linux_base-suse-9.3/Makefile10
-rw-r--r--emulators/linux_base/Makefile10
8 files changed, 40 insertions, 40 deletions
diff --git a/emulators/linux_base-6/Makefile b/emulators/linux_base-6/Makefile
index 4b2e965be041..8a29232ab236 100644
--- a/emulators/linux_base-6/Makefile
+++ b/emulators/linux_base-6/Makefile
@@ -156,23 +156,23 @@ do-install:
#
@for R in ${RPM_SET1}; do \
${ECHO} $$R; \
- rpm -i ${RPMFLAGS} ${RPMDIR}/$$R; \
+ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
done
@${ECHO} ${RPM_LDCONFIG}
- @rpm -i ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_LDCONFIG}
+ @rpm -U ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_LDCONFIG}
@brandelf -t Linux ${PREFIX}/sbin/ldconfig
@${PREFIX}/sbin/ldconfig
@${TOUCH} ${PREFIX}/etc/ld.so.conf
@for R in ${RPM_SET2}; do \
${ECHO} $$R; \
- rpm -i ${RPMFLAGS} ${RPMDIR}/$$R; \
+ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
done
@${ECHO} ${RPM_RPM}
- @rpm -i ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_RPM}
+ @rpm -U ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_RPM}
@brandelf -t Linux ${PREFIX}/bin/rpm
@for R in ${RPM_SET3}; do \
${ECHO} $$R; \
- rpm -i ${RPMFLAGS} ${RPMDIR}/$$R; \
+ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
done
#
# Install updates
diff --git a/emulators/linux_base-62/Makefile b/emulators/linux_base-62/Makefile
index 4b2e965be041..8a29232ab236 100644
--- a/emulators/linux_base-62/Makefile
+++ b/emulators/linux_base-62/Makefile
@@ -156,23 +156,23 @@ do-install:
#
@for R in ${RPM_SET1}; do \
${ECHO} $$R; \
- rpm -i ${RPMFLAGS} ${RPMDIR}/$$R; \
+ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
done
@${ECHO} ${RPM_LDCONFIG}
- @rpm -i ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_LDCONFIG}
+ @rpm -U ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_LDCONFIG}
@brandelf -t Linux ${PREFIX}/sbin/ldconfig
@${PREFIX}/sbin/ldconfig
@${TOUCH} ${PREFIX}/etc/ld.so.conf
@for R in ${RPM_SET2}; do \
${ECHO} $$R; \
- rpm -i ${RPMFLAGS} ${RPMDIR}/$$R; \
+ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
done
@${ECHO} ${RPM_RPM}
- @rpm -i ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_RPM}
+ @rpm -U ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_RPM}
@brandelf -t Linux ${PREFIX}/bin/rpm
@for R in ${RPM_SET3}; do \
${ECHO} $$R; \
- rpm -i ${RPMFLAGS} ${RPMDIR}/$$R; \
+ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
done
#
# Install updates
diff --git a/emulators/linux_base-8/Makefile b/emulators/linux_base-8/Makefile
index 4b2e965be041..8a29232ab236 100644
--- a/emulators/linux_base-8/Makefile
+++ b/emulators/linux_base-8/Makefile
@@ -156,23 +156,23 @@ do-install:
#
@for R in ${RPM_SET1}; do \
${ECHO} $$R; \
- rpm -i ${RPMFLAGS} ${RPMDIR}/$$R; \
+ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
done
@${ECHO} ${RPM_LDCONFIG}
- @rpm -i ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_LDCONFIG}
+ @rpm -U ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_LDCONFIG}
@brandelf -t Linux ${PREFIX}/sbin/ldconfig
@${PREFIX}/sbin/ldconfig
@${TOUCH} ${PREFIX}/etc/ld.so.conf
@for R in ${RPM_SET2}; do \
${ECHO} $$R; \
- rpm -i ${RPMFLAGS} ${RPMDIR}/$$R; \
+ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
done
@${ECHO} ${RPM_RPM}
- @rpm -i ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_RPM}
+ @rpm -U ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_RPM}
@brandelf -t Linux ${PREFIX}/bin/rpm
@for R in ${RPM_SET3}; do \
${ECHO} $$R; \
- rpm -i ${RPMFLAGS} ${RPMDIR}/$$R; \
+ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
done
#
# Install updates
diff --git a/emulators/linux_base-rh-9/Makefile b/emulators/linux_base-rh-9/Makefile
index 4b2e965be041..8a29232ab236 100644
--- a/emulators/linux_base-rh-9/Makefile
+++ b/emulators/linux_base-rh-9/Makefile
@@ -156,23 +156,23 @@ do-install:
#
@for R in ${RPM_SET1}; do \
${ECHO} $$R; \
- rpm -i ${RPMFLAGS} ${RPMDIR}/$$R; \
+ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
done
@${ECHO} ${RPM_LDCONFIG}
- @rpm -i ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_LDCONFIG}
+ @rpm -U ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_LDCONFIG}
@brandelf -t Linux ${PREFIX}/sbin/ldconfig
@${PREFIX}/sbin/ldconfig
@${TOUCH} ${PREFIX}/etc/ld.so.conf
@for R in ${RPM_SET2}; do \
${ECHO} $$R; \
- rpm -i ${RPMFLAGS} ${RPMDIR}/$$R; \
+ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
done
@${ECHO} ${RPM_RPM}
- @rpm -i ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_RPM}
+ @rpm -U ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_RPM}
@brandelf -t Linux ${PREFIX}/bin/rpm
@for R in ${RPM_SET3}; do \
${ECHO} $$R; \
- rpm -i ${RPMFLAGS} ${RPMDIR}/$$R; \
+ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
done
#
# Install updates
diff --git a/emulators/linux_base-suse-9.1/Makefile b/emulators/linux_base-suse-9.1/Makefile
index 4b2e965be041..8a29232ab236 100644
--- a/emulators/linux_base-suse-9.1/Makefile
+++ b/emulators/linux_base-suse-9.1/Makefile
@@ -156,23 +156,23 @@ do-install:
#
@for R in ${RPM_SET1}; do \
${ECHO} $$R; \
- rpm -i ${RPMFLAGS} ${RPMDIR}/$$R; \
+ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
done
@${ECHO} ${RPM_LDCONFIG}
- @rpm -i ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_LDCONFIG}
+ @rpm -U ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_LDCONFIG}
@brandelf -t Linux ${PREFIX}/sbin/ldconfig
@${PREFIX}/sbin/ldconfig
@${TOUCH} ${PREFIX}/etc/ld.so.conf
@for R in ${RPM_SET2}; do \
${ECHO} $$R; \
- rpm -i ${RPMFLAGS} ${RPMDIR}/$$R; \
+ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
done
@${ECHO} ${RPM_RPM}
- @rpm -i ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_RPM}
+ @rpm -U ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_RPM}
@brandelf -t Linux ${PREFIX}/bin/rpm
@for R in ${RPM_SET3}; do \
${ECHO} $$R; \
- rpm -i ${RPMFLAGS} ${RPMDIR}/$$R; \
+ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
done
#
# Install updates
diff --git a/emulators/linux_base-suse-9.2/Makefile b/emulators/linux_base-suse-9.2/Makefile
index 4b2e965be041..8a29232ab236 100644
--- a/emulators/linux_base-suse-9.2/Makefile
+++ b/emulators/linux_base-suse-9.2/Makefile
@@ -156,23 +156,23 @@ do-install:
#
@for R in ${RPM_SET1}; do \
${ECHO} $$R; \
- rpm -i ${RPMFLAGS} ${RPMDIR}/$$R; \
+ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
done
@${ECHO} ${RPM_LDCONFIG}
- @rpm -i ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_LDCONFIG}
+ @rpm -U ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_LDCONFIG}
@brandelf -t Linux ${PREFIX}/sbin/ldconfig
@${PREFIX}/sbin/ldconfig
@${TOUCH} ${PREFIX}/etc/ld.so.conf
@for R in ${RPM_SET2}; do \
${ECHO} $$R; \
- rpm -i ${RPMFLAGS} ${RPMDIR}/$$R; \
+ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
done
@${ECHO} ${RPM_RPM}
- @rpm -i ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_RPM}
+ @rpm -U ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_RPM}
@brandelf -t Linux ${PREFIX}/bin/rpm
@for R in ${RPM_SET3}; do \
${ECHO} $$R; \
- rpm -i ${RPMFLAGS} ${RPMDIR}/$$R; \
+ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
done
#
# Install updates
diff --git a/emulators/linux_base-suse-9.3/Makefile b/emulators/linux_base-suse-9.3/Makefile
index 4b2e965be041..8a29232ab236 100644
--- a/emulators/linux_base-suse-9.3/Makefile
+++ b/emulators/linux_base-suse-9.3/Makefile
@@ -156,23 +156,23 @@ do-install:
#
@for R in ${RPM_SET1}; do \
${ECHO} $$R; \
- rpm -i ${RPMFLAGS} ${RPMDIR}/$$R; \
+ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
done
@${ECHO} ${RPM_LDCONFIG}
- @rpm -i ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_LDCONFIG}
+ @rpm -U ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_LDCONFIG}
@brandelf -t Linux ${PREFIX}/sbin/ldconfig
@${PREFIX}/sbin/ldconfig
@${TOUCH} ${PREFIX}/etc/ld.so.conf
@for R in ${RPM_SET2}; do \
${ECHO} $$R; \
- rpm -i ${RPMFLAGS} ${RPMDIR}/$$R; \
+ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
done
@${ECHO} ${RPM_RPM}
- @rpm -i ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_RPM}
+ @rpm -U ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_RPM}
@brandelf -t Linux ${PREFIX}/bin/rpm
@for R in ${RPM_SET3}; do \
${ECHO} $$R; \
- rpm -i ${RPMFLAGS} ${RPMDIR}/$$R; \
+ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
done
#
# Install updates
diff --git a/emulators/linux_base/Makefile b/emulators/linux_base/Makefile
index 4b2e965be041..8a29232ab236 100644
--- a/emulators/linux_base/Makefile
+++ b/emulators/linux_base/Makefile
@@ -156,23 +156,23 @@ do-install:
#
@for R in ${RPM_SET1}; do \
${ECHO} $$R; \
- rpm -i ${RPMFLAGS} ${RPMDIR}/$$R; \
+ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
done
@${ECHO} ${RPM_LDCONFIG}
- @rpm -i ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_LDCONFIG}
+ @rpm -U ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_LDCONFIG}
@brandelf -t Linux ${PREFIX}/sbin/ldconfig
@${PREFIX}/sbin/ldconfig
@${TOUCH} ${PREFIX}/etc/ld.so.conf
@for R in ${RPM_SET2}; do \
${ECHO} $$R; \
- rpm -i ${RPMFLAGS} ${RPMDIR}/$$R; \
+ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
done
@${ECHO} ${RPM_RPM}
- @rpm -i ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_RPM}
+ @rpm -U ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_RPM}
@brandelf -t Linux ${PREFIX}/bin/rpm
@for R in ${RPM_SET3}; do \
${ECHO} $$R; \
- rpm -i ${RPMFLAGS} ${RPMDIR}/$$R; \
+ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
done
#
# Install updates
generated by cgit (git 2.34.1) at 2024-09-25 23:20:39 +0800