5 files changed, 8 insertions, 65 deletions
diff --git a/libraries/libvmime/flags.patch b/libraries/libvmime/flags.patch
deleted file mode 100644
index a7032f3792..0000000000
--- a/libraries/libvmime/flags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libvmime-0.9.0_orig/configure	2008-10-19 10:36:19.000000000 -0200
-+++ libvmime-0.9.0/configure	2009-12-17 09:17:29.000000000 -0200
-@@ -32224,8 +32224,8 @@
- EXTRA_CFLAGS="$EXTRA_CFLAGS -D_REENTRANT=1 -D_THREAD_SAFE=1 $LIBGNUTLS_CFLAGS"
- EXTRA_LIBS="$GSASL_LIBS $LIBGNUTLS_LIBS"
- 
--CFLAGS=""
--CXXFLAGS=""
-+#CFLAGS=""
-+#CXXFLAGS=""
- 
- # -- Debug
- if test x$VMIME_DEBUG = x1 ; then
diff --git a/libraries/libvmime/gcc44.patch b/libraries/libvmime/gcc44.patch
deleted file mode 100644
index a081c15e8d..0000000000
--- a/libraries/libvmime/gcc44.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libvmime-0.9.0/src/platforms/posix/posixFile.cpp	2008-10-12 06:42:23.000000000 -0300
-+++ libvmime-0.9.0_patched/src/platforms/posix/posixFile.cpp	2010-05-28 00:13:50.000000000 -0300
-@@ -32,6 +32,7 @@
- 
- #include <dirent.h>
- 
-+#include <stdio.h>
- #include <string.h>
- 
- #include "vmime/exception.hpp"
diff --git a/libraries/libvmime/gnutls-28.patch b/libraries/libvmime/gnutls-28.patch
deleted file mode 100644
index d502868b92..0000000000
--- a/libraries/libvmime/gnutls-28.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- libvmime-0.9.0.orig/configure
-+++ libvmime-0.9.0/configure
-@@ -30792,12 +30792,14 @@
-   { echo "$as_me:$LINENO: checking for libgnutls - version >= $min_libgnutls_version" >&5
- echo $ECHO_N "checking for libgnutls - version >= $min_libgnutls_version... $ECHO_C" >&6; }
-   no_libgnutls=""
--  if test "$LIBGNUTLS_CONFIG" = "no" ; then
-+#  if test "$LIBGNUTLS_CONFIG" = "no" ; then
-+  if [ ! $(pkg-config --modversion  gnutls-extra 2> /dev/null) ]; then
-     no_libgnutls=yes
-   else
--    LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
--    LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
--    libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
-+    LIBGNUTLS_CONFIG=""
-+    LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args pkg-config --cflags gnutls-extra`
-+    LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args pkg-config --libs gnutls-extra`
-+    libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args pkg-config --modversion gnutls-extra`
- 
- 
-       ac_save_CFLAGS="$CFLAGS"
diff --git a/libraries/libvmime/libvmime.SlackBuild b/libraries/libvmime/libvmime.SlackBuild
index 640b410434..94d6ee1164 100644
--- a/libraries/libvmime/libvmime.SlackBuild
+++ b/libraries/libvmime/libvmime.SlackBuild
@@ -4,19 +4,17 @@
 # a library for working with MIME messages
 
 # Written by Niels Horn <niels.horn@gmail.com>
-# revision date 2010/05/28
+# revision date 2010/11/20
 
 PRGNAM=libvmime
-VERSION=${VERSION:-0.9.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.9.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -50,18 +48,7 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-# Patch "configure" to accept gnutls-2.8
-# Based on: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=529834
-patch -p1 < $CWD/gnutls-28.patch
-
-# Force "configure" to respect our CFLAGS / CXXFLAGS
-patch -p1 < $CWD/flags.patch
-
-# Patch to avoid "::rename has not been declared" error w/ new gcc
-patch -p1 < $CWD/gcc44.patch
-
-CFLAGS=$SLKCFLAGS \
-CXXFLAGS=$SLKCFLAGS \
+EXTRA_CFLAGS=$SLKCFLAGS \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/libraries/libvmime/libvmime.info b/libraries/libvmime/libvmime.info
index cdfb5f3b47..e9045002bf 100644
--- a/libraries/libvmime/libvmime.info
+++ b/libraries/libvmime/libvmime.info
@@ -1,10 +1,10 @@
 PRGNAM="libvmime"
-VERSION="0.9.0"
+VERSION="0.9.1"
 HOMEPAGE="http://www.vmime.org/"
-DOWNLOAD="http://downloads.sourceforge.net/project/vmime/vmime/0.9/libvmime-0.9.0.tar.bz2"
-MD5SUM="23feb9cff7ba3961c0693926e21448cf"
+DOWNLOAD="http://downloads.sourceforge.net/vmime/libvmime-0.9.1.tar.bz2"
+MD5SUM="d5b6de44f7f9ca0e4cefe597d1905605"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Niels Horn"
 EMAIL="niels.horn@gmail.com"
-APPROVED="rworkman"
+APPROVED="Erik Hanson"