Upgrade to Qt 3.2.1 / KDE 3.1.4. See x11/kde3/Makefile rev 1.64 for details.

5 files changed, 61 insertions, 8 deletions

diff --git a/audio/arts/Makefile b/audio/arts/Makefile
index 069714fa7607..f06be2988bc3 100644
--- a/audio/arts/Makefile
+++ b/audio/arts/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	arts
-PORTVERSION=	1.1.3
+PORTVERSION=	1.1.4
 PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	audio kde
diff --git a/audio/arts/distinfo b/audio/arts/distinfo
index 96de3f5c77f7..60731fe8ebae 100644
--- a/audio/arts/distinfo
+++ b/audio/arts/distinfo
@@ -1 +1 @@
-MD5 (KDE/arts-1.1.3.tar.bz2) = f04eb6ef387d63741561ab6623696322
+MD5 (KDE/arts-1.1.4.tar.bz2) = aa4bef1e80cd3795e3fd832471e348e9
diff --git a/audio/arts/files/patch-configure b/audio/arts/files/patch-configure
index 7f4fc62c23a4..72d9d6ceb310 100644
--- a/audio/arts/files/patch-configure
+++ b/audio/arts/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Jan 30 14:50:09 2003
-+++ configure	Thu Jan 30 14:50:25 2003
-@@ -2807,7 +2807,7 @@
+--- configure.orig	Wed Aug 20 13:08:00 2003
++++ configure	Wed Aug 20 13:07:43 2003
+@@ -2906,7 +2906,7 @@
    fi
  else
    if test "$GCC" = yes; then
@@ -9,7 +9,7 @@
    else
      CFLAGS=
    fi
-@@ -3214,7 +3214,7 @@
+@@ -3454,7 +3454,7 @@
          CFLAGS="-g -O2 $CFLAGS"
        fi
      else
@@ -18,7 +18,7 @@
      fi
    fi
  
-@@ -3456,7 +3456,7 @@
+@@ -3694,7 +3694,7 @@
    fi
  else
    if test "$GXX" = yes; then
@@ -27,7 +27,7 @@
    else
      CXXFLAGS=
    fi
-@@ -3805,7 +3805,7 @@
+@@ -4051,7 +4051,7 @@
        if test "$CXX" = "KCC"; then
          CXXFLAGS="+K3 $CXXFLAGS"
        else
@@ -36,3 +36,12 @@
        fi
      fi
    fi
+@@ -26467,7 +26467,7 @@
+ 
+ 
+ 
+-for ac_func in socket snprintf vsnprintf seteuid setegid random strfmon stpcpy mkstemp setmntent gettimeofday
++for ac_func in socket snprintf vsnprintf seteuid setegid random strfmon stpcpy mkstemp setmntent gettimeofday vasprintf
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $ac_func" >&5
diff --git a/audio/arts/files/patch-flow-gsl-gslglib.c b/audio/arts/files/patch-flow-gsl-gslglib.c
new file mode 100644
index 000000000000..84cc769c9940
--- /dev/null
+++ b/audio/arts/files/patch-flow-gsl-gslglib.c
@@ -0,0 +1,22 @@
+--- flow/gsl/gslglib.c.orig	Wed May  7 13:50:15 2003
++++ flow/gsl/gslglib.c	Wed Aug 20 03:06:26 2003
+@@ -44,6 +44,10 @@
+ 		  va_list      args1)
+ {
+   gchar *buffer;
++#ifdef HAVE_VASPRINTF
++  if (vasprintf (&buffer, format, args1) < 0)
++    buffer = NULL;
++#else
+   va_list args2;
+ 
+   G_VA_COPY (args2, args1);
+@@ -52,7 +56,7 @@
+ 
+   vsprintf (buffer, format, args2);
+   va_end (args2);
+-
++#endif
+   return buffer;
+ }
+ gchar *
diff --git a/audio/arts/files/patch-mcop-debug.cc b/audio/arts/files/patch-mcop-debug.cc
new file mode 100644
index 000000000000..4bce736c5d39
--- /dev/null
+++ b/audio/arts/files/patch-mcop-debug.cc
@@ -0,0 +1,22 @@
+--- mcop/debug.cc.orig	Sun Jul 13 21:33:40 2003
++++ mcop/debug.cc	Wed Aug 20 03:06:26 2003
+@@ -785,6 +785,10 @@
+ arts_strdup_vprintf (const char *format, va_list args1)
+ {
+   gchar *buffer;
++#ifdef HAVE_VASPRINTF
++  if (vasprintf (&buffer, format, args1) < 0)
++    buffer = NULL;
++#else
+   va_list args2;
+ 
+   G_VA_COPY (args2, args1);
+@@ -793,7 +797,7 @@
+ 
+   vsprintf (buffer, format, args2);
+   va_end (args2);
+-
++#endif
+   return buffer;
+ }
+