1. Unbreak port due to incorrect packing list, using NO_FILTER_SHLIBS

2. Unbreak port due to distfiles not fetchable on both i386 and alpha
3. Unbreak port on 5.3-RELEASE and 6-CURRENT for using bsdtar
   unsupported flag (-S)
4. doesn't unnecessaryly rebuild things for 'make reinstall'
5. cleans up pkg_delete errors due to incorrect PLIST @dirrm ordering
6. cleans up pkg_delete errors due to trying to rm ${PREFIX}/etc

Thus 7. un-deprecates as portmgr's requirements met to keep port alive

Reviewed by:	trevor

4 files changed, 38 insertions, 40 deletions

diff --git a/emulators/linux_base-gentoo-stage1/Makefile b/emulators/linux_base-gentoo-stage1/Makefile
index 79cecb97bffa..d2f38464699e 100644
--- a/emulators/linux_base-gentoo-stage1/Makefile
+++ b/emulators/linux_base-gentoo-stage1/Makefile
@@ -14,54 +14,53 @@ EXTRACT_ONLY=
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Files from Gentoo distribution, for Linux compatibility
 
-BROKEN=		incorrect packing list
 RESTRICTED=	"binaries licensed under GNU GPL without accompanying source"
-EXPIRATION_DATE=2005-02-18
-DEPRECATED=	${BROKEN}
 
-ONLY_FOR_ARCHS=	alpha amd64 ia64 i386
+ONLY_FOR_MACHINE_ARCHS=	alpha amd64 ia64 i386
 
 USE_BZIP2=	y
 
 .include <bsd.port.pre.mk>
 
-.if (${ARCH} == "amd64")
+.if (${MACHINE_ARCH} == "amd64")
 LATEST_LINK=	${PORTNAME:C/linux_base/linux32_base/}
 MACHINE_ARCH=	i386
 .endif
 
 .if (${MACHINE_ARCH} == "alpha")
+MASTER_SITES+=	ftp://ftp.uos.ac.kr/pub/Linux/gentoo/gentoo/experimental/alpha/stages/
 MASTER_SITE_SUBDIR=	experimental/alpha/stages
-DISTNAME=	stage1-alpha-20030721
+DISTNAME=	stage1-alpha-20030729
 .elif (${MACHINE_ARCH} == "i386")
-MASTER_SITE_SUBDIR=	releases/x86/${PORTVERSION}/stages/x86
-MASTER_SITE_SUBDIR+=	releases/historical/x86/${PORTVERSION}/stages/x86
+MASTER_SITE_SUBDIR=	releases/x86/${PORTVERSION}/stages/x86 \
+			releases/historical/x86/${PORTVERSION}/stages/x86
 DISTNAME=	stage1-x86-20030910
 .elif (${MACHINE_ARCH} == "ia64")
-MASTER_SITE_SUBDIR=	releases/x86/${PORTVERSION}/stages/x86
+MASTER_SITE_SUBDIR=	releases/x86/${PORTVERSION}/stages/x86 \
+			releases/historical/x86/${PORTVERSION}/stages/x86
 DISTNAME=	stage1-x86-20030910
 .endif
 
 DIST_SUBDIR=	gentoo-linux
 MD5_FILE=	${MASTERDIR}/distinfo.${MACHINE_ARCH}
-NO_BUILD=	y
 PLIST=		${WRKDIR}/pkg-plist
 PREFIX=		${LINUXBASE}
+NO_FILTER_SHLIBS=y
 CONFLICTS=	linux_base-6* linux_base-7* linux_base-8* linux_base-debian*
 
-pre-install:
+do-build:
 	${ECHO_CMD} etc/resolv.conf > ${PLIST}
 	${TAR} tyf ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${CUT} -c3-100 \
-		> ${WRKDIR}/list.txt
-	cd ${WRKDIR} && ${GREP} -v '/$$' ${WRKDIR}/list.txt >> ${PLIST}
-	${GREP} '/$$' ${WRKDIR}/list.txt | ${SED} -e "s:^:@dirrm :g" >> ${PLIST}
-	${RM} ${WRKDIR}/list.txt
-	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+		> ${WRKDIR}/tarball-contents
+	${GREP} -v '/$$' ${WRKDIR}/tarball-contents >> ${PLIST}
+	${GREP} '/$$' ${WRKDIR}/tarball-contents | ${SED} -e "s:^:@dirrm :g" \
+		| ${GREP} -v '@dirrm etc/' | ${SORT} -r >> ${PLIST}
 
 do-install:
+	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 	- ${MKDIR} ${PREFIX}
-	${TAR} -C ${PREFIX} -xypSf ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES}
-	- ${CP} -p /etc/resolv.conf ${PREFIX}/etc/
+	${TAR} -xpy -C ${PREFIX} -f ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES}
+	${CP} -p /etc/resolv.conf ${PREFIX}/etc/
 	${RM} ${PREFIX}/dev/null ${PREFIX}/dev/stdout
 	mknod ${PREFIX}/dev/null c 2 2
 	mknod ${PREFIX}/dev/stdout c 22 1
diff --git a/emulators/linux_base-gentoo-stage1/distinfo.alpha b/emulators/linux_base-gentoo-stage1/distinfo.alpha
index 973d5d7db5e2..f3d1649a15ca 100644
--- a/emulators/linux_base-gentoo-stage1/distinfo.alpha
+++ b/emulators/linux_base-gentoo-stage1/distinfo.alpha
@@ -1,3 +1,3 @@
 $FreeBSD$
