3 files changed, 11 insertions, 71 deletions

diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index 6ad017bce438..ef71ec3fbd37 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -3,15 +3,14 @@
 # Whom:                Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/x11-toolkits/gtkmm24/Makefile,v 1.1 2007/12/02 00:20:21 mezz Exp $
+#   $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.42 2008/11/18 06:51:19 marcus Exp $
 #
 
 PORTNAME=	gtkmm
-PORTVERSION=	2.12.7
-PORTREVISION?=	1
+PORTVERSION=	2.14.3
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -23,7 +22,8 @@ LATEST_LINK=	gtkmm24
 .if !defined(REFERENCE_PORT)
 
 LIB_DEPENDS=	glibmm-2.4.1:${PORTSDIR}/devel/glibmm \
-		cairomm-1.0.1:${PORTSDIR}/graphics/cairomm
+		cairomm-1.0.1:${PORTSDIR}/graphics/cairomm \
+		pangomm-1.4.1:${PORTSDIR}/x11-toolkits/pangomm
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_GMAKE=	yes
diff --git a/x11-toolkits/gtkmm24/distinfo b/x11-toolkits/gtkmm24/distinfo
index 75dd0b0d95cd..5c77592fc96f 100644
--- a/x11-toolkits/gtkmm24/distinfo
+++ b/x11-toolkits/gtkmm24/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtkmm-2.12.7.tar.bz2) = ad199f4a392799134c128deab48fee30
-SHA256 (gnome2/gtkmm-2.12.7.tar.bz2) = 4e58c9ad827759a2375b3c0d39952b5b2983111ab16ee329b10a34792fb1d9eb
-SIZE (gnome2/gtkmm-2.12.7.tar.bz2) = 15198578
+MD5 (gnome2/gtkmm-2.14.3.tar.bz2) = 10039f35d7f815d47f926a13cefe65d6
+SHA256 (gnome2/gtkmm-2.14.3.tar.bz2) = 24b18105636cea1033658a0a5f7e86783d0e620590aa359a005ba64d055559a2
+SIZE (gnome2/gtkmm-2.14.3.tar.bz2) = 8667875
diff --git a/x11-toolkits/gtkmm24/pkg-plist b/x11-toolkits/gtkmm24/pkg-plist
index e405a27dcd87..fea6c20e19d0 100644
--- a/x11-toolkits/gtkmm24/pkg-plist
+++ b/x11-toolkits/gtkmm24/pkg-plist
@@ -340,6 +340,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/toggletoolbutton_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/toolbar_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/toolbutton_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/toolitem_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/toolshell_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/tooltip_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/tooltips_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/treedragdest_p.h
@@ -414,6 +415,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/toggletoolbutton.h
 include/gtkmm-%%API_VERSION%%/gtkmm/toolbar.h
 include/gtkmm-%%API_VERSION%%/gtkmm/toolbutton.h
 include/gtkmm-%%API_VERSION%%/gtkmm/toolitem.h
+include/gtkmm-%%API_VERSION%%/gtkmm/toolshell.h
 include/gtkmm-%%API_VERSION%%/gtkmm/tooltip.h
 include/gtkmm-%%API_VERSION%%/gtkmm/tooltips.h
 include/gtkmm-%%API_VERSION%%/gtkmm/treedragdest.h
@@ -437,60 +439,6 @@ include/gtkmm-%%API_VERSION%%/gtkmm/volumebutton.h
 include/gtkmm-%%API_VERSION%%/gtkmm/widget.h
 include/gtkmm-%%API_VERSION%%/gtkmm/window.h
 include/gtkmm-%%API_VERSION%%/gtkmm/wrap_init.h
