From 63ecf7e34bfbaaaf48c8100fff4671be73a86ebb Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 26 Jan 2010 09:01:24 +0000 Subject: Changes 5.6.1: - Changed msSaveImageBufferGD to be in accordance with msSaveImageGD - Changed the query map rendering implementation without adding extra layers to the map - SQL Server 2008 plugin is not handling null field values correctly - Hatch symbol not properly saved - Expose symbolObj.inmapfile to the SWIG API, have already been exposed to PHP - Expose getGeomTransform/setGeomTransform to SWIG instead of exposing the private vars for rfc48 - Fixed writeSymbol to support writing 'ANGLE AUTO' - Fixed problems with point queries not working via the CGI (mode=query or mode=nquery) Changes 5.6.0: - Fixed potential leak of env. vars through msEvalRegex() - WFS hits count is incorrect if the request contain 2 layers or more - Fixed a problem with layer plugin where copyVirtualTable didn't copy the LayerResultsGetShape function pointer --- geography/mapserver/Makefile | 61 +++++++++++------- geography/mapserver/PLIST | 9 +-- geography/mapserver/distinfo | 11 ++-- geography/mapserver/options.mk | 23 +++++++ geography/mapserver/patches/patch-aa | 116 +++++++---------------------------- geography/mapserver/patches/patch-ab | 22 +++++++ 6 files changed, 116 insertions(+), 126 deletions(-) create mode 100644 geography/mapserver/options.mk create mode 100644 geography/mapserver/patches/patch-ab (limited to 'geography') diff --git a/geography/mapserver/Makefile b/geography/mapserver/Makefile index 78bab35c47f..93472131e05 100644 --- a/geography/mapserver/Makefile +++ b/geography/mapserver/Makefile @@ -1,40 +1,57 @@ -# $NetBSD: Makefile,v 1.20 2010/01/18 09:58:55 wiz Exp $ -# +# $NetBSD: Makefile,v 1.21 2010/01/26 09:01:24 adam Exp $ -DISTNAME= mapserver-4.0 -PKGREVISION= 7 -CATEGORIES= geography www -MASTER_SITES= http://download.osgeo.org/mapserver/ +DISTNAME= mapserver-5.6.1 +CATEGORIES= geography www +MASTER_SITES= http://download.osgeo.org/mapserver/ -MAINTAINER= hdp@cs.msu.edu -HOMEPAGE= http://mapserver.gis.umn.edu/ -COMMENT= Environment for building spatially enabled Internet apps +MAINTAINER= hdp@cs.msu.edu +HOMEPAGE= http://mapserver.org/ +COMMENT= Environment for building spatially enabled Internet apps PKG_DESTDIR_SUPPORT= user-destdir MAKE_JOBS_SAFE= no +USE_LANGUAGES= c c++ USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -USE_LANGUAGES= c c++ - -CONFIGURE_ARGS+= --with-gd=${PREFIX:Q} \ - --with-libiconv=${PREFIX:Q} \ - --with-zlib=${BUILDLINK_PREFIX.zlib} - -INSTALLATION_DIRS= bin include lib +CONFIGURE_ARGS+= --with-cairo +CONFIGURE_ARGS+= --with-freetype +CONFIGURE_ARGS+= --with-fribidi-config=${BUILDLINK_PREFIX.fribidi}/bin/fribidi-config +CONFIGURE_ARGS+= --with-gdal +CONFIGURE_ARGS+= --with-gd=${BUILDLINK_PREFIX.gd} +CONFIGURE_ARGS+= --with-geos +CONFIGURE_ARGS+= --with-libiconv +CONFIGURE_ARGS+= --with-ogr +CONFIGURE_ARGS+= --with-png +CONFIGURE_ARGS+= --with-proj +CONFIGURE_ARGS+= --with-wcs +CONFIGURE_ARGS+= --with-wfs +CONFIGURE_ARGS+= --with-zlib + +INSTALLATION_DIRS= bin lib libexec/cgi-bin do-install: - ${INSTALL_DATA} ${WRKSRC}/libmap.a ${DESTDIR}${PREFIX}/lib - ${INSTALL_DATA} ${WRKSRC}/map.h ${DESTDIR}${PREFIX}/include -.for f in shp2img shp2pdf mapserv legend shptree shptreevis \ - shptreetst scalebar sortshp - ${INSTALL_PROGRAM} ${WRKSRC}/${f:Q} ${DESTDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/libmapserver.a ${DESTDIR}${PREFIX}/lib + ${INSTALL_PROGRAM} ${WRKSRC}/mapserv ${DESTDIR}${PREFIX}/libexec/cgi-bin +.for f in legend msencrypt scalebar shp2img shp2pdf \ + shptree shptreetst shptreevis sortshp tile4ms + ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/bin .endfor +.include "options.mk" + +.include "../../converters/fribidi/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" +.include "../../devel/readline/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +.include "../../geography/gdal-lib/buildlink3.mk" +.include "../../geography/geos/buildlink3.mk" +.include "../../graphics/cairo/buildlink3.mk" +.include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/gd/buildlink3.mk" -.include "../../graphics/tiff/buildlink3.mk" +.include "../../graphics/png/buildlink3.mk" +.include "../../misc/proj/buildlink3.mk" +.include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/geography/mapserver/PLIST b/geography/mapserver/PLIST index e542a85a8d8..7f7a747c051 100644 --- a/geography/mapserver/PLIST +++ b/geography/mapserver/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2003/10/05 17:41:30 jschauma Exp $ +@comment $NetBSD: PLIST,v 1.2 2010/01/26 09:01:24 adam Exp $ bin/legend -bin/mapserv +bin/msencrypt bin/scalebar bin/shp2img bin/shp2pdf @@ -8,5 +8,6 @@ bin/shptree bin/shptreetst bin/shptreevis bin/sortshp -include/map.h -lib/libmap.a +bin/tile4ms +lib/libmapserver.a +libexec/cgi-bin/mapserv diff --git a/geography/mapserver/distinfo b/geography/mapserver/distinfo index 9d9e88caa59..67f615b618e 100644 --- a/geography/mapserver/distinfo +++ b/geography/mapserver/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.3 2005/02/22 21:08:32 agc Exp $ +$NetBSD: distinfo,v 1.4 2010/01/26 09:01:24 adam Exp $ -SHA1 (mapserver-4.0.tar.gz) = 1007771932e43f97d868862fdc3a7ad3ab3d9880 -RMD160 (mapserver-4.0.tar.gz) = fb543646b5aee6ca381c3e8dd4ebb86c3723bd60 -Size (mapserver-4.0.tar.gz) = 857870 bytes -SHA1 (patch-aa) = be9ec2335e608f52804287c5731e2adf597d86e4 +SHA1 (mapserver-5.6.1.tar.gz) = 3531396b0b3f9dc43be4a6be8090c67dedced460 +RMD160 (mapserver-5.6.1.tar.gz) = db58c6570d50576ca087b2d6c4cccf68d959c7d5 +Size (mapserver-5.6.1.tar.gz) = 2308608 bytes +SHA1 (patch-aa) = d842afeab3455304236bebbf4ea576c974cafbdd +SHA1 (patch-ab) = f1521546905034304bc5f1556625d6171421d93d diff --git a/geography/mapserver/options.mk b/geography/mapserver/options.mk new file mode 100644 index 00000000000..e2a90dc8303 --- /dev/null +++ b/geography/mapserver/options.mk @@ -0,0 +1,23 @@ +# $NetBSD: options.mk,v 1.1 2010/01/26 09:01:24 adam Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.mapserver +PKG_SUPPORTED_OPTIONS= pgsql mysql +PKG_SUGGESTED_OPTIONS= # empty + +.include "../../mk/bsd.options.mk" + +# +# PostgreSQL/PostGIS support +# +.if !empty(PKG_OPTIONS:Mpgsql) +.include "../../databases/postgresql-postgis/buildlink3.mk" +CONFIGURE_ARGS+= --with-postgis +.endif + +# +# MySQL/MyGIS support +# +.if !empty(PKG_OPTIONS:Mmysql) +.include "../../databases/mysql5-client/buildlink3.mk" +CONFIGURE_ARGS+= --with-mygis +.endif diff --git a/geography/mapserver/patches/patch-aa b/geography/mapserver/patches/patch-aa index ca4409e363e..3a8ee8c4092 100644 --- a/geography/mapserver/patches/patch-aa +++ b/geography/mapserver/patches/patch-aa @@ -1,97 +1,23 @@ -$NetBSD: patch-aa,v 1.2 2004/07/10 17:20:30 kristerw Exp $ +$NetBSD: patch-aa,v 1.3 2010/01/26 09:01:24 adam Exp $ ---- Makefile.in.orig 2003-06-18 15:12:06.000000000 +0200 -+++ Makefile.in 2004-07-10 19:17:29.000000000 +0200 -@@ -137,7 +137,7 @@ - # - CXX= @CXX@ - CC= @CC@ --LD= @CC@ -+LD= @CXX@ - AR= ar rc - RANLIB= @RANLIB@ - LEX= @LEX@ -@@ -155,10 +155,10 @@ - $(CURL_INC) $(MING_INC) $(ORACLESPATIAL_INC) +--- Makefile.in.orig 2009-06-07 09:52:59.000000000 +0000 ++++ Makefile.in +@@ -239,7 +239,7 @@ LD_SHARED = @LD_SHARED@ + LD_SONAME_LIBMAP = -W1,@SO_COMMAND_NAME@,$(LIBMAP_SH_VER) + + XTRALIBS= @XTRALIBS@ +-RUNPATHS= @RPATHS@ ++RUNPATHS= @RPATHS@ -Wl,-R${prefix}/lib -Wl,-R${X11BASE}/lib + + DEFINES = $(IGNORE_MISSING_DATA) $(USE_POINT_Z_M) $(STRINGS) @ALL_ENABLED@ $(FRIBIDI) + +@@ -286,6 +286,9 @@ all: $(MAKE_GD) libmapserver.a $(EXTRA_D + .c.o: + $(CC) -c $(CFLAGS) $< -o $@ + ++.cpp.o: ++ $(CXX) -c $(CXXFLAGS) $< -o $@ ++ + mapogl.o: mapogl.cpp + $(CXX) -c $(CXXFLAGS) mapogl.cpp -o mapogl.o - # Link flags and shared libs only --LDFLAGS= $(RUNPATHS) -L. -lmap $(GD_LIB) $(PDF_LIB) $(TIFF_LIB) $(PROJ_LIB) \ -+MSLDFLAGS= $(RUNPATHS) -L. -lmap $(GD_LIB) $(PDF_LIB) $(TIFF_LIB) $(PROJ_LIB) \ - $(JPEG_LIB) $(SDE_LIB) $(OGR_LIB) $(GDAL_LIB) \ - $(MING_LIB) $(POSTGIS_LIB) $(MYGIS_LIB) $(CURL_LIB) $(ORACLESPATIAL_LIB) \ -- $(MPATROL_LIB) $(THREAD_LIB) $(XTRALIBS) -+ $(MPATROL_LIB) $(THREAD_LIB) $(XTRALIBS) ${LDFLAGS} - - # STATIC_LIBS is full filename with path of libs that will be statically linked - STATIC_LIBS= $(GD_STATIC) $(OGR_STATIC) -@@ -200,55 +200,55 @@ - $(RANLIB) libmap.a - - shp2pdf: libmap.a shp2pdf.o map.h -- $(LD) $(CFLAGS) shp2pdf.o $(LDFLAGS) $(STATIC_LIBS) -o shp2pdf -+ $(LD) $(CFLAGS) shp2pdf.o $(MSLDFLAGS) $(STATIC_LIBS) -o shp2pdf - - shp2img: libmap.a shp2img.o map.h -- $(LD) $(CFLAGS) shp2img.o $(LDFLAGS) $(STATIC_LIBS) -o shp2img -+ $(LD) $(CFLAGS) shp2img.o $(MSLDFLAGS) $(STATIC_LIBS) -o shp2img - - sym2img: libmap.a sym2img.o map.h -- $(LD) $(CFLAGS) sym2img.o $(LDFLAGS) $(STATIC_LIBS) -o sym2img -+ $(LD) $(CFLAGS) sym2img.o $(MSLDFLAGS) $(STATIC_LIBS) -o sym2img - - legend: libmap.a legend.o map.h -- $(LD) $(CFLAGS) legend.o $(LDFLAGS) $(STATIC_LIBS) -o legend -+ $(LD) $(CFLAGS) legend.o $(MSLDFLAGS) $(STATIC_LIBS) -o legend - - scalebar: libmap.a scalebar.o map.h -- $(LD) $(CFLAGS) scalebar.o $(LDFLAGS) $(STATIC_LIBS) -o scalebar -+ $(LD) $(CFLAGS) scalebar.o $(MSLDFLAGS) $(STATIC_LIBS) -o scalebar - - mapserv: mapserv.h libmap.a mapserv.o cgiutil.o map.h -- $(LD) $(CFLAGS) mapserv.o cgiutil.o $(LDFLAGS) $(STATIC_LIBS) -o mapserv -+ $(LD) $(CFLAGS) mapserv.o cgiutil.o $(MSLDFLAGS) $(STATIC_LIBS) -o mapserv - - mapserv.fcgi: mapserv.h libmap.a mapserv_fcgi.o cgiutil.o map.h - $(LD) $(CFLAGS) mapserv_fcgi.o cgiutil.o \ -- $(LDFLAGS) $(STATIC_LIBS) -lfcgi \ -+ $(MSLDFLAGS) $(STATIC_LIBS) -lfcgi \ - -o mapserv.fcgi - - shpindex: libmap.a shpindex.o map.h -- $(LD) $(CFLAGS) shpindex.o $(LDFLAGS) $(STATIC_LIBS) -o shpindex -+ $(LD) $(CFLAGS) shpindex.o $(MSLDFLAGS) $(STATIC_LIBS) -o shpindex - - shptree: libmap.a shptree.o map.h -- $(LD) $(CFLAGS) shptree.o $(LDFLAGS) $(STATIC_LIBS) -o shptree -+ $(LD) $(CFLAGS) shptree.o $(MSLDFLAGS) $(STATIC_LIBS) -o shptree - - shptreevis: libmap.a shptreevis.o map.h -- $(LD) $(CFLAGS) shptreevis.o $(LDFLAGS) $(STATIC_LIBS) -o shptreevis -+ $(LD) $(CFLAGS) shptreevis.o $(MSLDFLAGS) $(STATIC_LIBS) -o shptreevis - - shptreetst: libmap.a shptreetst.o map.h -- $(LD) $(CFLAGS) shptreetst.o $(LDFLAGS) $(STATIC_LIBS) -o shptreetst -+ $(LD) $(CFLAGS) shptreetst.o $(MSLDFLAGS) $(STATIC_LIBS) -o shptreetst - - sortshp: sortshp.o -- $(LD) $(CFLAGS) sortshp.o $(LDFLAGS) $(STATIC_LIBS) -o sortshp -+ $(LD) $(CFLAGS) sortshp.o $(MSLDFLAGS) $(STATIC_LIBS) -o sortshp - - tile4ms: tile4ms.o -- $(LD) $(CFLAGS) tile4ms.o $(LDFLAGS) $(STATIC_LIBS) -o tile4ms -+ $(LD) $(CFLAGS) tile4ms.o $(MSLDFLAGS) $(STATIC_LIBS) -o tile4ms - - testexpr: testexpr.o mapparser.o maplexer.o -- $(LD) $(CFLAGS) testexpr.o $(LDFLAGS) $(STATIC_LIBS) -o testexpr -+ $(LD) $(CFLAGS) testexpr.o $(MSLDFLAGS) $(STATIC_LIBS) -o testexpr - - mapscriptvars: - touch mapscriptvars - pwd > mapscriptvars - echo $(IGNORE_MISSING_DATA) $(STRINGS) $(EPPL) $(PROJ) $(TTF) $(TIFF) $(JPEG) $(GD) $(SDE) $(OGR) $(GDAL) >> mapscriptvars - echo -I. $(PROJ_INC) $(GD_INC) $(TTF_INC) $(TIFF_INC) $(JPEG_INC) $(SDE_INC) $(OGR_INC) $(GDAL_INC) >> mapscriptvars -- echo $(LDFLAGS) >> mapscriptvars -+ echo $(MSLDFLAGS) >> mapscriptvars - echo $(STATIC_LIBS) >> mapscriptvars - - php3_mapscript_clean:: diff --git a/geography/mapserver/patches/patch-ab b/geography/mapserver/patches/patch-ab new file mode 100644 index 00000000000..2b258e2daee --- /dev/null +++ b/geography/mapserver/patches/patch-ab @@ -0,0 +1,22 @@ +$NetBSD: patch-ab,v 1.1 2010/01/26 09:01:24 adam Exp $ + +--- configure.orig 2009-11-27 21:16:01.000000000 +0000 ++++ configure +@@ -9186,7 +9186,7 @@ else + echo "${ECHO_T}no" >&6 + fi + +- if test "$FT_BIN" == "no" ; then ++ if test "$FT_BIN" = "no" ; then + { { echo "$as_me:$LINENO: error: the freetype-config executable could not be found and is required for agg support + to fix this, you should either: + * install the freetype development headers +@@ -12159,7 +12159,7 @@ if test "$FRIBIDI_CONFIG" = "no" ; then + FRIBIDI_INC= + FRIBIDI_LIB= + else +- if test "$FRIBIDI_PKG_CONFIG" = "yes" -o ${FRIBIDI_CONFIG: -3} = ".pc" ; then ++ if test "$FRIBIDI_PKG_CONFIG" = "yes"; then + echo "$as_me:$LINENO: result: yes, user supplied path to fribidi.pc" >&5 + echo "${ECHO_T}yes, user supplied path to fribidi.pc" >&6 + FRIBIDI_ENABLED="-DUSE_FRIBIDI -DUSE_FRIBIDI2" -- cgit v1.2.3