aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--accessibility/at-spi/Makefile5
-rw-r--r--accessibility/at-spi/pkg-plist46
-rw-r--r--print/libgnomeprint/Makefile6
-rw-r--r--print/libgnomeprint/pkg-plist38
-rw-r--r--x11-toolkits/at-spi/Makefile5
-rw-r--r--x11-toolkits/at-spi/pkg-plist46
-rw-r--r--x11-toolkits/libbonoboui/Makefile5
-rw-r--r--x11-toolkits/libbonoboui/pkg-plist6
-rw-r--r--x11-toolkits/libgail-gnome/Makefile6
-rw-r--r--x11-toolkits/libgnomeprintui/Makefile6
-rw-r--r--x11-toolkits/libgnomeui/Makefile5
-rw-r--r--x11-toolkits/libgnomeui/pkg-plist14
-rw-r--r--x11-toolkits/libzvt/Makefile5
-rw-r--r--x11/gnome-desktop/Makefile5
-rw-r--r--x11/gnome-desktop/pkg-plist314
-rw-r--r--x11/gnomedesktop/Makefile5
-rw-r--r--x11/gnomedesktop/pkg-plist314
-rw-r--r--x11/libgnome/Makefile5
-rw-r--r--x11/libgnome/pkg-plist12
19 files changed, 428 insertions, 420 deletions
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index 36402702a452..4d980d383ba5 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -7,6 +7,7 @@
PORTNAME= at-spi
PORTVERSION= 0.12.1
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta4
@@ -22,8 +23,8 @@ USE_GMAKE= yes
USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome2 \
- --datadir=${PREFIX}/share/gnome2 \
+CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
+ --datadir=${PREFIX}/share/gnome \
--with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc \
--enable-static
diff --git a/accessibility/at-spi/pkg-plist b/accessibility/at-spi/pkg-plist
index 9f6e13fc5666..7c038ce97b40 100644
--- a/accessibility/at-spi/pkg-plist
+++ b/accessibility/at-spi/pkg-plist
@@ -68,29 +68,29 @@ share/doc/at-spi-cspi/spi-accessible.html
share/doc/at-spi-cspi/spi-application.html
share/doc/at-spi-cspi/spi-component.html
share/doc/at-spi-cspi/spi-main.html
-share/gnome2/idl/Magnifier.idl
-share/gnome2/idl/at-spi-1.0/Accessibility.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Accessible.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Action.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Application.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Component.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Desktop.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_EditableText.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Event.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Hyperlink.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Hypertext.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Image.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Registry.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Relation.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Role.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Selection.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_State.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_StreamableContent.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Table.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Text.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Value.idl
-@dirrm share/gnome2/idl/at-spi-1.0
-@dirrm share/gnome2/idl
+share/gnome/idl/Magnifier.idl
+share/gnome/idl/at-spi-1.0/Accessibility.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Accessible.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Action.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Application.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Component.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Desktop.idl
+share/gnome/idl/at-spi-1.0/Accessibility_EditableText.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Event.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Hyperlink.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Hypertext.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Image.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Registry.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Relation.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Role.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Selection.idl
+share/gnome/idl/at-spi-1.0/Accessibility_State.idl
+share/gnome/idl/at-spi-1.0/Accessibility_StreamableContent.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Table.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Text.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Value.idl
+@dirrm share/gnome/idl/at-spi-1.0
+@dirrm share/gnome/idl
@dirrm share/doc/at-spi-cspi
@dirrm lib/orbit-2.0
@dirrm include/at-spi-1.0/libspi
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index b3b2acc8c712..727fd2acd325 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libgnomeprint
PORTVERSION= 1.112.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta4
@@ -24,8 +24,8 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome2 \
- --datadir=${PREFIX}/share/gnome2
+CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
+ --datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist
index 560838b14b7c..036d639935ca 100644
--- a/print/libgnomeprint/pkg-plist
+++ b/print/libgnomeprint/pkg-plist
@@ -24,17 +24,17 @@ lib/libgnomeprint-2.a
lib/libgnomeprint-2.so
lib/libgnomeprint-2.so.0
libdata/pkgconfig/libgnomeprint-2.0.pc
-share/gnome2/fonts/README.installer
-share/gnome2/gnome-print-2.0/media/media.xml
-share/gnome2/gnome-print-2.0/models/GNOME-GENERIC-PS.model
-share/gnome2/gnome-print-2.0/models/HP-LASERJET-4ML.model
-share/gnome2/gnome-print-2.0/models/STYLUS-COLOR-740.model
-share/gnome2/gnome-print-2.0/printers/GENERIC.printer
-share/gnome2/gnome-print-2.0/vendors/EPSON.vendor
-share/gnome2/gnome-print-2.0/vendors/GNOME.vendor
-share/gnome2/gnome-print-2.0/vendors/HP.vendor
-share/gnome2/libgnomeprint-2.0/fonts/adobe-urw.font
-share/gnome2/libgnomeprint-2.0/fonts/defaults.fontmap
+share/gnome/fonts/README.installer
+share/gnome/gnome-print-2.0/media/media.xml
+share/gnome/gnome-print-2.0/models/GNOME-GENERIC-PS.model
+share/gnome/gnome-print-2.0/models/HP-LASERJET-4ML.model
+share/gnome/gnome-print-2.0/models/STYLUS-COLOR-740.model
+share/gnome/gnome-print-2.0/printers/GENERIC.printer
+share/gnome/gnome-print-2.0/vendors/EPSON.vendor
+share/gnome/gnome-print-2.0/vendors/GNOME.vendor
+share/gnome/gnome-print-2.0/vendors/HP.vendor
+share/gnome/libgnomeprint-2.0/fonts/adobe-urw.font
+share/gnome/libgnomeprint-2.0/fonts/defaults.fontmap
share/locale/az/LC_MESSAGES/libgnomeprint-2.0.mo
share/locale/ca/LC_MESSAGES/libgnomeprint-2.0.mo
share/locale/es/LC_MESSAGES/libgnomeprint-2.0.mo
@@ -56,14 +56,14 @@ share/locale/uk/LC_MESSAGES/libgnomeprint-2.0.mo
share/locale/wa/LC_MESSAGES/libgnomeprint-2.0.mo
share/locale/zh_CN/LC_MESSAGES/libgnomeprint-2.0.mo
share/locale/zh_TW/LC_MESSAGES/libgnomeprint-2.0.mo
-@dirrm share/gnome2/libgnomeprint-2.0/fonts
-@dirrm share/gnome2/libgnomeprint-2.0
-@dirrm share/gnome2/gnome-print-2.0/vendors
-@dirrm share/gnome2/gnome-print-2.0/printers
-@dirrm share/gnome2/gnome-print-2.0/models
-@dirrm share/gnome2/gnome-print-2.0/media
-@dirrm share/gnome2/gnome-print-2.0
-@dirrm share/gnome2/fonts
+@dirrm share/gnome/libgnomeprint-2.0/fonts
+@dirrm share/gnome/libgnomeprint-2.0
+@dirrm share/gnome/gnome-print-2.0/vendors
+@dirrm share/gnome/gnome-print-2.0/printers
+@dirrm share/gnome/gnome-print-2.0/models
+@dirrm share/gnome/gnome-print-2.0/media
+@dirrm share/gnome/gnome-print-2.0
+@dirrm share/gnome/fonts
@dirrm lib/gnome-print-2.0/transports
@dirrm lib/gnome-print-2.0/drivers
@dirrm lib/gnome-print-2.0
diff --git a/x11-toolkits/at-spi/Makefile b/x11-toolkits/at-spi/Makefile
index 36402702a452..4d980d383ba5 100644
--- a/x11-toolkits/at-spi/Makefile
+++ b/x11-toolkits/at-spi/Makefile
@@ -7,6 +7,7 @@
PORTNAME= at-spi
PORTVERSION= 0.12.1
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta4
@@ -22,8 +23,8 @@ USE_GMAKE= yes
USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome2 \
- --datadir=${PREFIX}/share/gnome2 \
+CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
+ --datadir=${PREFIX}/share/gnome \
--with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc \
--enable-static
diff --git a/x11-toolkits/at-spi/pkg-plist b/x11-toolkits/at-spi/pkg-plist
index 9f6e13fc5666..7c038ce97b40 100644
--- a/x11-toolkits/at-spi/pkg-plist
+++ b/x11-toolkits/at-spi/pkg-plist
@@ -68,29 +68,29 @@ share/doc/at-spi-cspi/spi-accessible.html
share/doc/at-spi-cspi/spi-application.html
share/doc/at-spi-cspi/spi-component.html
share/doc/at-spi-cspi/spi-main.html
-share/gnome2/idl/Magnifier.idl
-share/gnome2/idl/at-spi-1.0/Accessibility.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Accessible.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Action.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Application.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Component.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Desktop.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_EditableText.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Event.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Hyperlink.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Hypertext.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Image.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Registry.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Relation.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Role.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Selection.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_State.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_StreamableContent.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Table.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Text.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Value.idl
-@dirrm share/gnome2/idl/at-spi-1.0
-@dirrm share/gnome2/idl
+share/gnome/idl/Magnifier.idl
+share/gnome/idl/at-spi-1.0/Accessibility.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Accessible.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Action.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Application.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Component.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Desktop.idl
+share/gnome/idl/at-spi-1.0/Accessibility_EditableText.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Event.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Hyperlink.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Hypertext.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Image.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Registry.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Relation.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Role.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Selection.idl
+share/gnome/idl/at-spi-1.0/Accessibility_State.idl
+share/gnome/idl/at-spi-1.0/Accessibility_StreamableContent.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Table.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Text.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Value.idl
+@dirrm share/gnome/idl/at-spi-1.0
+@dirrm share/gnome/idl
@dirrm share/doc/at-spi-cspi
@dirrm lib/orbit-2.0
@dirrm include/at-spi-1.0/libspi
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index f71ae7c2189b..3f741bd7a869 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libbonoboui
PORTVERSION= 1.115.0
+PORTREVISION= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta4
@@ -22,8 +23,8 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome2 \
- --datadir=${PREFIX}/share/gnome2
+CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
+ --datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist
index a2a7f1139b21..64e394a3eb2e 100644
--- a/x11-toolkits/libbonoboui/pkg-plist
+++ b/x11-toolkits/libbonoboui/pkg-plist
@@ -39,7 +39,7 @@ lib/libbonoboui-2.so.0
lib/libglade/2.0/libbonobo.so
libdata/bonobo/servers/Bonobo_Sample_Controls.server
libdata/pkgconfig/libbonoboui-2.0.pc
-share/gnome2/gnome-2.0/ui/Bonobo_Sample_Hello.xml
+share/gnome/gnome-2.0/ui/Bonobo_Sample_Hello.xml
share/locale/az/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/bg/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/ca/LC_MESSAGES/libbonoboui-2.0.mo
@@ -66,7 +66,7 @@ share/locale/uk/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/wa/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/zh_CN/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/zh_TW/LC_MESSAGES/libbonoboui-2.0.mo
-@dirrm share/gnome2/gnome-2.0/ui
-@dirrm share/gnome2/gnome-2.0
+@dirrm share/gnome/gnome-2.0/ui
+@dirrm share/gnome/gnome-2.0
@dirrm include/libbonoboui-2.0/bonobo
@dirrm include/libbonoboui-2.0
diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile
index 25e7346b104d..098042044608 100644
--- a/x11-toolkits/libgail-gnome/Makefile
+++ b/x11-toolkits/libgail-gnome/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libgail-gnome
PORTVERSION= 0.5.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta4
@@ -23,8 +23,8 @@ USE_GMAKE= yes
USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome2 \
- --datadir=${PREFIX}/share/gnome2 \
+CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
+ --datadir=${PREFIX}/share/gnome \
--with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc \
--enable-static
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index 996fb40e7ec9..6f00d876f4ba 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libgnomeprintui
PORTVERSION= 1.112.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta4
@@ -25,8 +25,8 @@ USE_GMAKE= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
USE_BISON= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome2 \
- --datadir=${PREFIX}/share/gnome2 \
+CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
+ --datadir=${PREFIX}/share/gnome \
--with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index eb9ac45f2a76..fcb138f9cb8b 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libgnomeui
PORTVERSION= 1.115.0
+PORTREVISION= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta4
@@ -23,8 +24,8 @@ USE_GMAKE= yes
INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
USE_BISON= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome2 \
- --datadir=${PREFIX}/share/gnome2 \
+CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
+ --datadir=${PREFIX}/share/gnome \
--with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist
index 2d69de40e06c..362d0a376072 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -117,12 +117,12 @@ share/doc/libgnomeui/libgnomeui-gnomepixmapentry.html
share/doc/libgnomeui/libgnomeui-gnomepropertybox.html
share/doc/libgnomeui/libgnomeui-gnomescores.html
share/doc/libgnomeui/libgnomeui-gnometypebuiltins.html
-share/gnome2/pixmaps/gnome-about-logo.png
-share/gnome2/pixmaps/gnome-default-dlg.png
-share/gnome2/pixmaps/gnome-error.png
-share/gnome2/pixmaps/gnome-info.png
-share/gnome2/pixmaps/gnome-question.png
-share/gnome2/pixmaps/gnome-warning.png
+share/gnome/pixmaps/gnome-about-logo.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/locale/az/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/de/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/en_GB/LC_MESSAGES/libgnomeui-2.0.mo
@@ -152,7 +152,7 @@ share/locale/vi/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/wa/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/zh_CN/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/zh_TW/LC_MESSAGES/libgnomeui-2.0.mo
-@dirrm share/gnome2/pixmaps
+@dirrm share/gnome/pixmaps
@dirrm share/doc/libgnomeui
@dirrm include/libgnomeui-2.0/libgnomeui
@dirrm include/libgnomeui-2.0
diff --git a/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile
index 1f6a0c23807b..8af0cb65511e 100644
--- a/x11-toolkits/libzvt/Makefile
+++ b/x11-toolkits/libzvt/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libzvt
PORTVERSION= 1.114.0
+PORTREVISION= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta4
@@ -23,8 +24,8 @@ USE_GMAKE= yes
USE_BISON= yes
INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome2 \
- --datadir=${PREFIX}/share/gnome2
+CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
+ --datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index c13b96395d73..70b18ccc9d2f 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnomedesktop
PORTVERSION= 1.5.17
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta4
@@ -24,8 +25,8 @@ USE_GMAKE= yes
USE_BISON= yes
INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome2 \
- --datadir=${PREFIX}/share/gnome2
+CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
+ --datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index 1e1db57e093d..a1729bbc79a0 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -6,151 +6,151 @@ lib/libgnome-desktop-2.a
lib/libgnome-desktop-2.so
lib/libgnome-desktop-2.so.0
libdata/pkgconfig/gnome-desktop-2.0.pc
-share/gnome2/gnome-about/contributors.dat
-share/gnome2/gnome-about/gnome-version
-share/gnome2/help/fdl/C/fdl.xml
-share/gnome2/help/gpl/C/gpl.xml
-share/gnome2/help/lgpl/C/lgpl.xml
-share/gnome2/vfolders/Accessories.directory
-share/gnome2/vfolders/Applications.directory
-share/gnome2/vfolders/Development.directory
-share/gnome2/vfolders/Games.directory
-share/gnome2/vfolders/Graphics.directory
-share/gnome2/vfolders/Home.directory
-share/gnome2/vfolders/Internet.directory
-share/gnome2/vfolders/Multimedia.directory
-share/gnome2/vfolders/Office.directory
-share/gnome2/vfolders/Root.directory
-share/gnome2/vfolders/Root.order
-share/gnome2/vfolders/Settings.directory
-share/gnome2/vfolders/Settings.order
-share/gnome2/vfolders/System.directory
-share/gnome2/pixmaps/apple-green.png
-share/gnome2/pixmaps/apple-red.png
-share/gnome2/pixmaps/cdeappmenu.png
-share/gnome2/pixmaps/gnome-amusements.png
-share/gnome2/pixmaps/gnome-aorta.png
-share/gnome2/pixmaps/gnome-applets.png
-share/gnome2/pixmaps/gnome-applications.png
-share/gnome2/pixmaps/gnome-audio2.png
-share/gnome2/pixmaps/gnome-background.png
-share/gnome2/pixmaps/gnome-calc2.png
-share/gnome2/pixmaps/gnome-calendar.png
-share/gnome2/pixmaps/gnome-cardgame.png
-share/gnome2/pixmaps/gnome-ccbackground.png
-share/gnome2/pixmaps/gnome-ccdesktop.png
-share/gnome2/pixmaps/gnome-ccdialog.png
-share/gnome2/pixmaps/gnome-cckeyboard-bell.png
-share/gnome2/pixmaps/gnome-cckeyboard.png
-share/gnome2/pixmaps/gnome-ccmime.png
-share/gnome2/pixmaps/gnome-ccperiph.png
-share/gnome2/pixmaps/gnome-ccscreensaver.png
-share/gnome2/pixmaps/gnome-ccthemes.png
-share/gnome2/pixmaps/gnome-ccwindowmanager.png
-share/gnome2/pixmaps/gnome-clock.png
-share/gnome2/pixmaps/gnome-color-browser.png
-share/gnome2/pixmaps/gnome-color-xterm.png
-share/gnome2/pixmaps/gnome-computer.png
-share/gnome2/pixmaps/gnome-cromagnon.png
-share/gnome2/pixmaps/gnome-day.png
-share/gnome2/pixmaps/gnome-debian.png
-share/gnome2/pixmaps/gnome-devel.png
-share/gnome2/pixmaps/gnome-die1.png
-share/gnome2/pixmaps/gnome-die2.png
-share/gnome2/pixmaps/gnome-die3.png
-share/gnome2/pixmaps/gnome-die4.png
-share/gnome2/pixmaps/gnome-die5.png
-share/gnome2/pixmaps/gnome-die6.png
-share/gnome2/pixmaps/gnome-diskfree.png
-share/gnome2/pixmaps/gnome-emacs.png
-share/gnome2/pixmaps/gnome-eterm.png
-share/gnome2/pixmaps/gnome-favorites.png
-share/gnome2/pixmaps/gnome-file-c.png
-share/gnome2/pixmaps/gnome-file-h.png
-share/gnome2/pixmaps/gnome-folder.png
-share/gnome2/pixmaps/gnome-gegl.png
-share/gnome2/pixmaps/gnome-gegl2-2.png
-share/gnome2/pixmaps/gnome-gegl2.png
-share/gnome2/pixmaps/gnome-gemvt.png
-share/gnome2/pixmaps/gnome-gimp.png
-share/gnome2/pixmaps/gnome-globe.png
-share/gnome2/pixmaps/gnome-gmenu.png
-share/gnome2/pixmaps/gnome-gmush.png
-share/gnome2/pixmaps/gnome-gnomine.png
-share/gnome2/pixmaps/gnome-gnomoku.png
-share/gnome2/pixmaps/gnome-graphics.png
-share/gnome2/pixmaps/gnome-gsame.png
-share/gnome2/pixmaps/gnome-help.png
-share/gnome2/pixmaps/gnome-home.png
-share/gnome2/pixmaps/gnome-html.png
-share/gnome2/pixmaps/gnome-image-gif.png
-share/gnome2/pixmaps/gnome-image-jpeg.png
-share/gnome2/pixmaps/gnome-irc.png
-share/gnome2/pixmaps/gnome-joystick.png
-share/gnome2/pixmaps/gnome-laptop.png
-share/gnome2/pixmaps/gnome-lockscreen.png
-share/gnome2/pixmaps/gnome-log.png
-share/gnome2/pixmaps/gnome-logo-icon-transparent.png
-share/gnome2/pixmaps/gnome-logo-icon.png
-share/gnome2/pixmaps/gnome-logo-large.png
-share/gnome2/pixmaps/gnome-mailcheck.png
-share/gnome2/pixmaps/gnome-mdi.png
-share/gnome2/pixmaps/gnome-mnemonic.png
-share/gnome2/pixmaps/gnome-modem.png
-share/gnome2/pixmaps/gnome-money.png
-share/gnome2/pixmaps/gnome-monitor.png
-share/gnome2/pixmaps/gnome-month.png
-share/gnome2/pixmaps/gnome-mouse.png
-share/gnome2/pixmaps/gnome-multimedia.png
-share/gnome2/pixmaps/gnome-networktool.png
-share/gnome2/pixmaps/gnome-news.png
-share/gnome2/pixmaps/gnome-note.png
-share/gnome2/pixmaps/gnome-panel-type-corner.png
-share/gnome2/pixmaps/gnome-panel-type-edge.png
-share/gnome2/pixmaps/gnome-panel-type-floating.png
-share/gnome2/pixmaps/gnome-panel-type-menu.png
-share/gnome2/pixmaps/gnome-panel-type-sliding.png
-share/gnome2/pixmaps/gnome-panel.png
-share/gnome2/pixmaps/gnome-qeye.png
-share/gnome2/pixmaps/gnome-run.png
-share/gnome2/pixmaps/gnome-session.png
-share/gnome2/pixmaps/gnome-set-time.png
-share/gnome2/pixmaps/gnome-settings.png
-share/gnome2/pixmaps/gnome-spider.png
-share/gnome2/pixmaps/gnome-squeak.png
-share/gnome2/pixmaps/gnome-suse.png
-share/gnome2/pixmaps/gnome-system.png
-share/gnome2/pixmaps/gnome-talk.png
-share/gnome2/pixmaps/gnome-term-linux.png
-share/gnome2/pixmaps/gnome-term-linux2.png
-share/gnome2/pixmaps/gnome-term-night.png
-share/gnome2/pixmaps/gnome-term-tiger.png
-share/gnome2/pixmaps/gnome-term.png
-share/gnome2/pixmaps/gnome-tigert.png
-share/gnome2/pixmaps/gnome-touristinfo.png
-share/gnome2/pixmaps/gnome-unknown.png
-share/gnome2/pixmaps/gnome-user-interface.png
-share/gnome2/pixmaps/gnome-util.png
-share/gnome2/pixmaps/gnome-week.png
-share/gnome2/pixmaps/gnome-windows.png
-share/gnome2/pixmaps/gnome-word.png
-share/gnome2/pixmaps/gnome-workspace.png
-share/gnome2/pixmaps/gnome-xterm.png
-share/gnome2/pixmaps/gtkvim.png
-share/gnome2/pixmaps/kterm.xpm
-share/gnome2/pixmaps/launcher-program.png
-share/gnome2/pixmaps/monitor.png
-share/gnome2/pixmaps/panel-arrow-down.png
-share/gnome2/pixmaps/panel-arrow-left.png
-share/gnome2/pixmaps/panel-arrow-right.png
-share/gnome2/pixmaps/panel-arrow-up.png
-share/gnome2/pixmaps/panel-corner-left.png
-share/gnome2/pixmaps/panel-corner-right.png
-share/gnome2/pixmaps/panel-drawer.png
-share/gnome2/pixmaps/panel-folder.png
-share/gnome2/pixmaps/panel-knob.png
-share/gnome2/pixmaps/panel-menu-main.png
-share/gnome2/pixmaps/vnterm.xpm
+share/gnome/gnome-about/contributors.dat
+share/gnome/gnome-about/gnome-version
+share/gnome/help/fdl/C/fdl.xml
+share/gnome/help/gpl/C/gpl.xml
+share/gnome/help/lgpl/C/lgpl.xml
+share/gnome/vfolders/Accessories.directory
+share/gnome/vfolders/Applications.directory
+share/gnome/vfolders/Development.directory
+share/gnome/vfolders/Games.directory
+share/gnome/vfolders/Graphics.directory
+share/gnome/vfolders/Home.directory
+share/gnome/vfolders/Internet.directory
+share/gnome/vfolders/Multimedia.directory
+share/gnome/vfolders/Office.directory
+share/gnome/vfolders/Root.directory
+share/gnome/vfolders/Root.order
+share/gnome/vfolders/Settings.directory
+share/gnome/vfolders/Settings.order
+share/gnome/vfolders/System.directory
+share/gnome/pixmaps/apple-green.png
+share/gnome/pixmaps/apple-red.png
+share/gnome/pixmaps/cdeappmenu.png
+share/gnome/pixmaps/gnome-amusements.png
+share/gnome/pixmaps/gnome-aorta.png
+share/gnome/pixmaps/gnome-applets.png
+share/gnome/pixmaps/gnome-applications.png
+share/gnome/pixmaps/gnome-audio2.png
+share/gnome/pixmaps/gnome-background.png
+share/gnome/pixmaps/gnome-calc2.png
+share/gnome/pixmaps/gnome-calendar.png
+share/gnome/pixmaps/gnome-cardgame.png
+share/gnome/pixmaps/gnome-ccbackground.png
+share/gnome/pixmaps/gnome-ccdesktop.png
+share/gnome/pixmaps/gnome-ccdialog.png
+share/gnome/pixmaps/gnome-cckeyboard-bell.png
+share/gnome/pixmaps/gnome-cckeyboard.png
+share/gnome/pixmaps/gnome-ccmime.png
+share/gnome/pixmaps/gnome-ccperiph.png
+share/gnome/pixmaps/gnome-ccscreensaver.png
+share/gnome/pixmaps/gnome-ccthemes.png
+share/gnome/pixmaps/gnome-ccwindowmanager.png
+share/gnome/pixmaps/gnome-clock.png
+share/gnome/pixmaps/gnome-color-browser.png
+share/gnome/pixmaps/gnome-color-xterm.png
+share/gnome/pixmaps/gnome-computer.png
+share/gnome/pixmaps/gnome-cromagnon.png
+share/gnome/pixmaps/gnome-day.png
+share/gnome/pixmaps/gnome-debian.png
+share/gnome/pixmaps/gnome-devel.png
+share/gnome/pixmaps/gnome-die1.png
+share/gnome/pixmaps/gnome-die2.png
+share/gnome/pixmaps/gnome-die3.png
+share/gnome/pixmaps/gnome-die4.png
+share/gnome/pixmaps/gnome-die5.png
+share/gnome/pixmaps/gnome-die6.png
+share/gnome/pixmaps/gnome-diskfree.png
+share/gnome/pixmaps/gnome-emacs.png
+share/gnome/pixmaps/gnome-eterm.png
+share/gnome/pixmaps/gnome-favorites.png
+share/gnome/pixmaps/gnome-file-c.png
+share/gnome/pixmaps/gnome-file-h.png
+share/gnome/pixmaps/gnome-folder.png
+share/gnome/pixmaps/gnome-gegl.png
+share/gnome/pixmaps/gnome-gegl2-2.png
+share/gnome/pixmaps/gnome-gegl2.png
+share/gnome/pixmaps/gnome-gemvt.png
+share/gnome/pixmaps/gnome-gimp.png
+share/gnome/pixmaps/gnome-globe.png
+share/gnome/pixmaps/gnome-gmenu.png
+share/gnome/pixmaps/gnome-gmush.png
+share/gnome/pixmaps/gnome-gnomine.png
+share/gnome/pixmaps/gnome-gnomoku.png
+share/gnome/pixmaps/gnome-graphics.png
+share/gnome/pixmaps/gnome-gsame.png
+share/gnome/pixmaps/gnome-help.png
+share/gnome/pixmaps/gnome-home.png
+share/gnome/pixmaps/gnome-html.png
+share/gnome/pixmaps/gnome-image-gif.png
+share/gnome/pixmaps/gnome-image-jpeg.png
+share/gnome/pixmaps/gnome-irc.png
+share/gnome/pixmaps/gnome-joystick.png
+share/gnome/pixmaps/gnome-laptop.png
+share/gnome/pixmaps/gnome-lockscreen.png
+share/gnome/pixmaps/gnome-log.png
+share/gnome/pixmaps/gnome-logo-icon-transparent.png
+share/gnome/pixmaps/gnome-logo-icon.png
+share/gnome/pixmaps/gnome-logo-large.png
+share/gnome/pixmaps/gnome-mailcheck.png
+share/gnome/pixmaps/gnome-mdi.png
+share/gnome/pixmaps/gnome-mnemonic.png
+share/gnome/pixmaps/gnome-modem.png
+share/gnome/pixmaps/gnome-money.png
+share/gnome/pixmaps/gnome-monitor.png
+share/gnome/pixmaps/gnome-month.png
+share/gnome/pixmaps/gnome-mouse.png
+share/gnome/pixmaps/gnome-multimedia.png
+share/gnome/pixmaps/gnome-networktool.png
+share/gnome/pixmaps/gnome-news.png
+share/gnome/pixmaps/gnome-note.png
+share/gnome/pixmaps/gnome-panel-type-corner.png
+share/gnome/pixmaps/gnome-panel-type-edge.png
+share/gnome/pixmaps/gnome-panel-type-floating.png
+share/gnome/pixmaps/gnome-panel-type-menu.png
+share/gnome/pixmaps/gnome-panel-type-sliding.png
+share/gnome/pixmaps/gnome-panel.png
+share/gnome/pixmaps/gnome-qeye.png
+share/gnome/pixmaps/gnome-run.png
+share/gnome/pixmaps/gnome-session.png
+share/gnome/pixmaps/gnome-set-time.png
+share/gnome/pixmaps/gnome-settings.png
+share/gnome/pixmaps/gnome-spider.png
+share/gnome/pixmaps/gnome-squeak.png
+share/gnome/pixmaps/gnome-suse.png
+share/gnome/pixmaps/gnome-system.png
+share/gnome/pixmaps/gnome-talk.png
+share/gnome/pixmaps/gnome-term-linux.png
+share/gnome/pixmaps/gnome-term-linux2.png
+share/gnome/pixmaps/gnome-term-night.png
+share/gnome/pixmaps/gnome-term-tiger.png
+share/gnome/pixmaps/gnome-term.png
+share/gnome/pixmaps/gnome-tigert.png
+share/gnome/pixmaps/gnome-touristinfo.png
+share/gnome/pixmaps/gnome-unknown.png
+share/gnome/pixmaps/gnome-user-interface.png
+share/gnome/pixmaps/gnome-util.png
+share/gnome/pixmaps/gnome-week.png
+share/gnome/pixmaps/gnome-windows.png
+share/gnome/pixmaps/gnome-word.png
+share/gnome/pixmaps/gnome-workspace.png
+share/gnome/pixmaps/gnome-xterm.png
+share/gnome/pixmaps/gtkvim.png
+share/gnome/pixmaps/kterm.xpm
+share/gnome/pixmaps/launcher-program.png
+share/gnome/pixmaps/monitor.png
+share/gnome/pixmaps/panel-arrow-down.png
+share/gnome/pixmaps/panel-arrow-left.png
+share/gnome/pixmaps/panel-arrow-right.png
+share/gnome/pixmaps/panel-arrow-up.png
+share/gnome/pixmaps/panel-corner-left.png
+share/gnome/pixmaps/panel-corner-right.png
+share/gnome/pixmaps/panel-drawer.png
+share/gnome/pixmaps/panel-folder.png
+share/gnome/pixmaps/panel-knob.png
+share/gnome/pixmaps/panel-menu-main.png
+share/gnome/pixmaps/vnterm.xpm
share/locale/az/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/bg/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -192,18 +192,18 @@ share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
-@dirrm share/gnome2/vfolders
-@dirrm share/gnome2/help/lgpl/C/figures
-@dirrm share/gnome2/help/lgpl/C
-@dirrm share/gnome2/help/lgpl
-@dirrm share/gnome2/help/gpl/C/figures
-@dirrm share/gnome2/help/gpl/C
-@dirrm share/gnome2/help/gpl
-@dirrm share/gnome2/help/fdl/C/figures
-@dirrm share/gnome2/help/fdl/C
-@dirrm share/gnome2/help/fdl
-@dirrm share/gnome2/help
-@dirrm share/gnome2/gnome-about
+@dirrm share/gnome/vfolders
+@dirrm share/gnome/help/lgpl/C/figures
+@dirrm share/gnome/help/lgpl/C
+@dirrm share/gnome/help/lgpl
+@dirrm share/gnome/help/gpl/C/figures
+@dirrm share/gnome/help/gpl/C
+@dirrm share/gnome/help/gpl
+@dirrm share/gnome/help/fdl/C/figures
+@dirrm share/gnome/help/fdl/C
+@dirrm share/gnome/help/fdl
+@dirrm share/gnome/help
+@dirrm share/gnome/gnome-about
@dirrm include/gnome-desktop-2.0/libgnomeui
@dirrm include/gnome-desktop-2.0/libgnome
@dirrm include/gnome-desktop-2.0
diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile
index c13b96395d73..70b18ccc9d2f 100644
--- a/x11/gnomedesktop/Makefile
+++ b/x11/gnomedesktop/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnomedesktop
PORTVERSION= 1.5.17
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta4
@@ -24,8 +25,8 @@ USE_GMAKE= yes
USE_BISON= yes
INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome2 \
- --datadir=${PREFIX}/share/gnome2
+CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
+ --datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/x11/gnomedesktop/pkg-plist b/x11/gnomedesktop/pkg-plist
index 1e1db57e093d..a1729bbc79a0 100644
--- a/x11/gnomedesktop/pkg-plist
+++ b/x11/gnomedesktop/pkg-plist
@@ -6,151 +6,151 @@ lib/libgnome-desktop-2.a
lib/libgnome-desktop-2.so
lib/libgnome-desktop-2.so.0
libdata/pkgconfig/gnome-desktop-2.0.pc
-share/gnome2/gnome-about/contributors.dat
-share/gnome2/gnome-about/gnome-version
-share/gnome2/help/fdl/C/fdl.xml
-share/gnome2/help/gpl/C/gpl.xml
-share/gnome2/help/lgpl/C/lgpl.xml
-share/gnome2/vfolders/Accessories.directory
-share/gnome2/vfolders/Applications.directory
-share/gnome2/vfolders/Development.directory
-share/gnome2/vfolders/Games.directory
-share/gnome2/vfolders/Graphics.directory
-share/gnome2/vfolders/Home.directory
-share/gnome2/vfolders/Internet.directory
-share/gnome2/vfolders/Multimedia.directory
-share/gnome2/vfolders/Office.directory
-share/gnome2/vfolders/Root.directory
-share/gnome2/vfolders/Root.order
-share/gnome2/vfolders/Settings.directory
-share/gnome2/vfolders/Settings.order
-share/gnome2/vfolders/System.directory
-share/gnome2/pixmaps/apple-green.png
-share/gnome2/pixmaps/apple-red.png
-share/gnome2/pixmaps/cdeappmenu.png
-share/gnome2/pixmaps/gnome-amusements.png
-share/gnome2/pixmaps/gnome-aorta.png
-share/gnome2/pixmaps/gnome-applets.png
-share/gnome2/pixmaps/gnome-applications.png
-share/gnome2/pixmaps/gnome-audio2.png
-share/gnome2/pixmaps/gnome-background.png
-share/gnome2/pixmaps/gnome-calc2.png
-share/gnome2/pixmaps/gnome-calendar.png
-share/gnome2/pixmaps/gnome-cardgame.png
-share/gnome2/pixmaps/gnome-ccbackground.png
-share/gnome2/pixmaps/gnome-ccdesktop.png
-share/gnome2/pixmaps/gnome-ccdialog.png
-share/gnome2/pixmaps/gnome-cckeyboard-bell.png
-share/gnome2/pixmaps/gnome-cckeyboard.png
-share/gnome2/pixmaps/gnome-ccmime.png
-share/gnome2/pixmaps/gnome-ccperiph.png
-share/gnome2/pixmaps/gnome-ccscreensaver.png
-share/gnome2/pixmaps/gnome-ccthemes.png
-share/gnome2/pixmaps/gnome-ccwindowmanager.png
-share/gnome2/pixmaps/gnome-clock.png
-share/gnome2/pixmaps/gnome-color-browser.png
-share/gnome2/pixmaps/gnome-color-xterm.png
-share/gnome2/pixmaps/gnome-computer.png
-share/gnome2/pixmaps/gnome-cromagnon.png
-share/gnome2/pixmaps/gnome-day.png
-share/gnome2/pixmaps/gnome-debian.png
-share/gnome2/pixmaps/gnome-devel.png
-share/gnome2/pixmaps/gnome-die1.png
-share/gnome2/pixmaps/gnome-die2.png
-share/gnome2/pixmaps/gnome-die3.png
-share/gnome2/pixmaps/gnome-die4.png
-share/gnome2/pixmaps/gnome-die5.png
-share/gnome2/pixmaps/gnome-die6.png
-share/gnome2/pixmaps/gnome-diskfree.png
-share/gnome2/pixmaps/gnome-emacs.png
-share/gnome2/pixmaps/gnome-eterm.png
-share/gnome2/pixmaps/gnome-favorites.png
-share/gnome2/pixmaps/gnome-file-c.png
-share/gnome2/pixmaps/gnome-file-h.png
-share/gnome2/pixmaps/gnome-folder.png
-share/gnome2/pixmaps/gnome-gegl.png
-share/gnome2/pixmaps/gnome-gegl2-2.png
-share/gnome2/pixmaps/gnome-gegl2.png
-share/gnome2/pixmaps/gnome-gemvt.png
-share/gnome2/pixmaps/gnome-gimp.png
-share/gnome2/pixmaps/gnome-globe.png
-share/gnome2/pixmaps/gnome-gmenu.png
-share/gnome2/pixmaps/gnome-gmush.png
-share/gnome2/pixmaps/gnome-gnomine.png
-share/gnome2/pixmaps/gnome-gnomoku.png
-share/gnome2/pixmaps/gnome-graphics.png
-share/gnome2/pixmaps/gnome-gsame.png
-share/gnome2/pixmaps/gnome-help.png
-share/gnome2/pixmaps/gnome-home.png
-share/gnome2/pixmaps/gnome-html.png
-share/gnome2/pixmaps/gnome-image-gif.png
-share/gnome2/pixmaps/gnome-image-jpeg.png
-share/gnome2/pixmaps/gnome-irc.png
-share/gnome2/pixmaps/gnome-joystick.png
-share/gnome2/pixmaps/gnome-laptop.png
-share/gnome2/pixmaps/gnome-lockscreen.png
-share/gnome2/pixmaps/gnome-log.png
-share/gnome2/pixmaps/gnome-logo-icon-transparent.png
-share/gnome2/pixmaps/gnome-logo-icon.png
-share/gnome2/pixmaps/gnome-logo-large.png
-share/gnome2/pixmaps/gnome-mailcheck.png
-share/gnome2/pixmaps/gnome-mdi.png
-share/gnome2/pixmaps/gnome-mnemonic.png
-share/gnome2/pixmaps/gnome-modem.png
-share/gnome2/pixmaps/gnome-money.png
-share/gnome2/pixmaps/gnome-monitor.png
-share/gnome2/pixmaps/gnome-month.png
-share/gnome2/pixmaps/gnome-mouse.png
-share/gnome2/pixmaps/gnome-multimedia.png
-share/gnome2/pixmaps/gnome-networktool.png
-share/gnome2/pixmaps/gnome-news.png
-share/gnome2/pixmaps/gnome-note.png
-share/gnome2/pixmaps/gnome-panel-type-corner.png
-share/gnome2/pixmaps/gnome-panel-type-edge.png
-share/gnome2/pixmaps/gnome-panel-type-floating.png
-share/gnome2/pixmaps/gnome-panel-type-menu.png
-share/gnome2/pixmaps/gnome-panel-type-sliding.png
-share/gnome2/pixmaps/gnome-panel.png
-share/gnome2/pixmaps/gnome-qeye.png
-share/gnome2/pixmaps/gnome-run.png
-share/gnome2/pixmaps/gnome-session.png
-share/gnome2/pixmaps/gnome-set-time.png
-share/gnome2/pixmaps/gnome-settings.png
-share/gnome2/pixmaps/gnome-spider.png
-share/gnome2/pixmaps/gnome-squeak.png
-share/gnome2/pixmaps/gnome-suse.png
-share/gnome2/pixmaps/gnome-system.png
-share/gnome2/pixmaps/gnome-talk.png
-share/gnome2/pixmaps/gnome-term-linux.png
-share/gnome2/pixmaps/gnome-term-linux2.png
-share/gnome2/pixmaps/gnome-term-night.png
-share/gnome2/pixmaps/gnome-term-tiger.png
-share/gnome2/pixmaps/gnome-term.png
-share/gnome2/pixmaps/gnome-tigert.png
-share/gnome2/pixmaps/gnome-touristinfo.png
-share/gnome2/pixmaps/gnome-unknown.png
-share/gnome2/pixmaps/gnome-user-interface.png
-share/gnome2/pixmaps/gnome-util.png
-share/gnome2/pixmaps/gnome-week.png
-share/gnome2/pixmaps/gnome-windows.png
-share/gnome2/pixmaps/gnome-word.png
-share/gnome2/pixmaps/gnome-workspace.png
-share/gnome2/pixmaps/gnome-xterm.png
-share/gnome2/pixmaps/gtkvim.png
-share/gnome2/pixmaps/kterm.xpm
-share/gnome2/pixmaps/launcher-program.png
-share/gnome2/pixmaps/monitor.png
-share/gnome2/pixmaps/panel-arrow-down.png
-share/gnome2/pixmaps/panel-arrow-left.png
-share/gnome2/pixmaps/panel-arrow-right.png
-share/gnome2/pixmaps/panel-arrow-up.png
-share/gnome2/pixmaps/panel-corner-left.png
-share/gnome2/pixmaps/panel-corner-right.png
-share/gnome2/pixmaps/panel-drawer.png
-share/gnome2/pixmaps/panel-folder.png
-share/gnome2/pixmaps/panel-knob.png
-share/gnome2/pixmaps/panel-menu-main.png
-share/gnome2/pixmaps/vnterm.xpm
+share/gnome/gnome-about/contributors.dat
+share/gnome/gnome-about/gnome-version
+share/gnome/help/fdl/C/fdl.xml
+share/gnome/help/gpl/C/gpl.xml
+share/gnome/help/lgpl/C/lgpl.xml
+share/gnome/vfolders/Accessories.directory
+share/gnome/vfolders/Applications.directory
+share/gnome/vfolders/Development.directory
+share/gnome/vfolders/Games.directory
+share/gnome/vfolders/Graphics.directory
+share/gnome/vfolders/Home.directory
+share/gnome/vfolders/Internet.directory
+share/gnome/vfolders/Multimedia.directory
+share/gnome/vfolders/Office.directory
+share/gnome/vfolders/Root.directory
+share/gnome/vfolders/Root.order
+share/gnome/vfolders/Settings.directory
+share/gnome/vfolders/Settings.order
+share/gnome/vfolders/System.directory
+share/gnome/pixmaps/apple-green.png
+share/gnome/pixmaps/apple-red.png
+share/gnome/pixmaps/cdeappmenu.png
+share/gnome/pixmaps/gnome-amusements.png
+share/gnome/pixmaps/gnome-aorta.png
+share/gnome/pixmaps/gnome-applets.png
+share/gnome/pixmaps/gnome-applications.png
+share/gnome/pixmaps/gnome-audio2.png
+share/gnome/pixmaps/gnome-background.png
+share/gnome/pixmaps/gnome-calc2.png
+share/gnome/pixmaps/gnome-calendar.png
+share/gnome/pixmaps/gnome-cardgame.png
+share/gnome/pixmaps/gnome-ccbackground.png
+share/gnome/pixmaps/gnome-ccdesktop.png
+share/gnome/pixmaps/gnome-ccdialog.png
+share/gnome/pixmaps/gnome-cckeyboard-bell.png
+share/gnome/pixmaps/gnome-cckeyboard.png
+share/gnome/pixmaps/gnome-ccmime.png
+share/gnome/pixmaps/gnome-ccperiph.png
+share/gnome/pixmaps/gnome-ccscreensaver.png
+share/gnome/pixmaps/gnome-ccthemes.png
+share/gnome/pixmaps/gnome-ccwindowmanager.png
+share/gnome/pixmaps/gnome-clock.png
+share/gnome/pixmaps/gnome-color-browser.png
+share/gnome/pixmaps/gnome-color-xterm.png
+share/gnome/pixmaps/gnome-computer.png
+share/gnome/pixmaps/gnome-cromagnon.png
+share/gnome/pixmaps/gnome-day.png
+share/gnome/pixmaps/gnome-debian.png
+share/gnome/pixmaps/gnome-devel.png
+share/gnome/pixmaps/gnome-die1.png
+share/gnome/pixmaps/gnome-die2.png
+share/gnome/pixmaps/gnome-die3.png
+share/gnome/pixmaps/gnome-die4.png
+share/gnome/pixmaps/gnome-die5.png
+share/gnome/pixmaps/gnome-die6.png
+share/gnome/pixmaps/gnome-diskfree.png
+share/gnome/pixmaps/gnome-emacs.png
+share/gnome/pixmaps/gnome-eterm.png
+share/gnome/pixmaps/gnome-favorites.png
+share/gnome/pixmaps/gnome-file-c.png
+share/gnome/pixmaps/gnome-file-h.png
+share/gnome/pixmaps/gnome-folder.png
+share/gnome/pixmaps/gnome-gegl.png
+share/gnome/pixmaps/gnome-gegl2-2.png
+share/gnome/pixmaps/gnome-gegl2.png
+share/gnome/pixmaps/gnome-gemvt.png
+share/gnome/pixmaps/gnome-gimp.png
+share/gnome/pixmaps/gnome-globe.png
+share/gnome/pixmaps/gnome-gmenu.png
+share/gnome/pixmaps/gnome-gmush.png
+share/gnome/pixmaps/gnome-gnomine.png
+share/gnome/pixmaps/gnome-gnomoku.png
+share/gnome/pixmaps/gnome-graphics.png
+share/gnome/pixmaps/gnome-gsame.png
+share/gnome/pixmaps/gnome-help.png
+share/gnome/pixmaps/gnome-home.png
+share/gnome/pixmaps/gnome-html.png
+share/gnome/pixmaps/gnome-image-gif.png
+share/gnome/pixmaps/gnome-image-jpeg.png
+share/gnome/pixmaps/gnome-irc.png
+share/gnome/pixmaps/gnome-joystick.png
+share/gnome/pixmaps/gnome-laptop.png
+share/gnome/pixmaps/gnome-lockscreen.png
+share/gnome/pixmaps/gnome-log.png
+share/gnome/pixmaps/gnome-logo-icon-transparent.png
+share/gnome/pixmaps/gnome-logo-icon.png
+share/gnome/pixmaps/gnome-logo-large.png
+share/gnome/pixmaps/gnome-mailcheck.png
+share/gnome/pixmaps/gnome-mdi.png
+share/gnome/pixmaps/gnome-mnemonic.png
+share/gnome/pixmaps/gnome-modem.png
+share/gnome/pixmaps/gnome-money.png
+share/gnome/pixmaps/gnome-monitor.png
+share/gnome/pixmaps/gnome-month.png
+share/gnome/pixmaps/gnome-mouse.png
+share/gnome/pixmaps/gnome-multimedia.png
+share/gnome/pixmaps/gnome-networktool.png
+share/gnome/pixmaps/gnome-news.png
+share/gnome/pixmaps/gnome-note.png
+share/gnome/pixmaps/gnome-panel-type-corner.png
+share/gnome/pixmaps/gnome-panel-type-edge.png
+share/gnome/pixmaps/gnome-panel-type-floating.png
+share/gnome/pixmaps/gnome-panel-type-menu.png
+share/gnome/pixmaps/gnome-panel-type-sliding.png
+share/gnome/pixmaps/gnome-panel.png
+share/gnome/pixmaps/gnome-qeye.png
+share/gnome/pixmaps/gnome-run.png
+share/gnome/pixmaps/gnome-session.png
+share/gnome/pixmaps/gnome-set-time.png
+share/gnome/pixmaps/gnome-settings.png
+share/gnome/pixmaps/gnome-spider.png
+share/gnome/pixmaps/gnome-squeak.png
+share/gnome/pixmaps/gnome-suse.png
+share/gnome/pixmaps/gnome-system.png
+share/gnome/pixmaps/gnome-talk.png
+share/gnome/pixmaps/gnome-term-linux.png
+share/gnome/pixmaps/gnome-term-linux2.png
+share/gnome/pixmaps/gnome-term-night.png
+share/gnome/pixmaps/gnome-term-tiger.png
+share/gnome/pixmaps/gnome-term.png
+share/gnome/pixmaps/gnome-tigert.png
+share/gnome/pixmaps/gnome-touristinfo.png
+share/gnome/pixmaps/gnome-unknown.png
+share/gnome/pixmaps/gnome-user-interface.png
+share/gnome/pixmaps/gnome-util.png
+share/gnome/pixmaps/gnome-week.png
+share/gnome/pixmaps/gnome-windows.png
+share/gnome/pixmaps/gnome-word.png
+share/gnome/pixmaps/gnome-workspace.png
+share/gnome/pixmaps/gnome-xterm.png
+share/gnome/pixmaps/gtkvim.png
+share/gnome/pixmaps/kterm.xpm
+share/gnome/pixmaps/launcher-program.png
+share/gnome/pixmaps/monitor.png
+share/gnome/pixmaps/panel-arrow-down.png
+share/gnome/pixmaps/panel-arrow-left.png
+share/gnome/pixmaps/panel-arrow-right.png
+share/gnome/pixmaps/panel-arrow-up.png
+share/gnome/pixmaps/panel-corner-left.png
+share/gnome/pixmaps/panel-corner-right.png
+share/gnome/pixmaps/panel-drawer.png
+share/gnome/pixmaps/panel-folder.png
+share/gnome/pixmaps/panel-knob.png
+share/gnome/pixmaps/panel-menu-main.png
+share/gnome/pixmaps/vnterm.xpm
share/locale/az/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/bg/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -192,18 +192,18 @@ share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
-@dirrm share/gnome2/vfolders
-@dirrm share/gnome2/help/lgpl/C/figures
-@dirrm share/gnome2/help/lgpl/C
-@dirrm share/gnome2/help/lgpl
-@dirrm share/gnome2/help/gpl/C/figures
-@dirrm share/gnome2/help/gpl/C
-@dirrm share/gnome2/help/gpl
-@dirrm share/gnome2/help/fdl/C/figures
-@dirrm share/gnome2/help/fdl/C
-@dirrm share/gnome2/help/fdl
-@dirrm share/gnome2/help
-@dirrm share/gnome2/gnome-about
+@dirrm share/gnome/vfolders
+@dirrm share/gnome/help/lgpl/C/figures
+@dirrm share/gnome/help/lgpl/C
+@dirrm share/gnome/help/lgpl
+@dirrm share/gnome/help/gpl/C/figures
+@dirrm share/gnome/help/gpl/C
+@dirrm share/gnome/help/gpl
+@dirrm share/gnome/help/fdl/C/figures
+@dirrm share/gnome/help/fdl/C
+@dirrm share/gnome/help/fdl
+@dirrm share/gnome/help
+@dirrm share/gnome/gnome-about
@dirrm include/gnome-desktop-2.0/libgnomeui
@dirrm include/gnome-desktop-2.0/libgnome
@dirrm include/gnome-desktop-2.0
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 00507f8ecc22..1c986a31a809 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libgnome
PORTVERSION= 1.115.0
+PORTREVISION= 1
CATEGORIES?= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta4
@@ -25,8 +26,8 @@ USE_ESOUND= yes
USE_BISON= yes
INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome2 \
- --datadir=${PREFIX}/share/gnome2 \
+CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
+ --datadir=${PREFIX}/share/gnome \
--with-html-dir=${PREFIX}/share/doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index 13630cf4f7ff..e1676446683f 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -108,9 +108,9 @@ share/doc/libgnome/x2848.html
share/doc/libgnome/x3213.html
share/doc/libgnome/x4055.html
share/doc/libgnome/x9.html
-share/gnome2/sgml/docbook/gnome-customization-0.1/gnome-custom.xsl
-share/gnome2/sgml/docbook/gnome-customization-0.1/gnome-customization.xsl
-share/gnome2/sgml/docbook/gnome-customization-0.1/l10n.xml
+share/gnome/sgml/docbook/gnome-customization-0.1/gnome-custom.xsl
+share/gnome/sgml/docbook/gnome-customization-0.1/gnome-customization.xsl
+share/gnome/sgml/docbook/gnome-customization-0.1/l10n.xml
share/locale/az/LC_MESSAGES/libgnome-2.0.mo
share/locale/da/LC_MESSAGES/libgnome-2.0.mo
share/locale/de/LC_MESSAGES/libgnome-2.0.mo
@@ -136,9 +136,9 @@ share/locale/uk/LC_MESSAGES/libgnome-2.0.mo
share/locale/wa/LC_MESSAGES/libgnome-2.0.mo
share/locale/zh_CN/LC_MESSAGES/libgnome-2.0.mo
share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
-@dirrm share/gnome2/sgml/docbook/gnome-customization-0.1
-@dirrm share/gnome2/sgml/docbook
-@dirrm share/gnome2/sgml
+@dirrm share/gnome/sgml/docbook/gnome-customization-0.1
+@dirrm share/gnome/sgml/docbook
+@dirrm share/gnome/sgml
@dirrm share/doc/libgnome
@dirrm include/libgnome-2.0/libgnome
@dirrm include/libgnome-2.0