merge git from master into develop

8 files changed, 29 insertions, 16 deletions

diff --git a/core/conf/ports/contrib.git b/core/conf/ports/contrib.git
index 461f70a..178495d 100644
--- a/core/conf/ports/contrib.git
+++ b/core/conf/ports/contrib.git
@@ -1,7 +1,7 @@
 # Collection core
 #
 NAME=contrib
-URL=git://c2.ank/contrib.git
-BRANCH=master
+URL=git://hive.gnu.systems/contrib.git
+BRANCH=stable-3.4
 destination=/usr/ports/contrib
 PORTS_DIR="/usr/ports"
diff --git a/core/conf/ports/core.git b/core/conf/ports/core.git
index e907dcb..c8df2ff 100644
--- a/core/conf/ports/core.git
+++ b/core/conf/ports/core.git
@@ -1,7 +1,7 @@
 # Collection core
 #
 NAME=core
-URL=git://c2.ank/core.git
-BRANCH=master
+URL=git://hive.gnu.systems/core.git
+BRANCH=stable-3.4
 destination=/usr/ports/core
 PORTS_DIR="/usr/ports"
diff --git a/core/conf/ports/mate.git b/core/conf/ports/mate.git
index 7335ba4..ded4c12 100644
--- a/core/conf/ports/mate.git
+++ b/core/conf/ports/mate.git
@@ -1,7 +1,7 @@
 # Collection mate
 #
 NAME=mate
-URL=git://c2.ank/mate.git
-BRANCH=master
+URL=git://hive.gnu.systems/mate.git
+BRANCH=stable-3.4
 destination=/usr/ports/mate
 PORTS_DIR="/usr/ports"
diff --git a/core/conf/ports/mate.httpup.inactive b/core/conf/ports/mate.httpup.inactive
index 93ad84f..ada5d63 100644
--- a/core/conf/ports/mate.httpup.inactive
+++ b/core/conf/ports/mate.httpup.inactive
@@ -2,4 +2,4 @@
 # File generated by the CRUX portdb https://crux.nu/portdb/
 
 ROOT_DIR=/usr/ports/mate
-URL=https://raw.githubusercontent.com/mhoush/crux-mate/master/
+URL=https://raw.githubusercontent.com/mhoush/crux-mate/stable-3.4/
diff --git a/core/conf/ports/opt.git b/core/conf/ports/opt.git
index 4cad2d2..c8eca84 100644
--- a/core/conf/ports/opt.git
+++ b/core/conf/ports/opt.git
@@ -1,7 +1,7 @@
 # Collection core
 #
 NAME=opt
-URL=git://c2.ank/opt.git
-BRANCH=master
+URL=git://hive.gnu.systems/opt.git
+BRANCH=stable-3.4
 destination=/usr/ports/opt
 PORTS_DIR="/usr/ports"
diff --git a/core/conf/ports/ports.git b/core/conf/ports/ports.git
index f099049..59d2072 100644
--- a/core/conf/ports/ports.git
+++ b/core/conf/ports/ports.git
@@ -1,7 +1,7 @@
 # Collection Ports Driver
 #
 NAME=ports
-URL=git://c2.ank/ports.git
-BRANCH=master
+URL=git://hive.gnu.systems/ports.git
+BRANCH=stable-3.4
 destination=/usr/ports/ports
 PORTS_DIR="/usr/ports"
diff --git a/core/conf/ports/xorg.git b/core/conf/ports/xorg.git
index 5e80694..f5511d3 100644
--- a/core/conf/ports/xorg.git
+++ b/core/conf/ports/xorg.git
@@ -1,7 +1,7 @@
 # Collection core
 #
 NAME=xorg
-URL=git://c2.ank/xorg.git
-BRANCH=master
+URL=git://hive.gnu.systems/xorg.git
+BRANCH=stable-3.4
 destination=/srv/ports/xorg
 PORTS_DIR="/usr/ports"
diff --git a/core/conf/skel/.bashrc b/core/conf/skel/.bashrc
index 9a7498e..88cf24c 100644
--- a/core/conf/skel/.bashrc
+++ b/core/conf/skel/.bashrc
@@ -29,6 +29,7 @@ alias mv='mv -i'
 alias mkdir='mkdir -p'
 
 alias h='history'
+alias hg='history | grep'
 alias j='jobs -l'
 alias which='type -a'
 alias ..='cd ..'
@@ -40,13 +41,25 @@ genpasswd () {
     tr -dc A-Za-z0-9_ < /dev/urandom | head -c ${l} | xargs
 }
 
-# Git graph log
+# Git log
 glog () {
+    git log --stat --decorate
+}
+# Git graph log
+gloga () {
     git log --graph --abbrev-commit --decorate --date=relative --all
 }
 
+alias tmux="tmux -2"
+
+# Virtual Crux machine
+alias c1.ank="ssh c1.ank -t tmux a"
+alias c2.ank="ssh c2.ank -t tmux a"
+alias c9.ank="ssh c9.ank -t tmux a"
+
+alias pkg_mirror="pkg_bin -f /usr/ports/mirror_bin_db"
+alias pkg_update="pkg_bin -r /usr/ports/mirror_bin_db"
 
-#alias tmux="tmux -2"
 #if [[ -z "$TMUX" ]] ;then
 #    ID="`tmux ls | grep -vm1 attached | cut -d: -f1`" # get the id of a deattached session
 #    if [[ -z "$ID" ]] ;then # if not available create a new one
@@ -55,4 +68,4 @@ glog () {
 #        tmux attach-session -t "$ID" # if available attach to it
 #    fi
 #fi
-#
+MAIL=/home/silvino/.mail/