* Consolidate some GNOME components and add some new functionality

* Adjust PLIST accordingly

PR:		64820
Submitted by:	mike johnson <ahze@ahze.net>

8 files changed, 24 insertions, 4 deletions

diff --git a/x11-toolkits/gtk-sharp-devel/Makefile b/x11-toolkits/gtk-sharp-devel/Makefile
index fd3d07bbd24d..cfad7dfdda33 100644
--- a/x11-toolkits/gtk-sharp-devel/Makefile
+++ b/x11-toolkits/gtk-sharp-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtk-sharp
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtk-sharp
@@ -22,7 +23,7 @@ USE_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack libgda2 libgnomeui libgnomedb libgtkhtml vte
+USE_GNOME=	gnomehack libgnomedb gtkhtml3 vte
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|lib/pkgconfig|libdata/pkgconfig|g' \
diff --git a/x11-toolkits/gtk-sharp-devel/pkg-plist b/x11-toolkits/gtk-sharp-devel/pkg-plist
index 2bae159f3a66..76c9a84f8fdc 100644
--- a/x11-toolkits/gtk-sharp-devel/pkg-plist
+++ b/x11-toolkits/gtk-sharp-devel/pkg-plist
@@ -20,8 +20,10 @@ lib/glib-sharp.dll
 lib/gnome-sharp.dll
 lib/gnomedb-sharp.dll
 lib/gtk-sharp.dll
+lib/gtkhtml-sharp.dll
 lib/libgtksharpglue.so
 lib/pango-sharp.dll
+lib/rsvg-sharp.dll
 lib/vte-sharp.dll
 libdata/pkgconfig/gapi.pc
 libdata/pkgconfig/gtk-sharp.pc
@@ -36,7 +38,9 @@ share/gapi/gnome-api.xml
 share/gapi/gnomedb-api.xml
 share/gapi/gtk-api.xml
 share/gapi/gtk-symbols.xml
+share/gapi/gtkhtml-api.xml
 share/gapi/pango-api.xml
+share/gapi/rsvg-api.xml
 share/gapi/vte-api.xml
 share/perl5/GAPI/Metadata.pm
 @dirrm share/perl5/GAPI
diff --git a/x11-toolkits/gtk-sharp/Makefile b/x11-toolkits/gtk-sharp/Makefile
index fd3d07bbd24d..cfad7dfdda33 100644
--- a/x11-toolkits/gtk-sharp/Makefile
+++ b/x11-toolkits/gtk-sharp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtk-sharp
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtk-sharp
@@ -22,7 +23,7 @@ USE_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack libgda2 libgnomeui libgnomedb libgtkhtml vte
+USE_GNOME=	gnomehack libgnomedb gtkhtml3 vte
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|lib/pkgconfig|libdata/pkgconfig|g' \
diff --git a/x11-toolkits/gtk-sharp/pkg-plist b/x11-toolkits/gtk-sharp/pkg-plist
index 2bae159f3a66..76c9a84f8fdc 100644
--- a/x11-toolkits/gtk-sharp/pkg-plist
+++ b/x11-toolkits/gtk-sharp/pkg-plist
@@ -20,8 +20,10 @@ lib/glib-sharp.dll
 lib/gnome-sharp.dll
 lib/gnomedb-sharp.dll
 lib/gtk-sharp.dll
+lib/gtkhtml-sharp.dll
 lib/libgtksharpglue.so
 lib/pango-sharp.dll
+lib/rsvg-sharp.dll
 lib/vte-sharp.dll
 libdata/pkgconfig/gapi.pc
 libdata/pkgconfig/gtk-sharp.pc
@@ -36,7 +38,9 @@ share/gapi/gnome-api.xml
 share/gapi/gnomedb-api.xml
 share/gapi/gtk-api.xml
 share/gapi/gtk-symbols.xml
+share/gapi/gtkhtml-api.xml
 share/gapi/pango-api.xml
