ports/99710: Port upgrade: sysutils/k3b to 0.12.16

[Heiner]

>Number:         99710
>Category:       ports
>Synopsis:       Port upgrade: sysutils/k3b to 0.12.16
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 02 07:50:16 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Heiner Eichmann <h.eichmann at gmx.de>
>Release:        FreeBSD 5.5-RELEASE
>Organization:
Sirius Cybernetics Corp.
>Environment:
FreeBSD 7of9.unimatrix-zero.borg 5.5-RELEASE-p1 FreeBSD 5.5-RELEASE-p1 #0: Mon 
Jun  5 10:58:47 CEST 2006     
root at 7of9.unimatrix-zero.borg:/usr/obj/usr/src/sys/MYKERNEL  i386

>Description:
Upgrade to 0.12.16

>How-To-Repeat:
>Fix:

Apply the patch.  Afterwards the files directory should contain 
patch-core-k3bglobals.cpp only!


--Boundary-00=_cm3pESgpOyB+d1k
Content-Type: text/x-diff;
  charset="iso-8859-1";
  name="k3b.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="k3b.diff"

diff -urN ../../sysutils/k3b/Makefile ./Makefile
--- ../../sysutils/k3b/Makefile	Mon May 15 20:20:14 2006
+++ ./Makefile	Fri Jun 23 19:01:39 2006
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	k3b
-PORTVERSION=	0.12.15
+PORTVERSION=	0.12.16
 CATEGORIES=	sysutils multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff -urN ../../sysutils/k3b/distinfo ./distinfo
--- ../../sysutils/k3b/distinfo	Mon May 15 20:20:14 2006
+++ ./distinfo	Fri Jun 23 19:04:07 2006
@@ -1,3 +1,3 @@
-MD5 (k3b-0.12.15.tar.bz2) = 246607f9d63b94c7f91ac86c108efdc2
-SHA256 (k3b-0.12.15.tar.bz2) = 5e6cb62f38dcb17c5296e53df89d7bb709f0d336b6a41db9be1b464d4638f32a
-SIZE (k3b-0.12.15.tar.bz2) = 4000389
+MD5 (k3b-0.12.16.tar.bz2) = cac9b8230295c1756581399b3bbd0687
+SHA256 (k3b-0.12.16.tar.bz2) = bc686f6e596df32f2c305a1f4948ceddbbfb067045e6b9b314af615319d11fe6
+SIZE (k3b-0.12.16.tar.bz2) = 4004784
diff -urN ../../sysutils/k3b/files/patch-core-k3bglobals.cpp ./files/patch-core-k3bglobals.cpp
--- ../../sysutils/k3b/files/patch-core-k3bglobals.cpp	Thu Jan  1 01:00:00 1970
+++ ./files/patch-core-k3bglobals.cpp	Fri Jun 23 22:40:38 2006
@@ -0,0 +1,28 @@
+--- 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
++
+ 
+ 
+ 
diff -urN ../../sysutils/k3b/files/patch-libk3b-core-k3bglobals.h ./files/patch-libk3b-core-k3bglobals.h
--- ../../sysutils/k3b/files/patch-libk3b-core-k3bglobals.h	Sun Dec 25 11:46:50 2005
+++ ./files/patch-libk3b-core-k3bglobals.h	Thu Jan  1 01:00:00 1970
@@ -1,13 +0,0 @@
---- libk3b/core/k3bglobals.h.orig	Mon Dec 12 10:33:27 2005
-+++ libk3b/core/k3bglobals.h	Wed Dec 14 23:57:17 2005
-@@ -21,6 +21,10 @@
- #include <kio/global.h>
- #include <kurl.h>
- #include <k3bdevicetypes.h>
-+#ifdef Q_OS_FREEBSD
-+#define stat64 stat
-+#define lstat64 lstat
-+#endif
- 
- class KConfig;
- class K3bVersion;
diff -urN ../../sysutils/k3b/files/patch-libk3bdevice-k3bdevice.h ./files/patch-libk3bdevice-k3bdevice.h
--- ../../sysutils/k3b/files/patch-libk3bdevice-k3bdevice.h	Sun Dec 25 11:46:50 2005
+++ ./files/patch-libk3bdevice-k3bdevice.h	Thu Jan  1 01:00:00 1970
@@ -1,10 +0,0 @@
---- libk3bdevice/k3bdevice.h.orig	Mon Dec 12 10:32:59 2005
-+++ libk3bdevice/k3bdevice.h	Wed Dec 14 23:49:42 2005
-@@ -28,6 +28,7 @@
- 
- #ifdef Q_OS_FREEBSD
- struct cam_device;
-+#define stat64 stat
- #endif
- 
- namespace K3bDevice
diff -urN ../../sysutils/k3b/pkg-plist ./pkg-plist
--- ../../sysutils/k3b/pkg-plist	Mon Apr  3 20:42:43 2006
+++ ./pkg-plist	Sun Jun 25 13:20:51 2006
@@ -104,6 +104,12 @@
 lib/kde3/libk3bartsoutputplugin.a
 lib/kde3/libk3bartsoutputplugin.la
 lib/kde3/libk3bartsoutputplugin.so
+lib/kde3/libk3baudiometainforenamerplugin.a
+lib/kde3/libk3baudiometainforenamerplugin.la
+lib/kde3/libk3baudiometainforenamerplugin.so
+lib/kde3/libk3baudioprojectcddbplugin.a
+lib/kde3/libk3baudioprojectcddbplugin.la
+lib/kde3/libk3baudioprojectcddbplugin.so
 lib/kde3/libk3bexternalencoder.a
 lib/kde3/libk3bexternalencoder.la
 lib/kde3/libk3bexternalencoder.so
@@ -141,12 +147,6 @@
 lib/libk3b.la
 lib/libk3b.so
 lib/libk3b.so.2
-lib/libk3baudiometainforenamerplugin.a
-lib/libk3baudiometainforenamerplugin.la
-lib/libk3baudiometainforenamerplugin.so
-lib/libk3baudioprojectcddbplugin.a
-lib/libk3baudioprojectcddbplugin.la
-lib/libk3baudioprojectcddbplugin.so
 lib/libk3bdevice.a
 lib/libk3bdevice.la
 lib/libk3bdevice.so

--Boundary-00=_cm3pESgpOyB+d1k--
>Release-Note:
>Audit-Trail:
>Unformatted:
 --Boundary-00=_cm3pESgpOyB+d1k
 Content-Type: text/plain;
   charset="iso-8859-1"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 X-send-pr-version: send-pr 3.113
 X-GNATS-Notify: