Date: Fri, 8 Jul 2005 08:43:05 +0200 From: Heiner <h.eichmann@gmx.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/83126: Port upgrade: sysutils/k3b to 0.12.2 Message-ID: <200507080843.05973.h.eichmann@gmx.de> Resent-Message-ID: <200507080640.j686ePSX037582@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 83126
>Category: ports
>Synopsis: Port upgrade: sysutils/k3b to 0.12.2
>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: Fri Jul 08 06:40:25 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Heiner Eichmann <h.eichmann@gmx.de>
>Release: FreeBSD 5.4-RELEASE
>Organization:
Sirius Cybernetics Corp.
>Environment:
# $FreeBSD: ports/sysutils/k3b/Makefile,v 1.24 2005/05/27 14:42:51 arved Exp $
>Description:
Upgrade to 0.12.2
Please remove the file directory BEFORE applying the patch!
>How-To-Repeat:
>Fix:
Please remove the file directory BEFORE applying the patch!
--Boundary-00=_5BizCZqRTVP6VD5
Content-Type: text/x-diff;
charset="iso-8859-1";
name="k3b.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="k3b.diff"
diff -u ../../sysutils/k3b/Makefile ./Makefile
--- ../../sysutils/k3b/Makefile Sat Jun 4 18:08:55 2005
+++ ./Makefile Fri Jul 8 08:37:34 2005
@@ -6,8 +6,7 @@
#
PORTNAME= k3b
-PORTVERSION= 0.11.24
-PORTREVISION= 1
+PORTVERSION= 0.12.2
CATEGORIES= sysutils multimedia kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,27 +16,29 @@
RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools \
cdrdao:${PORTSDIR}/sysutils/cdrdao
-LIB_DEPENDS= mad:${PORTSDIR}/audio/libmad \
- id3:${PORTSDIR}/audio/id3lib \
- vorbis:${PORTSDIR}/audio/libvorbis \
- FLAC:${PORTSDIR}/audio/flac
+LIB_DEPENDS= id3:${PORTSDIR}/audio/id3lib \
+ dvdcss:${PORTSDIR}/multimedia/libdvdcss
USE_BZIP2= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS= --with-k3bsetup=no
+CONFIGURE_ARGS= --with-k3bsetup=no --enable-debug=full --without-resmgr --without-hal
USE_GMAKE= yes
USE_INC_LIBTOOL_VER=15
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= %%PREFIX%%/lib %%PREFIX%%/lib/kde3
USE_KDELIBS_VER= 3
-USE_REINPLACE= yes
+
+OPTIONS= SNDFILE "Add audio/libsndfile decoder (for wav files)" On \
+ 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 \
+ MPC "Add audio/libmpcdec decoder (for musepack file)" Off
pre-configure:
- ${REINPLACE_CMD} "s,-O2 ,,g" ${WRKSRC}/configure
-.for i in config.h.in Makefile.in
- ${TOUCH} ${WRKSRC}/${i}
-.endfor
+ ${RM} ${WRKSRC}/admin/cvs.sh
+ ${TOUCH} ${WRKSRC}/admin/cvs.sh
post-install:
@${CAT} ${PKGMESSAGE}
@@ -50,6 +51,54 @@
.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)
+PLIST_SUB+= FLAC=""
+LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac
+.else
+PLIST_SUB+= FLAC="@comment "
+CONFIGURE_ARGS+= --without-flac
+.endif
+
+.if defined(WITH_LAME)
+PLIST_SUB+= LAME=""
+LIB_DEPENDS+= mp3lame:${PORTSDIR}/audio/lame
+.else
+PLIST_SUB+= LAME="@comment "
+CONFIGURE_ARGS+= --without-lame
+.endif
+
+.if defined(WITH_FFMPEG)
+PLIST_SUB+= FFMPEG=""
+LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg
+.else
+PLIST_SUB+= FFMPEG="@comment "
+CONFIGURE_ARGS+= --without-ffmpeg
+.endif
+
+.if defined(WITH_MUSICBRAINZ)
+PLIST_SUB+= MUSICBRAINZ=""
+LIB_DEPENDS+= musicbrainz:${PORTSDIR}/audio/libmusicbrainz
+.else
+PLIST_SUB+= MUSICBRAINZ="@comment "
+CONFIGURE_ARGS+= --without-musicbrainz
+.endif
+
+.if defined(WITH_MPC)
+PLIST_SUB+= MPC=""
+LIB_DEPENDS+= mpcdec:${PORTSDIR}/audio/libmpcdec
+.else
+PLIST_SUB+= MPC="@comment "
+CONFIGURE_ARGS+= --without-musepack
.endif
.include <bsd.port.post.mk>
diff -u ../../sysutils/k3b/distinfo ./distinfo
--- ../../sysutils/k3b/distinfo Sat May 21 10:57:31 2005
+++ ./distinfo Sat Jul 2 21:03:29 2005
@@ -1,2 +1,2 @@
-MD5 (k3b-0.11.24.tar.bz2) = d30fe0bc321e1f8aeebda80c82ee3dfb
-SIZE (k3b-0.11.24.tar.bz2) = 3198948
+MD5 (k3b-0.12.2.tar.bz2) = 52dac62c8f22330784f82703385482ee
+SIZE (k3b-0.12.2.tar.bz2) = 3771371
diff -u ../../sysutils/k3b/pkg-plist ./pkg-plist
--- ../../sysutils/k3b/pkg-plist Sat Jun 4 18:08:56 2005
+++ ./pkg-plist Sat Jul 2 21:28:07 2005
@@ -1,21 +1,34 @@
bin/k3b
+include/k3baudiocdtrackdrag.h
+include/k3baudiocdtracksource.h
+include/k3baudiocuefilewritingjob.h
+include/k3baudiodatasource.h
+include/k3baudiodatasourceiterator.h
include/k3baudiodecoder.h
include/k3baudiodoc.h
include/k3baudioencoder.h
+include/k3baudiofile.h
include/k3baudiojob.h
-include/k3baudioview.h
+include/k3baudiooutputplugin.h
+include/k3baudiotrack.h
+include/k3baudiozerodata.h
+include/k3bbinimagewritingjob.h
include/k3bblankingjob.h
include/k3bbootitem.h
-include/k3bburnprogressdialog.h
include/k3bbusywidget.h
+include/k3bcdcopyjob.h
include/k3bcdparanoialib.h
+include/k3bcdrdaowriter.h
+include/k3bcdrecordwriter.h
include/k3bcdtext.h
+include/k3bcdtextvalidator.h
+include/k3bclonejob.h
include/k3bcore.h
+include/k3bcuefileparser.h
include/k3bcutcombobox.h
include/k3bdatadoc.h
include/k3bdataitem.h
include/k3bdatajob.h
-include/k3bdataview.h
include/k3bdefaultexternalprograms.h
include/k3bdevice.h
include/k3bdevicecombobox.h
@@ -23,35 +36,36 @@
include/k3bdevicehandler.h
include/k3bdevicemanager.h
include/k3bdeviceselectiondialog.h
+include/k3bdevicetypes.h
include/k3bdiritem.h
include/k3bdiskinfo.h
include/k3bdoc.h
+include/k3bdvdcopyjob.h
include/k3bdvddoc.h
include/k3bdvdformattingjob.h
include/k3bdvdjob.h
-include/k3bdvdview.h
-include/k3bemptydiscwaiter.h
+include/k3bexceptions.h
include/k3bexternalbinmanager.h
include/k3bfileitem.h
include/k3bglobals.h
-include/k3binteractiondialog.h
+include/k3bglobalsettings.h
+include/k3bgrowisofswriter.h
+include/k3binffilewriter.h
include/k3bintvalidator.h
include/k3biso9660.h
+include/k3biso9660imagewritingjob.h
include/k3bisooptions.h
include/k3bjob.h
-include/k3bjobprogressdialog.h
include/k3blistview.h
+include/k3blistviewitemanimator.h
include/k3bmd5job.h
include/k3bmixeddoc.h
include/k3bmixedjob.h
-include/k3bmixedview.h
include/k3bmovixdoc.h
include/k3bmovixdvddoc.h
include/k3bmovixdvdjob.h
-include/k3bmovixdvdview.h
include/k3bmovixfileitem.h
include/k3bmovixjob.h
-include/k3bmovixview.h
include/k3bmsf.h
include/k3bmsfedit.h
include/k3bmultichoicedialog.h
@@ -60,32 +74,47 @@
include/k3bpluginfactory.h
include/k3bpluginmanager.h
include/k3bprocess.h
-include/k3bprojectmanager.h
+include/k3bprogressdialog.h
+include/k3bprojectplugin.h
+include/k3bpushbutton.h
+include/k3bradioaction.h
+include/k3bsignalwaiter.h
+include/k3bsimplejob.h
include/k3bstdguiitems.h
include/k3bstringutils.h
include/k3bthread.h
include/k3bthreadjob.h
+include/k3bthreadwidget.h
include/k3bthroughputestimator.h
include/k3btoc.h
+include/k3btocfilewriter.h
+include/k3btoolbox.h
include/k3btrack.h
include/k3bvalidators.h
include/k3bvcddoc.h
include/k3bvcdjob.h
include/k3bvcdoptions.h
-include/k3bvcdview.h
include/k3bversion.h
include/k3bvideodvddoc.h
include/k3bvideodvdjob.h
-include/k3bview.h
include/k3bwavefilewriter.h
-include/k3bwriterselectionwidget.h
include/kcutlabel.h
+lib/kde3/libk3bartsoutputplugin.la
+lib/kde3/libk3bartsoutputplugin.so
lib/kde3/libk3bexternalencoder.la
lib/kde3/libk3bexternalencoder.so
-lib/kde3/libk3bflacdecoder.la
-lib/kde3/libk3bflacdecoder.so
+%%FFMPEG%%lib/kde3/libk3bffmpegdecoder.la
+%%FFMPEG%%lib/kde3/libk3bffmpegdecoder.so
+%%FLAC%%lib/kde3/libk3bflacdecoder.la
+%%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/libk3bmaddecoder.la
lib/kde3/libk3bmaddecoder.so
+%%MPC%%lib/kde3/libk3bmpcdecoder.la
+%%MPC%%lib/kde3/libk3bmpcdecoder.so
lib/kde3/libk3boggvorbisdecoder.la
lib/kde3/libk3boggvorbisdecoder.so
lib/kde3/libk3boggvorbisencoder.la
@@ -94,26 +123,19 @@
lib/kde3/libk3bsoxencoder.so
lib/kde3/libk3bwavedecoder.la
lib/kde3/libk3bwavedecoder.so
+lib/libk3b.la
+lib/libk3b.so
+lib/libk3b.so.1
lib/libk3baudiometainforenamerplugin.la
lib/libk3baudiometainforenamerplugin.so
-lib/libk3bcore.la
-lib/libk3bcore.so
-lib/libk3bcore.so.2
+lib/libk3baudioprojectcddbplugin.la
+lib/libk3baudioprojectcddbplugin.so
lib/libk3bdevice.la
lib/libk3bdevice.so
lib/libk3bdevice.so.2
-lib/libk3bplugin.la
-lib/libk3bplugin.so
-lib/libk3bplugin.so.2
-lib/libk3bproject.la
-lib/libk3bproject.so
-lib/libk3bproject.so.2
-lib/libk3btools.la
-lib/libk3btools.so
-lib/libk3btools.so.2
+share/applications/kde/k3b.desktop
share/applnk/.hidden/k3b-cue.desktop
share/applnk/.hidden/k3b-iso.desktop
-share/applnk/Multimedia/k3b.desktop
share/apps/k3b/cdi/cdi_imag.rtf
share/apps/k3b/cdi/cdi_text.fnt
share/apps/k3b/cdi/cdi_vcd.app
@@ -121,6 +143,8 @@
share/apps/k3b/cdi/icdia.htm
share/apps/k3b/cdi/vcd_on_cdi_41.pdf
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
@@ -133,47 +157,57 @@
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/musicbrainz.png
+share/apps/k3b/icons/hicolor/64x64/actions/musicbrainz.png
share/apps/k3b/k3bui.rc
-share/apps/k3b/kpartplugins/k3baudiometainforenamerplugin.rc
-share/apps/k3b/pics/73lab/diskinfo_audio.png
-share/apps/k3b/pics/73lab/diskinfo_data.png
-share/apps/k3b/pics/73lab/diskinfo_dvd.png
-share/apps/k3b/pics/73lab/diskinfo_empty.png
-share/apps/k3b/pics/73lab/diskinfo_left.png
-share/apps/k3b/pics/73lab/diskinfo_mixed.png
-share/apps/k3b/pics/73lab/diskinfo_right.png
+share/apps/k3b/pics/73lab/dialog_left.png
+share/apps/k3b/pics/73lab/dialog_right.png
share/apps/k3b/pics/73lab/k3b.theme
-share/apps/k3b/pics/73lab/k3b_3d_logo.png
-share/apps/k3b/pics/73lab/k3b_cd_copy.png
-share/apps/k3b/pics/73lab/k3b_probing_cd.png
-share/apps/k3b/pics/73lab/k3b_progress_dialog_failed.png
-share/apps/k3b/pics/73lab/k3b_progress_dialog_success.png
-share/apps/k3b/pics/73lab/k3b_splash.png
-share/apps/k3b/pics/73lab/k3bprojectview_left.png
-share/apps/k3b/pics/73lab/k3bprojectview_left_short.png
-share/apps/k3b/pics/73lab/k3bprojectview_right.png
-share/apps/k3b/pics/73lab/k3bsetup2_guy.png
-share/apps/k3b/pics/crystal/diskinfo_audio.png
-share/apps/k3b/pics/crystal/diskinfo_data.png
-share/apps/k3b/pics/crystal/diskinfo_dvd.png
-share/apps/k3b/pics/crystal/diskinfo_empty.png
-share/apps/k3b/pics/crystal/diskinfo_left.png
-share/apps/k3b/pics/crystal/diskinfo_mixed.png
-share/apps/k3b/pics/crystal/diskinfo_right.png
+share/apps/k3b/pics/73lab/media_audio.png
+share/apps/k3b/pics/73lab/media_data.png
+share/apps/k3b/pics/73lab/media_empty.png
+share/apps/k3b/pics/73lab/media_left.png
+share/apps/k3b/pics/73lab/media_mixed.png
+share/apps/k3b/pics/73lab/media_none.png
+share/apps/k3b/pics/73lab/media_video.png
+share/apps/k3b/pics/73lab/probing.png
+share/apps/k3b/pics/73lab/progress_fail.png
+share/apps/k3b/pics/73lab/progress_right.png
+share/apps/k3b/pics/73lab/progress_success.png
+share/apps/k3b/pics/73lab/progress_working.png
+share/apps/k3b/pics/73lab/project_left.png
+share/apps/k3b/pics/73lab/project_right.png
+share/apps/k3b/pics/73lab/splash.png
+share/apps/k3b/pics/73lab/welcome_bg.png
+share/apps/k3b/pics/crystal/dialog_left.png
+share/apps/k3b/pics/crystal/dialog_right.png
share/apps/k3b/pics/crystal/k3b.theme
-share/apps/k3b/pics/crystal/k3b_3d_logo.png
-share/apps/k3b/pics/crystal/k3b_cd_copy.png
-share/apps/k3b/pics/crystal/k3b_probing_cd.png
-share/apps/k3b/pics/crystal/k3b_progress_dialog_failed.png
-share/apps/k3b/pics/crystal/k3b_progress_dialog_success.png
-share/apps/k3b/pics/crystal/k3b_splash.png
-share/apps/k3b/pics/crystal/k3bprojectview_left.png
-share/apps/k3b/pics/crystal/k3bprojectview_left_short.png
-share/apps/k3b/pics/crystal/k3bprojectview_right.png
-share/apps/k3b/pics/crystal/k3bsetup2_guy.png
+share/apps/k3b/pics/crystal/media_audio.png
+share/apps/k3b/pics/crystal/media_data.png
+share/apps/k3b/pics/crystal/media_empty.png
+share/apps/k3b/pics/crystal/media_left.png
+share/apps/k3b/pics/crystal/media_mixed.png
+share/apps/k3b/pics/crystal/media_none.png
+share/apps/k3b/pics/crystal/media_video.png
+share/apps/k3b/pics/crystal/probing.png
+share/apps/k3b/pics/crystal/progress_fail.png
+share/apps/k3b/pics/crystal/progress_right.png
+share/apps/k3b/pics/crystal/progress_success.png
+share/apps/k3b/pics/crystal/progress_working.png
+share/apps/k3b/pics/crystal/project_left.png
+share/apps/k3b/pics/crystal/project_right.png
+share/apps/k3b/pics/crystal/splash.png
+share/apps/k3b/pics/crystal/welcome_bg.png
+share/apps/k3b/plugins/k3bartsoutputplugin.plugin
+share/apps/k3b/plugins/k3baudiometainforenamerplugin.plugin
+share/apps/k3b/plugins/k3baudioprojectcddbplugin.plugin
share/apps/k3b/plugins/k3bexternalencoder.plugin
-share/apps/k3b/plugins/k3bflacdecoder.plugin
+%%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/k3bmaddecoder.plugin
+%%MPC%%share/apps/k3b/plugins/k3bmpcdecoder.plugin
share/apps/k3b/plugins/k3boggvorbisdecoder.plugin
share/apps/k3b/plugins/k3boggvorbisencoder.plugin
share/apps/k3b/plugins/k3bsoxencoder.plugin
@@ -202,12 +236,9 @@
share/doc/HTML/en/k3b/select_audiofiles.png
share/doc/HTML/en/k3b/select_project.png
share/doc/HTML/en/k3b/video-encoding.docbook
-share/icons/crystalsvg/128x128/apps/k3b.png
-share/icons/crystalsvg/16x16/apps/k3b.png
-share/icons/crystalsvg/32x32/apps/k3b.png
-share/icons/crystalsvg/48x48/apps/k3b.png
-share/icons/crystalsvg/64x64/apps/k3b.png
+share/icons/hicolor/128x128/apps/k3b.png
share/icons/hicolor/16x16/apps/k3b.png
+share/icons/hicolor/22x22/apps/k3b.png
share/icons/hicolor/32x32/apps/k3b.png
share/icons/hicolor/48x48/apps/k3b.png
share/icons/hicolor/64x64/apps/k3b.png
@@ -215,12 +246,15 @@
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/kpartplugins
+@dirrm share/apps/k3b/icons/hicolor/64x64/actions
+@dirrm share/apps/k3b/icons/hicolor/64x64
+@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
@@ -229,5 +263,6 @@
@dirrm share/apps/k3b/icons/crystalsvg/16x16
@dirrm share/apps/k3b/icons/crystalsvg
@dirrm share/apps/k3b/icons
+@dirrm share/apps/k3b/extra
@dirrm share/apps/k3b/cdi
@dirrm share/apps/k3b
--Boundary-00=_5BizCZqRTVP6VD5--
>Release-Note:
>Audit-Trail:
>Unformatted:
--Boundary-00=_5BizCZqRTVP6VD5
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?200507080843.05973.h.eichmann>