+share/gapi/rsvg-api.xml
 share/gapi/vte-api.xml
 share/perl5/GAPI/Metadata.pm
 @dirrm share/perl5/GAPI
diff --git a/x11-toolkits/gtk-sharp10/Makefile b/x11-toolkits/gtk-sharp10/Makefile
index fd3d07bbd24d..cfad7dfdda33 100644
--- a/x11-toolkits/gtk-sharp10/Makefile
+++ b/x11-toolkits/gtk-sharp10/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtk-sharp
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtk-sharp
@@ -22,7 +23,7 @@ USE_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack libgda2 libgnomeui libgnomedb libgtkhtml vte
+USE_GNOME=	gnomehack libgnomedb gtkhtml3 vte
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|lib/pkgconfig|libdata/pkgconfig|g' \
diff --git a/x11-toolkits/gtk-sharp10/pkg-plist b/x11-toolkits/gtk-sharp10/pkg-plist
index 2bae159f3a66..76c9a84f8fdc 100644
--- a/x11-toolkits/gtk-sharp10/pkg-plist
+++ b/x11-toolkits/gtk-sharp10/pkg-plist
@@ -20,8 +20,10 @@ lib/glib-sharp.dll
 lib/gnome-sharp.dll
 lib/gnomedb-sharp.dll
 lib/gtk-sharp.dll
+lib/gtkhtml-sharp.dll
 lib/libgtksharpglue.so
 lib/pango-sharp.dll
+lib/rsvg-sharp.dll
 lib/vte-sharp.dll
 libdata/pkgconfig/gapi.pc
 libdata/pkgconfig/gtk-sharp.pc
@@ -36,7 +38,9 @@ share/gapi/gnome-api.xml
 share/gapi/gnomedb-api.xml
 share/gapi/gtk-api.xml
 share/gapi/gtk-symbols.xml
+share/gapi/gtkhtml-api.xml
 share/gapi/pango-api.xml
+share/gapi/rsvg-api.xml
 share/gapi/vte-api.xml
 share/perl5/GAPI/Metadata.pm
 @dirrm share/perl5/GAPI
diff --git a/x11-toolkits/gtk-sharp20/Makefile b/x11-toolkits/gtk-sharp20/Makefile
index fd3d07bbd24d..cfad7dfdda33 100644
--- a/x11-toolkits/gtk-sharp20/Makefile
+++ b/x11-toolkits/gtk-sharp20/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtk-sharp
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtk-sharp
@@ -22,7 +23,7 @@ USE_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack libgda2 libgnomeui libgnomedb libgtkhtml vte
+USE_GNOME=	gnomehack libgnomedb gtkhtml3 vte
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|lib/pkgconfig|libdata/pkgconfig|g' \
diff --git a/x11-toolkits/gtk-sharp20/pkg-plist b/x11-toolkits/gtk-sharp20/pkg-plist
index 2bae159f3a66..76c9a84f8fdc 100644
--- a/x11-toolkits/gtk-sharp20/pkg-plist
+++ b/x11-toolkits/gtk-sharp20/pkg-plist
@@ -20,8 +20,10 @@ lib/glib-sharp.dll
 lib/gnome-sharp.dll
 lib/gnomedb-sharp.dll
 lib/gtk-sharp.dll
+lib/gtkhtml-sharp.dll
 lib/libgtksharpglue.so
 lib/pango-sharp.dll
+lib/rsvg-sharp.dll
 lib/vte-sharp.dll
 libdata/pkgconfig/gapi.pc
 libdata/pkgconfig/gtk-sharp.pc
@@ -36,7 +38,9 @@ share/gapi/gnome-api.xml
 share/gapi/gnomedb-api.xml
 share/gapi/gtk-api.xml
 share/gapi/gtk-symbols.xml
+share/gapi/gtkhtml-api.xml
 share/gapi/pango-api.xml
+share/gapi/rsvg-api.xml
 share/gapi/vte-api.xml
 share/perl5/GAPI/Metadata.pm
 @dirrm share/perl5/GAPI