5 files changed, 36 insertions, 21 deletions

diff --git a/x11-toolkits/bakery/Makefile b/x11-toolkits/bakery/Makefile
index f5a76653f749..e0597a556f97 100644
--- a/x11-toolkits/bakery/Makefile
+++ b/x11-toolkits/bakery/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/bakery/Makefile,v 1.8 2006/09/10 00:51:16 mezz Exp $
+#   $MCom: ports-stable/x11-toolkits/bakery/Makefile,v 1.5 2007/12/02 07:02:19 marcus Exp $
 #
 
 PORTNAME=	bakery
-PORTVERSION=	2.4.1
-PORTREVISION=	1
+PORTVERSION=	2.4.3
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.4
@@ -24,7 +23,7 @@ LIB_DEPENDS=	gconfmm-2.6:${PORTSDIR}/devel/gconfmm26 \
 USE_GNOME=	gnomehack gnomeprefix gnometarget intltool ltverhack
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GCC=	3.4
+USE_GCC=	3.4+
 USE_GETTEXT=	yes
 USE_XLIB=	yes
 USE_AUTOTOOLS=	libtool:15
diff --git a/x11-toolkits/bakery/distinfo b/x11-toolkits/bakery/distinfo
index 4d4c6bde3cf8..6f11807c6f20 100644
--- a/x11-toolkits/bakery/distinfo
+++ b/x11-toolkits/bakery/distinfo
@@ -1,3 +1,3 @@
-MD5 (bakery-2.4.1.tar.bz2) = 9ac57944cadde3d1c2ce35f48c66eb80
-SHA256 (bakery-2.4.1.tar.bz2) = c784fdd7a382d6edcd4e6141f3905db0f6f8a94cac3babf90f33806621b2b6d6
-SIZE (bakery-2.4.1.tar.bz2) = 361955
+MD5 (bakery-2.4.3.tar.bz2) = 7d22a4610656c412e6ae3918a3e82304
+SHA256 (bakery-2.4.3.tar.bz2) = c719c0e7f6ce7c53b1f3a4c0d3a23dbab758bf03525ec7eaf364c4b1a3fc6130
+SIZE (bakery-2.4.3.tar.bz2) = 380117
diff --git a/x11-toolkits/bakery/files/patch-bakery-2.4.pc.in b/x11-toolkits/bakery/files/patch-bakery-2.4.pc.in
new file mode 100644
index 000000000000..61609f1dea58
--- /dev/null
+++ b/x11-toolkits/bakery/files/patch-bakery-2.4.pc.in
@@ -0,0 +1,9 @@
+--- bakery-2.4.pc.in.orig	2007-12-02 01:54:38.000000000 -0500
++++ bakery-2.4.pc.in	2007-12-02 01:54:46.000000000 -0500
+@@ -8,5 +8,5 @@ Description: C++ Application Framework f
+ Requires: gtkmm-2.4 >= 2.4.0 gconfmm-2.6 >= 2.6.0 libglademm-2.4 >= 2.4.0 libxml++-2.6 >= 2.6.0 gnome-vfsmm-2.6 >= 2.6.0
+ Version: @VERSION@
+ Libs: -L${libdir} -lbakery-2.4
+-Cflags: -I${includedir}/bakery-2.4 -I${libdir}/bakery-2.4/include
++Cflags: -I${includedir}/bakery-2.4
+ 
diff --git a/x11-toolkits/bakery/files/patch-bakery::Makefile.in b/x11-toolkits/bakery/files/patch-bakery::Makefile.in
index d0c1c45d7051..1c28b5348fea 100644
--- a/x11-toolkits/bakery/files/patch-bakery::Makefile.in
+++ b/x11-toolkits/bakery/files/patch-bakery::Makefile.in
@@ -1,11 +1,15 @@
---- 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 @@
+--- bakery/Makefile.in.orig	2007-12-02 01:51:18.000000000 -0500
++++ bakery/Makefile.in	2007-12-02 01:55:39.000000000 -0500
+@@ -279,10 +279,10 @@ libbakery_2_4_la_LIBADD = App/libbakery_
                        View/libbakery_view.la \
                        $(BAKERY_LIBS)
  
 -libbakery_2_4_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) -release $(GENERIC_RELEASE)
 +libbakery_2_4_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
- all: all-recursive
  
- .SUFFIXES:
+ # Install the headers:
+-library_configdir = $(libdir)/bakery-2.4/include
++library_configdir = $(library_includedir)
+ library_config_DATA = bakeryconfig.h
+ all: bakeryconfig.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/x11-toolkits/bakery/pkg-plist b/x11-toolkits/bakery/pkg-plist
index 983b6f282142..576d15e85667 100644
--- a/x11-toolkits/bakery/pkg-plist
+++ b/x11-toolkits/bakery/pkg-plist
@@ -4,14 +4,7 @@ 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
@@ -24,6 +17,7 @@ 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/bakeryconfig.h
 include/bakery-%%API_VERSION%%/bakery/init.h
 lib/libbakery-%%VERSION%%.a
 lib/libbakery-%%VERSION%%.la
@@ -34,22 +28,29 @@ share/locale/ar/LC_MESSAGES/bakery.mo
 share/locale/bg/LC_MESSAGES/bakery.mo
 share/locale/ca/LC_MESSAGES/bakery.mo
 share/locale/de/LC_MESSAGES/bakery.mo
+share/locale/dz/LC_MESSAGES/bakery.mo
 share/locale/el/LC_MESSAGES/bakery.mo
 share/locale/en_CA/LC_MESSAGES/bakery.mo
 share/locale/en_GB/LC_MESSAGES/bakery.mo
 share/locale/es/LC_MESSAGES/bakery.mo
 share/locale/fi/LC_MESSAGES/bakery.mo
 share/locale/fr/LC_MESSAGES/bakery.mo
+share/locale/gl/LC_MESSAGES/bakery.mo
 share/locale/hu/LC_MESSAGES/bakery.mo
 share/locale/ja/LC_MESSAGES/bakery.mo
+share/locale/lt/LC_MESSAGES/bakery.mo
 share/locale/mk/LC_MESSAGES/bakery.mo
 share/locale/nb/LC_MESSAGES/bakery.mo
 share/locale/ne/LC_MESSAGES/bakery.mo
+share/locale/oc/LC_MESSAGES/bakery.mo
 share/locale/nl/LC_MESSAGES/bakery.mo
+share/locale/pl/LC_MESSAGES/bakery.mo
 share/locale/pt_BR/LC_MESSAGES/bakery.mo
 share/locale/ru/LC_MESSAGES/bakery.mo
 share/locale/rw/LC_MESSAGES/bakery.mo
 share/locale/sk/LC_MESSAGES/bakery.mo
+share/locale/sl/LC_MESSAGES/bakery.mo
+share/locale/sq/LC_MESSAGES/bakery.mo
 share/locale/sv/LC_MESSAGES/bakery.mo
 share/locale/vi/LC_MESSAGES/bakery.mo
 share/locale/uk/LC_MESSAGES/bakery.mo
@@ -59,10 +60,12 @@ share/locale/zh_TW/LC_MESSAGES/bakery.mo
 @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%%
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz