From e52ad7baa28982fb63154d7eda40c54982f8d276 Mon Sep 17 00:00:00 2001
From: Silvino <silvino@bk.ru>
Date: Tue, 11 Jun 2019 03:46:58 +0100
Subject: fix core ports pkgmk.conf

---
 core/conf/pkgmk.conf | 24 +++++++++++++-----------
 core/ports.html      | 26 +++++++++++---------------
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/core/conf/pkgmk.conf b/core/conf/pkgmk.conf
index 14cc258..7a7c6e7 100644
--- a/core/conf/pkgmk.conf
+++ b/core/conf/pkgmk.conf
@@ -2,7 +2,7 @@
 # /etc/pkgmk.conf: pkgmk(8) configuration
 #
 
-export CFLAGS="-O2 -g -march=x86-64"
+export CFLAGS="-O2 -march=x86-64"
 export CXXFLAGS="${CFLAGS}"
 
 ## ccache settings
@@ -10,21 +10,23 @@ export CXXFLAGS="${CFLAGS}"
 #export CCACHE_DIR="/usr/ports/ccache"
 #export CCACHE_PREFIX="distcc"
 #export CCACHE_COMPILERCHECK="%compiler% -dumpversion; crux"
+#export DISTCC_DIR="/usr/ports/distcc"
 #
-#export DISTCC_HOSTS="localhost/4 worker/4"
-#export DISTCC_DIR="/urs/ports/distcc"
+## compile using ccache and distcc
+#export DISTCC_HOSTS="localhost/4 xborg/4"
+#
+## compile using distcc without ccache
+##export PATH="/usr/lib/distcc/:$PATH"
+##export DISTCC_HOSTS="localhost/4,lzo,cpp xborg/4,lzo,cpp cb1/2,lzo,cpp"
+#
+#export MAKEFLAGS="-j $(/usr/bin/distcc -j 2> /dev/null)"
+#export SCONSFLAGS="$MAKEFLAGS"
 
 # local compile only
+#export MAKEFLAGS="-j 8"
 export JOBS=$(nproc)
 export MAKEFLAGS="-j $JOBS"
 
-## compile using distcc
-## set static cpu cores available
-###export MAKEFLAGS="-j 8"
-## get dynamically cpu cores available
-#export MAKEFLAGS="/usr/bin/distcc -j 2> /dev/null"
-#export SCONSFLAGS="$MAKEFLAGS"
-
 case ${PKGMK_ARCH} in
 	"64"|"")
 		;;
@@ -40,7 +42,7 @@ case ${PKGMK_ARCH} in
 		;;
 esac
 
-PKGMK_SOURCE_MIRRORS=(http://c1.ank/distfiles/ http://c1.ank/archive/distfiles/)
+PKGMK_SOURCE_MIRRORS=(https://hive.gnu.systems/mirror/distfiles/)
 # PKGMK_SOURCE_DIR="$PWD"
 PKGMK_SOURCE_DIR="/usr/ports/distfiles"
 # PKGMK_PACKAGE_DIR="$PWD"
diff --git a/core/ports.html b/core/ports.html
index a977568..d7ea41c 100644
--- a/core/ports.html
+++ b/core/ports.html
@@ -211,26 +211,22 @@
         export CCACHE_COMPILERCHECK="%compiler% -dumpversion; crux"
         </pre>
 
-        <pre>
-        ## local compile only
-        #export JOBS=$(nproc)
-        #export MAKEFLAGS="-j $JOBS"
-
-        # compile using distcc
-        # set static cpu cores available
-        ##export MAKEFLAGS="-j 8"
-        # get dynamically cpu cores available
-        export MAKEFLAGS="/usr/bin/distcc -j 2> /dev/null"
-        export SCONSFLAGS="$MAKEFLAGS"
-        </pre>
-
         <p>Set distcc hosts and respective number of
         cpu cores to send work, hosts names, exp; "worker" must
         be configured on /etc/hosts.</p>
 
         <pre>
-        export DISTCC_HOSTS="localhost/4 worker/4"
-        export DISTCC_DIR="/urs/ports/distcc"
+        export DISTCC_DIR="/usr/ports/distcc"
+
+        # compile using ccache and distcc
+        export DISTCC_HOSTS="localhost/4 xborg/4"
+
+        # compile using distcc without ccache
+        #export PATH="/usr/lib/distcc/:$PATH"
+        #export DISTCC_HOSTS="localhost/4,lzo,cpp xborg/4,lzo,cpp cb1/2,lzo,cpp"
+
+        export MAKEFLAGS="-j $(/usr/bin/distcc -j 2> /dev/null)"
+        export SCONSFLAGS="$MAKEFLAGS"
         </pre>
 
         <p>Configure distcc daemon, edit
-- 
cgit 1.4.1-2-gfad0