Update to mapserver 5.6.0, see http://www.osgeo.org/node/984 for

details.
Looks good to & 'go ahead' jasper@

geo/mapserver/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2009/10/29 19:34:12 landry Exp $
+# $OpenBSD: Makefile,v 1.3 2009/12/24 21:59:19 landry Exp $
 
 MULTI_PACKAGES=	-utils -main -php -perl
 SHARED_ONLY=	Yes
@@ -8,7 +8,7 @@ COMMENT-utils=	mapserver utilities
 COMMENT-php=	PHP Mapscript extension
 COMMENT-perl=	Perl Mapscript binding
 
-V =		5.4.2
+V =		5.6.0
 DISTNAME=	mapserver-${V}
 PKGNAME-main=	${DISTNAME}
 PKGNAME-utils=	mapserver-utils-${V}
@@ -31,7 +31,6 @@ MASTER_SITES=	http://download.osgeo.org/mapserver/
 BUILD_DEPENDS=	:php5-core-*:www/php5/core
 
 LIB_DEPENDS=	proj::devel/proj \
-		agg,aggfontfreetype::graphics/agg \
 		gdal::geo/gdal \
 		geos_c::geo/geos \
 		geotiff::devel/geotiff \
@@ -40,7 +39,7 @@ LIB_DEPENDS=	proj::devel/proj \
 RUN_DEPENDS-php=	:php5-core-*:www/php5/core
 
 WANTLIB=	crypto curl expat freetype gif iconv idn jasper jpeg \
-		m png pq ssl tiff xml2 z
+		com_err readline termcap m png pq ssl tiff xml2 z
 
 WANTLIB-main=	${WANTLIB} c stdc++
 WANTLIB-utils=	${WANTLIB} c stdc++
@@ -48,7 +47,7 @@ WANTLIB-utils=	${WANTLIB} c stdc++
 USE_GMAKE=	yes
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=	--with-proj=${LOCALBASE} \
-		--with-agg=${LOCALBASE} \
+		--with-png=${LOCALBASE} \
 		--without-pdf \
 		--with-tiff=${LOCALBASE} \
 		--with-freetype=${X11BASE}/bin \
@@ -68,6 +67,8 @@ CONFIGURE_ARGS=	--with-proj=${LOCALBASE} \
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+MAKE_ENV=	CFLAGS+=-fPIC
+
 UTILS=	shp2img shp2pdf legend shptree shptreevis shptreetst scalebar \
 	sortshp tile4ms msencrypt mapserver-config
 

geo/mapserver/distinfo

@@ -1,5 +1,5 @@
-MD5 (mapserver-5.4.2.tar.gz) = fFi7kPUAP8+uxDIMxlKmaQ==
-RMD160 (mapserver-5.4.2.tar.gz) = BWNDVeGnS4f/o/ugdBkRs0VQMh4=
-SHA1 (mapserver-5.4.2.tar.gz) = Sv5HGa03x3ru7YPzMFnkugU9z6E=
-SHA256 (mapserver-5.4.2.tar.gz) = pwBagJx0lM8soWSDUOq2Acwa80cJsSdYdnm840nl4YU=
-SIZE (mapserver-5.4.2.tar.gz) = 1877995
+MD5 (mapserver-5.6.0.tar.gz) = FP5zpn/MNmAl/bZ42aeCnQ==
+RMD160 (mapserver-5.6.0.tar.gz) = RHgVqv59/L/ShSGhNvuv/BETF58=
+SHA1 (mapserver-5.6.0.tar.gz) = LNPfh5BjFs517odsDPyNAagPcnY=
+SHA256 (mapserver-5.6.0.tar.gz) = cV7bK5J3yN9EZkOqmAld9ZVJkB/g+w3xbPn/8fEB2nM=
+SIZE (mapserver-5.6.0.tar.gz) = 2308687

geo/mapserver/patches/patch-configure

@@ -0,0 +1,12 @@
+$OpenBSD: patch-configure,v 1.1 2009/12/24 21:59:19 landry Exp $
+--- configure.orig	Fri Nov 27 22:16:01 2009
++++ configure	Wed Dec 23 17:37:23 2009
+@@ -9784,7 +9784,7 @@ fi
+ 
+ RGBA_PNG_ENABLED=$RGBA_PNG_ENABLED
+ 
+-PNG_INC=$PNG_INC
++PNG_INC=-I$PNG_DIR/include/libpng
+ 
+ PNG_LIB=$PNG_LIB
+ 

geo/mapserver/patches/patch-mapows_c

@@ -1,17 +0,0 @@
-$OpenBSD: patch-mapows_c,v 1.1 2009/10/29 19:34:12 landry Exp $
-Fix for http://trac.osgeo.org/mapserver/ticket/2578
---- mapows.c.orig	Tue Oct 27 19:51:18 2009
-+++ mapows.c	Tue Oct 27 19:51:46 2009
-@@ -1211,7 +1211,11 @@ void msOWSPrintLatLonBoundingBox(FILE *stream, const c
- 
-   if (nService == OWS_WMS) { /* always project to lat long */
-     if (srcproj->numargs > 0 && !pj_is_latlong(srcproj->proj)) {
--      msProjectRect(srcproj, NULL, &ext);
-+      projectionObj wgs84;
-+      msInitProjection(&wgs84);
-+      msLoadProjectionString(&wgs84, "+proj=longlat +datum=WGS84");
-+      msProjectRect(srcproj, &wgs84, &ext);
-+      msFreeProjection(&wgs84);
-     }
-   }
- 

geo/mapserver/patches/patch-mapscript_php3_Makefile_in

@@ -0,0 +1,12 @@
+$OpenBSD: patch-mapscript_php3_Makefile_in,v 1.1 2009/12/24 21:59:19 landry Exp $
+--- mapscript/php3/Makefile.in.orig	Wed Dec 23 21:22:37 2009
++++ mapscript/php3/Makefile.in	Wed Dec 23 21:22:45 2009
+@@ -85,7 +85,7 @@ PHPPROJ_OBJS = php_mapscript_util.o php_proj.o $(PHP_R
+ 
+ 
+ php_mapscript.so: $(PHPMS_OBJS) ../../libmapserver.a
+-	$(LD) -o $@ $(PHPMS_OBJS) $(MS_LIBS)
++	$(LD) -fPIC -o $@ $(PHPMS_OBJS) $(MS_LIBS)
+ 
+ php_proj.so:  $(PHPPROJ_OBJS)
+ 	$(LD) -o $@ $(PHPPROJ_OBJS) $(MS_LIBS)