Update to 2.5.1

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2478 df743ca5-7f9a-e211-a948-0013205c9059

7 files changed, 24 insertions, 32 deletions

diff --git a/print/libgnomeprintmm/Makefile b/print/libgnomeprintmm/Makefile
index d62271fc3..cad2eb7f3 100644
--- a/print/libgnomeprintmm/Makefile
+++ b/print/libgnomeprintmm/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libgnomeprintmm
-PORTVERSION=	2.5.0
-PORREVISION=	3
+PORTVERSION=	2.5.1
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.5
@@ -16,15 +15,16 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	bland@FreeBSD.org
 COMMENT=	C++ bindings for the GNOME print support library
 
-LIB_DEPENDS=	gtkmm-2.3.4:${PORTSDIR}/x11-toolkits/gtk--2
+LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack lthack libgnomeprint
+USE_GCC=	3.3
+USE_GNOME=	gnomeprefix gnomehack libgnomeprint
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_ARGS=	--enable-static
 
 PLIST_SUB=	VERSION="2.5" API_VERSION="2.6"
diff --git a/print/libgnomeprintmm/distinfo b/print/libgnomeprintmm/distinfo
index 8c4b26b0e..0115f95f4 100644
--- a/print/libgnomeprintmm/distinfo
+++ b/print/libgnomeprintmm/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgnomeprintmm-2.5.0.tar.bz2) = 61db9f654329c01a0d1f7454eaab7864
-SIZE (gnome2/libgnomeprintmm-2.5.0.tar.bz2) = 268120
+MD5 (gnome2/libgnomeprintmm-2.5.1.tar.bz2) = cac1729ff8708bec30be4291b73530bc
+SIZE (gnome2/libgnomeprintmm-2.5.1.tar.bz2) = 261134
diff --git a/print/libgnomeprintmm/files/patch-libgnomeprint_libgnomeprintmm_font.cc b/print/libgnomeprintmm/files/patch-libgnomeprint_libgnomeprintmm_font.cc
deleted file mode 100644
index b8b050cf7..000000000
--- a/print/libgnomeprintmm/files/patch-libgnomeprint_libgnomeprintmm_font.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgnomeprint/libgnomeprintmm/font.cc.orig	Wed Dec 17 19:59:13 2003
-+++ libgnomeprint/libgnomeprintmm/font.cc	Wed Dec 17 19:59:29 2003
-@@ -180,7 +180,7 @@
- 
- Glib::RefPtr<Font> Font::find_closest(const Glib::ustring& family, FontWeight weight, bool italic, double size)
- {
--  return Glib::wrap(gnome_font_find_closest_from_weight_slant((const guchar*)family.c_str(), static_cast<GnomeFontWeight>(weight), static_cast<int>(italic), size));
-+  return Glib::wrap(gnome_font_find_closest_from_weight_slant((const guchar*)family.c_str(), (GnomeFontWeight)(weight), static_cast<int>(italic), size));
- }
- 
- Glib::RefPtr<Pango::Font> Font::get_closest_pango_font(const Glib::RefPtr<Pango::FontMap>& map, double dpi) const
diff --git a/print/libgnomeprintmm/pkg-plist b/print/libgnomeprintmm/pkg-plist
index bd6ae8140..1f1f05899 100644
--- a/print/libgnomeprintmm/pkg-plist
+++ b/print/libgnomeprintmm/pkg-plist
@@ -15,7 +15,7 @@ include/libgnomeprintmm-%%API_VERSION%%/libgnomeprintmm/types.h
 include/libgnomeprintmm-%%API_VERSION%%/libgnomeprintmm/wrap_init.h
 lib/libgnomeprintmm-%%VERSION%%.a
 lib/libgnomeprintmm-%%VERSION%%.so
-lib/libgnomeprintmm-%%VERSION%%.so.1
+lib/libgnomeprintmm-%%VERSION%%.so.2
 lib/libgnomeprintmm-%%API_VERSION%%/include/libgnomeprintmmconfig.h
 lib/libgnomeprintmm-%%API_VERSION%%/proc/m4/convert.m4
 lib/libgnomeprintmm-%%API_VERSION%%/proc/m4/convert_libgnomeprintmm.m4
