From 1b7c1f4e4b8871d5ae3eb4706eb0b8bcc45b1a6f Mon Sep 17 00:00:00 2001 From: Corrado Franco Date: Mon, 10 Nov 2014 10:55:31 +0100 Subject: [PATCH] justniffer: upgraded to 0.5.12 --- justniffer/justniffer.SlackBuild | 31 ++++++++++++++----------------- justniffer/justniffer.info | 8 ++++---- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/justniffer/justniffer.SlackBuild b/justniffer/justniffer.SlackBuild index 80699bd06c..2d272adb88 100644 --- a/justniffer/justniffer.SlackBuild +++ b/justniffer/justniffer.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for justniffer (http://justniffer.sourceforge.net/) # -# Copyright 2008-2013 Corrado Franco (http://www.conraid.net) +# Copyright 2008-2014 Corrado Franco (http://www.conraid.net) # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -29,8 +29,8 @@ set -e CWD=$(pwd) PRGNAME=${PRGNAME:-justniffer} -VERSION=${VERSION:-$(echo ${PRGNAME}_*.tar.?z* | rev | cut -f3- -d. | cut -f1 -d_ | rev)} -BUILD=${BUILD:-5} +VERSION=${VERSION:-0.5.12} +BUILD=${BUILD:-1} TAG=${TAG:-cf} TMP=${TMP:-/tmp/pkg} PKG=$TMP/package-$PRGNAME @@ -39,11 +39,12 @@ DOCS="$PKG/usr/doc/$PRGNAME-$VERSION" # Insert document files in this variable DOCFILES="AUTHORS COPYING ChangeLog INSTALL NEWS README" -# Automatically determine the architecture we are building on: +ARCH=${ARCH:=""} # Set ARCH or leave blank to determine it automatically +# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i686 ;; - arm*) ARCH=arm ;; + i?86) ARCH=i686 ;; + arm*) ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac @@ -81,13 +82,15 @@ cd $PRGNAME-$VERSION chown -R root:root . chmod -R u+w,go+r-w,a-s . +# Configure sed -i "s#CFLAGS = @CFLAGS@#CFLAGS = $SLKCFLAGS#g" Makefile.in sed -i "s#CXXFLAGS = @CXXFLAGS@#CXXFLAGS = $SLKCFLAGS#g" Makefile.in -sed -i "s#LDFLAGS = @LDGLAGS@#LDFLAGS = $SLKLDFLAGS#g" Makefile.in +sed -i "s#LDFLAGS = @LDGLAGS@#LDFLAGS = $SLKLDFLAGS -Wl,-z,defs#g" Makefile.in sed -i "s#CFLAGS = @CFLAGS@#CFLAGS = $SLKCFLAGS#g" src/Makefile.in sed -i "s#CXXFLAGS = @CXXFLAGS@#CXXFLAGS = $SLKCFLAGS#g" src/Makefile.in -sed -i "s#LDFLAGS = @LDGLAGS@#LDFLAGS = $SLKLDFLAGS#g" src/Makefile.in +sed -i "s#LDFLAGS = @LDGLAGS@#LDFLAGS = $SLKLDFLAGS -Wl,-z,defs#g" src/Makefile.in +automake --add-missing ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -96,6 +99,8 @@ sed -i "s#LDFLAGS = @LDGLAGS@#LDFLAGS = $SLKLDFLAGS#g" src/Makefile.in --mandir=/usr/man \ --infodir=/usr/info \ --with-boost-libdir=/usr/lib${LIBDIRSUFFIX} \ + --disable-dependency-tracking \ + --enable-python \ --host=$CHOST-slackware-linux \ --build=$CHOST-slackware-linux @@ -113,15 +118,7 @@ fi # Add a documentation directory: mkdir -p ${DOCS} -for i in ${DOCFILES}; do - if [ -e ${i} ]; then - if ! [ -L ${i} ]; then - cp -a ${i} ${DOCS} - else - cp -LRp ${i} ${DOCS} - fi - fi; -done +cp -a $DOCFILES $DOCS || true # Add a slackbuild script: cat $CWD/$PRGNAME.SlackBuild > $DOCS/$PRGNAME.SlackBuild diff --git a/justniffer/justniffer.info b/justniffer/justniffer.info index 8fd758f8be..bd75f9e847 100644 --- a/justniffer/justniffer.info +++ b/justniffer/justniffer.info @@ -1,7 +1,7 @@ NAME="justniffer" -VERSION="0.5.11" +VERSION="0.5.12" HOMEPAGE="http://justniffer.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/project/justniffer/justniffer/justniffer%200.5.11/justniffer_0.5.11.tar.gz" +DOWNLOAD="http://downloads.sourceforge.net/project/justniffer/justniffer/justniffer%200.5.12/justniffer_0.5.12.tar.gz" REQUIRES="" -MD5SUM="8545b817c479444b01e74aa7b79fd2c6" -SHASUM="3f3222361794a6f79f47567753550995c318a037" +MD5SUM="4321e69e77f21b335c9f1da228b70450" +SHASUM="f3f7f06d5abb2fdedc37b004409e4f7eae47c2a9"