Update to 2.0.0

8 files changed, 17 insertions, 16 deletions

diff --git a/x11-toolkits/bakery/Makefile b/x11-toolkits/bakery/Makefile
index e3928db1b993..85177101c311 100644
--- a/x11-toolkits/bakery/Makefile
+++ b/x11-toolkits/bakery/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bakery
-PORTVERSION=	1.3.11
+PORTVERSION=	2.0.0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,7 +17,7 @@ COMMENT=	A C++ Application Framework for use with Gtkmm
 LIB_DEPENDS=	gtkmm-2.0.6:${PORTSDIR}/x11-toolkits/gtk--2 \
 		gconfmm-2.0:${PORTSDIR}/devel/gconfmm \
 		glademm-2.0:${PORTSDIR}/devel/libglademm \
-		xml\\+\\+-0.1:${PORTSDIR}/textproc/libxml++
+		xml\\+\\+-1.0:${PORTSDIR}/textproc/libxml++
 
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
diff --git a/x11-toolkits/bakery/distinfo b/x11-toolkits/bakery/distinfo
index 9960570ef273..aa71a3455de0 100644
--- a/x11-toolkits/bakery/distinfo
+++ b/x11-toolkits/bakery/distinfo
@@ -1 +1 @@
-MD5 (bakery-1.3.11.tar.gz) = 1ca70f933c8f5432e996b94e9f6f81a7
+MD5 (bakery-2.0.0.tar.gz) = f2f0006b00b78b2a3aabe2bb341cbe31
diff --git a/x11-toolkits/bakery/files/patch-bakery::Makefile.in b/x11-toolkits/bakery/files/patch-bakery::Makefile.in
index 0d41c80e1647..f683cc5219e1 100644
--- a/x11-toolkits/bakery/files/patch-bakery::Makefile.in
+++ b/x11-toolkits/bakery/files/patch-bakery::Makefile.in
@@ -4,8 +4,8 @@
                        View/libbakery_view.la \
                        $(BAKERY_LIBS)
  
--libbakery_1_3_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) -release $(GENERIC_RELEASE)
-+libbakery_1_3_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
+-libbakery_2_0_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) -release $(GENERIC_RELEASE)
++libbakery_2_0_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
  subdir = bakery
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/x11-toolkits/bakery/pkg-plist b/x11-toolkits/bakery/pkg-plist
index ddf8b06d21d6..bd54aaee158f 100644
--- a/x11-toolkits/bakery/pkg-plist
+++ b/x11-toolkits/bakery/pkg-plist
@@ -18,10 +18,11 @@ include/bakery-2.0/bakery/View/ViewBase.h
 include/bakery-2.0/bakery/View/View_Composite.h
 include/bakery-2.0/bakery/bakery.h
 include/bakery-2.0/bakery/init.h
-lib/libbakery-1.3.a
-lib/libbakery-1.3.so
-lib/libbakery-1.3.so.11
+lib/libbakery-2.0.a
+lib/libbakery-2.0.so
+lib/libbakery-2.0.so.1
 libdata/pkgconfig/bakery-2.0.pc
+share/locale/de/LC_MESSAGES/bakery.mo
 @dirrm include/bakery-2.0/bakery/View
 @dirrm include/bakery-2.0/bakery/Utilities
 @dirrm include/bakery-2.0/bakery/Document
diff --git a/x11-toolkits/bakery_gnomeui/Makefile b/x11-toolkits/bakery_gnomeui/Makefile
index f9e0c29fe108..74698e15cda6 100644
--- a/x11-toolkits/bakery_gnomeui/Makefile
+++ b/x11-toolkits/bakery_gnomeui/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bakery_gnomeui
-PORTVERSION=	1.3.2
+PORTVERSION=	2.0.0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bakery
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	bakery
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A Bakery C++ Application Framework extention for GNOME
 
-LIB_DEPENDS=	bakery-1.3:${PORTSDIR}/x11-toolkits/bakery \
+LIB_DEPENDS=	bakery-2.0:${PORTSDIR}/x11-toolkits/bakery \
 		gnomeuimm-2.0:${PORTSDIR}/x11-toolkits/libgnomeuimm
 
 USE_X_PREFIX=	yes
diff --git a/x11-toolkits/bakery_gnomeui/distinfo b/x11-toolkits/bakery_gnomeui/distinfo
index 4f14cc626c3b..80c86169e0f8 100644
--- a/x11-toolkits/bakery_gnomeui/distinfo
+++ b/x11-toolkits/bakery_gnomeui/distinfo
@@ -1 +1 @@
-MD5 (bakery_gnomeui-1.3.2.tar.gz) = 6d70f028b1d6df8e15654a206704c445
+MD5 (bakery_gnomeui-2.0.0.tar.gz) = 6bb5eac1d7443c24b7088c56fe086960
diff --git a/x11-toolkits/bakery_gnomeui/files/patch-bakery_gnomeui::Makefile.in b/x11-toolkits/bakery_gnomeui/files/patch-bakery_gnomeui::Makefile.in
index c2c438a02af1..fc634736f32f 100644
--- a/x11-toolkits/bakery_gnomeui/files/patch-bakery_gnomeui::Makefile.in
+++ b/x11-toolkits/bakery_gnomeui/files/patch-bakery_gnomeui::Makefile.in
@@ -4,8 +4,8 @@
  				  Configuration/libbakery_gnomeui_configuration.la \
                        $(BAKERY_GNOMEUI_LIBS)
  
--libbakery_gnomeui_1_3_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) -release $(GENERIC_RELEASE)
-+libbakery_gnomeui_1_3_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
+-libbakery_gnomeui_2_0_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) -release $(GENERIC_RELEASE)
++libbakery_gnomeui_2_0_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
  subdir = bakery_gnomeui
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/x11-toolkits/bakery_gnomeui/pkg-plist b/x11-toolkits/bakery_gnomeui/pkg-plist
index 4a1204875883..0c813ed276df 100644
--- a/x11-toolkits/bakery_gnomeui/pkg-plist
+++ b/x11-toolkits/bakery_gnomeui/pkg-plist
@@ -3,9 +3,9 @@ include/bakery_gnomeui-2.0/bakery_gnomeui/App/App_WithDoc_GnomeUI.h
 include/bakery_gnomeui-2.0/bakery_gnomeui/Configuration/Client.h
 include/bakery_gnomeui-2.0/bakery_gnomeui/Configuration/Dialog_Preferences.h
 include/bakery_gnomeui-2.0/bakery_gnomeui/bakery_gnomeui.h
-lib/libbakery_gnomeui-1.3.a
-lib/libbakery_gnomeui-1.3.so
-lib/libbakery_gnomeui-1.3.so.3
+lib/libbakery_gnomeui-2.0.a
+lib/libbakery_gnomeui-2.0.so
+lib/libbakery_gnomeui-2.0.so.1
 libdata/pkgconfig/bakery_gnomeui-2.0.pc
 share/locale/de/LC_MESSAGES/bakery_gnomeui.mo
 @dirrm include/bakery_gnomeui-2.0/bakery_gnomeui/Configuration