[107104] trunk/dports/gnome/gnome-sharp2/Portfile
devans at macports.org
devans at macports.org
Tue Jun 18 08:01:35 PDT 2013
Revision: 107104
https://trac.macports.org/changeset/107104
Author: devans at macports.org
Date: 2013-06-18 08:01:35 -0700 (Tue, 18 Jun 2013)
Log Message:
-----------
gnome-sharp2: add +x11 default variant, dummy +no_x11 remains for legacy compatibility.
Modified Paths:
--------------
trunk/dports/gnome/gnome-sharp2/Portfile
Modified: trunk/dports/gnome/gnome-sharp2/Portfile
===================================================================
--- trunk/dports/gnome/gnome-sharp2/Portfile 2013-06-18 13:43:17 UTC (rev 107103)
+++ trunk/dports/gnome/gnome-sharp2/Portfile 2013-06-18 15:01:35 UTC (rev 107104)
@@ -6,7 +6,7 @@
name gnome-sharp2
set my_name gnome-sharp
version 2.24.1
-revision 3
+revision 4
categories gnome devel
license LGPL-2
platforms darwin
@@ -30,14 +30,14 @@
# Errors creating policy.*.dll multiple times in parallel
use_parallel_build no
-patchfiles patch-gnome-sharp.dll.config.in.diff
+patchfiles patch-gnome-sharp.dll.config.in.diff \
+ patch-disable-gnomepanel.diff
depends_build port:pkgconfig
depends_lib port:mono \
port:gnome-vfs \
port:libgnomeui \
port:libgnomeprintui \
- port:gnome-panel \
port:gtk-sharp2
# mono is not universal
@@ -59,16 +59,27 @@
$worksrcpath/sample/gnomevfs/Makefile
}
-variant no_x11 description {Disable X11 support} {
+# Legacy no_x11 variant to be removed after June 2014.
+variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
+
+variant x11 conflicts no_x11 {
+ patchfiles-delete patch-disable-gnomepanel.diff
+ depends_lib-append port:gnome-panel
+}
+
+if {[variant_isset no_x11]} {
+ default_variants -x11
+} else {
+ default_variants +x11
+}
+
+if {![variant_isset x11]} {
pre-fetch {
if {[file exists ${prefix}/lib/pkgconfig/gtk+-x11-2.0.pc]} {
ui_error "Please uninstall or deactivate the gtk2 port and reinstall it by running `port install gtk2 +no_x11`."
error "gtk2 must be installed with the no_x11 variant enabled."
}
}
-
- patchfiles-append patch-disable-gnomepanel.diff
- depends_lib-delete port:gnome-panel
}
livecheck.type regex
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130618/1fe72e90/attachment.html>
More information about the macports-changes
mailing list