diff --git a/x11-toolkits/libgnomeprintuimm/Makefile b/x11-toolkits/libgnomeprintuimm/Makefile
index ee5e5fbb4..d1cd38462 100644
--- a/x11-toolkits/libgnomeprintuimm/Makefile
+++ b/x11-toolkits/libgnomeprintuimm/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libgnomeprintuimm
-PORTVERSION=	2.5.0
-PORTREVISION=	1
+PORTVERSION=	2.5.1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.5
@@ -16,17 +15,22 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	bland@FreeBSD.org
 COMMENT=	C++ wrappers for the GNOME print support library
 
-LIB_DEPENDS=	gnomeprintmm-2.5.1:${PORTSDIR}/print/libgnomeprintmm
+LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
+		gnomeprintmm-2.5.2:${PORTSDIR}/print/libgnomeprintmm
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack lthack libgnomeprintui
+USE_GNOME=	gnomeprefix gnomehack libgnomeprintui
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_REINPLACE=	yes
+USE_LIBTOOL_VER=15
 CONFIGURE_ARGS=	--enable-static
 
 PLIST_SUB=	VERSION="2.5" API_VERSION="2.6"
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|2\.0|2.6|' ${WRKSRC}/tools/m4/Makefile.in
+
 .include <bsd.port.mk>
diff --git a/x11-toolkits/libgnomeprintuimm/distinfo b/x11-toolkits/libgnomeprintuimm/distinfo
index 5c429287f..535533a7c 100644
--- a/x11-toolkits/libgnomeprintuimm/distinfo
+++ b/x11-toolkits/libgnomeprintuimm/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgnomeprintuimm-2.5.0.tar.bz2) = 3f25ededb740a3382062105fb7cd3945
-SIZE (gnome2/libgnomeprintuimm-2.5.0.tar.bz2) = 258359
+MD5 (gnome2/libgnomeprintuimm-2.5.1.tar.bz2) = dd6f3e265bf9d1c1dbe1fce4005c417b
+SIZE (gnome2/libgnomeprintuimm-2.5.1.tar.bz2) = 256310
diff --git a/x11-toolkits/libgnomeprintuimm/pkg-plist b/x11-toolkits/libgnomeprintuimm/pkg-plist
index b08633117..841ecba3b 100644
--- a/x11-toolkits/libgnomeprintuimm/pkg-plist
+++ b/x11-toolkits/libgnomeprintuimm/pkg-plist
@@ -9,18 +9,17 @@ include/libgnomeprintuimm-%%API_VERSION%%/libgnomeprintuimm/private/enums_p.h
 include/libgnomeprintuimm-%%API_VERSION%%/libgnomeprintuimm/private/fontdialog_p.h
 include/libgnomeprintuimm-%%API_VERSION%%/libgnomeprintuimm/types.h
 include/libgnomeprintuimm-%%API_VERSION%%/libgnomeprintuimm/wrap_init.h
-lib/libgnomeprintuimm-2.0/proc/m4/convert.m4
-lib/libgnomeprintuimm-2.0/proc/m4/convert_libgnomeprintuimm.m4
 lib/libgnomeprintuimm-%%VERSION%%.a
 lib/libgnomeprintuimm-%%VERSION%%.so
-lib/libgnomeprintuimm-%%VERSION%%.so.1
+lib/libgnomeprintuimm-%%VERSION%%.so.2
 lib/libgnomeprintuimm-%%API_VERSION%%/include/libgnomeprintuimmconfig.h
+lib/libgnomeprintuimm-%%API_VERSION%%/proc/m4/convert.m4
+lib/libgnomeprintuimm-%%API_VERSION%%/proc/m4/convert_libgnomeprintuimm.m4
 libdata/pkgconfig/libgnomeprintuimm-%%API_VERSION%%.pc
+@dirrm lib/libgnomeprintuimm-%%API_VERSION%%/proc/m4
+@dirrm lib/libgnomeprintuimm-%%API_VERSION%%/proc
 @dirrm lib/libgnomeprintuimm-%%API_VERSION%%/include
 @dirrm lib/libgnomeprintuimm-%%API_VERSION%%
-@dirrm lib/libgnomeprintuimm-2.0/proc/m4
-@dirrm lib/libgnomeprintuimm-2.0/proc
-@dirrm lib/libgnomeprintuimm-2.0
 @dirrm include/libgnomeprintuimm-%%API_VERSION%%/libgnomeprintuimm/private
 @dirrm include/libgnomeprintuimm-%%API_VERSION%%/libgnomeprintuimm
 @dirrm include/libgnomeprintuimm-%%API_VERSION%%