4 files changed, 18 insertions, 32 deletions
diff --git a/databases/gnome-db/Makefile b/databases/gnome-db/Makefile
index 50c19c6d7c32..6ce21fb3c9aa 100644
--- a/databases/gnome-db/Makefile
+++ b/databases/gnome-db/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/gnome-db/Makefile,v 1.2 2006/09/10 00:51:05 mezz Exp $
+#   $MCom: ports/databases/gnome-db/Makefile,v 1.5 2007/05/19 21:36:00 marcus Exp $
 #
 
 PORTNAME=	gnome-db
 PORTVERSION=	0.2.96
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-db/0.2
diff --git a/databases/gnome-db/files/patch-doc::C::reference::Makefile.in b/databases/gnome-db/files/patch-doc::C::reference::Makefile.in
index b9c8dda0e901..0509e52a6de6 100644
--- a/databases/gnome-db/files/patch-doc::C::reference::Makefile.in
+++ b/databases/gnome-db/files/patch-doc::C::reference::Makefile.in
@@ -7,7 +7,7 @@ $FreeBSD$
  
  
  DOC_MAIN_SGML_FILE = libgnomedb-reference.sgml
--DOC_DIR = $(datadir)/html
+-DOC_DIR = $(datadir)/gnome/html
 +DOC_DIR = $(prefix)/share/doc/gnomedb
  TARGET_DIR = $(DOC_DIR)/libgnomedb-reference
  
diff --git a/databases/gnome-db/files/patch-idl::Makefile.in b/databases/gnome-db/files/patch-idl::Makefile.in
deleted file mode 100644
index da60a4cfbf63..000000000000
--- a/databases/gnome-db/files/patch-idl::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- idl/Makefile.in	2001/07/26 14:06:24	1.1
-+++ idl/Makefile.in	2001/07/26 14:06:37
-@@ -153,7 +153,7 @@
- EXTRA_DIST =  	$(IDL_FILES)
- 
- 
--idldir = $(prefix)/share/idl
-+idldir = $(prefix)/share/gnome/idl
- idl_DATA = $(IDL_FILES)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
diff --git a/databases/gnome-db/pkg-plist b/databases/gnome-db/pkg-plist
index b85a8396e885..9226911f6ed3 100644
--- a/databases/gnome-db/pkg-plist
+++ b/databases/gnome-db/pkg-plist
@@ -118,25 +118,12 @@ share/gnome/help/gnome-db/pt_BR/manager.html
 share/gnome/help/gnome-db/pt_BR/topic.dat
 share/gnome/help/gnome-db/pt_BR/widgetlib-overview.html
 share/gnome/help/gnome-db/pt_BR/widgetlib.html
-share/gnome/idl/GNOME_Database_UI.idl
-share/gnome/oaf/GNOME_DB_Builder.oaf
-share/gnome/oaf/GNOME_DB_ComponentFactory.oaf
-share/gnome/oaf/GNOME_DB_Connection.oaf
-share/gnome/oaf/GNOME_DB_Designer.oaf
-share/gnome/oaf/GNOME_DB_Export.oaf
-share/gnome/oaf/GNOME_DB_Log.oaf
-share/gnome/oaf/GNOME_DB_Manager.oaf
-share/gnome/oaf/GNOME_DB_Monikers.oaf
-share/gnome/omf/gnome-db/gnome-db-C.omf
-share/gnome/omf/gnome-db/gnome-db-es.omf
-share/gnome/omf/gnome-db/gnome-db-it.omf
-share/gnome/omf/gnome-db/gnome-db-pt_BR.omf
-share/gnome/pixmaps/gnome-db.png
 share/gnome/ui/gnomedb-com-connection.xml
 share/gnome/ui/gnomedb-com-designer.xml
 share/gnome/ui/gnomedb-com-log.xml
 share/gnome/ui/gnomedb-fe.xml
 share/gnome/ui/gnomedb-manager.xml
+share/idl/GNOME_Database_UI.idl
 share/locale/az/LC_MESSAGES/gnome-db.mo
 share/locale/ca/LC_MESSAGES/gnome-db.mo
 share/locale/da/LC_MESSAGES/gnome-db.mo
@@ -164,7 +151,20 @@ share/locale/sv/LC_MESSAGES/gnome-db.mo
 share/locale/tr/LC_MESSAGES/gnome-db.mo
 share/locale/uk/LC_MESSAGES/gnome-db.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-db.mo
-@dirrm share/gnome/omf/gnome-db
+share/oaf/GNOME_DB_Builder.oaf
+share/oaf/GNOME_DB_ComponentFactory.oaf
+share/oaf/GNOME_DB_Connection.oaf
+share/oaf/GNOME_DB_Designer.oaf
+share/oaf/GNOME_DB_Export.oaf
+share/oaf/GNOME_DB_Log.oaf
+share/oaf/GNOME_DB_Manager.oaf
+share/oaf/GNOME_DB_Monikers.oaf
+share/omf/gnome-db/gnome-db-C.omf
+share/omf/gnome-db/gnome-db-es.omf
+share/omf/gnome-db/gnome-db-it.omf
+share/omf/gnome-db/gnome-db-pt_BR.omf
+share/pixmaps/gnome-db.png
+@dirrm share/omf/gnome-db
 @dirrm share/gnome/help/gnome-db/pt_BR/images
 @dirrm share/gnome/help/gnome-db/pt_BR
 @dirrm share/gnome/help/gnome-db/it/images