[50532] trunk/dports/x11

jeremyhu at macports.org jeremyhu at macports.org
Sat May 2 11:51:36 PDT 2009


Revision: 50532
          http://trac.macports.org/changeset/50532
Author:   jeremyhu at macports.org
Date:     2009-05-02 11:51:35 -0700 (Sat, 02 May 2009)
Log Message:
-----------
xorg: Nuked the +system_x11 variant.

Modified Paths:
--------------
    trunk/dports/x11/Xft2/Portfile
    trunk/dports/x11/imake/Portfile
    trunk/dports/x11/mesa/Portfile
    trunk/dports/x11/xorg-libAppleWM/Portfile
    trunk/dports/x11/xorg-libFS/Portfile
    trunk/dports/x11/xorg-libX11/Portfile
    trunk/dports/x11/xorg-libXScrnSaver/Portfile
    trunk/dports/x11/xorg-libXTrap/Portfile
    trunk/dports/x11/xorg-libXau/Portfile
    trunk/dports/x11/xorg-libXaw/Portfile
    trunk/dports/x11/xorg-libXcomposite/Portfile
    trunk/dports/x11/xorg-libXcursor/Portfile
    trunk/dports/x11/xorg-libXdamage/Portfile
    trunk/dports/x11/xorg-libXdmcp/Portfile
    trunk/dports/x11/xorg-libXevie/Portfile
    trunk/dports/x11/xorg-libXext/Portfile
    trunk/dports/x11/xorg-libXfixes/Portfile
    trunk/dports/x11/xorg-libXfont/Portfile
    trunk/dports/x11/xorg-libXfontcache/Portfile
    trunk/dports/x11/xorg-libXi/Portfile
    trunk/dports/x11/xorg-libXinerama/Portfile
    trunk/dports/x11/xorg-libXmu/Portfile
    trunk/dports/x11/xorg-libXp/Portfile
    trunk/dports/x11/xorg-libXrandr/Portfile
    trunk/dports/x11/xorg-libXres/Portfile
    trunk/dports/x11/xorg-libXt/Portfile
    trunk/dports/x11/xorg-libXtst/Portfile
    trunk/dports/x11/xorg-libXv/Portfile
    trunk/dports/x11/xorg-libXvMC/Portfile
    trunk/dports/x11/xorg-libXxf86dga/Portfile
    trunk/dports/x11/xorg-libXxf86misc/Portfile
    trunk/dports/x11/xorg-libXxf86vm/Portfile
    trunk/dports/x11/xorg-libdmx/Portfile
    trunk/dports/x11/xorg-libfontenc/Portfile
    trunk/dports/x11/xorg-libice/Portfile
    trunk/dports/x11/xorg-liblbxutil/Portfile
    trunk/dports/x11/xorg-liboldX/Portfile
    trunk/dports/x11/xorg-libsm/Portfile
    trunk/dports/x11/xorg-libxcb/Portfile
    trunk/dports/x11/xorg-libxkbfile/Portfile
    trunk/dports/x11/xorg-libxkbui/Portfile
    trunk/dports/x11/xorg-xcb-util/Portfile
    trunk/dports/x11/xpm/Portfile
    trunk/dports/x11/xrender/Portfile

Modified: trunk/dports/x11/Xft2/Portfile
===================================================================
--- trunk/dports/x11/Xft2/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/Xft2/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -48,21 +48,3 @@
 livecheck.check     regex
 livecheck.url       ${master_sites}?C=M&O=D
 livecheck.regex     libXft-(\[0-9.\]+)\\.tar\\.bz2
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libXft.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/imake/Portfile
===================================================================
--- trunk/dports/x11/imake/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/imake/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -37,30 +37,6 @@
         ${worksrcpath}/mkhtmlindex.pl
 }
 
-variant system_x11 description {Use the system X11 rather than MacPorts} {
-    if { ! [string equal ${prefix} ${x11prefix}] } {
-        if { [file exists ${x11prefix}/bin/imake] } {
-            # imake was installed by system X11.
-            depends_build
-            depends_lib
-            depends_run
-            fetch           { }
-            checksum        { }
-            extract         { }
-            patch           { }
-            build           { }
-            destroot        {
-                xinstall -d ${destroot}${prefix}/share/doc/${name}
-                system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-            }
-            use_configure no
-        } elseif { ${os.major} >= 9 && [file exists ${x11prefix}/lib/pkgconfig/xproto.pc] && ![file exists ${prefix}/lib/pkgconfig/xproto.pc]} {
-            # Current versions of XQuartz no longer provide imake, so system_x11 means use the X11 headers.
-            depends_build-delete port:xorg-xproto
-        }
-    }
-}
-
 livecheck.check  regex
 livecheck.url    "http://xorg.freedesktop.org/releases/individual/util/?C=M;O=D"
 livecheck.regex  ${name}-(\\d+(?:\\.\\d+)*)

