[PC-BSD Commits] r4823 - in pbibuild/modules/emulator/wine: . overlay-dir

[svn at pcbsd.org]

Author: kris
Date: 2009-10-30 07:39:11 -0700 (Fri, 30 Oct 2009)
New Revision: 4823

Removed:
   pbibuild/modules/emulator/wine/overlay-dir/autolibs/
   pbibuild/modules/emulator/wine/overlay-dir/share/
Modified:
   pbibuild/modules/emulator/wine/copy-files
   pbibuild/modules/emulator/wine/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/emulator/wine/pbi.conf
   pbibuild/modules/emulator/wine/preportmake.sh
Log:

Cleanup the wine port, and make sure it builds freetype, since on amd64 it can't include the amd64 version of it



Modified: pbibuild/modules/emulator/wine/copy-files
===================================================================
--- pbibuild/modules/emulator/wine/copy-files	2009-10-30 09:00:24 UTC (rev 4822)
+++ pbibuild/modules/emulator/wine/copy-files	2009-10-30 14:39:11 UTC (rev 4823)
@@ -1 +1,2 @@
 /usr/local/lib/libjpeg* lib/
+/usr/local/lib/libfree* lib/

Modified: pbibuild/modules/emulator/wine/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/emulator/wine/overlay-dir/PBI.SetupScript.sh	2009-10-30 09:00:24 UTC (rev 4822)
+++ pbibuild/modules/emulator/wine/overlay-dir/PBI.SetupScript.sh	2009-10-30 14:39:11 UTC (rev 4823)
@@ -39,9 +39,11 @@
 ln -fs /Programs/${PROGDIR}/.sbin/wmc /Programs/bin/wmc
 ln -fs /Programs/${PROGDIR}/.sbin/wrc /Programs/bin/wrc
 
+# Make sure we only use the libGL on the system
+rm /Programs/${PROGDIR}/lib/libGl.*
+rm /Programs/${PROGDIR}/lib/libGL.*
+rm /Programs/${PROGDIR}/lib/libGLU.*
 
-# 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

Modified: pbibuild/modules/emulator/wine/pbi.conf
===================================================================
--- pbibuild/modules/emulator/wine/pbi.conf	2009-10-30 09:00:24 UTC (rev 4822)
+++ pbibuild/modules/emulator/wine/pbi.conf	2009-10-30 14:39:11 UTC (rev 4823)
@@ -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="02"
 
 PBIAUTOPOPULATE="YES"
 export PBIAUTOPOPULATE

Modified: pbibuild/modules/emulator/wine/preportmake.sh
===================================================================
--- pbibuild/modules/emulator/wine/preportmake.sh	2009-10-30 09:00:24 UTC (rev 4822)
+++ pbibuild/modules/emulator/wine/preportmake.sh	2009-10-30 14:39:11 UTC (rev 4823)
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+cd /usr/ports/print/freetype2
+make install clean
+
 cd /usr/ports/x11/xorg
 make clean
 make install