Say hello to Mate 1.6.

Mate is a lite desktop forked from gnome2.

Most of the work is done by Jeremy Messenger (mezz@). The only thing I did
was update a few ports to later 1.6 release and attempting to keep up with
ports infra changes. Resulting bugs are all mine.

Mate is a sort of replacement for Gnome 2. So people wanting to keep a
Gnome 2 like desktop should switch. Gnome 2 will be replaced by Gnome 3
in the near future. This switch will be announce with a transition time
so people have more time to switch if they haven't already.

This release was made possible by everyone that send friendly pokes to
keep mate on my mind.

Approved by:	portmgr (bapt)

4 files changed, 529 insertions, 0 deletions

diff --git a/x11/mate-menus/files/GNOME.directory b/x11/mate-menus/files/GNOME.directory
new file mode 100644
index 000000000000..f6c98fff65f3
--- /dev/null
+++ b/x11/mate-menus/files/GNOME.directory
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=GNOME
+Comment=Some comment about GNOME menu
+Icon=/usr/local/share/icons/gnome/48x48/places/gnome-main-menu.png
+Type=Directory
diff --git a/x11/mate-menus/files/KDE.directory b/x11/mate-menus/files/KDE.directory
new file mode 100644
index 000000000000..d8cacb75019e
--- /dev/null
+++ b/x11/mate-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/mate-menus/files/patch-layout_mate-applications.menu b/x11/mate-menus/files/patch-layout_mate-applications.menu
new file mode 100644
index 000000000000..b50b8267ee4a
--- /dev/null
+++ b/x11/mate-menus/files/patch-layout_mate-applications.menu
@@ -0,0 +1,459 @@
+--- layout/mate-applications.menu.orig	2013-03-31 16:16:30.000000000 -0500
++++ layout/mate-applications.menu	2013-04-13 21:48:00.000000000 -0500
+@@ -6,9 +6,8 @@
+   <Name>Applications</Name>
+   <Directory>mate-menu-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/mate/apps</LegacyDir>
+ 
+   <!-- Read standard .directory and .desktop file locations -->
+@@ -31,6 +30,9 @@
+ 	     applications here -->
+         <Not><Category>Accessibility</Category></Not>
+         <Not><Category>System</Category></Not>
++	<Not><Category>Qt</Category></Not>
++	<Not><Category>KDE</Category></Not>
++	<Not><Category>GNOME</Category></Not>
+       </And>
+     </Include>
+   </Menu> <!-- End Accessories -->
+@@ -43,6 +45,9 @@
+       <And>
+         <Category>Accessibility</Category>
+         <Not><Category>Settings</Category></Not>
++	<Not><Category>Qt</Category></Not>
++	<Not><Category>KDE</Category></Not>
++	<Not><Category>GNOME</Category></Not>
+       </And>
+     </Include>
+   </Menu> <!-- End Accessibility -->
+@@ -54,6 +59,9 @@
+     <Include>
+       <And>
+         <Category>Development</Category>
++        <Not><Category>Qt</Category></Not>
++        <Not><Category>KDE</Category></Not>
++	<Not><Category>GNOME</Category></Not>
+       </And>
+       <Filename>emacs.desktop</Filename>
+     </Include>
+@@ -66,6 +74,9 @@
+     <Include>
+       <And>
+         <Category>Education</Category>
++	<Not><Category>Qt</Category></Not>
++	<Not><Category>KDE</Category></Not>
++	<Not><Category>GNOME</Category></Not>
+       </And>
+     </Include>
+   </Menu> <!-- End Education -->
+@@ -77,6 +88,9 @@
+     <Include>
+       <And>
+         <Category>Game</Category>
++	<Not><Category>Qt</Category></Not>
++	<Not><Category>KDE</Category></Not>
++	<Not><Category>GNOME</Category></Not>
+       </And>
+     </Include>
+   </Menu> <!-- End Games -->
+@@ -88,6 +102,9 @@
+     <Include>
+       <And>
+         <Category>Graphics</Category>
++	<Not><Category>Qt</Category></Not>
++	<Not><Category>KDE</Category></Not>
++	<Not><Category>GNOME</Category></Not>
+       </And>
+     </Include>
+   </Menu> <!-- End Graphics -->
+@@ -99,6 +116,9 @@
+     <Include>
+       <And>
+         <Category>Network</Category>
++	<Not><Category>Qt</Category></Not>
++	<Not><Category>KDE</Category></Not>
++	<Not><Category>GNOME</Category></Not>
+       </And>
+     </Include>
+   </Menu>   <!-- End Internet -->
+@@ -110,6 +130,9 @@
+     <Include>
+       <And>
+         <Category>AudioVideo</Category>
++	<Not><Category>Qt</Category></Not>
++	<Not><Category>KDE</Category></Not>
++	<Not><Category>GNOME</Category></Not>
+       </And>
+     </Include>
+   </Menu>   <!-- End Multimedia -->
+@@ -121,6 +144,9 @@
+     <Include>
+       <And>
+         <Category>Office</Category>
++	<Not><Category>Qt</Category></Not>
++	<Not><Category>KDE</Category></Not>
++	<Not><Category>GNOME</Category></Not>
+       </And>
+     </Include>
+   </Menu> <!-- End Office -->
+@@ -133,6 +159,9 @@
+       <And>
+         <Category>System</Category>
+         <Not><Category>Settings</Category></Not>
++	<Not><Category>Qt</Category></Not>
++	<Not><Category>KDE</Category></Not>
++	<Not><Category>GNOME</Category></Not>
+       </And>
+     </Include>
+   </Menu>   <!-- End System Tools -->
+@@ -147,8 +176,344 @@
+         <Not><Category>Core</Category></Not>
+         <Not><Category>Settings</Category></Not>
+         <Not><Category>Screensaver</Category></Not>
++	<Not><Category>Qt</Category></Not>
++	<Not><Category>KDE</Category></Not>
++	<Not><Category>GNOME</Category></Not>
+       </And>
+     </Include>
+   </Menu> <!-- End Other -->
+ 
++  <!-- Read in overrides and child menus from applications-merged/ -->
++  <DefaultMergeDirs/>
++
++  <!-- GNOME -->
++  <Menu>
++    <Name>GNOME</Name>
++    <Directory>GNOME.directory</Directory>
++
++    <!-- GNOME Accessories submenu -->
++    <Menu>
++      <Name>Accessories</Name>
++      <Directory>mate-utility.directory</Directory>
++      <Include>
++        <And>
++          <Category>GNOME</Category>
++          <Category>Utility</Category>
++          <Not><Category>Accessibility</Category></Not>
++          <Not><Category>System</Category></Not>
++        </And>
++      </Include>
++    </Menu> <!-- End GNOME Accessories -->
++
++    <!-- GNOME Accessibility submenu -->
++    <Menu>
++      <Name>Universal Access</Name>
++      <Directory>mate-utility-accessibility.directory</Directory>
++      <Include>
++        <And>
++          <Category>GNOME</Category>
++          <Category>Accessibility</Category>
++          <Not><Category>Settings</Category></Not>
++        </And>
++      </Include>
++    </Menu> <!-- End GNOME Accessibility -->
++
++    <!-- GNOME Development Tools -->
++    <Menu>
++      <Name>Development</Name>
++      <Directory>mate-development.directory</Directory>
++      <Include>
++        <And>
++          <Category>GNOME</Category>
++          <Category>Development</Category>
++        </And>
++      </Include>
++    </Menu> <!-- End GNOME Development Tools -->
++
++    <!-- GNOME Education -->
++    <Menu>
++      <Name>Education</Name>
++      <Directory>mate-education.directory</Directory>
++      <Include>
++        <And>
++          <Category>GNOME</Category>
++          <Category>Education</Category>
++        </And>
++      </Include>
++    </Menu> <!-- End GNOME Education -->
++
++    <!-- GNOME Games -->
++    <Menu>
++      <Name>Games</Name>
++      <Directory>mate-game.directory</Directory>
++      <Include>
++        <And>
++          <Category>GNOME</Category>
++          <Category>Game</Category>
++        </And>
++      </Include>
++    </Menu> <!-- End GNOME Games -->
++
++    <!-- GNOME Graphics -->
++    <Menu>
++      <Name>Graphics</Name>
++      <Directory>mate-graphics.directory</Directory>
++      <Include>
++        <And>
++          <Category>GNOME</Category>
++          <Category>Graphics</Category>
++        </And>
++      </Include>
++    </Menu> <!-- End GNOME Graphics -->
++
++    <!-- GNOME Internet -->
++    <Menu>
++      <Name>Internet</Name>
++      <Directory>mate-network.directory</Directory>
++      <Include>
++        <And>
++          <Category>GNOME</Category>
++          <Category>Network</Category>
++        </And>
++      </Include>
++    </Menu> <!-- End GNOME Internet -->
++
++    <!-- GNOME Multimedia -->
++    <Menu>
++      <Name>Multimedia</Name>
++      <Directory>mate-audio-video.directory</Directory>
++      <Include>
++        <And>
++          <Category>GNOME</Category>
++          <Category>AudioVideo</Category>
++        </And>
++      </Include>
++    </Menu> <!-- End GNOME Multimedia -->
++
++    <!-- GNOME Office -->
++    <Menu>
++      <Name>Office</Name>
++      <Directory>mate-office.directory</Directory>
++      <Include>
++        <And>
++          <Category>GNOME</Category>
++          <Category>Office</Category>
++        </And>
++      </Include>
++    </Menu><!-- End GNOME Office -->
++
++    <!-- GNOME System Tools-->
++    <Menu>
++      <Name>System</Name>
++      <Directory>mate-system-tools.directory</Directory>
++      <Include>
++        <And>
++          <Category>GNOME</Category>
++          <Category>System</Category>
++          <Not><Category>Settings</Category></Not>
++        </And>
++      </Include>
++    </Menu>   <!-- End GNOME System Tools -->
++
++    <!-- GNOME Other -->
++    <Menu>
++      <Name>Other</Name>
++      <Directory>mate-other.directory</Directory>
++      <OnlyUnallocated/>
++      <Include>
++        <And>
++          <Category>GNOME</Category>
++          <Category>Application</Category>
++          <Not><Category>Core</Category></Not>
++          <Not><Category>Settings</Category></Not>
++          <Not><Category>Screensaver</Category></Not>
++        </And>
++      </Include>
++    </Menu> <!-- End GNOME Other -->
++  </Menu> <!-- GNOME -->
++
++  <!-- KDE -->
++  <Menu>
++    <KDELegacyDirs/>
++    <Name>KDE</Name>
++    <Directory>KDE.directory</Directory>
++
++    <!-- KAccessories submenu -->
++    <Menu>
++      <Name>Accessories</Name>
++      <Directory>mate-utility.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>mate-utility-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>mate-development.directory</Directory>
++      <Include>
++        <And>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++          <Category>Development</Category>
++        </And>
++      </Include>
++    </Menu> <!-- End KDevelopment Tools -->
++
++    <!-- KEducation -->
++    <Menu>
++      <Name>Education</Name>
++      <Directory>mate-education.directory</Directory>
++      <Include>
++        <And>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++          <Category>Education</Category>
++        </And>
++      </Include>
++    </Menu> <!-- End KEducation -->
++
++    <!-- KGames -->
++    <Menu>
++      <Name>Games</Name>
++      <Directory>mate-game.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>mate-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>mate-network.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>mate-audio-video.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>mate-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>mate-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>mate-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/mate-menus/files/patch-layout_mate-settings.menu b/x11/mate-menus/files/patch-layout_mate-settings.menu
new file mode 100644
index 000000000000..48b33c41dd04
--- /dev/null
+++ b/x11/mate-menus/files/patch-layout_mate-settings.menu
@@ -0,0 +1,60 @@
+--- layout/mate-settings.menu.orig	2013-04-13 22:55:06.000000000 -0500
++++ layout/mate-settings.menu	2013-04-13 22:55:49.000000000 -0500
+@@ -27,6 +27,7 @@
+         <Category>Settings</Category>
+         <Not>
+           <Or>
++            <Category>GNOME</Category>
+             <Category>System</Category>
+             <Filename>matecc.desktop</Filename>
+           </Or>
+@@ -43,10 +44,49 @@
+       <And>
+         <Category>Settings</Category>
+         <Category>System</Category>
++        <Not>
++          <Or>
++            <Category>GNOME</Category>
++          </Or>
++        </Not>
+       </And>
+     </Include>
+   </Menu>     <!-- End System Settings -->
+ 
++  <Menu>
++    <Name>GNOME</Name>
++    <Directory>GNOME.directory</Directory>
++    <Menu>
++      <Name>Preferences</Name>
++      <Directory>mate-settings.directory</Directory>
++      <Include>
++        <And>
++          <Category>GNOME</Category>
++          <Category>Settings</Category>
++          <Not>
++            <Or>
++              <Category>System</Category>
++              <Filename>matecc.desktop</Filename>
++            </Or>
++          </Not>
++        </And>
++      </Include>
++    </Menu>
++
++    <!-- System Settings -->
++    <Menu>
++      <Name>Administration</Name>
++      <Directory>mate-settings-system.directory</Directory>
++      <Include>
++        <And>
++          <Category>GNOME</Category>
++          <Category>Settings</Category>
++          <Category>System</Category>
++        </And>
++      </Include>
++    </Menu>     <!-- End System Settings -->
++  </Menu>
++
+   <Layout>
+     <Menuname>Preferences</Menuname>
+     <Menuname>Administration</Menuname>