network/liferea: Updated for version 1.4.28

5 files changed, 79 insertions, 34 deletions

diff --git a/network/liferea/README b/network/liferea/README
index bebd46b14b..b6b1a0076a 100644
--- a/network/liferea/README
+++ b/network/liferea/README
@@ -4,4 +4,4 @@ for Linux or require many extra libraries to be installed.
 Liferea tries to fill this gap by creating a fast, easy to use,
 easy to install news aggregator for GTK/GNOME.
 
-Requires GConf, available at SlackBuilds.org.
+Requires GConf and libnotify, available at SlackBuilds.org.
diff --git a/network/liferea/doinst.sh b/network/liferea/doinst.sh
new file mode 100644
index 0000000000..51a03bc8f7
--- /dev/null
+++ b/network/liferea/doinst.sh
@@ -0,0 +1,13 @@
+schema_install() {
+  SCHEMA="$1"
+  GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \
+  chroot . gconftool-2 --makefile-install-rule \
+    /etc/gconf/schemas/$SCHEMA \
+    1>/dev/null
+}
+
+schema_install liferea.schemas
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/network/liferea/liferea.SlackBuild b/network/liferea/liferea.SlackBuild
index e4cacccaee..d1cbe7149c 100644
--- a/network/liferea/liferea.SlackBuild
+++ b/network/liferea/liferea.SlackBuild
@@ -1,24 +1,51 @@
-#!/bin/sh -eu
-
+#!/bin/sh
+#
 # Slackware build script for liferea
-# Written by Erik Hanson  erik@slackbuilds.org
+#
+# Copyright 2009-2010  Erik W. Hanson, Minneapolis, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=liferea
-VERSION=1.4.20
+VERSION=1.4.28
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-CWD=`pwd`
+
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 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 -eu
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
@@ -28,15 +55,25 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
+GTKHTML=${GTKHTML:-"yes"}
+WEBKIT=${WEBKIT:-"no"}
+XULRUNNER=${XULRUNNER:-"no"}
+LUA=${LUA:-"no"}
+
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --disable-gtkhtml2 \
-  --disable-webkit \
-  --disable-nm
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-gtkhtml2=$GTKHTML \
+  --enable-webkit=$WEBKIT \
+  --enable-gecko=$XULRUNNER \
+  --enable-lua=$LUA \
+  --disable-nm \
+  --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
@@ -44,29 +81,14 @@ make install-strip DESTDIR=$PKG
 gzip -9 $PKG/usr/man/man?/*.?
 gzip -9 $PKG/usr/man/pl/man?/*.?
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION $PKG/install
-cp -ar AUTHORS COPYING ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -ar AUTHORS COPYING ChangeLog INSTALL NEWS README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cat >> $PKG/install/doinst.sh << "EOF"
-mkdir -p etc/gconf/gconf.xml.defaults
-GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults"
-export GCONF_CONFIG_SOURCE
-EOF
-
-for SCHEMA in $(find $PKG/etc/gconf/schemas -name "*.schemas") ; do
-	ISCHEMA=$(echo $SCHEMA | cut -d"/" -f5-)
-	echo "gconftool-2 --makefile-install-rule $ISCHEMA" >> $PKG/install/doinst.sh
-done
-
-for ENTRY in $(find $PKG/etc/gconf/schemas -name "*.entries") ; do
-	IENTRY=$(echo $ENTRY | cut -d"/" -f5-)
-	echo "gconftool-2 --direct --config-source=\$GCONF_CONFIG_SOURCE --load $IENTRY" >> $PKG/install/doinst.sh
-done
-
-echo "unset GCONF_CONFIG_SOURCE" >> $PKG/install/doinst.sh
 
+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.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/liferea/liferea.info b/network/liferea/liferea.info
index f8e25e5447..fe96dc4678 100644
--- a/network/liferea/liferea.info
+++ b/network/liferea/liferea.info
@@ -1,8 +1,10 @@
 PRGNAM="liferea"
-VERSION="1.4.20"
+VERSION="1.4.28"
 HOMEPAGE="http://liferea.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/liferea/liferea-1.4.20.tar.gz"
-MD5SUM="c52212f73276aecd3293fb9d8e232d28"
+DOWNLOAD="http://downloads.sourceforge.net/liferea/liferea-1.4.28.tar.gz"
+MD5SUM="411bd9e56a648056cdce96dbea104c3e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
 APPROVED="dsomero"
diff --git a/network/liferea/slack-desc b/network/liferea/slack-desc
index 81ae0a3429..a33afe59fa 100644
--- a/network/liferea/slack-desc
+++ b/network/liferea/slack-desc
@@ -1,3 +1,11 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+       |-----handy-ruler----------------------------------------------------|
 liferea: liferea (A simple and free GTK desktop news aggregator for Unix)
 liferea: 
 liferea: Liferea is an aggregator for online news feeds. There are many