10 files changed, 26 insertions, 40 deletions

diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile
index 8ae0298cd218..706fd36bf8e5 100644
--- a/sysutils/k3b-kde4/Makefile
+++ b/sysutils/k3b-kde4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	k3b
-PORTVERSION=	0.11.23
+PORTVERSION=	0.11.24
 CATEGORIES=	sysutils multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -26,8 +26,9 @@ GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-k3bsetup=no
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
+LDCONFIG_DIRS=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 USE_KDELIBS_VER=	3
 USE_REINPLACE=	yes
 
diff --git a/sysutils/k3b-kde4/distinfo b/sysutils/k3b-kde4/distinfo
index 7b6adb69fa05..a8857b4b51f4 100644
--- a/sysutils/k3b-kde4/distinfo
+++ b/sysutils/k3b-kde4/distinfo
@@ -1,2 +1,2 @@
-MD5 (k3b-0.11.23.tar.bz2) = eaff485fb4c431aae715b0ef95c43fcf
-SIZE (k3b-0.11.23.tar.bz2) = 3195224
+MD5 (k3b-0.11.24.tar.bz2) = d30fe0bc321e1f8aeebda80c82ee3dfb
+SIZE (k3b-0.11.24.tar.bz2) = 3198948
diff --git a/sysutils/k3b-kde4/pkg-message b/sysutils/k3b-kde4/pkg-message
index 3a8fd669cceb..61798a16a4c0 100644
--- a/sysutils/k3b-kde4/pkg-message
+++ b/sysutils/k3b-kde4/pkg-message
@@ -7,7 +7,7 @@ Notes for FreeBSD 4.x users:
    have to be adressed by e.g. /dev/cd0c instead of /dev/acd0c.
 3. k3b has to be started from a root console, which is not recommended.
    Alternatively do ALL of the following:
-3a. set the suid flag on cdrecord and cdrdao. The 'Notes' the chapter of
+3a. set the suid flag on cdrecord and cdrdao. The 'Notes' chapter of
     'man cdrecord' discusses this.
 3b. - For every user who should be able to use k3b and for every CD or DVD
       device add a directory in the users home directory. These directories
diff --git a/sysutils/k3b-kde4/pkg-message5 b/sysutils/k3b-kde4/pkg-message5
index 9007f34d1644..9a1b2e01f17e 100644
--- a/sysutils/k3b-kde4/pkg-message5
+++ b/sysutils/k3b-kde4/pkg-message5
@@ -7,7 +7,7 @@ Notes for FreeBSD 5.x users:
    have to be adressed by e.g. /dev/cd0 instead of /dev/acd0.
 3. k3b has to be started from a root console, which is not recommended.
    Alternatively do ALL of the following:
-3a. set the suid flag on cdrecord and cdrdao. The 'Notes' the chapter of
+3a. set the suid flag on cdrecord and cdrdao. The 'Notes' chapter of
     'man cdrecord' discusses this.
 3b. - For every user who should be able to use k3b and for every CD or DVD
       device add a directory in the users home directory. These directories
@@ -20,7 +20,7 @@ Notes for FreeBSD 5.x users:
         * add 'devd_enable="YES"' to /etc/rc.conf
         * add a 'perm cdX 666' to /etc/devfs.conf for each cd/dvd device. X 
           is the device number. If you prefer allow access for a group only, 
-          add a 'perm cdX 660' instead, followed by a own 'cdX root:XXX' 
+          add a 'perm cdX 660' instead, followed by an 'own cdX root:XXX' 
           where XXX is the group name.          
     - or just give mount and umount the suid flag, which is a security leak.
 3c. Every user who should be able to use k3b must have read and write access
diff --git a/sysutils/k3b-kde4/pkg-plist b/sysutils/k3b-kde4/pkg-plist
index 47535eae7391..68c462b338e9 100644
--- a/sysutils/k3b-kde4/pkg-plist
+++ b/sysutils/k3b-kde4/pkg-plist
@@ -80,35 +80,27 @@ include/k3bview.h
 include/k3bwavefilewriter.h
 include/k3bwriterselectionwidget.h
 include/kcutlabel.h
-lib/kde3/libk3bexternalencoder.la
 lib/kde3/libk3bexternalencoder.so
-lib/kde3/libk3bflacdecoder.la
 lib/kde3/libk3bflacdecoder.so
-lib/kde3/libk3bmaddecoder.la
 lib/kde3/libk3bmaddecoder.so
-lib/kde3/libk3boggvorbisdecoder.la
 lib/kde3/libk3boggvorbisdecoder.so
-lib/kde3/libk3boggvorbisencoder.la
 lib/kde3/libk3boggvorbisencoder.so
-lib/kde3/libk3bsoxencoder.la
 lib/kde3/libk3bsoxencoder.so
-lib/kde3/libk3bwavedecoder.la
 lib/kde3/libk3bwavedecoder.so
-lib/libk3baudiometainforenamerplugin.la
 lib/libk3baudiometainforenamerplugin.so
-lib/libk3bcore.la
+lib/libk3bcore.a
 lib/libk3bcore.so
 lib/libk3bcore.so.2
-lib/libk3bdevice.la
+lib/libk3bdevice.a
 lib/libk3bdevice.so
 lib/libk3bdevice.so.2
-lib/libk3bplugin.la
+lib/libk3bplugin.a
 lib/libk3bplugin.so
 lib/libk3bplugin.so.2
-lib/libk3bproject.la
+lib/libk3bproject.a
 lib/libk3bproject.so
 lib/libk3bproject.so.2
