4 files changed, 38 insertions, 33 deletions

diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile
index 5bd2c307117d..2484a980a650 100644
--- a/sysutils/k3b-kde4/Makefile
+++ b/sysutils/k3b-kde4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	k3b
-PORTVERSION=	0.12.16
+PORTVERSION=	0.12.17
 CATEGORIES=	sysutils multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -25,7 +25,7 @@ USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-k3bsetup=no --without-resmgr --without-hal
 USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 USE_KDELIBS_VER=	3
 
diff --git a/sysutils/k3b-kde4/distinfo b/sysutils/k3b-kde4/distinfo
index 6356abf0463e..8dc80f7d299f 100644
--- a/sysutils/k3b-kde4/distinfo
+++ b/sysutils/k3b-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (k3b-0.12.16.tar.bz2) = cac9b8230295c1756581399b3bbd0687
-SHA256 (k3b-0.12.16.tar.bz2) = bc686f6e596df32f2c305a1f4948ceddbbfb067045e6b9b314af615319d11fe6
-SIZE (k3b-0.12.16.tar.bz2) = 4004784
+MD5 (k3b-0.12.17.tar.bz2) = e7d423fe386fe0cab7aec6034eb33316
+SHA256 (k3b-0.12.17.tar.bz2) = 067ef9d621bed9a1c385c201b13810f11305edf03a7da0793cb059bb578700b7
+SIZE (k3b-0.12.17.tar.bz2) = 4008650
diff --git a/sysutils/k3b-kde4/files/patch-configure b/sysutils/k3b-kde4/files/patch-configure
new file mode 100644
index 000000000000..472a0eee6d4a
--- /dev/null
+++ b/sysutils/k3b-kde4/files/patch-configure
@@ -0,0 +1,33 @@
+--- configure.orig	Wed Aug 23 09:46:04 2006
++++ configure	Wed Aug 23 21:49:44 2006
+@@ -21673,10 +21673,10 @@
+ 
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS=" /usr/local/share/libtool/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
++LIBTOOL='$(SHELL) /usr/local/bin/libtool --silent'
+ 
+ # Prevent multiple expansion
+ 
+@@ -36974,7 +36974,7 @@
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ 
+-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $all_libraries $LIBS 1>&5'
+ 
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -37019,7 +37019,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 	OLD_LIBS=$LIBS
+-	LIBS="-lavformat -lavcodec -lavutil"
++	LIBS="-lavformat -lavcodec"
+ 	cat >conftest.$ac_ext <<_ACEOF
+ #include <ffmpeg/avformat.h>
+ 		#include <ffmpeg/avcodec.h>
diff --git a/sysutils/k3b-kde4/files/patch-core-k3bglobals.cpp b/sysutils/k3b-kde4/files/patch-core-k3bglobals.cpp
deleted file mode 100644
index 2bf049cb1184..000000000000
--- a/sysutils/k3b-kde4/files/patch-core-k3bglobals.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
---- libk3b/core/k3bglobals.cpp.orig	Fri Jun 23 19:31:55 2006
-+++ libk3b/core/k3bglobals.cpp	Fri Jun 23 22:39:36 2006
-@@ -41,16 +41,16 @@
- 
- #include <config.h>
- #if defined(__FreeBSD__) || defined(__NetBSD__)
--#include <sys/param.h>
--#include <sys/mount.h>
--#else
--#  ifdef HAVE_SYS_STATVFS_H
--#    include <sys/statvfs.h>
--#  endif
--#  ifdef HAVE_SYS_STATFS_H
--#    include <sys/vfs.h>
--#  endif
-+#  include <sys/param.h>
-+#  include <sys/mount.h>
- #endif
-+#ifdef HAVE_SYS_STATVFS_H
-+#  include <sys/statvfs.h>
-+#endif
-+#ifdef HAVE_SYS_STATFS_H
-+#  include <sys/vfs.h>
-+#endif
-+
- 
- 
-