Index: head/misc/compat4x/Makefile
===================================================================
--- head/misc/compat4x/Makefile	(revision 398821)
+++ head/misc/compat4x/Makefile	(revision 398822)
@@ -1,99 +1,91 @@
 # Created by: Scot W. Hetzel
 # $FreeBSD$
 
 PORTNAME=	compat4x
 PORTVERSION=	${COMPAT4X_PORTVERSION}
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	misc
 MASTER_SITES=	${COMPAT4X_MASTER_SITES}
 PKGNAMESUFFIX=	-${COMPAT4X_ARCH}
 DISTFILES=	${COMPAT4X_DISTFILES}
 DIST_SUBDIR=	${COMPAT4X_ARCH}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Convenience package to install the compat4x libraries
 
 RUN_DEPENDS=	${LOCALBASE}/share/compat/locale/UTF-8/LC_CTYPE:${PORTSDIR}/misc/localedata
 
 WRKSRC=		${WRKDIR}/usr/lib/compat
 
 NO_BUILD=	yes
 TARGET_DIR=	${PREFIX}/lib/compat
 TARGET32_DIR=	${PREFIX}/lib32/compat
 
 .include <bsd.port.pre.mk>
 
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON= FreeBSD 4.x did not support this architecture
 
 COMPAT4X_ARCH=	${ARCH}
 COMPAT4X_OSVERSION=	5.3
 PLIST=			${.CURDIR}/pkg-plist.freebsd5
 .if ${ARCH} == i386
 PLIST_SUB+=		LIBDIR="lib"
 COMPAT4X_DISTFILES=	${PORTNAME}.aa \
 			${PORTNAME}.ab
 .elif ${ARCH} == amd64
 COMPAT4X_ARCH=		i386
 TARGET_DIR=		${TARGET32_DIR}
 PLIST_SUB+=		LIBDIR="lib32"
 COMPAT4X_DISTFILES=	${PORTNAME}.aa \
 			${PORTNAME}.ab
 .endif
 
 .if ${COMPAT4X_ARCH} == i386
 PLIST_SUB+=		I386_ONLY=""
 .else
 PLIST_SUB+=		I386_ONLY="@comment "
 .endif
 
 .if ${ARCH} == amd64
 PLIST_SUB+=		AMD64_ONLY="" AMD64NA="@comment "
 USE_LDCONFIG32=		${TARGET32_DIR}
 .else
 USE_LDCONFIG=		${TARGET_DIR}
 PLIST_SUB+=		AMD64_ONLY="@comment " AMD64NA=""
 .endif
 
 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, FreeBSD-SA-03:02.openssl, FreeBSD-SA-03:18.openssl  - OpenSSL contains multiple vulnerabilities
 
 PLIST_SUB+=		FORBIDDEN:=""
 .else
 PLIST_SUB+=		FORBIDDEN:="@comment "
 .endif
 
-FREEBSD4_LIBS=		libc_r.so.4 libperl.so.3
-
 .if defined(COMPAT4X_OSRELDATE) && !empty(COMPAT4X_OSRELDATE)
 COMPAT4X_PORTVERSION=	${COMPAT4X_OSVERSION}.${COMPAT4X_OSRELDATE}
 COMPAT4X_MASTER_SITES=	ftp://current.FreeBSD.org/pub/FreeBSD/snapshots/${COMPAT4X_ARCH}/${COMPAT4X_OSVERSION}-${COMPAT4X_OSBRANCH}-${COMPAT4X_OSRELDATE}-JPSNAP/${PORTNAME}/
 .else
 COMPAT4X_PORTVERSION=	${COMPAT4X_OSVERSION}
 COMPAT4X_MASTER_SITES=	LOCAL/kris/${COMPAT4X_ARCH}
 .endif
 
 do-extract:
 	@${MKDIR} ${WRKDIR}
 	@(cd ${DISTDIR}/${DIST_SUBDIR} && ${CAT} ${DISTFILES} | ${TAR} -xzf - -C ${WRKDIR} )
