wine, wine-devel: help it find libGL and other things that are part o…

…f X11; closes https://trac.macports.org/ticket/16603 git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@40534 d073be05-634f-4543-b044-5fe20cf6d1d6
macports · Oct 6, 2008 · cd6bcf0 · cd6bcf0
1 parent d04bcc5
commit cd6bcf0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/x11/wine-devel/Portfile b/x11/wine-devel/Portfile
@@ -5,6 +5,7 @@ PortSystem              1.0
 name                    wine-devel
 set my_name             wine
 version                 1.1.5
+revision                1
 
 categories              x11
 maintainers             ryandesign jwa openmaintainer
@@ -69,6 +70,7 @@ post-destroot {
     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}

diff --git a/x11/wine-devel/files/wine.in b/x11/wine-devel/files/wine.in
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-DYLD_FALLBACK_LIBRARY_PATH="@PREFIX@/lib" \
+DYLD_FALLBACK_LIBRARY_PATH="@PREFIX@/lib:@X11PREFIX@/lib" \
 "@PREFIX@/libexec/wine/wine" "$@"
diff --git a/x11/wine/Portfile b/x11/wine/Portfile
@@ -4,7 +4,7 @@ PortSystem              1.0
 
 name                    wine
 version                 1.0
-revision                1
+revision                2
 categories              x11
 maintainers             ryandesign jwa openmaintainer
 homepage                http://www.winehq.com/
@@ -70,6 +70,7 @@ post-destroot {
     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

diff --git a/x11/wine/files/wine.in b/x11/wine/files/wine.in
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-DYLD_FALLBACK_LIBRARY_PATH="@PREFIX@/lib" \
+DYLD_FALLBACK_LIBRARY_PATH="@PREFIX@/lib:@X11PREFIX@/lib" \
 "@PREFIX@/libexec/wine/wine" "$@"