cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix update to mapserver 6.4.1.

Browse Source 
Adapt README's for nginx, and provide an rc script using spawn-fcgi.
This commit is contained in:
landry 2014-05-18 09:29:50 +00:00
parent b35193ad17
commit 4115d9ff08
7 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
geo/mapserver/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.32 2014/01/10 14:47:09 dcoppa Exp $
# $OpenBSD: Makefile,v 1.33 2014/05/18 09:29:50 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 = 6.4.0
V = 6.4.1
DISTNAME= mapserver-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-utils= mapserver-utils-${V}
@ -29,6 +29,7 @@ MASTER_SITES= http://download.osgeo.org/mapserver/
MODULES= converters/libiconv lang/php devel/cmake
MODPHP_RUNDEP= No
RUN_DEPENDS-php = ${MODPHP_RUN_DEPENDS}
RUN_DEPENDS-main = www/spawn-fcgi
BUILD_DEPENDS += devel/swig databases/postgresql,-server
LIB_DEPENDS= devel/proj \
@ -60,7 +61,7 @@ CONFIGURE_ARGS += -DPHP5_CONFIG_EXECUTABLE=${LOCALBASE}/bin/php-config-${MODPHP_
PREFIX-main= ${VARBASE}/www
SUBST_VARS+= PREFIX-main
SUBST_VARS+= PREFIX-main VARBASE
post-extract:
rm -f ${WRKSRC}/cmake/Find{Freetype,PostgreSQL,ICONV}.cmake

4
geo/mapserver/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (mapserver-6.4.0.tar.gz) = 8lVTeY+9Tq8ie9pm6+RPQCkq1+xl+LsbNphYClGMo4Y=
SIZE (mapserver-6.4.0.tar.gz) = 2097411
SHA256 (mapserver-6.4.1.tar.gz) = RFkV/W4x7Rmc5Hft0dnzLWCdMAHNUtPkWP8VlUNAPWQ=
SIZE (mapserver-6.4.1.tar.gz) = 2098792

10
geo/mapserver/patches/patch-CMakeLists_txt
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-CMakeLists_txt,v 1.2 2014/01/10 14:47:09 dcoppa Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.3 2014/05/18 09:29:50 landry Exp $
Ensure it uses our FindIconv.cmake module
--- CMakeLists.txt.orig Tue Sep 17 15:47:04 2013
+++ CMakeLists.txt Fri Jan 10 12:58:53 2014
@@ -262,7 +262,7 @@ find_package(Freetype)
--- CMakeLists.txt.orig Thu Jan 2 13:41:49 2014
+++ CMakeLists.txt Sun May 18 11:11:18 2014
@@ -294,7 +294,7 @@ find_package(Freetype)
if(NOT FREETYPE_FOUND)
report_mandatory_not_found(FREETYPE)
endif(NOT FREETYPE_FOUND)
@ -11,7 +11,7 @@ Ensure it uses our FindIconv.cmake module
ms_link_libraries( ${FREETYPE_LIBRARY})
@@ -324,7 +324,7 @@ if(WITH_FRIBIDI)
@@ -356,7 +356,7 @@ if(WITH_FRIBIDI)
endif (WITH_FRIBIDI)
if(WITH_ICONV)

3
geo/mapserver/pkg/PLIST-main
View File

@ -1,7 +1,8 @@
@comment $OpenBSD: PLIST-main,v 1.4 2013/12/25 21:55:57 landry Exp $
@comment $OpenBSD: PLIST-main,v 1.5 2014/05/18 09:29:50 landry Exp $
@bin cgi-bin/mapserv
@cwd ${LOCALBASE}
@bin bin/mapserv
@lib lib/libmapserver.so.${LIBmapserver_VERSION}
@rcscript ${RCDIR}/mapserv
@cwd ${LOCALBASE}/share/doc/pkg-readmes
${FULLPKGNAME}

23
geo/mapserver/pkg/README-main
View File

@ -1,10 +1,10 @@
$OpenBSD: README-main,v 1.1 2012/01/24 12:03:19 sthen Exp $
$OpenBSD: README-main,v 1.2 2014/05/18 09:29:50 landry Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD
+-----------------------------------------------------------------------
If you plan to use mapserv CGI with a chrooted httpd, make sure to
If you plan to use mapserv CGI with a chrooted web server, make sure to
copy the libs needed by mapserv binary from ${LOCALBASE}/lib, but also
the projection definitions from libgeotiff and proj packages to the
chroot:
@ -13,16 +13,11 @@ chroot:
# cp ${LOCALBASE}/share/epsg_csv/* ${PREFIX-main}${LOCALBASE}/share/epsg_csv
# cp ${LOCALBASE}/share/proj/* ${PREFIX-main}${LOCALBASE}/share/proj
If you would like to use FastCGI with httpd from base, install and enable
the mod_fcgi package, and you can use configuration lines like this:
If you would like to use FastCGI with nginx from base, use the provided rc.d(8)
script and add the following lines to you nginx.conf:
<Location /cgi-bin/mapserv>
SetHandler fastcgi-script
</Location>
FastCgiConfig -appConnTimeout 60 -idle-timeout 60 \
-init-start-delay 1 -minProcesses 2 -maxClassProcesses 30 \
-startDelay 5
For more information about this and changes to your .map files which may
be useful with FastCGI, see http://mapserver.org/optimization/fastcgi.html
location /cgi-bin/mapserv {
fastcgi_pass unix:run/mapserv.sock;
fastcgi_param SCRIPT_FILENAME /cgi-bin/mapserv;
include fastcgi_params;
}

6
geo/mapserver/pkg/README-php
View File

@ -1,4 +1,4 @@
$OpenBSD: README-php,v 1.2 2012/08/24 08:29:27 ajacoutot Exp $
$OpenBSD: README-php,v 1.3 2014/05/18 09:29:50 landry Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD
@ -6,12 +6,12 @@ $OpenBSD: README-php,v 1.2 2012/08/24 08:29:27 ajacoutot Exp $
You can enable this module by creating a symbolic
link from ${SYSCONFDIR}/php-${MODPHP_VERSION}.sample/mapscript.ini to
${SYSCONFDIR}/php-${MODPHP_VERSION}/mapscript.ini.
${SYSCONFDIR}/php-${MODPHP_VERSION}/mapscript.ini.
# ln -fs ${SYSCONFDIR}/php-${MODPHP_VERSION}.sample/mapscript.ini \
${SYSCONFDIR}/php-${MODPHP_VERSION}/mapscript.ini
If you plan to use PHP mapscript extension with a chrooted httpd(8), make
If you plan to use PHP mapscript extension with a chrooted web server, make
sure to copy the libs needed by mapscript.so file binary from ${LOCALBASE}/lib,
but also the projection definitions from libgeotiff and proj packages to the
chroot:

12
geo/mapserver/pkg/mapserv.rc Normal file
View File

@ -0,0 +1,12 @@
#!/bin/sh
#
# $OpenBSD: mapserv.rc,v 1.1 2014/05/18 09:29:50 landry Exp $
daemon="${LOCALBASE}/bin/spawn-fcgi"
daemon_flags="-c ${VARBASE}/www -s run/mapserv.sock -u www -- /cgi-bin/mapserv"
. /etc/rc.d/rc.subr
pexp="/cgi-bin/mapserv"
rc_cmd $1