aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--graphics/mapserver/Makefile55
-rw-r--r--graphics/mapserver/distinfo4
-rw-r--r--graphics/mapserver/files/extra-patch-mapscript-php-image.c26
-rw-r--r--graphics/mapserver/files/extra-patch-mapscript-php-php_mapscript.c11
-rw-r--r--graphics/mapserver/files/extra-patch-mapscript-php-php_mapscript_util.c31
-rw-r--r--graphics/mapserver/pkg-plist3
6 files changed, 30 insertions, 100 deletions
diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile
index 694c8aca4df5..80730899604b 100644
--- a/graphics/mapserver/Makefile
+++ b/graphics/mapserver/Makefile
@@ -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 support
.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} --with-tiff=${LOCALBASE} --with-png=${L
.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=${LOCALBASE}/bin/pg_config
.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>
diff --git a/graphics/mapserver/distinfo b/graphics/mapserver/distinfo
index f132829f35d8..88eceb615678 100644
--- a/graphics/mapserver/distinfo
+++ b/graphics/mapserver/distinfo
@@ -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
diff --git a/graphics/mapserver/files/extra-patch-mapscript-php-image.c b/graphics/mapserver/files/extra-patch-mapscript-php-image.c
deleted file mode 100644
index 63bc10cd226c..000000000000
--- a/graphics/mapserver/files/extra-patch-mapscript-php-image.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- mapscript/php/image.c.orig 2012-09-05 14:29:49.000000000 +0800
-+++ mapscript/php/image.c 2012-09-05 14:31:04.000000000 +0800
-@@ -303,11 +303,18 @@
- /* no filename - read stdout */
-
- /* if there is no output buffer active, set the header */
-- if (OG(ob_nesting_level)<=0)
-- {
-- php_header(TSRMLS_C);
-- }
--
-+ //handle changes in PHP 5.4.x
-+ #if PHP_VERSION_ID < 50399
-+ if (OG(ob_nesting_level)<=0)
-+ {
-+ php_header(TSRMLS_C);
-+ }
-+ #else
-+ if (php_output_get_level(TSRMLS_C)<=0)
-+ {
-+ php_header(TSRMLS_C);
-+ }
-+ #endif
-
- if (MS_RENDERER_PLUGIN(php_image->image->format))
- {
diff --git a/graphics/mapserver/files/extra-patch-mapscript-php-php_mapscript.c b/graphics/mapserver/files/extra-patch-mapscript-php-php_mapscript.c
deleted file mode 100644
index 34fa48fa1ef9..000000000000
--- a/graphics/mapserver/files/extra-patch-mapscript-php-php_mapscript.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- mapscript/php/php_mapscript.c.orig 2012-09-05 14:31:32.000000000 +0800
-+++ mapscript/php/php_mapscript.c 2012-09-05 14:32:04.000000000 +0800
-@@ -899,7 +899,7 @@
-
- }
-
--function_entry mapscript_functions[] = {
-+zend_function_entry mapscript_functions[] = {
- PHP_FE(ms_GetVersion, NULL)
- PHP_FE(ms_GetVersionInt, NULL)
- PHP_FE(ms_newLineObj, NULL)
diff --git a/graphics/mapserver/files/extra-patch-mapscript-php-php_mapscript_util.c b/graphics/mapserver/files/extra-patch-mapscript-php-php_mapscript_util.c
deleted file mode 100644
index c4885635409b..000000000000
--- a/graphics/mapserver/files/extra-patch-mapscript-php-php_mapscript_util.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- mapscript/php/php_mapscript_util.c.orig 2012-09-05 14:32:18.000000000 +0800
-+++ mapscript/php/php_mapscript_util.c 2012-09-05 14:35:09.000000000 +0800
-@@ -42,7 +42,12 @@
- zobj->ce = ce;
- ALLOC_HASHTABLE(zobj->properties);
- zend_hash_init(zobj->properties, 0, NULL, ZVAL_PTR_DTOR, 0);
-- zend_hash_copy(zobj->properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &temp, sizeof(zval *));
-+ //handle changes in PHP 5.4.x
-+ #if PHP_VERSION_ID < 50399
-+ zend_hash_copy(zobj->properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &temp, sizeof(zval *));
-+ #else
-+ object_properties_init(zobj, ce);
-+ #endif
- retval.handle = zend_objects_store_put(zobj, NULL, (zend_objects_free_object_storage_t)zend_objects_free_object, NULL TSRMLS_CC);
- retval.handlers = &mapscript_std_object_handlers;
- return retval;
-@@ -59,8 +64,12 @@
- zobj->ce = ce;
- ALLOC_HASHTABLE(zobj->properties);
- zend_hash_init(zobj->properties, 0, NULL, ZVAL_PTR_DTOR, 0);
-- zend_hash_copy(zobj->properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &temp, sizeof(zval *));
-- retval.handle = zend_objects_store_put(zobj, NULL, (zend_objects_free_object_storage_t)zend_objects_free_object, NULL TSRMLS_CC);
-+ //handle changes in PHP 5.4.x
-+ #if PHP_VERSION_ID < 50399
-+ zend_hash_copy(zobj->properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &temp, sizeof(zval *));
-+ #else
-+ object_properties_init(zobj, ce);
-+ #endif retval.handle = zend_objects_store_put(zobj, NULL, (zend_objects_free_object_storage_t)zend_objects_free_object, NULL TSRMLS_CC);
- retval.handlers = object_handlers;
- return retval;
- }
diff --git a/graphics/mapserver/pkg-plist b/graphics/mapserver/pkg-plist
index 2db7636e2826..2328b7dd531a 100644
--- a/graphics/mapserver/pkg-plist
+++ b/graphics/mapserver/pkg-plist
@@ -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
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-22 15:16:48 +0000