diff options
| author | Jack Nagel | 2012-09-04 23:04:01 -0500 |
|---|---|---|
| committer | Jack Nagel | 2012-09-10 16:16:54 -0500 |
| commit | 6b8d25f2d21a3c19ecb0809d619999137cb94565 (patch) | |
| tree | 402f61e324fc981a56a2064bb0d4f5680ca135ed /Library/Formula/mapserver.rb | |
| parent | db74b9b4776aced4f4ac59076eebe10a98768f09 (diff) | |
| download | homebrew-6b8d25f2d21a3c19ecb0809d619999137cb94565.tar.bz2 | |
Clean up MacOS version method usage
The MacOS.version? family of methods (other than "leopard?") are poorly
defined and lead to confusing code. Replace them in formulae with more
explicit comparisons.
"MacOS.version" is a special version object that can be compared to
numerics, symbols, and strings using the standard Ruby comparison
methods.
The old methods were moved to compat when the version comparison code
was merged, and they must remain there "forever", but they should not be
used in new code.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Formula/mapserver.rb')
| -rw-r--r-- | Library/Formula/mapserver.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Library/Formula/mapserver.rb b/Library/Formula/mapserver.rb index e17a48d1e..edbc1f345 100644 --- a/Library/Formula/mapserver.rb +++ b/Library/Formula/mapserver.rb @@ -18,7 +18,7 @@ class Mapserver < Formula depends_on 'gdal' depends_on 'geos' if build.include? 'with-geos' - depends_on 'postgresql' if build.include? 'with-postgresql' and not MacOS.lion? + depends_on 'postgresql' if build.include? 'with-postgresql' and not MacOS.version >= :lion depends_on 'fcgi' if build.include? 'with-fastcgi' def patches @@ -41,7 +41,7 @@ class Mapserver < Formula args << "--with-php=/usr/include/php" if build.include? 'with-php' if build.include? 'with-postgresql' - if MacOS.lion? # Lion ships with PostgreSQL libs + if MacOS.version >= :lion # Lion ships with PostgreSQL libs args << "--with-postgis" else args << "--with-postgis=#{HOMEBREW_PREFIX}/bin/pg_config" |