- Update to 2.15.4.1 (forgot to commit this 12 days ago)

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6682 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 456 insertions, 0 deletions

diff --git a/x11/gnome-menus/files/KDE.directory b/x11/gnome-menus/files/KDE.directory
new file mode 100644
index 000000000..d8cacb750
--- /dev/null
+++ b/x11/gnome-menus/files/KDE.directory
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=KDE
+Comment=Some comment about KDE menu
+Icon=/usr/local/share/icons/default.kde/48x48/apps/kmenu.png
+Type=Directory
diff --git a/x11/gnome-menus/files/patch-Makefile.in b/x11/gnome-menus/files/patch-Makefile.in
new file mode 100644
index 000000000..995bf4c2e
--- /dev/null
+++ b/x11/gnome-menus/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Thu Apr 13 08:59:30 2006
++++ Makefile.in	Thu Apr 13 08:59:38 2006
+@@ -205,7 +205,7 @@
+ target_alias = @target_alias@
+ NULL = 
+ 
+-@HAVE_PYTHON_TRUE@PYTHON_SUBDIRS = python simple-editor
++@HAVE_PYTHON_TRUE@PYTHON_SUBDIRS = python
+ 
+ ALL_SUBDIRS = \
+ 	po 			\
diff --git a/x11/gnome-menus/files/patch-layout::applications.menu b/x11/gnome-menus/files/patch-layout::applications.menu
new file mode 100644
index 000000000..a3644747b
--- /dev/null
+++ b/x11/gnome-menus/files/patch-layout::applications.menu
@@ -0,0 +1,357 @@
+--- layout/applications.menu.orig	Wed Mar  9 11:49:53 2005
++++ layout/applications.menu	Fri Mar 25 11:45:09 2005
+@@ -6,24 +6,26 @@
+   <Name>Applications</Name>
+   <Directory>Applications.directory</Directory>
+ 
+-  <!-- Scan legacy dirs first, as later items take priority -->
+-  <KDELegacyDirs/>
+-  <LegacyDir>/etc/X11/applnk</LegacyDir>
++  <!-- Scan legacy dirs first, as later items take priority
++  <LegacyDir>/etc/X11/applnk</LegacyDir> -->
+   <LegacyDir>/usr/share/gnome/apps</LegacyDir>
+ 
+   <!-- Read standard .directory and .desktop file locations -->
+   <DefaultAppDirs/>
+   <DefaultDirectoryDirs/>
+ 
+-  <!-- Read in overrides and child menus from applications-merged/ -->
+-  <DefaultMergeDirs/>
+-
+   <!-- Accessories submenu -->
+   <Menu>
+     <Name>Accessories</Name>
+     <Directory>Accessories.directory</Directory>
+     <Include>
+       <And>
++        <Not>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++        </Not>
+         <Category>Utility</Category>
+         <Not>
+           <Category>System</Category>
+@@ -38,6 +40,12 @@
+     <Directory>Accessibility.directory</Directory>
+     <Include>
+       <And>
++        <Not>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++        </Not>
+         <Category>Accessibility</Category>
+         <Not>
+           <Category>Settings</Category>
+@@ -52,6 +60,12 @@
+     <Directory>Development.directory</Directory>
+     <Include>
+       <And>
++        <Not>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++        </Not>
+         <Category>Development</Category>
+       </And>
+       <Filename>emacs.desktop</Filename>
+@@ -64,6 +78,12 @@
+     <Directory>Edutainment.directory</Directory>
+     <Include>
+       <And>
++        <Not>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++        </Not>
+         <Category>Education</Category>
+       </And>
+     </Include>
+@@ -75,6 +95,12 @@
+     <Directory>Games.directory</Directory>
+     <Include>
+       <And>
++        <Not>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++        </Not>
+         <Category>Game</Category>
+       </And>
+     </Include>
+@@ -86,6 +112,12 @@
+     <Directory>Graphics.directory</Directory>
+     <Include>
+       <And>
++        <Not>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++        </Not>
+         <Category>Graphics</Category>
+       </And>
+     </Include>
+@@ -97,6 +129,12 @@
+     <Directory>Internet.directory</Directory>
+     <Include>
+       <And>
++        <Not>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++        </Not>
+         <Category>Network</Category>
+       </And>
+     </Include>
+@@ -108,6 +146,12 @@
+     <Directory>Multimedia.directory</Directory>
+     <Include>
+       <And>
++        <Not>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++        </Not>
+         <Category>AudioVideo</Category>
+       </And>
+     </Include>
+@@ -119,6 +163,12 @@
+     <Directory>Office.directory</Directory>
+     <Include>
+       <And>
++        <Not>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++        </Not>
+         <Category>Office</Category>
+       </And>
+     </Include>
+@@ -130,6 +180,12 @@
+     <Directory>System-Tools.directory</Directory>
+     <Include>
+       <And>
++        <Not>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++        </Not>
+         <Category>System</Category>
+         <Not><Category>Settings</Category></Not>
+       </And>
+@@ -143,11 +199,204 @@
+     <OnlyUnallocated/>
+     <Include>
+       <And>
++        <Not>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++        </Not>
+         <Category>Application</Category>
+         <Not><Category>Core</Category></Not>
+         <Not><Category>Settings</Category></Not>
+       </And>
+     </Include>
+   </Menu> <!-- End Other -->
++
++  <!-- Read in overrides and child menus from applications-merged/ -->
++  <DefaultMergeDirs/>
++
++  <!-- KDE -->
++  <Menu>
++    <KDELegacyDirs/>
++    <Name>KDE</Name>
++    <Directory>KDE.directory</Directory>
++
++    <!-- KAccessories submenu -->
++    <Menu>
++      <Name>Accessories</Name>
++      <Directory>Accessories.directory</Directory>
++      <Include>
++        <And>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++          <Category>Utility</Category>
++          <Not>
++            <Category>System</Category>
++          </Not>
++        </And>
++      </Include>
++    </Menu> <!-- End KAccessories -->
++
++    <!-- KAccessibility submenu -->
++    <Menu>
++      <Name>Accessibility</Name>
++      <Directory>Accessibility.directory</Directory>
++      <Include>
++        <And>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++          <Category>Accessibility</Category>
++          <Not>
++            <Category>Settings</Category>
++          </Not>
++        </And>
++      </Include>
++    </Menu> <!-- End KAccessibility -->
++
++    <!-- KDevelopment Tools -->
++    <Menu>
++      <Name>Development</Name>
++      <Directory>Development.directory</Directory>
++      <Include>
++        <And>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++          <Category>Development</Category>
++        </And>
++      </Include>
++    </Menu> <!-- End KDevelopment Tools -->
++
++    <!-- KEdutainment -->
++    <Menu>
++      <Name>Edutainment</Name>
++      <Directory>Edutainment.directory</Directory>
++      <Include>
++        <And>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++          <Category>Education</Category>
++        </And>
++      </Include>
++    </Menu> <!-- End KEdutainment -->
++
++    <!-- KGames -->
++    <Menu>
++      <Name>Games</Name>
++      <Directory>Games.directory</Directory>
++      <Include>
++        <And>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++          <Category>Game</Category>
++        </And>
++      </Include>
++    </Menu> <!-- End KGames -->
++
++    <!-- KGraphics -->
++    <Menu>
++      <Name>Graphics</Name>
++      <Directory>Graphics.directory</Directory>
++      <Include>
++        <And>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++          <Category>Graphics</Category>
++        </And>
++      </Include>
++    </Menu> <!-- End KGraphics -->
++
++    <!-- KInternet -->
++    <Menu>
++      <Name>Internet</Name>
++      <Directory>Internet.directory</Directory>
++      <Include>
++        <And>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++          <Category>Network</Category>
++        </And>
++      </Include>
++    </Menu> <!-- End KInternet -->
++
++    <!-- KMultimedia -->
++    <Menu>
++      <Name>Multimedia</Name>
++      <Directory>Multimedia.directory</Directory>
++      <Include>
++        <And>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++          <Category>AudioVideo</Category>
++        </And>
++      </Include>
++    </Menu> <!-- End KMultimedia -->
++
++    <!-- KOffice -->
++    <Menu>
++      <Name>Office</Name>
++      <Directory>Office.directory</Directory>
++      <Include>
++        <And>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++          <Or>
++            <Category>Office</Category>
++          </Or>
++        </And>
++      </Include>
++    </Menu><!-- End KOffice -->
++
++    <!-- KSystem Tools-->
++    <Menu>
++      <Name>System</Name>
++      <Directory>System-Tools.directory</Directory>
++      <Include>
++        <And>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++          <Category>System</Category>
++          <Not><Category>Settings</Category></Not>
++        </And>
++      </Include>
++    </Menu>   <!-- End KSystem Tools -->
++
++    <!-- KOther -->
++    <Menu>
++      <Name>Other</Name>
++      <Directory>Other.directory</Directory>
++      <OnlyUnallocated/>
++      <Include>
++        <And>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++          <Category>Application</Category>
++          <Not><Category>Core</Category></Not>
++          <Not><Category>Settings</Category></Not>
++        </And>
++      </Include>
++    </Menu> <!-- End KOther -->
++  </Menu> <!-- KDE -->
+ 
+ </Menu> <!-- End Applications -->
diff --git a/x11/gnome-menus/files/patch-layout::preferences.menu b/x11/gnome-menus/files/patch-layout::preferences.menu
new file mode 100644
index 000000000..fef1dc0dc
--- /dev/null
+++ b/x11/gnome-menus/files/patch-layout::preferences.menu
@@ -0,0 +1,41 @@
+--- layout/preferences.menu.orig	Sat Dec 11 07:58:50 2004
++++ layout/preferences.menu	Tue Mar  1 01:28:57 2005
+@@ -9,12 +9,15 @@
+   <DefaultAppDirs/>
+   <DefaultDirectoryDirs/>
+ 
+-  <!-- Read in overrides and child menus from preferences-merged/ -->
+-  <DefaultMergeDirs/>
+-
+   <!-- Stuff in the toplevel -->
+   <Include>
+     <And>
++      <Not>
++        <Or>
++          <Category>Qt</Category>
++          <Category>KDE</Category>
++        </Or>
++      </Not>
+       <Category>Settings</Category>
+       <Not>
+         <Or>
+@@ -36,10 +39,19 @@
+     <Directory>Settings-Accessibility.directory</Directory>
+     <Include>
+       <And>
++        <Not>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++        </Not>
+         <Category>Settings</Category>
+         <Category>Accessibility</Category>
+       </And>
+     </Include>
+   </Menu>
++
++  <!-- Read in overrides and child menus from preferences-merged/ -->
++  <DefaultMergeDirs/>
+ 
+ </Menu>     <!-- End Prefs -->
diff --git a/x11/gnome-menus/files/patch-layout::settings.menu b/x11/gnome-menus/files/patch-layout::settings.menu
new file mode 100644
index 000000000..115f03ce7
--- /dev/null
+++ b/x11/gnome-menus/files/patch-layout::settings.menu
@@ -0,0 +1,22 @@
+--- layout/settings.menu.orig	Thu Apr 14 17:36:13 2005
++++ layout/settings.menu	Tue May 17 18:42:56 2005
+@@ -25,10 +25,19 @@
+     <Directory>System-Settings.directory</Directory>
+     <Include>
+       <And>
++        <Not>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++        </Not>
+         <Category>Settings</Category>
+         <Category>System</Category>
+       </And>
+     </Include>
+   </Menu>     <!-- End System Settings -->
++
++  <!-- Read in overrides and child menus from settings-merged/ -->
++  <DefaultMergeDirs/>
+ 
+ </Menu> <!-- End Applications -->
diff --git a/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py b/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py
new file mode 100644
index 000000000..2306f0609
--- /dev/null
+++ b/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py
@@ -0,0 +1,20 @@
+--- simple-editor/GMenuSimpleEditor/menutreemodel.py.orig	Mon Apr 11 05:36:04 2005
++++ simple-editor/GMenuSimpleEditor/menutreemodel.py	Tue Sep  6 11:04:46 2005
+@@ -29,7 +29,7 @@
+     if os.environ.has_key ("XDG_CONFIG_DIRS"):
+         conf_dirs = os.environ["XDG_CONFIG_DIRS"]
+     if not conf_dirs:
+-        conf_dirs = "/etc/xdg"
++	conf_dirs = "%%X11BASE%%/etc/xdg"
+ 
+     for conf_dir in conf_dirs.split (":"):
+         menu_file_path = os.path.join (conf_dir, "menus", menu_file)
+@@ -51,7 +51,7 @@
+     if os.environ.has_key ("XDG_DATA_DIRS"):
+         data_dirs = os.environ["XDG_DATA_DIRS"]
+     if not data_dirs:
+-        data_dirs = "/usr/local/share/:/usr/share/"
++	data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"
+ 
+     for data_dir in data_dirs.split (":"):
+         retval = load_icon_from_path (os.path.join (data_dir, "pixmaps", icon_value))