svn commit: r314615 - in head/graphics/mapserver: . files

Wen Heping wen at FreeBSD.org
Tue Mar 19 03:16:55 UTC 2013 

Author: wen
Date: Tue Mar 19 03:16:54 2013
New Revision: 314615
URL: http://svnweb.freebsd.org/changeset/ports/314615

Log:
  - Update to 6.2.0

Deleted:
  head/graphics/mapserver/files/extra-patch-mapscript-php-image.c
  head/graphics/mapserver/files/extra-patch-mapscript-php-php_mapscript.c
  head/graphics/mapserver/files/extra-patch-mapscript-php-php_mapscript_util.c
Modified:
  head/graphics/mapserver/Makefile
  head/graphics/mapserver/distinfo
  head/graphics/mapserver/pkg-plist

Modified: head/graphics/mapserver/Makefile
==============================================================================
--- head/graphics/mapserver/Makefile	Tue Mar 19 03:01:28 2013	(r314614)
+++ head/graphics/mapserver/Makefile	Tue Mar 19 03:16:54 2013	(r314615)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=		mapserver
-PORTVERSION=		6.0.3
+PORTVERSION=		6.2.0
 CATEGORIES=		graphics www geography
 MASTER_SITES=		http://download.osgeo.org/mapserver/
 
@@ -13,23 +13,25 @@ LIB_DEPENDS=		gd:${PORTSDIR}/graphics/gd
 			proj:${PORTSDIR}/graphics/proj \
 			png15:${PORTSDIR}/graphics/png \
 			jpeg:${PORTSDIR}/graphics/jpeg \
-			gif:${PORTSDIR}/graphics/giflib
+			gif:${PORTSDIR}/graphics/giflib \
+			curl:${PORTSDIR}/ftp/curl
 
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS=		--enable-runpath \
+CONFIGURE_ARGS=		--with-proj=${LOCALBASE} \
 			--with-gd=${LOCALBASE} \
 			--with-png=${LOCALBASE} \
 			--with-jpeg=${LOCALBASE} \
 			--with-gif=${LOCALBASE} \
-			--with-proj=${LOCALBASE}
+			--with-curl-config=${LOCALBASE}
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS_DEFINE=		AGG TIFF PDF GDAL GEOS MING MYGIS POSTGIS PHP PERL PYTHON \
+OPTIONS_DEFINE=		AGG TIFF PDF GDAL GEOS KML MING MYGIS POSTGIS PHP PERL PYTHON \
 			WMS WFS MAPSERV FASTCGI DEBUG
-OPTIONS_DEFAULT=	GDAL GEOS MAPSERV
+OPTIONS_DEFAULT=	AGG GDAL GEOS MAPSERV
 AGG_DESC=		AGG image rendering support
 GDAL_DESC=		GDAL library support
+KML_DESC=		KML support
 MING_DESC=		Macromedia Flash output support
 MYGIS_DESC=		MyGIS support
 WMS_DESC=		Web map service server and client support
@@ -41,7 +43,8 @@ MAPSERV_DESC=		Mapserv cgi interface sup
 .if ${PORT_OPTIONS:MMAPSERV}
 USE_APACHE_RUN=		22+
 PLIST_SUB+=		MAPSERV=""
-PLIST_DIRSTRY=		www/cgi-bin
+PLIST_SUB+=		APA_VER=${APACHE_VERSION}
+PLIST_DIRSTRY=		www/apache${APACHE_VERSION}/cgi-bin
 .else
 PLIST_SUB+=		MAPSERV="@comment "
 .endif
@@ -55,18 +58,19 @@ PLIST_SUB+=		MAP_EGG=${MAP_EGG}
 PLIST_SUB+=		PYTHON="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-
 .if ${PORT_OPTIONS:MAGG}
 LIB_DEPENDS+=		agg:${PORTSDIR}/graphics/agg
-CONFIGURE_ARGS+=	--with-agg=${LOCALBASE} --with-freetype=${LOCALBASE}
+#CONFIGURE_ARGS+=	--with-agg=${LOCALBASE} --with-freetype=${LOCALBASE}
+.endif
+
+.if ${PORT_OPTIONS:MKML}
+LIB_DEPENDS+=		xml2:${PORTSDIR}/textproc/libxml2
+CONFIGURE_ARGS+=	--with-kml --with-xml2-config=${LOCALBASE}/bin/xml2-config
 .endif
 
 .if ${PORT_OPTIONS:MTIFF}
 LIB_DEPENDS+=		tiff:${PORTSDIR}/graphics/tiff
-CONFIGURE_ARGS+=	--with-tiff=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=	--without-tiff
+CONFIGURE_ARGS+=	--with-tiff
 .endif
 
 .if ${PORT_OPTIONS:MMING}
