Date: Thu, 24 Aug 2006 20:47:30 +0200 From: Heiner <h.eichmann@gmx.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/102484: Port upgrade: sysutils/k3b to 0.12.17 Message-ID: <200608242047.31300.h.eichmann@gmx.de> Resent-Message-ID: <200608241850.k7OIoIjV002354@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 102484
>Category: ports
>Synopsis: Port upgrade: sysutils/k3b to 0.12.17
>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: Thu Aug 24 18:50:17 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Heiner Eichmann <h.eichmann@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@7of9.unimatrix-zero.borg:/usr/obj/usr/src/sys/MYKERNEL i386
>Description:
Upgrade to 0.12.17
>How-To-Repeat:
>Fix:
Apply the patch. Afterwards the files directory should contain
patch-configure only!
--Boundary-00=_DRf7E9y4sNSNN3G
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 Jul 17 22:38:58 2006
+++ ./Makefile Thu Aug 24 20:45:17 2006
@@ -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}
diff -urN ../../sysutils/k3b/distinfo ./distinfo
--- ../../sysutils/k3b/distinfo Mon Jul 17 22:38:58 2006
+++ ./distinfo Wed Aug 23 19:58:54 2006
@@ -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 -urN ../../sysutils/k3b/files/patch-configure ./files/patch-configure
--- ../../sysutils/k3b/files/patch-configure Thu Jan 1 01:00:00 1970
+++ ./files/patch-configure Wed Aug 23 21:50:36 2006
@@ -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 -urN ../../sysutils/k3b/files/patch-core-k3bglobals.cpp ./files/patch-core-k3bglobals.cpp
--- ../../sysutils/k3b/files/patch-core-k3bglobals.cpp Tue Jul 4 07:37:40 2006
+++ ./files/patch-core-k3bglobals.cpp Thu Jan 1 01:00:00 1970
@@ -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
-+
-
-
-
--Boundary-00=_DRf7E9y4sNSNN3G--
>Release-Note:
>Audit-Trail:
>Unformatted:
--Boundary-00=_DRf7E9y4sNSNN3G
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?200608242047.31300.h.eichmann>