Update misc/compat4x for 5.0/i386 to 5.0.20021221 and fix a fetch

problem.

Update misc/compat4x for 4.x to 4.7 while I'm at it.

3 files changed, 17 insertions, 19 deletions

diff --git a/misc/compat4x/Makefile b/misc/compat4x/Makefile
index 9692156bb95d..607676c25c0c 100644
--- a/misc/compat4x/Makefile
+++ b/misc/compat4x/Makefile
@@ -31,13 +31,8 @@ COMPAT4X_OSVERSION=	5.0
 COMPAT4X_OSBRANCH=	CURRENT
 COMPAT4X_MASTER_SITES=	ftp://current.FreeBSD.org/pub/FreeBSD/%SUBDIR%/
 .if ${ARCH} == i386
-COMPAT4X_OSRELDATE=	20020917
-COMPAT4X_DISTFILES=	${PORTNAME}.aa \
-			${PORTNAME}.ab \
-			${PORTNAME}.ac \
-			${PORTNAME}.ad \
-			${PORTNAME}.ae \
-			${PORTNAME}.af
+COMPAT4X_OSRELDATE=	20021221
+COMPAT4X_DISTFILES=	${PORTNAME}.aa
 .elif ${ARCH} == alpha
 FORBIDDEN=		"FreeBSD-SA-02:28.resolv - buffer overflow in resolver in libc"
 
@@ -54,7 +49,7 @@ IGNORE=			unsupported architecture
 .endif
 CURRENT_ONLY=		""
 .else
-COMPAT4X_OSVERSION=	4.6.2
+COMPAT4X_OSVERSION=	4.7
 .if ${ARCH} == i386
 COMPAT4X_MASTER_SITES=	${MASTER_SITE_FREEBSD_ORG}
 COMPAT4X_DISTFILES=	${PORTNAME}.aa \
@@ -70,7 +65,14 @@ IGNORE=			unsupported architecture
 
 CURRENT_ONLY?=		"@comment "
 
-PLIST_SUB+=		CURRENT_ONLY:=${CURRENT_ONLY}
+.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)
diff --git a/misc/compat4x/distinfo b/misc/compat4x/distinfo
index 6f1dc9ce8a95..183e5a687e86 100644
--- a/misc/compat4x/distinfo
+++ b/misc/compat4x/distinfo
@@ -1,5 +1,5 @@
-MD5 (alpha/4.6.2/compat4x.aa) = 37f95a98a33d5b536feed3deef213648
-MD5 (alpha/4.6.2/compat4x.ab) = 28b859345d06e833b820e2b97a51b083
+MD5 (alpha/4.7/compat4x.aa) = 6f35d1ce24c37339dce2ee46a4231f21
+MD5 (alpha/4.7/compat4x.ab) = c4e5a5c9b59226422f51daec923ffaea
 MD5 (alpha/5.0.20020809/compat4x.aa) = 21317ad52cd242827f812b617e806fa7
 MD5 (alpha/5.0.20020809/compat4x.ab) = 13f3d92036c8ca5ff5449d65f3048a68
 MD5 (alpha/5.0.20020809/compat4x.ac) = 7e8ca14d6903130d4a32591c0e7ef27d
@@ -7,11 +7,6 @@ MD5 (alpha/5.0.20020809/compat4x.ad) = ac7f4c9d033022f02eac64996a4bdaa5
 MD5 (alpha/5.0.20020809/compat4x.ae) = 7bcaee5c5e337de65534bfaf04ef31d3
 MD5 (alpha/5.0.20020809/compat4x.af) = 6b7e63768a219393a0f4ab96aa2b5b1a
 MD5 (alpha/5.0.20020809/compat4x.ag) = 8e76cc5620364f4ab46e93db8d5cdf6a
-MD5 (i386/4.6.2/compat4x.aa) = 7ca8ce6dcc85d16cb393c10588c27aa2
-MD5 (i386/4.6.2/compat4x.ab) = 6ff885268ba4c7c11ccc9a650a582807
-MD5 (i386/5.0.20020917/compat4x.aa) = de66c57b51acb63689549b00073a8e3b
-MD5 (i386/5.0.20020917/compat4x.ab) = 77feee0d3497b67fa98a3c94d1966de5
-MD5 (i386/5.0.20020917/compat4x.ac) = 5f75379986c1335c24b80b346af57175
-MD5 (i386/5.0.20020917/compat4x.ad) = 951fa38b8ba8ed96e3fa2409259aa97c
-MD5 (i386/5.0.20020917/compat4x.ae) = 9bbc5e894d4e168d358d5783128bbfa1
-MD5 (i386/5.0.20020917/compat4x.af) = 4304fb3172dbb49cd3834316b76e868e
+MD5 (i386/4.7/compat4x.aa) = 6d4c2cdf62264901c90182598c64780a
+MD5 (i386/4.7/compat4x.ab) = 0712a862736bd8abc1023f027a654399
+MD5 (i386/5.0.20021221/compat4x.aa) = 2ff39cf49554775319993a42db82c4f4
diff --git a/misc/compat4x/pkg-plist b/misc/compat4x/pkg-plist
index 0c0ca6a2de36..8076e2b3ee66 100644
--- a/misc/compat4x/pkg-plist
+++ b/misc/compat4x/pkg-plist
@@ -10,6 +10,7 @@ lib/compat/libfetch.so.2
 %%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