5 files changed, 42 insertions, 8 deletions

diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index c0bbb145f7e9..497fbb839b46 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -3,14 +3,14 @@
 # Whom:                 		Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/devel/glibmm/Makefile,v 1.1 2006/03/08 14:38:06 marcus Exp $
+#   $MCom: ports/devel/glibmm/Makefile,v 1.31 2006/04/14 21:55:21 mezz Exp $
 #
 
 PORTNAME=	glibmm
-PORTVERSION=	2.8.6
+PORTVERSION=	2.10.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -23,7 +23,6 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GCC=	3.4
 USE_GNOME=	gnomehack gnometarget glib20
-USE_REINPLACE=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo
index df2d47a8388b..1cdf128f8eca 100644
--- a/devel/glibmm/distinfo
+++ b/devel/glibmm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glibmm-2.8.6.tar.bz2) = e5747f4216a80d29f647ad1c05090146
-SHA256 (gnome2/glibmm-2.8.6.tar.bz2) = 26864501770a3ec291c2b4e19c4305dc1634aeb63d85e72cc2021020b9a0c5c1
-SIZE (gnome2/glibmm-2.8.6.tar.bz2) = 2378213
+MD5 (gnome2/glibmm-2.10.1.tar.bz2) = 3af9f4f3dbec200545f1eb21a678706d
+SHA256 (gnome2/glibmm-2.10.1.tar.bz2) = 5e401a2dd369c50c058e6023a2b071d4086328e1930af193e937b91e86859659
+SIZE (gnome2/glibmm-2.10.1.tar.bz2) = 2383901
diff --git a/devel/glibmm/files/patch-glib_glibmm_date.cc b/devel/glibmm/files/patch-glib_glibmm_date.cc
new file mode 100644
index 000000000000..bac31b4c991e
--- /dev/null
+++ b/devel/glibmm/files/patch-glib_glibmm_date.cc
@@ -0,0 +1,17 @@
+--- glib/glibmm/date.cc.orig	Mon Feb  6 00:50:58 2006
++++ glib/glibmm/date.cc	Mon Feb  6 00:51:32 2006
+@@ -72,12 +72,14 @@ void Date::set_parse(const Glib::ustring
+ }
+ 
+ #ifndef GLIBMM_DISABLE_DEPRECATED
++#if GLIB_SIZEOF_LONG != 4 && !defined(__alpha__)
+ 
+ void Date::set_time(GTime time)
+ {
+   //This method, and the C function that it wraps, are deprecated.
+   g_date_set_time(&gobject_, time);
+ }
++#endif
+ #endif // GLIBMM_DISABLE_DEPRECATED
+ 
+ 
diff --git a/devel/glibmm/files/patch-glib_glibmm_date.h b/devel/glibmm/files/patch-glib_glibmm_date.h
new file mode 100644
index 000000000000..0d249931c1d5
--- /dev/null
+++ b/devel/glibmm/files/patch-glib_glibmm_date.h
@@ -0,0 +1,18 @@
+--- glib/glibmm/date.h.orig	Mon Feb  6 00:51:03 2006
++++ glib/glibmm/date.h	Mon Feb  6 00:52:08 2006
+@@ -120,6 +120,7 @@ enum DMY
+   void set_parse (const Glib::ustring& str);
+ 
+   #ifndef GLIBMM_DISABLE_DEPRECATED
++#if GLIB_SIZEOF_LONG != 4 && !defined(__alpha__)
+ 
+   /** Sets the value of a date from a GTime (time_t) value. 
+    *
+@@ -128,6 +129,7 @@ enum DMY
+    * @deprecated Please use set_time(time_t) or set_time(const GTimeVal&).
+    */
+   void set_time(GTime time);
++#endif
+   #endif // GLIBMM_DISABLE_DEPRECATED
+ 
+ 
diff --git a/devel/glibmm/pkg-plist b/devel/glibmm/pkg-plist
index 25dc9e0cbf23..0916b1d62b2b 100644
--- a/devel/glibmm/pkg-plist
+++ b/devel/glibmm/pkg-plist
@@ -133,7 +133,6 @@ share/aclocal/glibmm_check_perl.m4
 %%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Cond-members.html
 %%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Cond.html
 %%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Container__Helpers_1_1ArrayHandleIterator.html
-%%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Container__Helpers_1_1ListHandleIterator-members.html
 %%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Container__Helpers_1_1ListHandleIterator.html
 %%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Container__Helpers_1_1SListHandleIterator.html
 %%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/classGlib_1_1ConvertError-members.html
@@ -427,6 +426,7 @@ share/aclocal/glibmm_check_perl.m4
 %%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/convert_8h.html
 %%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/date_8h.html
 %%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/debug_8h.html
+%%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/deprecated.html
 %%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/dispatcher_8h.html
 %%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/doxygen.css
 %%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/doxygen.png