7 files changed, 65 insertions, 104 deletions

diff --git a/x11-toolkits/bakery/Makefile b/x11-toolkits/bakery/Makefile
index 78c17bfee57d..782ef9bf2c52 100644
--- a/x11-toolkits/bakery/Makefile
+++ b/x11-toolkits/bakery/Makefile
@@ -6,29 +6,32 @@
 #
 
 PORTNAME=	bakery
-PORTVERSION=	2.0.0
-PORTREVISION=	3
+PORTVERSION=	2.3.11
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.3
 
 MAINTAINER=	gnome@FreeBSD.org
 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\\+\\+-1.0:${PORTSDIR}/textproc/libxml++
+LIB_DEPENDS=	gconfmm-2.6:${PORTSDIR}/devel/gconfmm26 \
+		glademm-2.4:${PORTSDIR}/devel/libglademm24 \
+		gnomevfsmm-2.6:${PORTSDIR}/devel/gnome-vfsmm \
+		xml\\+\\+-2.6:${PORTSDIR}/textproc/libxml++26
 
-USE_X_PREFIX=	yes
-USE_PERL5=	yes
+USE_GNOME=	gnomehack gnomeprefix gnometarget intltool
+USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack lthack intltool gnometarget
-USE_INC_LIBTOOL_VER=13
+USE_GCC=	3.4
+USE_PERL5=	yes
+USE_X_PREFIX=	yes
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
+PLIST_SUB=	VERSION="2.3" API_VERSION="2.4"
+
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS =/s/examples//' \
 		${WRKSRC}/Makefile.in
diff --git a/x11-toolkits/bakery/distinfo b/x11-toolkits/bakery/distinfo
index 8c2ee8115be8..3428283f2d7a 100644
--- a/x11-toolkits/bakery/distinfo
+++ b/x11-toolkits/bakery/distinfo
@@ -1,2 +1,2 @@
-MD5 (bakery-2.0.0.tar.gz) = f2f0006b00b78b2a3aabe2bb341cbe31
-SIZE (bakery-2.0.0.tar.gz) = 423653
+MD5 (bakery-2.3.11.tar.bz2) = 357db8cec155dd320c893655a5808bd1
+SIZE (bakery-2.3.11.tar.bz2) = 723951
diff --git a/x11-toolkits/bakery/files/patch-bakery::App::App.h b/x11-toolkits/bakery/files/patch-bakery::App::App.h
deleted file mode 100644
index d64c2714ca29..000000000000
--- a/x11-toolkits/bakery/files/patch-bakery::App::App.h
+++ /dev/null
@@ -1,19 +0,0 @@
---- bakery/App/App.h.orig	Thu Jan  2 08:46:33 2003
-+++ bakery/App/App.h	Wed Aug 18 15:50:32 2004
-@@ -93,6 +93,7 @@
- //  virtual void bring_to_front() = 0;
-   //Signal handlers:
- 
-+public:
-   //Menus:
-   virtual void on_menu_file_new();
-   virtual void on_menu_file_close();
-@@ -109,7 +110,7 @@
- 
-   virtual void on_about_close();
- 
--
-+protected:
-   //GUI abstractions:
-   virtual void ui_hide() = 0;
-   virtual void ui_bring_to_front() = 0;
diff --git a/x11-toolkits/bakery/files/patch-bakery::App::App_WithDoc.h b/x11-toolkits/bakery/files/patch-bakery::App::App_WithDoc.h
deleted file mode 100644
index b9d54c0bb660..000000000000
--- a/x11-toolkits/bakery/files/patch-bakery::App::App_WithDoc.h
+++ /dev/null
@@ -1,21 +0,0 @@
---- bakery/App/App_WithDoc.h.orig	Wed Aug 18 15:44:34 2004
-+++ bakery/App/App_WithDoc.h	Wed Aug 18 15:45:06 2004
-@@ -90,7 +90,7 @@
-   static void session_save_document_history();
- 
-   //Signal handlers:
--
-+public:
-   //Menu items:
-   virtual void on_menu_file_open();
-   virtual void on_menu_file_open_recent(guint index); //use with SigC::bind.
-@@ -102,7 +102,8 @@
-   virtual void on_menu_edit_copy();
-   virtual void on_menu_edit_paste();
-   virtual void on_menu_edit_clear();
--  
-+
-+protected:  
-   //Document:
-   ///Update visual status.
-   virtual void on_document_modified();
diff --git a/x11-toolkits/bakery/files/patch-bakery::Makefile.in b/x11-toolkits/bakery/files/patch-bakery::Makefile.in
index f683cc5219e1..2c45e2083d2e 100644
--- a/x11-toolkits/bakery/files/patch-bakery::Makefile.in
+++ b/x11-toolkits/bakery/files/patch-bakery::Makefile.in
@@ -1,11 +1,11 @@
---- bakery/Makefile.in.orig	Fri Nov 28 11:44:02 2003
-+++ bakery/Makefile.in	Fri Nov 28 11:44:17 2003
-@@ -192,7 +192,7 @@
+--- bakery/Makefile.in.orig	Fri Nov 12 01:48:47 2004
++++ bakery/Makefile.in	Fri Nov 12 01:49:10 2004
+@@ -251,7 +251,7 @@
                        View/libbakery_view.la \
                        $(BAKERY_LIBS)
  