Modified: trunk/dports/x11/mesa/Portfile
===================================================================
--- trunk/dports/x11/mesa/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/mesa/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -89,40 +89,29 @@
         configure.cppflags-append -I${filespath}/include
 }
 
-if {! [variant_isset system_x11]} {
-	default_variants +hw_render
+default_variants +hw_render
 
-	post-patch {
-		reinplace "s:-fno-strict-aliasing:-fno-strict-aliasing -fno-common:g" ${worksrcpath}/configs/darwin
-		reinplace "s:osmesa::g" ${worksrcpath}/configs/darwin
+post-patch {
+	reinplace "s:-fno-strict-aliasing:-fno-strict-aliasing -fno-common:g" ${worksrcpath}/configs/darwin
+	reinplace "s:osmesa::g" ${worksrcpath}/configs/darwin
 
-        # Ensure correct compilers are used in mklib.
-        reinplace "s:LINK=\"g++\":LINK=\"${configure.cxx}\":"  ${worksrcpath}/bin/mklib
-        reinplace "s:LINK=\"cc\":LINK=\"${configure.cc}\":"    ${worksrcpath}/bin/mklib
-	}
+	# Ensure correct compilers are used in mklib.
+	reinplace "s:LINK=\"g++\":LINK=\"${configure.cxx}\":"  ${worksrcpath}/bin/mklib
+	reinplace "s:LINK=\"cc\":LINK=\"${configure.cc}\":"    ${worksrcpath}/bin/mklib
+}
 
-	post-extract {
-		if {! [file exists "${worksrcpath}/configs/current"]} {
-			ln -s darwin ${worksrcpath}/configs/current
-		}
+post-extract {
+	if {! [file exists "${worksrcpath}/configs/current"]} {
+		ln -s darwin ${worksrcpath}/configs/current
 	}
+}
 
-	# This next hunk supports building -system_x11 mesa on a system that is otherwise +system_x11
-	pre-build {
-		if {! [file exists ${prefix}/lib/libX11.dylib]} {
-			build.args-append X11_DIR=${x11prefix}
-			destroot.args-append X11_DIR=${x11prefix}
-		}
-	}
-
 # Do this if you want to install the mesa-provided glxinfo and glxgears... doesn't work on Tiger
-#	post-destroot {
-#		xinstall -m 755 -W "${worksrcpath}/progs/xdemos" glxgears glxinfo "${destroot}${prefix}/bin"
-#	}
+#post-destroot {
+#	xinstall -m 755 -W "${worksrcpath}/progs/xdemos" glxgears glxinfo "${destroot}${prefix}/bin"
+#}
 
-}
-
-variant hw_render conflicts system_x11 description {Install a libGL.dylib that uses OpenGL.framework to allow rendering on your graphics hardware} {
+variant hw_render description {Install a libGL.dylib that uses OpenGL.framework to allow rendering on your graphics hardware} {
 #	post-patch {
 #		system "cd ${worksrcpath}/../AppleSGLX-${ASGLX_version} && cat ${filespath}/asglx-*.patch | patch -p0"
 #	}
@@ -146,23 +135,4 @@
 	}
 }
 
-variant system_x11 conflicts hw_render description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libGLU.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		distfiles
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	}
-}
-
 livecheck.regex "<title>MesaLib (.*) released.*</title>"

