3 files changed, 30 insertions, 50 deletions

diff --git a/misc/compat3x/Makefile b/misc/compat3x/Makefile
index df3e32b021be..aa66022a49d5 100644
--- a/misc/compat3x/Makefile
+++ b/misc/compat3x/Makefile
@@ -8,19 +8,18 @@
 PORTNAME=	compat3x
 PORTVERSION=	${COMPAT3X_PORTVERSION}
 CATEGORIES=	misc
-MASTER_SITES=	${COMPAT3X_MASTER_SITES}
-MASTER_SITE_SUBDIR=	${COMPAT3X_MASTER_SITE_SUBDIR}
+MASTER_SITES=	ftp://ftp.mk.bsdclub.org/pub/FreeBSD/distfiles/ \
+		${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	motoyuki
 PKGNAMESUFFIX=	-${ARCH}
-DISTFILES=	${COMPAT3X_DISTFILES}
-DIST_SUBDIR=	${ARCH}/${PORTVERSION}
+DISTNAME=	${PORTNAME}-${COMPAT3X_OSRELDATE}
+DIST_SUBDIR=	${ARCH}
 
 MAINTAINER=	ports@FreeBSD.org
 
-FORBIDDEN=	"FreeBSD-SA-02:28.resolv - buffer overflow in resolver in libc"
-
 ONLY_FOR_ARCHS=	i386
 
-WRKSRC=		${WRKDIR}/usr/lib/compat
+NO_WRKSUBDIR=	yes
 NO_MTREE=	yes
 
 TARGET_DIR=	${PREFIX}/lib/compat
@@ -31,44 +30,30 @@ LDCONFIG_DIRS=	%%PREFIX%%/lib/compat
 .include <bsd.port.pre.mk>
 .if ${OSVERSION} >= 500000
 COMPAT3X_OSVERSION=	5.0
-COMPAT3X_OSRELDATE=	20020219
-COMPAT3X_OSBRANCH=	CURRENT
-COMPAT3X_MASTER_SITES=	ftp://current.FreeBSD.org/pub/FreeBSD/%SUBDIR%/
-COMPAT3X_DISTFILES=	${PORTNAME}.aa \
-			${PORTNAME}.ab \
-			${PORTNAME}.ac \
-			${PORTNAME}.ad \
-			${PORTNAME}.ae \
-			${PORTNAME}.af \
-			${PORTNAME}.ag
+COMPAT3X_OSRELDATE=	20020925
 PLIST_SUB=		CURRENT_ONLY:=""
 .else
 COMPAT3X_OSVERSION=	4.4
-COMPAT3X_OSRELDATE=	20011227
-COMPAT3X_OSBRANCH=	STABLE
-COMPAT3X_MASTER_SITES=	ftp://stable.FreeBSD.org/pub/FreeBSD/%SUBDIR%/
-COMPAT3X_DISTFILES=	${PORTNAME}.aa \
-			${PORTNAME}.ab \
-			${PORTNAME}.ac \
-			${PORTNAME}.ad \
-			${PORTNAME}.ae
+COMPAT3X_OSRELDATE=	20020925
 PLIST_SUB=		CURRENT_ONLY:="@comment "
 .endif
 
+FREEBSD4_LIBS=	libc_r.so.4 libperl.so.3
+
 .if defined(COMPAT3X_OSRELDATE) && !empty(COMPAT3X_OSRELDATE)
 COMPAT3X_PORTVERSION=	${COMPAT3X_OSVERSION}.${COMPAT3X_OSRELDATE}
-COMPAT3X_MASTER_SITE_SUBDIR=	snapshots/${ARCH}/${COMPAT3X_OSVERSION}-${COMPAT3X_OSRELDATE}-${COMPAT3X_OSBRANCH}/${PORTNAME}
 .else
 COMPAT3X_PORTVERSION=	${COMPAT3X_OSVERSION}
-COMPAT3X_MASTER_SITE_SUBDIR=	releases/${ARCH}/${COMPAT3X_OSVERSION}-RELEASE/${PORTNAME}
 .endif
 
-do-extract:
-	${MKDIR} ${WRKDIR}
-	cd ${_DISTDIR} && ${CAT} ${DISTFILES} | ${TAR} -xzf - -C ${WRKDIR}
-	if [ -e ${WRKSRC}/libc_r.so.4 ]; then \
-		${MV} ${WRKSRC}/libc_r.so.4 ${WRKSRC}/libc_r.so.4.compat3x; \
-	fi
+post-extract:
+.for lib in ${FREEBSD4_LIBS}
+.if ${OSVERSION} >= 500000
+	${MV} ${WRKSRC}/${lib} ${WRKSRC}/${lib}.compat3x
+.else
+	${RM} -f ${WRKSRC}/${lib}
+.endif
+.endfor
 
 do-build:
 	@( ${ECHO_CMD} '#!/bin/sh'; ${ECHO_CMD} '${LDCONFIG} -m ${LDCONFIG_RUNLIST}'; \
@@ -76,10 +61,13 @@ do-build:
 
 do-install:
 	${MKDIR} ${TARGET_DIR} ${PREFIX}/etc/rc.d
-	${INSTALL_DATA} ${WRKSRC}/* ${TARGET_DIR}/
-	if [ -e ${TARGET_DIR}/libc_r.so.4.compat3x -a ! -e ${TARGET_DIR}/libc_r.so.4.compat4x ]; then \
-		${LN} -sf ${TARGET_DIR}/libc_r.so.4.compat3x ${TARGET_DIR}/libc_r.so.4; \
+	${INSTALL_DATA} ${WRKSRC}/lib*.so.* ${TARGET_DIR}/
+.for lib in ${FREEBSD4_LIBS}
+	cd ${TARGET_DIR}; \
+	if [ -e ${lib}.compat3x -a ! -e ${lib}.compat4x ]; then \
+		${LN} -sf ${lib}.compat3x ${lib}; \
 	fi
+.endfor
 	${INSTALL_SCRIPT} ${WRKDIR}/000.${PORTNAME}.sh ${PREFIX}/etc/rc.d/
 
 .include <bsd.port.post.mk>
diff --git a/misc/compat3x/distinfo b/misc/compat3x/distinfo
index eebfd2a03771..b84793063896 100644
--- a/misc/compat3x/distinfo
+++ b/misc/compat3x/distinfo
@@ -1,12 +1 @@
-MD5 (i386/4.4.20011227/compat3x.aa) = 2c4c505655ac2668fbdb0e79c083d1b5
-MD5 (i386/4.4.20011227/compat3x.ab) = 3472272e21585206d96240cf66002bd4
-MD5 (i386/4.4.20011227/compat3x.ac) = d2d61ebc06ee116c8d9f040872c64a6b
-MD5 (i386/4.4.20011227/compat3x.ad) = 05d265756f5d1e332b8fe98bbac9dfa9
-MD5 (i386/4.4.20011227/compat3x.ae) = 73e8c77b27dba5f76ac6943921501c48
-MD5 (i386/5.0.20020219/compat3x.aa) = b9de6d5c100032664eb14fdeb7bd06dc
-MD5 (i386/5.0.20020219/compat3x.ab) = 2681bfc7efbf036ba084bca14da116eb
-MD5 (i386/5.0.20020219/compat3x.ac) = c68f9be640dadb95c640583642ecf4bb
-MD5 (i386/5.0.20020219/compat3x.ad) = 74d97a7c5bfdb80a071fbd80bae316f7
-MD5 (i386/5.0.20020219/compat3x.ae) = 09b101fea7a834ba30bc04ebe81f8cbf
-MD5 (i386/5.0.20020219/compat3x.af) = 0a7ad2b9ba7b1a3775aeb050958b8a39
-MD5 (i386/5.0.20020219/compat3x.ag) = aece06c6d283fe18cea7eee577bf691b
+MD5 (i386/compat3x-20020925.tar.gz) = 5a710718fe6b8ff63e605bf3d8e6778c
diff --git a/misc/compat3x/pkg-plist b/misc/compat3x/pkg-plist
index f864d8a2077c..ff4c811bb652 100644
--- a/misc/compat3x/pkg-plist
+++ b/misc/compat3x/pkg-plist
@@ -2,9 +2,9 @@ etc/rc.d/000.compat3x.sh
 lib/compat/libalias.so.3
 lib/compat/libc.so.3
 lib/compat/libc_r.so.3
-%%CURRENT_ONLY:%%@unexec if [ -e %B/libc_r.so.4.compat4x ]; then ln -sf %B/libc_r.so.4.compat4x %B/libc_r.so.4; else rm %B/libc_r.so.4; fi
+%%CURRENT_ONLY:%%@unexec if [ -e %B/libc_r.so.4.compat4x ]; then ln -sf libc_r.so.4.compat4x %B/libc_r.so.4; else rm %B/libc_r.so.4; fi
 %%CURRENT_ONLY:%%lib/compat/libc_r.so.4.compat3x
-%%CURRENT_ONLY:%%@exec if [ ! -e %B/libc_r.so.4.compat4x ]; then ln -sf %B/%f %B/libc_r.so.4; fi
+%%CURRENT_ONLY:%%@exec if [ ! -e %B/libc_r.so.4.compat4x ]; then ln -sf %f %B/libc_r.so.4; fi
 lib/compat/libcurses.so.2
 lib/compat/libdialog.so.3
 lib/compat/libedit.so.2
@@ -15,6 +15,9 @@ lib/compat/libg++.so.4
 lib/compat/libhistory.so.3
 lib/compat/libmytinfo.so.2
 lib/compat/libncurses.so.3
+%%CURRENT_ONLY:%%@unexec if [ -e %B/libperl.so.3.compat4x ]; then ln -sf libperl.so.3.compat4x %B/libperl.so.3; else rm %B/libperl.so.3; fi
+%%CURRENT_ONLY:%%lib/compat/libperl.so.3.compat3x
+%%CURRENT_ONLY:%%@exec if [ ! -e %B/libperl.so.3.compat4x ]; then ln -sf %f %B/libperl.so.3; fi
 lib/compat/libreadline.so.3
 lib/compat/libss.so.2
 lib/compat/libstdc++.so.2