Update to 2.4.6

3 files changed, 34 insertions, 7 deletions

diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index 4254a9ab1ef4..4bab1993ed55 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gtkmm
-PORTVERSION=	2.4.5
-PORTREVISION=	1
+PORTVERSION=	2.4.6
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		${MASTER_SITE_SOURCEFORGE}
@@ -27,10 +26,10 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GCC=	3.4
-USE_INC_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomehack lthack gtk20
+USE_GNOME=	gnomehack gtk20
 CONFIGURE_ARGS=	--enable-static=yes \
 		--with-sigc-prefix=${LOCALBASE}
 
@@ -53,4 +52,13 @@ post-patch:
 		${WRKSRC}/Makefile.in
 .endif
 
+patch-autotools:
+	@(cd ${PATCH_WRKSRC}; \
+	for file in ${LIBTOOLFILES}; do \
+		${CP} $$file $$file.tmp; \
+		${SED} -e "/^ltmain=/s^\$$ac_aux_dir/ltmain.sh^${LTMAIN}^g" \
+			$$file.tmp > $$file; \
+		${RM} $$file.tmp; \
+	done);
+
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtkmm24/distinfo b/x11-toolkits/gtkmm24/distinfo
index c36bcd6bdf75..e1a90a002202 100644
--- a/x11-toolkits/gtkmm24/distinfo
+++ b/x11-toolkits/gtkmm24/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gtkmm-2.4.5.tar.bz2) = ee16663ad6e41949afce670cb7fe0090
-SIZE (gnome2/gtkmm-2.4.5.tar.bz2) = 3935774
+MD5 (gnome2/gtkmm-2.4.6.tar.bz2) = 8182e5ce74b51227b8ecedc8f882041a
+SIZE (gnome2/gtkmm-2.4.6.tar.bz2) = 4031209
diff --git a/x11-toolkits/gtkmm24/pkg-plist b/x11-toolkits/gtkmm24/pkg-plist
index 6b91f288e236..1f9eabf31658 100644
--- a/x11-toolkits/gtkmm24/pkg-plist
+++ b/x11-toolkits/gtkmm24/pkg-plist
@@ -1295,7 +1295,11 @@ libdata/pkgconfig/pangomm-1.4.pc
 %%PORTDOCS%%share/doc/gtkmm-%%API_VERSION%%/docs/reference/html/general_8h.html
 %%PORTDOCS%%share/doc/gtkmm-%%API_VERSION%%/docs/reference/html/globals.html
 %%PORTDOCS%%share/doc/gtkmm-%%API_VERSION%%/docs/reference/html/globals_defs.html
+%%PORTDOCS%%share/doc/gtkmm-%%API_VERSION%%/docs/reference/html/globals_enum.html
+%%PORTDOCS%%share/doc/gtkmm-%%API_VERSION%%/docs/reference/html/globals_eval.html
+%%PORTDOCS%%share/doc/gtkmm-%%API_VERSION%%/docs/reference/html/globals_func.html
 %%PORTDOCS%%share/doc/gtkmm-%%API_VERSION%%/docs/reference/html/globals_type.html
+%%PORTDOCS%%share/doc/gtkmm-%%API_VERSION%%/docs/reference/html/globals_vars.html
 %%PORTDOCS%%share/doc/gtkmm-%%API_VERSION%%/docs/reference/html/glyph_8h.html
 %%PORTDOCS%%share/doc/gtkmm-%%API_VERSION%%/docs/reference/html/glyphstring_8h.html
 %%PORTDOCS%%share/doc/gtkmm-%%API_VERSION%%/docs/reference/html/graph_legend.dot
@@ -1684,7 +1688,7 @@ libdata/pkgconfig/pangomm-1.4.pc
 %%PORTDOCS%%share/doc/gtkmm-%%API_VERSION%%/docs/tutorial/figures/combo.png
 %%PORTDOCS%%share/doc/gtkmm-%%API_VERSION%%/docs/tutorial/figures/devcpp_project_options.png
 %%PORTDOCS%%share/doc/gtkmm-%%API_VERSION%%/docs/tutorial/figures/dialogs_colorselectiondialog.png
-%%PORTDOCS%%share/doc/gtkmm-%%API_VERSION%%/docs/tutorial/figures/dialogs_fileselection.png
+%%PORTDOCS%%share/doc/gtkmm-%%API_VERSION%%/docs/tutorial/figures/dialogs_filechooser.png
 %%PORTDOCS%%share/doc/gtkmm-%%API_VERSION%%/docs/tutorial/figures/dialogs_fontselectiondialog.png
 %%PORTDOCS%%share/doc/gtkmm-%%API_VERSION%%/docs/tutorial/figures/dialogs_messagedialog.png
 %%PORTDOCS%%share/doc/gtkmm-%%API_VERSION%%/docs/tutorial/figures/dialogs_simple.png
