diff options
Diffstat (limited to 'source/n/mtr')
-rw-r--r-- | source/n/mtr/mtr-0.73.configure.error.diff | 20 | ||||
-rwxr-xr-x | source/n/mtr/mtr.SlackBuild | 45 |
2 files changed, 32 insertions, 33 deletions
diff --git a/source/n/mtr/mtr-0.73.configure.error.diff b/source/n/mtr/mtr-0.73.configure.error.diff deleted file mode 100644 index 896a5216..00000000 --- a/source/n/mtr/mtr-0.73.configure.error.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- ./configure.orig 2008-04-07 11:32:49.000000000 -0500 -+++ ./configure 2008-07-24 12:57:20.000000000 -0500 -@@ -6737,17 +6737,6 @@ - - - rm -f conf.gtktest -- -- else -- AM_PATH_GTK(1.0.0, CFLAGS="$CFLAGS $GTK_CFLAGS" -- LIBS="$LIBS $GTK_LIBS", -- { echo "$as_me:$LINENO: WARNING: Building without GTK+ display support" >&5 --echo "$as_me: WARNING: Building without GTK+ display support" >&2;} -- cat >>confdefs.h <<\_ACEOF --#define NO_GTK 1 --_ACEOF -- -- GTK_OBJ="") - fi - else - cat >>confdefs.h <<\_ACEOF diff --git a/source/n/mtr/mtr.SlackBuild b/source/n/mtr/mtr.SlackBuild index 91ed7be9..4f53c587 100755 --- a/source/n/mtr/mtr.SlackBuild +++ b/source/n/mtr/mtr.SlackBuild @@ -22,10 +22,19 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=mtr -VERSION=0.73 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +PKGNAM=mtr +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi NUMJOBS=${NUMJOBS:-" -j7 "} @@ -35,19 +44,20 @@ elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" +else + SLKCFLAGS="-O2" fi CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PKGNAM rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf ${PRGNAM}-${VERSION} -tar xvf $CWD/${PRGNAM}-${VERSION}.tar.bz2 || exit 1 -cd ${PRGNAM}-${VERSION} || exit 1 -zcat $CWD/mtr-0.73.configure.error.diff.gz | patch -p1 --verbose || exit 1 +rm -rf ${PKGNAM}-${VERSION} +tar xvf $CWD/${PKGNAM}-${VERSION}.tar.?z* || exit 1 +cd ${PKGNAM}-${VERSION} || exit 1 chown -R root.root * find . \ @@ -70,11 +80,19 @@ make DESTDIR=$PKG install || exit 1 chmod -s $PKG/usr/sbin/mtr -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ AUTHORS COPYING* FORMATS INSTALL NEWS README* SECURITY TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION -chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/* + $PKG/usr/doc/$PKGNAM-$VERSION +chmod -R a-w $PKG/usr/doc/$PKGNAM-$VERSION/* + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi # Compress the man page(s) find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; @@ -88,5 +106,6 @@ cat $CWD/slack-desc > $PKG/install/slack-desc # Build the package: cd $PKG -/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + |