[63871] trunk/dports/graphics/openvrml/Portfile
raphael at macports.org
raphael at macports.org
Wed Feb 17 08:41:51 PST 2010
Revision: 63871
http://trac.macports.org/changeset/63871
Author: raphael at macports.org
Date: 2010-02-17 08:41:50 -0800 (Wed, 17 Feb 2010)
Log Message:
-----------
openvrml:
* update to 0.18.5
* add dependency on libtool (openvrml uses libltdl)
* fix +no_x11 variant and conflicts between variants (fixes #23713)
* ensure that mesa is inactive before trying to build +no_x11 variant
Modified Paths:
--------------
trunk/dports/graphics/openvrml/Portfile
Modified: trunk/dports/graphics/openvrml/Portfile
===================================================================
--- trunk/dports/graphics/openvrml/Portfile 2010-02-17 16:40:21 UTC (rev 63870)
+++ trunk/dports/graphics/openvrml/Portfile 2010-02-17 16:41:50 UTC (rev 63871)
@@ -4,7 +4,7 @@
PortSystem 1.0
name openvrml
-version 0.18.4
+version 0.18.5
categories graphics x11
maintainers raphael openmaintainer
description a cross-platform VRML and X3D browser and C++ runtime \
@@ -20,9 +20,9 @@
license LGPL-3
platforms darwin
master_sites sourceforge
-checksums md5 2f201cdb625fe6a32a1edc34bfbd21bc \
- sha1 1d526ba8406a53f65e66eb3fcfda010bc56bbe52 \
- rmd160 86cb62a13a523cbc450c18dbe35c13dc788ef5a1
+checksums md5 af1a307130d9af0621bdd29c8ea3c2f2 \
+ sha1 c9acd9522a763ff49a0d882a4435d517bd542ddd \
+ rmd160 e202ddcbd030bae38bb138694a603234409d5c76
depends_lib port:boost \
port:libpng \
@@ -30,7 +30,8 @@
port:fontconfig \
port:mesa \
port:libxml2 \
- path:lib/pkgconfig/sdl.pc:libsdl
+ path:lib/pkgconfig/sdl.pc:libsdl \
+ path:bin/glibtool:libtool
depends_build port:pkgconfig
pre-extract { if {"darwin" == ${os.platform} && 9 == ${os.major}} {
@@ -43,6 +44,11 @@
}
}
+pre-configure { if {[variant_isset no_x11] && [file exists ${prefix}/lib/pkgconfig/gl.pc]} {
+ ui_msg "Please deactivate mesa with \"sudo port deactivate mesa\" before building openvrml."
+ return -code error "mesa should be deactivated"
+ }
+}
configure.args --disable-script-node-javascript \
--disable-script-node-java \
--disable-xembed \
@@ -89,7 +95,7 @@
--disable-examples
}
-variant xembed conflicts no_opengl description {Build the XEmbed control} {
+variant xembed conflicts no_opengl no_x11 description {Build the XEmbed control} {
depends_lib-append port:gtkglext \
port:dbus-glib
configure.args-delete --disable-xembed
@@ -101,7 +107,7 @@
configure.args-delete --disable-player
}
-variant mozilla_plugin requires xembed description {Build the Mozilla plug-in} {
+variant mozilla_plugin requires xembed conflicts no_x11 description {Build the Mozilla plug-in} {
depends_lib-append path:lib/xulrunner/libxul.dylib:xulrunner
configure.args-delete --disable-mozilla-plugin
configure.args-append --enable-mozilla-plugin
@@ -109,8 +115,11 @@
destroot.args-append mozpluginsdir=${prefix}/lib/nsplugins
}
-variant no_x11 requires no_opengl conflicts js_mozilla {
- configure.args-delete --with-x
+variant no_x11 conflicts js_mozilla mozilla_plugin {
+ depends_lib-delete port:mesa
+ configure.args-delete --with-x \
+ --x-includes=${prefix}/include \
+ --x-libraries=${prefix}/lib
configure.args-append --without-x
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100217/d8472070/attachment.html>
More information about the macports-changes
mailing list