From 95f63bef3ec14b51ac3e13cb7881e5bf461aa90e Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Mon, 5 Jul 2010 14:42:03 +0200 Subject: [PATCH] /usr/Makefile: Adjust to our new handling of the pkgsrc GIT repository. --- etc/Makefile.usr | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/etc/Makefile.usr b/etc/Makefile.usr index 6bb6f7cc2d..6d285b2ca9 100644 --- a/etc/Makefile.usr +++ b/etc/Makefile.usr @@ -1,8 +1,6 @@ -# Makefile.pkgsrc - installed as /usr/pkgsrc/Makefile +# Makefile.usr - installed as /usr/Makefile # -# Provides simple targets to download and maintain /usr/pkgsrc. -# -# $DragonFly: src/etc/Makefile.usr,v 1.8 2008/09/03 10:38:55 hasso Exp $ +# Provides simple targets to download and maintain /usr/src, /usr/pkgsrc etc. help all: @echo "HELP:" @@ -55,12 +53,12 @@ pkgsrc-create: cd ${.CURDIR}/pkgsrc && \ git remote add origin git://git.dragonflybsd.org/pkgsrc.git cd ${.CURDIR}/pkgsrc && git fetch origin - cd ${.CURDIR}/pkgsrc && git branch vendor origin/vendor - cd ${.CURDIR}/pkgsrc && git checkout vendor + cd ${.CURDIR}/pkgsrc && git branch master origin/master + cd ${.CURDIR}/pkgsrc && git checkout master cd ${.CURDIR}/pkgsrc && git pull pkgsrc-checkout: - cd ${.CURDIR}/pkgsrc && git checkout vendor + cd ${.CURDIR}/pkgsrc && git checkout master pkgsrc-update: cd ${.CURDIR}/pkgsrc && git pull -- 2.41.0