Update to 2.13.5, and split pangomm out of gtkmm24.

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

7 files changed, 124 insertions, 69 deletions

diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index 102f7a6ee..d3c822ce4 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.33 2008/07/09 20:19:56 marcus Exp $
+#   $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.34 2008/07/18 18:54:22 marcus Exp $
 #
 
 PORTNAME=	gtkmm
-PORTVERSION=	2.13.4
+PORTVERSION=	2.13.5
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -23,11 +23,11 @@ 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
-USE_GCC=	3.4+
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack gtk20
diff --git a/x11-toolkits/gtkmm24/distinfo b/x11-toolkits/gtkmm24/distinfo
index 96a785661..be4f2aa54 100644
--- a/x11-toolkits/gtkmm24/distinfo
+++ b/x11-toolkits/gtkmm24/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtkmm-2.13.4.tar.bz2) = bdd481cc0a3f7918e5db5bb72efc6b6f
-SHA256 (gnome2/gtkmm-2.13.4.tar.bz2) = 39149e7c598bfbe0d8458b944693165d019f82684a6f0a07bcda58c0ccd63973
-SIZE (gnome2/gtkmm-2.13.4.tar.bz2) = 9533259
+MD5 (gnome2/gtkmm-2.13.5.tar.bz2) = 30fa45ec3f9413619c4cc62f3ec4b152
+SHA256 (gnome2/gtkmm-2.13.5.tar.bz2) = f3fa47c9fbaa7275af68d080f1732a07d24828a8f7f3636522d7145f0d92d5d3
+SIZE (gnome2/gtkmm-2.13.5.tar.bz2) = 9419756
diff --git a/x11-toolkits/gtkmm24/pkg-plist b/x11-toolkits/gtkmm24/pkg-plist
index 878b1da96..fea6c20e1 100644
--- a/x11-toolkits/gtkmm24/pkg-plist
+++ b/x11-toolkits/gtkmm24/pkg-plist
@@ -439,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
@@ -513,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%%
diff --git a/x11-toolkits/pangomm/Makefile b/x11-toolkits/pangomm/Makefile
new file mode 100644
index 000000000..6fafb2efb
--- /dev/null
+++ b/x11-toolkits/pangomm/Makefile
@@ -0,0 +1,48 @@
+# New ports collection makefile for:   pangomm
+# Date created:        23 July 2008
+# Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom$
+#
+
+PORTNAME=	pangomm
+PORTVERSION=	2.13.5
+PORTREVISION?=	0
+CATEGORIES=	x11-toolkits
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	C++ wrapper for Pango
+
+USE_BZIP2=	yes
+
+.if !defined(REFERENCE_PORT)
+
+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
+GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
+USE_GNOME=	gnomehack pango
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--disable-demos \
+		--disable-docs \
+		--disable-examples \
+		--enable-static=yes \
+		--with-sigc-prefix=${LOCALBASE}
+
+PLIST_SUB=	VERSION="2.4" API_VERSION="1.4"
+
+post-patch:
+	@${REINPLACE_CMD} -e '/^SUBDIRS =/s/tests//' \
+		${WRKSRC}/Makefile.in
+
+.include <bsd.port.mk>
+
+.endif
diff --git a/x11-toolkits/pangomm/distinfo b/x11-toolkits/pangomm/distinfo
new file mode 100644
index 000000000..7e0d1f0b4
--- /dev/null
+++ b/x11-toolkits/pangomm/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/pangomm-2.13.5.tar.bz2) = 0ced0baee96401162abeae030b366d78
+SHA256 (gnome2/pangomm-2.13.5.tar.bz2) = 27448e39f468d4a3ebcb3480f126a678d1a5ad814811f54419de80e50ebff0c3
+SIZE (gnome2/pangomm-2.13.5.tar.bz2) = 1664382
diff --git a/x11-toolkits/pangomm/pkg-descr b/x11-toolkits/pangomm/pkg-descr
new file mode 100644
index 000000000..1fec3f2b7
--- /dev/null
+++ b/x11-toolkits/pangomm/pkg-descr
@@ -0,0 +1,3 @@
+C++ wrapper for Pango.
+
+WWW: http://gtkmm.sourceforge.net/
diff --git a/x11-toolkits/pangomm/pkg-plist b/x11-toolkits/pangomm/pkg-plist
new file mode 100644
index 000000000..28049094b
--- /dev/null
+++ b/x11-toolkits/pangomm/pkg-plist
@@ -0,0 +1,63 @@
+include/pangomm-%%API_VERSION%%/pangomm.h
+include/pangomm-%%API_VERSION%%/pangomm/attributes.h
+include/pangomm-%%API_VERSION%%/pangomm/attriter.h
+include/pangomm-%%API_VERSION%%/pangomm/attrlist.h
+include/pangomm-%%API_VERSION%%/pangomm/cairofontmap.h
+include/pangomm-%%API_VERSION%%/pangomm/color.h
+include/pangomm-%%API_VERSION%%/pangomm/context.h
+include/pangomm-%%API_VERSION%%/pangomm/coverage.h
+include/pangomm-%%API_VERSION%%/pangomm/font.h
+include/pangomm-%%API_VERSION%%/pangomm/fontdescription.h
+include/pangomm-%%API_VERSION%%/pangomm/fontface.h
+include/pangomm-%%API_VERSION%%/pangomm/fontfamily.h
+include/pangomm-%%API_VERSION%%/pangomm/fontmap.h
+include/pangomm-%%API_VERSION%%/pangomm/fontmetrics.h
+include/pangomm-%%API_VERSION%%/pangomm/fontset.h
+include/pangomm-%%API_VERSION%%/pangomm/glyph.h
+include/pangomm-%%API_VERSION%%/pangomm/glyphstring.h
+include/pangomm-%%API_VERSION%%/pangomm/init.h
+include/pangomm-%%API_VERSION%%/pangomm/item.h
+include/pangomm-%%API_VERSION%%/pangomm/language.h
+include/pangomm-%%API_VERSION%%/pangomm/layout.h
+include/pangomm-%%API_VERSION%%/pangomm/layoutiter.h
+include/pangomm-%%API_VERSION%%/pangomm/layoutline.h
+include/pangomm-%%API_VERSION%%/pangomm/layoutrun.h
+include/pangomm-%%API_VERSION%%/pangomm/private/attributes_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/attriter_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/attrlist_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/cairofontmap_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/color_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/context_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/coverage_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/font_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/fontdescription_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/fontface_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/fontfamily_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/fontmap_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/fontmetrics_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/fontset_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/glyph_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/glyphstring_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/item_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/language_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/layout_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/layoutiter_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/layoutline_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/layoutrun_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/rectangle_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/renderer_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/tabarray_p.h
+include/pangomm-%%API_VERSION%%/pangomm/rectangle.h
+include/pangomm-%%API_VERSION%%/pangomm/renderer.h
+include/pangomm-%%API_VERSION%%/pangomm/tabarray.h
+include/pangomm-%%API_VERSION%%/pangomm/types.h
+include/pangomm-%%API_VERSION%%/pangomm/wrap_init.h
+lib/libpangomm-%%API_VERSION%%.a
+lib/libpangomm-%%API_VERSION%%.la
+lib/libpangomm-%%API_VERSION%%.so
+lib/libpangomm-%%API_VERSION%%.so.1
+lib/pangomm-%%VERSION%%/proc/m4/convert.m4
+lib/pangomm-%%VERSION%%/proc/m4/convert_pango.m4
+libdata/pkgconfig/pangomm-%%API_VERSION%%.pc
+@dirrm include/pangomm-%%API_VERSION%%/pangomm
+@dirrm include/pangomm-%%API_VERSION%%