-.for lib in ${FREEBSD4_LIBS}
-	@${MV} ${WRKSRC}/${lib} ${WRKSRC}/${lib}.compat4x
-.endfor
 .if !defined(FORCE_VULNERABLE_OPENSSL)
 .for lib in ${OPENSSL_LIBS}
 	@${RM} -f ${WRKSRC}/${lib}
 .endfor
 .endif
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${TARGET_DIR}
 	${INSTALL_DATA} ${WRKSRC}/* ${STAGEDIR}${TARGET_DIR}/
-.for lib in ${FREEBSD4_LIBS}
-	${LN} -sf ${lib}.compat4x ${STAGEDIR}${TARGET_DIR}/${lib}
-.endfor
 
 pre-clean:
 	@[ -w ${WRKDIR}/var ] && chflags -R noschg ${WRKDIR}/var || ${TRUE}
 
 .include <bsd.port.post.mk>
Index: head/misc/compat4x/pkg-plist.freebsd5
===================================================================
--- head/misc/compat4x/pkg-plist.freebsd5	(revision 398821)
+++ head/misc/compat4x/pkg-plist.freebsd5	(revision 398822)
@@ -1,40 +1,36 @@
 %%LIBDIR%%/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
-%%LIBDIR%%/compat/libc_r.so.4.compat4x
-@exec ln -sf %f %B/libc_r.so.4
+%%LIBDIR%%/compat/libc_r.so.4
 %%FORBIDDEN:%%%%LIBDIR%%/compat/libcrypto.so.1
 %%FORBIDDEN:%%%%LIBDIR%%/compat/libcrypto.so.2
 %%LIBDIR%%/compat/libdevstat.so.2
 %%LIBDIR%%/compat/libedit.so.3
 %%LIBDIR%%/compat/libfetch.so.2
 %%LIBDIR%%/compat/libgmp.so.3
 %%LIBDIR%%/compat/libhistory.so.4
 %%LIBDIR%%/compat/libm.so.2
 %%LIBDIR%%/compat/libmp.so.3
 %%LIBDIR%%/compat/libopie.so.2
 %%LIBDIR%%/compat/libpam.so.1
 %%LIBDIR%%/compat/libpcap.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
-%%LIBDIR%%/compat/libperl.so.3.compat4x
-@exec ln -sf %f %B/libperl.so.3
+%%LIBDIR%%/compat/libperl.so.3
 %%LIBDIR%%/compat/libposix1e.so.2
 %%LIBDIR%%/compat/libreadline.so.4
 %%LIBDIR%%/compat/libskey.so.2
 %%FORBIDDEN:%%%%LIBDIR%%/compat/libssl.so.1
 %%FORBIDDEN:%%%%LIBDIR%%/compat/libssl.so.2
 %%LIBDIR%%/compat/libstdc++.so.3
 %%LIBDIR%%/compat/libusb.so.0
 %%LIBDIR%%/compat/libusbhid.so.0
 %%I386_ONLY%%%%LIBDIR%%/compat/libutil.so.3
 %%I386_ONLY%%%%LIBDIR%%/compat/libvgl.so.2
 %%LIBDIR%%/compat/pam_cleartext_pass_ok.so
 %%LIBDIR%%/compat/pam_deny.so
 %%LIBDIR%%/compat/pam_opie.so
 %%LIBDIR%%/compat/pam_opieaccess.so
 %%LIBDIR%%/compat/pam_permit.so
 %%LIBDIR%%/compat/pam_radius.so
 %%LIBDIR%%/compat/pam_skey.so
 %%LIBDIR%%/compat/pam_ssh.so
 %%LIBDIR%%/compat/pam_tacplus.so
 %%LIBDIR%%/compat/pam_unix.so
 @comment Hardcode lib32 since we should not remove lib.