aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcel <marcel@FreeBSD.org>2000-01-10 21:04:34 +0800
committermarcel <marcel@FreeBSD.org>2000-01-10 21:04:34 +0800
commit861c872e509c83b37ca939216d484f730afa8443 (patch)
treed14e6fe4e08b9c0b97207aacbd0ed57748b53611
parent0c1ccfded5ccead63babc681228c41c30c61cb74 (diff)
downloadfreebsd-ports-gnome-861c872e509c83b37ca939216d484f730afa8443.tar.gz
freebsd-ports-gnome-861c872e509c83b37ca939216d484f730afa8443.tar.zst
freebsd-ports-gnome-861c872e509c83b37ca939216d484f730afa8443.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.
-rw-r--r--devel/linux_devtools-6/Makefile2
-rw-r--r--devel/linux_devtools-7/Makefile2
-rw-r--r--devel/linux_devtools/Makefile2
-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
11 files changed, 43 insertions, 43 deletions
diff --git a/devel/linux_devtools-6/Makefile b/devel/linux_devtools-6/Makefile
index ecb33a678112..d433ce40d8ab 100644
--- a/devel/linux_devtools-6/Makefile
+++ b/devel/linux_devtools-6/Makefile
@@ -120,7 +120,7 @@ do-install:
#
@for R in ${DISTFILES}; do \
${ECHO} $$R; \
- rpm -i ${RPMFLAGS} ${RPMDIR}/$$R; \
+ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
done
#
# Install updates
diff --git a/devel/linux_devtools-7/Makefile b/devel/linux_devtools-7/Makefile
index ecb33a678112..d433ce40d8ab 100644
--- a/devel/linux_devtools-7/Makefile
+++ b/devel/linux_devtools-7/Makefile
@@ -120,7 +120,7 @@ do-install:
#
@for R in ${DISTFILES}; do \
${ECHO} $$R; \
- rpm -i ${RPMFLAGS} ${RPMDIR}/$$R; \
+ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
done
#
# Install updates
diff --git a/devel/linux_devtools/Makefile b/devel/linux_devtools/Makefile
index ecb33a678112..d433ce40d8ab 100644
--- a/devel/linux_devtools/Makefile
+++ b/devel/linux_devtools/Makefile
@@ -120,7 +120,7 @@ do-install:
#
@for R in ${DISTFILES}; do \
${ECHO} $$R; \
- rpm -i ${RPMFLAGS} ${RPMDIR}/$$R; \
+ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
done
#
# Install updates
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