13 files changed, 52 insertions, 103 deletions

diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index f67e9b38520e..52d1f30f022c 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-libs/Makefile,v 1.2 2006/09/10 00:51:15 mezz Exp $
+#   $MCom: ports/x11/gnome-libs/Makefile,v 1.7 2007/08/04 03:51:32 marcus Exp $
 #
 
 PORTNAME=	gnome-libs
 PORTVERSION=	1.4.2
-PORTREVISION=	7
+PORTREVISION=	10
 CATEGORIES?=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-libs/1.4
@@ -17,8 +17,8 @@ DIST_SUBDIR=	gnome
 MAINTAINER?=	gnome@FreeBSD.org
 COMMENT=	Libraries for GNOME, a GNU desktop environment
 
-BUILD_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
-RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
+BUILD_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
+RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 
 USE_BZIP2=	yes
 USE_XLIB=	yes
diff --git a/x11/gnome-libs/files/patch-aa b/x11/gnome-libs/files/patch-aa
index 1af3d26ce2ef..8ec33082e174 100644
--- a/x11/gnome-libs/files/patch-aa
+++ b/x11/gnome-libs/files/patch-aa
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- configure.orig	Mon Apr 29 12:07:59 2002
 +++ configure	Mon Apr 29 12:08:54 2002
 @@ -5339,6 +5339,7 @@
