9 files changed, 53 insertions, 96 deletions

diff --git a/multimedia/bombono/Makefile b/multimedia/bombono/Makefile
index bdced7316062..233b5b4d3d91 100644
--- a/multimedia/bombono/Makefile
+++ b/multimedia/bombono/Makefile
@@ -2,19 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	bombono
-PORTVERSION=	1.2.1
-PORTREVISION=	4
+PORTVERSION=	1.2.2
 CATEGORIES=	multimedia
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-dvd/1.2
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-dvd/${PORTVERSION:R}
 DISTNAME=	${PORTNAME}-dvd-${PORTVERSION}
 
 MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	DVD authoring program
 
-BUILD_DEPENDS=	GraphicsMagick>=1.1.7:${PORTSDIR}/graphics/GraphicsMagick \
-		mjpegtools>=1.9.0:${PORTSDIR}/multimedia/mjpegtools
-LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
-		xml++-2.6.2:${PORTSDIR}/textproc/libxml++26 \
+BUILD_DEPENDS=	GraphicsMagick>=1.1.7:${PORTSDIR}/graphics/GraphicsMagick
+LIB_DEPENDS=	gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
+		xml++-2.6:${PORTSDIR}/textproc/libxml++26 \
 		lavfile:${PORTSDIR}/multimedia/mjpegtools \
 		dvdread:${PORTSDIR}/multimedia/libdvdread \
 		avcodec:${PORTSDIR}/multimedia/ffmpeg \
@@ -26,9 +24,9 @@ RUN_DEPENDS=	GraphicsMagick>=1.1.7:${PORTSDIR}/graphics/GraphicsMagick \
 		toolame:${PORTSDIR}/audio/toolame
 
 USE_BZIP2=	yes
-USE_GNOME=	gtk20 libxml2
-USE_GCC=	4.2+
 USE_SCONS=	yes
+USE_PKGCONFIG=	build
+USE_GCC=	4.2+
 USE_GETTEXT=	yes
 INSTALLS_ICONS=	yes
 MAKE_JOBS_SAFE=	yes
@@ -43,8 +41,6 @@ MANDIR=		${MANPREFIX}/man/man1
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/SConstruct
-	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
-		${WRKSRC}/src/mgui/author/gb_devices.c
 
 post-install:
 	${MKDIR} ${MANDIR}
