5 files changed, 60 insertions, 32 deletions

diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index fdd2b8f73eb6..eed9bdca8398 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -3,11 +3,11 @@
 # Whom:                Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.8 2005/10/20 16:16:50 marcus Exp $
+#   $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.20 2006/08/22 03:45:28 marcus Exp $
 #
 
 PORTNAME=	gtkmm
-PORTVERSION=	2.8.8
+PORTVERSION=	2.10.1
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -22,15 +22,17 @@ LATEST_LINK=	gtkmm24
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS=	glibmm-2.4.1:${PORTSDIR}/devel/glibmm
+LIB_DEPENDS=	glibmm-2.4.1:${PORTSDIR}/devel/glibmm \
+		cairomm-1.0.1:${PORTSDIR}/graphics/cairomm
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_GMAKE=	yes
 USE_GCC=	3.4
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack gtk20
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-demos \
 		--disable-docs \
 		--disable-examples \
@@ -42,6 +44,8 @@ PLIST_SUB=	VERSION="2.4" API_VERSION="2.4"
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS =/s/tests//' \
 		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|demo[$$][(]EXEEXT[)]|gtkmm-demo$$(EXEEXT)|g' \
+	    	${WRKSRC}/demos/gtk-demo/Makefile.in
 
 .include <bsd.port.mk>
 
diff --git a/x11-toolkits/gtkmm24/distinfo b/x11-toolkits/gtkmm24/distinfo
index c5fdc67d91c7..ca6061cbedff 100644
--- a/x11-toolkits/gtkmm24/distinfo
+++ b/x11-toolkits/gtkmm24/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtkmm-2.8.8.tar.bz2) = 319a7847f67c5099a78afb495e148143
-SHA256 (gnome2/gtkmm-2.8.8.tar.bz2) = e86b42f59d9928ed73435a0f33ac3334be2a87a9371bc1ba09e834996a8bb292
-SIZE (gnome2/gtkmm-2.8.8.tar.bz2) = 6203479
+MD5 (gnome2/gtkmm-2.10.1.tar.bz2) = d661420297e7486a0e0f715f352b4100
+SHA256 (gnome2/gtkmm-2.10.1.tar.bz2) = 855c2b44c472b9c85ededa96ed3082917da3162941032acd716ec2505eba5696
+SIZE (gnome2/gtkmm-2.10.1.tar.bz2) = 7259967
diff --git a/x11-toolkits/gtkmm24/files/patch-gtk__gdkmm__Makefile.in b/x11-toolkits/gtkmm24/files/patch-gtk__gdkmm__Makefile.in
deleted file mode 100644
index 7422f5718de3..000000000000
--- a/x11-toolkits/gtkmm24/files/patch-gtk__gdkmm__Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- gdk/gdkmm/Makefile.in.orig	Fri Apr 14 17:13:13 2006
-+++ gdk/gdkmm/Makefile.in	Fri Apr 14 17:13:31 2006
-@@ -329,8 +329,7 @@
- 
- @PLATFORM_WIN32_FALSE@no_undefined = 
- @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined -Wl,--export-all-symbols
--@PLATFORM_WIN32_FALSE@win32_dlls_extra_libs = 
--@PLATFORM_WIN32_TRUE@win32_dlls_extra_libs = $(sublib_win32_dlls_libs)
-+win32_dlls_extra_libs = $(sublib_win32_dlls_libs)
- 
- # Only export lines that do not contain _GLOBAL_
- # ?! is "negative lookahead" - it stops looking on the line if it finds the regex.
diff --git a/x11-toolkits/gtkmm24/files/patch-gtk__gtkmm__Makefile.in b/x11-toolkits/gtkmm24/files/patch-gtk__gtkmm__Makefile.in
deleted file mode 100644
index 9823a9db77d0..000000000000
--- a/x11-toolkits/gtkmm24/files/patch-gtk__gtkmm__Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- gtk/gtkmm/Makefile.in.orig	Fri Apr 14 17:14:20 2006
-+++ gtk/gtkmm/Makefile.in	Fri Apr 14 17:14:41 2006
-@@ -425,8 +425,7 @@
- 
- @PLATFORM_WIN32_FALSE@no_undefined = 
- @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined -Wl,--export-all-symbols
--@PLATFORM_WIN32_FALSE@win32_dlls_extra_libs = 
--@PLATFORM_WIN32_TRUE@win32_dlls_extra_libs = $(sublib_win32_dlls_libs)
-+win32_dlls_extra_libs = $(sublib_win32_dlls_libs)
- 
- # Only export lines that do not contain _GLOBAL_
- # ?! is "negative lookahead" - it stops looking on the line if it finds the regex.
diff --git a/x11-toolkits/gtkmm24/pkg-plist b/x11-toolkits/gtkmm24/pkg-plist
index 9df2d7989273..b04bd7c370da 100644
--- a/x11-toolkits/gtkmm24/pkg-plist
+++ b/x11-toolkits/gtkmm24/pkg-plist
@@ -1,3 +1,4 @@
+bin/gtkmm-demo
 include/atkmm-1.6/atkmm.h
 include/atkmm-1.6/atkmm/action.h
 include/atkmm-1.6/atkmm/component.h
