From 751650761c805655565911426d5891e753866273 Mon Sep 17 00:00:00 2001 From: tobias Date: Thu, 12 Jun 2008 19:18:00 +0000 Subject: [PATCH] On 64-bit systems, artsdsp tries to access lib64, which is not available. Also, ldpreload the proper shared objects. Input and ok martynas, ok bernd --- x11/kde/arts3/Makefile | 4 ++-- x11/kde/arts3/patches/patch-artsc_artsdsp_in | 24 ++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 x11/kde/arts3/patches/patch-artsc_artsdsp_in diff --git a/x11/kde/arts3/Makefile b/x11/kde/arts3/Makefile index 9ad40ccd738..f6b2d6f4221 100644 --- a/x11/kde/arts3/Makefile +++ b/x11/kde/arts3/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.65 2008/03/25 11:45:08 espie Exp $ +# $OpenBSD: Makefile,v 1.66 2008/06/12 19:18:00 tobias Exp $ COMMENT= K Desktop Environment, aRTs CATEGORIES= x11 x11/kde VERSION= 3.5.9 DISTNAME= arts-1.5.9 MODKDE_VERSION?= 3.5.8 -PKGNAME= ${DISTNAME} +PKGNAME= ${DISTNAME}p0 SHARED_LIBS += mcop 2.0 # .1.0 SHARED_LIBS += artsflow_idl 2.0 # .1.0 diff --git a/x11/kde/arts3/patches/patch-artsc_artsdsp_in b/x11/kde/arts3/patches/patch-artsc_artsdsp_in new file mode 100644 index 00000000000..d6bc5bd4eea --- /dev/null +++ b/x11/kde/arts3/patches/patch-artsc_artsdsp_in @@ -0,0 +1,24 @@ +$OpenBSD: patch-artsc_artsdsp_in,v 1.1 2008/06/12 19:18:00 tobias Exp $ +--- artsc/artsdsp.in.orig Sat Sep 10 11:13:34 2005 ++++ artsc/artsdsp.in Tue Jun 10 01:44:32 2008 +@@ -109,7 +109,7 @@ case $3 in + arch_libdir=lib + ;; + 64-bit) +- arch_libdir=lib64 ++ arch_libdir=lib + ;; + *) + exit 1 +@@ -122,9 +122,9 @@ exec_prefix=@exec_prefix@ + libdir=${prefix}/${arch_libdir} + + if test "$single_thread" = 1; then +- LD_PRELOAD=${libdir}/libartsdsp_st.so.0 ++ LD_PRELOAD=${libdir}/libartsdsp_st.so + else +- LD_PRELOAD=${libdir}/libartsdsp.so.0:${libdir}/libartsc.so.0 ++ LD_PRELOAD=${libdir}/libartsdsp.so:${libdir}/libartsc.so + fi + if test -f ${libdir}/libdl.so.2; then + LD_PRELOAD=$LD_PRELOAD:${libdir}/libdl.so.2