4 files changed, 43 insertions, 21 deletions

diff --git a/multimedia/bombono/Makefile b/multimedia/bombono/Makefile
index 1d4052e5785b..425c663a4ca3 100644
--- a/multimedia/bombono/Makefile
+++ b/multimedia/bombono/Makefile
@@ -32,15 +32,16 @@ LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 MAKE_ARGS=	DVDREAD_INCLUDE=${LOCALBASE}/include \
 		DVDREAD_LIBPATH=${LOCALBASE}/lib \
 		CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
-		CC="${CC}" CXX="${CXX}"
+		CC="${CC}" CXX="${CXX}" USE_EXT_BOOST=true
 
-BROKEN=		does not build
+.include <bsd.port.pre.mk>
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/SConstruct
+.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000023
+BROKEN=		does not build on 10.x+
+.endif
 
 post-install:
 	cd ${WRKSRC}/docs/man/man1 && ${INSTALL_MAN} bombono-dvd.1 \
 		mpeg2demux.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/multimedia/bombono/files/patch-SConstruct b/multimedia/bombono/files/patch-SConstruct
index 1c887a4d0af0..921c1be3ba59 100644
--- a/multimedia/bombono/files/patch-SConstruct
+++ b/multimedia/bombono/files/patch-SConstruct
@@ -1,6 +1,15 @@
---- SConstruct.orig	2012-02-08 13:19:21.000000000 +0100
-+++ SConstruct	2012-02-11 11:16:02.000000000 +0100
-@@ -148,18 +148,6 @@
+--- SConstruct.orig	2013-03-07 21:20:45 UTC
++++ SConstruct
+@@ -59,7 +59,7 @@ ThreadOpt = ['-pthread']
+ common_warn_flags = []
+ cxx_warn_flags    = []
+ debug_flags   = ['-g', '-O0']
+-release_flags = ['-O2']
++release_flags = ['']
+ defines       = []
+ 
+ def CalcCommonFlags():
+@@ -148,18 +148,6 @@ def AdjustConfigOptions(env):
      #env.Replace (PATH = user_options_dict['PATH'])
      #env.Replace (AR = user_options_dict['AR'])
  
@@ -19,7 +28,7 @@
      # Multithreading, global
      if IsThreadedBuild:
          env.Append(CCFLAGS = ThreadOpt, LINKFLAGS = ThreadOpt)
-@@ -566,7 +554,6 @@
+@@ -571,7 +559,6 @@ def InstallDir(rel_dst_path, src_dir):
      BV.InstallDir(mgui_env, data_prefix, src_dir)
  
  InstallDir('share/bombono', "resources")
diff --git a/multimedia/bombono/files/patch-src-mgui-ffviewer.cpp b/multimedia/bombono/files/patch-src-mgui-ffviewer.cpp
index 7e8f07281485..8580bbb87cca 100644
--- a/multimedia/bombono/files/patch-src-mgui-ffviewer.cpp
+++ b/multimedia/bombono/files/patch-src-mgui-ffviewer.cpp
@@ -1,6 +1,6 @@
---- src/mgui/ffviewer.cpp.orig	2013-10-24 20:27:18.405577708 +0200
-+++ src/mgui/ffviewer.cpp	2013-10-24 20:29:52.933598308 +0200
-@@ -406,7 +406,7 @@
+--- src/mgui/ffviewer.cpp.orig	2013-03-07 21:20:45 UTC
++++ src/mgui/ffviewer.cpp
+@@ -406,7 +406,7 @@ static std::string CodecID2Str(CodecID c
  
  #else // CALC_FF_TAG
  
@@ -9,3 +9,16 @@
  {
      return Int2Str(codec_id);
  }
+@@ -1119,8 +1119,10 @@ static bool SeekSetTime(FFViewer& ffv, d
+     {
+         bool seek_ok = TimeSeek(ffv, start_time, time);
+         if( !seek_ok && CanByteSeek(ffv.iCtx) )
+-            // тогда переходим в начало файла
+-            seek_ok = DoSeek(ffv, ffv.iCtx->data_offset, true);
++            // then seek to the file's start; since data_offset is private
++            // now, if we seek to 0 and there is a data_offset our seek will
++            // be rounded to the minimum possible, i.e. data_offset.
++            seek_ok = DoSeek(ffv, /* ffv.iCtx->data_offset */ 0, true);
+ 
+         // некоторое видео глючит в начале (Hellboy), из-за чего
+         // последовательный доступ выполняется с перескоками -
diff --git a/multimedia/bombono/pkg-descr b/multimedia/bombono/pkg-descr
index 3aa3c35e3af2..e2903e6a4a7a 100644
--- a/multimedia/bombono/pkg-descr
+++ b/multimedia/bombono/pkg-descr
@@ -1,11 +1,10 @@
-Bombono DVD is a DVD authoring program.
-It is made easy to use and has nice and clean GUI (Gtk).
+Bombono DVD is a DVD authoring program.  It is made easy to use and has a
+nice and clean GUI (GTK+ based).  The main features of Bombono DVD are:
 
-The main features of Bombono DVD are:
-	+excellent MPEG viewer: Timeline and Monitor
-	+real WYSIWYG Menu Editor with live thumbnails
-	+comfortable Drag-n-Drop support
-	+you can author to folder, make ISO-image or burn directly to DVD
-	+reauthoring: you can import video from DVD discs. 
+  - Excellent MPEG viewer, with timeline and monitor
+  - Real WYSIWYG menu editor with live thumbnails
+  - Comfortable drag-n-drop support
+  - Can author to a folder, make ISO image, or burn directly to DVD
+  - Reauthoring: can import video from DVD discs
 
-WWW: http://www.bombono.org
+WWW: http://www.bombono.org/