(1) Move /var/db/pkg/.mkversion to /var/db/port.mkversion.

Requested by:	jkh

(2) Don't let user pkg_delete the "upgrade kits".
Requested by:	Toshihiko Kodama <kodama@ayame.mfd.cs.fujitsu.co.jp>

18 files changed, 66 insertions, 12 deletions

diff --git a/misc/221upgrade/Makefile b/misc/221upgrade/Makefile
index b5d121b..3772bb5 100644
--- a/misc/221upgrade/Makefile
+++ b/misc/221upgrade/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 Apr 1997
 # Whom:			asami
 #
-# $Id: Makefile,v 1.4 1999/03/10 22:10:47 asami Exp $
+# $Id: Makefile,v 1.5 1999/03/29 07:09:42 asami Exp $
 #
 
 DISTNAME=	221upgrade-1998.03.08
@@ -28,4 +28,8 @@ do-install:
 	${SED} -e "s/%%VERSION%%/${BSDPORTMKVERSION}/" ${PKGDIR}/INSTALL \
 		> ${PKGINSTALL}
 
+deinstall:
+	@${ECHO} "You can't delete this port."
+	@${FALSE}
+
 .include <bsd.port.post.mk>
diff --git a/misc/221upgrade/pkg-install b/misc/221upgrade/pkg-install
index 83a9f3e..8ed8de6 100644
--- a/misc/221upgrade/pkg-install
+++ b/misc/221upgrade/pkg-install
@@ -2,4 +2,4 @@
 if [ "$2" != "PRE-INSTALL" ]; then
         exit 0
 fi
-echo %%VERSION%% > /var/db/pkg/.mkversion
+echo %%VERSION%% > /var/db/port.mkversion
diff --git a/misc/221upgrade/pkg-req b/misc/221upgrade/pkg-req
new file mode 100644
index 0000000..1eb81c6
--- /dev/null
+++ b/misc/221upgrade/pkg-req
@@ -0,0 +1,5 @@
+#!/bin/sh
+if [ $2 = "DEINSTALL" ]; then
+  echo "Package $1 cannot be removed -- to do so will render your system useless."
+  exit 1
+fi
diff --git a/misc/222upgrade/Makefile b/misc/222upgrade/Makefile
index 02c7f45..56a708b 100644
--- a/misc/222upgrade/Makefile
+++ b/misc/222upgrade/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 Apr 1997
 # Whom:			asami
 #
-# $Id: Makefile,v 1.4 1999/03/10 22:10:49 asami Exp $
+# $Id: Makefile,v 1.5 1999/03/29 07:09:44 asami Exp $
 #
 
 DISTNAME=	222upgrade-1998.03.08
@@ -28,4 +28,8 @@ do-install:
 	${SED} -e "s/%%VERSION%%/${BSDPORTMKVERSION}/" ${PKGDIR}/INSTALL \
 		> ${PKGINSTALL}
 
+deinstall:
+	@${ECHO} "You can't delete this port."
+	@${FALSE}
+
 .include <bsd.port.post.mk>
diff --git a/misc/222upgrade/pkg-install b/misc/222upgrade/pkg-install
index 83a9f3e..8ed8de6 100644
--- a/misc/222upgrade/pkg-install
+++ b/misc/222upgrade/pkg-install
@@ -2,4 +2,4 @@
 if [ "$2" != "PRE-INSTALL" ]; then
         exit 0
 fi
-echo %%VERSION%% > /var/db/pkg/.mkversion
+echo %%VERSION%% > /var/db/port.mkversion
diff --git a/misc/222upgrade/pkg-req b/misc/222upgrade/pkg-req
new file mode 100644
index 0000000..1eb81c6
--- /dev/null
+++ b/misc/222upgrade/pkg-req
@@ -0,0 +1,5 @@
+#!/bin/sh
+if [ $2 = "DEINSTALL" ]; then
+  echo "Package $1 cannot be removed -- to do so will render your system useless."
+  exit 1
+fi
diff --git a/misc/225upgrade/Makefile b/misc/225upgrade/Makefile
index 98a580e..299abbd 100644
--- a/misc/225upgrade/Makefile
+++ b/misc/225upgrade/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 Nov 1997
 # Whom:			asami
 #
-# $Id: Makefile,v 1.4 1999/03/10 22:10:50 asami Exp $
+# $Id: Makefile,v 1.5 1999/03/29 07:09:45 asami Exp $
 #
 
 DISTNAME=	225upgrade-1998.03.08
@@ -28,4 +28,8 @@ do-install:
 	${SED} -e "s/%%VERSION%%/${BSDPORTMKVERSION}/" ${PKGDIR}/INSTALL \
 		> ${PKGINSTALL}
 
+deinstall:
+	@${ECHO} "You can't delete this port."
+	@${FALSE}
+
 .include <bsd.port.post.mk>
diff --git a/misc/225upgrade/pkg-install b/misc/225upgrade/pkg-install
index 83a9f3e..8ed8de6 100644
--- a/misc/225upgrade/pkg-install
+++ b/misc/225upgrade/pkg-install
@@ -2,4 +2,4 @@
 if [ "$2" != "PRE-INSTALL" ]; then
         exit 0
 fi
-echo %%VERSION%% > /var/db/pkg/.mkversion
+echo %%VERSION%% > /var/db/port.mkversion
diff --git a/misc/225upgrade/pkg-req b/misc/225upgrade/pkg-req
new file mode 100644
index 0000000..1eb81c6
--- /dev/null
+++ b/misc/225upgrade/pkg-req
@@ -0,0 +1,5 @@
+#!/bin/sh
+if [ $2 = "DEINSTALL" ]; then
+  echo "Package $1 cannot be removed -- to do so will render your system useless."
+  exit 1
+fi
diff --git a/misc/227upgrade/Makefile b/misc/227upgrade/Makefile
index f3c51db..854e3af 100644
--- a/misc/227upgrade/Makefile
+++ b/misc/227upgrade/Makefile
@@ -3,7 +3,7 @@
 # Date created:		17 Dec 1998
 # Whom:			asami
 #
