From d97ea6e09ee7b9aa36c43731eb48369dc85f4644 Mon Sep 17 00:00:00 2001
From: John B <irgunii@gmail.com>
Date: Thu, 3 Apr 2014 22:37:33 +0700
Subject: network/dillo: Update Build Script.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 network/dillo/README           |  3 ---
 network/dillo/dillo.SlackBuild | 24 +++++++++++-------------
 network/dillo/dillo.info       |  6 +++---
 3 files changed, 14 insertions(+), 19 deletions(-)

(limited to 'network/dillo')

diff --git a/network/dillo/README b/network/dillo/README
index e97919ea35..5d4725b929 100644
--- a/network/dillo/README
+++ b/network/dillo/README
@@ -3,6 +3,3 @@ and small footprint.  It is written in C and C++ and is based on FLTK.
 
 HTTPS and SSL support is built into this but is only at *alpha* stage. It can
 be commented out in the dillo.SlackBuild file if you wish.
-
-Note: fltk can't be installed together alongside with fltk13 to build
-this package, so remove fltk prior to building this package.
diff --git a/network/dillo/dillo.SlackBuild b/network/dillo/dillo.SlackBuild
index a277d8b9dc..5422ee7efa 100644
--- a/network/dillo/dillo.SlackBuild
+++ b/network/dillo/dillo.SlackBuild
@@ -2,7 +2,9 @@
 
 # Slackware build script for dillo
 
-# Copyright 2012 John Berger  TN, USA
+# Copyright 2012 John B  TN, USA
+# This was only successful with the help of Erik Hanson and
+# B Watson who e-mailed me his patch/idea for the fltk and fltk-13 problem
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -64,22 +66,20 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -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 {} \;
 
-sed -i 's/fltk-config/fltk13-config/g' configure.ac
-autoreconf
+sed -i 's/fltk-config/fltk13-config/g' configure
 
- #https and ssl are in the alpha stage, but if you don't want to try and use it
- #just delete or comment out --enable-ssl
+LDFLAGS="-L/usr/lib$LIBDIRSUFFIX/fltk13 -Wl,-rpath,/usr/lib$LIBDIRSUFFIX/fltk13" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
+  --libdir=/usr/lib${LIBDIRSUFFIX}/fltk13 \
   --enable-ssl \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX}/fltk13 \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
@@ -98,9 +98,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  README AUTHORS INSTALL COPYING \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README AUTHORS INSTALL COPYING $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/dillo/dillo.info b/network/dillo/dillo.info
index fae37b2391..be0dd58074 100644
--- a/network/dillo/dillo.info
+++ b/network/dillo/dillo.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://www.dillo.org/download/dillo-3.0.3.tar.bz2"
 MD5SUM="726cd0b7a18c5e25f4d80ebeffe7607e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="fltk13"
-MAINTAINER="John Berger"
-EMAIL="insomniactoo ampersand localnet . com"
+REQUIRES="fltk fltk13"
+MAINTAINER="John B"
+EMAIL="irgunii ampersand gmail . com"
-- 
cgit v1.2.3