8 files changed, 24 insertions, 24 deletions

diff --git a/emulators/linux_base-6/Makefile b/emulators/linux_base-6/Makefile
index a5b2c14179fe..f47f7423d0e4 100644
--- a/emulators/linux_base-6/Makefile
+++ b/emulators/linux_base-6/Makefile
@@ -31,7 +31,7 @@ MD5_FILE=		${MASTERDIR}/distinfo.${MACHINE_ARCH}
 
 RPM_MIRRORS=		\
 	ftp://ftp.freesoftware.com/pub/linux/redhat/__DIR__/ \
-	ftp://ftp.redhat.com/redhat/__DIR__/ \
+	ftp://ftp.redhat.com/pub/redhat/__DIR__/ \
 	ftp://ftp.infomagic.com/pub/mirrors/linux/RedHat/__DIR__/ \
 	ftp://ftp.crc.ca/mirrors/by-site/ftp.redhat.com/redhat/__DIR__/ \
 	ftp://ftp.nluug.nl/site/ftp.redhat.com/redhat/__DIR__/ \
@@ -40,8 +40,8 @@ RPM_MIRRORS=		\
 	ftp://ftp.is.co.za/linux/distributions/redhat/__DIR__/ \
 	ftp://mirror.aarnet.edu.au/pub/linux/redhat/__DIR__/
 
-STDDIR=			old-releases/redhat-6.1/${MACHINE_ARCH}/RedHat/RPMS
-UPDDIR=			updates/6.1/${MACHINE_ARCH}
+STDDIR=			linux/6.1/en/os/${MACHINE_ARCH}/RedHat/RPMS
+UPDDIR=			linux/updates/6.1/en/os/${MACHINE_ARCH}
 
 .include <bsd.port.pre.mk>
 
diff --git a/emulators/linux_base-62/Makefile b/emulators/linux_base-62/Makefile
index a5b2c14179fe..f47f7423d0e4 100644
--- a/emulators/linux_base-62/Makefile
+++ b/emulators/linux_base-62/Makefile
@@ -31,7 +31,7 @@ MD5_FILE=		${MASTERDIR}/distinfo.${MACHINE_ARCH}
 
 RPM_MIRRORS=		\
 	ftp://ftp.freesoftware.com/pub/linux/redhat/__DIR__/ \
-	ftp://ftp.redhat.com/redhat/__DIR__/ \
+	ftp://ftp.redhat.com/pub/redhat/__DIR__/ \
 	ftp://ftp.infomagic.com/pub/mirrors/linux/RedHat/__DIR__/ \
 	ftp://ftp.crc.ca/mirrors/by-site/ftp.redhat.com/redhat/__DIR__/ \
 	ftp://ftp.nluug.nl/site/ftp.redhat.com/redhat/__DIR__/ \
@@ -40,8 +40,8 @@ RPM_MIRRORS=		\
 	ftp://ftp.is.co.za/linux/distributions/redhat/__DIR__/ \
 	ftp://mirror.aarnet.edu.au/pub/linux/redhat/__DIR__/
 
-STDDIR=			old-releases/redhat-6.1/${MACHINE_ARCH}/RedHat/RPMS
-UPDDIR=			updates/6.1/${MACHINE_ARCH}
+STDDIR=			linux/6.1/en/os/${MACHINE_ARCH}/RedHat/RPMS
+UPDDIR=			linux/updates/6.1/en/os/${MACHINE_ARCH}
 
 .include <bsd.port.pre.mk>
 
diff --git a/emulators/linux_base-8/Makefile b/emulators/linux_base-8/Makefile
index a5b2c14179fe..f47f7423d0e4 100644
--- a/emulators/linux_base-8/Makefile
+++ b/emulators/linux_base-8/Makefile
@@ -31,7 +31,7 @@ MD5_FILE=		${MASTERDIR}/distinfo.${MACHINE_ARCH}
 
 RPM_MIRRORS=		\
 	ftp://ftp.freesoftware.com/pub/linux/redhat/__DIR__/ \
-	ftp://ftp.redhat.com/redhat/__DIR__/ \
+	ftp://ftp.redhat.com/pub/redhat/__DIR__/ \
 	ftp://ftp.infomagic.com/pub/mirrors/linux/RedHat/__DIR__/ \
 	ftp://ftp.crc.ca/mirrors/by-site/ftp.redhat.com/redhat/__DIR__/ \
 	ftp://ftp.nluug.nl/site/ftp.redhat.com/redhat/__DIR__/ \
@@ -40,8 +40,8 @@ RPM_MIRRORS=		\
 	ftp://ftp.is.co.za/linux/distributions/redhat/__DIR__/ \
 	ftp://mirror.aarnet.edu.au/pub/linux/redhat/__DIR__/
 
