3 files changed, 21 insertions, 24 deletions

diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile
index 858a573675b8..e954025f9553 100644
--- a/graphics/mapserver/Makefile
+++ b/graphics/mapserver/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=		mapserver
-PORTVERSION=		5.2.0
-PORTREVISION=		1
+PORTVERSION=		5.2.1
 CATEGORIES=		graphics www geography
 MASTER_SITES=		http://download.osgeo.org/mapserver/
 
@@ -23,7 +22,8 @@ CONFIGURE_ARGS=		--enable-runpath \
 			--with-gd=${LOCALBASE} \
 			--with-proj=${LOCALBASE}
 
-OPTIONS=		TIFF "Support for TIFF (but not GeoTIFF) files" off \
+OPTIONS=		AGG "Support for AGG image rendering (req: FreeType)" off \
+			TIFF "Support for TIFF (but not GeoTIFF) files" off \
 			MING "Support for Macromedia Flash output" off \
 			PDF "Support for PDF output via pdflib" off \
 			GDAL "Support for a number of input raster formats" off \
@@ -37,6 +37,11 @@ OPTIONS=		TIFF "Support for TIFF (but not GeoTIFF) files" off \
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_AGG)
+LIB_DEPENDS+=		agg.2:${PORTSDIR}/graphics/agg
+CONFIGURE_ARGS+=	--with-agg=${LOCALBASE} --with-freetype=${LOCALBASE}
+.endif
+
 .if defined(WITH_TIFF)
 .if !defined(WITH_GDAL)
 LIB_DEPENDS+=		tiff.4:${PORTSDIR}/graphics/tiff
@@ -79,17 +84,9 @@ CONFIGURE_ARGS+=	--with-postgis=${LOCALBASE}/bin/pg_config
 .endif
 
 .if defined(WITH_PHP)
-.BEGIN:
-# make sure php was built with regex=system
-	@if [ `grep -q 'define REGEX 0' ${LOCALBASE}/include/php/main/php_config.h` ]; then \
-		${ECHO_MSG} "This port currently requires your php to have been built specifying the"; \
-		${ECHO_MSG} "flag --with-regex=system. To specify this flag when building php from ports,"; \
-		${ECHO_MSG} "use 'WITH_REGEX_TYPE=system'."; \
-		${ECHO_MSG} ""; \
-		sleep 2; \
-	fi
-USE_PHP=	yes
-CONFIGURE_ARGS+=	--with-php=${LOCALBASE}
+BUILD_DEPENDS+=		${LOCALBASE}/bin/php-config:${PORTSDIR}/lang/php5
+RUN_BUILDS=		${BUILD_DEPENDS}
+CONFIGURE_ARGS+=	--with-php=${LOCALBASE}/include/php/
 PHP_EXTENSION_DIR!=	${LOCALBASE}/bin/php-config --extension-dir | ${SED} -e 's,/usr/local/,,'
 PLIST_SUB+=		PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
 PLIST_SUB+=		WITH_PHP=""
@@ -139,10 +136,14 @@ do-install:
 .if defined(WITH_PHP)
 	@${MKDIR} ${LOCALBASE}/${PHP_EXTENSION_DIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/mapscript/php3/php_mapscript.so ${LOCALBASE}/${PHP_EXTENSION_DIR}/
-	${ECHO} "extension=php_mapscript.so" >> ${LOCALBASE}/etc/php/extensions.ini
 .endif
 .if defined(WITH_PERL)
 	(cd ${WRKSRC}/mapscript/perl && make install)
 .endif
 
+post-install:
+.if defined(WITH_PHP)
+	@${ECHO_MSG} "Please add the line extension=php_mapscript.so to ${LOCALBASE}/etc/php/extensions.ini"
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/graphics/mapserver/distinfo b/graphics/mapserver/distinfo
index 119508d2dd3a..44dde6613e70 100644
--- a/graphics/mapserver/distinfo
+++ b/graphics/mapserver/distinfo
@@ -1,3 +1,3 @@
-MD5 (mapserver-5.2.0.tar.gz) = 6c0f210eb6510f0a43b6d5b09df8bb83
-SHA256 (mapserver-5.2.0.tar.gz) = a7867d52ada7ed60ce928dc02d5bf4cbbb8b651602e2bf35ede16bb271b89285
-SIZE (mapserver-5.2.0.tar.gz) = 1948751
+MD5 (mapserver-5.2.1.tar.gz) = 26cea03c01096d994e02802fda019ae1
+SHA256 (mapserver-5.2.1.tar.gz) = 4a11e8a937c9fae8f9430d2e5a712c2d4eb1d7145d670a41d7f67c73ea1132e7
+SIZE (mapserver-5.2.1.tar.gz) = 1947295
diff --git a/graphics/mapserver/pkg-plist b/graphics/mapserver/pkg-plist
index 6c4af5080d6c..4c5bd3180136 100644
--- a/graphics/mapserver/pkg-plist
+++ b/graphics/mapserver/pkg-plist
@@ -12,12 +12,8 @@ bin/sortshp
 %%WITH_PERL%%%%SITE_PERL%%/mach/auto/mapscript/mapscript.bs
 %%WITH_PERL%%%%SITE_PERL%%/mach/auto/mapscript/.packlist
 %%WITH_PERL%%%%SITE_PERL%%/mach/mapscript.pm
+%%WITH_PERL%%lib/perl5/%%PERL_VER%%/mach/perllocal.pod
 %%WITH_PERL%%@dirrm %%SITE_PERL%%/mach/auto/mapscript
 %%WITH_PHP%%%%PHP_EXTENSION_DIR%%/php_mapscript.so
-%%WITH_PHP%%@exec mkdir -p %D/etc/php
-%%WITH_PHP%%@exec echo extension=php_mapscript.so >> %D/etc/php/extensions.ini
-%%WITH_PHP%%@unexec cp %D/etc/php/extensions.ini %D/etc/php/extensions.ini.orig
-%%WITH_PHP%%@unexec grep -v php_mapscript\\.so %D/etc/php/extensions.ini.orig > %D/etc/php/extensions.ini || true
-%%WITH_PHP%%@unexec rm %D/etc/php/extensions.ini.orig
-%%WITH_PHP%%@unexec [ -s %D/etc/php/extensions.ini ] || rm %D/etc/php/extensions.ini
+%%WITH_PHP%%@dirrmtry %%PHP_EXTENSION_DIR%%
 %%WITH_PHP%%@dirrmtry etc/php