-MD5 (gentoo-linux/stage1-alpha-20030721.tar.bz2) = 26af7ffae217b0f1cd8b3eefddaa12de
-SIZE (gentoo-linux/stage1-alpha-20030721.tar.bz2) = 12311041
+MD5 (gentoo-linux/stage1-alpha-20030729.tar.bz2) = 3700e2e20b7f50ee02424dd5a3a0617c
+SIZE (gentoo-linux/stage1-alpha-20030729.tar.bz2) = 12367528
diff --git a/emulators/linux_dist-gentoo-stage1/Makefile b/emulators/linux_dist-gentoo-stage1/Makefile
index 79cecb97bffa..d2f38464699e 100644
--- a/emulators/linux_dist-gentoo-stage1/Makefile
+++ b/emulators/linux_dist-gentoo-stage1/Makefile
@@ -14,54 +14,53 @@ EXTRACT_ONLY=
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Files from Gentoo distribution, for Linux compatibility
 
-BROKEN=		incorrect packing list
 RESTRICTED=	"binaries licensed under GNU GPL without accompanying source"
-EXPIRATION_DATE=2005-02-18
-DEPRECATED=	${BROKEN}
 
-ONLY_FOR_ARCHS=	alpha amd64 ia64 i386
+ONLY_FOR_MACHINE_ARCHS=	alpha amd64 ia64 i386
 
 USE_BZIP2=	y
 
 .include <bsd.port.pre.mk>
 
-.if (${ARCH} == "amd64")
+.if (${MACHINE_ARCH} == "amd64")
 LATEST_LINK=	${PORTNAME:C/linux_base/linux32_base/}
 MACHINE_ARCH=	i386
 .endif
 
 .if (${MACHINE_ARCH} == "alpha")
+MASTER_SITES+=	ftp://ftp.uos.ac.kr/pub/Linux/gentoo/gentoo/experimental/alpha/stages/
 MASTER_SITE_SUBDIR=	experimental/alpha/stages
-DISTNAME=	stage1-alpha-20030721
+DISTNAME=	stage1-alpha-20030729
 .elif (${MACHINE_ARCH} == "i386")
-MASTER_SITE_SUBDIR=	releases/x86/${PORTVERSION}/stages/x86
-MASTER_SITE_SUBDIR+=	releases/historical/x86/${PORTVERSION}/stages/x86
+MASTER_SITE_SUBDIR=	releases/x86/${PORTVERSION}/stages/x86 \
+			releases/historical/x86/${PORTVERSION}/stages/x86
 DISTNAME=	stage1-x86-20030910
 .elif (${MACHINE_ARCH} == "ia64")
-MASTER_SITE_SUBDIR=	releases/x86/${PORTVERSION}/stages/x86
+MASTER_SITE_SUBDIR=	releases/x86/${PORTVERSION}/stages/x86 \
+			releases/historical/x86/${PORTVERSION}/stages/x86
 DISTNAME=	stage1-x86-20030910
 .endif
 
 DIST_SUBDIR=	gentoo-linux
 MD5_FILE=	${MASTERDIR}/distinfo.${MACHINE_ARCH}
-NO_BUILD=	y
 PLIST=		${WRKDIR}/pkg-plist
 PREFIX=		${LINUXBASE}
+NO_FILTER_SHLIBS=y
 CONFLICTS=	linux_base-6* linux_base-7* linux_base-8* linux_base-debian*
 
-pre-install:
+do-build:
 	${ECHO_CMD} etc/resolv.conf > ${PLIST}
 	${TAR} tyf ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${CUT} -c3-100 \
-		> ${WRKDIR}/list.txt
-	cd ${WRKDIR} && ${GREP} -v '/$$' ${WRKDIR}/list.txt >> ${PLIST}
-	${GREP} '/$$' ${WRKDIR}/list.txt | ${SED} -e "s:^:@dirrm :g" >> ${PLIST}
-	${RM} ${WRKDIR}/list.txt
-	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+		> ${WRKDIR}/tarball-contents
+	${GREP} -v '/$$' ${WRKDIR}/tarball-contents >> ${PLIST}
+	${GREP} '/$$' ${WRKDIR}/tarball-contents | ${SED} -e "s:^:@dirrm :g" \
+		| ${GREP} -v '@dirrm etc/' | ${SORT} -r >> ${PLIST}
 
 do-install:
+	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 	- ${MKDIR} ${PREFIX}
-	${TAR} -C ${PREFIX} -xypSf ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES}
-	- ${CP} -p /etc/resolv.conf ${PREFIX}/etc/
+	${TAR} -xpy -C ${PREFIX} -f ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES}
+	${CP} -p /etc/resolv.conf ${PREFIX}/etc/
 	${RM} ${PREFIX}/dev/null ${PREFIX}/dev/stdout
 	mknod ${PREFIX}/dev/null c 2 2
 	mknod ${PREFIX}/dev/stdout c 22 1
diff --git a/emulators/linux_dist-gentoo-stage1/distinfo.alpha b/emulators/linux_dist-gentoo-stage1/distinfo.alpha
index 973d5d7db5e2..f3d1649a15ca 100644
--- a/emulators/linux_dist-gentoo-stage1/distinfo.alpha
+++ b/emulators/linux_dist-gentoo-stage1/distinfo.alpha
@@ -1,3 +1,3 @@
 $FreeBSD$
-MD5 (gentoo-linux/stage1-alpha-20030721.tar.bz2) = 26af7ffae217b0f1cd8b3eefddaa12de
-SIZE (gentoo-linux/stage1-alpha-20030721.tar.bz2) = 12311041
+MD5 (gentoo-linux/stage1-alpha-20030729.tar.bz2) = 3700e2e20b7f50ee02424dd5a3a0617c
+SIZE (gentoo-linux/stage1-alpha-20030729.tar.bz2) = 12367528