[PC-BSD Commits] r1879 - in pbibuild/modules/winrar: . overlay-dir overlay-dir/bin

[svn at pcbsd.org]

Author: gonzalo
Date: 2008-05-09 07:23:05 -0700 (Fri, 09 May 2008)
New Revision: 1879

Removed:
   pbibuild/modules/winrar/overlay-dir/bin/winrarpath
Modified:
   pbibuild/modules/winrar/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/winrar/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/winrar/overlay-dir/winrar.desktop
   pbibuild/modules/winrar/pbi.conf
Log:
WinRAR fixes

Modified: pbibuild/modules/winrar/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/winrar/overlay-dir/PBI.RemoveScript.sh	2008-05-09 13:39:29 UTC (rev 1878)
+++ pbibuild/modules/winrar/overlay-dir/PBI.RemoveScript.sh	2008-05-09 14:23:05 UTC (rev 1879)
@@ -7,7 +7,6 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 rm -fR /usr/local/bin/winrar
-rm -fR /usr/local/bin/winrarpath
 rm -fR /usr/local/share/icons/*/*/mimetypes/winrar.png
 #remove the new winrar.desktop entry to all users
   cd /home

Modified: pbibuild/modules/winrar/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/winrar/overlay-dir/PBI.SetupScript.sh	2008-05-09 13:39:29 UTC (rev 1878)
+++ pbibuild/modules/winrar/overlay-dir/PBI.SetupScript.sh	2008-05-09 14:23:05 UTC (rev 1879)
@@ -15,7 +15,6 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 ln -s /Programs/${PROGDIR}/.sbin/winrar /usr/local/bin/winrar
-ln -s /Programs/${PROGDIR}/.sbin/winrarpath /usr/local/bin/winrarpath
 chmod -R 777 /Programs/${PROGDIR}/WINRAR
 chmod +x /Programs/${PROGDIR}/bin/winrar
 USER=`who | grep :0 | cut -f 1 -d " "`

Deleted: pbibuild/modules/winrar/overlay-dir/bin/winrarpath

Modified: pbibuild/modules/winrar/overlay-dir/winrar.desktop
===================================================================
--- pbibuild/modules/winrar/overlay-dir/winrar.desktop	2008-05-09 13:39:29 UTC (rev 1878)
+++ pbibuild/modules/winrar/overlay-dir/winrar.desktop	2008-05-09 14:23:05 UTC (rev 1879)
@@ -13,7 +13,7 @@
 Name[pl]=Otwórz w Winrar
 Name[de]=Öffnen mit Winrar
 Icon=winrar
-Exec=winrar "`winrarpath -w %f`"
+Exec=winrar "`/Programs/WinRAR0.9.61/bin/winepath -w %f`"
 
 
 
@@ -25,7 +25,7 @@
 Name[pl]=Wypakuj tutaj
 Name[de]=Hier entpacken
 Icon=winrar
-Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar x -iext -ow -ver  "`winrarpath -w ./.winerartmp/`*.*" "`winrarpath -w ./`" ; rm -R ./.winerartmp
+Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar x -iext -ow -ver  "`/Programs/WinRAR0.9.61/bin/winepath -w ./.winerartmp/`*.*" "`/Programs/WinRAR0.9.61/bin/winepath -w ./`" ; rm -R ./.winerartmp
 
 
 
@@ -37,7 +37,7 @@
 Name[pl]=Wypakuj do folderu
 Name[de]=Entpacken in Ordner
 Icon=winrar
-Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar x -ow -ver -ad "`winrarpath -w ./.winerartmp/`*.*" "`winrarpath -w ./`" ; rm -R ./.winerartmp
+Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar x -ow -ver -ad "`/Programs/WinRAR0.9.61/bin/winepath -w ./.winerartmp/`*.*" "`/Programs/WinRAR0.9.61/bin/winepath -w ./`" ; rm -R ./.winerartmp
 
 
 
@@ -49,7 +49,7 @@
 Name[pl]=Wypakuj pliki...
 Name[de]=Entpacken nach...
 Icon=winrar
-Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar x -iext -ow -ver -- "`winrarpath -w ./.winerartmp/`*.*" '?\' ; rm -R ./.winerartmp
+Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar x -iext -ow -ver -- "`/Programs/WinRAR0.9.61/bin/winepath -w ./.winerartmp/`*.*" '?\' ; rm -R ./.winerartmp
 
 
 
@@ -61,7 +61,7 @@
 Name[pl]=Szybka kompresja
 Name[de]=Schnell komprimieren
 Icon=winrar
-Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar a -r -ep1 -iext "`kdialog --inputbox 'Please, enter the archive name' \`basename %F\`  `".rar "`winrarpath -w ./.winerartmp/`*" ; rm -R ./.winerartmp
+Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar a -r -ep1 -iext "`kdialog --inputbox 'Please, enter the archive name' \`basename %F\`  `".rar "`/Programs/WinRAR0.9.61/bin/winepath -w ./.winerartmp/`*" ; rm -R ./.winerartmp
 
 
 
@@ -73,7 +73,7 @@
 Name[pl]=Kompresuj...
 Name[de]=Komprimieren...
 Icon=winrar
-Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar a -r -iext -ep1 -- . "`winrarpath -w ./.winerartmp/`*" ; rm -R ./.winerartmp
+Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar a -r -iext -ep1 -- . "`/Programs/WinRAR0.9.61/bin/winepath -w ./.winerartmp/`*" ; rm -R ./.winerartmp
 
 
 
@@ -85,4 +85,4 @@
 Name[pl]=Napraw archiwum
 Name[de]=Archiv reparieren
 Icon=winrar
-Exec=cd %D ;winrar R "`winrarpath -w %f`"
+Exec=cd %D ;winrar R "`/Programs/WinRAR0.9.61/bin/winepath -w %f`"

Modified: pbibuild/modules/winrar/pbi.conf
===================================================================
--- pbibuild/modules/winrar/pbi.conf	2008-05-09 13:39:29 UTC (rev 1878)
+++ pbibuild/modules/winrar/pbi.conf	2008-05-09 14:23:05 UTC (rev 1879)
@@ -32,7 +32,7 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="05"
+BUILDKEY="06"
 
 # Don't build this PBI on certian processors (i386 / amd64)
 ARCHIGNORE="amd64" ; export ARCHIGNORE