1 files changed, 22 insertions, 28 deletions

diff --git a/misc/compat4x/Makefile b/misc/compat4x/Makefile
index 840712b70d69..1d4376e387ba 100644
--- a/misc/compat4x/Makefile
+++ b/misc/compat4x/Makefile
@@ -28,52 +28,44 @@ LDCONFIG_DIRS=	%%PREFIX%%/lib/compat
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500000
-COMPAT4X_OSVERSION=	5.0
-COMPAT4X_OSBRANCH=	CURRENT
-COMPAT4X_MASTER_SITES=	ftp://current.FreeBSD.org/pub/FreeBSD/%SUBDIR%/
+COMPAT4X_OSVERSION=	5.2.1
+PLIST=			${.CURDIR}/pkg-plist.freebsd5
 .if ${ARCH} == i386
-COMPAT4X_OSRELDATE=	20030328
 COMPAT4X_DISTFILES=	${PORTNAME}.aa \
 			${PORTNAME}.ab
 .elif ${ARCH} == alpha
-FORBIDDEN=		"FreeBSD-SA-02:28.resolv - buffer overflow in resolver in libc"
-
-COMPAT4X_OSRELDATE=	20020809
 COMPAT4X_DISTFILES=	${PORTNAME}.aa \
-			${PORTNAME}.ab \
-			${PORTNAME}.ac \
-			${PORTNAME}.ad \
-			${PORTNAME}.ae \
-			${PORTNAME}.af \
-			${PORTNAME}.ag
+			${PORTNAME}.ab
 .else
 IGNORE=			unsupported architecture
 .endif
 .else
-COMPAT4X_OSVERSION=	4.7
+COMPAT4X_OSVERSION=	4.9
+PLIST=			${.CURDIR}/pkg-plist.freebsd4
 .if ${ARCH} == i386
-COMPAT4X_MASTER_SITES=	${MASTER_SITE_FREEBSD_ORG}
 COMPAT4X_DISTFILES=	${PORTNAME}.aa \
-			${PORTNAME}.ab
+			${PORTNAME}.ab \
+			${PORTNAME}.ac \
+			${PORTNAME}.ad
 .elif ${ARCH} == alpha
-COMPAT4X_MASTER_SITES=	${MASTER_SITE_FREEBSD_ORG}
 COMPAT4X_DISTFILES=	${PORTNAME}.aa \
-			${PORTNAME}.ab
+			${PORTNAME}.ab \
+			${PORTNAME}.ac \
+			${PORTNAME}.ad
 .else
 IGNORE=			unsupported architecture
 .endif
 .endif
 
-PLIST=	${.CURDIR}/pkg-plist.${ARCH}-freebsd${OSREL:C/\..*//}
 .if ${ARCH} == i386
-I386_ONLY=		""
+PLIST_SUB+=		I386_ONLY=""
 .else
-I386_ONLY=		"@comment "
+PLIST_SUB+=		I386_ONLY="@comment "
 .endif
 
-OPENSSL_LIBS=		libcrypto.so.1 libssl.so.1
+OPENSSL_LIBS=		libcrypto.so.1 libcrypto.so.2 libssl.so.1 libssl.so.2
 .if defined(FORCE_VULNERABLE_OPENSSL)
-FORBIDDEN=		"FreeBSD-SA-02:33.openssl - openssl contains multiple vulnerabilities"
+FORBIDDEN=		"FreeBSD-SA-02:33.openssl, FreeBSD-SA-03:02.openssl, FreeBSD-SA-03:18.openssl  - OpenSSL contains multiple vulnerabilities"
 
 PLIST_SUB+=		FORBIDDEN:=""
 .else
@@ -84,20 +76,22 @@ FREEBSD4_LIBS=		libc_r.so.4 libperl.so.3
 
 .if defined(COMPAT4X_OSRELDATE) && !empty(COMPAT4X_OSRELDATE)
 COMPAT4X_PORTVERSION=	${COMPAT4X_OSVERSION}.${COMPAT4X_OSRELDATE}
-COMPAT4X_MASTER_SITE_SUBDIR=	snapshots/${ARCH}/${COMPAT4X_OSVERSION}-${COMPAT4X_OSBRANCH}-${COMPAT4X_OSRELDATE}-JPSNAP/${PORTNAME}
+COMPAT4X_MASTER_SITES=	ftp://current.FreeBSD.org/pub/FreeBSD/%SUBDIR%/
+COMPAT4X_MASTER_SITE_SUBDIR=   snapshots/${ARCH}/${COMPAT4X_OSVERSION}-${COMPAT4X_OSBRANCH}-${COMPAT4X_OSRELDATE}-JPSNAP/${PORTNAME}
 .else
 COMPAT4X_PORTVERSION=	${COMPAT4X_OSVERSION}
+COMPAT4X_MASTER_SITES=	${MASTER_SITE_FREEBSD_ORG}
 COMPAT4X_MASTER_SITE_SUBDIR=	releases/${ARCH}/${COMPAT4X_OSVERSION}-RELEASE/${PORTNAME}
 .endif
 
 do-extract:
 	${MKDIR} ${WRKDIR}
 	cd ${DISTDIR}/${DIST_SUBDIR} && ${CAT} ${DISTFILES} | ${TAR} -xzf - -C ${WRKDIR}
-.for lib in ${FREEBSD4_LIBS}
 .if ${OSVERSION} >= 500000
+.for lib in ${FREEBSD4_LIBS}
 	${MV} ${WRKSRC}/${lib} ${WRKSRC}/${lib}.compat4x
-.endif
 .endfor
+.endif
 .if !defined(FORCE_VULNERABLE_OPENSSL)
 .for lib in ${OPENSSL_LIBS}
 	${RM} -f ${WRKSRC}/${lib}
@@ -111,11 +105,11 @@ do-build:
 do-install:
 	${MKDIR} ${TARGET_DIR} ${PREFIX}/etc/rc.d
 	${INSTALL_DATA} ${WRKSRC}/* ${TARGET_DIR}/
-.for lib in ${FREEBSD4_LIBS}
 .if ${OSVERSION} >= 500000
+.for lib in ${FREEBSD4_LIBS}
 	${LN} -sf ${lib}.compat4x ${TARGET_DIR}/${lib}
-.endif
 .endfor
+.endif
 	${INSTALL_SCRIPT} ${WRKDIR}/000.${PORTNAME}.sh ${PREFIX}/etc/rc.d/
 
 .include <bsd.port.post.mk>