aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/k3b-kde4/Makefile6
-rw-r--r--sysutils/k3b-kde4/files/patch-libk3b-tools-k3blibdvdcss.cpp11
-rw-r--r--sysutils/k3b/Makefile6
-rw-r--r--sysutils/k3b/files/patch-libk3b-tools-k3blibdvdcss.cpp11
4 files changed, 26 insertions, 8 deletions
diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile
index f20a40682663..fdc55879342c 100644
--- a/sysutils/k3b-kde4/Makefile
+++ b/sysutils/k3b-kde4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= k3b
PORTVERSION= 1.0.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= sysutils multimedia kde
MASTER_SITES= SF
@@ -24,9 +24,7 @@ CONFIGURE_ARGS= --with-k3bsetup=no --without-resmgr --without-hal
USE_GMAKE= yes
USE_CDRTOOLS= yes
USE_LDCONFIG= yes
-LDCONFIG_DIRS= %%PREFIX%%/lib %%PREFIX%%/lib/kde3
USE_KDELIBS_VER= 3
-INSTALLS_ICONS= yes
OPTIONS= FLAC "Add audio/flac decoder" On \
LAME "Add audio/lame encoder (for mp3 files)" On \
@@ -127,7 +125,7 @@ RUN_DEPENDS+= sox:${PORTSDIR}/audio/sox
.endif
.if defined (WITH_VCDIMAGER)
-RUN_DEPENDS+= vcdxrip:${PORTSDIR}/multimedia/vcdimager
+RUN_DEPENDS+= vcdxrip:${PORTSDIR}/multimedia/vcdimager
.endif
.include <bsd.port.post.mk>
diff --git a/sysutils/k3b-kde4/files/patch-libk3b-tools-k3blibdvdcss.cpp b/sysutils/k3b-kde4/files/patch-libk3b-tools-k3blibdvdcss.cpp
new file mode 100644
index 000000000000..3f8147114df4
--- /dev/null
+++ b/sysutils/k3b-kde4/files/patch-libk3b-tools-k3blibdvdcss.cpp
@@ -0,0 +1,11 @@
+--- libk3b/tools/k3blibdvdcss.cpp.orig 2010-02-08 18:49:23.016438402 +0000
++++ libk3b/tools/k3blibdvdcss.cpp 2010-02-08 18:49:35.965396300 +0000
+@@ -283,7 +283,7 @@
+ K3bLibDvdCss* K3bLibDvdCss::create()
+ {
+ if( s_libDvdCss == 0 ) {
+- s_libDvdCss = dlopen( "libdvdcss.so.2", RTLD_LAZY|RTLD_GLOBAL );
++ s_libDvdCss = dlopen( "libdvdcss.so", RTLD_LAZY|RTLD_GLOBAL );
+ if( s_libDvdCss ) {
+ k3b_dvdcss_open = (dvdcss_t (*)(char*))dlsym( s_libDvdCss, "dvdcss_open" );
+ k3b_dvdcss_close = (int (*)( dvdcss_t ))dlsym( s_libDvdCss, "dvdcss_close" );
diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index f20a40682663..fdc55879342c 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -7,7 +7,7 @@
PORTNAME= k3b
PORTVERSION= 1.0.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= sysutils multimedia kde
MASTER_SITES= SF
@@ -24,9 +24,7 @@ CONFIGURE_ARGS= --with-k3bsetup=no --without-resmgr --without-hal
USE_GMAKE= yes
USE_CDRTOOLS= yes
USE_LDCONFIG= yes
-LDCONFIG_DIRS= %%PREFIX%%/lib %%PREFIX%%/lib/kde3
USE_KDELIBS_VER= 3
-INSTALLS_ICONS= yes
OPTIONS= FLAC "Add audio/flac decoder" On \
LAME "Add audio/lame encoder (for mp3 files)" On \
@@ -127,7 +125,7 @@ RUN_DEPENDS+= sox:${PORTSDIR}/audio/sox
.endif
.if defined (WITH_VCDIMAGER)
-RUN_DEPENDS+= vcdxrip:${PORTSDIR}/multimedia/vcdimager
+RUN_DEPENDS+= vcdxrip:${PORTSDIR}/multimedia/vcdimager
.endif
.include <bsd.port.post.mk>
diff --git a/sysutils/k3b/files/patch-libk3b-tools-k3blibdvdcss.cpp b/sysutils/k3b/files/patch-libk3b-tools-k3blibdvdcss.cpp
new file mode 100644
index 000000000000..3f8147114df4
--- /dev/null
+++ b/sysutils/k3b/files/patch-libk3b-tools-k3blibdvdcss.cpp
@@ -0,0 +1,11 @@
+--- libk3b/tools/k3blibdvdcss.cpp.orig 2010-02-08 18:49:23.016438402 +0000
++++ libk3b/tools/k3blibdvdcss.cpp 2010-02-08 18:49:35.965396300 +0000
+@@ -283,7 +283,7 @@
+ K3bLibDvdCss* K3bLibDvdCss::create()
+ {
+ if( s_libDvdCss == 0 ) {
+- s_libDvdCss = dlopen( "libdvdcss.so.2", RTLD_LAZY|RTLD_GLOBAL );
++ s_libDvdCss = dlopen( "libdvdcss.so", RTLD_LAZY|RTLD_GLOBAL );
+ if( s_libDvdCss ) {
+ k3b_dvdcss_open = (dvdcss_t (*)(char*))dlsym( s_libDvdCss, "dvdcss_open" );
+ k3b_dvdcss_close = (int (*)( dvdcss_t ))dlsym( s_libDvdCss, "dvdcss_close" );