Modified: trunk/dports/x11/xorg-libAppleWM/Portfile
===================================================================
--- trunk/dports/x11/xorg-libAppleWM/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libAppleWM/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -38,23 +38,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libAppleWM-(\\d+(?:\\.\\d+)*)
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libAppleWM.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		distfiles
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_autoreconf no
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xorg-libFS/Portfile
===================================================================
--- trunk/dports/x11/xorg-libFS/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libFS/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -27,21 +27,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libFS-(\\d+(?:\\.\\d+)*)
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libFS.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xorg-libX11/Portfile
===================================================================
--- trunk/dports/x11/xorg-libX11/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libX11/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -41,21 +41,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libX11-(\\d+(?:\\.\\d+)*)
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libX11.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xorg-libXScrnSaver/Portfile
===================================================================
--- trunk/dports/x11/xorg-libXScrnSaver/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libXScrnSaver/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -28,22 +28,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libXScrnSaver-(\\d+(?:\\.\\d+)*)
-
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libXss.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xorg-libXTrap/Portfile
===================================================================
--- trunk/dports/x11/xorg-libXTrap/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libXTrap/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -32,21 +32,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libXTrap-(\\d+(?:\\.\\d+)*)
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libXTrap.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xorg-libXau/Portfile
===================================================================
--- trunk/dports/x11/xorg-libXau/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libXau/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -25,22 +25,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libXau-(\\d+(?:\\.\\d+)*)
-
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libXau.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xorg-libXaw/Portfile
===================================================================
--- trunk/dports/x11/xorg-libXaw/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libXaw/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -43,24 +43,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libXaw-(\\d+(?:\\.\\d+)*)
-
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libXaw.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		use_autoreconf	no
-		patch		{ }		
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xorg-libXcomposite/Portfile
===================================================================
--- trunk/dports/x11/xorg-libXcomposite/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libXcomposite/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -30,28 +30,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libXcomposite-(\\d+(?:\\.\\d+)*)
-
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libXcomposite.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	} else {
-		if {${os.major} < 9 && ![file exists ${prefix}/lib/pkgconfig/x11.pc]} {
-			configure.env-append \
-				XCOMPOSITE_CFLAGS="-I${prefix}/include -I${x11prefix}/include" \
-				XCOMPOSITE_LIBS="-L${prefix}/lib -L${x11prefix}/lib -lXext -lXfixes -lX11"
-		}
-	}
-}

Modified: trunk/dports/x11/xorg-libXcursor/Portfile
===================================================================
--- trunk/dports/x11/xorg-libXcursor/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libXcursor/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -31,22 +31,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libXcursor-(\\d+(?:\\.\\d+)*)
-
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libXcursor.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xorg-libXdamage/Portfile
===================================================================
--- trunk/dports/x11/xorg-libXdamage/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libXdamage/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -29,28 +29,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libXdamage-(\\d+(?:\\.\\d+)*)
-
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libXdamage.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	} else {
-		if {${os.major} < 9 && ![file exists ${prefix}/lib/pkgconfig/x11.pc]} {
-			configure.env-append \
-				XDAMAGE_CFLAGS="-I${prefix}/include -I${x11prefix}/include" \
-				XDAMAGE_LIBS="-L${prefix}/lib -L${x11prefix}/lib -lXfixes -lX11"
-		}
-	}
-}

Modified: trunk/dports/x11/xorg-libXdmcp/Portfile
===================================================================
--- trunk/dports/x11/xorg-libXdmcp/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libXdmcp/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -23,22 +23,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libXdmcp-(\\d+(?:\\.\\d+)*)
-
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libXdmcp.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xorg-libXevie/Portfile
===================================================================
--- trunk/dports/x11/xorg-libXevie/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libXevie/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -38,28 +38,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libXevie-(\\d+(?:\\.\\d+)*)
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libXevie.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_autoreconf no
-		use_configure no
-	} else {
-		if {${os.major} < 9 && ![file exists ${prefix}/lib/pkgconfig/x11.pc]} {
-			configure.env-append \
-				XEVIE_CFLAGS="-I${prefix}/include -I${x11prefix}/include" \
-				XEVIE_LIBS="-L${prefix}/lib -L${x11prefix}/lib -lXext -lX11"
-		}
-	}
-}

Modified: trunk/dports/x11/xorg-libXext/Portfile
===================================================================
--- trunk/dports/x11/xorg-libXext/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libXext/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -32,21 +32,3 @@
 
 patchfiles cad77b1d6d1a344f2cb31c16401076c003bb97dd.patch
 patch.args -p1
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libXext.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xorg-libXfixes/Portfile
===================================================================
--- trunk/dports/x11/xorg-libXfixes/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libXfixes/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -29,28 +29,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libXfixes-(\\d+(?:\\.\\d+)*)
-
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libXfixes.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	} else {
-		if {${os.major} < 9 && ![file exists ${prefix}/lib/pkgconfig/x11.pc]} {
-                	configure.env-append \
-                        	X_CFLAGS="-I${prefix}/include -I${x11prefix}/include" \
-	                        X_LIBS="-L${prefix}/lib -L${x11prefix}/lib -lX11"
-		}
-	}
-}

