From ca287d36b4725ff2cf67fa44cb810df5fec58360 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Sun, 16 Sep 2018 10:01:39 +0200
Subject: 20180916.1 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 network/elinks/elinks.SlackBuild | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

(limited to 'network/elinks/elinks.SlackBuild')

diff --git a/network/elinks/elinks.SlackBuild b/network/elinks/elinks.SlackBuild
index fd67946657..580d64180c 100644
--- a/network/elinks/elinks.SlackBuild
+++ b/network/elinks/elinks.SlackBuild
@@ -25,8 +25,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=elinks
-VERSION=${VERSION:-git20131231}
-BUILD=${BUILD:-9}
+VERSION=${VERSION:-20170723_f86be65}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -71,24 +71,11 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Next patch fixes URL: html links
-patch --verbose -p1 < $CWD/0001-gopher_html_links.patch
-
-# Next patch fixes index queries
-patch --verbose -p1 < $CWD/0002-gopher_index_queries.patch
-
-# Next patch fixes remote directory links
-patch --verbose -p1 < $CWD/0003-gopher_directory_links.patch
-
-# Next patch makes elinks verify ssl hostnames
-patch --verbose -p1 < $CWD/0004-ssl_cert_verify.patch
-
-# Next patch fixes several problems for gopher links
-patch --verbose -p1 < $CWD/0005-gopher_newlines_tabs_entity.patch
-
 [ -n "$NOMOUSE" ] && mouse="--disable-mouse"
 [ -n "$NOGPM" ] && gpm="--without-gpm"
 
+./autogen.sh
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
   ./configure \
@@ -99,7 +86,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --infodir=/usr/info \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --with-guile \
+  --without-guile \
   --enable-cgi \
   --enable-finger \
   --enable-fsp \
@@ -128,7 +115,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO doc/html doc/*txt \
+  AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO doc/*txt \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-- 
cgit v1.2.3