[66285] trunk/dports
jmr at macports.org
jmr at macports.org
Thu Apr 8 01:09:13 PDT 2010
Revision: 66285
http://trac.macports.org/changeset/66285
Author: jmr at macports.org
Date: 2010-04-08 01:09:09 -0700 (Thu, 08 Apr 2010)
Log Message:
-----------
adapt portfiles to removal of platforms as variants
Modified Paths:
--------------
trunk/dports/devel/boost/Portfile
trunk/dports/devel/codeblocks/Portfile
trunk/dports/devel/codeblocks-devel/Portfile
trunk/dports/devel/nu/Portfile
trunk/dports/devel/wxstedit/Portfile
trunk/dports/games/liquidwar/Portfile
trunk/dports/graphics/Coin/Portfile
trunk/dports/graphics/cairo/Portfile
trunk/dports/graphics/cairo-devel/Portfile
trunk/dports/graphics/wxLua/Portfile
trunk/dports/java/unicodeconverter-java/Portfile
trunk/dports/lang/apple-gcc33/Portfile
trunk/dports/lang/clisp/Portfile
trunk/dports/lang/g95/Portfile
trunk/dports/lang/php4/Portfile
trunk/dports/lang/php5/Portfile
trunk/dports/lang/php5-devel/Portfile
trunk/dports/lang/php52/Portfile
trunk/dports/math/fftw-single/Portfile
trunk/dports/math/maxima/Portfile
trunk/dports/net/nefu/Portfile
trunk/dports/net/radmind/Portfile
trunk/dports/net/tuntaposx/Portfile
trunk/dports/print/ghostscript-fonts-hiragino/Portfile
trunk/dports/sysutils/anacron/Portfile
trunk/dports/sysutils/apt/Portfile
trunk/dports/sysutils/cfengine/Portfile
trunk/dports/textproc/pdftk/Portfile
trunk/dports/www/mod_jk/Portfile
trunk/dports/www/mod_jk2/Portfile
trunk/dports/www/privoxy/Portfile
trunk/dports/www/zope/Portfile
trunk/dports/x11/gecko-sharp/Portfile
trunk/dports/x11/libhangul/Portfile
trunk/dports/x11/pango/Portfile
trunk/dports/x11/pango-devel/Portfile
Modified: trunk/dports/devel/boost/Portfile
===================================================================
--- trunk/dports/devel/boost/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/devel/boost/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -189,7 +189,7 @@
build.args-append architecture=power
}
- if {![variant_isset powerpc]} {
+ if {${os.arch} != "powerpc"} {
build.args-append --disable-long-double
}
} else {
Modified: trunk/dports/devel/codeblocks/Portfile
===================================================================
--- trunk/dports/devel/codeblocks/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/devel/codeblocks/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -35,11 +35,15 @@
}
platform macosx {}
-if { [variant_isset macosx] && ![variant_isset x11] } { default_variants +aqua }
-if { [variant_isset puredarwin] } { default_variants +x11 }
-if { [variant_isset freebsd] } { default_variants +x11 }
+if { ([variant_isset macosx] || ([info exists os.subplatform] && ${os.subplatform} == "macosx"))
+ && ![variant_isset x11] } {
+ default_variants +aqua
+} else {
+ default_variants +x11
+}
-variant aqua requires macosx description "Use the wxMac port of wxWidgets" {
+if { ([variant_isset macosx] || ([info exists os.subplatform] && ${os.subplatform} == "macosx")) } {
+variant aqua conflicts x11 description "Use the wxMac port of wxWidgets" {
depends_lib port:wxWidgets
post-destroot {
@@ -82,8 +86,9 @@
delete ${destroot}${prefix}/share/pixmaps/codeblocks.png
}
}
+}
-variant x11 conflicts aqua description "Use the wxGTK port of wxWidgets" {
+variant x11 description "Use the wxGTK port of wxWidgets" {
depends_lib port:wxgtk
patchfiles patch-wxscoder.cpp.diff
Modified: trunk/dports/devel/codeblocks-devel/Portfile
===================================================================
--- trunk/dports/devel/codeblocks-devel/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/devel/codeblocks-devel/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -42,11 +42,15 @@
}
platform macosx {}
-if { [variant_isset macosx] && ![variant_isset x11] } { default_variants +aqua }
-if { [variant_isset puredarwin] } { default_variants +x11 }
-if { [variant_isset freebsd] } { default_variants +x11 }
+if { ([variant_isset macosx] || ([info exists os.subplatform] && ${os.subplatform} == "macosx"))
+ && ![variant_isset x11] } {
+ default_variants +aqua
+} else {
+ default_variants +x11
+}
-variant aqua requires macosx description "Use the wxMac port of wxWidgets" {
+if { ([variant_isset macosx] || ([info exists os.subplatform] && ${os.subplatform} == "macosx")) } {
+variant aqua conflicts x11 description "Use the wxMac port of wxWidgets" {
depends_lib port:wxWidgets
post-destroot {
@@ -89,8 +93,9 @@
delete ${destroot}${prefix}/share/pixmaps/codeblocks.png
}
}
+}
-variant x11 conflicts aqua description "Use the wxGTK port of wxWidgets" {
+variant x11 description "Use the wxGTK port of wxWidgets" {
depends_lib port:wxgtk
}
Modified: trunk/dports/devel/nu/Portfile
===================================================================
--- trunk/dports/devel/nu/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/devel/nu/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -36,10 +36,6 @@
livecheck.url http://programming.nu/downloads
livecheck.regex {Nu-([\d.]+).tgz}
-platform darwin 8 {
- # set up the variant for pre-build
-}
-
variant universal {
patchfiles-delete patch-libffi-single-arch
patchfiles-delete patch-Nukefile
@@ -54,7 +50,7 @@
}
pre-build {
- if {[variant_isset darwin_8]} {
+ if {${os.platform} == "darwin" && ${os.major} == 8} {
ui_info "$UI_PREFIX Building libffi"
system "cd ${worksrcpath}/libffi && rake"
}
Modified: trunk/dports/devel/wxstedit/Portfile
===================================================================
--- trunk/dports/devel/wxstedit/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/devel/wxstedit/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -38,15 +38,20 @@
platform macosx {}
-if { [variant_isset macosx] && ![variant_isset x11] } { default_variants +aqua }
-if { [variant_isset puredarwin] } { default_variants +x11 }
-if { [variant_isset freebsd] } { default_variants +x11 }
+if { ([variant_isset macosx] || ([info exists os.subplatform] && ${os.subplatform} == "macosx"))
+ && ![variant_isset x11] } {
+ default_variants +aqua
+} else {
+ default_variants +x11
+}
-variant aqua requires macosx description "Use the wxMac port of wxWidgets" {
+if { ([variant_isset macosx] || ([info exists os.subplatform] && ${os.subplatform} == "macosx")) } {
+variant aqua conflicts x11 description "Use the wxMac port of wxWidgets" {
depends_lib port:wxWidgets
}
+}
-variant x11 conflicts aqua description "Use the wxGTK port of wxWidgets" {
+variant x11 description "Use the wxGTK port of wxWidgets" {
depends_lib port:wxgtk
}
Modified: trunk/dports/games/liquidwar/Portfile
===================================================================
--- trunk/dports/games/liquidwar/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/games/liquidwar/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -33,10 +33,11 @@
reinplace -E "s|^DATADIR =(.*)$|DATADIR = \$(datadir)/liquidwar|" ${worksrcpath}/src/Makefile.in
}
-platform darwin 10 {}
-if {[variant_isset darwin_10]} {
+if {$build_arch == "x86_64} {
# Allegro does not compile 64-bit due to NS* stuff, so we have to do i386
configure.build_arch i386
+} elseif {$build_arch == "ppc64"} {
+ configure.build_arch ppc
}
configure.cflags-append -DALLEGRO_UNIX
Modified: trunk/dports/graphics/Coin/Portfile
===================================================================
--- trunk/dports/graphics/Coin/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/graphics/Coin/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -37,13 +37,15 @@
configure.args-append --disable-framework --enable-darwin-x11
}
-variant aqua requires darwin {
+if {${os.platform} == "darwin"} {
+variant aqua {
configure.args-delete --disable-framework --enable-darwin-x11
configure.args-append --with-framework=${destroot}/Library/Frameworks --without-x
depends_lib-delete port:xorg-libsm \
port:xorg-libXext \
port:xorg-libXt
}
+}
variant devel description {Activate developer features, including debug libraries.} {
configure.args-append --enable-next-minor --enable-debug
Modified: trunk/dports/graphics/cairo/Portfile
===================================================================
--- trunk/dports/graphics/cairo/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/graphics/cairo/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -96,7 +96,8 @@
}
platform macosx {}
-variant quartz requires macosx {
+if {([variant_isset macosx] || ([info exists os.subplatform] && ${os.subplatform} == "macosx"))} {
+variant quartz {
configure.args-delete \
--disable-quartz \
--disable-quartz-font \
@@ -106,6 +107,7 @@
--enable-quartz-font \
--enable-quartz-image
}
+}
variant no_x11 conflicts glitz x11_xcb {
depends_lib-delete \
Modified: trunk/dports/graphics/cairo-devel/Portfile
===================================================================
--- trunk/dports/graphics/cairo-devel/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/graphics/cairo-devel/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -96,7 +96,8 @@
}
platform macosx {}
-variant quartz requires macosx {
+if {([variant_isset macosx] || ([info exists os.subplatform] && ${os.subplatform} == "macosx"))} {
+variant quartz {
configure.args-delete \
--disable-quartz \
--disable-quartz-font \
@@ -106,6 +107,7 @@
--enable-quartz-font \
--enable-quartz-image
}
+}
variant no_x11 conflicts glitz x11_xcb {
depends_lib-delete \
Modified: trunk/dports/graphics/wxLua/Portfile
===================================================================
--- trunk/dports/graphics/wxLua/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/graphics/wxLua/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -44,11 +44,15 @@
}
platform macosx {}
-if { [variant_isset macosx] && ![variant_isset x11] } { default_variants +aqua }
-if { [variant_isset puredarwin] } { default_variants +x11 }
-if { [variant_isset freebsd] } { default_variants +x11 }
+if { ([variant_isset macosx] || ([info exists os.subplatform] && ${os.subplatform} == "macosx"))
+ && ![variant_isset x11] } {
+ default_variants +aqua
+} else {
+ default_variants +x11
+}
-variant aqua requires macosx description "Use the wxMac port of wxWidgets" {
+if { ([variant_isset macosx] || ([info exists os.subplatform] && ${os.subplatform} == "macosx")) } {
+variant aqua conflicts x11 description "Use the wxMac port of wxWidgets" {
depends_lib-append port:wxWidgets
@@ -81,8 +85,9 @@
}
}
+}
-variant x11 conflicts aqua description "Use the wxGTK port of wxWidgets" {
+variant x11 description "Use the wxGTK port of wxWidgets" {
depends_lib-append port:wxgtk
Modified: trunk/dports/java/unicodeconverter-java/Portfile
===================================================================
--- trunk/dports/java/unicodeconverter-java/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/java/unicodeconverter-java/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -45,7 +45,7 @@
xinstall -m 644 -W ${worksrcpath} readme.html versionchanges.html \
${destroot}${prefix}/share/doc/${name}
# Build a nice .app
- if {[variant_isset darwin]} {
+ if {${os.platform} == "darwin"} {
set ucAppPath ${destroot}/Applications/MacPorts/UnicodeConverter.app
# Build paths
xinstall -m 755 -d ${ucAppPath}/Contents/Resources/Java \
@@ -68,8 +68,3 @@
}
}
}
-
-# So it gets set, when applicable
-platform darwin {
-}
-
Modified: trunk/dports/lang/apple-gcc33/Portfile
===================================================================
--- trunk/dports/lang/apple-gcc33/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/lang/apple-gcc33/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -53,10 +53,8 @@
livecheck.type moddate
livecheck.url ${master_sites}
-platform i386 {}
-
pre-fetch {
- if {[variant_isset i386]} {
+ if {${os.arch} == "i386"} {
return -code error "${name} is not supported on Intel Macs!"
}
}
Modified: trunk/dports/lang/clisp/Portfile
===================================================================
--- trunk/dports/lang/clisp/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/lang/clisp/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -49,10 +49,6 @@
configure.args-append --ignore-absence-of-libsigsegv
}
-platform darwin {
- # placeholder for use with variant_isset
-}
-
platform darwin 7 {
depends_lib-delete port:libsigsegv
configure.args-append --ignore-absence-of-libsigsegv
Modified: trunk/dports/lang/g95/Portfile
===================================================================
--- trunk/dports/lang/g95/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/lang/g95/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -19,8 +19,7 @@
master_sites ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.0.4/:gcc \
http://ftp.g95.org/v${version}/:g95
-platform darwin 10 {}
-if {[variant_isset darwin_10]||${build_arch}=="ppc64"||${build_arch}=="x86_64"} {
+if {(${os.platform} == "darwin" && ${os.major} == 10)||${build_arch}=="ppc64"||${build_arch}=="x86_64"} {
default_variants +gcc42
}
@@ -77,7 +76,7 @@
pre-configure {
file mkdir ${workpath}/gcc-${version_gcc}/${name}
reinplace "s|tjmp %%edx|tjmp *%%edx|" ${workpath}/gcc-${version_gcc}/gcc/config/i386/i386.c
- if {![variant_isset darwin_8]} {
+ if {${os.major} != 8} {
reinplace "s|i686|i386|" ${workpath}/gcc-${version_gcc}/gcc/config/i386/darwin.h
set gcc_configargs "--with-as=/usr/bin/as --with-ld=/usr/bin/ld --with-nm=/usr/bin/nm"
} else {
Modified: trunk/dports/lang/php4/Portfile
===================================================================
--- trunk/dports/lang/php4/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/lang/php4/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -115,7 +115,7 @@
variant no_web conflicts apache apache2 apache20 fastcgi description {Don't include any web server support} {}
variant apache conflicts apache2 apache20 no_web description {Add Apache 1 web server module} {
- if { ! [variant_isset macosx] } {
+ if { ! [variant_isset macosx] && (![info exists os.subplatform] || ${os.subplatform} != "macosx") } {
depends_lib-append \
port:apache
configure.args-append \
@@ -329,7 +329,7 @@
# again and build just the FastCGI binary. Keep the options here in sync
# with the options specified in the apache, apache2 and apache20 variants.
if { [variant_isset apache] } {
- if { ![variant_isset macosx] } {
+ if { ![variant_isset macosx] && (![info exists os.subplatform] || ${os.subplatform} != "macosx") } {
configure.args-delete \
--with-apxs=${prefix}/sbin/apxs
} else {
Modified: trunk/dports/lang/php5/Portfile
===================================================================
--- trunk/dports/lang/php5/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/lang/php5/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -112,7 +112,7 @@
# On other platforms, the MacPorts apache port is used. Keep the options here
# in sync with those in the relevant part of the post-destroot phase.
variant apache conflicts apache2 no_web description {Add Apache 1 web server module} {
- if { ! [variant_isset macosx] } {
+ if { ! [variant_isset macosx] && (![info exists os.subplatform] || ${os.subplatform} != "macosx") } {
depends_lib-append \
port:apache
configure.args-append \
@@ -261,7 +261,7 @@
# again and build just the FastCGI binary. Keep the options here in sync
# with the options specified in the apache and apache2 variants.
if { [variant_isset apache] } {
- if { ![variant_isset macosx] } {
+ if { ![variant_isset macosx] && (![info exists os.subplatform] || ${os.subplatform} != "macosx") } {
configure.args-delete \
--with-apxs=${prefix}/sbin/apxs
} else {
Modified: trunk/dports/lang/php5-devel/Portfile
===================================================================
--- trunk/dports/lang/php5-devel/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/lang/php5-devel/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -114,7 +114,7 @@
# On other platforms, the MacPorts apache port is used. Keep the options here
# in sync with those in the relevant part of the post-destroot phase.
variant apache conflicts apache2 no_web description {Add Apache 1 web server module} {
- if { ! [variant_isset macosx] } {
+ if { ! [variant_isset macosx] && (![info exists os.subplatform] || ${os.subplatform} != "macosx") } {
depends_lib-append \
port:apache
configure.args-append \
@@ -264,7 +264,7 @@
# again and build just the FastCGI binary. Keep the options here in sync
# with the options specified in the apache and apache2 variants.
if { [variant_isset apache] } {
- if { ![variant_isset macosx] } {
+ if { ![variant_isset macosx] && (![info exists os.subplatform] || ${os.subplatform} != "macosx") } {
configure.args-delete \
--with-apxs=${prefix}/sbin/apxs
} else {
Modified: trunk/dports/lang/php52/Portfile
===================================================================
--- trunk/dports/lang/php52/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/lang/php52/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -128,7 +128,7 @@
# On other platforms, the MacPorts apache port is used. Keep the options here
# in sync with those in the relevant part of the post-destroot phase.
variant apache conflicts apache2 no_web description {Add Apache 1 web server module} {
- if { ! [variant_isset macosx] } {
+ if { ! [variant_isset macosx] && (![info exists os.subplatform] || ${os.subplatform} != "macosx") } {
depends_lib-append \
port:apache
configure.args-append \
@@ -411,7 +411,7 @@
# again and build just the FastCGI binary. Keep the options here in sync
# with the options specified in the apache and apache2 variants.
if { [variant_isset apache] } {
- if { ![variant_isset macosx] } {
+ if { ![variant_isset macosx] && (![info exists os.subplatform] || ${os.subplatform} != "macosx") } {
configure.args-delete \
--with-apxs=${prefix}/sbin/apxs
} else {
Modified: trunk/dports/math/fftw-single/Portfile
===================================================================
--- trunk/dports/math/fftw-single/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/math/fftw-single/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -40,7 +40,7 @@
depends_lib-append port:gcc34
configure.args-delete --disable-fortran
configure.args-append --enable-fortran
- if {[variant_isset darwin]} {
+ if {${os.platform} == "darwin"} {
patchfiles-append patch-configure_darwin
}
}
Modified: trunk/dports/math/maxima/Portfile
===================================================================
--- trunk/dports/math/maxima/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/math/maxima/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -46,12 +46,14 @@
--mandir=${prefix}/share/man \
--enable-sbcl
-variant clisp conflicts darwin i386 description {Use CLISP instead of SBCL for Lisp} {
+if {${os.platform} != "darwin" && ${os.arch} != "i386"} {
+variant clisp description {Use CLISP instead of SBCL for Lisp} {
depends_lib-delete port:sbcl
depends_lib-append port:clisp
configure.args-delete --enable-sbcl
configure.args-append --enable-clisp
}
+}
test.run yes
test.target check
Modified: trunk/dports/net/nefu/Portfile
===================================================================
--- trunk/dports/net/nefu/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/net/nefu/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -59,7 +59,7 @@
${destroot}${prefix}/etc/nefu.conf-dist
# nefu start/stop rc script (if non-Darwin)
- if {![variant_isset darwin]} {
+ if {${os.platform} != "darwin"} {
xinstall -d -m 0755 ${destroot}${prefix}/etc/rc.d
xinstall -m 0755 ${filespath}/nefu.sh.in \
${destroot}${prefix}/etc/rc.d/nefu.sh
Modified: trunk/dports/net/radmind/Portfile
===================================================================
--- trunk/dports/net/radmind/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/net/radmind/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -56,7 +56,7 @@
system "echo 'Place command files in this directory.' > ${destroot}${prefix}/var/radmind/client/README"
# radmind start/stop rc script (if non-Darwin)
- if {![variant_isset darwin]} {
+ if {${os.platform} != "darwin"} {
xinstall -d -m 0755 ${destroot}${prefix}/etc/rc.d
xinstall -m 0755 ${filespath}/radmind.sh.in \
${destroot}${prefix}/etc/rc.d/radmind.sh
Modified: trunk/dports/net/tuntaposx/Portfile
===================================================================
--- trunk/dports/net/tuntaposx/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/net/tuntaposx/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -61,8 +61,7 @@
}
}
-platform darwin 10 {}
-if {[variant_isset darwin_10]} {
+if {${os.platform} == "darwin" && ${os.major} == 10} {
# Kernel can be 32-bit or 64-bit, so build both
default_variants +universal
configure.universal_archs i386 x86_64
Modified: trunk/dports/print/ghostscript-fonts-hiragino/Portfile
===================================================================
--- trunk/dports/print/ghostscript-fonts-hiragino/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/print/ghostscript-fonts-hiragino/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -21,7 +21,7 @@
build {}
destroot {
- if {[variant_isset darwin_8]} {
+ if {${os.platform} == "darwin" && ${os.major} == 8} {
set FontList {"/System/Library/Fonts/ヒラギノ角ゴ Pro W3.otf" HiraKakuPro-W3 Adobe-Japan1 {GothicBBB-Medium}
"/System/Library/Fonts/ヒラギノ角ゴ Pro W6.otf" HiraKakuPro-W6 Adobe-Japan1 {FutoGoB101-Bold}
"/System/Library/Fonts/ヒラギノ角ゴ Std W8.otf" HiraKakuStd-W8 Adobe-Japan1 {}
@@ -41,7 +41,7 @@
"/Library/Fonts/ヒラギノ丸ゴ ProN W4.otf" HiraMaruProN-W4 Adobe-Japan1 {}
"/System/Library/Fonts/ヒラギノ明朝 ProN W3.otf" HiraMinProN-W3 Adobe-Japan1 {}
"/System/Library/Fonts/ヒラギノ明朝 ProN W6.otf" HiraMinProN-W6 Adobe-Japan1 {}}
- if {[variant_isset darwin_10]} {
+ if {${os.platform} == "darwin" && ${os.major} == 10} {
lappend FontList \
"/Library/Fonts/Hiragino Sans GB W3.otf" HiraginoSansGB-W3 Adobe-GB1 {} \
"/Library/Fonts/Hiragino Sans GB W6.otf" HiraginoSansGB-W6 Adobe-GB1 {}
@@ -275,9 +275,6 @@
}
}
-platform darwin 8 {}
-platform darwin 10 {}
-
variant no_alias description "Do not use Hiragino as an alternative to Morisawa's standard 5 fonts" {}
livecheck.type none
Modified: trunk/dports/sysutils/anacron/Portfile
===================================================================
--- trunk/dports/sysutils/anacron/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/sysutils/anacron/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -48,7 +48,7 @@
${destroot}${prefix}/share/doc/${name}/README
# Create startup rc script (if non-Darwin)
- if {![variant_isset darwin]} {
+ if {${os.platform} != "darwin"} {
xinstall -d -m 0755 ${destroot}${prefix}/etc/rc.d
xinstall -m 755 -c ${filespath}/anacron.sh \
${destroot}${prefix}/etc/rc.d/
Modified: trunk/dports/sysutils/apt/Portfile
===================================================================
--- trunk/dports/sysutils/apt/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/sysutils/apt/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -110,7 +110,7 @@
${worksrcpath}/dselect/setup \
${worksrcpath}/dselect/update
# Hack for lack of post-patch-append
- if {[variant_isset freebsd]} {
+ if {${os.platform} == "freebsd"} {
reinplace "s|make -s|gmake -s|g" ${worksrcpath}/configure
}
}
Modified: trunk/dports/sysutils/cfengine/Portfile
===================================================================
--- trunk/dports/sysutils/cfengine/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/sysutils/cfengine/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -94,7 +94,7 @@
${destroot}${cfworkdir}/masterfiles/inputs/${conf}-dist
}
# Create startup rc script (if non-Darwin)
- if {![variant_isset darwin]} {
+ if {${os.platform} != "darwin"} {
xinstall -d -m 0755 ${destroot}${prefix}/etc/rc.d
xinstall -m 0755 ${filespath}/${name}.sh.in \
${destroot}${prefix}/etc/rc.d/${name}.sh
Modified: trunk/dports/textproc/pdftk/Portfile
===================================================================
--- trunk/dports/textproc/pdftk/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/textproc/pdftk/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -75,18 +75,18 @@
${destroot}${prefix}/share/man/man1
}
-variant with_gcc41 conflicts with_gcc42 i386 description {Build using gcc41 (PowerPC only)} {
+if {${os.arch} == "powerpc"} {
+variant with_gcc41 conflicts with_gcc42 description {Build using gcc41 (PowerPC only)} {
depends_lib-append port:gcc41
set versuff -mp-4.1
}
+}
variant with_gcc42 conflicts with_gcc41 description {Build using gcc42} {
depends_lib-append port:gcc42
set versuff -mp-4.2
}
-platform i386 {}
-
-if { ![variant_isset with_gcc41] && ![variant_isset with_gcc42] } {
+if { (![variant_exists with_gcc41] || ![variant_isset with_gcc41]) && ![variant_isset with_gcc42] } {
default_variants +with_gcc42
}
Modified: trunk/dports/www/mod_jk/Portfile
===================================================================
--- trunk/dports/www/mod_jk/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/www/mod_jk/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -41,7 +41,7 @@
set javahome ""
}
if { ![file isdirectory ${javahome}] } {
- if { [variant_isset darwin] } {
+ if { ${os.platform} == "darwin" } {
if { [file isdirectory "/System/Library/Frameworks/JavaVM.framework/Home"] } {
set javahome "/System/Library/Frameworks/JavaVM.framework/Home"
}
Modified: trunk/dports/www/mod_jk2/Portfile
===================================================================
--- trunk/dports/www/mod_jk2/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/www/mod_jk2/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -40,7 +40,7 @@
set javahome ""
}
if { ![file isdirectory ${javahome}] } {
- if { [variant_isset darwin] } {
+ if { ${os.platform} == "darwin" } {
if { [file isdirectory "/System/Library/Frameworks/JavaVM.framework/Home"] } {
set javahome "/System/Library/Frameworks/JavaVM.framework/Home"
}
Modified: trunk/dports/www/privoxy/Portfile
===================================================================
--- trunk/dports/www/privoxy/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/www/privoxy/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -52,7 +52,7 @@
post-destroot {
xinstall -m 755 -d ${destroot}${prefix}/var/run
# Install and fixup startup script (if non-Darwin)
- if {![variant_isset darwin]} {
+ if {${os.platform} != "darwin"} {
xinstall -m 755 -d ${destroot}${prefix}/etc/rc.d
xinstall -m 755 -W ${worksrcpath} privoxy-generic.init \
${destroot}${prefix}/etc/rc.d/privoxy.sh
Modified: trunk/dports/www/zope/Portfile
===================================================================
--- trunk/dports/www/zope/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/www/zope/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -91,7 +91,7 @@
${destroot}${prefix}/bin/zopectl
# Create startup rc script (if non-Darwin)
- if {![variant_isset darwin]} {
+ if {${os.platform} != "darwin"} {
xinstall -o root -m 0755 -d ${destroot}${prefix}/etc/rc.d
xinstall -o root -m 0755 ${filespath}/zope.sh.in \
${destroot}${prefix}/etc/rc.d/zope.sh
Modified: trunk/dports/x11/gecko-sharp/Portfile
===================================================================
--- trunk/dports/x11/gecko-sharp/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/x11/gecko-sharp/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -19,6 +19,8 @@
depends_lib bin:mono:mono \
lib:mono:gtk-sharp
-variant macosx_framework requires darwin description {Build as a framework} {
+if {${os.platform} == "darwin"} {
+variant macosx_framework description {Build as a framework} {
prefix /Library/Frameworks/Mono.framework/Versions/${version}
}
+}
Modified: trunk/dports/x11/libhangul/Portfile
===================================================================
--- trunk/dports/x11/libhangul/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/x11/libhangul/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -17,11 +17,11 @@
patchfiles patch-Makefile patch-test
post-patch {
- reinplace "s|__PLATFORM__|ppc|g" \
- ${worksrcpath}/test/hangul.c
-
-if { [variant_isset i386] } {
- reinplace "s|__PLATFORM__|i386|g" \
- ${worksrcpath}/test/hangul.c
+ if { ${os.arch} == "powerpc" } {
+ reinplace "s|__PLATFORM__|ppc|g" \
+ ${worksrcpath}/test/hangul.c
+ } else {
+ reinplace "s|__PLATFORM__|${os.arch}|g" \
+ ${worksrcpath}/test/hangul.c
+ }
}
-}
Modified: trunk/dports/x11/pango/Portfile
===================================================================
--- trunk/dports/x11/pango/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/x11/pango/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -51,12 +51,14 @@
configure.ccache no
platform macosx {}
-variant quartz requires macosx {
+if { ([variant_isset macosx] || ([info exists os.subplatform] && ${os.subplatform} == "macosx"))} {
+variant quartz {
# Although this variant does nothing, pango will automatically build
# itself differently depending on whether or not cairo is installed with
# the quartz variant. Therefore this variant is necessary to be able to
# distinguish whether an installed pango has quartz support or not.
}
+}
pre-configure {
set glib_minimum_version 2.17.3
@@ -74,7 +76,7 @@
}
set cairo_quartz_pc ${prefix}/lib/pkgconfig/cairo-quartz.pc
- if {[variant_isset quartz]} {
+ if {[variant_exists quartz] && [variant_isset quartz]} {
if {![file exists ${cairo_quartz_pc}]} {
ui_error "To install pango with the quartz variant, cairo must be installed with the quartz variant."
return -code error "incompatible cairo installation"
Modified: trunk/dports/x11/pango-devel/Portfile
===================================================================
--- trunk/dports/x11/pango-devel/Portfile 2010-04-08 08:07:11 UTC (rev 66284)
+++ trunk/dports/x11/pango-devel/Portfile 2010-04-08 08:09:09 UTC (rev 66285)
@@ -50,7 +50,8 @@
configure.ccache no
platform macosx {}
-variant quartz requires macosx {
+if { ([variant_isset macosx] || ([info exists os.subplatform] && ${os.subplatform} == "macosx"))} {
+variant quartz {
# Although this variant does nothing, pango will automatically build
# itself differently depending on whether or not cairo is installed with
# the quartz variant. Therefore this variant is necessary to be able to
@@ -67,6 +68,7 @@
}
}
}
+}
pre-configure {
set glib_minimum_version 2.17.3
@@ -84,7 +86,7 @@
}
set cairo_quartz_pc ${prefix}/lib/pkgconfig/cairo-quartz.pc
- if {[variant_isset quartz]} {
+ if {[variant_exists quartz] && [variant_isset quartz]} {
if {![file exists ${cairo_quartz_pc}]} {
ui_error "To install pango with the quartz variant, cairo must be installed with the quartz variant."
return -code error "incompatible cairo installation"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100408/ceb104cd/attachment-0001.html>
More information about the macports-changes
mailing list