desktop/icon-naming-utils: Updated for version 0.8.6

3 files changed, 35 insertions, 43 deletions

diff --git a/desktop/icon-naming-utils/README b/desktop/icon-naming-utils/README
index d8ea17efce..02c39f37e4 100644
--- a/desktop/icon-naming-utils/README
+++ b/desktop/icon-naming-utils/README
@@ -1,10 +1,9 @@
-Icon-naming-utils generate icon files for your DE
+Icon-naming-utils generate icon files for your desktop environment
 
-It is a script for maintaining backwards compatibility with
-current desktop icon themes while migrating to the names 
-specified in the Icon Naming Specification.
-See http://www.freedesktop.org/wiki/Standards_2ficon_2dnaming_2dspec
-
-Icon-naming-utils needs the XML::Simple perl module, which is 
-available at SlackBuilds.org as xml-simple.
+It is a script for maintaining backwards compatibility with current desktop 
+icon themes while migrating to the names specified in the freedesktop.org
+Icon Naming Specification.  For more information, see:
+http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
 
+Icon-naming-utils needs the XML::Simple perl module, which is available at 
+SlackBuilds.org as perl-xml-simple.
diff --git a/desktop/icon-naming-utils/icon-naming-utils.SlackBuild b/desktop/icon-naming-utils/icon-naming-utils.SlackBuild
index 553459cf11..3cb5dd833a 100644
--- a/desktop/icon-naming-utils/icon-naming-utils.SlackBuild
+++ b/desktop/icon-naming-utils/icon-naming-utils.SlackBuild
@@ -1,29 +1,28 @@
 #!/bin/sh
 # 
-# Slackware Build Script for icon-naming-utils
+# Slackware build script for icon-naming-utils
 # (C) 2007 Michael Wagner <lapinours@web.de>
+# All rights reserved.
 #
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
 #
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# 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.
  
-# Modified by the SlackBuilds.org project
-
-set -e
-
 PRGNAM=icon-naming-utils
-VERSION=0.8.2
+VERSION=0.8.6
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -32,7 +31,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="AUTHORS COPYING ChangeLog INSTALL README"
+DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -42,30 +41,24 @@ fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
+cd $TMP || exit 1
 rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root . || true
+tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
+cd $PRGNAM-$VERSION || exit 1
+chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
+# Place pkgconfigdir under /usr/lib/ instead of /usr/share/
+sed -i s/'pkgconfigdir = $(datadir)'/'pkgconfigdir = $(libdir)'/ Makefile.*
+
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --sysconfdir=/etc \
-  --localstatedir=/var/lib \
-  --program-prefix="" \
   || exit 1
   
 make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-# Someone is smoking some good stuff...  let's put the pkgconfig directory
-# where it belongs
-mkdir -p $PKG/usr/lib
-mv $PKG/usr/share/pkgconfig $PKG/usr/lib
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/desktop/icon-naming-utils/icon-naming-utils.info b/desktop/icon-naming-utils/icon-naming-utils.info
index 20682a687a..bf6bec4b96 100644
--- a/desktop/icon-naming-utils/icon-naming-utils.info
+++ b/desktop/icon-naming-utils/icon-naming-utils.info
@@ -1,8 +1,8 @@
 PRGNAM="icon-naming-utils"
-VERSION="0.8.2"
+VERSION="0.8.6"
 HOMEPAGE="tango.freedesktop.org"
-DOWNLOAD="http://tango-project.org/releases/icon-naming-utils-0.8.2.tar.gz"
-MD5SUM="76e6afde567bd17b4fe095aa0ec90531 "
+DOWNLOAD="http://tango-project.org/releases/icon-naming-utils-0.8.6.tar.gz"
+MD5SUM="22bd13295d42ff886f6ea355d00e036b "
 MAINTAINER="Michael Wagner"
 EMAIL="lapinours@web.de"
 APPROVED="BP{k},rworkman"