diff options
Diffstat (limited to 'source/x/x11/x11.SlackBuild')
| -rwxr-xr-x | source/x/x11/x11.SlackBuild | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/source/x/x11/x11.SlackBuild b/source/x/x11/x11.SlackBuild index 6da53346..d2d75e4f 100755 --- a/source/x/x11/x11.SlackBuild +++ b/source/x/x11/x11.SlackBuild @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2007-2013 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2007-2014 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,10 @@ # ./x11.SlackBuild lib libX11 # Upgrade packages as they are built. -# This is default. To not upgrade, pass UPGRADE_PACKAGES=no (or anything else). +# Default is to upgrade new packages (UPGRADE_PACKAGES=yes). +# To install ALL newly built packages (even if they are already installed), +# use UPGRADE_PACKAGES=always +# To not upgrade, pass UPGRADE_PACKAGES=no UPGRADE_PACKAGES=${UPGRADE_PACKAGES:-yes} pkgbase() { @@ -58,7 +61,7 @@ TMP=${TMP:-/tmp} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -275,6 +278,8 @@ mkdir -p $SLACK_X_BUILD_DIR /sbin/makepkg -l y -c n ${SLACK_X_BUILD_DIR}/${PKGNAME}-${MODULAR_PACKAGE_VERSION}-${PKGARCH}-${MODBUILD}.txz if [ "$UPGRADE_PACKAGES" = "yes" ]; then /sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/${PKGNAME}-${MODULAR_PACKAGE_VERSION}-${PKGARCH}-${MODBUILD}.txz + elif [ "$UPGRADE_PACKAGES" = "always" ]; then + /sbin/upgradepkg --install-new --reinstall ${SLACK_X_BUILD_DIR}/${PKGNAME}-${MODULAR_PACKAGE_VERSION}-${PKGARCH}-${MODBUILD}.txz fi fi fi @@ -329,6 +334,8 @@ mkdir -p $SLACK_X_BUILD_DIR /sbin/makepkg -l y -c n ${SLACK_X_BUILD_DIR}/x11-${x_source_dir}-${VERSION}-${PKGARCH}-${SRCDIRBUILD}.txz if [ "$UPGRADE_PACKAGES" = "yes" ]; then /sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/x11-${x_source_dir}-${VERSION}-${PKGARCH}-${SRCDIRBUILD}.txz + elif [ "$UPGRADE_PACKAGES" = "always" ]; then + /sbin/upgradepkg --install-new --reinstall ${SLACK_X_BUILD_DIR}/x11-${x_source_dir}-${VERSION}-${PKGARCH}-${SRCDIRBUILD}.txz fi fi ) |