diff options
| -rw-r--r-- | network/bitlbee/bitlbee.SlackBuild | 20 | ||||
| -rw-r--r-- | network/bitlbee/bitlbee.info | 10 |
2 files changed, 21 insertions, 9 deletions
diff --git a/network/bitlbee/bitlbee.SlackBuild b/network/bitlbee/bitlbee.SlackBuild index ea9ba08b83..6bd417110a 100644 --- a/network/bitlbee/bitlbee.SlackBuild +++ b/network/bitlbee/bitlbee.SlackBuild @@ -24,7 +24,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=bitlbee -VERSION=1.2.3 +VERSION=${VERSION:-1.2.4} ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -34,10 +34,19 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +# Set the SSL type to use. Since Slackware-13.0 seems to +# require gnutls to work properly, we'll use that as default. +CRYPT=${CRYPT:-gnutls} + if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi set -e @@ -59,8 +68,9 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ - --config=/var/lib/bitlbee \ - --etcdir=/etc/bitlbee \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --config=/var/lib/$PRGNAM \ + --etcdir=/etc/$PRGNAM \ --mandir=/usr/man \ --msn=1 \ --jabber=1 \ @@ -69,7 +79,7 @@ CXXFLAGS="$SLKCFLAGS" \ --ipv6=1 \ --plugins=1 \ --events=glib \ - --ssl=openssl \ + --ssl=$CRYPT \ --debug=0 \ --build=$ARCH-slackware-linux \ --host=$ARCH-slackware-linux @@ -114,4 +124,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/bitlbee/bitlbee.info b/network/bitlbee/bitlbee.info index f9160b5b8a..39e150538e 100644 --- a/network/bitlbee/bitlbee.info +++ b/network/bitlbee/bitlbee.info @@ -1,8 +1,10 @@ PRGNAM="bitlbee" -VERSION="1.2.3" +VERSION="1.2.4" HOMEPAGE="http://www.bitlbee.org" -DOWNLOAD="http://get.bitlbee.org/src/bitlbee-1.2.3.tar.gz" -MD5SUM="2b1674d98804970809de3da3edf0bed2" +DOWNLOAD="http://get.bitlbee.org/src/bitlbee-1.2.4.tar.gz" +MD5SUM="26b9bfc5446bdf0e932e8074d117be67" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" MAINTAINER="Michiel van Wessem" EMAIL="michiel@slackbuilds.org" -APPROVED="rworkman" +APPROVED="dsomero" |