Modified: trunk/dports/x11/xorg-libXfont/Portfile
===================================================================
--- trunk/dports/x11/xorg-libXfont/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libXfont/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -52,22 +52,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libXfont-(\\d+(?:\\.\\d+)*)
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libXfont.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_autoreconf no
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xorg-libXfontcache/Portfile
===================================================================
--- trunk/dports/x11/xorg-libXfontcache/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libXfontcache/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -31,22 +31,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libXfontcache-(\\d+(?:\\.\\d+)*)
-
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libXfontcache.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xorg-libXi/Portfile
===================================================================
--- trunk/dports/x11/xorg-libXi/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libXi/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -29,21 +29,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libXi-(\\d+(?:\\.\\d+)*)
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libXi.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xorg-libXinerama/Portfile
===================================================================
--- trunk/dports/x11/xorg-libXinerama/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libXinerama/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -29,22 +29,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libXinerama-(\\d+(?:\\.\\d+)*)
-
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libXinerama.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xorg-libXmu/Portfile
===================================================================
--- trunk/dports/x11/xorg-libXmu/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libXmu/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -30,23 +30,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libXmu-(\\d+(?:\\.\\d+)*)
-
-
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libXmu.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xorg-libXp/Portfile
===================================================================
--- trunk/dports/x11/xorg-libXp/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libXp/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -37,22 +37,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libXp-(\\d+(?:\\.\\d+)*)
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libXp.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_autoreconf no
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xorg-libXrandr/Portfile
===================================================================
--- trunk/dports/x11/xorg-libXrandr/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libXrandr/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -32,22 +32,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libXrandr-(\\d+(?:\\.\\d+)*)
-
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libXrandr.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xorg-libXres/Portfile
===================================================================
--- trunk/dports/x11/xorg-libXres/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libXres/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -29,22 +29,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libXres-(\\d+(?:\\.\\d+)*)
-
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libXres.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xorg-libXt/Portfile
===================================================================
--- trunk/dports/x11/xorg-libXt/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libXt/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -44,22 +44,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libXt-(\\d+(?:\\.\\d+)*)
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libXt.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_autoreconf no
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xorg-libXtst/Portfile
===================================================================
--- trunk/dports/x11/xorg-libXtst/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libXtst/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -30,22 +30,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libXtst-(\\d+(?:\\.\\d+)*)
-
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libXtst.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xorg-libXv/Portfile
===================================================================
--- trunk/dports/x11/xorg-libXv/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libXv/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -28,22 +28,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libXv-(\\d+(?:\\.\\d+)*)
-
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libXv.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xorg-libXvMC/Portfile
===================================================================
--- trunk/dports/x11/xorg-libXvMC/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libXvMC/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -28,22 +28,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libXvMC-(\\d+(?:\\.\\d+)*)
-
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libXvMC.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xorg-libXxf86dga/Portfile
===================================================================
--- trunk/dports/x11/xorg-libXxf86dga/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libXxf86dga/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -29,28 +29,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libXxf86dga-(\\d+(?:\\.\\d+)*)
-
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libXxf86dga.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	} else {
-		if {${os.major} < 9 && ![file exists ${prefix}/lib/pkgconfig/x11.pc]} {
-			configure.env-append \
-				XXF86DGA_CFLAGS="-I${prefix}/include -I${x11prefix}/include" \
-				XXF86DGA_LIBS="-L${prefix}/lib -L${x11prefix}/lib -lXext -lX11"
-		}
-	}
-}

