Update to KDE 3.4

7 files changed, 22 insertions, 95 deletions

diff --git a/audio/arts/Makefile b/audio/arts/Makefile
index b7c22bbc3c6..f1e34fe4038 100644
--- a/audio/arts/Makefile
+++ b/audio/arts/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	arts
-PORTVERSION=	1.3.2
-PORTREVISION=	1
+PORTVERSION=	1.4.0
 PORTEPOCH=	1
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
@@ -33,7 +32,6 @@ INSTALLS_SHLIB=	yes
 QTCPPFLAGS+=	-L${LOCALBASE}/lib
 USE_REINPLACE=	yes
 DO_NOT_COMPILE+=gmcop
-_NO_KDE_CLOSURE=yes
 _NO_KDE_FINAL=	yes
 
 CFLAGS+=	-DHAVE_VASPRINTF
@@ -48,6 +46,10 @@ OPTIONS=	ESD "Enable esound support" off \
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
+.if (${OSVERSION} < 500000 ) || (${OSVERSION} > 502102 )
+LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
+.endif
+
 .if defined(WITH_ESD)
 USE_GNOME+=	esound
 .endif
@@ -74,4 +76,8 @@ pre-configure:
 			${WRKSRC}/configure
 .endif
 
+post-configure:
+	${TOUCH} ${WRKSRC}/mcop/arts_export.h.in
+	${TOUCH} ${WRKSRC}/artsc/artsc_export.h.in
+
 .include <bsd.port.post.mk>
diff --git a/audio/arts/distinfo b/audio/arts/distinfo
index 8fc8a644233..f0d56825017 100644
--- a/audio/arts/distinfo
+++ b/audio/arts/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/arts-1.3.2.tar.bz2) = a3d22f7cc5c641204a28d3f77e441a84
-SIZE (KDE/arts-1.3.2.tar.bz2) = 968368
+MD5 (KDE/arts-1.4.0.tar.bz2) = a155bb00f56c71bc475890249e2dcaa9
+SIZE (KDE/arts-1.4.0.tar.bz2) = 1003016
diff --git a/audio/arts/files/patch-configure b/audio/arts/files/patch-configure
deleted file mode 100644
index b71ea0d6d12..00000000000
--- a/audio/arts/files/patch-configure
+++ /dev/null
@@ -1,31 +0,0 @@
---- configure.orig	Fri Nov  5 20:53:28 2004
-+++ configure	Fri Nov  5 20:53:42 2004
-@@ -38537,28 +38537,6 @@
- 
- 
- 
--echo "$as_me:$LINENO: checking for Jack Audio Connection Kit" >&5
--echo $ECHO_N "checking for Jack Audio Connection Kit... $ECHO_C" >&6
--if $PKG_CONFIG --atleast-version 0.90 jack >/dev/null 2>&1 ; then
--  JACK_CFLAGS="`$PKG_CONFIG --cflags jack`"
--  JACK_LIBADD="`$PKG_CONFIG --libs-only-l jack`"
--  JACK_LDFLAGS="`$PKG_CONFIG --libs-only-L jack`"
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_LIBJACK 1
--_ACEOF
--
--else
--  echo "$as_me:$LINENO: result: not installed" >&5
--echo "${ECHO_T}not installed" >&6
--fi
--
--
--
--
--
- for ac_header in soundcard.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
diff --git a/audio/arts/files/patch-flow_gsl_Makefile.in b/audio/arts/files/patch-flow_gsl_Makefile.in
deleted file mode 100644
index 1a44e9f2356..00000000000
--- a/audio/arts/files/patch-flow_gsl_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- flow/gsl/Makefile.in.orig	Sun May 30 18:24:53 2004
-+++ flow/gsl/Makefile.in	Tue Jun  1 16:21:56 2004
-@@ -485,7 +485,7 @@
- #>- libgsl_la_LDFLAGS = -no-undefined $(all_libraries)
- #>+ 1
- libgsl_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
--GSL_progs_ldadd = libgsl.la -lm $(USE_THREADS)
-+GSL_progs_ldadd = libgsl.la -lm $(USE_THREADS) $(LIBPTHREAD)
- GSL_cc_dummy = dummy.cc
- #>- all: all-am
- #>+ 1
diff --git a/audio/arts/files/patch-mcopidl_Makefile.in b/audio/arts/files/patch-mcopidl_Makefile.in
deleted file mode 100644
index 583880f023e..00000000000
--- a/audio/arts/files/patch-mcopidl_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- mcopidl/Makefile.in.orig	Tue Jun  1 15:51:13 2004
-+++ mcopidl/Makefile.in	Tue Jun  1 15:51:56 2004
-@@ -348,7 +348,7 @@
- INCLUDES = -I$(top_srcdir)/mcop $(all_includes)
- mcopidl_SOURCES = mcopidl.cc yacc.cc scanner.cc namespace.cc
- mcopidl_LDFLAGS = $(all_libraries)
--mcopidl_LDADD = ../mcop/libmcop.la
-+mcopidl_LDADD = ../mcop/libmcop.la $(LIBPTHREAD)
- noinst_HEADERS = yacc.cc.h
- #>- all: all-am
- #>+ 1
diff --git a/audio/arts/files/patch-soundserver-Makefile.in b/audio/arts/files/patch-soundserver-Makefile.in
index 1cce355e445..a3f3b467e86 100644
--- a/audio/arts/files/patch-soundserver-Makefile.in
+++ b/audio/arts/files/patch-soundserver-Makefile.in
@@ -1,5 +1,5 @@
---- soundserver/Makefile.in.orig	Wed Apr  7 09:12:08 2004
-+++ soundserver/Makefile.in	Wed Apr  7 09:14:08 2004
+--- soundserver/Makefile.in.orig	Fri Mar  4 10:58:22 2005
++++ soundserver/Makefile.in	Wed Mar 16 04:32:04 2005
 @@ -20,7 +20,7 @@
  
  
