Update to version 1.2.0.

Reasons for doing it now instead of
together with all the other KDE 3.2
(read: lame excuses):

- Problems which it supposedly has
  do not surface in testing.
- It's the official arts version for KDE 3.2
  and people reporting bugs at bugs.kde.org
  will earn funny looks if they report they
  have arts 1.1.4 still.
- Many people seem to have inexplicable problems
  with arts 1.1.4 and KDE (which didn't surface
  in testing either... bleh)
- It does no longer contain a statically linked,
  outdated glib and instead links to glib20 from
  ports - this should fix 'artsdsp xmms' once and
  for all.

5 files changed, 12 insertions, 65 deletions

diff --git a/audio/arts/Makefile b/audio/arts/Makefile
index a776d2bb0246..dccc94370667 100644
--- a/audio/arts/Makefile
+++ b/audio/arts/Makefile
@@ -7,22 +7,21 @@
 #
 
 PORTNAME=	arts
-PORTVERSION=	1.1.4
-PORTREVISION=	3
+PORTVERSION=	1.2.0
 PORTEPOCH=	1
 CATEGORIES=	audio kde
-MASTER_SITES=	http://mirrors.isc.org/pub/kde/stable/3.1.4/FreeBSD/patches/ \
-		${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/3.1.4/src
-DISTFILES=	arts-1.1.4.tar.bz2 \
-		arts-2003092201-configure.tar.bz2 \
-		patch-ltmain.sh
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	stable/3.2/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Audio system for the KDE integrated X11 desktop
 
-LIB_DEPENDS+=	audiofile.0:${PORTSDIR}/audio/libaudiofile
+LIB_DEPENDS+=	audiofile:${PORTSDIR}/audio/libaudiofile \
+		mad:${PORTSDIR}/audio/libmad \
+		ogg:${PORTSDIR}/audio/libogg \
+		glib:${PORTSDIR}/devel/glib20 \
+		vorbis:${PORTSDIR}/audio/libvorbis
 
 USE_QT_VER=	3
 USE_BZIP2=	yes
@@ -38,6 +37,6 @@ CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 
 post-install:
-	@${CHMOD} 4555 ${PREFIX}/bin/artswrapper	
+	@${CHMOD} 4555 ${PREFIX}/bin/artswrapper
 
 .include <bsd.port.mk>
diff --git a/audio/arts/distinfo b/audio/arts/distinfo
index b72f9fe88d05..ef3b26853b4b 100644
--- a/audio/arts/distinfo
+++ b/audio/arts/distinfo
@@ -1,3 +1,2 @@
-MD5 (KDE/arts-1.1.4.tar.bz2) = aa4bef1e80cd3795e3fd832471e348e9
-MD5 (KDE/arts-2003092201-configure.tar.bz2) = 1c4c287f36fe2db5471453c46ce2e128
-MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
+MD5 (KDE/arts-1.2.0.tar.bz2) = f17708ad3c91b0a2f0c83674f78c3e53
+SIZE (KDE/arts-1.2.0.tar.bz2) = 993338
diff --git a/audio/arts/files/patch-flow-gsl-gslglib.c b/audio/arts/files/patch-flow-gsl-gslglib.c
deleted file mode 100644
index 84cc769c9940..000000000000
--- a/audio/arts/files/patch-flow-gsl-gslglib.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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
deleted file mode 100644
index 4bce736c5d39..000000000000
--- a/audio/arts/files/patch-mcop-debug.cc
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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;
- }
- 
diff --git a/audio/arts/pkg-plist b/audio/arts/pkg-plist
index b405e572263a..9ffb598cb1ec 100644
--- a/audio/arts/pkg-plist
+++ b/audio/arts/pkg-plist
@@ -7,7 +7,6 @@ bin/artsrec
 bin/artsshell
 bin/artswrapper
 bin/mcopidl
-bin/testdhandle
 include/arts/anyref.h
 include/arts/artsflow.h
 include/arts/artsflow.idl
@@ -36,7 +35,6 @@ include/arts/extensionloader.h
 include/arts/factory.h
 include/arts/fft.h
 include/arts/flowsystem.h
-include/arts/gsl/gslartsthreads.h
 include/arts/gsl/gslcommon.h
 include/arts/gsl/gslconfig.h
 include/arts/gsl/gslconvert.h
@@ -49,7 +47,6 @@ include/arts/gsl/gsldefs.h
 include/arts/gsl/gslengine.h
 include/arts/gsl/gslfft.h
 include/arts/gsl/gslfilter.h
-include/arts/gsl/gslglib.h
 include/arts/gsl/gslieee754.h
 include/arts/gsl/gslloader.h
 include/arts/gsl/gslmagic.h
@@ -59,6 +56,7 @@ include/arts/gsl/gslosctable.h
 include/arts/gsl/gslsignal.h
 include/arts/gsl/gslwavechunk.h
 include/arts/gsl/gslwaveosc.h
+include/arts/gslschedule.h
 include/arts/idlfilereg.h
 include/arts/ifacerepo_impl.h
 include/arts/iomanager.h
@@ -160,8 +158,3 @@ lib/mcop/soundserver.mcopclass
 lib/mcop/soundserver.mcoptype
 lib/mcop/x11globalcomm.mcopclass
 lib/mcop/x11globalcomm.mcoptype
-@dirrm lib/mcop/Arts
-@dirrm lib/mcop
-@dirrm include/artsc
-@dirrm include/arts/gsl
-@dirrm include/arts