-STDDIR=			old-releases/redhat-6.1/${MACHINE_ARCH}/RedHat/RPMS
-UPDDIR=			updates/6.1/${MACHINE_ARCH}
+STDDIR=			linux/6.1/en/os/${MACHINE_ARCH}/RedHat/RPMS
+UPDDIR=			linux/updates/6.1/en/os/${MACHINE_ARCH}
 
 .include <bsd.port.pre.mk>
 
diff --git a/emulators/linux_base-rh-9/Makefile b/emulators/linux_base-rh-9/Makefile
index a5b2c14179fe..f47f7423d0e4 100644
--- a/emulators/linux_base-rh-9/Makefile
+++ b/emulators/linux_base-rh-9/Makefile
@@ -31,7 +31,7 @@ MD5_FILE=		${MASTERDIR}/distinfo.${MACHINE_ARCH}
 
 RPM_MIRRORS=		\
 	ftp://ftp.freesoftware.com/pub/linux/redhat/__DIR__/ \
-	ftp://ftp.redhat.com/redhat/__DIR__/ \
+	ftp://ftp.redhat.com/pub/redhat/__DIR__/ \
 	ftp://ftp.infomagic.com/pub/mirrors/linux/RedHat/__DIR__/ \
 	ftp://ftp.crc.ca/mirrors/by-site/ftp.redhat.com/redhat/__DIR__/ \
 	ftp://ftp.nluug.nl/site/ftp.redhat.com/redhat/__DIR__/ \
@@ -40,8 +40,8 @@ RPM_MIRRORS=		\
 	ftp://ftp.is.co.za/linux/distributions/redhat/__DIR__/ \
 	ftp://mirror.aarnet.edu.au/pub/linux/redhat/__DIR__/
 
-STDDIR=			old-releases/redhat-6.1/${MACHINE_ARCH}/RedHat/RPMS
-UPDDIR=			updates/6.1/${MACHINE_ARCH}
+STDDIR=			linux/6.1/en/os/${MACHINE_ARCH}/RedHat/RPMS
+UPDDIR=			linux/updates/6.1/en/os/${MACHINE_ARCH}
 
 .include <bsd.port.pre.mk>
 
diff --git a/emulators/linux_base-suse-9.1/Makefile b/emulators/linux_base-suse-9.1/Makefile
index a5b2c14179fe..f47f7423d0e4 100644
--- a/emulators/linux_base-suse-9.1/Makefile
+++ b/emulators/linux_base-suse-9.1/Makefile
@@ -31,7 +31,7 @@ MD5_FILE=		${MASTERDIR}/distinfo.${MACHINE_ARCH}
 
 RPM_MIRRORS=		\
 	ftp://ftp.freesoftware.com/pub/linux/redhat/__DIR__/ \
-	ftp://ftp.redhat.com/redhat/__DIR__/ \
+	ftp://ftp.redhat.com/pub/redhat/__DIR__/ \
 	ftp://ftp.infomagic.com/pub/mirrors/linux/RedHat/__DIR__/ \
 	ftp://ftp.crc.ca/mirrors/by-site/ftp.redhat.com/redhat/__DIR__/ \
 	ftp://ftp.nluug.nl/site/ftp.redhat.com/redhat/__DIR__/ \
@@ -40,8 +40,8 @@ RPM_MIRRORS=		\
 	ftp://ftp.is.co.za/linux/distributions/redhat/__DIR__/ \
 	ftp://mirror.aarnet.edu.au/pub/linux/redhat/__DIR__/
 
-STDDIR=			old-releases/redhat-6.1/${MACHINE_ARCH}/RedHat/RPMS
-UPDDIR=			updates/6.1/${MACHINE_ARCH}
+STDDIR=			linux/6.1/en/os/${MACHINE_ARCH}/RedHat/RPMS
+UPDDIR=			linux/updates/6.1/en/os/${MACHINE_ARCH}
 
 .include <bsd.port.pre.mk>
 
diff --git a/emulators/linux_base-suse-9.2/Makefile b/emulators/linux_base-suse-9.2/Makefile
index a5b2c14179fe..f47f7423d0e4 100644
--- a/emulators/linux_base-suse-9.2/Makefile
+++ b/emulators/linux_base-suse-9.2/Makefile
@@ -31,7 +31,7 @@ MD5_FILE=		${MASTERDIR}/distinfo.${MACHINE_ARCH}
 
 RPM_MIRRORS=		\
 	ftp://ftp.freesoftware.com/pub/linux/redhat/__DIR__/ \
