5 files changed, 27 insertions, 50 deletions

diff --git a/audio/xmms-arts/Makefile b/audio/xmms-arts/Makefile
index 5ccddd9bd5d8..4d605602bfbc 100644
--- a/audio/xmms-arts/Makefile
+++ b/audio/xmms-arts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-arts
 PORTVERSION=	0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://stukach.com/hosted/m.i.a/xmmsarts/
 DISTNAME=	${PORTNAME:S/-//}-${PORTVERSION}
@@ -21,16 +21,10 @@ LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms \
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gtk12
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${X11BASE}/include"
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-PKGMESSAGE=	${WRKDIR}/pkg-message
-
-post-install:
-	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
-		<${FILESDIR}/pkg-message.in >${PKGMESSAGE}
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/audio/xmms-arts/files/patch-init.c b/audio/xmms-arts/files/patch-init.c
new file mode 100644
index 000000000000..564b289eaa59
--- /dev/null
+++ b/audio/xmms-arts/files/patch-init.c
@@ -0,0 +1,25 @@
+--- init.c.orig	Fri Sep  1 10:35:03 2000
++++ init.c	Thu Feb  5 02:53:58 2004
+@@ -20,6 +20,7 @@
+  */
+ 
+ #include "artsout.h"
++#include <dlfcn.h>
+ 
+ aRtsConfig arts_cfg;
+ 
+@@ -39,4 +40,14 @@
+ 		xmms_cfg_read_int(cfgfile, "aRts", "prebuffer", &arts_cfg.prebuffer);
+ 		xmms_cfg_free(cfgfile);
+ 	}
++
++	/*
++	 * This is a hack to prevent unloading of libstdc++
++	 * (required by arts libraries) in arts_free() but before
++	 * this thread is terminated. libstdc++ registers thread cleanup
++	 * handler and xmms crashes when this cleanup function is called
++	 * on thread termination.
++	 */
++	if (dlopen("libstdc++.so", RTLD_NOW | RTLD_GLOBAL) == NULL)
++		fprintf(stderr, "Failed to preload libstdc++.so\n");
+ }
diff --git a/audio/xmms-arts/files/patch-ltmain.sh b/audio/xmms-arts/files/patch-ltmain.sh
deleted file mode 100644
index 41741c1a9053..000000000000
--- a/audio/xmms-arts/files/patch-ltmain.sh
+++ /dev/null
@@ -1,25 +0,0 @@
---- ltmain.sh.orig	Fri Sep  1 10:46:39 2000
-+++ ltmain.sh	Tue Nov 25 06:49:01 2003
-@@ -1091,6 +1091,13 @@
- 	deplibs="$deplibs $arg"
- 	;;
- 
-+      -pthread)
-+        compile_command="$compile_command -pthread"
-+        finalize_command="$finalize_command -pthread"
-+        compiler_flags="$compiler_flags -pthread"
-+        continue
-+        ;;
-+
-       -module)
- 	module=yes
- 	continue
-@@ -1926,7 +1933,7 @@
- 	  set dummy $deplibs_check_method
- 	  file_magic_regex="`expr \"$deplibs_check_method\" : \"$2 \(.*\)\"`"
- 	  for a_deplib in $deplibs; do
--	    name="`expr $a_deplib : '-l\(.*\)'`"
-+	    name="`expr \( $a_deplib : '-l\(.*\)' \)`"
- 	    # If $name is empty we are operating on a -L argument.
- 	    if test "$name" != "" ; then
- 	      libname=`eval \\$echo \"$libname_spec\"`
diff --git a/audio/xmms-arts/files/pkg-message.in b/audio/xmms-arts/files/pkg-message.in
deleted file mode 100644
index 7293221d73b0..000000000000
--- a/audio/xmms-arts/files/pkg-message.in
+++ /dev/null
@@ -1,16 +0,0 @@
-In order to use aRts plugin on FreeBSD you must to do the following:
-
-1) Move xmms binary to xmms.bin:
-
-cd %%PREFIX%%/bin && mv xmms xmms.bin
-
-2) Write custom xmms script:
-
---- cut here ---
-#!/bin/sh
-LD_PRELOAD=/usr/lib/libstdc++.so exec %%PREFIX%%/bin/xmms.bin "$@"
---- cut here ---
-
-and put it to %%PREFIX%%/bin
-
-/fjoe
diff --git a/audio/xmms-arts/pkg-plist b/audio/xmms-arts/pkg-plist
index 3f82f6099a41..bf187fae6e3a 100644
--- a/audio/xmms-arts/pkg-plist
+++ b/audio/xmms-arts/pkg-plist
@@ -1,4 +1,3 @@
 lib/xmms/Output/libartsout.a
-lib/xmms/Output/libartsout.la
 lib/xmms/Output/libartsout.so
 lib/xmms/Output/libartsout.so.0