Update misc/compat4x for 5.0/i386 to 5.0.20030218.

Have a separate pkg-plist for each platform.

8 files changed, 69 insertions, 36 deletions

diff --git a/misc/compat4x/Makefile b/misc/compat4x/Makefile
index 607676c25c0c..631dce1bfeec 100644
--- a/misc/compat4x/Makefile
+++ b/misc/compat4x/Makefile
@@ -15,6 +15,7 @@ DISTFILES=	${COMPAT4X_DISTFILES}
 DIST_SUBDIR=	${ARCH}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A convenience package to install the compat4x libraries
 
 WRKSRC=		${WRKDIR}/usr/lib/compat
 NO_MTREE=	yes
@@ -31,8 +32,9 @@ COMPAT4X_OSVERSION=	5.0
 COMPAT4X_OSBRANCH=	CURRENT
 COMPAT4X_MASTER_SITES=	ftp://current.FreeBSD.org/pub/FreeBSD/%SUBDIR%/
 .if ${ARCH} == i386
-COMPAT4X_OSRELDATE=	20021221
-COMPAT4X_DISTFILES=	${PORTNAME}.aa
+COMPAT4X_OSRELDATE=	20030218
+COMPAT4X_DISTFILES=	${PORTNAME}.aa \
+			${PORTNAME}.ab
 .elif ${ARCH} == alpha
 FORBIDDEN=		"FreeBSD-SA-02:28.resolv - buffer overflow in resolver in libc"
 
@@ -47,7 +49,6 @@ COMPAT4X_DISTFILES=	${PORTNAME}.aa \
 .else
 IGNORE=			unsupported architecture
 .endif
-CURRENT_ONLY=		""
 .else
 COMPAT4X_OSVERSION=	4.7
 .if ${ARCH} == i386
@@ -63,17 +64,13 @@ IGNORE=			unsupported architecture
 .endif
 .endif
 
