aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--devel/linux_devtools-6/Makefile19
-rw-r--r--devel/linux_devtools/Makefile19
2 files changed, 8 insertions, 30 deletions
diff --git a/devel/linux_devtools-6/Makefile b/devel/linux_devtools-6/Makefile
index 739c3bf3c489..990116d74712 100644
--- a/devel/linux_devtools-6/Makefile
+++ b/devel/linux_devtools-6/Makefile
@@ -8,7 +8,8 @@
PORTNAME= linux_devtools
PORTVERSION= 6.1
CATEGORIES= devel emulators linux
-MASTER_SITES= ${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
+MASTER_SITES= ${MASTER_SITE_REDHAT_LINUX}
+MASTER_SITE_SUBDIR= ${PORTVERSION}/en/os/${MACHINE_ARCH}/RedHat/RPMS
DISTFILES= ${RPM_KERNEL_HEADERS} \
${RPM_GLIBC_DEVEL} \
make-3.77-6.${MACHINE_ARCH}.rpm \
@@ -19,7 +20,8 @@ DISTFILES= ${RPM_KERNEL_HEADERS} \
${RPM_GDB} \
${RPM_X_DEVEL}
-PATCH_SITES= ${RPM_MIRRORS:S/__DIR__/${UPDDIR}/g}
+PATCH_SITES= ${MASTER_SITE_REDHAT_LINUX}
+PATCH_SITE_SUBDIR= updates/${PORTVERSION}/en/os/${MACHINE_ARCH}
PATCHFILES=
MAINTAINER= marcel@FreeBSD.org
@@ -37,19 +39,6 @@ NO_FILTER_SHLIBS= yes
NO_MTREE= yes
PLIST= ${PKGDIR}/pkg-plist.${MACHINE_ARCH}
-RPM_MIRRORS= \
- ftp://ftp.redhat.com/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__/ \
- ftp://mirror.nucba.ac.jp/mirror/redhat/__DIR__/ \
- ftp://ftp.mirror.ac.uk/sites/ftp.redhat.com/pub/redhat/__DIR__/ \
- ftp://ftp.is.co.za/linux/distributions/redhat/__DIR__/ \
- ftp://mirror.aarnet.edu.au/pub/linux/redhat/__DIR__/
-
-STDDIR= linux/6.1/en/os/${MACHINE_ARCH}/RedHat/RPMS
-UPDDIR= linux/updates/6.1/en/os/${MACHINE_ARCH}
-
.include <bsd.port.pre.mk>
.if (${MACHINE_ARCH} == "i386")
diff --git a/devel/linux_devtools/Makefile b/devel/linux_devtools/Makefile
index 739c3bf3c489..990116d74712 100644
--- a/devel/linux_devtools/Makefile
+++ b/devel/linux_devtools/Makefile
@@ -8,7 +8,8 @@
PORTNAME= linux_devtools
PORTVERSION= 6.1
CATEGORIES= devel emulators linux
-MASTER_SITES= ${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
+MASTER_SITES= ${MASTER_SITE_REDHAT_LINUX}
+MASTER_SITE_SUBDIR= ${PORTVERSION}/en/os/${MACHINE_ARCH}/RedHat/RPMS
DISTFILES= ${RPM_KERNEL_HEADERS} \
${RPM_GLIBC_DEVEL} \
make-3.77-6.${MACHINE_ARCH}.rpm \
@@ -19,7 +20,8 @@ DISTFILES= ${RPM_KERNEL_HEADERS} \
${RPM_GDB} \
${RPM_X_DEVEL}
-PATCH_SITES= ${RPM_MIRRORS:S/__DIR__/${UPDDIR}/g}
+PATCH_SITES= ${MASTER_SITE_REDHAT_LINUX}
+PATCH_SITE_SUBDIR= updates/${PORTVERSION}/en/os/${MACHINE_ARCH}
PATCHFILES=
MAINTAINER= marcel@FreeBSD.org
@@ -37,19 +39,6 @@ NO_FILTER_SHLIBS= yes
NO_MTREE= yes
PLIST= ${PKGDIR}/pkg-plist.${MACHINE_ARCH}
-RPM_MIRRORS= \
- ftp://ftp.redhat.com/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__/ \
- ftp://mirror.nucba.ac.jp/mirror/redhat/__DIR__/ \
- ftp://ftp.mirror.ac.uk/sites/ftp.redhat.com/pub/redhat/__DIR__/ \
- ftp://ftp.is.co.za/linux/distributions/redhat/__DIR__/ \
- ftp://mirror.aarnet.edu.au/pub/linux/redhat/__DIR__/
-
-STDDIR= linux/6.1/en/os/${MACHINE_ARCH}/RedHat/RPMS
-UPDDIR= linux/updates/6.1/en/os/${MACHINE_ARCH}
-
.include <bsd.port.pre.mk>
.if (${MACHINE_ARCH} == "i386")