4 files changed, 12 insertions, 16 deletions

diff --git a/x11-toolkits/bakery/Makefile b/x11-toolkits/bakery/Makefile
index edfbf0e4d959..fa14b4fa3703 100644
--- a/x11-toolkits/bakery/Makefile
+++ b/x11-toolkits/bakery/Makefile
@@ -7,11 +7,9 @@
 #
 
 PORTNAME=	bakery
-PORTVERSION=	2.4.3
-PORTREVISION=	1
+PORTVERSION=	2.4.4
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.4
+MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A C++ Application Framework for use with Gtkmm
@@ -21,12 +19,10 @@ LIB_DEPENDS=	gconfmm-2.6:${PORTSDIR}/devel/gconfmm26 \
 		gnomevfsmm-2.6:${PORTSDIR}/devel/gnome-vfsmm \
 		xml\\+\\+-2.6:${PORTSDIR}/textproc/libxml++26
 
-USE_GNOME=	gnomehack gnomeprefix gnometarget intltool ltverhack
+USE_GNOME=	gnomehack gnomeprefix gnometarget intlhack ltverhack
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GCC=	3.4+
 USE_GETTEXT=	yes
-USE_XLIB=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/bakery/distinfo b/x11-toolkits/bakery/distinfo
index 6f11807c6f20..dadb0ad3f19c 100644
--- a/x11-toolkits/bakery/distinfo
+++ b/x11-toolkits/bakery/distinfo
@@ -1,3 +1,3 @@
-MD5 (bakery-2.4.3.tar.bz2) = 7d22a4610656c412e6ae3918a3e82304
-SHA256 (bakery-2.4.3.tar.bz2) = c719c0e7f6ce7c53b1f3a4c0d3a23dbab758bf03525ec7eaf364c4b1a3fc6130
-SIZE (bakery-2.4.3.tar.bz2) = 380117
+MD5 (bakery-2.4.4.tar.bz2) = c80b4cf39dc8aa65bb9302b84f084b93
+SHA256 (bakery-2.4.4.tar.bz2) = 04fccb599d28884214da9a6ed71e195141baa4e48da09c1f80fc2ec5440f02b9
+SIZE (bakery-2.4.4.tar.bz2) = 382214
diff --git a/x11-toolkits/bakery/files/patch-bakery::Makefile.in b/x11-toolkits/bakery/files/patch-bakery::Makefile.in
index 9d0fa0b3ee9b..90f78eb92bdd 100644
--- a/x11-toolkits/bakery/files/patch-bakery::Makefile.in
+++ b/x11-toolkits/bakery/files/patch-bakery::Makefile.in
@@ -1,10 +1,10 @@
---- bakery/Makefile.in.orig	2008-03-17 21:46:07.000000000 +0100
-+++ bakery/Makefile.in	2008-03-17 21:47:37.000000000 +0100
-@@ -279,10 +279,10 @@
+--- bakery/Makefile.in.orig	2008-04-07 16:18:10.000000000 -0500
++++ bakery/Makefile.in	2008-04-07 16:19:12.000000000 -0500
+@@ -284,10 +284,10 @@
                        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) -release $(GENERIC_RELEASE) -no-undefined
 +libbakery_2_4_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
  
  # Install the headers:
diff --git a/x11-toolkits/bakery/pkg-plist b/x11-toolkits/bakery/pkg-plist
index 5642da1da4c0..b8d3c54424e6 100644
--- a/x11-toolkits/bakery/pkg-plist
+++ b/x11-toolkits/bakery/pkg-plist
@@ -42,8 +42,8 @@ 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/oc/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
@@ -52,8 +52,8 @@ 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
+share/locale/vi/LC_MESSAGES/bakery.mo
 share/locale/zh_CN/LC_MESSAGES/bakery.mo
 share/locale/zh_TW/LC_MESSAGES/bakery.mo
 @dirrm include/bakery-%%API_VERSION%%/bakery/View