People running 3.4R need the new libc_r.so.4 now. Adjust all the old

3*upgrade ports accordingly.

13 files changed, 65 insertions, 9 deletions

diff --git a/misc/30upgrade/Makefile b/misc/30upgrade/Makefile
index dbe9647..9394b75 100644
--- a/misc/30upgrade/Makefile
+++ b/misc/30upgrade/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-DISTNAME=	30upgrade-1999.05.20
+DISTNAME=	30upgrade-1999.01.05
 CATEGORIES=	misc
 DISTFILES=	# empty
 
@@ -16,8 +16,8 @@ MAINTAINER=	asami@FreeBSD.org
 
 .if !defined(PACKAGE_BUILDING)
 BROKEN=		this \"port\" is for building packages for distribution only, please get the package from http://www.freebsd.org/ports/ if you need an upgrade
-.elif ${OSVERSION} < 300000
-FORBIDDEN=	this needs to be built on a 3-stable system
+.elif ${OSVERSION} < 340000
+FORBIDDEN=	this needs to be built on a recent 3-stable system
 .endif
 NO_MTREE=	yes
 PREFIX=		/
diff --git a/misc/30upgrade/pkg-plist b/misc/30upgrade/pkg-plist
index ed4842a..3bb89fa 100644
--- a/misc/30upgrade/pkg-plist
+++ b/misc/30upgrade/pkg-plist
@@ -11,6 +11,7 @@ usr/bin/perlcc
 usr/bin/perldoc
 usr/bin/sperl5.00503
 usr/bin/suidperl
+usr/lib/libc_r.so.4
 usr/lib/libperl.a
 usr/lib/libperl.so
 usr/lib/libperl.so.3
diff --git a/misc/31upgrade/Makefile b/misc/31upgrade/Makefile
index 86d1ac4..28796bd 100644
--- a/misc/31upgrade/Makefile
+++ b/misc/31upgrade/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-DISTNAME=	31upgrade-1999.05.20
+DISTNAME=	31upgrade-1999.01.05
 CATEGORIES=	misc
 DISTFILES=	# empty
 
@@ -16,8 +16,8 @@ MAINTAINER=	asami@FreeBSD.org
 
 .if !defined(PACKAGE_BUILDING)
 BROKEN=		this \"port\" is for building packages for distribution only, please get the package from http://www.freebsd.org/ports/ if you need an upgrade
-.elif ${OSVERSION} < 310000
-FORBIDDEN=	this needs to be built on a 3-stable system
+.elif ${OSVERSION} < 340000
+FORBIDDEN=	this needs to be built on a recent 3-stable system
 .endif
 NO_MTREE=	yes
 PREFIX=		/
diff --git a/misc/31upgrade/pkg-plist b/misc/31upgrade/pkg-plist
index 55cdea5..6ef2100 100644
--- a/misc/31upgrade/pkg-plist
+++ b/misc/31upgrade/pkg-plist
@@ -9,6 +9,7 @@ usr/bin/perlcc
 usr/bin/perldoc
 usr/bin/sperl5.00503
 usr/bin/suidperl
+usr/lib/libc_r.so.4
 usr/lib/libperl.a
 usr/lib/libperl.so
 usr/lib/libperl.so.3
diff --git a/misc/32upgrade/Makefile b/misc/32upgrade/Makefile
index d93b152..5a68cc0 100644
--- a/misc/32upgrade/Makefile
+++ b/misc/32upgrade/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-DISTNAME=	32upgrade-1999.05.20
+DISTNAME=	32upgrade-1999.01.05
 CATEGORIES=	misc
 DISTFILES=	# empty
 
@@ -16,8 +16,8 @@ MAINTAINER=	asami@FreeBSD.org
 
 .if !defined(PACKAGE_BUILDING)
 BROKEN=		this \"port\" is for building packages for distribution only, please get the package from http://www.freebsd.org/ports/ if you need an upgrade
-.elif ${OSVERSION} < 320000
-FORBIDDEN=	this needs to be built on a 3-stable system
+.elif ${OSVERSION} < 340000
+FORBIDDEN=	this needs to be built on a recent 3-stable system
 .endif
 NO_MTREE=	yes
 PREFIX=		/
diff --git a/misc/32upgrade/pkg-plist b/misc/32upgrade/pkg-plist
index b641c83..08e809b 100644
--- a/misc/32upgrade/pkg-plist
+++ b/misc/32upgrade/pkg-plist
@@ -1 +1,2 @@
+usr/lib/libc_r.so.4
 usr/bin/fetch
diff --git a/misc/34upgrade/Makefile b/misc/34upgrade/Makefile
new file mode 100644
index 0000000..c7fc76f
--- /dev/null
+++ b/misc/34upgrade/Makefile
@@ -0,0 +1,35 @@
+# New ports collection makefile for:	3.3/3.4R to 3-stable upgrade kit
+# Version required:	n/a
+# Date created:		5 Jan 2000
+# Whom:			asami
+#
+# $FreeBSD$
+#
+
+DISTNAME=	34upgrade-2000.01.05
+CATEGORIES=	misc
+DISTFILES=	# empty
+
+MAINTAINER=	asami@FreeBSD.org
+
+.include <bsd.port.pre.mk>
+
+.if !defined(PACKAGE_BUILDING)
+BROKEN=		this \"port\" is for building packages for distribution only, please get the package from http://www.freebsd.org/ports/ if you need an upgrade
+.elif ${OSVERSION} < 340000
+FORBIDDEN=	this needs to be built on a recent 3-stable system
+.endif
+NO_MTREE=	yes
+PREFIX=		/
+NO_BUILD=	yes
+PKGINSTALL=	${WRKDIR}/INSTALL
+
+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/34upgrade/pkg-comment b/misc/34upgrade/pkg-comment
new file mode 100644
index 0000000..86b177c
--- /dev/null
+++ b/misc/34upgrade/pkg-comment
@@ -0,0 +1 @@
+A convenience package to upgrade your 3.3 or 3.4 system to 3-stable for ports
diff --git a/misc/34upgrade/pkg-descr b/misc/34upgrade/pkg-descr
new file mode 100644
index 0000000..d71e734
--- /dev/null
+++ b/misc/34upgrade/pkg-descr
@@ -0,0 +1,5 @@
+This package will allow you to upgrade your 3.3R or 3.4R system to
+3-stable, so you can compile and use all ports in ports-current.
+
+Satoshi
+asami@freebsd.org
diff --git a/misc/34upgrade/pkg-install b/misc/34upgrade/pkg-install
new file mode 100644
index 0000000..8ed8de6
--- /dev/null
+++ b/misc/34upgrade/pkg-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+if [ "$2" != "PRE-INSTALL" ]; then
+        exit 0
+fi
+echo %%VERSION%% > /var/db/port.mkversion
diff --git a/misc/34upgrade/pkg-plist b/misc/34upgrade/pkg-plist
new file mode 100644
index 0000000..cec34ab
--- /dev/null
+++ b/misc/34upgrade/pkg-plist
@@ -0,0 +1 @@
+usr/lib/libc_r.so.4
diff --git a/misc/34upgrade/pkg-req b/misc/34upgrade/pkg-req
new file mode 100644
index 0000000..1eb81c6
--- /dev/null
+++ b/misc/34upgrade/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/Makefile b/misc/Makefile
index 424f631..27e7cbb 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -8,6 +8,7 @@
     SUBDIR += 30upgrade
     SUBDIR += 31upgrade
     SUBDIR += 32upgrade
+    SUBDIR += 34upgrade
     SUBDIR += Howto
     SUBDIR += aclgen
     SUBDIR += acron