[PC-BSD Commits] r17491 - in pbi/modules/editors/openoffice-3: . scripts xdg-desktop xdg-menu

[svn at pcbsd.org]

Author: kenmoore
Date: 2012-06-28 18:04:03 +0000 (Thu, 28 Jun 2012)
New Revision: 17491

Modified:
   pbi/modules/editors/openoffice-3/pbi.conf
   pbi/modules/editors/openoffice-3/scripts/post-portmake.sh
   pbi/modules/editors/openoffice-3/xdg-desktop/openoffice-3.4.0-sbase.desktop
   pbi/modules/editors/openoffice-3/xdg-menu/openoffice-3.4.0-sbase.desktop
Log:
Final fix for the new openoffice-3/ module. This just fixes the desktop/menu entries



Modified: pbi/modules/editors/openoffice-3/pbi.conf
===================================================================
--- pbi/modules/editors/openoffice-3/pbi.conf	2012-06-28 17:47:09 UTC (rev 17490)
+++ pbi/modules/editors/openoffice-3/pbi.conf	2012-06-28 18:04:03 UTC (rev 17491)
@@ -17,7 +17,7 @@
 PBI_REQUIRESROOT="NO"
 
 # -- Auto-build Configuration Options --
-PBI_BUILDKEY="01"
+PBI_BUILDKEY="02"
 PBI_AB_PRIORITY="10"
 PBI_AB_NOTMPFS="YES"
 

Modified: pbi/modules/editors/openoffice-3/scripts/post-portmake.sh
===================================================================
--- pbi/modules/editors/openoffice-3/scripts/post-portmake.sh	2012-06-28 17:47:09 UTC (rev 17490)
+++ pbi/modules/editors/openoffice-3/scripts/post-portmake.sh	2012-06-28 18:04:03 UTC (rev 17491)
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 cd ${PBI_PROGDIRPATH}/bin
-ln -s openoffice-${PBI_PROGVERSION} openoffice
 ln -s open*sbase sbase
 ln -s open*scalc scalc
 ln -s open*sdraw sdraw

Modified: pbi/modules/editors/openoffice-3/xdg-desktop/openoffice-3.4.0-sbase.desktop
===================================================================
--- pbi/modules/editors/openoffice-3/xdg-desktop/openoffice-3.4.0-sbase.desktop	2012-06-28 17:47:09 UTC (rev 17490)
+++ pbi/modules/editors/openoffice-3/xdg-desktop/openoffice-3.4.0-sbase.desktop	2012-06-28 18:04:03 UTC (rev 17491)
@@ -4,7 +4,7 @@
 Type=Application
 Name=Apache OpenOffice
 GenericName=apache openoffice
-Exec=%%PBI_EXEDIR%%/openoffice
+Exec=%%PBI_EXEDIR%%/soffice
 Path=%%PBI_APPDIR%%
 Icon=%%PBI_APPDIR%%/openoffice.png
 StartupNotify=true

Modified: pbi/modules/editors/openoffice-3/xdg-menu/openoffice-3.4.0-sbase.desktop
===================================================================
--- pbi/modules/editors/openoffice-3/xdg-menu/openoffice-3.4.0-sbase.desktop	2012-06-28 17:47:09 UTC (rev 17490)
+++ pbi/modules/editors/openoffice-3/xdg-menu/openoffice-3.4.0-sbase.desktop	2012-06-28 18:04:03 UTC (rev 17491)
@@ -4,7 +4,7 @@
 Type=Application
 Name=Apache OpenOffice
 GenericName=apache openoffice
-Exec=%%PBI_EXEDIR%%/openoffice
+Exec=%%PBI_EXEDIR%%/soffice
 Path=%%PBI_APPDIR%%
 Icon=%%PBI_APPDIR%%/openoffice.png
 StartupNotify=true