@@ -106,6 +107,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/adjustment.h
 include/gtkmm-%%API_VERSION%%/gtkmm/alignment.h
 include/gtkmm-%%API_VERSION%%/gtkmm/arrow.h
 include/gtkmm-%%API_VERSION%%/gtkmm/aspectframe.h
+include/gtkmm-%%API_VERSION%%/gtkmm/assistant.h
 include/gtkmm-%%API_VERSION%%/gtkmm/base.h
 include/gtkmm-%%API_VERSION%%/gtkmm/bin.h
 include/gtkmm-%%API_VERSION%%/gtkmm/box.h
@@ -116,9 +118,11 @@ include/gtkmm-%%API_VERSION%%/gtkmm/celleditable.h
 include/gtkmm-%%API_VERSION%%/gtkmm/celllayout.h
 include/gtkmm-%%API_VERSION%%/gtkmm/cellrenderer.h
 include/gtkmm-%%API_VERSION%%/gtkmm/cellrenderer_generation.h
+include/gtkmm-%%API_VERSION%%/gtkmm/cellrendereraccel.h
 include/gtkmm-%%API_VERSION%%/gtkmm/cellrenderercombo.h
 include/gtkmm-%%API_VERSION%%/gtkmm/cellrendererpixbuf.h
 include/gtkmm-%%API_VERSION%%/gtkmm/cellrendererprogress.h
+include/gtkmm-%%API_VERSION%%/gtkmm/cellrendererspin.h
 include/gtkmm-%%API_VERSION%%/gtkmm/cellrenderertext.h
 include/gtkmm-%%API_VERSION%%/gtkmm/cellrenderertoggle.h
 include/gtkmm-%%API_VERSION%%/gtkmm/cellview.h
@@ -166,7 +170,9 @@ include/gtkmm-%%API_VERSION%%/gtkmm/invisible.h
 include/gtkmm-%%API_VERSION%%/gtkmm/item.h
 include/gtkmm-%%API_VERSION%%/gtkmm/label.h
 include/gtkmm-%%API_VERSION%%/gtkmm/layout.h
+include/gtkmm-%%API_VERSION%%/gtkmm/linkbutton.h
 include/gtkmm-%%API_VERSION%%/gtkmm/liststore.h
+include/gtkmm-%%API_VERSION%%/gtkmm/listviewtext.h
 include/gtkmm-%%API_VERSION%%/gtkmm/main.h
 include/gtkmm-%%API_VERSION%%/gtkmm/menu.h
 include/gtkmm-%%API_VERSION%%/gtkmm/menu_elems.h
@@ -179,8 +185,18 @@ include/gtkmm-%%API_VERSION%%/gtkmm/misc.h
 include/gtkmm-%%API_VERSION%%/gtkmm/notebook.h
 include/gtkmm-%%API_VERSION%%/gtkmm/object.h
 include/gtkmm-%%API_VERSION%%/gtkmm/optionmenu.h
+include/gtkmm-%%API_VERSION%%/gtkmm/pagesetup.h
+include/gtkmm-%%API_VERSION%%/gtkmm/pagesetupunixdialog.h
 include/gtkmm-%%API_VERSION%%/gtkmm/paned.h
