aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--development/watchman/watchman.SlackBuild23
-rw-r--r--development/watchman/watchman.info6
2 files changed, 16 insertions, 13 deletions
diff --git a/development/watchman/watchman.SlackBuild b/development/watchman/watchman.SlackBuild
index 4cb6a55a572d..9b9c6116e718 100644
--- a/development/watchman/watchman.SlackBuild
+++ b/development/watchman/watchman.SlackBuild
@@ -2,8 +2,11 @@
# Slackware build script for watchman
+# Originally written by:
# Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
+# Now maintained by B. Watson (yalhcru@gmail.com)
+
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
@@ -22,9 +25,15 @@
# with this program (most likely, a file named COPYING). If not, see
# <https://www.gnu.org/licenses/>.
+# 20170309 bkw:
+# - take over maintenance
+# - use long-form github URL
+# - /usr/var/run => /var/run
+# - BUILD=2
+
PRGNAM=watchman
VERSION=${VERSION:-4.7.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -60,11 +69,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-if [ -e $CWD/v$VERSION.tar.gz ]; then
- tar xvf $CWD/v$VERSION.tar.gz
-else
- tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-fi
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -82,15 +87,13 @@ CXXFLAGS="$SLKCFLAGS" \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--localstatedir=/var \
+ --enable-statedir=/var/run/$PRGNAM \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--build=$ARCH-slackware-linux
make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make install-strip DESTDIR=$PKG
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a LICENSE README.markdown $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/development/watchman/watchman.info b/development/watchman/watchman.info
index 306f77c4abca..90a1672e1b3e 100644
--- a/development/watchman/watchman.info
+++ b/development/watchman/watchman.info
@@ -1,10 +1,10 @@
PRGNAM="watchman"
VERSION="4.7.0"
HOMEPAGE="https://facebook.github.io/watchman/"
-DOWNLOAD="https://github.com/facebook/watchman/archive/v4.7.0.tar.gz"
+DOWNLOAD="https://github.com/facebook/watchman/archive/v4.7.0/watchman-4.7.0.tar.gz"
MD5SUM="edb4201c790ace55569b82bd69cee78b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
-MAINTAINER="Ryan P.C. McQuen"
-EMAIL="ryanpcmcquen@member.fsf.org"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"