@@ -1812,6 +1816,8 @@ libdata/pkgconfig/pangomm-1.4.pc
 %%PORTDOCS%%share/doc/gtkmm-%%API_VERSION%%/docs/tutorial/html/ch21.html
 %%PORTDOCS%%share/doc/gtkmm-%%API_VERSION%%/docs/tutorial/html/ch21s02.html
 %%PORTDOCS%%share/doc/gtkmm-%%API_VERSION%%/docs/tutorial/html/ch22.html
+%%PORTDOCS%%share/doc/gtkmm-%%API_VERSION%%/docs/tutorial/html/ch22s02.html
+%%PORTDOCS%%share/doc/gtkmm-%%API_VERSION%%/docs/tutorial/html/ch23.html
 %%PORTDOCS%%share/doc/gtkmm-%%API_VERSION%%/docs/tutorial/html/index.html
 %%EXAMPLES%%share/doc/gtkmm-%%API_VERSION%%/examples/arrow/arrow.cc
 %%EXAMPLES%%share/doc/gtkmm-%%API_VERSION%%/examples/arrow/direction.cc
@@ -1855,6 +1861,16 @@ libdata/pkgconfig/pangomm-1.4.pc
 %%EXAMPLES%%share/doc/gtkmm-%%API_VERSION%%/examples/book/combobox/text/examplewindow.cc
 %%EXAMPLES%%share/doc/gtkmm-%%API_VERSION%%/examples/book/combobox/text/examplewindow.h
 %%EXAMPLES%%share/doc/gtkmm-%%API_VERSION%%/examples/book/combobox/text/main.cc
+%%EXAMPLES%%share/doc/gtkmm-%%API_VERSION%%/examples/book/custom/custom_container/examplewindow.cc
+%%EXAMPLES%%share/doc/gtkmm-%%API_VERSION%%/examples/book/custom/custom_container/examplewindow.h
+%%EXAMPLES%%share/doc/gtkmm-%%API_VERSION%%/examples/book/custom/custom_container/main.cc
+%%EXAMPLES%%share/doc/gtkmm-%%API_VERSION%%/examples/book/custom/custom_container/mycontainer.cc
+%%EXAMPLES%%share/doc/gtkmm-%%API_VERSION%%/examples/book/custom/custom_container/mycontainer.h
+%%EXAMPLES%%share/doc/gtkmm-%%API_VERSION%%/examples/book/custom/custom_widget/examplewindow.cc
+%%EXAMPLES%%share/doc/gtkmm-%%API_VERSION%%/examples/book/custom/custom_widget/examplewindow.h
+%%EXAMPLES%%share/doc/gtkmm-%%API_VERSION%%/examples/book/custom/custom_widget/main.cc
+%%EXAMPLES%%share/doc/gtkmm-%%API_VERSION%%/examples/book/custom/custom_widget/mywidget.cc
+%%EXAMPLES%%share/doc/gtkmm-%%API_VERSION%%/examples/book/custom/custom_widget/mywidget.h
 %%EXAMPLES%%share/doc/gtkmm-%%API_VERSION%%/examples/book/dialogs/colorselectiondialog/examplewindow.cc
 %%EXAMPLES%%share/doc/gtkmm-%%API_VERSION%%/examples/book/dialogs/colorselectiondialog/examplewindow.h
 %%EXAMPLES%%share/doc/gtkmm-%%API_VERSION%%/examples/book/dialogs/colorselectiondialog/main.cc
@@ -2063,6 +2079,9 @@ libdata/pkgconfig/pangomm-1.4.pc
 %%EXAMPLES%%@dirrm share/doc/gtkmm-%%API_VERSION%%/examples/book/dialogs/filechooserdialog
 %%EXAMPLES%%@dirrm share/doc/gtkmm-%%API_VERSION%%/examples/book/dialogs/colorselectiondialog
 %%EXAMPLES%%@dirrm share/doc/gtkmm-%%API_VERSION%%/examples/book/dialogs
+%%EXAMPLES%%@dirrm share/doc/gtkmm-%%API_VERSION%%/examples/book/custom/custom_container
+%%EXAMPLES%%@dirrm share/doc/gtkmm-%%API_VERSION%%/examples/book/custom/custom_widget
+%%EXAMPLES%%@dirrm share/doc/gtkmm-%%API_VERSION%%/examples/book/custom
 %%EXAMPLES%%@dirrm share/doc/gtkmm-%%API_VERSION%%/examples/book/combobox/text
 %%EXAMPLES%%@dirrm share/doc/gtkmm-%%API_VERSION%%/examples/book/combobox/complex
 %%EXAMPLES%%@dirrm share/doc/gtkmm-%%API_VERSION%%/examples/book/combobox