Update to 1.2.4.

7 files changed, 5 insertions, 85 deletions

diff --git a/x11-toolkits/gnome--/Makefile b/x11-toolkits/gnome--/Makefile
index 20ea20a1d49b..36e421633fca 100644
--- a/x11-toolkits/gnome--/Makefile
+++ b/x11-toolkits/gnome--/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomemm
-PORTVERSION=	1.2.2
+PORTVERSION=	1.2.4
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnomemm/1.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.2
 #DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/gnome--/distinfo b/x11-toolkits/gnome--/distinfo
index bc95618c744e..dcd72fcc2636 100644
--- a/x11-toolkits/gnome--/distinfo
+++ b/x11-toolkits/gnome--/distinfo
@@ -1 +1 @@
-MD5 (gnomemm-1.2.2.tar.bz2) = 22d2460dbb083dfc0de2e94b6365fb3a
+MD5 (gnomemm-1.2.4.tar.bz2) = 13e2351b16376292771ed277a6866a2b
diff --git a/x11-toolkits/gnome--/files/patch-src::app.gen_h b/x11-toolkits/gnome--/files/patch-src::app.gen_h
deleted file mode 100644
index ae09d697a140..000000000000
--- a/x11-toolkits/gnome--/files/patch-src::app.gen_h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-$FreeBSD$
-
---- src/app.gen_h	2002/07/16 15:29:22	1.1
-+++ src/app.gen_h	2002/07/16 15:32:17
-@@ -442,13 +442,13 @@
-     return w;
-   }
- 
--App::Progress App::progress(const Gtk::string &description, Callback cancel=0)
-+App::Progress App::progress(const Gtk::string &description, Callback cancel)
-   {
-     return Progress(*this,  description, cancel);
-   }
- 
- App::Progress App::progress(const Gtk::string &description, guint32 interval,
--                    ProgressCallback percent, Callback cancel=0)
-+                    ProgressCallback percent, Callback cancel)
-   {
-     return Progress(*this,  description, interval, percent, cancel);
-   }
-@@ -490,7 +490,7 @@
- 
- Progress::Progress(Gnome::App& app, 
-                    const Gtk::string &description, 
--                   Cancel cancel=0)
-+                   Cancel cancel)
-   {
-     ProgressCallbackData *data=new ProgressCallbackData();
-     data->cancel=cancel;
-@@ -505,7 +505,7 @@
-                    const Gtk::string &description, 
-                    guint32 interval,
-                    Update percent, 
--                   Cancel cancel=0)
-+                   Cancel cancel)
-   {
-     ProgressCallbackData *data=new ProgressCallbackData();
-     data->cancel=cancel;
diff --git a/x11-toolkits/gnome--/files/patch-src::clock.gen_h b/x11-toolkits/gnome--/files/patch-src::clock.gen_h
deleted file mode 100644
index 7e7db036597a..000000000000
--- a/x11-toolkits/gnome--/files/patch-src::clock.gen_h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/clock.gen_h	2002/07/16 15:34:29	1.1
-+++ src/clock.gen_h	2002/07/16 15:34:40
-@@ -104,7 +104,7 @@
- #include <gnome--/private/clock_p.h>
- #include <gnome--/construct_copies.h>
- 
--Gtk::Clock::Clock(Type type = REALTIME)
-+Gtk::Clock::Clock(Type type)
-   : Gtk::Label(GTK_LABEL(gtk_object_new(get_type(),0)))
- {
-   initialize_class();
diff --git a/x11-toolkits/gnome--/files/patch-src::gnome--::affinetrans.cc b/x11-toolkits/gnome--/files/patch-src::gnome--::affinetrans.cc
deleted file mode 100644
index 537ff0362d7f..000000000000
--- a/x11-toolkits/gnome--/files/patch-src::gnome--::affinetrans.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/gnome--/affinetrans.cc	2002/07/16 10:11:14	1.1
-+++ src/gnome--/affinetrans.cc	2002/07/16 10:13:14
-@@ -29,7 +29,7 @@
- namespace Art
- {
- 
--AffineTrans::AffineTrans(gdouble scale = 1.0)
-+AffineTrans::AffineTrans(gdouble scale)
- {
-   trans_[0] = scale;
-   trans_[1] = 0.0;
diff --git a/x11-toolkits/gnome--/files/patch-src::icon-item.gen_h b/x11-toolkits/gnome--/files/patch-src::icon-item.gen_h
deleted file mode 100644
index 43a87362e613..000000000000
--- a/x11-toolkits/gnome--/files/patch-src::icon-item.gen_h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/icon-item.gen_h	2002/07/16 15:35:39	1.1
-+++ src/icon-item.gen_h	2002/07/16 15:35:50
-@@ -101,7 +101,7 @@
- void Gnome::IconTextItem::configure(int x, int y, int width,
- 			      const Gtk::string &fontname,
- 			      const Gtk::string &text,
--			      bool is_editable = true)
-+			      bool is_editable)
- {
-   gnome_icon_text_item_configure(gtkobj(), x, y, width,
-                                  fontname.c_str(), text.c_str(),
diff --git a/x11-toolkits/gnome--/pkg-plist b/x11-toolkits/gnome--/pkg-plist
index ec854e16e11f..a653ff09a675 100644
--- a/x11-toolkits/gnome--/pkg-plist
+++ b/x11-toolkits/gnome--/pkg-plist
@@ -118,7 +118,8 @@ include/gnome--/stock.h
 include/gnome--/types.h
 lib/libgnomemm.a
 lib/libgnomemm.so
-lib/libgnomemm.so.9
+lib/libgnomemm-1.2.so
+lib/libgnomemm-1.2.so.10
 share/aclocal/gnome--.m4
 @dirrm include/gnome--/private
 @dirrm include/gnome--