aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'graphics')
-rw-r--r--graphics/mapserver/Makefile22
-rw-r--r--graphics/mapserver/pkg-plist2
2 files changed, 5 insertions, 19 deletions
diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile
index cfafad92cd1f..9994f37bb0bf 100644
--- a/graphics/mapserver/Makefile
+++ b/graphics/mapserver/Makefile
@@ -25,8 +25,8 @@ CMAKE_ARGS+= -DCMAKE_PREFIX_PATH=${LOCALBASE} \
MAKE_JOBS_UNSAFE= yes
OPTIONS_DEFINE= FRIBIDI CURL GDAL GEOS KML POSTGIS PHP PERL PYTHON \
- WMS WFS WCS MAPSERV FASTCGI DEBUG CAIRO CAIRO_SVG
-OPTIONS_DEFAULT= FRIBIDI GDAL GEOS MAPSERV
+ WMS WFS WCS FASTCGI DEBUG CAIRO CAIRO_SVG
+OPTIONS_DEFAULT= FRIBIDI GDAL GEOS
CAIRO_SVG_DESC= Cairo SVG parser support
GDAL_DESC= GDAL library support
FRIBIDI_DESC= Fribidi library support
@@ -34,19 +34,9 @@ KML_DESC= KML support
WMS_DESC= WMS Server support
WFS_DESC= WFS Server support
WCS_DESC= WCS Server support
-MAPSERV_DESC= Mapserv cgi interface support
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MMAPSERV}
-USE_APACHE_RUN= 22+
-PLIST_SUB+= MAPSERV=""
-PLIST_SUB+= APA_VER=${APACHE_VERSION}
-PLIST_DIRSTRY= www/apache${APACHE_VERSION}/cgi-bin
-.else
-PLIST_SUB+= MAPSERV="@comment "
-.endif
-
.if ${PORT_OPTIONS:MPYTHON}
USE_PYTHON= 2
BUILD_DEPENDS+= swig2.0:${PORTSDIR}/devel/swig20
@@ -109,6 +99,7 @@ CMAKE_ARGS+= -DWITH_WCS=0
.endif
.if ${PORT_OPTIONS:MGDAL}
+USES+= iconv
LIB_DEPENDS+= libgdal.so:${PORTSDIR}/graphics/gdal
CMAKE_ARGS+= -DWITH_GDAL=1
.else
@@ -172,7 +163,7 @@ CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
.endif
PROG_FILES= legend scalebar shp2img shptree shptreetst shptreevis \
- sortshp msencrypt tile4ms
+ sortshp msencrypt tile4ms mapserv
do-install:
.for f in ${PROG_FILES}
@@ -180,11 +171,6 @@ do-install:
.endfor
${INSTALL_PROGRAM} ${WRKSRC}/libmapserver.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib
-.if ${PORT_OPTIONS:MMAPSERV}
- ${MKDIR} ${STAGEDIR}${PREFIX}/www/apache${APACHE_VERSION}/cgi-bin/
- ${INSTALL_SCRIPT} ${WRKSRC}/mapserv ${STAGEDIR}${PREFIX}/www/apache${APACHE_VERSION}/cgi-bin/mapserv
-.endif
-
.if ${PORT_OPTIONS:MPHP}
@${MKDIR} ${STAGEDIR}${PREFIX}/${PHP_EXTENSION_DIR}
${INSTALL_PROGRAM} ${WRKSRC}/mapscript/php/php_mapscript.so \
diff --git a/graphics/mapserver/pkg-plist b/graphics/mapserver/pkg-plist
index 1beebbaa1ea5..c3cf9358921b 100644
--- a/graphics/mapserver/pkg-plist
+++ b/graphics/mapserver/pkg-plist
@@ -1,4 +1,5 @@
bin/legend
+bin/mapserv
bin/msencrypt
bin/scalebar
bin/shp2img
@@ -10,7 +11,6 @@ bin/tile4ms
lib/libmapserver.so
lib/libmapserver.so.1
lib/libmapserver.so.6.4.0
-%%MAPSERV%%www/apache%%APA_VER%%/cgi-bin/mapserv
%%PHP%%%%PHP_EXTENSION_DIR%%/php_mapscript.so
%%PHP%%@dirrmtry %%PHP_EXTENSION_DIR%%
%%PHP%%@dirrmtry etc/php