@@ -18,7 +18,7 @@
  subdir = soundserver
  DIST_COMMON = $(artsinclude_HEADERS) $(srcdir)/Makefile.am \
  	$(srcdir)/Makefile.in $(srcdir)/artsversion-new.h.in
-@@ -234,12 +234,12 @@
+@@ -192,12 +192,12 @@
  	$(libartswavplayobject_la_SOURCES) $(libkmedia2_la_SOURCES) \
  	$(libkmedia2_idl_la_SOURCES) $(libsoundserver_idl_la_SOURCES) \
  	$(artscat_SOURCES) $(artsd_SOURCES) $(artsplay_SOURCES) \
@@ -33,17 +33,17 @@
  mcopclassDATA_INSTALL = $(INSTALL_DATA)
  mcoptypeDATA_INSTALL = $(INSTALL_DATA)
  DATA = $(mcopclass_DATA) $(mcoptype_DATA)
-@@ -558,9 +558,6 @@
- artsplay_LDADD = libsoundserver_idl.la $(USE_THREADS)
+@@ -539,9 +539,6 @@
+ artsplay_LDFLAGS = $(USE_THREADS)
  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_LDADD = libsoundserver_idl.la $(LIBPTHREAD)
+ artsshell_LDFLAGS = $(USE_THREADS)
  artsshell_SOURCES = artsshell.cc tradercheck.cc
- artsshell_COMPILE_FIRST = soundserver.h artsversion.h
-@@ -571,10 +568,6 @@
+@@ -553,10 +550,6 @@
  mcopclassdir = $(libdir)/mcop/Arts
  mcopclass_DATA = FileInputStream.mcopclass $(WAV_MCOPCLASS) GSLPlayObject.mcopclass
  
