network/w3m: Update to 0.5.3_34

1 files changed, 82 insertions, 16 deletions

diff --git a/network/w3m/w3m.SlackBuild b/network/w3m/w3m.SlackBuild
index c6175eed32..97bc53612b 100644
--- a/network/w3m/w3m.SlackBuild
+++ b/network/w3m/w3m.SlackBuild
@@ -19,10 +19,14 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Now maintained by David Woodfall <dave@dawoodfall.net>
+# Now maintained by Dave Woodfall <dave@tty1.uk> (2018)
+# Much appreciation to the debian maintainers for keeping w3m alive and
+# patched https://packages.debian.org/stretch/w3m
 
 PRGNAM=w3m
-VERSION=${VERSION:-git20170104}
+VERSION=${VERSION:-0.5.3_34}
+SRCVERSION=${SRCVERSION:-0.5.3}
+PATCHVERS=${PATCHVERS:-34+deb9u1.debian}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -53,16 +57,23 @@ else
   LIBDIRSUFFIX=""
 fi
 
-DOCS="ChangeLog NEWS doc* ABOUT-NLS README TODO"
-
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$SRCVERSION
+# source
+tar xvf $CWD/${PRGNAM}_${SRCVERSION}.orig.tar.gz
+cd $PRGNAM-$SRCVERSION
+# patches
+tar xvf $CWD/${PRGNAM}_$SRCVERSION-$PATCHVERS.tar.xz
+
+# patches from debian
+while read patch; do
+  patch -p1 --verbose < debian/patches/$patch
+done < debian/patches/series
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -73,25 +84,32 @@ find -L . \
 [ -n "$NOMOUSE" ] && mouse="--disable-mouse"
 [ -n "$NOMAILER" ] && mailer="--disable-w3mmailer"
 [ -n "$GUIBROWSER" ] && browser="--with-browser=$GUIBROWSER"
+[ -n "$EDITOR" ] && editor="--with-editor=$EDITOR"
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-	--libexecdir=/usr/libexec \
+  --libexecdir=/usr/libexec \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --enable-image=x11,fb \
+  --with-gc \
+  --with-ssl \
+  --enable-image=x11,fb+s \
   --enable-keymap=w3m \
   --enable-gopher \
+  --enable-unicode \
+  --enable-nls \
+  --enable-m17n \
   --with-imagelib="gtk2 gdk-pixbuf imlib2" \
   --with-termlib="terminfo ncurses" \
-	$mouse \
-	$mailer \
-	$browser \
+  $mouse \
+  $mailer \
+  $browser \
+  $editor \
   --build=$ARCH-slackware-linux
 
 make
@@ -100,15 +118,63 @@ make install DESTDIR=$PKG
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-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/examples/Bonus
+find Bonus -type f | while read f; do
+  install -m 644 $f $PKG/usr/doc/$PRGNAM-$VERSION/examples/Bonus
+done
+
+mkdir -p $PKG/etc/w3m
+install -m 644 debian/w3mconfig $PKG/etc/w3m/config.new
+install -m 644 debian/mailcap $PKG/etc/w3m/mailcap.new
+
+DOCS="ChangeLog NEWS doc* ABOUT-NLS README TODO"
+DEBDOCS="changelog copyright mailcap w3mconfig"
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/debian
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+for doc in $DEBDOCS; do
+  cp -a debian/$doc $PKG/usr/doc/$PRGNAM-$VERSION/debian
+done
+
+mv $PKG/usr/doc/$PRGNAM-$VERSION/examples/Bonus/README \
+  $PKG/usr/doc/$PRGNAM-$VERSION/examples/Bonus/README.ja
+
+for f in \
+   $PKG/usr/doc/$PRGNAM-$VERSION/examples/Bonus/README.ja \
+   $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/FAQ.html \
+   $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/HISTORY \
+   $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/MANUAL.html \
+   $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/README \
+   $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/README.SSL \
+   $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/README.cookie \
+   $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/README.dict \
+   $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/README.func \
+   $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/README.keymap \
+   $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/README.m17n \
+   $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/README.mailcap \
+   $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/README.menu \
+   $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/README.migemo \
+   $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/README.mouse \
+   $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/README.siteconf \
+   $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/STORY.html \
+   $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/menu.default \
+   $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/menu.submenu \
+   $PKG/usr/man/ja/man1/w3m.1; do \
+   iconv -f euc-jp -t utf-8 "$f" > "$f".tmp \
+    && mv -f "$f".tmp "$f" || rm -f "$f".tmp; \
+ done
+
+find $PKG -name CVS -type d -exec rm -rf '{}' \+
+
+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
+
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 mkdir -p $PKG/install
 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.${PKGTYPE:-tgz}