Changes 2.12.7:

* Build: Hopefully fix the build on NetBSD-4.99.6/amd64.

Changes 2.12.6:
* Options: Don't overwrite default arguments. This change was lost in
  March 2006, but now it is back.

5 files changed, 7 insertions, 56 deletions

diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index 1ccfb926778..365f2f899a6 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2007/02/05 19:43:23 adam Exp $
+# $NetBSD: Makefile,v 1.22 2007/03/18 12:51:28 adam Exp $
 
-DISTNAME=	glibmm-2.12.5
+DISTNAME=	glibmm-2.12.7
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/glibmm/2.12/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/glibmm/PLIST b/devel/glibmm/PLIST
index 15e6ee173e5..134eca898cb 100644
--- a/devel/glibmm/PLIST
+++ b/devel/glibmm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2007/01/04 22:12:47 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2007/03/18 12:51:28 adam Exp $
 include/glibmm-2.4/glibmm.h
 include/glibmm-2.4/glibmm/arrayhandle.h
 include/glibmm-2.4/glibmm/class.h
@@ -207,8 +207,6 @@ share/doc/glibmm-2.4/docs/reference/html/classGlib_1_1OptionError.html
 share/doc/glibmm-2.4/docs/reference/html/classGlib_1_1OptionError__inherit__graph.png
 share/doc/glibmm-2.4/docs/reference/html/classGlib_1_1OptionGroup-members.html
 share/doc/glibmm-2.4/docs/reference/html/classGlib_1_1OptionGroup.html
-share/doc/glibmm-2.4/docs/reference/html/classGlib_1_1OptionGroup_1_1CppOptionEntry-members.html
-share/doc/glibmm-2.4/docs/reference/html/classGlib_1_1OptionGroup_1_1CppOptionEntry.html
 share/doc/glibmm-2.4/docs/reference/html/classGlib_1_1PatternSpec-members.html
 share/doc/glibmm-2.4/docs/reference/html/classGlib_1_1PatternSpec.html
 share/doc/glibmm-2.4/docs/reference/html/classGlib_1_1PollFD-members.html
@@ -347,7 +345,6 @@ share/doc/glibmm-2.4/docs/reference/html/classGlib_1_1ValueBase__inherit__graph.
 share/doc/glibmm-2.4/docs/reference/html/classGlib_1_1Value_3_01Glib_1_1ustring_01_4-members.html
 share/doc/glibmm-2.4/docs/reference/html/classGlib_1_1Value_3_01Glib_1_1ustring_01_4.html
 share/doc/glibmm-2.4/docs/reference/html/classGlib_1_1Value_3_01Glib_1_1ustring_01_4__inherit__graph.png
-share/doc/glibmm-2.4/docs/reference/html/classGlib_1_1Value_3_01T_01_5_01_4-members.html
 share/doc/glibmm-2.4/docs/reference/html/classGlib_1_1Value_3_01T_01_5_01_4.html
 share/doc/glibmm-2.4/docs/reference/html/classGlib_1_1Value_3_01T_01_5_01_4__inherit__graph.png
 share/doc/glibmm-2.4/docs/reference/html/classGlib_1_1Value_3_01bool_01_4-members.html
@@ -356,7 +353,6 @@ share/doc/glibmm-2.4/docs/reference/html/classGlib_1_1Value_3_01bool_01_4__inher
 share/doc/glibmm-2.4/docs/reference/html/classGlib_1_1Value_3_01char_01_4-members.html
 share/doc/glibmm-2.4/docs/reference/html/classGlib_1_1Value_3_01char_01_4.html
 share/doc/glibmm-2.4/docs/reference/html/classGlib_1_1Value_3_01char_01_4__inherit__graph.png
-share/doc/glibmm-2.4/docs/reference/html/classGlib_1_1Value_3_01const_01T_01_5_01_4-members.html
 share/doc/glibmm-2.4/docs/reference/html/classGlib_1_1Value_3_01const_01T_01_5_01_4.html
 share/doc/glibmm-2.4/docs/reference/html/classGlib_1_1Value_3_01const_01T_01_5_01_4__inherit__graph.png
 share/doc/glibmm-2.4/docs/reference/html/classGlib_1_1Value_3_01double_01_4-members.html
@@ -417,7 +413,6 @@ share/doc/glibmm-2.4/docs/reference/html/containers_8h.html
 share/doc/glibmm-2.4/docs/reference/html/convert_8h.html
 share/doc/glibmm-2.4/docs/reference/html/date_8h.html
 share/doc/glibmm-2.4/docs/reference/html/debug_8h.html
