Revision: 96046 https://trac.macports.org/changeset/96046 Author: and.damore@macports.org Date: 2012-07-30 03:48:03 -0700 (Mon, 30 Jul 2012) Log Message: ----------- port mapserver: abandonment ticket #35424, updated to 6.0.3 according to patch #30250 #34033 and #34614, closes the aforementioned tickets Modified Paths: -------------- trunk/dports/gis/mapserver/Portfile Added Paths: ----------- trunk/dports/gis/mapserver/files/patch-renderers-agg-include-agg_renderer_outline_aa.h.diff Modified: trunk/dports/gis/mapserver/Portfile =================================================================== --- trunk/dports/gis/mapserver/Portfile 2012-07-30 10:25:07 UTC (rev 96045) +++ trunk/dports/gis/mapserver/Portfile 2012-07-30 10:48:03 UTC (rev 96046) @@ -3,9 +3,10 @@ PortSystem 1.0 name mapserver -version 5.2.0 -maintainers googlemail.com:mbarchfe +version 6.0.3 +maintainers and.damore hbaspecto.com:jea openmaintainer categories gis +license permissive platforms darwin description mapserver @@ -14,26 +15,114 @@ homepage http://mapserver.gis.umn.edu/ master_sites http://download.osgeo.org/mapserver +distname mapserver-${version} -checksums md5 6c0f210eb6510f0a43b6d5b09df8bb83 +checksums md5 0d2ad6f56e8a1b5755e856a54f90071c \ + rmd160 a1bf9a90e889c17ad95f7c52de1e6523189bcd8d \ + sha256 a939d5e207017ff87e115816a0a8a13fb2751069feb90e12fe594c537a917199 depends_lib port:gd2 \ - port:geos + port:jpeg \ + port:libpng \ + port:freetype \ + port:giflib \ -patchfiles patch-Makefile.in.diff +patchfiles patch-Makefile.in.diff \ + patch-renderers-agg-include-agg_renderer_outline_aa.h.diff -configure.args --with-gd=${prefix} -variant gdalogr description {Add raster formats from gdal (Geospatial Data Abstraction Library) and vector formats from OGR Simple Features Library} { - depends_lib-append port:gdal - configure.args-append --with-gdal=${prefix}/bin/gdal-config \ - --with-ogr=${prefix}/bin/gdal-config +configure.args --with-gd=${prefix} \ + --with-png=${prefix} \ + --with-zlib=${prefix} \ + --with-jpeg=${prefix} \ + --with-gif=${prefix} \ + +default_variants +wms +gdal +ogr +proj +cairo +wfs +proj \ + +geos +postgis +wmsclient +wfsclient \ + +wcs +sos +kml +fastcgi + +if {[variant_isset postgis]} { + #check for most recent version of postgresql installed + set HAVE_PGCONFIG [llength [glob -nocomplain -d ${prefix}/lib postgresql*/bin/pg_config]] + #if not found, intall the postgresql port + if {$HAVE_PGCONFIG == 0} { + depends_lib-append port:postgresql90 + } } -variant proj description {Add projection and Web Map Service support} { - depends_lib-append port:proj - configure.args-append --with-proj=${prefix} +variant postgis description {Add support for postgis sources} { + set PGSQL_DIR [lindex [lsort -dec [glob -d ${prefix}/lib postgresql*]] 0] + configure.args-append "--with-postgis=${PGSQL_DIR}/bin/pg_config" } +variant wms description {Add WMS server support} { + default_variants-append +proj +} + +variant wfs description {Add WFS server support} { + depends_lib-append port:libxml2 + default_variants-append +proj +ogr +geos + configure.args-append --with-wfs +} + +variant sos description {Add SOS server support} { + depends_lib-append port:libxml2 + default_variants-append +proj +ogr + configure.args-append --with-sos +} + +variant wcs description {Add WCS server support} { + default_variants-append +proj +gdal + configure.args-append --with-wcs +} + +variant wmsclient description {Add WMS client support} { + depends_lib-append port:curl + default_variants-append +proj +gdal + configure.args-append --with-wmsclient +} + +variant kml description {Add KML output support} { + configure.args-append --with-kml +} + +variant wfsclient description {Add WFS client support} { + depends_lib-append port:libxml2 \ + port:curl + default_variants-append +proj +ogr +geos + configure.args-append --with-wfsclient +} + +variant cairo description {Add SVG and PDF support through cairo} { + depends_lib-append path:lib/pkgconfig/cairo.pc:cairo + configure.args-append --with-cairo +} + +variant gdal description {Add GDAL input format support} { + depends_lib-append port:gdal + configure.args-append --with-gdal +} + +variant ogr description {Add OGR input format support} { + depends_lib-append port:gdal + configure.args-append --with-ogr +} + + +variant proj description {Proj.4 reprojection support} { + depends_lib-append port:proj + configure.args-append --with-proj=${prefix} +} + +variant fastcgi description {FastCGI support} { + depends_lib-append port:fcgi + configure.args-append --with-fastcgi=${prefix} +} + +variant geos description {Add GEOS operations support} { + depends_lib-append port:geos + configure.args-append --with-geos +} + variant apache conflicts apache2 apache_apple description {Use MacPorts Apache 1} { depends_run-append port:apache global cgi_path @@ -52,12 +141,13 @@ } if {![variant_isset apache] && ![variant_isset apache2] && ![variant_isset apache_apple]} { - default_variants +apache2 + #default to the apple apache version if none specified + default_variants +apache_apple } destroot.target install-force destroot.violate_mtree yes post-destroot { file mkdir ${destroot}${cgi_path} - xinstall -m 755 ${worksrcpath}/mapserv ${destroot}${cgi_path} + xinstall -m 755 ${worksrcpath}/mapserv ${destroot}${cgi_path}/mapserv } Added: trunk/dports/gis/mapserver/files/patch-renderers-agg-include-agg_renderer_outline_aa.h.diff =================================================================== --- trunk/dports/gis/mapserver/files/patch-renderers-agg-include-agg_renderer_outline_aa.h.diff (rev 0) +++ trunk/dports/gis/mapserver/files/patch-renderers-agg-include-agg_renderer_outline_aa.h.diff 2012-07-30 10:48:03 UTC (rev 96046) @@ -0,0 +1,10 @@ +--- renderers/agg/include/agg_renderer_outline_aa.h.orig 2012-04-13 13:16:34.000000000 -0600 ++++ renderers/agg/include/agg_renderer_outline_aa.h 2012-04-13 13:17:21.000000000 -0600 +@@ -1365,7 +1365,6 @@ + //--------------------------------------------------------------------- + void profile(const line_profile_aa& prof) { m_profile = &prof; } + const line_profile_aa& profile() const { return *m_profile; } +- line_profile_aa& profile() { return *m_profile; } + + //--------------------------------------------------------------------- + int subpixel_width() const { return m_profile->subpixel_width(); }