-	ftp://ftp.redhat.com/redhat/__DIR__/ \
+	ftp://ftp.redhat.com/pub/redhat/__DIR__/ \
 	ftp://ftp.infomagic.com/pub/mirrors/linux/RedHat/__DIR__/ \
 	ftp://ftp.crc.ca/mirrors/by-site/ftp.redhat.com/redhat/__DIR__/ \
 	ftp://ftp.nluug.nl/site/ftp.redhat.com/redhat/__DIR__/ \
@@ -40,8 +40,8 @@ RPM_MIRRORS=		\
 	ftp://ftp.is.co.za/linux/distributions/redhat/__DIR__/ \
 	ftp://mirror.aarnet.edu.au/pub/linux/redhat/__DIR__/
 
-STDDIR=			old-releases/redhat-6.1/${MACHINE_ARCH}/RedHat/RPMS
-UPDDIR=			updates/6.1/${MACHINE_ARCH}
+STDDIR=			linux/6.1/en/os/${MACHINE_ARCH}/RedHat/RPMS
+UPDDIR=			linux/updates/6.1/en/os/${MACHINE_ARCH}
 
 .include <bsd.port.pre.mk>
 
diff --git a/emulators/linux_base-suse-9.3/Makefile b/emulators/linux_base-suse-9.3/Makefile
index a5b2c14179fe..f47f7423d0e4 100644
--- a/emulators/linux_base-suse-9.3/Makefile
+++ b/emulators/linux_base-suse-9.3/Makefile
@@ -31,7 +31,7 @@ MD5_FILE=		${MASTERDIR}/distinfo.${MACHINE_ARCH}
 
 RPM_MIRRORS=		\
 	ftp://ftp.freesoftware.com/pub/linux/redhat/__DIR__/ \
-	ftp://ftp.redhat.com/redhat/__DIR__/ \
+	ftp://ftp.redhat.com/pub/redhat/__DIR__/ \
 	ftp://ftp.infomagic.com/pub/mirrors/linux/RedHat/__DIR__/ \
 	ftp://ftp.crc.ca/mirrors/by-site/ftp.redhat.com/redhat/__DIR__/ \
 	ftp://ftp.nluug.nl/site/ftp.redhat.com/redhat/__DIR__/ \
@@ -40,8 +40,8 @@ RPM_MIRRORS=		\
 	ftp://ftp.is.co.za/linux/distributions/redhat/__DIR__/ \
 	ftp://mirror.aarnet.edu.au/pub/linux/redhat/__DIR__/
 
-STDDIR=			old-releases/redhat-6.1/${MACHINE_ARCH}/RedHat/RPMS
-UPDDIR=			updates/6.1/${MACHINE_ARCH}
+STDDIR=			linux/6.1/en/os/${MACHINE_ARCH}/RedHat/RPMS
+UPDDIR=			linux/updates/6.1/en/os/${MACHINE_ARCH}
 
 .include <bsd.port.pre.mk>
 
diff --git a/emulators/linux_base/Makefile b/emulators/linux_base/Makefile
index a5b2c14179fe..f47f7423d0e4 100644
--- a/emulators/linux_base/Makefile
+++ b/emulators/linux_base/Makefile
@@ -31,7 +31,7 @@ MD5_FILE=		${MASTERDIR}/distinfo.${MACHINE_ARCH}
 
 RPM_MIRRORS=		\
 	ftp://ftp.freesoftware.com/pub/linux/redhat/__DIR__/ \
-	ftp://ftp.redhat.com/redhat/__DIR__/ \
+	ftp://ftp.redhat.com/pub/redhat/__DIR__/ \
 	ftp://ftp.infomagic.com/pub/mirrors/linux/RedHat/__DIR__/ \
 	ftp://ftp.crc.ca/mirrors/by-site/ftp.redhat.com/redhat/__DIR__/ \
 	ftp://ftp.nluug.nl/site/ftp.redhat.com/redhat/__DIR__/ \
@@ -40,8 +40,8 @@ RPM_MIRRORS=		\
 	ftp://ftp.is.co.za/linux/distributions/redhat/__DIR__/ \
 	ftp://mirror.aarnet.edu.au/pub/linux/redhat/__DIR__/
 
-STDDIR=			old-releases/redhat-6.1/${MACHINE_ARCH}/RedHat/RPMS
-UPDDIR=			updates/6.1/${MACHINE_ARCH}
+STDDIR=			linux/6.1/en/os/${MACHINE_ARCH}/RedHat/RPMS
+UPDDIR=			linux/updates/6.1/en/os/${MACHINE_ARCH}
 
 .include <bsd.port.pre.mk>