pkgsrc: Update git repo info

diff --git a/etc/Makefile b/etc/Makefile
index bcb3d7c8626e3ae0cf61ae56171b3ad944d5ff65..36b2c8074b52c7034e12167ba07e649d5ffa99d2 100644 (file)
--- 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 e46c066073f64dce0d62e147c15ebb6ac3c711fa..706f8827bfe4050c83f7b8bed0a8eb7c57e9bb34 100644 (file)
--- 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