@@ -54,7 +54,7 @@
  ######## install idl typeinfo files
  mcoptypedir = $(libdir)/mcop
  mcoptype_DATA = soundserver.mcoptype soundserver.mcopclass \
-@@ -725,9 +718,6 @@
+@@ -707,9 +700,6 @@
  artsshell$(EXEEXT): $(artsshell_OBJECTS) $(artsshell_DEPENDENCIES) 
  	@rm -f artsshell$(EXEEXT)
  	$(CXXLINK) $(artsshell_LDFLAGS) $(artsshell_OBJECTS) $(artsshell_LDADD) $(LIBS)
@@ -64,31 +64,3 @@
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
---- soundserver/Makefile.in.orig	Tue Jun  1 16:36:34 2004
-+++ soundserver/Makefile.in	Tue Jun  1 16:45:08 2004
-@@ -545,20 +545,20 @@
- libartsgslplayobject_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) -module $(all_libraries)
- libartsgslplayobject_la_COMPILE_FIRST = soundserver.h ../flow/artsflow.h
- artsd_LDADD = libsoundserver_idl.la $(FLOWLIBS) \
--              $(top_builddir)/mcop_mt/libmcop_mt.la $(USE_THREADS)
-+              $(top_builddir)/mcop_mt/libmcop_mt.la $(USE_THREADS) $(LIBPTHREAD)
- 
- artsd_SOURCES = soundserverv2_impl.cc soundserver_impl.cc simplesoundserver_impl.cc artsd.cc cpuusage.cc samplestorage_impl.cc crashhandler.cc soundserverstartup_impl.cc
- artsd_COMPILE_FIRST = soundserver.h artsversion.h
--artscat_LDADD = libsoundserver_idl.la $(FLOWLIBS) $(USE_THREADS)
-+artscat_LDADD = libsoundserver_idl.la $(FLOWLIBS) $(USE_THREADS) $(LIBPTHREAD)
- artscat_SOURCES = artscat.cc
- artscat_COMPILE_FIRST = soundserver.h artsversion.h 
--artsrec_LDADD = libsoundserver_idl.la $(FLOWLIBS) $(USE_THREADS)
-+artsrec_LDADD = libsoundserver_idl.la $(FLOWLIBS) $(USE_THREADS) $(LIBPTHREAD)
- artsrec_SOURCES = artsrec.cc
- artsrec_COMPILE_FIRST = soundserver.h artsversion.h
--artsplay_LDADD = libsoundserver_idl.la $(USE_THREADS)
-+artsplay_LDADD = libsoundserver_idl.la $(USE_THREADS) $(LIBPTHREAD)
- artsplay_SOURCES = artsplay.cc
- artsplay_COMPILE_FIRST = soundserver.h artsversion.h
--artsshell_LDADD = libsoundserver_idl.la $(USE_THREADS)
-+artsshell_LDADD = libsoundserver_idl.la $(USE_THREADS) $(LIBPTHREAD)
- artsshell_SOURCES = artsshell.cc tradercheck.cc
- artsshell_COMPILE_FIRST = soundserver.h artsversion.h
- DISTCLEANFILES = soundserver.cc soundserver.h soundserver.mcopclass \
diff --git a/audio/arts/pkg-plist b/audio/arts/pkg-plist
index 664258fa256..81460ff4be8 100644
--- a/audio/arts/pkg-plist
+++ b/audio/arts/pkg-plist
@@ -7,6 +7,7 @@ bin/artsrec
 bin/artsshell
 bin/mcopidl
 include/arts/anyref.h
+include/arts/arts_export.h
 include/arts/artsflow.h
 include/arts/artsflow.idl
 include/arts/artsversion.h
@@ -86,6 +87,7 @@ include/arts/unixconnection.h
 include/arts/unixserver.h
 include/arts/weakreference.h
 include/artsc/artsc.h
+include/artsc/artsc_export.h
 lib/libartsc.la
 lib/libartsc.so
 lib/libartsc.so.0