4 files changed, 68 insertions, 6 deletions

diff --git a/audio/arts/Makefile b/audio/arts/Makefile
index db60a99784c8..b6e4ae79a13a 100644
--- a/audio/arts/Makefile
+++ b/audio/arts/Makefile
@@ -7,12 +7,11 @@
 #
 
 PORTNAME=	arts
-PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTVERSION=	1.2.1
 PORTEPOCH=	1
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/3.2/src
+MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
@@ -36,4 +35,5 @@ CFLAGS+=	-DHAVE_VASPRINTF
 CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+
 .include <bsd.port.mk>
diff --git a/audio/arts/distinfo b/audio/arts/distinfo
index ef3b26853b4b..07fba721c9aa 100644
--- a/audio/arts/distinfo
+++ b/audio/arts/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/arts-1.2.0.tar.bz2) = f17708ad3c91b0a2f0c83674f78c3e53
-SIZE (KDE/arts-1.2.0.tar.bz2) = 993338
+MD5 (KDE/arts-1.2.1.tar.bz2) = 84877632917893438c629803e7b004f3
+SIZE (KDE/arts-1.2.1.tar.bz2) = 1039479
diff --git a/audio/arts/files/patch-soundserver-Makefile.in b/audio/arts/files/patch-soundserver-Makefile.in
new file mode 100644
index 000000000000..bdeb225da37c
--- /dev/null
+++ b/audio/arts/files/patch-soundserver-Makefile.in
@@ -0,0 +1,58 @@
+--- soundserver/Makefile.in.orig	Sun Feb 29 22:25:27 2004
++++ soundserver/Makefile.in	Thu Mar  4 16:07:59 2004
+@@ -344,7 +344,7 @@
+ 
+ 
+ ###### "real" programs
+-bin_PROGRAMS = artsd artsplay artscat artswrapper artsshell artsrec
++bin_PROGRAMS = artsd artsplay artscat artsshell artsrec
+ 
+ artsd_LDADD = libsoundserver_idl.la $(FLOWLIBS) \
+               $(top_builddir)/mcop_mt/libmcop_mt.la $(USE_THREADS)
+@@ -364,10 +364,6 @@
+ artsplay_SOURCES = artsplay.cc
+ artsplay_COMPILE_FIRST = soundserver.h artsversion.h
+ 
+-artswrapper_SOURCES = artswrapper.c
+-artswrapper_INCLUDES = -I$(top_builddir) -DEXECUTE=\"$(artsdpath)\"
+-artswrapper_LDADD = $(LIBPOSIX4)
+-
+ artsshell_LDADD = libsoundserver_idl.la $(USE_THREADS)
+ artsshell_SOURCES = artsshell.cc tradercheck.cc
+ artsshell_COMPILE_FIRST = soundserver.h artsversion.h
+@@ -431,7 +427,7 @@
+ #>+ 1
+ libsoundserver_idl_la_OBJECTS = soundserver.lo
+ bin_PROGRAMS = artsd$(EXEEXT) artsplay$(EXEEXT) artscat$(EXEEXT) \
+-	artswrapper$(EXEEXT) artsshell$(EXEEXT) artsrec$(EXEEXT)
++	artsshell$(EXEEXT) artsrec$(EXEEXT)
+ PROGRAMS = $(bin_PROGRAMS)
+ 
+ am_artscat_OBJECTS = artscat.$(OBJEXT)
+@@ -568,14 +564,14 @@
+ 	$(libartswavplayobject_la_SOURCES) $(libkmedia2_la_SOURCES) \
+ 	$(libkmedia2_idl_la_SOURCES) $(libsoundserver_idl_la_SOURCES) \
+ 	$(artscat_SOURCES) $(artsd_SOURCES) $(artsplay_SOURCES) \
+-	$(artsrec_SOURCES) $(artsshell_SOURCES) $(artswrapper_SOURCES)
++	$(artsrec_SOURCES) $(artsshell_SOURCES)
+ DATA = $(mcopclass_DATA) $(mcoptype_DATA)
+ 
+ HEADERS = $(artsinclude_HEADERS)
+ 
+ DIST_COMMON = $(artsinclude_HEADERS) Makefile.am Makefile.in \
+ 	artsversion-new.h.in
+-SOURCES = $(libartsgslplayobject_la_SOURCES) $(libartswavplayobject_la_SOURCES) $(libkmedia2_la_SOURCES) $(libkmedia2_idl_la_SOURCES) $(libsoundserver_idl_la_SOURCES) $(artscat_SOURCES) $(artsd_SOURCES) $(artsplay_SOURCES) $(artsrec_SOURCES) $(artsshell_SOURCES) $(artswrapper_SOURCES)
++SOURCES = $(libartsgslplayobject_la_SOURCES) $(libartswavplayobject_la_SOURCES) $(libkmedia2_la_SOURCES) $(libkmedia2_idl_la_SOURCES) $(libsoundserver_idl_la_SOURCES) $(artscat_SOURCES) $(artsd_SOURCES) $(artsplay_SOURCES) $(artsrec_SOURCES) $(artsshell_SOURCES)
+ 
+ #>- all: all-am
+ #>+ 1
+@@ -691,9 +687,6 @@
+ artsshell$(EXEEXT): $(artsshell_OBJECTS) $(artsshell_DEPENDENCIES) 
+ 	@rm -f artsshell$(EXEEXT)
+ 	$(CXXLINK) $(artsshell_LDFLAGS) $(artsshell_OBJECTS) $(artsshell_LDADD) $(LIBS)
+-artswrapper$(EXEEXT): $(artswrapper_OBJECTS) $(artswrapper_DEPENDENCIES) 
+-	@rm -f artswrapper$(EXEEXT)
+-	$(LINK) $(artswrapper_LDFLAGS) $(artswrapper_OBJECTS) $(artswrapper_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT) core *.core
diff --git a/audio/arts/pkg-plist b/audio/arts/pkg-plist
index 9ffb598cb1ec..664258fa256f 100644
--- a/audio/arts/pkg-plist
+++ b/audio/arts/pkg-plist
@@ -5,7 +5,6 @@ bin/artsdsp
 bin/artsplay
 bin/artsrec
 bin/artsshell
-bin/artswrapper
 bin/mcopidl
 include/arts/anyref.h
 include/arts/artsflow.h
@@ -158,3 +157,8 @@ 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