3 files changed, 56 insertions, 53 deletions
diff --git a/trunk/conf/repos.conf b/trunk/conf/repos.conf
new file mode 100644
index 0000000..fa06a8e
--- /dev/null
+++ b/trunk/conf/repos.conf
@@ -0,0 +1,37 @@
+#
+# repository definitions for simplaret
+# please dont use any spaces inside a repository definition
+#
+
+# slackware root repositories
+#ROOT-i386="sarava%http://slack.sarava.org/slackware/"
+ROOT-i386="tds%http://slackware.mirrors.tds.net/pub/slackware/"
+ROOT-i386="easynews%http://slackware.mirrors.easynews.com/linux/slackware/"
+ROOT-i386="gwdg%http://ftp.gwdg.de/pub/linux/slackware/"
+
+# powerpc root definitions
+ROOT-powerpc="workaround%http://slackintosh.workaround.ch/pub/slackintosh/"
+
+# s390 root definitions
+ROOT-s390="ibiblio%http://distro.ibiblio.org/pub/linux/distributions/slack390/"
+
+# slamd64 root repositories
+#ROOT-x86_64="sarava%http://slack.sarava.org/slamd64/"
+ROOT-x86_64="slackadelic%http://mirror1.slackadelic.com/slamd64/"
+ROOT-x86_64="heanet%http://ftp.heanet.ie/pub/slamd64/"
+
+# If you want to use Bluewhite64 instead of Slamd64, please uncoment the
+# next line and make sure to comment out all other slamd64 repository definitions
+#ROOT-x86_64="bluewhite64%http://mirror.inode.at/data/bluewhite64/"
+
+# If you want to use Sflack instead of Slamd64 or Bluewhite64, please uncoment
+# the next line and make sure to comment out all other slamd64 and Bluewhite64
+# repository definitions
+#ROOT-x86_64="bluewhite64%http://webftp.slackarea.net/pub/sflack/"
+
+# noarch
+NOARCH="sarava%http://slack.sarava.org/packages/noarch"
+
+# i386 12.1
+REPOS-i386-12.1="sarava%http://slack.sarava.org/packages/slackware/slackware-12.1/"
+PATCHES-i386-12.1="sarava%http://slack.sarava.org/packages/slackware/slackware-12.1/patches/"
diff --git a/trunk/conf/repos.conf.new b/trunk/conf/repos.conf.new
deleted file mode 100644
index 02ded08..0000000
--- a/trunk/conf/repos.conf.new
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# repository definitions for simplaret
-# please dont use any spaces inside a repository definition
-#
-
-# root repositories
-ROOT-i386="tds%http://slackware.mirrors.tds.net/pub/slackware/"
-ROOT-i386="sarava%http://slack.sarava.org/slackware/"
-ROOT-powerpc="workaround%http://slackintosh.workaround.ch/pub/slackintosh/"
-ROOT-s390="ibiblio%http://distro.ibiblio.org/pub/linux/distributions/slack390/"
-ROOT-x86_64="sarava%http://slack.sarava.org/slamd64/"
-ROOT-x86_64="slackadelic%http://mirror1.slackadelic.com/slamd64/"
-ROOT-x86_64="heanet%http://ftp.heanet.ie/pub/slamd64/"
-# If you want to use Bluewhite64 instead of Slamd64, please uncoment the
-# next line and make sure to comment out all other slamd64 repository definitions
-#ROOT-x86_64="bluewhite64%http://mirror.inode.at/data/bluewhite64/"
-# If you want to use Sflack instead of Slamd64, please uncoment the
-# next line and make sure to comment out all other slamd64 repository definitions
-#ROOT-x86_64="bluewhite64%http://webftp.slackarea.net/pub/sflack/"
-
-# noarch
-NOARCH="sarava%http://slack.sarava.org/packages/noarch"
-
-# i386 10.2
-REPOS-i386-10.2="sarava%http://slack.sarava.org/packages/slackware/slackware-10.2/"
-PATCHES-i386-10.2="sarava%http://slack.sarava.org/packages/slackware/slackware-10.2/patches/"
-
-# x86_64 10.2
-REPOS-x86_64-10.2="sarava%http://slack.sarava.org/packages/slamd64/slamd64-10.2/"
-PATCHES-x86_64-10.2="sarava%http://slack.sarava.org/packages/slamd64/slamd64-10.2/patches/"
-
-# x86_64 10.2b
-REPOS-x86_64-10.2b="sarava%http://slack.sarava.org/packages/slamd64/slamd64-10.2b/"
-PATCHES-x86_64-10.2b="sarava%http://slack.sarava.org/packages/slamd64/slamd64-10.2b/patches/"
-
-# i386 11.0
-REPOS-i386-11.0="sarava%http://slack.sarava.org/packages/slackware/slackware-11.0/"
-PATCHES-i386-11.0="sarava%http://slack.sarava.org/packages/slackware/slackware-11.0/patches/"
-
-# x86_64 11.0
-REPOS-x86_64-11.0="sarava%http://slack.sarava.org/packages/slamd64/slamd64-11.0/"
-PATCHES-x86_64-11.0="sarava%http://slack.sarava.org/slamd64/slamd64-11.0/patches/"
-
-# powerpc 11.0
-REPOS-powerpc-11.0="sarava%http://slack.sarava.org/packages/slackintosh/slackintosh-11.0/"
-PATCHES-powerpc-11.0="workaround%http://slackintosh.workaround.ch/pub/slackintosh/11.0/patches/"
-
-# i386 12.0
-REPOS-i386-12.0="sarava%http://slack.sarava.org/packages/slackware/slackware-12.0/"
-PATCHES-i386-12.0="sarava%http://slack.sarava.org/packages/slackware/slackware-12.0/patches/"
-
diff --git a/trunk/conf/simplepkg.conf.new b/trunk/conf/simplepkg.conf
index d5b2e2d..9e7427d 100644
--- a/trunk/conf/simplepkg.conf.new
+++ b/trunk/conf/simplepkg.conf
@@ -1,5 +1,5 @@
 #