+include/gtkmm-%%API_VERSION%%/gtkmm/papersize.h
 include/gtkmm-%%API_VERSION%%/gtkmm/plug.h
+include/gtkmm-%%API_VERSION%%/gtkmm/printcontext.h
+include/gtkmm-%%API_VERSION%%/gtkmm/printer.h
+include/gtkmm-%%API_VERSION%%/gtkmm/printjob.h
+include/gtkmm-%%API_VERSION%%/gtkmm/printoperation.h
+include/gtkmm-%%API_VERSION%%/gtkmm/printoperationpreview.h
+include/gtkmm-%%API_VERSION%%/gtkmm/printsettings.h
+include/gtkmm-%%API_VERSION%%/gtkmm/printunixdialog.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/aboutdialog_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/accelgroup_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/accellabel_p.h
@@ -190,6 +206,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/adjustment_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/alignment_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/arrow_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/aspectframe_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/assistant_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/bin_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/box_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/button_p.h
@@ -198,9 +215,11 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/calendar_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/celleditable_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/celllayout_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrenderer_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrendereraccel_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrenderercombo_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrendererpixbuf_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrendererprogress_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrendererspin_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrenderertext_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrenderertoggle_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/cellview_p.h
@@ -246,6 +265,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/invisible_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/item_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/label_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/layout_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/linkbutton_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/liststore_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/main_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/menu_p.h
@@ -258,8 +278,18 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/misc_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/notebook_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/object_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/optionmenu_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/pagesetup_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/pagesetupunixdialog_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/paned_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/papersize_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/plug_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/printcontext_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/printer_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/printjob_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/printoperation_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/printoperationpreview_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/printsettings_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/printunixdialog_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/progressbar_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/radioaction_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/radiobutton_p.h
@@ -267,6 +297,13 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/radiomenuitem_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/radiotoolbutton_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/range_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/rc_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/recentchooser_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/recentchooserdialog_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/recentchoosermenu_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/recentchooserwidget_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/recentfilter_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/recentinfo_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/recentmanager_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/ruler_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/scale_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/scrollbar_p.h
@@ -280,6 +317,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/sizegroup_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/socket_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/spinbutton_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/statusbar_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/statusicon_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/stockitem_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/style_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/table_p.h
@@ -325,6 +363,13 @@ include/gtkmm-%%API_VERSION%%/gtkmm/radiomenuitem.h
 include/gtkmm-%%API_VERSION%%/gtkmm/radiotoolbutton.h
 include/gtkmm-%%API_VERSION%%/gtkmm/range.h
 include/gtkmm-%%API_VERSION%%/gtkmm/rc.h
+include/gtkmm-2.4/gtkmm/recentchooser.h
+include/gtkmm-2.4/gtkmm/recentchooserdialog.h
+include/gtkmm-2.4/gtkmm/recentchoosermenu.h
+include/gtkmm-2.4/gtkmm/recentchooserwidget.h
+include/gtkmm-2.4/gtkmm/recentfilter.h
+include/gtkmm-2.4/gtkmm/recentinfo.h
+include/gtkmm-2.4/gtkmm/recentmanager.h
 include/gtkmm-%%API_VERSION%%/gtkmm/ruler.h
 include/gtkmm-%%API_VERSION%%/gtkmm/scale.h
 include/gtkmm-%%API_VERSION%%/gtkmm/scrollbar.h
@@ -339,6 +384,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/sizegroup.h
 include/gtkmm-%%API_VERSION%%/gtkmm/socket.h
 include/gtkmm-%%API_VERSION%%/gtkmm/spinbutton.h
 include/gtkmm-%%API_VERSION%%/gtkmm/statusbar.h
+include/gtkmm-2.4/gtkmm/statusicon.h
 include/gtkmm-%%API_VERSION%%/gtkmm/stock.h
 include/gtkmm-%%API_VERSION%%/gtkmm/stockid.h
 include/gtkmm-%%API_VERSION%%/gtkmm/stockitem.h
@@ -386,6 +432,7 @@ 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
@@ -408,6 +455,7 @@ 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