[40534] trunk/dports/x11

[ryandesign at macports.org]

Revision: 40534
          http://trac.macports.org/changeset/40534
Author:   ryandesign at macports.org
Date:     2008-10-05 23:45:23 -0700 (Sun, 05 Oct 2008)
Log Message:
-----------
wine, wine-devel: help it find libGL and other things that are part of X11; closes #16603

Modified Paths:
--------------
    trunk/dports/x11/wine/Portfile
    trunk/dports/x11/wine/files/wine.in
    trunk/dports/x11/wine-devel/Portfile
    trunk/dports/x11/wine-devel/files/wine.in

Modified: trunk/dports/x11/wine/Portfile
===================================================================
--- trunk/dports/x11/wine/Portfile	2008-10-06 06:13:21 UTC (rev 40533)
+++ trunk/dports/x11/wine/Portfile	2008-10-06 06:45:23 UTC (rev 40534)
@@ -4,7 +4,7 @@
 
 name                    wine
 version                 1.0
-revision                1
+revision                2
 categories              x11
 maintainers             ryandesign jwa openmaintainer
 homepage                http://www.winehq.com/
@@ -70,6 +70,7 @@
     file rename ${destroot}${prefix}/bin/wine ${destroot}${prefix}/libexec/wine/wine
     xinstall -m 755 ${filespath}/wine.in ${destroot}${prefix}/bin/wine
     reinplace s|@PREFIX@|${prefix}|g ${destroot}${prefix}/bin/wine
+    reinplace s|@X11PREFIX@|${x11prefix}|g ${destroot}${prefix}/bin/wine
 }
 
 livecheck.check         sourceforge

Modified: trunk/dports/x11/wine/files/wine.in
===================================================================
--- trunk/dports/x11/wine/files/wine.in	2008-10-06 06:13:21 UTC (rev 40533)
+++ trunk/dports/x11/wine/files/wine.in	2008-10-06 06:45:23 UTC (rev 40534)
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-DYLD_FALLBACK_LIBRARY_PATH="@PREFIX@/lib" \
+DYLD_FALLBACK_LIBRARY_PATH="@PREFIX@/lib:@X11PREFIX@/lib" \
 "@PREFIX@/libexec/wine/wine" "$@"

Modified: trunk/dports/x11/wine-devel/Portfile
===================================================================
--- trunk/dports/x11/wine-devel/Portfile	2008-10-06 06:13:21 UTC (rev 40533)
+++ trunk/dports/x11/wine-devel/Portfile	2008-10-06 06:45:23 UTC (rev 40534)
@@ -5,6 +5,7 @@
 name                    wine-devel
 set my_name             wine
 version                 1.1.5
+revision                1
 
 categories              x11
 maintainers             ryandesign jwa openmaintainer
@@ -69,6 +70,7 @@
     file rename ${destroot}${prefix}/bin/wine ${destroot}${prefix}/libexec/wine/wine
     xinstall -m 755 ${filespath}/wine.in ${destroot}${prefix}/bin/wine
     reinplace s|@PREFIX@|${prefix}|g ${destroot}${prefix}/bin/wine
+    reinplace s|@X11PREFIX@|${x11prefix}|g ${destroot}${prefix}/bin/wine
 }
 
 livecheck.name          ${my_name}

Modified: trunk/dports/x11/wine-devel/files/wine.in
===================================================================
--- trunk/dports/x11/wine-devel/files/wine.in	2008-10-06 06:13:21 UTC (rev 40533)
+++ trunk/dports/x11/wine-devel/files/wine.in	2008-10-06 06:45:23 UTC (rev 40534)
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-DYLD_FALLBACK_LIBRARY_PATH="@PREFIX@/lib" \
+DYLD_FALLBACK_LIBRARY_PATH="@PREFIX@/lib:@X11PREFIX@/lib" \
 "@PREFIX@/libexec/wine/wine" "$@"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20081005/99c3b6d1/attachment.html