-share/doc/glibmm-2.4/docs/reference/html/deprecated.html
 share/doc/glibmm-2.4/docs/reference/html/dispatcher_8h.html
 share/doc/glibmm-2.4/docs/reference/html/doxygen.css
 share/doc/glibmm-2.4/docs/reference/html/doxygen.png
@@ -584,7 +579,6 @@ share/doc/glibmm-2.4/docs/reference/html/inherit__graph__52.png
 share/doc/glibmm-2.4/docs/reference/html/inherit__graph__53.png
 share/doc/glibmm-2.4/docs/reference/html/inherit__graph__54.png
 share/doc/glibmm-2.4/docs/reference/html/inherit__graph__55.png
-share/doc/glibmm-2.4/docs/reference/html/inherit__graph__56.png
 share/doc/glibmm-2.4/docs/reference/html/inherit__graph__6.png
 share/doc/glibmm-2.4/docs/reference/html/inherit__graph__7.png
 share/doc/glibmm-2.4/docs/reference/html/inherit__graph__8.png
diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo
index 5674127e73b..3e46bd777f4 100644
--- a/devel/glibmm/distinfo
+++ b/devel/glibmm/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.17 2007/02/05 19:43:23 adam Exp $
+$NetBSD: distinfo,v 1.18 2007/03/18 12:51:28 adam Exp $
 
-SHA1 (glibmm-2.12.5.tar.bz2) = eab7974e19bd796c06fb1f6575cf1bb42581dd6e
-RMD160 (glibmm-2.12.5.tar.bz2) = e78403b11d84abb2abc7a660c9319e6bd86018eb
-Size (glibmm-2.12.5.tar.bz2) = 2343299 bytes
-SHA1 (patch-aa) = 104df3732246838c18c2be93665ac15671da4af8
+SHA1 (glibmm-2.12.7.tar.bz2) = 94785d47a4226d4b5b4621f35d65bc7dbb2b94d6
+RMD160 (glibmm-2.12.7.tar.bz2) = cc5a7cd8762e782b4a3777a15c97f1f2ae63a52d
+Size (glibmm-2.12.7.tar.bz2) = 2529337 bytes
 SHA1 (patch-ab) = 41e6de4c94dfa56ebb2014a103f4815cbfa26693
-SHA1 (patch-ac) = e06a8801376a3e0e014f1dcd032d046a1161c82b
diff --git a/devel/glibmm/patches/patch-aa b/devel/glibmm/patches/patch-aa
deleted file mode 100644
index f8e94cca590..00000000000
--- a/devel/glibmm/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/12/26 11:05:56 wiz Exp $
-
---- glib/glibmm/date.cc.orig	2006-09-21 19:47:43.000000000 +0000
-+++ glib/glibmm/date.cc
-@@ -78,13 +78,14 @@ void Date::set_time(GTime time)
-   //This method, and the C function that it wraps, are deprecated.
-   g_date_set_time(&gobject_, time);
- }
--#endif // GLIBMM_DISABLE_DEPRECATED
-+#else
- 
- 
- void Date::set_time(time_t timet)
- {
-   g_date_set_time_t(&gobject_, timet);
- }
-+#endif // GLIBMM_DISABLE_DEPRECATED
- 
- void Date::set_time_current()
- {
diff --git a/devel/glibmm/patches/patch-ac b/devel/glibmm/patches/patch-ac
deleted file mode 100644
index 3c925fcd597..00000000000
--- a/devel/glibmm/patches/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/12/26 11:05:56 wiz Exp $
-
---- glib/glibmm/date.h.orig	2006-09-21 19:47:43.000000000 +0000
-+++ glib/glibmm/date.h
-@@ -128,7 +128,7 @@ enum DMY
-    * @deprecated Please use set_time(time_t) or set_time(const GTimeVal&).
-    */
-   void set_time(GTime time);
--  #endif // GLIBMM_DISABLE_DEPRECATED
-+  #else
- 
- 
-   /** Sets the value of a date from a <type>time_t</type> value. 
-@@ -140,6 +140,7 @@ enum DMY
-    * Since: 2.10
-    */
-   void set_time(time_t timet);
-+  #endif // GLIBMM_DISABLE_DEPRECATED
- 
-   /** Sets the value of a date from a GTimeVal value.  Note that the
-    * tv_usec member is ignored, because Glib::Date can't make use of the