From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Fri, 19 Jul 2013 22:05:53 +0000 (-0700)
Subject: Makefile.usr - Move fetch locations
X-Git-Tag: v3.7.0~801
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/f201b7975e0e9367ce6df110145fb69162bc7244

Makefile.usr - Move fetch locations

* Move the bootstrap fetch from leaf:~marino to mirror-master

* Move the dports git fetch from ~marino's github to mirror-master
  (which currently clones it)
---

diff --git a/etc/Makefile.usr b/etc/Makefile.usr
index 9d904e3566..4c3a59a410 100644
--- a/etc/Makefile.usr
+++ b/etc/Makefile.usr
@@ -10,8 +10,9 @@ PKGBALL=/tmp/pkgboot.tar.xz
 DPDLURL=https://api.github.com/repos/jrmarino/DPorts/tarball/
 PKGBOOT_i386=bootstrap_pkg_x86-32.tar.xz
 PKGBOOT_x86_64=bootstrap_pkg_x86-64.tar.xz
-PKGBOOT=http://leaf.dragonflybsd.org/~marino/dports-src/${PKGBOOT_${MACHINE_ARCH}}
+PKGBOOT=http://mirror-master.dragonflybsd.org/dports/bootstraps/${PKGBOOT_${MACHINE_ARCH}}
 GITNFMSG="git must be present on the system to use this option."
+ABIVERS=`uname -P`
 ERRPS="Error: ${.CURDIR}/pkgsrc already exists"
 ERRDP="Error: ${.CURDIR}/dports already exists"
 ERRSR="Error: ${.CURDIR}/src already exists"
@@ -23,7 +24,6 @@ WSTARS="***************************************************************"
 WARNPS="  Warning: Delete or move ${.CURDIR}/pkg before building any dport!"
 LPATT="   make %-23s- %s\n"
 
-
 help all:
 	@echo "HELP:"
 .if exists(${.CURDIR}/pkgsrc/.git)
@@ -49,9 +49,8 @@ help all:
 	@printf ${LPATT} "dports-download"       "download & install dports tarball from Github"
 .  endif
 .endif
-.if !exists(${.CURDIR}/local/sbin/pkg)
 	@printf ${LPATT} "pkg-bootstrap"	"Use pre-built pkg to install dports packages"
-.endif
+	@printf ${LPATT} "pkg-bootstrap-force"	"Force it (pkg.conf will be overwritten)"
 	@echo
 
 .if exists(${.CURDIR}/src/.git)
@@ -217,7 +216,7 @@ dports-create:
 .else
 	@echo "If problems occur you may have to rm -rf dports and try again."
 	@echo
-	git clone git://github.com/jrmarino/DPorts.git ${.CURDIR}/dports
+	git clone git://mirror-master.dragonflybsd.org/dports.git ${.CURDIR}/dports
 .if exists(${.CURDIR}/pkg)
 	@echo ${WSTARS}
 	@echo ${WARNPS}
@@ -233,7 +232,7 @@ dports-create-shallow:
 .else
 	@echo "If problems occur you may have to rm -rf dports and try again."
 	@echo
-	git clone --depth=1 git://github.com/jrmarino/DPorts.git \
+	git clone --depth=1 git://mirror-master.dragonflybsd.org/dports.git \
 	   ${.CURDIR}/dports
 .if exists(${.CURDIR}/pkg)
 	@echo ${WSTARS}
@@ -274,6 +273,12 @@ dports-replace:
 	rm -f ${DPTBALL}
 .endif
 
+pkg-bootstrap-force:
+	@fetch -o ${PKGBALL} ${PKGBOOT}
+	@tar -xJf ${PKGBALL} -C ${.CURDIR}/local
+	@rm -f ${PKGBALL}
+	ABI=${ABIVERS} ${.CURDIR}/local/sbin/pkg-static install -y -f pkg
+
 pkg-bootstrap:
 .if exists(${.CURDIR}/local/sbin/pkg)
 	@echo ${ERRPKG}
@@ -284,5 +289,5 @@ pkg-bootstrap:
 	@fetch -o ${PKGBALL} ${PKGBOOT}
 	@tar -xJf ${PKGBALL} -C ${.CURDIR}/local
 	@rm -f ${PKGBALL}
-	@echo "type 'rehash; pkg-static install -y pkg; rehash' to install the latest pkg"
+	ABI=${ABIVERS} ${.CURDIR}/local/sbin/pkg-static install -y pkg
 .endif