aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11-toolkits/libgnomeuimm/Makefile3
-rw-r--r--x11-toolkits/libgnomeuimm/distinfo2
-rw-r--r--x11-toolkits/libgnomeuimm/files/patch-libgnome::libgnomeuimm::app-helper.h11
-rw-r--r--x11-toolkits/libgnomeuimm/pkg-plist6
-rw-r--r--x11-toolkits/libgnomeuimm26/Makefile3
-rw-r--r--x11-toolkits/libgnomeuimm26/distinfo2
-rw-r--r--x11-toolkits/libgnomeuimm26/files/patch-libgnome::libgnomeuimm::app-helper.h11
-rw-r--r--x11-toolkits/libgnomeuimm26/pkg-plist6
8 files changed, 10 insertions, 34 deletions
diff --git a/x11-toolkits/libgnomeuimm/Makefile b/x11-toolkits/libgnomeuimm/Makefile
index cd6bc4868e19..3128904ab63a 100644
--- a/x11-toolkits/libgnomeuimm/Makefile
+++ b/x11-toolkits/libgnomeuimm/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libgnomeuimm
-PORTVERSION= 1.3.17
+PORTVERSION= 2.0.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gtkmm
@@ -18,7 +18,6 @@ COMMENT= C++ wrapper for libgnomeui library
LIB_DEPENDS= gnomemm-1.3:${PORTSDIR}/x11/libgnomemm \
gnomecanvasmm-2.0:${PORTSDIR}/graphics/libgnomecanvasmm \
gconfmm-2.0:${PORTSDIR}/devel/gconfmm \
- bonobouimm_servers-1.3:${PORTSDIR}/x11-toolkits/libbonobouimm \
glademm-2.0:${PORTSDIR}/devel/libglademm
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/x11-toolkits/libgnomeuimm/distinfo b/x11-toolkits/libgnomeuimm/distinfo
index 6fb1f4ff0e5f..a2010e3b8b6d 100644
--- a/x11-toolkits/libgnomeuimm/distinfo
+++ b/x11-toolkits/libgnomeuimm/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomeuimm-1.3.17.tar.gz) = a5995db967279da60532e897240aa145
+MD5 (gnome2/libgnomeuimm-2.0.0.tar.gz) = 6869f8a24a8bda1f42b1c66b418b5fe3
diff --git a/x11-toolkits/libgnomeuimm/files/patch-libgnome::libgnomeuimm::app-helper.h b/x11-toolkits/libgnomeuimm/files/patch-libgnome::libgnomeuimm::app-helper.h
deleted file mode 100644
index b475c40cfe5e..000000000000
--- a/x11-toolkits/libgnomeuimm/files/patch-libgnome::libgnomeuimm::app-helper.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgnomeui/libgnomeuimm/app-helper.h.orig Wed Jul 23 11:41:05 2003
-+++ libgnomeui/libgnomeuimm/app-helper.h Wed Jul 23 11:41:37 2003
-@@ -53,7 +53,7 @@
- /*** Derived GnomeUIInfo
- * Note: When deriving this, you must not add any fields or add any virtuals
- */
--class Info : protected GnomeUIInfo
-+class Info : public GnomeUIInfo
- {
- friend class InfoData;
- friend class Array<Info>;
diff --git a/x11-toolkits/libgnomeuimm/pkg-plist b/x11-toolkits/libgnomeuimm/pkg-plist
index 262ef681d2bd..92a22c7f552e 100644
--- a/x11-toolkits/libgnomeuimm/pkg-plist
+++ b/x11-toolkits/libgnomeuimm/pkg-plist
@@ -49,9 +49,9 @@ include/libgnomeuimm-2.0/libgnomeuimm.h
lib/libgnomeuimm-2.0/include/libgnomeuimmconfig.h
lib/libgnomeuimm-2.0/proc/m4/convert.m4
lib/libgnomeuimm-2.0/proc/m4/convert_libgnomeuimm.m4
-lib/libgnomeuimm-1.3.a
-lib/libgnomeuimm-1.3.so
-lib/libgnomeuimm-1.3.so.18
+lib/libgnomeuimm-2.0.a
+lib/libgnomeuimm-2.0.so
+lib/libgnomeuimm-2.0.so.1
libdata/pkgconfig/libgnomeuimm-2.0.pc
@dirrm lib/libgnomeuimm-2.0/include
@dirrm lib/libgnomeuimm-2.0/proc/m4
diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile
index cd6bc4868e19..3128904ab63a 100644
--- a/x11-toolkits/libgnomeuimm26/Makefile
+++ b/x11-toolkits/libgnomeuimm26/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libgnomeuimm
-PORTVERSION= 1.3.17
+PORTVERSION= 2.0.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gtkmm
@@ -18,7 +18,6 @@ COMMENT= C++ wrapper for libgnomeui library
LIB_DEPENDS= gnomemm-1.3:${PORTSDIR}/x11/libgnomemm \
gnomecanvasmm-2.0:${PORTSDIR}/graphics/libgnomecanvasmm \
gconfmm-2.0:${PORTSDIR}/devel/gconfmm \
- bonobouimm_servers-1.3:${PORTSDIR}/x11-toolkits/libbonobouimm \
glademm-2.0:${PORTSDIR}/devel/libglademm
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/x11-toolkits/libgnomeuimm26/distinfo b/x11-toolkits/libgnomeuimm26/distinfo
index 6fb1f4ff0e5f..a2010e3b8b6d 100644
--- a/x11-toolkits/libgnomeuimm26/distinfo
+++ b/x11-toolkits/libgnomeuimm26/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomeuimm-1.3.17.tar.gz) = a5995db967279da60532e897240aa145
+MD5 (gnome2/libgnomeuimm-2.0.0.tar.gz) = 6869f8a24a8bda1f42b1c66b418b5fe3
diff --git a/x11-toolkits/libgnomeuimm26/files/patch-libgnome::libgnomeuimm::app-helper.h b/x11-toolkits/libgnomeuimm26/files/patch-libgnome::libgnomeuimm::app-helper.h
deleted file mode 100644
index b475c40cfe5e..000000000000
--- a/x11-toolkits/libgnomeuimm26/files/patch-libgnome::libgnomeuimm::app-helper.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgnomeui/libgnomeuimm/app-helper.h.orig Wed Jul 23 11:41:05 2003
-+++ libgnomeui/libgnomeuimm/app-helper.h Wed Jul 23 11:41:37 2003
-@@ -53,7 +53,7 @@
- /*** Derived GnomeUIInfo
- * Note: When deriving this, you must not add any fields or add any virtuals
- */
--class Info : protected GnomeUIInfo
-+class Info : public GnomeUIInfo
- {
- friend class InfoData;
- friend class Array<Info>;
diff --git a/x11-toolkits/libgnomeuimm26/pkg-plist b/x11-toolkits/libgnomeuimm26/pkg-plist
index 262ef681d2bd..92a22c7f552e 100644
--- a/x11-toolkits/libgnomeuimm26/pkg-plist
+++ b/x11-toolkits/libgnomeuimm26/pkg-plist
@@ -49,9 +49,9 @@ include/libgnomeuimm-2.0/libgnomeuimm.h
lib/libgnomeuimm-2.0/include/libgnomeuimmconfig.h
lib/libgnomeuimm-2.0/proc/m4/convert.m4
lib/libgnomeuimm-2.0/proc/m4/convert_libgnomeuimm.m4
-lib/libgnomeuimm-1.3.a
-lib/libgnomeuimm-1.3.so
-lib/libgnomeuimm-1.3.so.18
+lib/libgnomeuimm-2.0.a
+lib/libgnomeuimm-2.0.so
+lib/libgnomeuimm-2.0.so.1
libdata/pkgconfig/libgnomeuimm-2.0.pc
@dirrm lib/libgnomeuimm-2.0/include
@dirrm lib/libgnomeuimm-2.0/proc/m4