diff --git a/multimedia/bombono/distinfo b/multimedia/bombono/distinfo
index 45a34bc4c0c1..747699cdb0bc 100644
--- a/multimedia/bombono/distinfo
+++ b/multimedia/bombono/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bombono-dvd-1.2.1.tar.bz2) = 89817ce134b5ee2879285dfb30e9f8b0603b2282989ecb91793e7b928d64152f
-SIZE (bombono-dvd-1.2.1.tar.bz2) = 4111237
+SHA256 (bombono-dvd-1.2.2.tar.bz2) = 3ffaadc803dc2526d2805629ee928800ce150cb2e6a40b6724d898c76366f68b
+SIZE (bombono-dvd-1.2.2.tar.bz2) = 4406764
diff --git a/multimedia/bombono/files/patch-src-mbase-project-table.cpp b/multimedia/bombono/files/patch-src-mbase-project-table.cpp
deleted file mode 100644
index 669d85e0218e..000000000000
--- a/multimedia/bombono/files/patch-src-mbase-project-table.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mbase/project/table.cpp.orig	2012-06-05 22:28:36.000000000 +0200
-+++ src/mbase/project/table.cpp	2012-06-05 22:39:36.000000000 +0200
-@@ -427,7 +427,7 @@
-         {
-             for( fs::directory_iterator itr(dir), end; itr != end; ++itr )
-                 if( IsFrameDir(*itr) )
--                    t_lst.push_back(itr->leaf());
-+                    t_lst.push_back(itr->path().filename().string());
-         }
-     }
- 
diff --git a/multimedia/bombono/files/patch-src-mgui-editor-toolbar.cpp b/multimedia/bombono/files/patch-src-mgui-editor-toolbar.cpp
deleted file mode 100644
index 7b8956dd7e39..000000000000
--- a/multimedia/bombono/files/patch-src-mgui-editor-toolbar.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mgui/editor/toolbar.cpp.orig	2012-06-05 17:43:12.000000000 +0200
-+++ src/mgui/editor/toolbar.cpp	2012-06-05 17:43:33.000000000 +0200
-@@ -287,7 +287,7 @@
-     	    if( fs::is_directory(dir) )
-     	    {    
-     		boost_foreach( const fs::path& pth, dir_range(dir) )
--    		    o_lst.push_back(pth.filename());
-+    		    o_lst.push_back(pth.filename().string());
-     	    }
-     	}
-     	std::sort(o_lst.begin(), o_lst.end(), &ByExtName);
diff --git a/multimedia/bombono/files/patch-src-mgui-project-add.cpp b/multimedia/bombono/files/patch-src-mgui-project-add.cpp
deleted file mode 100644
index 1c182ebe9ebd..000000000000
--- a/multimedia/bombono/files/patch-src-mgui-project-add.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/mgui/project/add.cpp.orig	2012-02-08 13:19:21.000000000 +0100
-+++ src/mgui/project/add.cpp	2012-06-05 17:53:01.000000000 +0200
-@@ -420,7 +420,7 @@
- static std::string StandFNameOut(const fs::path& pth)
- {
-     return "<span style=\"italic\" underline=\"low\">" + 
--                    pth.leaf() + "</span>";
-+                    pth.filename().string() + "</span>";
- }
- 
- #if GTK_CHECK_VERSION(2,18,0)
-@@ -465,7 +465,7 @@
-     {
-         const std::string fname = paths[0];
-         fs::path pth(fname); 
--        std::string leaf = pth.leaf();
-+        std::string leaf = pth.filename().string();
-         {
-             static re::pattern dvd_video_vob("(VIDEO_TS|VTS_[0-9][0-9]_[0-9]).VOB", 
-                                               re::pattern::perl|re::pattern::icase);
diff --git a/multimedia/bombono/files/patch-src-mgui-project-mconstructor.cpp b/multimedia/bombono/files/patch-src-mgui-project-mconstructor.cpp
deleted file mode 100644
index 97c3d65ace1f..000000000000
--- a/multimedia/bombono/files/patch-src-mgui-project-mconstructor.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mgui/project/mconstructor.cpp.orig	2012-06-05 22:41:12.000000000 +0200
-+++ src/mgui/project/mconstructor.cpp	2012-06-05 22:42:17.000000000 +0200
-@@ -961,7 +961,7 @@
-         static const fs::directory_iterator end_itr;
-         for( fs::directory_iterator itr(DataDirPath("bmd-icons"));
-             itr != end_itr; ++itr )
--            pix_lst.push_back(Gdk::Pixbuf::create_from_file(itr->string()));
-+            pix_lst.push_back(Gdk::Pixbuf::create_from_file(itr->path().string()));
-         Gtk::Window::set_default_icon_list(pix_lst);
-     
-         ActionFunctor after_fnr = BuildConstructor(app, prj_file_name);
diff --git a/multimedia/bombono/files/patch-src-mgui-project-serialize.cpp b/multimedia/bombono/files/patch-src-mgui-project-serialize.cpp
deleted file mode 100644
index 46e7a8a901dd..000000000000
--- a/multimedia/bombono/files/patch-src-mgui-project-serialize.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mgui/project/serialize.cpp.orig	2012-06-05 18:34:29.000000000 +0200
-+++ src/mgui/project/serialize.cpp	2012-06-05 18:35:16.000000000 +0200
-@@ -71,7 +71,7 @@
-         return "untitled.bmd";
- 
-     fs::path full_path(db.GetProjectFName());
--    std::string res_str = full_path.leaf();
-+    std::string res_str = full_path.filename().string();
-     if( with_path_breakdown )
-         res_str += " (" + full_path.branch_path().string() + ")";
-     return res_str;
diff --git a/multimedia/bombono/files/patch-src-mlib-filesystem.cpp b/multimedia/bombono/files/patch-src-mlib-filesystem.cpp
index 587039c65cca..11bc768edc8e 100644
--- a/multimedia/bombono/files/patch-src-mlib-filesystem.cpp
+++ b/multimedia/bombono/files/patch-src-mlib-filesystem.cpp
@@ -1,6 +1,6 @@
---- src/mlib/filesystem.cpp.orig	2012-06-05 18:44:31.000000000 +0200
-+++ src/mlib/filesystem.cpp	2012-06-05 18:46:42.000000000 +0200
-@@ -47,7 +47,7 @@
+--- ./src/mlib/filesystem.cpp.orig	2013-03-07 22:20:45.000000000 +0100
++++ src/mlib/filesystem.cpp	2013-03-08 16:42:27.000000000 +0100
+@@ -105,7 +105,7 @@
  
  std::string get_basename(const fs::path& pth)
  {
@@ -9,7 +9,7 @@
      const char* name = name_s.c_str();
  
      //if( const char* dot = strstr(name, ".") )
-@@ -58,7 +58,7 @@
+@@ -116,7 +116,7 @@
  
  std::string get_extension(const fs::path& pth)
  {
@@ -18,11 +18,3 @@
  
      if( const char* dot = FindExtDot(name_s.c_str()) )
          return std::string(dot+1);
-@@ -72,7 +72,6 @@
-     tune_boost_filesystem()
-     {
-         // чтоб любые символы в именах файлов позволялись, для utf8
--        fs::path::default_name_check(fs::native);
-     }
- } tune_boost_filesystem_obj;
- 
diff --git a/multimedia/bombono/pkg-plist b/multimedia/bombono/pkg-plist
index 001e2f508b39..f58340ae1ef9 100644
--- a/multimedia/bombono/pkg-plist
+++ b/multimedia/bombono/pkg-plist
@@ -120,6 +120,10 @@ share/applications/bombono-dvd.desktop
 %%DATADIR%%/resources/frames/timber2/frame.png
 %%DATADIR%%/resources/frames/timber2/vframe.png
 %%DATADIR%%/resources/gtkrc
+%%DATADIR%%/resources/icons/arrow.black.left.png
+%%DATADIR%%/resources/icons/arrow.black.right.png
+%%DATADIR%%/resources/icons/arrow.blue.left.png
+%%DATADIR%%/resources/icons/arrow.blue.right.png
 %%DATADIR%%/resources/icons/arrow.green.left.png
 %%DATADIR%%/resources/icons/arrow.green.right.png
 %%DATADIR%%/resources/icons/arrow.maroon.left.png
@@ -128,14 +132,19 @@ share/applications/bombono-dvd.desktop
 %%DATADIR%%/resources/icons/arrow.olive.right.png
 %%DATADIR%%/resources/icons/arrow.purple.left.png
 %%DATADIR%%/resources/icons/arrow.purple.right.png
+%%DATADIR%%/resources/icons/check.black.png
+%%DATADIR%%/resources/icons/check.blue.png
 %%DATADIR%%/resources/icons/check.green.png
 %%DATADIR%%/resources/icons/check.maroon.png
 %%DATADIR%%/resources/icons/check.olive.png
 %%DATADIR%%/resources/icons/check.purple.png
+%%DATADIR%%/resources/icons/designator.black.left.png
+%%DATADIR%%/resources/icons/designator.black.right.png
+%%DATADIR%%/resources/icons/designator.blue.left.png
+%%DATADIR%%/resources/icons/designator.blue.right.png
 %%DATADIR%%/resources/icons/designator.green.left.png
 %%DATADIR%%/resources/icons/designator.green.right.png
 %%DATADIR%%/resources/icons/designator.maroon.left.png
-%%DATADIR%%/resources/icons/go-down.svg
 %%DATADIR%%/resources/icons/designator.maroon.right.png
 %%DATADIR%%/resources/icons/designator.olive.left.png
 %%DATADIR%%/resources/icons/designator.olive.right.png
@@ -143,11 +152,14 @@ share/applications/bombono-dvd.desktop
 %%DATADIR%%/resources/icons/designator.purple.right.png
 %%DATADIR%%/resources/icons/dialog-ok-apply.png
 %%DATADIR%%/resources/icons/dialog-ok.png
+%%DATADIR%%/resources/icons/diamond.black.png
+%%DATADIR%%/resources/icons/diamond.blue.png
 %%DATADIR%%/resources/icons/diamond.green.png
 %%DATADIR%%/resources/icons/diamond.maroon.png
 %%DATADIR%%/resources/icons/diamond.olive.png
 %%DATADIR%%/resources/icons/diamond.purple.png
 %%DATADIR%%/resources/icons/go-bottom.svg
+%%DATADIR%%/resources/icons/go-down.svg
 %%DATADIR%%/resources/icons/go-first.png
 %%DATADIR%%/resources/icons/go-first.svg
 %%DATADIR%%/resources/icons/go-last.png
@@ -159,10 +171,14 @@ share/applications/bombono-dvd.desktop
 %%DATADIR%%/resources/icons/go-top.svg
 %%DATADIR%%/resources/icons/go-up.svg
 %%DATADIR%%/resources/icons/help-about.svg
+%%DATADIR%%/resources/icons/hexagon.black.png
+%%DATADIR%%/resources/icons/hexagon.blue.png
 %%DATADIR%%/resources/icons/hexagon.green.png
 %%DATADIR%%/resources/icons/hexagon.maroon.png
 %%DATADIR%%/resources/icons/hexagon.olive.png
 %%DATADIR%%/resources/icons/hexagon.purple.png
+%%DATADIR%%/resources/icons/hexagram.black.png
+%%DATADIR%%/resources/icons/hexagram.blue.png
 %%DATADIR%%/resources/icons/hexagram.green.png
 %%DATADIR%%/resources/icons/hexagram.maroon.png
 %%DATADIR%%/resources/icons/hexagram.olive.png
@@ -172,19 +188,29 @@ share/applications/bombono-dvd.desktop
 %%DATADIR%%/resources/icons/media-seek-backward.svg
 %%DATADIR%%/resources/icons/media-seek-forward.svg
 %%DATADIR%%/resources/icons/media-skip-backward.svg
-%%DATADIR%%/resources/icons/oval.green.png
 %%DATADIR%%/resources/icons/media-skip-forward.svg
+%%DATADIR%%/resources/icons/oval.black.png
+%%DATADIR%%/resources/icons/oval.blue.png
+%%DATADIR%%/resources/icons/oval.green.png
 %%DATADIR%%/resources/icons/oval.maroon.png
 %%DATADIR%%/resources/icons/oval.olive.png
 %%DATADIR%%/resources/icons/oval.purple.png
+%%DATADIR%%/resources/icons/pentagon.black.png
+%%DATADIR%%/resources/icons/pentagon.blue.png
 %%DATADIR%%/resources/icons/pentagon.green.png
 %%DATADIR%%/resources/icons/pentagon.maroon.png
 %%DATADIR%%/resources/icons/pentagon.olive.png
 %%DATADIR%%/resources/icons/pentagon.purple.png
+%%DATADIR%%/resources/icons/pentagram.black.png
+%%DATADIR%%/resources/icons/pentagram.blue.png
 %%DATADIR%%/resources/icons/pentagram.green.png
 %%DATADIR%%/resources/icons/pentagram.maroon.png
 %%DATADIR%%/resources/icons/pentagram.olive.png
 %%DATADIR%%/resources/icons/pentagram.purple.png
+%%DATADIR%%/resources/icons/pointer.black.left.png
+%%DATADIR%%/resources/icons/pointer.black.right.png
+%%DATADIR%%/resources/icons/pointer.blue.left.png
+%%DATADIR%%/resources/icons/pointer.blue.right.png
 %%DATADIR%%/resources/icons/pointer.green.left.png
 %%DATADIR%%/resources/icons/pointer.green.right.png
 %%DATADIR%%/resources/icons/pointer.maroon.left.png
@@ -201,10 +227,14 @@ share/applications/bombono-dvd.desktop
 %%DATADIR%%/resources/icons/quotes.olive.right.png
 %%DATADIR%%/resources/icons/quotes.purple.left.png
 %%DATADIR%%/resources/icons/quotes.right.png
+%%DATADIR%%/resources/icons/round.black.png
+%%DATADIR%%/resources/icons/round.blue.png
 %%DATADIR%%/resources/icons/round.green.png
 %%DATADIR%%/resources/icons/round.maroon.png
 %%DATADIR%%/resources/icons/round.olive.png
 %%DATADIR%%/resources/icons/round.purple.png
+%%DATADIR%%/resources/icons/square.black.png
+%%DATADIR%%/resources/icons/square.blue.png
 %%DATADIR%%/resources/icons/square.green.png
 %%DATADIR%%/resources/icons/square.maroon.png
 %%DATADIR%%/resources/icons/square.olive.png
@@ -220,20 +250,23 @@ share/applications/bombono-dvd.desktop
 %%DATADIR%%/resources/splash-bmd.png
 %%DATADIR%%/resources/tool-pointer.png
 %%DATADIR%%/resources/tool-text.png
+share/icons/hicolor/128x128/apps/bombono-dvd.png
 share/icons/hicolor/16x16/apps/bombono-dvd.png
 share/icons/hicolor/32x32/apps/bombono-dvd.png
 share/icons/hicolor/48x48/apps/bombono-dvd.png
 share/icons/hicolor/64x64/apps/bombono-dvd.png
-share/icons/hicolor/128x128/apps/bombono-dvd.png
 share/locale/cs/LC_MESSAGES/bombono-dvd.mo
 share/locale/da/LC_MESSAGES/bombono-dvd.mo
 share/locale/de/LC_MESSAGES/bombono-dvd.mo
+share/locale/eo/LC_MESSAGES/bombono-dvd.mo
 share/locale/es/LC_MESSAGES/bombono-dvd.mo
 share/locale/fi/LC_MESSAGES/bombono-dvd.mo
 share/locale/fr/LC_MESSAGES/bombono-dvd.mo
+share/locale/gl/LC_MESSAGES/bombono-dvd.mo
 share/locale/it/LC_MESSAGES/bombono-dvd.mo
 share/locale/nn/LC_MESSAGES/bombono-dvd.mo
 share/locale/ru/LC_MESSAGES/bombono-dvd.mo
+share/locale/sk/LC_MESSAGES/bombono-dvd.mo
 share/locale/sv/LC_MESSAGES/bombono-dvd.mo
 share/locale/uk/LC_MESSAGES/bombono-dvd.mo
 share/locale/vi/LC_MESSAGES/bombono-dvd.mo
@@ -242,8 +275,6 @@ share/mime/packages/bombono.xml
 share/pixmaps/bombono-dvd.png
 @dirrmtry share/mime/packages
 @dirrmtry share/mime
-@dirrmtry share/icons/hicolor/128x128/apps
-@dirrmtry share/icons/hicolor/128x128
 @dirrmtry share/icons/hicolor/64x64/apps
 @dirrmtry share/icons/hicolor/64x64
 @dirrmtry share/icons/hicolor/48x48/apps
@@ -252,7 +283,8 @@ share/pixmaps/bombono-dvd.png
 @dirrmtry share/icons/hicolor/32x32
 @dirrmtry share/icons/hicolor/16x16/apps
 @dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/applications
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
 @dirrm %%DATADIR%%/resources/scons_authoring
 @dirrm %%DATADIR%%/resources/icons
 @dirrm %%DATADIR%%/resources/frames/timber2
@@ -277,8 +309,8 @@ share/pixmaps/bombono-dvd.png
 @dirrm %%DATADIR%%/resources/frames/ogradient
 @dirrm %%DATADIR%%/resources/frames/gradient
 @dirrm %%DATADIR%%/resources/frames/flourish
-@dirrm %%DATADIR%%/resources/frames/classic
 @dirrm %%DATADIR%%/resources/frames/classic.old
+@dirrm %%DATADIR%%/resources/frames/classic
 @dirrm %%DATADIR%%/resources/frames/cell
 @dirrm %%DATADIR%%/resources/frames
 @dirrm %%DATADIR%%/resources/emblems/tmp
@@ -289,3 +321,4 @@ share/pixmaps/bombono-dvd.png
 @dirrm %%DATADIR%%/resources/bmd-icons
 @dirrm %%DATADIR%%/resources
 @dirrm %%DATADIR%%
+@dirrmtry share/applications