--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
+-libbakery_2_3_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) -release $(GENERIC_RELEASE)
++libbakery_2_3_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
+ all: all-recursive
+ 
+ .SUFFIXES:
diff --git a/x11-toolkits/bakery/files/patch-bakery::View::View_Composite.h b/x11-toolkits/bakery/files/patch-bakery::View::View_Composite.h
deleted file mode 100644
index cf0636cd8b5b..000000000000
--- a/x11-toolkits/bakery/files/patch-bakery::View::View_Composite.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- bakery/View/View_Composite.h.orig	Wed Aug 18 15:45:34 2004
-+++ bakery/View/View_Composite.h	Wed Aug 18 15:45:52 2004
-@@ -49,7 +49,7 @@
- 	  //This should be unnecessary.
- 	  if(pView)
- 	  {
--  		pView->set_document(get_document());
-+  		pView->set_document(type_view::get_document());
-   		
-   		//Add it to the list of child views:
-   	  m_vecViews.push_back(pView);
diff --git a/x11-toolkits/bakery/pkg-plist b/x11-toolkits/bakery/pkg-plist
index bd54aaee158f..f0a40d5c2aec 100644
--- a/x11-toolkits/bakery/pkg-plist
+++ b/x11-toolkits/bakery/pkg-plist
@@ -1,32 +1,41 @@
-include/bakery-2.0/bakery/App/App.h
-include/bakery-2.0/bakery/App/AppInstanceManager.h
-include/bakery-2.0/bakery/App/App_Gtk.h
-include/bakery-2.0/bakery/App/App_WithDoc.h
-include/bakery-2.0/bakery/App/App_WithDoc_Gtk.h
-include/bakery-2.0/bakery/App/Dialog_OfferSave.h
-include/bakery-2.0/bakery/App/Dialog_OverwriteFile.h
-include/bakery-2.0/bakery/App/GtkDialogs.h
-include/bakery-2.0/bakery/Configuration/Association.h
-include/bakery-2.0/bakery/Configuration/AssociationBase.h
-include/bakery-2.0/bakery/Configuration/Client.h
-include/bakery-2.0/bakery/Configuration/Dialog_Preferences.h
-include/bakery-2.0/bakery/Document/Document.h
-include/bakery-2.0/bakery/Document/Document_XML.h
-include/bakery-2.0/bakery/Utilities/BusyCursor.h
-include/bakery-2.0/bakery/View/View.h
-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-2.0.a
-lib/libbakery-2.0.so
-lib/libbakery-2.0.so.1
-libdata/pkgconfig/bakery-2.0.pc
+include/bakery-%%API_VERSION%%/bakery/App/App.h
+include/bakery-%%API_VERSION%%/bakery/App/AppInstanceManager.h
+include/bakery-%%API_VERSION%%/bakery/App/App_Gtk.h
+include/bakery-%%API_VERSION%%/bakery/App/App_WithDoc.h
+include/bakery-%%API_VERSION%%/bakery/App/App_WithDoc_Gtk.h
+include/bakery-%%API_VERSION%%/bakery/App/Dialog_OfferSave.h
+include/bakery-%%API_VERSION%%/bakery/App/Dialog_OverwriteFile.h
+include/bakery-%%API_VERSION%%/bakery/App/GtkDialogs.h
+include/bakery-%%API_VERSION%%/bakery/App/libegg/recent-files/egg-recent-item.h
+include/bakery-%%API_VERSION%%/bakery/App/libegg/recent-files/egg-recent-model.h
+include/bakery-%%API_VERSION%%/bakery/App/libegg/recent-files/egg-recent-util.h
+include/bakery-%%API_VERSION%%/bakery/App/libegg/recent-files/egg-recent-view-gtk.h
+include/bakery-%%API_VERSION%%/bakery/App/libegg/recent-files/egg-recent-view.h
+include/bakery-%%API_VERSION%%/bakery/App/libegg/recent-files/egg-recent.h
+include/bakery-%%API_VERSION%%/bakery/Configuration/Association.h
+include/bakery-%%API_VERSION%%/bakery/Configuration/AssociationBase.h
+include/bakery-%%API_VERSION%%/bakery/Configuration/Client.h
+include/bakery-%%API_VERSION%%/bakery/Configuration/Dialog_Preferences.h
+include/bakery-%%API_VERSION%%/bakery/Document/Document.h
+include/bakery-%%API_VERSION%%/bakery/Document/Document_XML.h
+include/bakery-%%API_VERSION%%/bakery/Utilities/BusyCursor.h
+include/bakery-%%API_VERSION%%/bakery/Utilities/sharedptr.h
+include/bakery-%%API_VERSION%%/bakery/View/View.h
+include/bakery-%%API_VERSION%%/bakery/View/ViewBase.h
+include/bakery-%%API_VERSION%%/bakery/View/View_Composite.h
+include/bakery-%%API_VERSION%%/bakery/bakery.h
+include/bakery-%%API_VERSION%%/bakery/init.h
+lib/libbakery-%%VERSION%%.a
+lib/libbakery-%%VERSION%%.so
+lib/libbakery-%%VERSION%%.so.11
+libdata/pkgconfig/bakery-%%API_VERSION%%.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
-@dirrm include/bakery-2.0/bakery/Configuration
-@dirrm include/bakery-2.0/bakery/App
-@dirrm include/bakery-2.0/bakery
-@dirrm include/bakery-2.0
+@dirrm include/bakery-%%API_VERSION%%/bakery/View
+@dirrm include/bakery-%%API_VERSION%%/bakery/Utilities
+@dirrm include/bakery-%%API_VERSION%%/bakery/Document
+@dirrm include/bakery-%%API_VERSION%%/bakery/Configuration
+@dirrm include/bakery-%%API_VERSION%%/bakery/App/libegg/recent-files
+@dirrm include/bakery-%%API_VERSION%%/bakery/App/libegg
+@dirrm include/bakery-%%API_VERSION%%/bakery/App
+@dirrm include/bakery-%%API_VERSION%%/bakery
+@dirrm include/bakery-%%API_VERSION%%