[66336] trunk/dports/x11
ryandesign at macports.org
ryandesign at macports.org
Fri Apr 9 06:15:05 PDT 2010
Revision: 66336
http://trac.macports.org/changeset/66336
Author: ryandesign at macports.org
Date: 2010-04-09 06:15:04 -0700 (Fri, 09 Apr 2010)
Log Message:
-----------
wine, wine-devel: be explicit about what features we want and don't want, including
* indicating we want png support (and adding the png dependency; see #23683)
* disabling OpenAL support (don't know what it's good for and it caused problems; see #23222 and #23571)
* enabling LCMS support and adding lcms dependency
Modified Paths:
--------------
trunk/dports/x11/wine/Portfile
trunk/dports/x11/wine-devel/Portfile
Modified: trunk/dports/x11/wine/Portfile
===================================================================
--- trunk/dports/x11/wine/Portfile 2010-04-09 13:08:16 UTC (rev 66335)
+++ trunk/dports/x11/wine/Portfile 2010-04-09 13:15:04 UTC (rev 66336)
@@ -8,7 +8,7 @@
conflicts wine-devel wine-crossover-games
set my_name wine
version 1.0.1
-revision 6
+revision 7
license LGPL-2.1+
categories x11
maintainers ryandesign jwa openmaintainer
@@ -53,7 +53,9 @@
port:fontconfig \
port:freetype \
port:jpeg \
+ port:lcms \
port:libiconv \
+ port:libpng \
port:libxml2 \
port:libxslt \
port:ncurses \
@@ -71,7 +73,9 @@
lib/libfontconfig.dylib \
lib/libfreetype.dylib \
lib/libjpeg.dylib \
+ lib/liblcms.dylib \
lib/libiconv.dylib \
+ lib/libpng.dylib \
lib/libxml2.dylib \
lib/libxslt.dylib \
lib/libncurses.dylib \
@@ -99,7 +103,42 @@
-framework CoreServices \
-lz
-configure.args --x-include=${prefix}/include --x-lib=${prefix}/lib
+configure.args --without-alsa \
+ --without-audioio \
+ --without-capi \
+ --with-cms \
+ --with-coreaudio \
+ --without-cups \
+ --with-curses \
+ --without-esd \
+ --with-fontconfig \
+ --with-freetype \
+ --without-gphoto \
+ --with-glu \
+ --without-hal \
+ --without-jack \
+ --with-jpeg \
+ --without-ldap \
+ --without-nas \
+ --with-opengl \
+ --with-openssl \
+ --without-oss \
+ --with-png \
+ --without-sane \
+ --with-xcomposite \
+ --with-xcursor \
+ --with-xinerama \
+ --with-xinput \
+ --with-xml \
+ --with-xrandr \
+ --with-xrender \
+ --with-xshape \
+ --with-xshm \
+ --with-xslt \
+ --with-xvidmode \
+ --with-x \
+ --x-include=${prefix}/include \
+ --x-lib=${prefix}/lib
# This is not 64-bit friendly yet
if {[info exists supported_archs]} {
@@ -124,7 +163,7 @@
}
pre-configure {
- foreach badfile {/usr/local/include/dispatch/dispatch.h /Library/Frameworks/OpenAL.framework} {
+ foreach badfile {/usr/local/include/dispatch/dispatch.h} {
if {[file exists ${badfile}]} {
ui_error "You have a copy of [file tail ${badfile}] in [file dirname ${badfile}] that will prevent"
ui_error "${name} from building properly. Please remove it before trying again."
Modified: trunk/dports/x11/wine-devel/Portfile
===================================================================
--- trunk/dports/x11/wine-devel/Portfile 2010-04-09 13:08:16 UTC (rev 66335)
+++ trunk/dports/x11/wine-devel/Portfile 2010-04-09 13:15:04 UTC (rev 66336)
@@ -8,6 +8,7 @@
conflicts wine wine-crossover-games
set my_name wine
version 1.1.42
+revision 1
license LGPL-2.1+
categories x11
maintainers ryandesign jwa openmaintainer
@@ -52,11 +53,14 @@
port:fontconfig \
port:freetype \
port:jpeg \
+ port:lcms \
port:libiconv \
+ port:libpng \
port:libxml2 \
port:libxslt \
port:ncurses \
port:openssl \
+ port:tiff \
port:zlib \
port:xorg-libsm \
port:xorg-libXcursor \
@@ -70,11 +74,14 @@
lib/libfontconfig.dylib \
lib/libfreetype.dylib \
lib/libjpeg.dylib \
+ lib/liblcms.dylib \
lib/libiconv.dylib \
+ lib/libpng.dylib \
lib/libxml2.dylib \
lib/libxslt.dylib \
lib/libncurses.dylib \
lib/libssl.dylib \
+ lib/libtiff.dylib \
lib/libz.dylib \
lib/libSM.dylib \
lib/libXcursor.dylib \
@@ -92,7 +99,49 @@
-framework CoreServices \
-lz
-configure.args --x-include=${prefix}/include --x-lib=${prefix}/lib
+configure.args --without-alsa \
+ --without-audioio \
+ --without-capi \
+ --with-cms \
+ --with-coreaudio \
+ --without-cups \
+ --with-curses \
+ --without-esd \
+ --with-fontconfig \
+ --with-freetype \
+ --without-gphoto \
+ --with-glu \
+ --without-gnutls \
+ --without-gsm \
+ --without-hal \
+ --without-jack \
+ --with-jpeg \
+ --without-ldap \
+ --without-mpg123 \
+ --without-nas \
+ --without-openal \
+ --with-opengl \
+ --with-openssl \
+ --without-oss \
+ --with-png \
+ --with-pthread \
+ --without-sane \
+ --with-tiff \
+ --without-v4l \
+ --with-xcomposite \
+ --with-xcursor \
+ --with-xinerama \
+ --with-xinput \
+ --with-xml \
+ --with-xrandr \
+ --with-xrender \
+ --with-xshape \
+ --with-xshm \
+ --with-xslt \
+ --with-xxf86vm \
+ --with-x \
+ --x-include=${prefix}/include \
+ --x-lib=${prefix}/lib
# This is not 64-bit friendly yet
if {[info exists supported_archs]} {
@@ -120,16 +169,6 @@
}
}
-pre-configure {
- foreach badfile {/Library/Frameworks/OpenAL.framework} {
- if {[file exists ${badfile}]} {
- ui_error "You have a copy of [file tail ${badfile}] in [file dirname ${badfile}] that will prevent"
- ui_error "${name} from building properly. Please remove it before trying again."
- return -code error "incompatible file"
- }
- }
-}
-
post-destroot {
xinstall -d ${destroot}${prefix}/libexec/wine
file rename ${destroot}${prefix}/bin/wine ${destroot}${prefix}/libexec/wine/wine
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100409/72d5f661/attachment.html>
More information about the macports-changes
mailing list