-lib/libk3btools.la
+lib/libk3btools.a
 lib/libk3btools.so
 lib/libk3btools.so.2
 share/applnk/.hidden/k3b-cue.desktop
diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index 8ae0298cd218..706fd36bf8e5 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	k3b
-PORTVERSION=	0.11.23
+PORTVERSION=	0.11.24
 CATEGORIES=	sysutils multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -26,8 +26,9 @@ GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-k3bsetup=no
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
+LDCONFIG_DIRS=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 USE_KDELIBS_VER=	3
 USE_REINPLACE=	yes
 
diff --git a/sysutils/k3b/distinfo b/sysutils/k3b/distinfo
index 7b6adb69fa05..a8857b4b51f4 100644
--- a/sysutils/k3b/distinfo
+++ b/sysutils/k3b/distinfo
@@ -1,2 +1,2 @@
-MD5 (k3b-0.11.23.tar.bz2) = eaff485fb4c431aae715b0ef95c43fcf
-SIZE (k3b-0.11.23.tar.bz2) = 3195224
+MD5 (k3b-0.11.24.tar.bz2) = d30fe0bc321e1f8aeebda80c82ee3dfb
+SIZE (k3b-0.11.24.tar.bz2) = 3198948
diff --git a/sysutils/k3b/pkg-message b/sysutils/k3b/pkg-message
index 3a8fd669cceb..61798a16a4c0 100644
--- a/sysutils/k3b/pkg-message
+++ b/sysutils/k3b/pkg-message
@@ -7,7 +7,7 @@ Notes for FreeBSD 4.x users:
    have to be adressed by e.g. /dev/cd0c instead of /dev/acd0c.
 3. k3b has to be started from a root console, which is not recommended.
    Alternatively do ALL of the following:
-3a. set the suid flag on cdrecord and cdrdao. The 'Notes' the chapter of
+3a. set the suid flag on cdrecord and cdrdao. The 'Notes' chapter of
     'man cdrecord' discusses this.
 3b. - For every user who should be able to use k3b and for every CD or DVD
       device add a directory in the users home directory. These directories
diff --git a/sysutils/k3b/pkg-message5 b/sysutils/k3b/pkg-message5
index 9007f34d1644..9a1b2e01f17e 100644
--- a/sysutils/k3b/pkg-message5
+++ b/sysutils/k3b/pkg-message5
@@ -7,7 +7,7 @@ Notes for FreeBSD 5.x users:
    have to be adressed by e.g. /dev/cd0 instead of /dev/acd0.
 3. k3b has to be started from a root console, which is not recommended.
    Alternatively do ALL of the following:
-3a. set the suid flag on cdrecord and cdrdao. The 'Notes' the chapter of
+3a. set the suid flag on cdrecord and cdrdao. The 'Notes' chapter of
     'man cdrecord' discusses this.
 3b. - For every user who should be able to use k3b and for every CD or DVD
       device add a directory in the users home directory. These directories
@@ -20,7 +20,7 @@ Notes for FreeBSD 5.x users:
         * add 'devd_enable="YES"' to /etc/rc.conf
         * add a 'perm cdX 666' to /etc/devfs.conf for each cd/dvd device. X 
           is the device number. If you prefer allow access for a group only, 
-          add a 'perm cdX 660' instead, followed by a own 'cdX root:XXX' 
+          add a 'perm cdX 660' instead, followed by an 'own cdX root:XXX' 
           where XXX is the group name.          
     - or just give mount and umount the suid flag, which is a security leak.
 3c. Every user who should be able to use k3b must have read and write access
diff --git a/sysutils/k3b/pkg-plist b/sysutils/k3b/pkg-plist
index 47535eae7391..68c462b338e9 100644
--- a/sysutils/k3b/pkg-plist
+++ b/sysutils/k3b/pkg-plist
@@ -80,35 +80,27 @@ include/k3bview.h
 include/k3bwavefilewriter.h
 include/k3bwriterselectionwidget.h
 include/kcutlabel.h
-lib/kde3/libk3bexternalencoder.la
 lib/kde3/libk3bexternalencoder.so
-lib/kde3/libk3bflacdecoder.la
 lib/kde3/libk3bflacdecoder.so
-lib/kde3/libk3bmaddecoder.la
 lib/kde3/libk3bmaddecoder.so
-lib/kde3/libk3boggvorbisdecoder.la
 lib/kde3/libk3boggvorbisdecoder.so
-lib/kde3/libk3boggvorbisencoder.la
 lib/kde3/libk3boggvorbisencoder.so
-lib/kde3/libk3bsoxencoder.la
 lib/kde3/libk3bsoxencoder.so
-lib/kde3/libk3bwavedecoder.la
 lib/kde3/libk3bwavedecoder.so
-lib/libk3baudiometainforenamerplugin.la
 lib/libk3baudiometainforenamerplugin.so
-lib/libk3bcore.la
+lib/libk3bcore.a
 lib/libk3bcore.so
 lib/libk3bcore.so.2
-lib/libk3bdevice.la
+lib/libk3bdevice.a
 lib/libk3bdevice.so
 lib/libk3bdevice.so.2
-lib/libk3bplugin.la
+lib/libk3bplugin.a
 lib/libk3bplugin.so
 lib/libk3bplugin.so.2
-lib/libk3bproject.la
+lib/libk3bproject.a
 lib/libk3bproject.so
 lib/libk3bproject.so.2
-lib/libk3btools.la
+lib/libk3btools.a
 lib/libk3btools.so
 lib/libk3btools.so.2
 share/applnk/.hidden/k3b-cue.desktop