aboutsummaryrefslogtreecommitdiff
path: root/trunk/conf
diff options
context:
space:
mode:
Diffstat (limited to 'trunk/conf')
-rw-r--r--trunk/conf/generic.mkSlackBuild.new250
-rw-r--r--trunk/conf/simplepkg.conf.new28
2 files changed, 15 insertions, 263 deletions
diff --git a/trunk/conf/generic.mkSlackBuild.new b/trunk/conf/generic.mkSlackBuild.new
deleted file mode 100644
index 6b5473e..0000000
--- a/trunk/conf/generic.mkSlackBuild.new
+++ /dev/null
@@ -1,250 +0,0 @@
-###################################################
-## Generic template for SlackBuilds
-##
-## Version 0.8.1 - Luis ( luis at riseup d0t net)
-##
-###################################################
-<head> all
-#!/bin/bash
-#
-# SlackBuild for [[PROGRAM NAME]]
-# [[PROGRAM URL]]
-#
-# Author: [[SLACKBUILD AUTHOR]]
-#
-</head>
-
-<slackbuildrc> all
-# Look for slackbuildrc
-if [ -f ~/.slackbuildrc ]; then
- source ~/.slackbuildrc
-elif [ -f /etc/slackbuildrc ]; then
- source /etc/slackbuildrc
-fi
-</slackbuildrc>
-
-<set_variables> all
-# Set variables
-CWD="$(pwd)"
-SRC_NAME="[[SOURCE NAME]]"
-PKG_NAME="[[PACKAGE NAME]]"
-ARCH=${ARCH:=[[ARCH]]}
-SRC_VERSION=${VERSION:=[[VERSION]]}
-PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
-BUILD=${BUILD:=1[[SLACKBUILD AUTHOR INITIALS]]}
-SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
-TMP=${TMP:=/tmp}
-PKG=${PKG:=$TMP/package-$PKG_NAME}
-REPOS=${REPOS:=$TMP}
-PREFIX=${PREFIX:=[[PREFIX]]}
-PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION"
-CONF_OPTIONS=${CONF_OPTIONS:=[[OTHER CONFIGURE ARGS]]}
-NUMJOBS=${NUMJOBS:="-j4"}
-</set_variables>
-
-<slkflags> all
-# Set system libraries' path and optmization flags based on $ARCH
-LIBDIR="$PREFIX/lib"
-
-if [ "$ARCH" = "i386" ]; then
- SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
-elif [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686"
-elif [ "$ARCH" = "s390" ]; then
- SLKCFLAGS="-O2"
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2"
- LIBDIR="$PREFIX/lib64"
-fi
-</slkflags>
-
-<error_codes> on
-# Set error codes (used by createpkg)
-ERROR_WGET=31; ERROR_MAKE=32; ERROR_INSTALL=33
-ERROR_MD5=34; ERROR_CONF=35; ERROR_HELP=36
-ERROR_TAR=37; ERROR_MKPKG=38; ERROR_GPG=39
-ERROR_PATCH=40; ERROR_VCS=41; ERROR_MKDIR=42
-</error_codes>
-
-<start_structure> all
-# Clean up any leftovers of previous builds
-rm -rf "$PKG_SRC" 2> /dev/null
-rm -rf "$PKG" 2> /dev/null
-
-# Create directories if necessary
-mkdir -p "$SRC_DIR" || exit $ERROR_MKDIR
-mkdir -p "$PKG" || exit $ERROR_MKDIR
-mkdir -p "$REPOS" || exit $ERROR_MKDIR
-</start_structure>
-
-<download_source> on
-# Dowload source if necessary
-SRC="$SRC_NAME-$SRC_VERSION.tar.[[SOURCE EXTENSION]]"
-URL="[[DOWNLOAD FOLDER URL]]/$SRC"
-
-if [ ! -s "$SRC_DIR/$SRC" ] || ! [[DECOMPRESSOR]] [[DECOMPRESSOR TEST FLAG]] "$SRC_DIR/$SRC" 2> /dev/null; then
- wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
-fi
-</download_source>
-
-<md5sum_download_and_check> off
-# Download source's MD5 checksum if necessary and check it
-if [ ! -s "$SRC_DIR/$SRC.[[MD5SUM EXTENSION]]" ]; then
- wget "$URL.[[MD5SUM EXTENSION]]" -O "$SRC_DIR/$SRC.[[MD5SUM EXTENSION]]" || exit $ERROR_WGET
-fi
-
-MD5SUM_SRC="$(md5sum "$SRC_DIR/$SRC" | cut -d " " -f 1)"
-MD5SUM_URL="$(grep "$SRC[ \t]*$" "$SRC_DIR/$SRC.[[MD5SUM EXTENSION]]" | cut -d " " -f 1)"
-
-[ "$MD5SUM_SRC" == "$MD5SUM_URL" ] || exit $ERROR_MD5
-</md5sum_download_and_check>
-
-<gpg_signature_check> off
-# Import minimized signing key from
-# [[SIGNING KEY URL]]
-gpg --import << EOKEY || exit $ERROR_GPG
-[[SIGNING KEY]]
-EOKEY
-
-# Dowload source's signature if necessary and check it
-if [ ! -s "$SRC_DIR/$SRC.sig" ]; then
- wget "$URL.sig" -O "$SRC_DIR/$SRC.sig" || exit $ERROR_WGET
-fi
-
-gpg --verify "$SRC_DIR/$SRC.sig" "$SRC_DIR/$SRC" || exit $ERROR_GPG
-</gpg_signature_check>
-
-<untar_source> all
-# Untar
-cd "$TMP"
-tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
-cd "$PKG_SRC"
-</untar_source>
-
-<path_source> off
-# Patch source
-patches="[[PATCH FILES]]
- $PKG_NAME.diff $PKG_NAME-$PKG_VERSION.diff
- $PKG_NAME-$PKG_VERSION-$ARCH.diff $PKG_NAME-$ARCH.diff"
-for patch in $patches; do
- if [ -f "$CWD/$patch" ]; then
- patch -Np[[NUMBER OF PREFIX SLASHES TO STRIP]] < "$CWD/$patch" || exit $ERROR_PATCH
- elif [ -f "$CWD/patches/$patch" ]; then
- patch -Np[[NUMBER OF PREFIX SLASHES TO STRIP]] < "$CWD/patches/$patch" || exit $ERROR_PATCH
- fi
-done
-</path_source>
-
-<configure> on
-# Configure
-CFLAGS="$SLKCFLAGS" \
- CXXFLAGS="$SLKCFLAGS" \
- ./configure \
- --prefix="$PREFIX" --libdir="$LIBDIR" "$CONF_OPTIONS" || exit $ERROR_CONF
-</configure>
-
-<make_package> all
-# Compile
-make $NUMJOBS || exit $ERROR_MAKE
-</make_package>
-
-<install_package> all
-# Install
-make install DESTDIR="$PKG" || exit $ERROR_INSTALL
-</install_package>
-
-<strip_binaries> on
-# Strip binaries
-( cd "$PKG"
- find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
- xargs strip --strip-unneeded 2> /dev/null
- find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
- xargs strip --strip-unneeded 2> /dev/null
-)
-</strip_binaries>
-
-<compress_manpages> off
-# Compress and link manpages
-if [ -d "$PKG/$PREFIX/man" ]; then
- ( cd "$PKG/$PREFIX/man"
- for manpagedir in $(find . -type d -name "man*") ; do
- ( cd $manpagedir
- for eachpage in $( find . -type l -maxdepth 1) ; do
- ln -s $( readlink $eachpage ).gz $eachpage.gz
- rm $eachpage
- done
- gzip -9 *.?
- )
- done
- )
-fi
-</compress_manpages>
-
-<compress_info_files> off
-# Compress info files
-if [ -d "$PKG/$PREFIX/info" ]; then
- ( cd "$PKG/$PREFIX/info"
- rm -f dir
- gzip -9 *
- )
-fi
-</compress_info_files>
-
-<install_documentation> on
-# Install documentation
-DOCS="[[DOCUMENTATION FILES]]"
-mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR
-cp -a $DOCS "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION"
-</install_documentation>
-
-<slackdesc> on
-# Add package description (slack-desc)
-mkdir -p "$PKG/install" || exit $ERROR_MKDIR
-cat << EODESC > "$PKG/install/slack-desc"
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
- |-----handy-ruler------------------------------------------------------|
-[[SLACK-DESC]]
-EODESC
-</slackdesc>
-
-<postinstall_script> off
-# Add a post-installation script (doinst.sh)
-cat << EOSCRIPT > "$PKG/install/doinst.sh"
-config() {
- NEW="\$1"
- OLD="\$(dirname \$NEW)/\$(basename \$NEW .new)"
- # If there's no config file by that name, mv it over:
- if [ ! -r \$OLD ]; then
- mv \$NEW \$OLD
- elif [ "\$(cat \$OLD | md5sum)" = "\$(cat \$NEW | md5sum)" ]; then
- # toss the redundant copy
- rm \$NEW
- fi
- # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-config path/to/config_file.new
-[[REST OF DOINST.SH]]
-EOSCRIPT
-</postinstall_script>
-
-<build_package> all
-# Build the package
-cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
-</build_package>
-
-<clean_builds> on
-# Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
- rm -rf "$PKG_SRC" "$PKG"
-fi
-</clean_builds>
diff --git a/trunk/conf/simplepkg.conf.new b/trunk/conf/simplepkg.conf.new
index 50ea4ad..70aa70b 100644
--- a/trunk/conf/simplepkg.conf.new
+++ b/trunk/conf/simplepkg.conf.new
@@ -34,7 +34,7 @@ SIMPLARET_DOWNLOAD_FROM_NEXT_REPO="1"
# Wheter delete also patches when simplaret --purge is called;
# to enable it, set to "1" or "yes"
-SIMPLARET_PURGE_PATCHES="1"
+SIMPLARET_PURGE_PATCHES="0"
# Whether delete each package rigth after its installation;
# to enable it, set to "1" or "yes"
@@ -55,11 +55,11 @@ PASSIVE_FTP="1"
# Http retrieval tool;
# available parameters are "wget" or "curl"
-HTTP_TOOL="curl"
+HTTP_TOOL="wget"
# Ftp retrieval tool;
# available parameters are "wget", "curl" or "ncftpget"
-FTP_TOOL="curl"
+FTP_TOOL="wget"
# Set connection timeout in seconds
CONNECT_TIMEOUT="20"
@@ -127,26 +127,28 @@ TEMPLATE_STORAGE_STYLE="own-folder"
# MKBUILD AND CREATEPKG SECTION
#---------------------------------------------------------------------
# Set SlackBuilds default directory from scripts
-SLACKBUILDS_DIR="/var/slackbuilds"
+SLACKBUILDS_DIR="/var/simplaret/slackbuilds"
# Set binaries default repository directory
-#MAKEPKG_REPOS="/var/createpkg"
+MAKEPKG_REPOS="/var/simplaret/repos"
# Set sources default directory
-#SOURCE_DIR="/var/sources"
+SOURCE_DIR="/var/simplaret/sources"
# Set color style
# possible values are: color,gray, none
-#COLOR_MODE="none"
+COLOR_MODE="none"
+
+# Createpkg architecture
+CREATE_ARCH="i486"
+
+# Remove build files
+CREATE_CLEANUP="yes"
# Remove old packages from repository tree by createpkg
-# 0 enable
-# 1 desable
-#REMOVE_OLD_PACKAGE=1
+REMOVE_OLD_PACKAGE="off"
# Move package to SlackBuilds-like tree
-# 0 enable
-# 1 desable
-#MOVE_BIN_PACKAGE=1
+MOVE_BIN_PACKAGE="off"
#---------------------------------------------------------------------