Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
procps-ng: Updated for 3.3.15
  • Loading branch information
belka-ew committed Jul 21, 2018
1 parent 5e71963 commit 99b33d6
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 67 deletions.
1 change: 0 additions & 1 deletion procps-ng/apply-patches.sh
Expand Up @@ -8,7 +8,6 @@ DLACK_PATCHDIR=${CWD}/patches
# This is how previous versions of 'w' in Slackware have always
# defaulted.
patch -p1 -E --backup --verbose -i ${DLACK_PATCHDIR}/procps.w.showfrom.diff
#patch -p0 -E --backup --verbose -i ${DLACK_PATCHDIR}/procps-3.3.9-systemd209.patch

# Set to YES if autogen is needed
DLACK_AUTOGEN=YES
Expand Down
11 changes: 0 additions & 11 deletions procps-ng/patches/procps-3.3.9-systemd209.patch

This file was deleted.

25 changes: 0 additions & 25 deletions procps-ng/patches/psmisc.diff

This file was deleted.

35 changes: 12 additions & 23 deletions procps-ng/procps-ng.SlackBuild
Expand Up @@ -23,8 +23,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

PKGNAM=procps-ng
VERSION=${VERSION:-3.3.14}
PSMISCVER=${PSMISCVER:-22.21}
VERSION=${VERSION:-3.3.15}
PSMISCVER=${PSMISCVER:-23.1}
PROCINFONGVER=${PROCINFONGVER:-2.0.304}
PROCINFOVER=${PROCINFOVER:-18}
BUILD=${BUILD:-1}
Expand All @@ -33,14 +33,11 @@ TAG=${TAG:-_dlack}
NUMJOBS=${NUMJOBS:--j7}

# Automatically determine the architecture we're building on:
MARCH=$( uname -m )
if [ -z "$ARCH" ]; then
case "$MARCH" in
i?86) export ARCH=i586 ;;
armv7hl) export ARCH=$MARCH ;;
arm*) export ARCH=arm ;;
# Unless $ARCH is already set, use uname -m for all other archs:
*) export ARCH=$MARCH ;;
case "$( uname -m )" in
i?86) export ARCH=i586 ;;
arm*) export ARCH=arm ;;
*) export ARCH=$( uname -m ) ;;
esac
fi

Expand All @@ -58,19 +55,11 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
elif [ "$ARCH" = "armv7hl" ]; then
SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
LIBDIRSUFFIX=""
else
SLKCFLAGS="-O2"
LIBDIRSUFFIX=""
fi

case "$ARCH" in
arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
*) TARGET=$ARCH-slackware-linux ;;
esac

rm -rf $TMP
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
Expand All @@ -82,11 +71,11 @@ tar xvf $CWD/procinfo-ng-$PROCINFONGVER.tar.xz || exit 1
tar xvf $CWD/procinfo-$PROCINFOVER.tar.xz || exit 1
chown -R root:root .

find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-o -perm 511 \) -exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;

unset DLACK_AUTOGEN
if [ -r ${CWD}/apply-patches.sh ]; then
Expand Down Expand Up @@ -122,7 +111,7 @@ CXXFLAGS="$SLKCFLAGS" \
--disable-kill \
--enable-timeout-stat \
--with-systemd \
--build=$TARGET || exit 1
--build=$ARCH-slackware-linux || exit 1

make $NUMJOBS || make || exit 1
make install DESTDIR=${PKG} || exit 1
Expand Down
14 changes: 7 additions & 7 deletions procps-ng/procps-ng.info
@@ -1,11 +1,11 @@
PKGNAM="procps-ng"
VERSION="3.3.14"
VERSION="3.3.15"
HOMEPAGE="https://sourceforge.net/projects/procps-ng/"
DOWNLOAD="http://prdownloads.sourceforge.net/procps-ng/procps-ng-3.3.14.tar.xz \
ftp://ftp.slackware.com/pub/slackware/slackware-current/source/a/procps-ng/procinfo-18.tar.xz \
ftp://ftp.slackware.com/pub/slackware/slackware-current/source/a/procps-ng/procinfo-ng-2.0.304.tar.xz \
ftp://ftp.slackware.com/pub/slackware/slackware-current/source/a/procps-ng/psmisc-22.21.tar.xz"
MD5SUM="957e42e8b193490b2111252e4a2b443c \
DOWNLOAD="https://prdownloads.sourceforge.net/procps-ng/procps-ng-3.3.15.tar.xz \
https://mirrors.slackware.com/slackware/slackware-current/source/a/procps-ng/procinfo-18.tar.xz \
https://mirrors.slackware.com/slackware/slackware-current/source/a/procps-ng/procinfo-ng-2.0.304.tar.xz \
https://mirrors.slackware.com/slackware/slackware-current/source/a/procps-ng/psmisc-23.1.tar.xz"
MD5SUM="2b0717a7cb474b3d6dfdeedfbad2eccc \
9c62b234519cd78169b8ac531ca6444b \
a174f43d2e747a53218ea1522f5943b4 \
df10c3779ef2c24d133d57165fe2c918"
bbba1f701c02fb50d59540d1ff90d8d1"

0 comments on commit 99b33d6

Please sign in to comment.