summaryrefslogtreecommitdiff
path: root/libraries
diff options
context:
space:
mode:
authorSteven King <kingrst@gmail.com>2013-12-02 08:51:53 +0700
committerRobby Workman <rworkman@slackbuilds.org>2013-12-02 00:57:39 -0600
commit627123e8811f16fb806e8917f2db2afbf4c1b375 (patch)
tree5eaf36630b14573b4eab7242a61dee361e55be7b /libraries
parent6c95f2d058417faaf523fed2942bdd0a0841e75f (diff)
downloadslackbuilds-627123e8811f16fb806e8917f2db2afbf4c1b375.tar.gz
libraries/iniparser: Updated for version 3.1.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org> Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'libraries')
-rw-r--r--libraries/iniparser/README1
-rw-r--r--libraries/iniparser/iniparser.SlackBuild52
-rw-r--r--libraries/iniparser/iniparser.info6
-rw-r--r--libraries/iniparser/patches/fixup_Makefile.patch70
-rw-r--r--libraries/iniparser/patches/fixup_dictionary.h_include.patch12
-rw-r--r--libraries/iniparser/slack-desc4
6 files changed, 36 insertions, 109 deletions
diff --git a/libraries/iniparser/README b/libraries/iniparser/README
index d93c29c726..f9cd696418 100644
--- a/libraries/iniparser/README
+++ b/libraries/iniparser/README
@@ -1,4 +1,5 @@
Iniparser is a free stand-alone INI file parsing library.
+It is written in portable ANSI C and should compile anywhere.
WARNING:
This package will overwrite Samba's libiniparser.so
diff --git a/libraries/iniparser/iniparser.SlackBuild b/libraries/iniparser/iniparser.SlackBuild
index 52f944fe00..a81eefa589 100644
--- a/libraries/iniparser/iniparser.SlackBuild
+++ b/libraries/iniparser/iniparser.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=iniparser
-VERSION=${VERSION:-2.17}
+VERSION=${VERSION:-3.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -49,6 +49,8 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+ LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,-rpath -Wl,/usr/lib64 -Wl,-rpath,/usr/lib64"
+ LDFLAGS="-Wl,-rpath -Wl,/usr/lib64 -Wl,-rpath,/usr/lib64"
else
SLKCFLAGS="-O2"
LIBDIRSUFFIX=""
@@ -60,39 +62,45 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/${PRGNAM}-$VERSION.tar.gz
+tar vxzf $CWD/${PRGNAM}-${VERSION}.tar.gz
+mv ${PRGNAM} ${PRGNAM}-${VERSION}
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 {} \;
-# Cleanup the Makefile quite a bit
-patch -p1 < $CWD/patches/fixup_Makefile.patch
+CFLAGS="$SLKCFLAGS" \
+CXFLAGS="$SLKCFLAGS" \
-make \
- CFLAGS="$SLKCFLAGS" \
- LIBDIR=/usr/lib${LIBDIRSUFFIX} \
- DOCDIR=/usr/doc/$PRGNAM-$VERSION
-
-# Install the dictionary.h include to <iniparser/>
-patch -p1 < $CWD/patches/fixup_dictionary.h_include.patch
-
-make install install-docs \
- DESTDIR=$PKG \
- CFLAGS="$SLKCFLAGS" \
- LIBDIR=/usr/lib${LIBDIRSUFFIX} \
- DOCDIR=/usr/doc/$PRGNAM-$VERSION
+make
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
+mkdir -p $PKG/usr/include
+
+cp -ar \
+ AUTHORS INSTALL LICENSE README html \
+ $PKG/usr/doc/$PRGNAM-$VERSION
+
+cp -a \
+ libiniparser.a libiniparser.so.0 \
+ $PKG/usr/lib${LIBDIRSUFFIX}
+
+cp -a \
+ ./src/dictionary.h ./src/iniparser.h \
+ $PKG/usr/include
+
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$(echo $VERSION | tr '-' '_')-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/iniparser/iniparser.info b/libraries/iniparser/iniparser.info
index 13614ad12d..b5e3850639 100644
--- a/libraries/iniparser/iniparser.info
+++ b/libraries/iniparser/iniparser.info
@@ -1,8 +1,8 @@
PRGNAM="iniparser"
-VERSION="2.17"
+VERSION="3.1"
HOMEPAGE="http://ndevilla.free.fr/iniparser/"
-DOWNLOAD="http://ndevilla.free.fr/iniparser/iniparser-2.17.tar.gz"
-MD5SUM="a7425ca813c13458928b1f1012323616"
+DOWNLOAD="http://ndevilla.free.fr/iniparser/iniparser-3.1.tar.gz"
+MD5SUM="0aa4f995468ed390caf323f50a285bc3"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/libraries/iniparser/patches/fixup_Makefile.patch b/libraries/iniparser/patches/fixup_Makefile.patch
deleted file mode 100644
index b2ee300778..0000000000
--- a/libraries/iniparser/patches/fixup_Makefile.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -Nur iniparser-2.17.orig//Makefile iniparser-2.17/Makefile
---- iniparser-2.17.orig//Makefile 2007-05-27 08:07:09.000000000 -0500
-+++ iniparser-2.17/Makefile 2010-11-27 20:53:39.674677644 -0600
-@@ -6,20 +6,29 @@
- CC = gcc
- CFLAGS = -O3 -fPIC
-
-+# Install paths
-+PREFIX = /usr
-+LIBDIR = $(PREFIX)/lib
-+INCDIR = $(PREFIX)/include
-+DOCDIR = $(PREFIX)/share/doc/iniparser
-+
- # Ar settings to build the library
- AR = ar
- ARFLAGS = rcv
-
- SHLD = ${CC} ${CFLAGS}
--LDSHFLAGS = -shared -Wl,-Bsymbolic -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib
--LDFLAGS = -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib
-+LDSHFLAGS = -shared -Wl,-Bsymbolic -Wl,-rpath -Wl,$(LIBDIR) -Wl,-rpath,$(LIBDIR)
-+LDFLAGS = -Wl,-rpath -Wl,$(LIBDIR) -Wl,-rpath,$(LIBDIR)
-
- # Set RANLIB to ranlib on systems that require it (Sun OS < 4, Mac OSX)
- # RANLIB = ranlib
- RANLIB = true
-
- RM = rm -f
--
-+MKDIR = mkdir -p
-+CP = cp -a
-+LN = ln -s
-+INSTALL = install
-
- # Implicit rules
-
-@@ -37,6 +46,7 @@
-
- OBJS = $(SRCS:.c=.o)
-
-+DOCFILES = AUTHORS INSTALL LICENSE README
-
- default: libiniparser.a libiniparser.so
-
-@@ -48,6 +58,25 @@
- @$(SHLD) $(LDSHFLAGS) -o $@.0 $(OBJS) $(LDFLAGS) \
- -Wl,-soname=`basename $@`.0
-
-+install-lib: libiniparser.a libiniparser.so
-+ $(MKDIR) $(DESTDIR)/$(LIBDIR)
-+ $(INSTALL) -m 0755 libiniparser.so.0 $(DESTDIR)/$(LIBDIR)
-+ $(INSTALL) -m 0644 libiniparser.a $(DESTDIR)/$(LIBDIR)
-+ @(cd $(DESTDIR)/$(LIBDIR) ; $(LN) libiniparser.so.0 libiniparser.so)
-+
-+install-dev:
-+ $(MKDIR) $(DESTDIR)/$(INCDIR)
-+ $(INSTALL) -m 0644 src/iniparser.h $(DESTDIR)/$(INCDIR)
-+ $(MKDIR) $(DESTDIR)/$(INCDIR)/iniparser
-+ $(INSTALL) -m 0644 src/dictionary.h $(DESTDIR)/$(INCDIR)/iniparser/
-+
-+install-docs:
-+ $(MKDIR) $(DESTDIR)/$(DOCDIR)
-+ $(INSTALL) -m 0644 $(DOCFILES) $(DESTDIR)/$(DOCDIR)
-+ $(CP) html $(DESTDIR)/$(DOCDIR)
-+
-+install: install-lib install-dev
-+
- clean:
- $(RM) $(OBJS)
-
diff --git a/libraries/iniparser/patches/fixup_dictionary.h_include.patch b/libraries/iniparser/patches/fixup_dictionary.h_include.patch
deleted file mode 100644
index c41e677831..0000000000
--- a/libraries/iniparser/patches/fixup_dictionary.h_include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur iniparser-2.17.orig//src/iniparser.h iniparser-2.17/src/iniparser.h
---- iniparser-2.17.orig//src/iniparser.h 2006-09-27 06:03:35.000000000 -0500
-+++ iniparser-2.17/src/iniparser.h 2010-11-27 20:17:54.230042402 -0600
-@@ -34,7 +34,7 @@
- */
- /* #include <unistd.h> */
-
--#include "dictionary.h"
-+#include <iniparser/dictionary.h>
-
- /*-------------------------------------------------------------------------*/
- /**
diff --git a/libraries/iniparser/slack-desc b/libraries/iniparser/slack-desc
index d2f6def121..c410aaa786 100644
--- a/libraries/iniparser/slack-desc
+++ b/libraries/iniparser/slack-desc
@@ -8,8 +8,6 @@
|-----handy-ruler------------------------------------------------------|
iniparser: iniparser (A free stand-alone INI file parsing library)
iniparser:
-iniparser: Iniparser is a free stand-alone INI file parsing library.
-iniparser:
iniparser: It is written in portable ANSI C and should compile anywhere.
iniparser: Iniparser is distributed under an MIT license.
iniparser:
@@ -17,3 +15,5 @@ iniparser: Homepage: http://ndevilla.free.fr/iniparser
iniparser:
iniparser:
iniparser:
+iniparser:
+iniparser: