[PC-BSD Commits] r4136 - in pbibuild/modules/emulator/wine: . kmenu-dir overlay-dir
svn at pcbsd.org
svn at pcbsd.org
Tue Jun 23 12:32:35 PDT 2009
Author: kris
Date: 2009-06-23 12:32:35 -0700 (Tue, 23 Jun 2009)
New Revision: 4136
Added:
pbibuild/modules/emulator/wine/kmenu-dir/function_grep.pl
pbibuild/modules/emulator/wine/kmenu-dir/regsvr32
pbibuild/modules/emulator/wine/kmenu-dir/widl
pbibuild/modules/emulator/wine/kmenu-dir/wineboot
pbibuild/modules/emulator/wine/kmenu-dir/winebuild
pbibuild/modules/emulator/wine/kmenu-dir/wineconsole
pbibuild/modules/emulator/wine/kmenu-dir/winecpp
pbibuild/modules/emulator/wine/kmenu-dir/winedbg
pbibuild/modules/emulator/wine/kmenu-dir/winedump
pbibuild/modules/emulator/wine/kmenu-dir/winefile
pbibuild/modules/emulator/wine/kmenu-dir/wineg++
pbibuild/modules/emulator/wine/kmenu-dir/winegcc
pbibuild/modules/emulator/wine/kmenu-dir/winemaker
pbibuild/modules/emulator/wine/kmenu-dir/winemine
pbibuild/modules/emulator/wine/kmenu-dir/winepath
pbibuild/modules/emulator/wine/kmenu-dir/wmc
pbibuild/modules/emulator/wine/kmenu-dir/wrc
Modified:
pbibuild/modules/emulator/wine/copy-files
pbibuild/modules/emulator/wine/overlay-dir/PBI.RemoveScript.sh
pbibuild/modules/emulator/wine/overlay-dir/PBI.SetupScript.sh
pbibuild/modules/emulator/wine/pbi.conf
pbibuild/modules/emulator/wine/preportmake.sh
Log:
Fixed up Wine, now works properly with OpenGL apps again, and also we include
all the various CLI commands like the port does
Modified: pbibuild/modules/emulator/wine/copy-files
===================================================================
--- pbibuild/modules/emulator/wine/copy-files 2009-06-23 19:05:49 UTC (rev 4135)
+++ pbibuild/modules/emulator/wine/copy-files 2009-06-23 19:32:35 UTC (rev 4136)
@@ -1,36 +0,0 @@
-/usr/local/bin/fontforge bin/
-/usr/local/bin/function_grep.pl bin/
-/usr/local/bin/gendiff bin/
-/usr/local/bin/msiexec bin/
-/usr/local/bin/notepad bin/
-/usr/local/bin/progman bin/
-/usr/local/bin/regedit bin/
-/usr/local/bin/regsvr32 bin/
-/usr/local/bin/sfddiff bin/
-/usr/local/bin/uninstaller bin/
-/usr/local/bin/widl bin/
-/usr/local/bin/wine bin/
-/usr/local/bin/wine-pthread bin/
-/usr/local/bin/wineboot bin/
-/usr/local/bin/winebrowser bin/
-/usr/local/bin/winebuild bin/
-/usr/local/bin/winecfg bin/
-/usr/local/bin/wineconsole bin/
-/usr/local/bin/winecpp bin/
-/usr/local/bin/winedbg bin/
-/usr/local/bin/winedump bin/
-/usr/local/bin/winefile bin/
-/usr/local/bin/wineg++ bin/
-/usr/local/bin/winegcc bin/
-/usr/local/bin/winelauncher bin/
-/usr/local/bin/winemaker bin/
-/usr/local/bin/winemine bin/
-/usr/local/bin/winepath bin/
-/usr/local/bin/wineprefixcreate bin/
-/usr/local/bin/wineserver bin/
-/usr/local/bin/wineshelllink bin/
-/usr/local/bin/winhelp bin/
-/usr/local/bin/wmc bin/
-/usr/local/bin/wrc bin/
-/usr/local/lib/wine autolibs/wine
-/usr/local/share/wine share/wine
Modified: pbibuild/modules/emulator/wine/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/emulator/wine/overlay-dir/PBI.RemoveScript.sh 2009-06-23 19:05:49 UTC (rev 4135)
+++ pbibuild/modules/emulator/wine/overlay-dir/PBI.RemoveScript.sh 2009-06-23 19:32:35 UTC (rev 4136)
@@ -6,18 +6,28 @@
# ${2} is the username of person performing the deletion.
# TIP: 'kdialog' should be used for user interaction.
#########################################
-cd /home
- for i in `ls`
- do
- if [ -d "/home/${i}/.wine" ]
- then
- kdialog --title "Uninstalling Wine!" --yesno "Do you want to delete this PBI completely?\nIf you answer 'Yes', configuration files and all the software installed in /home/${i}/.wine will be erased."
- if [ "$?" = "0" ]
- then
- rm -r /home/${i}/.wine
- rm /home/${i}/.config/menus/applications-merged/wine-Programs*
- rm /home/${i}/.local/share/desktop-directories/wine-*
- rm -rf /home/${i}/.local/share/applications/wine
- fi
- fi
- done
+
+rm /Programs/bin/wine
+rm /Programs/bin/winecfg
+rm /Programs/bin/wineserver
+rm /Programs/bin/wineprefixcreate
+rm /Programs/bin/regedit
+rm /Programs/bin/msiexec
+rm /Programs/bin/function_grep.pl
+rm /Programs/bin/regsvr32
+rm /Programs/bin/widl
+rm /Programs/bin/wineboot
+rm /Programs/bin/winebuild
+rm /Programs/bin/wineconsole
+rm /Programs/bin/winecpp
+rm /Programs/bin/winedbg
+rm /Programs/bin/winedump
+rm /Programs/bin/winefile
+rm /Programs/bin/wineg++
+rm /Programs/bin/winegcc
+rm /Programs/bin/winemaker
+rm /Programs/bin/winemine
+rm /Programs/bin/winepath
+rm /Programs/bin/wmc
+rm /Programs/bin/wrc
+
Modified: pbibuild/modules/emulator/wine/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/emulator/wine/overlay-dir/PBI.SetupScript.sh 2009-06-23 19:05:49 UTC (rev 4135)
+++ pbibuild/modules/emulator/wine/overlay-dir/PBI.SetupScript.sh 2009-06-23 19:32:35 UTC (rev 4136)
@@ -15,15 +15,44 @@
# echo 'MSG: <text>' # Display this text above progress bar
#########################################
-rm /Programs/bin/wine
-rm /Programs/bin/winecfg
-rm /Programs/bin/wineserver
-rm /Programs/bin/wineprefixcreate
-rm /Programs/bin/regedit
-rm /Programs/bin/msiexec
-ln -s /Programs/${PROGDIR}/.sbin/wine /Programs/bin/wine
-ln -s /Programs/${PROGDIR}/.sbin/winecfg /Programs/bin/winecfg
-ln -s /Programs/${PROGDIR}/.sbin/wineserver /Programs/bin/wineserver
-ln -s /Programs/${PROGDIR}/.sbin/wineprefixcreate /Programs/bin/wineprefixcreate
-ln -s /Programs/${PROGDIR}/.sbin/regedit /Programs/bin/regedit
-ln -s /Programs/${PROGDIR}/.sbin/msiexec.sh /Programs/bin/msiexec
+ln -fs /Programs/${PROGDIR}/.sbin/wine /Programs/bin/wine
+ln -fs /Programs/${PROGDIR}/.sbin/winecfg /Programs/bin/winecfg
+ln -fs /Programs/${PROGDIR}/.sbin/wineserver /Programs/bin/wineserver
+ln -fs /Programs/${PROGDIR}/.sbin/wineprefixcreate /Programs/bin/wineprefixcreate
+ln -fs /Programs/${PROGDIR}/.sbin/regedit /Programs/bin/regedit
+ln -fs /Programs/${PROGDIR}/.sbin/msiexec.sh /Programs/bin/msiexec
+ln -fs /Programs/${PROGDIR}/.sbin/function_grep.pl /Programs/bin/function_grep.pl
+ln -fs /Programs/${PROGDIR}/.sbin/regsvr32 /Programs/bin/regsvr32
+ln -fs /Programs/${PROGDIR}/.sbin/widl /Programs/bin/widl
+ln -fs /Programs/${PROGDIR}/.sbin/wineboot /Programs/bin/wineboot
+ln -fs /Programs/${PROGDIR}/.sbin/winebuild /Programs/bin/winebuild
+ln -fs /Programs/${PROGDIR}/.sbin/wineconsole /Programs/bin/wineconsole
+ln -fs /Programs/${PROGDIR}/.sbin/winecpp /Programs/bin/winecpp
+ln -fs /Programs/${PROGDIR}/.sbin/winedbg /Programs/bin/winedbg
+ln -fs /Programs/${PROGDIR}/.sbin/winedump /Programs/bin/winedump
+ln -fs /Programs/${PROGDIR}/.sbin/winefile /Programs/bin/winefile
+ln -fs /Programs/${PROGDIR}/.sbin/wineg++ /Programs/bin/wineg++
+ln -fs /Programs/${PROGDIR}/.sbin/winegcc /Programs/bin/winegcc
+ln -fs /Programs/${PROGDIR}/.sbin/winemaker /Programs/bin/winemaker
+ln -fs /Programs/${PROGDIR}/.sbin/winemine /Programs/bin/winemine
+ln -fs /Programs/${PROGDIR}/.sbin/winepath /Programs/bin/winepath
+ln -fs /Programs/${PROGDIR}/.sbin/wmc /Programs/bin/wmc
+ln -fs /Programs/${PROGDIR}/.sbin/wrc /Programs/bin/wrc
+
+
+# Make sure we link in any openGL libs from the system
+rm /Programs/${PROGDIR}/lib/libGL*
+if [ -e "/PCBSD/local/lib" ]
+then
+ cd /PCBSD/local/lib
+ for i in `ls libGL*`
+ do
+ ln -s /PCBSD/local/lib/${i} /Programs/${PROGDIR}/lib/${i}
+ done
+else
+ cd /usr/local/lib
+ for i in `ls libGL*`
+ do
+ ln -s /usr/local/lib/${i} /Programs/${PROGDIR}/lib/${i}
+ done
+fi
Modified: pbibuild/modules/emulator/wine/pbi.conf
===================================================================
--- pbibuild/modules/emulator/wine/pbi.conf 2009-06-23 19:05:49 UTC (rev 4135)
+++ pbibuild/modules/emulator/wine/pbi.conf 2009-06-23 19:32:35 UTC (rev 4136)
@@ -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="01"
+BUILDKEY="05"
PBIAUTOPOPULATE="YES"
export PBIAUTOPOPULATE
Modified: pbibuild/modules/emulator/wine/preportmake.sh
===================================================================
--- pbibuild/modules/emulator/wine/preportmake.sh 2009-06-23 19:05:49 UTC (rev 4135)
+++ pbibuild/modules/emulator/wine/preportmake.sh 2009-06-23 19:32:35 UTC (rev 4136)
@@ -30,5 +30,8 @@
cd /usr/ports/graphics/jpeg
make install clean
+cd /usr/ports/x11-fonts/liberation-fonts-ttf/
+make install clean
+
cd /usr/ports/x11-fonts/dejavu
make install clean
More information about the Commits
mailing list