Date: Sat, 24 Dec 2005 11:58:36 +0100 From: Heiner <h.eichmann@gmx.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/90874: Port upgrade: sysutils/k3b to 0.12.10 Message-ID: <200512241158.37243.h.eichmann@gmx.de> Resent-Message-ID: <200512241100.jBOB0IMP040323@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 90874
>Category: ports
>Synopsis: Port upgrade: sysutils/k3b to 0.12.10
>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: Sat Dec 24 11:00:17 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Heiner Eichmann <h.eichmann@gmx.de>
>Release: FreeBSD 5.4-RELEASE
>Organization:
Sirius Cybernetics Corp.
>Environment:
FreeBSD 7of9.unimatrix-zero.borg 5.4-RELEASE-p1 FreeBSD 5.4-RELEASE-p1 #0: Sat
Jun 4 10:07:52 CEST 2005
root@7of9.unimatrix-zero.borg:/usr/obj/usr/src/sys/MYKERNEL i386
>Description:
Upgrade to 0.12.10
>How-To-Repeat:
>Fix:
--Boundary-00=_dnSrDbesNqXesay
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 Wed Nov 30 22:14:59 2005
+++ ./Makefile Sat Dec 17 09:07:44 2005
@@ -6,7 +6,7 @@
#
PORTNAME= k3b
-PORTVERSION= 0.12.7
+PORTVERSION= 0.12.10
CATEGORIES= sysutils multimedia kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -30,8 +30,7 @@
LDCONFIG_DIRS= %%PREFIX%%/lib %%PREFIX%%/lib/kde3
USE_KDELIBS_VER= 3
-OPTIONS= SNDFILE "Add audio/libsndfile decoder (for wav files)" On \
- FLAC "Add audio/flac decoder" On \
+OPTIONS= FLAC "Add audio/flac decoder" On \
LAME "Add audio/lame encoder (for mp3 files)" On \
FFMPEG "Add multimedia/ffmpeg decoder (for wma files)" Off \
MUSICBRAINZ "Use audio/libmusicbrainz music meta database" Off \
@@ -52,14 +51,6 @@
.if ${OSVERSION} > 500000
PKGMESSAGE= ${PKGDIR}/pkg-message5
-.endif
-
-.if defined(WITH_SNDFILE)
-PLIST_SUB+= SNDFILE=""
-LIB_DEPENDS+= sndfile:${PORTSDIR}/audio/libsndfile
-.else
-PLIST_SUB+= SNDFILE="@comment "
-CONFIGURE_ARGS+= --without-sndfile
.endif
.if defined(WITH_FLAC)
diff -urN ../../sysutils/k3b/distinfo ./distinfo
--- ../../sysutils/k3b/distinfo Wed Nov 30 22:14:59 2005
+++ ./distinfo Fri Dec 16 18:22:49 2005
@@ -1,3 +1,3 @@
-MD5 (k3b-0.12.7.tar.bz2) = fbc9e20f44781da617a67dc6bff74964
-SHA256 (k3b-0.12.7.tar.bz2) = 42626f33194db1888d92f68e933cd497a9e00f10828d000c84597e578623ac81
-SIZE (k3b-0.12.7.tar.bz2) = 3772254
+MD5 (k3b-0.12.10.tar.bz2) = f685230ef445b36ccba42fc80b922dfa
+SHA256 (k3b-0.12.10.tar.bz2) = e774a0117477ac916d3bf1e01d143e430819a471ffa665fe66614c5fb86d6459
+SIZE (k3b-0.12.10.tar.bz2) = 4084756
diff -urN ../../sysutils/k3b/files/patch-libk3b-core-k3bglobals.h ./files/patch-libk3b-core-k3bglobals.h
--- ../../sysutils/k3b/files/patch-libk3b-core-k3bglobals.h Thu Jan 1 01:00:00 1970
+++ ./files/patch-libk3b-core-k3bglobals.h Thu Dec 15 00:02:41 2005
@@ -0,0 +1,13 @@
+--- 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 Thu Jan 1 01:00:00 1970
+++ ./files/patch-libk3bdevice-k3bdevice.h Wed Dec 14 23:50:50 2005
@@ -0,0 +1,10 @@
+--- 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 Sun Aug 14 10:55:19 2005
+++ ./pkg-plist Sat Dec 17 09:10:25 2005
@@ -53,6 +53,7 @@
include/k3binffilewriter.h
include/k3bintvalidator.h
include/k3biso9660.h
+include/k3biso9660backend.h
include/k3biso9660imagewritingjob.h
include/k3bisooptions.h
include/k3bjob.h
@@ -109,8 +110,8 @@
%%FLAC%%lib/kde3/libk3bflacdecoder.so
%%LAME%%lib/kde3/libk3blameencoder.la
%%LAME%%lib/kde3/libk3blameencoder.so
-%%SNDFILE%%lib/kde3/libk3blibsndfiledecoder.la
-%%SNDFILE%%lib/kde3/libk3blibsndfiledecoder.so
+lib/kde3/libk3blibsndfiledecoder.la
+lib/kde3/libk3blibsndfiledecoder.so
lib/kde3/libk3bmaddecoder.la
lib/kde3/libk3bmaddecoder.so
%%MPC%%lib/kde3/libk3bmpcdecoder.la
@@ -125,7 +126,7 @@
lib/kde3/libk3bwavedecoder.so
lib/libk3b.la
lib/libk3b.so
-lib/libk3b.so.1
+lib/libk3b.so.2
lib/libk3baudiometainforenamerplugin.la
lib/libk3baudiometainforenamerplugin.so
lib/libk3baudioprojectcddbplugin.la
@@ -145,20 +146,92 @@
share/apps/k3b/eventsrc
share/apps/k3b/extra/k3bphotosvcd.mpg
share/apps/k3b/extra/k3bphotovcd.mpg
-share/apps/k3b/icons/crystalsvg/16x16/actions/cdburn.png
-share/apps/k3b/icons/crystalsvg/16x16/actions/cdinfo.png
-share/apps/k3b/icons/crystalsvg/16x16/actions/cdrwblank.png
share/apps/k3b/icons/crystalsvg/16x16/actions/greenled.png
share/apps/k3b/icons/crystalsvg/16x16/actions/redled.png
share/apps/k3b/icons/crystalsvg/16x16/actions/yellowinfo.png
share/apps/k3b/icons/crystalsvg/16x16/actions/yellowled.png
-share/apps/k3b/icons/crystalsvg/22x22/actions/cdcopy.png
-share/apps/k3b/icons/crystalsvg/22x22/actions/cdinfo.png
-share/apps/k3b/icons/crystalsvg/22x22/actions/cdrwblank.png
-share/apps/k3b/icons/crystalsvg/32x32/actions/cdburn.png
-share/apps/k3b/icons/crystalsvg/32x32/actions/cdcopy.png
+share/apps/k3b/icons/hicolor/16x16/actions/audiocd.png
+share/apps/k3b/icons/hicolor/16x16/actions/burn_cdimage.png
+share/apps/k3b/icons/hicolor/16x16/actions/burn_dvdimage.png
+share/apps/k3b/icons/hicolor/16x16/actions/cdburn.png
+share/apps/k3b/icons/hicolor/16x16/actions/cdcopy.png
+share/apps/k3b/icons/hicolor/16x16/actions/cddarip.png
+share/apps/k3b/icons/hicolor/16x16/actions/datacd.png
+share/apps/k3b/icons/hicolor/16x16/actions/datadvd.png
+share/apps/k3b/icons/hicolor/16x16/actions/dvdcopy.png
+share/apps/k3b/icons/hicolor/16x16/actions/emovix.png
+share/apps/k3b/icons/hicolor/16x16/actions/erasecd.png
+share/apps/k3b/icons/hicolor/16x16/actions/formatdvd.png
+share/apps/k3b/icons/hicolor/16x16/actions/mixedcd.png
+share/apps/k3b/icons/hicolor/16x16/actions/mp3cd.png
share/apps/k3b/icons/hicolor/16x16/actions/musicbrainz.png
+share/apps/k3b/icons/hicolor/16x16/actions/videocd.png
+share/apps/k3b/icons/hicolor/16x16/actions/videodvd.png
+share/apps/k3b/icons/hicolor/22x22/actions/audiocd.png
+share/apps/k3b/icons/hicolor/22x22/actions/burn_cdimage.png
+share/apps/k3b/icons/hicolor/22x22/actions/burn_dvdimage.png
+share/apps/k3b/icons/hicolor/22x22/actions/cdburn.png
+share/apps/k3b/icons/hicolor/22x22/actions/cdcopy.png
+share/apps/k3b/icons/hicolor/22x22/actions/cddarip.png
+share/apps/k3b/icons/hicolor/22x22/actions/datacd.png
+share/apps/k3b/icons/hicolor/22x22/actions/datadvd.png
+share/apps/k3b/icons/hicolor/22x22/actions/dvdcopy.png
+share/apps/k3b/icons/hicolor/22x22/actions/emovix.png
+share/apps/k3b/icons/hicolor/22x22/actions/erasecd.png
+share/apps/k3b/icons/hicolor/22x22/actions/formatdvd.png
+share/apps/k3b/icons/hicolor/22x22/actions/mixedcd.png
+share/apps/k3b/icons/hicolor/22x22/actions/mp3cd.png
+share/apps/k3b/icons/hicolor/22x22/actions/videocd.png
+share/apps/k3b/icons/hicolor/22x22/actions/videodvd.png
+share/apps/k3b/icons/hicolor/32x32/actions/audiocd.png
+share/apps/k3b/icons/hicolor/32x32/actions/burn_cdimage.png
+share/apps/k3b/icons/hicolor/32x32/actions/burn_dvdimage.png
+share/apps/k3b/icons/hicolor/32x32/actions/cdburn.png
+share/apps/k3b/icons/hicolor/32x32/actions/cdcopy.png
+share/apps/k3b/icons/hicolor/32x32/actions/cddarip.png
+share/apps/k3b/icons/hicolor/32x32/actions/datacd.png
+share/apps/k3b/icons/hicolor/32x32/actions/datadvd.png
+share/apps/k3b/icons/hicolor/32x32/actions/dvdcopy.png
+share/apps/k3b/icons/hicolor/32x32/actions/emovix.png
+share/apps/k3b/icons/hicolor/32x32/actions/erasecd.png
+share/apps/k3b/icons/hicolor/32x32/actions/formatdvd.png
+share/apps/k3b/icons/hicolor/32x32/actions/mixedcd.png
+share/apps/k3b/icons/hicolor/32x32/actions/mp3cd.png
+share/apps/k3b/icons/hicolor/32x32/actions/videocd.png
+share/apps/k3b/icons/hicolor/32x32/actions/videodvd.png
+share/apps/k3b/icons/hicolor/48x48/actions/audiocd.png
+share/apps/k3b/icons/hicolor/48x48/actions/burn_cdimage.png
+share/apps/k3b/icons/hicolor/48x48/actions/burn_dvdimage.png
+share/apps/k3b/icons/hicolor/48x48/actions/cdburn.png
+share/apps/k3b/icons/hicolor/48x48/actions/cdcopy.png
+share/apps/k3b/icons/hicolor/48x48/actions/cddarip.png
+share/apps/k3b/icons/hicolor/48x48/actions/datacd.png
+share/apps/k3b/icons/hicolor/48x48/actions/datadvd.png
+share/apps/k3b/icons/hicolor/48x48/actions/dvdcopy.png
+share/apps/k3b/icons/hicolor/48x48/actions/emovix.png
+share/apps/k3b/icons/hicolor/48x48/actions/erasecd.png
+share/apps/k3b/icons/hicolor/48x48/actions/formatdvd.png
+share/apps/k3b/icons/hicolor/48x48/actions/mixedcd.png
+share/apps/k3b/icons/hicolor/48x48/actions/mp3cd.png
+share/apps/k3b/icons/hicolor/48x48/actions/videocd.png
+share/apps/k3b/icons/hicolor/48x48/actions/videodvd.png
share/apps/k3b/icons/hicolor/64x64/actions/musicbrainz.png
+share/apps/k3b/icons/hicolor/scalable/actions/audiocd.svgz
+share/apps/k3b/icons/hicolor/scalable/actions/burn_cdimage.svgz
+share/apps/k3b/icons/hicolor/scalable/actions/burn_dvdimage.svgz
+share/apps/k3b/icons/hicolor/scalable/actions/cdburn.svgz
+share/apps/k3b/icons/hicolor/scalable/actions/cdcopy.svgz
+share/apps/k3b/icons/hicolor/scalable/actions/cddarip.svgz
+share/apps/k3b/icons/hicolor/scalable/actions/datacd.svgz
+share/apps/k3b/icons/hicolor/scalable/actions/datadvd.svgz
+share/apps/k3b/icons/hicolor/scalable/actions/dvdcopy.svgz
+share/apps/k3b/icons/hicolor/scalable/actions/emovix.svgz
+share/apps/k3b/icons/hicolor/scalable/actions/erasecd.svgz
+share/apps/k3b/icons/hicolor/scalable/actions/formatdvd.svgz
+share/apps/k3b/icons/hicolor/scalable/actions/mixedcd.svgz
+share/apps/k3b/icons/hicolor/scalable/actions/mp3cd.svgz
+share/apps/k3b/icons/hicolor/scalable/actions/videocd.svgz
+share/apps/k3b/icons/hicolor/scalable/actions/videodvd.svgz
share/apps/k3b/k3bui.rc
share/apps/k3b/pics/73lab/dialog_left.png
share/apps/k3b/pics/73lab/dialog_right.png
@@ -205,7 +278,7 @@
%%FFMPEG%%share/apps/k3b/plugins/k3bffmpegdecoder.plugin
%%FLAC%%share/apps/k3b/plugins/k3bflacdecoder.plugin
%%LAME%%share/apps/k3b/plugins/k3blameencoder.plugin
-%%SNDFILE%%share/apps/k3b/plugins/k3blibsndfiledecoder.plugin
+share/apps/k3b/plugins/k3blibsndfiledecoder.plugin
share/apps/k3b/plugins/k3bmaddecoder.plugin
%%MPC%%share/apps/k3b/plugins/k3bmpcdecoder.plugin
share/apps/k3b/plugins/k3boggvorbisdecoder.plugin
@@ -246,19 +319,24 @@
share/sounds/k3b_error1.wav
share/sounds/k3b_success1.wav
share/sounds/k3b_wait_media1.wav
+@dirrm share/doc/HTML/en/k3b
@dirrm share/apps/k3b/plugins
@dirrm share/apps/k3b/pics/crystal
@dirrm share/apps/k3b/pics/73lab
@dirrm share/apps/k3b/pics
+@dirrm share/apps/k3b/icons/hicolor/scalable/actions
+@dirrm share/apps/k3b/icons/hicolor/scalable
@dirrm share/apps/k3b/icons/hicolor/64x64/actions
@dirrm share/apps/k3b/icons/hicolor/64x64
+@dirrm share/apps/k3b/icons/hicolor/48x48/actions
+@dirrm share/apps/k3b/icons/hicolor/48x48
+@dirrm share/apps/k3b/icons/hicolor/32x32/actions
+@dirrm share/apps/k3b/icons/hicolor/32x32
+@dirrm share/apps/k3b/icons/hicolor/22x22/actions
+@dirrm share/apps/k3b/icons/hicolor/22x22
@dirrm share/apps/k3b/icons/hicolor/16x16/actions
@dirrm share/apps/k3b/icons/hicolor/16x16
@dirrm share/apps/k3b/icons/hicolor
-@dirrm share/apps/k3b/icons/crystalsvg/32x32/actions
-@dirrm share/apps/k3b/icons/crystalsvg/32x32
-@dirrm share/apps/k3b/icons/crystalsvg/22x22/actions
-@dirrm share/apps/k3b/icons/crystalsvg/22x22
@dirrm share/apps/k3b/icons/crystalsvg/16x16/actions
@dirrm share/apps/k3b/icons/crystalsvg/16x16
@dirrm share/apps/k3b/icons/crystalsvg
--Boundary-00=_dnSrDbesNqXesay--
>Release-Note:
>Audit-Trail:
>Unformatted:
--Boundary-00=_dnSrDbesNqXesay
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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200512241158.37243.h.eichmann>