- Update to the latest available versions:

  4-STABLE/alpha:	4.4-RELEASE
  4-STABLE/i386:	4.4-20011011-STABLE
  5-CURRENT/alpha:	5.0-20010721-CURRENT
  5-CURRENT/i386:	5.0-20011011-CURRENT

  I could not find up-to-date snapshots available for alpha.  If
  anyone knows one, please let me know.

- Transfer the maintainership to ports@, because this rather belongs
  to the base/ports infrastructure.

  We greatly appreciate your inititial idea and work, Scott! :)

3 files changed, 56 insertions, 23 deletions

diff --git a/misc/compat4x/Makefile b/misc/compat4x/Makefile
index a61cf138848f..0e98a79830fb 100644
--- a/misc/compat4x/Makefile
+++ b/misc/compat4x/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	compat4x
 PORTVERSION=	${COMPAT4X_PORTVERSION}
-PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	${COMPAT4X_MASTER_SITES}
+MASTER_SITE_SUBDIR=	${COMPAT4X_MASTER_SITE_SUBDIR}
 PKGNAMESUFFIX=	-${ARCH}
 DISTFILES=	${COMPAT4X_DISTFILES}
 DIST_SUBDIR=	${ARCH}/${PORTVERSION}
 
-MAINTAINER=	hetzels@westbend.net
+MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/usr/lib/compat
 NO_MTREE=	yes
@@ -27,30 +27,59 @@ LDCONFIG_DIRS=	%%PREFIX%%/lib/compat
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500000
-COMPAT4X_PORTVERSION=	5.0
+COMPAT4X_OSVERSION=	5.0
+COMPAT4X_OSBRANCH=	CURRENT
 COMPAT4X_MASTER_SITES=	ftp://current.FreeBSD.org/pub/FreeBSD/%SUBDIR%/
 .if ${ARCH} == i386
-MASTER_SITE_SUBDIR=	snapshots/${ARCH}/${PORTVERSION}-20010909-CURRENT/${PORTNAME}
+COMPAT4X_OSRELDATE=	20011011
 COMPAT4X_DISTFILES=	${PORTNAME}.aa \
 			${PORTNAME}.ab \
 			${PORTNAME}.ac \
-			${PORTNAME}.ad
+			${PORTNAME}.ad \
+			${PORTNAME}.ae \
+			${PORTNAME}.af
+LATEST_ONLY=		""
 .elif ${ARCH} == alpha
-MASTER_SITE_SUBDIR=	snapshots/${ARCH}/${PORTVERSION}-20010721-CURRENT/${PORTNAME}
+COMPAT4X_OSRELDATE=	20010721
 COMPAT4X_DISTFILES=	${PORTNAME}.aa \
 			${PORTNAME}.ab \
 			${PORTNAME}.ac \
 			${PORTNAME}.ad \
 			${PORTNAME}.ae
+.else
+IGNORE=			unsupported architecture
 .endif
-PLIST_SUB=		CURRENT_ONLY:=""
+CURRENT_ONLY=		""
 .else
-COMPAT4X_PORTVERSION=	4.3
+COMPAT4X_OSVERSION=	4.4
+.if ${ARCH} == i386
+COMPAT4X_OSRELDATE=	20011011
+COMPAT4X_OSBRANCH=	STABLE
+COMPAT4X_MASTER_SITES=	ftp://stable.FreeBSD.org/pub/FreeBSD/%SUBDIR%/
+COMPAT4X_DISTFILES=	${PORTNAME}.aa \
+			${PORTNAME}.ab
+LATEST_ONLY=		""
+.elif ${ARCH} == alpha
 COMPAT4X_MASTER_SITES=	${MASTER_SITE_FREEBSD_ORG}
-MASTER_SITE_SUBDIR=	releases/${ARCH}/${PORTVERSION}-RELEASE/${PORTNAME}
 COMPAT4X_DISTFILES=	${PORTNAME}.aa \
 			${PORTNAME}.ab
-PLIST_SUB=		CURRENT_ONLY:="@comment "
+.else
+IGNORE=			unsupported architecture
+.endif
+.endif
+
+CURRENT_ONLY?=		"@comment "
+LATEST_ONLY?=		"@comment "
+
+PLIST_SUB+=		CURRENT_ONLY:=${CURRENT_ONLY} \
+			LATEST_ONLY:=${LATEST_ONLY}
+
+.if defined(COMPAT4X_OSRELDATE) && !empty(COMPAT4X_OSRELDATE)
+COMPAT4X_PORTVERSION=	${COMPAT4X_OSVERSION}.${COMPAT4X_OSRELDATE}
+COMPAT4X_MASTER_SITE_SUBDIR=	snapshots/${ARCH}/${COMPAT4X_OSVERSION}-${COMPAT4X_OSRELDATE}-${COMPAT4X_OSBRANCH}/${PORTNAME}
+.else
+COMPAT4X_PORTVERSION=	${COMPAT4X_OSVERSION}
+COMPAT4X_MASTER_SITE_SUBDIR=	releases/${ARCH}/${COMPAT4X_OSVERSION}-RELEASE/${PORTNAME}
 .endif
 
 do-extract:
diff --git a/misc/compat4x/distinfo b/misc/compat4x/distinfo
index 9c8fe4ec138d..125961231165 100644
--- a/misc/compat4x/distinfo
+++ b/misc/compat4x/distinfo
@@ -1,13 +1,15 @@
-MD5 (alpha/4.3/compat4x.aa) = 0b08beae12dc0c5208c29b6ee68d914d
-MD5 (alpha/4.3/compat4x.ab) = 3e99d2e35c9705dbedef096ed12fe7b3
-MD5 (alpha/5.0/compat4x.aa) = 5c052f279d18b7a2d68ef9eb5b1f1505
-MD5 (alpha/5.0/compat4x.ab) = a86f387a12a0dba266b1eecdd2fd91eb
-MD5 (alpha/5.0/compat4x.ac) = 9cc91bf7f1a9d255f575ab538c3a15b4
-MD5 (alpha/5.0/compat4x.ad) = eb2681b993cc8829e1e947f00f5a5394
-MD5 (alpha/5.0/compat4x.ae) = 0df08287196d13eef071ec6ff12a3768
-MD5 (i386/4.3/compat4x.aa) = 8087f85456553dbc90b35b5b7a9895ed
-MD5 (i386/4.3/compat4x.ab) = a25bf5d6a9ddf9ae42e9a68385860661
-MD5 (i386/5.0/compat4x.aa) = 2039e571a9cf31f1abdbcd45f21cc8a7
-MD5 (i386/5.0/compat4x.ab) = b9830bd79c143bd0705da041a3abf83c
-MD5 (i386/5.0/compat4x.ac) = 3355706ddd8015e69fb299566022d38c
-MD5 (i386/5.0/compat4x.ad) = 8a3fe4a04fbc1b3ef8c734a3ca8cb96d
+MD5 (alpha/4.4/compat4x.aa) = be8e49a8900b0ed7dd305d57cb3c2ebf
+MD5 (alpha/4.4/compat4x.ab) = ac29d5fcdf07d78f82fcf78767e97312
+MD5 (alpha/5.0.20010721/compat4x.aa) = 5c052f279d18b7a2d68ef9eb5b1f1505
+MD5 (alpha/5.0.20010721/compat4x.ab) = a86f387a12a0dba266b1eecdd2fd91eb
+MD5 (alpha/5.0.20010721/compat4x.ac) = 9cc91bf7f1a9d255f575ab538c3a15b4
+MD5 (alpha/5.0.20010721/compat4x.ad) = eb2681b993cc8829e1e947f00f5a5394
+MD5 (alpha/5.0.20010721/compat4x.ae) = 0df08287196d13eef071ec6ff12a3768
+MD5 (i386/4.4.20011011/compat4x.aa) = 9d2ef20a12fe21d7a6e22d114536fb14
+MD5 (i386/4.4.20011011/compat4x.ab) = ef0fe3c663f119f3fec67b9176d8f70b
+MD5 (i386/5.0.20011011/compat4x.aa) = bd431b21f5d1ff08c8be718050690bf0
+MD5 (i386/5.0.20011011/compat4x.ab) = cba29d72e32fe965c4aad364d489641d
+MD5 (i386/5.0.20011011/compat4x.ac) = 0a5759f3b26a05be7dbf1d7c0a54eca8
+MD5 (i386/5.0.20011011/compat4x.ad) = f570daa884d70f750e96357b17a9c8bf
+MD5 (i386/5.0.20011011/compat4x.ae) = d33d963efc8136495e7e3e849def1bcb
+MD5 (i386/5.0.20011011/compat4x.af) = eb7b8b695f23e4933bf51bbdc2701fd8
diff --git a/misc/compat4x/pkg-plist b/misc/compat4x/pkg-plist
index d64e84aa6478..52901d91e615 100644
--- a/misc/compat4x/pkg-plist
+++ b/misc/compat4x/pkg-plist
@@ -4,5 +4,7 @@ etc/rc.d/000.compat4x.sh
 %%CURRENT_ONLY:%%lib/compat/libc_r.so.4.compat4x
 %%CURRENT_ONLY:%%@exec ln -sf %B/%f %B/libc_r.so.4
 lib/compat/libcrypto.so.1
+%%LATEST_ONLY:%%lib/compat/libedit.so.3
 lib/compat/libssl.so.1
+%%LATEST_ONLY:%%%%CURRENT_ONLY:%%lib/compat/libperl.so.3
 @unexec rmdir %D/lib/compat 2>/dev/null || true