From 41ae712b50f57e4bbeb31e6800c7f897e92b830c Mon Sep 17 00:00:00 2001
From: Arun Thomas <arun@minix3.org>
Date: Tue, 23 Nov 2010 11:12:06 +0000
Subject: [PATCH] pkgsrc: Update git repo info

---
 etc/Makefile     | 4 +++-
 etc/usr/Makefile | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/etc/Makefile b/etc/Makefile
index bcb3d7c86..36b2c8074 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -29,7 +29,7 @@ install::
 	@echo "Installing fonts.."
 	install -m 644 -o root -g operator fonts/*.fnt /usr/lib/fonts/
 
-installforce:: $(ETC)/rc $(ETC)/rs.inet $(ETC)/rs.single $(ETC)/system.conf $(USRETC)/rc
+installforce:: $(ETC)/rc $(ETC)/rs.inet $(ETC)/rs.single $(ETC)/system.conf $(USRETC)/rc $(USR)/Makefile
 
 $(ETC)/rc: rc
 	install -m 755 -o root -g operator $> $@
@@ -46,3 +46,5 @@ $(ETC)/system.conf: system.conf
 $(USRETC)/rc: usr/rc
 	install -m 755 -o root -g operator $> $@
 
+$(USR)/Makefile: usr/Makefile
+	install -m 644 -o root -g operator $> $@
diff --git a/etc/usr/Makefile b/etc/usr/Makefile
index e46c06607..706f8827b 100644
--- a/etc/usr/Makefile
+++ b/etc/usr/Makefile
@@ -26,14 +26,14 @@ pkgsrc-create:
 	mkdir -p ${.CURDIR}/pkgsrc
 	cd ${.CURDIR}/pkgsrc && git init
 	cd ${.CURDIR}/pkgsrc && \
-		git remote add origin http://github.com/gautambt/Pkgsrc-Minix.git
+		git remote add origin git://git.minix3.org/pkgsrc.git
 	cd ${.CURDIR}/pkgsrc && git fetch origin
-	cd ${.CURDIR}/pkgsrc && git branch minix origin/minix
-	cd ${.CURDIR}/pkgsrc && git checkout minix
+	cd ${.CURDIR}/pkgsrc && git branch minix-master origin/minix-master
+	cd ${.CURDIR}/pkgsrc && git checkout minix-master
 	cd ${.CURDIR}/pkgsrc && git pull
 
 pkgsrc-checkout:
-	cd ${.CURDIR}/pkgsrc && git checkout minix
+	cd ${.CURDIR}/pkgsrc && git checkout minix-master
 
 pkgsrc-update:
 	cd ${.CURDIR}/pkgsrc && git pull