[109316] trunk/dports/devel/libsdl/Portfile
jmr at macports.org
jmr at macports.org
Mon Aug 12 18:27:47 PDT 2013
Revision: 109316
https://trac.macports.org/changeset/109316
Author: jmr at macports.org
Date: 2013-08-12 18:27:47 -0700 (Mon, 12 Aug 2013)
Log Message:
-----------
libsdl: transitional no_x11 variant has been there long enough; removing
Modified Paths:
--------------
trunk/dports/devel/libsdl/Portfile
Modified: trunk/dports/devel/libsdl/Portfile
===================================================================
--- trunk/dports/devel/libsdl/Portfile 2013-08-13 01:24:53 UTC (rev 109315)
+++ trunk/dports/devel/libsdl/Portfile 2013-08-13 01:27:47 UTC (rev 109316)
@@ -36,19 +36,19 @@
--without-x
patchfiles \
- no-CGDirectPaletteRef.patch
+ no-CGDirectPaletteRef.patch
platform darwin {
configure.ldflags-append -framework Carbon
post-destroot {
reinplace "/Libs:/s/-lSDLmain/-lSDLmain -Wl,-framework,AppKit/" ${destroot}${prefix}/lib/pkgconfig/sdl.pc
- reinplace "s/SDLmain.a/SDLmain.a -Wl,-framework,AppKit/" ${destroot}${prefix}/bin/sdl-config
- reinplace "s/-lSDLmain/-lSDLmain -Wl,-framework,AppKit/" ${destroot}${prefix}/bin/sdl-config
+ reinplace "s/SDLmain.a/SDLmain.a -Wl,-framework,AppKit/" ${destroot}${prefix}/bin/sdl-config
+ reinplace "s/-lSDLmain/-lSDLmain -Wl,-framework,AppKit/" ${destroot}${prefix}/bin/sdl-config
}
}
-variant x11 conflicts no_x11 {
+variant x11 {
configure.args-delete --without-x
configure.args-append --x-includes=${prefix}/include \
--x-libraries=${prefix}/lib \
@@ -58,12 +58,7 @@
port:xorg-libXrandr \
port:xrender
}
-variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
-if {[variant_isset no_x11]} {
- default_variants -x11
-} else {
- default_variants +x11
-}
+default_variants +x11
post-configure {
if {[variant_isset universal]} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130812/dbe30d65/attachment.html>
More information about the macports-changes
mailing list