-# /etc/simplepkg/simplepkg.conf
+# /etc/simplepkg/default/simplepkg.conf
 #
 
 # Default architecture: set this option if you dont want simplepkg
@@ -10,10 +10,13 @@
 # to use the value from /etc/slackware-version
 # DEFAULT_VERSION="12.1"
 
+# Temporary folder
+TMP="/tmp"
+
 # Where jails are placed
 JAIL_ROOT="/vservers"
 
-# Wheter mkjial should add new jails in the jail list;
+# Wheter mkjail should add new jails in the jail list;
 # to enable it, set to "1" or "yes"
 ADD_TO_JAIL_LIST="1"
 
@@ -141,6 +144,17 @@ MKBUILDS_SVN="http://slack.sarava.org/mkbuilds"
 # Set binaries default repository directory
 MAKEPKG_REPOS="/var/simplepkg/repos"
 
+# Set the binaries default repository nested folder, useful if you manage
+# packages from different distribution versions and architectures in the
+# same parent folder.
+#
+# You can use any string here and also de special parameters none, distro,
+# arch and version. You can also mix more than one parameter, like
+# "distro-version".
+#
+# Default value is "none", which means no nested folders.
+MAKEPKG_REPOS_STYLE="none"
+
 # Set sources default directory
 SOURCE_DIR="/var/simplepkg/sources"
 
@@ -160,4 +174,7 @@ REMOVE_OLD_PACKAGE="off"
 # Move package to SlackBuilds-like tree
 MOVE_BIN_PACKAGE="on"
 
+# Move package's slack-required to binary repository
+MOVE_SLACK_REQUIRED="on"
+
 #---------------------------------------------------------------------