-CURRENT_ONLY?=		"@comment "
-
+PLIST=	${.CURDIR}/pkg-plist.${ARCH}-freebsd${OSREL:C/\..*//}
 .if ${ARCH} == i386
 I386_ONLY=		""
 .else
 I386_ONLY=		"@comment "
 .endif
 
-PLIST_SUB+=		CURRENT_ONLY:=${CURRENT_ONLY} \
-			I386_ONLY:=${I386_ONLY}
-
 OPENSSL_LIBS=		libcrypto.so.1 libssl.so.1
 .if defined(FORCE_VULNERABLE_OPENSSL)
 FORBIDDEN=		"FreeBSD-SA-02:33.openssl - openssl contains multiple vulnerabilities"
diff --git a/misc/compat4x/distinfo b/misc/compat4x/distinfo
index 183e5a687e86..5bc1092fa577 100644
--- a/misc/compat4x/distinfo
+++ b/misc/compat4x/distinfo
@@ -9,4 +9,5 @@ MD5 (alpha/5.0.20020809/compat4x.af) = 6b7e63768a219393a0f4ab96aa2b5b1a
 MD5 (alpha/5.0.20020809/compat4x.ag) = 8e76cc5620364f4ab46e93db8d5cdf6a
 MD5 (i386/4.7/compat4x.aa) = 6d4c2cdf62264901c90182598c64780a
 MD5 (i386/4.7/compat4x.ab) = 0712a862736bd8abc1023f027a654399
-MD5 (i386/5.0.20021221/compat4x.aa) = 2ff39cf49554775319993a42db82c4f4
+MD5 (i386/5.0.20030218/compat4x.aa) = 507dbf3b2a7a2e50ad7c6181b091238d
+MD5 (i386/5.0.20030218/compat4x.ab) = e9b91ffc2d001a425981013b163dec58
diff --git a/misc/compat4x/pkg-comment b/misc/compat4x/pkg-comment
deleted file mode 100644
index 829f29a62e1c..000000000000
--- a/misc/compat4x/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A convenience package to install the compat4x libraries
diff --git a/misc/compat4x/pkg-plist b/misc/compat4x/pkg-plist
deleted file mode 100644
index 8076e2b3ee66..000000000000
--- a/misc/compat4x/pkg-plist
+++ /dev/null
@@ -1,26 +0,0 @@
-etc/rc.d/000.compat4x.sh
-%%CURRENT_ONLY:%%lib/compat/libc.so.4
-%%CURRENT_ONLY:%%@unexec if [ -e %B/libc_r.so.4.compat3x ]; then ln -sf libc_r.so.4.compat3x %B/libc_r.so.4; else rm %B/libc_r.so.4; fi
-%%CURRENT_ONLY:%%lib/compat/libc_r.so.4.compat4x
-%%CURRENT_ONLY:%%@exec ln -sf %f %B/libc_r.so.4
-%%FORBIDDEN:%%lib/compat/libcrypto.so.1
-%%CURRENT_ONLY:%%lib/compat/libedit.so.3
-lib/compat/libfetch.so.2
-%%CURRENT_ONLY:%%@unexec if [ -e %B/libperl.so.3.compat3x ]; then ln -sf libperl.so.3.compat3x %B/libperl.so.3; else rm %B/libperl.so.3; fi
-%%CURRENT_ONLY:%%lib/compat/libperl.so.3.compat4x
-%%CURRENT_ONLY:%%@exec ln -sf %f %B/libperl.so.3
-%%CURRENT_ONLY:%%lib/compat/libpam.so.1
-%%CURRENT_ONLY:%%%%I386_ONLY:%%lib/compat/libposix1e.so.2
-%%FORBIDDEN:%%lib/compat/libssl.so.1
-%%CURRENT_ONLY:%%lib/compat/libstdc++.so.3
-%%CURRENT_ONLY:%%lib/compat/libusb.so.0
-%%CURRENT_ONLY:%%lib/compat/pam_cleartext_pass_ok.so
-%%CURRENT_ONLY:%%lib/compat/pam_deny.so
-%%CURRENT_ONLY:%%lib/compat/pam_opie.so
-%%CURRENT_ONLY:%%lib/compat/pam_permit.so
-%%CURRENT_ONLY:%%lib/compat/pam_radius.so
-%%CURRENT_ONLY:%%lib/compat/pam_skey.so
-%%CURRENT_ONLY:%%lib/compat/pam_ssh.so
-%%CURRENT_ONLY:%%lib/compat/pam_tacplus.so
-%%CURRENT_ONLY:%%lib/compat/pam_unix.so
-@unexec rmdir %D/lib/compat 2>/dev/null || true
diff --git a/misc/compat4x/pkg-plist.alpha-freebsd4 b/misc/compat4x/pkg-plist.alpha-freebsd4
new file mode 100644
index 000000000000..009c01e93b31
--- /dev/null
+++ b/misc/compat4x/pkg-plist.alpha-freebsd4
@@ -0,0 +1,5 @@
+etc/rc.d/000.compat4x.sh
+%%FORBIDDEN:%%lib/compat/libcrypto.so.1
+lib/compat/libfetch.so.2
+%%FORBIDDEN:%%lib/compat/libssl.so.1
+@unexec rmdir %D/lib/compat 2>/dev/null || true
diff --git a/misc/compat4x/pkg-plist.alpha-freebsd5 b/misc/compat4x/pkg-plist.alpha-freebsd5
new file mode 100644
index 000000000000..242468a4719a
--- /dev/null
+++ b/misc/compat4x/pkg-plist.alpha-freebsd5
@@ -0,0 +1,25 @@
+etc/rc.d/000.compat4x.sh
+lib/compat/libc.so.4
+@unexec if [ -e %B/libc_r.so.4.compat3x ]; then ln -sf libc_r.so.4.compat3x %B/libc_r.so.4; else rm %B/libc_r.so.4; fi
+lib/compat/libc_r.so.4.compat4x
+@exec ln -sf %f %B/libc_r.so.4
+%%FORBIDDEN:%%lib/compat/libcrypto.so.1
+lib/compat/libedit.so.3
+lib/compat/libfetch.so.2
+@unexec if [ -e %B/libperl.so.3.compat3x ]; then ln -sf libperl.so.3.compat3x %B/libperl.so.3; else rm %B/libperl.so.3; fi
+lib/compat/libperl.so.3.compat4x
+@exec ln -sf %f %B/libperl.so.3
+lib/compat/libpam.so.1
+%%FORBIDDEN:%%lib/compat/libssl.so.1
+lib/compat/libstdc++.so.3
+lib/compat/libusb.so.0
+lib/compat/pam_cleartext_pass_ok.so
+lib/compat/pam_deny.so
+lib/compat/pam_opie.so
+lib/compat/pam_permit.so
+lib/compat/pam_radius.so
+lib/compat/pam_skey.so
+lib/compat/pam_ssh.so
+lib/compat/pam_tacplus.so
+lib/compat/pam_unix.so
+@unexec rmdir %D/lib/compat 2>/dev/null || true
diff --git a/misc/compat4x/pkg-plist.i386-freebsd4 b/misc/compat4x/pkg-plist.i386-freebsd4
new file mode 100644
index 000000000000..009c01e93b31
--- /dev/null
+++ b/misc/compat4x/pkg-plist.i386-freebsd4
@@ -0,0 +1,5 @@
+etc/rc.d/000.compat4x.sh
+%%FORBIDDEN:%%lib/compat/libcrypto.so.1
+lib/compat/libfetch.so.2
+%%FORBIDDEN:%%lib/compat/libssl.so.1
+@unexec rmdir %D/lib/compat 2>/dev/null || true
diff --git a/misc/compat4x/pkg-plist.i386-freebsd5 b/misc/compat4x/pkg-plist.i386-freebsd5
new file mode 100644
index 000000000000..3c6cbfd7d28d
--- /dev/null
+++ b/misc/compat4x/pkg-plist.i386-freebsd5
@@ -0,0 +1,27 @@
+etc/rc.d/000.compat4x.sh
+lib/compat/libc.so.4
+@unexec if [ -e %B/libc_r.so.4.compat3x ]; then ln -sf libc_r.so.4.compat3x %B/libc_r.so.4; else rm %B/libc_r.so.4; fi
+lib/compat/libc_r.so.4.compat4x
+@exec ln -sf %f %B/libc_r.so.4
+lib/compat/libcrypto.so.2
+lib/compat/libedit.so.3
+lib/compat/libfetch.so.2
+lib/compat/libgmp.so.3
+@unexec if [ -e %B/libperl.so.3.compat3x ]; then ln -sf libperl.so.3.compat3x %B/libperl.so.3; else rm %B/libperl.so.3; fi
+lib/compat/libperl.so.3.compat4x
+@exec ln -sf %f %B/libperl.so.3
+lib/compat/libpam.so.1
+lib/compat/libposix1e.so.2
+lib/compat/libssl.so.2
+lib/compat/libstdc++.so.3
+lib/compat/libusb.so.0
+lib/compat/pam_cleartext_pass_ok.so
+lib/compat/pam_deny.so
+lib/compat/pam_opie.so
+lib/compat/pam_permit.so
+lib/compat/pam_radius.so
+lib/compat/pam_skey.so
+lib/compat/pam_ssh.so
+lib/compat/pam_tacplus.so
+lib/compat/pam_unix.so
+@unexec rmdir %D/lib/compat 2>/dev/null || true