@@ -81,8 +85,7 @@ CONFIGURE_ARGS+=	--with-pdf=${LOCALBASE}
 .endif
 
 .if ${PORT_OPTIONS:MWMS}
-LIB_DEPENDS+=		curl:${PORTSDIR}/ftp/curl
-CONFIGURE_ARGS+=	--with-curl=${LOCALBASE} --with-wms --with-wmsclient
+CONFIGURE_ARGS+=	--with-wms --with-wmsclient
 .endif
 
 .if ${PORT_OPTIONS:MWFS}
@@ -117,14 +120,10 @@ CONFIGURE_ARGS+=	--with-postgis=${LOCALB
 .endif
 
 .if ${PORT_OPTIONS:MPHP}
-IGNORE=			crashes or doesn't work
-EXTRA_PATCHES=		${FILESDIR}/extra-patch-mapscript-php-image.c \
-			${FILESDIR}/extra-patch-mapscript-php-php_mapscript.c \
-			${FILESDIR}/extra-patch-mapscript-php-php_mapscript_util.c
 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/,,'
+RUN_BUILDS+=		${LOCALBASE}/bin/php-config:${PORTSDIR}/lang/php5
+CONFIGURE_ARGS+=	--with-php=${LOCALBASE}/bin/php-config
+PHP_EXTENSION_DIR!=	${LOCALBASE}/bin/php-config --extension-dir | ${SED} -e "s,/usr/local/,,"
 PLIST_SUB+=		PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
 PLIST_SUB+=		PHP=""
 .else
@@ -167,17 +166,17 @@ post-build:
 
 do-install:
 .for f in ${PROG_FILES}
-	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${PREFIX}/bin
 .endfor
-	${INSTALL_SCRIPT} ${WRKSRC}/shp2mysql.pl ${PREFIX}/bin/shp2mysql
 .if ${PORT_OPTIONS:MMAPSERV}
-	${MKDIR} ${LOCALBASE}/www/cgi-bin/
-	${INSTALL_PROGRAM} ${WRKSRC}/mapserv ${LOCALBASE}/www/cgi-bin/mapserv
+	${MKDIR} ${LOCALBASE}/www/apache${APACHE_VERSION}/cgi-bin/
+	${INSTALL_SCRIPT} ${WRKSRC}/mapserv ${LOCALBASE}/www/apache${APACHE_VERSION}/cgi-bin/mapserv
 .endif
 
 .if ${PORT_OPTIONS:MPHP}
 	@${MKDIR} ${LOCALBASE}/${PHP_EXTENSION_DIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/mapscript/php/php_mapscript.so ${LOCALBASE}/${PHP_EXTENSION_DIR}/
+	${INSTALL_PROGRAM} ${WRKSRC}/mapscript/php/.libs/php_mapscript.so \
+		${LOCALBASE}/${PHP_EXTENSION_DIR}/
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
@@ -193,4 +192,4 @@ post-install:
 	@${ECHO_MSG} "Please add the line extension=php_mapscript.so to ${LOCALBASE}/etc/php/extensions.ini"
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/graphics/mapserver/distinfo
==============================================================================
--- head/graphics/mapserver/distinfo	Tue Mar 19 03:01:28 2013	(r314614)
+++ head/graphics/mapserver/distinfo	Tue Mar 19 03:16:54 2013	(r314615)
@@ -1,2 +1,2 @@
-SHA256 (mapserver-6.0.3.tar.gz) = a939d5e207017ff87e115816a0a8a13fb2751069feb90e12fe594c537a917199
-SIZE (mapserver-6.0.3.tar.gz) = 2439456
+SHA256 (mapserver-6.2.0.tar.gz) = 93eb52d659b58499939b609ac77f35dc8c862ca88db9e27de48476e9b766e392
+SIZE (mapserver-6.2.0.tar.gz) = 2806026

Modified: head/graphics/mapserver/pkg-plist
==============================================================================
--- head/graphics/mapserver/pkg-plist	Tue Mar 19 03:01:28 2013	(r314614)
+++ head/graphics/mapserver/pkg-plist	Tue Mar 19 03:16:54 2013	(r314615)
@@ -1,12 +1,11 @@
 bin/legend
 bin/scalebar
 bin/shp2img
-bin/shp2mysql
 bin/shptree
 bin/shptreetst
 bin/shptreevis
 bin/sortshp
-%%MAPSERV%%www/cgi-bin/mapserv
+%%MAPSERV%%www/apache%%APA_VER%%/cgi-bin/mapserv
 %%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/mapscript/mapscript.so
 %%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/mapscript/mapscript.bs
 %%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/mapscript/.packlist

More information about the svn-ports-all mailing list