diff --git a/x11/gnome-libs/files/patch-ad b/x11/gnome-libs/files/patch-ad
deleted file mode 100644
index 32e656859e37..000000000000
--- a/x11/gnome-libs/files/patch-ad
+++ /dev/null
@@ -1,20 +0,0 @@
---- libgnome/gnome-help.c.orig	Thu Apr  8 15:01:21 1999
-+++ libgnome/gnome-help.c	Mon Jul 12 10:29:11 1999
-@@ -69,7 +69,7 @@
- 		lang= language_list->data;
- 		
- 		buf= g_string_new (NULL);
--		g_string_sprintf (buf, "gnome/help/%s/%s/%s", app, lang, path);
-+		g_string_sprintf (buf, "help/%s/%s/%s", app, lang, path);
- 		res= (gchar *)gnome_unconditional_datadir_file (buf->str);
- 		p = strrchr (res, '#');
- 		if (p) {
-@@ -118,7 +118,7 @@
- 	if (!res)
- 	{
- 		buf = g_string_new(NULL);
--		g_string_sprintf(buf, "gnome/help/%s/C/%s", app, path);
-+		g_string_sprintf(buf, "help/%s/C/%s", app, path);
- 		res = (gchar *)gnome_unconditional_datadir_file(buf->str);
- 		g_string_free(buf, TRUE);
- 	}
diff --git a/x11/gnome-libs/files/patch-bb b/x11/gnome-libs/files/patch-bb
index a1daaf14fc52..d6564a00e8c5 100644
--- a/x11/gnome-libs/files/patch-bb
+++ b/x11/gnome-libs/files/patch-bb
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- gtk-xmhtml/Makefile.in.orig	Mon Jan 14 12:02:33 2002
 +++ gtk-xmhtml/Makefile.in	Mon Jan 14 12:03:13 2002
 @@ -151,7 +151,7 @@
diff --git a/x11/gnome-libs/files/patch-bg b/x11/gnome-libs/files/patch-bg
index 401724e01ed0..87aecf289d82 100644
--- a/x11/gnome-libs/files/patch-bg
+++ b/x11/gnome-libs/files/patch-bg
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- zvt/Makefile.in.orig	Sat Apr  6 19:22:07 2002
 +++ zvt/Makefile.in	Sat Apr  6 19:23:02 2002
 @@ -20,7 +20,7 @@
diff --git a/x11/gnome-libs/files/patch-bi b/x11/gnome-libs/files/patch-bi
index dd39ef04d88e..3b2325030f35 100644
--- a/x11/gnome-libs/files/patch-bi
+++ b/x11/gnome-libs/files/patch-bi
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- libart_lgpl/Makefile.in.orig	Sun Jun 23 11:41:23 2002
 +++ libart_lgpl/Makefile.in	Sun Jun 23 11:42:23 2002
 @@ -145,7 +145,7 @@
diff --git a/x11/gnome-libs/files/patch-devel-docs::gnome::Makefile.in b/x11/gnome-libs/files/patch-devel-docs::gnome::Makefile.in
index b98c5295317b..17709b79f18f 100644
--- a/x11/gnome-libs/files/patch-devel-docs::gnome::Makefile.in
+++ b/x11/gnome-libs/files/patch-devel-docs::gnome::Makefile.in
@@ -1,13 +1,10 @@
-
-$FreeBSD$
-
 --- devel-docs/gnome/Makefile.in	2002/05/01 01:47:18	1.1
 +++ devel-docs/gnome/Makefile.in	2002/05/01 01:50:40
 @@ -158,7 +158,7 @@
  # The directory containing the source code (if it contains documentation).
  DOC_SOURCE_DIR = $(GNOME_LIBS_DIR)/libgnome
  
--HTML_DIR = $(datadir)/html
+-HTML_DIR = $(datadir)/gnome/html
 +HTML_DIR = $(prefix)/share/doc/gnomelibs
  
  TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
diff --git a/x11/gnome-libs/files/patch-devel-docs::gnomeui::Makefile.in b/x11/gnome-libs/files/patch-devel-docs::gnomeui::Makefile.in
index 9266154be01a..de8b5960f7c1 100644
--- a/x11/gnome-libs/files/patch-devel-docs::gnomeui::Makefile.in
+++ b/x11/gnome-libs/files/patch-devel-docs::gnomeui::Makefile.in
@@ -1,13 +1,10 @@
-
-$FreeBSD$
-
 --- devel-docs/gnomeui/Makefile.in	2002/05/01 01:47:18	1.1
 +++ devel-docs/gnomeui/Makefile.in	2002/05/01 01:50:55
 @@ -161,7 +161,7 @@
  CFLAGS = `gnome-config --cflags gnomeui`
  LDFLAGS = `gnome-config --libs gnomeui`
  
--HTML_DIR = $(datadir)/html
+-HTML_DIR = $(datadir)/gnome/html
 +HTML_DIR = $(prefix)/share/doc/gnomelibs
  
  TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
diff --git a/x11/gnome-libs/files/patch-devel-docs::gnorba::Makefile.in b/x11/gnome-libs/files/patch-devel-docs::gnorba::Makefile.in
index e7cc10f89a6b..e5a6981cdb86 100644
--- a/x11/gnome-libs/files/patch-devel-docs::gnorba::Makefile.in
+++ b/x11/gnome-libs/files/patch-devel-docs::gnorba::Makefile.in
@@ -1,13 +1,10 @@
-
-$FreeBSD$
-
 --- devel-docs/gnorba/Makefile.in	2002/05/01 01:47:18	1.1
 +++ devel-docs/gnorba/Makefile.in	2002/05/01 01:51:15
 @@ -158,7 +158,7 @@
  # The directory containing the source code (if it contains documentation).
  DOC_SOURCE_DIR = $(GNOME_LIBS_DIR)/libgnorba
  
--HTML_DIR = $(datadir)/html
+-HTML_DIR = $(datadir)/gnome/html
 +HTML_DIR = $(prefix)/share/doc/gnomelibs
  
  TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
diff --git a/x11/gnome-libs/files/patch-devel-docs::zvt::Makefile.in b/x11/gnome-libs/files/patch-devel-docs::zvt::Makefile.in
index c03007ea3a2d..60b6affec183 100644
--- a/x11/gnome-libs/files/patch-devel-docs::zvt::Makefile.in
+++ b/x11/gnome-libs/files/patch-devel-docs::zvt::Makefile.in
@@ -1,13 +1,10 @@
-
-$FreeBSD$
-
 --- devel-docs/zvt/Makefile.in	2002/05/01 01:47:18	1.1
 +++ devel-docs/zvt/Makefile.in	2002/05/01 01:51:06
 @@ -158,7 +158,7 @@
  # The directory containing the source code (if it contains documentation).
  DOC_SOURCE_DIR = $(GNOME_LIBS_DIR)/zvt
  
--HTML_DIR = $(datadir)/html
+-HTML_DIR = $(datadir)/gnome/html
 +HTML_DIR = $(prefix)/share/doc/gnomelibs
  
  TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
diff --git a/x11/gnome-libs/files/patch-libart_lgpl::configure b/x11/gnome-libs/files/patch-libart_lgpl::configure
index 2ee4ceb2e6b1..2f4ef6723578 100644
--- a/x11/gnome-libs/files/patch-libart_lgpl::configure
+++ b/x11/gnome-libs/files/patch-libart_lgpl::configure
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- libart_lgpl/configure	2002/04/29 09:45:17	1.1
 +++ libart_lgpl/configure	2002/04/29 09:45:37
 @@ -5090,6 +5090,7 @@
diff --git a/x11/gnome-libs/files/patch-po::Makefile.in.in b/x11/gnome-libs/files/patch-po::Makefile.in.in
index 68b6a8c98491..8cd933b46112 100644
--- a/x11/gnome-libs/files/patch-po::Makefile.in.in
+++ b/x11/gnome-libs/files/patch-po::Makefile.in.in
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- po/Makefile.in.in	2002/01/14 11:02:35	1.1
 +++ po/Makefile.in.in	2002/01/14 11:02:49
 @@ -106,7 +106,7 @@
diff --git a/x11/gnome-libs/pkg-plist b/x11/gnome-libs/pkg-plist
index bf413271bf18..64c3256df41a 100644
--- a/x11/gnome-libs/pkg-plist
+++ b/x11/gnome-libs/pkg-plist
@@ -382,30 +382,30 @@ share/doc/libart/problems.html
 share/doc/libart/sample-display.html
 share/doc/libart/sample.html
 share/doc/libart/x35.html
-share/gnome/doc/gnome-doc
-share/gnome/doc/gnome-doc.1
-share/gnome/doc/gnome-doc.el
-share/gnome/doc/gnome-mkstub.1
-share/gnome/doc/mkstub
-share/gnome/gtkrc
-share/gnome/gtkrc.el
-share/gnome/gtkrc.eo
-share/gnome/gtkrc.he
-share/gnome/gtkrc.hy
-share/gnome/gtkrc.iso88592
-share/gnome/gtkrc.iso88595
-share/gnome/gtkrc.ja
-share/gnome/gtkrc.ka_GE.georgianacademy
-share/gnome/gtkrc.ka_GE.georgianps
-share/gnome/gtkrc.ko
-share/gnome/gtkrc.ru
-share/gnome/gtkrc.th
-share/gnome/gtkrc.tr
-share/gnome/gtkrc.uk
-share/gnome/gtkrc.vi_VN.tcvn
-share/gnome/gtkrc.vi_VN.viscii
-share/gnome/gtkrc.zh_CN
-share/gnome/gtkrc.zh_TW.Big5
+share/doc/gnome-doc
+share/doc/gnome-doc.1
+share/doc/gnome-doc.el
+share/doc/gnome-mkstub.1
+share/doc/mkstub
+share/gtkrc
+share/gtkrc.el
+share/gtkrc.eo
+share/gtkrc.he
+share/gtkrc.hy
+share/gtkrc.iso88592
+share/gtkrc.iso88595
+share/gtkrc.ja
+share/gtkrc.ka_GE.georgianacademy
+share/gtkrc.ka_GE.georgianps
+share/gtkrc.ko
+share/gtkrc.ru
+share/gtkrc.th
+share/gtkrc.tr
+share/gtkrc.uk
+share/gtkrc.vi_VN.tcvn
+share/gtkrc.vi_VN.viscii
+share/gtkrc.zh_CN
+share/gtkrc.zh_TW.Big5
 share/gnome/help/gnome-dev-info/C/addauth.html
 share/gnome/help/gnome-dev-info/C/altpol.html
 share/gnome/help/gnome-dev-info/C/arch.html
@@ -485,25 +485,25 @@ share/gnome/help/gnome-dev-info/C/x1453.html
 share/gnome/help/gnome-dev-info/C/x2161.html
 share/gnome/help/gnome-dev-info/C/x2674.html
 share/gnome/help/gnome-dev-info/C/x671.html
-share/gnome/idl/GnomeObject.idl
-share/gnome/idl/Table.idl
-share/gnome/idl/desktop-editor.idl
-share/gnome/idl/desktop-textviewer.idl
-share/gnome/idl/gnome-factory.idl
-share/gnome/idl/gnome-unknown.idl
-share/gnome/idl/name-service.idl
-share/gnome/mime-info/gnome.mime
-share/gnome/pixmaps/calculator-font.png
-share/gnome/pixmaps/gnome-default-dlg.png
-share/gnome/pixmaps/gnome-error.png
-share/gnome/pixmaps/gnome-info.png
-share/gnome/pixmaps/gnome-question.png
-share/gnome/pixmaps/gnome-warning.png
-share/gnome/pixmaps/no.xpm
-share/gnome/pixmaps/yes.xpm
-share/gnome/type-convert/gnome-make-postscript-mimes
-share/gnome/type-convert/postscript.convert
-share/gnome/type-convert/type.convert
+share/idl/GnomeObject.idl
+share/idl/Table.idl
+share/idl/desktop-editor.idl
+share/idl/desktop-textviewer.idl
+share/idl/gnome-factory.idl
+share/idl/gnome-unknown.idl
+share/idl/name-service.idl
+share/mime-info/gnome.mime
+share/pixmaps/calculator-font.png
+share/pixmaps/gnome-default-dlg.png
+share/pixmaps/gnome-error.png
+share/pixmaps/gnome-info.png
+share/pixmaps/gnome-question.png
+share/pixmaps/gnome-warning.png
+share/pixmaps/no.xpm
+share/pixmaps/yes.xpm
+share/type-convert/gnome-make-postscript-mimes
+share/type-convert/postscript.convert
+share/type-convert/type.convert
 share/locale/az/LC_MESSAGES/gnome-libs.mo
 share/locale/ca/LC_MESSAGES/gnome-libs.mo
 share/locale/cs/LC_MESSAGES/gnome-libs.mo
@@ -546,10 +546,9 @@ share/locale/vi/LC_MESSAGES/gnome-libs.mo
 share/locale/wa/LC_MESSAGES/gnome-libs.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-libs.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-libs.mo
-@dirrm share/gnome/type-convert
+@dirrm share/type-convert
 @dirrm share/gnome/help/gnome-dev-info/C
 @dirrm share/gnome/help/gnome-dev-info
-@dirrm share/gnome/doc
 @dirrm share/doc/libart
 @dirrm %%DOCSDIR%%/zvt
 @dirrm %%DOCSDIR%%/gnorba