-include/pangomm-1.4/pangomm.h
-include/pangomm-1.4/pangomm/attributes.h
-include/pangomm-1.4/pangomm/attriter.h
-include/pangomm-1.4/pangomm/attrlist.h
-include/pangomm-1.4/pangomm/cairofontmap.h
-include/pangomm-1.4/pangomm/color.h
-include/pangomm-1.4/pangomm/context.h
-include/pangomm-1.4/pangomm/coverage.h
-include/pangomm-1.4/pangomm/font.h
-include/pangomm-1.4/pangomm/fontdescription.h
-include/pangomm-1.4/pangomm/fontface.h
-include/pangomm-1.4/pangomm/fontfamily.h
-include/pangomm-1.4/pangomm/fontmap.h
-include/pangomm-1.4/pangomm/fontmetrics.h
-include/pangomm-1.4/pangomm/fontset.h
-include/pangomm-1.4/pangomm/glyph.h
-include/pangomm-1.4/pangomm/glyphstring.h
-include/pangomm-1.4/pangomm/init.h
-include/pangomm-1.4/pangomm/item.h
-include/pangomm-1.4/pangomm/language.h
-include/pangomm-1.4/pangomm/layout.h
-include/pangomm-1.4/pangomm/layoutiter.h
-include/pangomm-1.4/pangomm/layoutline.h
-include/pangomm-1.4/pangomm/layoutrun.h
-include/pangomm-1.4/pangomm/private/attributes_p.h
-include/pangomm-1.4/pangomm/private/attriter_p.h
-include/pangomm-1.4/pangomm/private/attrlist_p.h
-include/pangomm-1.4/pangomm/private/cairofontmap_p.h
-include/pangomm-1.4/pangomm/private/color_p.h
-include/pangomm-1.4/pangomm/private/context_p.h
-include/pangomm-1.4/pangomm/private/coverage_p.h
-include/pangomm-1.4/pangomm/private/font_p.h
-include/pangomm-1.4/pangomm/private/fontdescription_p.h
-include/pangomm-1.4/pangomm/private/fontface_p.h
-include/pangomm-1.4/pangomm/private/fontfamily_p.h
-include/pangomm-1.4/pangomm/private/fontmap_p.h
-include/pangomm-1.4/pangomm/private/fontmetrics_p.h
-include/pangomm-1.4/pangomm/private/fontset_p.h
-include/pangomm-1.4/pangomm/private/glyph_p.h
-include/pangomm-1.4/pangomm/private/glyphstring_p.h
-include/pangomm-1.4/pangomm/private/item_p.h
-include/pangomm-1.4/pangomm/private/language_p.h
-include/pangomm-1.4/pangomm/private/layout_p.h
-include/pangomm-1.4/pangomm/private/layoutiter_p.h
-include/pangomm-1.4/pangomm/private/layoutline_p.h
-include/pangomm-1.4/pangomm/private/layoutrun_p.h
-include/pangomm-1.4/pangomm/private/rectangle_p.h
-include/pangomm-1.4/pangomm/private/renderer_p.h
-include/pangomm-1.4/pangomm/private/tabarray_p.h
-include/pangomm-1.4/pangomm/rectangle.h
-include/pangomm-1.4/pangomm/renderer.h
-include/pangomm-1.4/pangomm/tabarray.h
-include/pangomm-1.4/pangomm/types.h
-include/pangomm-1.4/pangomm/wrap_init.h
 lib/gdkmm-%%API_VERSION%%/include/gdkmmconfig.h
 lib/gtkmm-%%API_VERSION%%/include/gtkmmconfig.h
 lib/gtkmm-%%API_VERSION%%/proc/m4/convert.m4
@@ -511,23 +459,15 @@ lib/libgtkmm-%%VERSION%%.a
 lib/libgtkmm-%%VERSION%%.la
 lib/libgtkmm-%%VERSION%%.so
 lib/libgtkmm-%%VERSION%%.so.1
-lib/libpangomm-1.4.a
-lib/libpangomm-1.4.la
-lib/libpangomm-1.4.so
-lib/libpangomm-1.4.so.1
 libdata/pkgconfig/atkmm-1.6.pc
 libdata/pkgconfig/gdkmm-%%API_VERSION%%.pc
 libdata/pkgconfig/gtkmm-%%API_VERSION%%.pc
-libdata/pkgconfig/pangomm-1.4.pc
 @dirrm lib/gtkmm-%%API_VERSION%%/proc/m4
 @dirrm lib/gtkmm-%%API_VERSION%%/proc
 @dirrm lib/gtkmm-%%API_VERSION%%/include
 @dirrm lib/gtkmm-%%API_VERSION%%
 @dirrm lib/gdkmm-%%API_VERSION%%/include
 @dirrm lib/gdkmm-%%API_VERSION%%
-@dirrm include/pangomm-1.4/pangomm/private
-@dirrm include/pangomm-1.4/pangomm
-@dirrm include/pangomm-1.4
 @dirrm include/gtkmm-%%API_VERSION%%/gtkmm/private
 @dirrm include/gtkmm-%%API_VERSION%%/gtkmm
 @dirrm include/gtkmm-%%API_VERSION%%