Modified: trunk/dports/x11/xorg-libXxf86misc/Portfile
===================================================================
--- trunk/dports/x11/xorg-libXxf86misc/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libXxf86misc/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -32,22 +32,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libXxf86misc-(\\d+(?:\\.\\d+)*)
-
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libXxf86misc.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xorg-libXxf86vm/Portfile
===================================================================
--- trunk/dports/x11/xorg-libXxf86vm/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libXxf86vm/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -29,22 +29,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libXxf86vm-(\\d+(?:\\.\\d+)*)
-
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libXxf86vm.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xorg-libdmx/Portfile
===================================================================
--- trunk/dports/x11/xorg-libdmx/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libdmx/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -31,28 +31,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libdmx-(\\d+(?:\\.\\d+)*)
-
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libdmx.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	} else {
-		if {${os.major} < 9 && ![file exists ${prefix}/lib/pkgconfig/x11.pc]} {
-			configure.env-append \
-				DMX_CFLAGS="-I${prefix}/include -I${x11prefix}/include" \
-				DMX_LIBS="-L${prefix}/lib -L${x11prefix}/lib -lXext -lX11"
-		}
-	}
-}

Modified: trunk/dports/x11/xorg-libfontenc/Portfile
===================================================================
--- trunk/dports/x11/xorg-libfontenc/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libfontenc/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -26,22 +26,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libfontenc-(\\d+(?:\\.\\d+)*)
-
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libfontenc.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xorg-libice/Portfile
===================================================================
--- trunk/dports/x11/xorg-libice/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libice/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -28,21 +28,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libICE-(\\d+(?:\\.\\d+)*)
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libICE.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xorg-liblbxutil/Portfile
===================================================================
--- trunk/dports/x11/xorg-liblbxutil/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-liblbxutil/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -38,22 +38,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex liblbxutil-(\\d+(?:\\.\\d+)*)
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/liblbxutil.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_autoreconf no
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xorg-liboldX/Portfile
===================================================================
--- trunk/dports/x11/xorg-liboldX/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-liboldX/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -26,22 +26,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex liboldX-(\\d+(?:\\.\\d+)*)
-
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/liboldX.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xorg-libsm/Portfile
===================================================================
--- trunk/dports/x11/xorg-libsm/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libsm/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -34,22 +34,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libSM-(\\d+(?:\\.\\d+)*)
-
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libSM.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xorg-libxcb/Portfile
===================================================================
--- trunk/dports/x11/xorg-libxcb/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libxcb/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -48,22 +48,3 @@
 if {![variant_isset python25] && ![variant_isset python30]} {
     default_variants +python26
 }
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libxcb.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-		use_autoreconf  no
-	}
-}

Modified: trunk/dports/x11/xorg-libxkbfile/Portfile
===================================================================
--- trunk/dports/x11/xorg-libxkbfile/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libxkbfile/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -29,22 +29,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libxkbfile-(\\d+(?:\\.\\d+)*)
-
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libxkbfile.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xorg-libxkbui/Portfile
===================================================================
--- trunk/dports/x11/xorg-libxkbui/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-libxkbui/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -29,22 +29,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libxkbui-(\\d+(?:\\.\\d+)*)
-
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libxkbui.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xorg-xcb-util/Portfile
===================================================================
--- trunk/dports/x11/xorg-xcb-util/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xorg-xcb-util/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -26,21 +26,3 @@
 livecheck.check regex
 livecheck.url   ${master_sites}?C=M&O=D
 livecheck.regex xcb-util-(\\d+(?:\\.\\d+)*)
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libxcb-render-util.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xpm/Portfile
===================================================================
--- trunk/dports/x11/xpm/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xpm/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -27,21 +27,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex libXpm-(\\d+(?:\\.\\d+)*)
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libXpm.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	}
-}

Modified: trunk/dports/x11/xrender/Portfile
===================================================================
--- trunk/dports/x11/xrender/Portfile	2009-05-02 18:43:40 UTC (rev 50531)
+++ trunk/dports/x11/xrender/Portfile	2009-05-02 18:51:35 UTC (rev 50532)
@@ -46,21 +46,3 @@
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
 livecheck.regex ${my_name}-(\\d+(?:\\.\\d+)*)
-
-variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} {
-	if { [file exists ${x11prefix}/lib/libXrender.dylib] && ! [string equal ${prefix} ${x11prefix}] } {
-		depends_build
-		depends_lib
-		depends_run
-		fetch           { }
-		checksum        { }
-		extract         { }
-		patch           { }
-		build           { }
-		destroot        {
-			xinstall -d ${destroot}${prefix}/share/doc/${name}
-			system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
-		}
-		use_configure no
-	}
-}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090502/d5b70b7b/attachment-0001.html>


More information about the macports-changes mailing list