-# $Id: Makefile,v 1.4 1999/03/10 22:10:50 asami Exp $
+# $Id: Makefile,v 1.5 1999/03/29 07:09:46 asami Exp $
 #
 
 DISTNAME=	227upgrade-1998.03.08
@@ -28,4 +28,8 @@ do-install:
 	${SED} -e "s/%%VERSION%%/${BSDPORTMKVERSION}/" ${PKGDIR}/INSTALL \
 		> ${PKGINSTALL}
 
+deinstall:
+	@${ECHO} "You can't delete this port."
+	@${FALSE}
+
 .include <bsd.port.post.mk>
diff --git a/misc/227upgrade/pkg-install b/misc/227upgrade/pkg-install
index 83a9f3e..8ed8de6 100644
--- a/misc/227upgrade/pkg-install
+++ b/misc/227upgrade/pkg-install
@@ -2,4 +2,4 @@
 if [ "$2" != "PRE-INSTALL" ]; then
         exit 0
 fi
-echo %%VERSION%% > /var/db/pkg/.mkversion
+echo %%VERSION%% > /var/db/port.mkversion
diff --git a/misc/227upgrade/pkg-req b/misc/227upgrade/pkg-req
new file mode 100644
index 0000000..1eb81c6
--- /dev/null
+++ b/misc/227upgrade/pkg-req
@@ -0,0 +1,5 @@
+#!/bin/sh
+if [ $2 = "DEINSTALL" ]; then
+  echo "Package $1 cannot be removed -- to do so will render your system useless."
+  exit 1
+fi
diff --git a/misc/30upgrade/Makefile b/misc/30upgrade/Makefile
index 23d1115..1adb98f 100644
--- a/misc/30upgrade/Makefile
+++ b/misc/30upgrade/Makefile
@@ -3,7 +3,7 @@
 # Date created:		17 Dec 1998
 # Whom:			asami
 #
-# $Id: Makefile,v 1.4 1999/03/10 22:10:50 asami Exp $
+# $Id: Makefile,v 1.5 1999/03/29 07:09:46 asami Exp $
 #
 
 DISTNAME=	30upgrade-1998.03.08
@@ -28,4 +28,8 @@ do-install:
 	${SED} -e "s/%%VERSION%%/${BSDPORTMKVERSION}/" ${PKGDIR}/INSTALL \
 		> ${PKGINSTALL}
 
+deinstall:
+	@${ECHO} "You can't delete this port."
+	@${FALSE}
+
 .include <bsd.port.post.mk>
diff --git a/misc/30upgrade/pkg-install b/misc/30upgrade/pkg-install
index 83a9f3e..8ed8de6 100644
--- a/misc/30upgrade/pkg-install
+++ b/misc/30upgrade/pkg-install
@@ -2,4 +2,4 @@
 if [ "$2" != "PRE-INSTALL" ]; then
         exit 0
 fi
-echo %%VERSION%% > /var/db/pkg/.mkversion
+echo %%VERSION%% > /var/db/port.mkversion
diff --git a/misc/30upgrade/pkg-req b/misc/30upgrade/pkg-req
new file mode 100644
index 0000000..1eb81c6
--- /dev/null
+++ b/misc/30upgrade/pkg-req
@@ -0,0 +1,5 @@
+#!/bin/sh
+if [ $2 = "DEINSTALL" ]; then
+  echo "Package $1 cannot be removed -- to do so will render your system useless."
+  exit 1
+fi
diff --git a/misc/31upgrade/Makefile b/misc/31upgrade/Makefile
index 46052f5..689cf90 100644
--- a/misc/31upgrade/Makefile
+++ b/misc/31upgrade/Makefile
@@ -3,7 +3,7 @@
 # Date created:		8 Mar 1999
 # Whom:			asami
 #
-# $Id: Makefile,v 1.3 1999/03/10 22:10:51 asami Exp $
+# $Id: Makefile,v 1.4 1999/03/29 07:09:47 asami Exp $
 #
 
 DISTNAME=	31upgrade-1999.03.08
@@ -28,4 +28,8 @@ do-install:
 	${SED} -e "s/%%VERSION%%/${BSDPORTMKVERSION}/" ${PKGDIR}/INSTALL \
 		> ${PKGINSTALL}
 
+deinstall:
+	@${ECHO} "You can't delete this port."
+	@${FALSE}
+
 .include <bsd.port.post.mk>
diff --git a/misc/31upgrade/pkg-install b/misc/31upgrade/pkg-install
index 83a9f3e..8ed8de6 100644
--- a/misc/31upgrade/pkg-install
+++ b/misc/31upgrade/pkg-install
@@ -2,4 +2,4 @@
 if [ "$2" != "PRE-INSTALL" ]; then
         exit 0
 fi
-echo %%VERSION%% > /var/db/pkg/.mkversion
+echo %%VERSION%% > /var/db/port.mkversion
diff --git a/misc/31upgrade/pkg-req b/misc/31upgrade/pkg-req
new file mode 100644
index 0000000..1eb81c6
--- /dev/null
+++ b/misc/31upgrade/pkg-req
@@ -0,0 +1,5 @@
+#!/bin/sh
+if [ $2 = "DEINSTALL" ]; then
+  echo "Package $1 cannot be removed -- to do so will render your system useless."
+  exit 1
+fi