Update to mapserver 6.2.1.

See http://mapserver.org/development/announce/6-2.html for a list of new features in the 6.2 branch. - Uses its own local copy of agg (as mapnik..) - now uses libtool and installs a library. Adapt chroot setups as needed. - provides an install target, so install perl examples and mapscript.ini in post-install. - dont install php examples, they're badly outdated
2013-08-06 19:47:17 +00:00 · 2013-08-06 19:47:17 +00:00 · 154f12dc13
commit 154f12dc13
parent 9ce6da1f27
9 changed files with 66 additions and 69 deletions
--- a/geo/mapserver/Makefile
+++ b/geo/mapserver/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2013/07/05 07:23:33 jasper Exp $
+# $OpenBSD: Makefile,v 1.27 2013/08/06 19:47:17 landry Exp $

 MULTI_PACKAGES=	-utils -main -php -perl
 SHARED_ONLY=	Yes
@ -8,14 +8,13 @@ COMMENT-utils=	mapserver utilities
 COMMENT-php=	PHP Mapscript extension
 COMMENT-perl=	Perl Mapscript binding

-V =		6.0.2
-REVISION-perl=	0
-REVISION-php=	1
+V =		6.2.1
 DISTNAME=	mapserver-${V}
 PKGNAME-main=	${DISTNAME}
 PKGNAME-utils=	mapserver-utils-${V}
 PKGNAME-php=	php-mapscript-${V}
 PKGNAME-perl=	p5-mapscript-${V}
+SHARED_LIBS +=	mapserver 0.0# 0.0

 CATEGORIES=	geo www

@ -30,8 +29,6 @@ MASTER_SITES=	http://download.osgeo.org/mapserver/
 MODULES=	devel/gettext lang/php
 MODPHP_RUNDEP=	No

-BUILD_DEPENDS=	graphics/agg
-
 LIB_DEPENDS=	devel/proj \
 		graphics/cairo \
 		geo/gdal \
@ -42,26 +39,30 @@ LIB_DEPENDS=	devel/proj \
 RUN_DEPENDS-php=	${MODPHP_RUN_DEPENDS}

 WANTLIB += crypto curl expat freetype idn jpeg m png pq ssl xml2 z proj
-WANTLIB += gdal geos_c gd stdc++ fcgi
-WANTLIB += GL X11
-WANTLIB += cairo Xrender fontconfig glib-2.0 gobject-2.0 gthread-2.0
-WANTLIB += pixman-1 pthread-stubs xcb xcb-render xcb-shm
+WANTLIB += gdal geos_c stdc++ cairo fontconfig gd tiff spatialite
+WANTLIB += pixman-1 pthread-stubs xcb xcb-render xcb-shm sqlite3
+WANTLIB += X11 Xext Xrender freexl geos geotiff gif jasper pcre

-WANTLIB-main=	${WANTLIB} pthread c gif
-WANTLIB-utils=	${WANTLIB} pthread c gif
-WANTLIB-php=	${WANTLIB} c pthread
-WANTLIB-perl=	${WANTLIB} c gif
+LIB_DEPENDS-utils = STEM->=${V}:${BUILD_PKGPATH},-main
+LIB_DEPENDS-php = STEM->=${V}:${BUILD_PKGPATH},-main
+LIB_DEPENDS-perl = STEM->=${V}:${BUILD_PKGPATH},-main
+WANTLIB-main=	${WANTLIB} fcgi pthread c gif
+WANTLIB-main += asn1 com_err heimbase krb5 roken wind
+WANTLIB-utils=	${WANTLIB} mapserver pthread c gif
+WANTLIB-php=	${WANTLIB} mapserver pthread
+WANTLIB-perl=	mapserver

 USE_GMAKE=	yes
+USE_LIBTOOL =	yes
+LIBTOOL_FLAGS =	--tag=disable-static
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=	--with-proj=${LOCALBASE} \
 		--with-png=${LOCALBASE} \
-		--with-agg=${LOCALBASE} \
 		--with-fastcgi=${LOCALBASE} \
-		--without-pdf \
 		--with-freetype=${X11BASE}/bin \
 		--with-gdal=${LOCALBASE}/bin/gdal-config \
-		--with-php=${LOCALBASE}/share/php-${MODPHP_VERSION}/include \
+		--with-gd=${LOCALBASE}/bin/gdlib-config \
+		--with-php=${LOCALBASE}/bin/php-config-${MODPHP_VERSION} \
 		--with-postgis=${LOCALBASE}/bin/pg_config \
 		--with-geos=${LOCALBASE}/bin/geos-config \
 		--with-ogr=${LOCALBASE}/bin/gdal-config \
@ -90,26 +91,19 @@ SUBST_VARS+=	PREFIX-main
 post-build:
 	cd ${WRKSRC}/mapscript/perl && perl Makefile.PL && ${MAKE}

-do-install:
+post-install:
 	${INSTALL_DATA_DIR} ${WRKINST}/${PREFIX-main}/cgi-bin
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/php-${MODPHP_VERSION}/modules
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/php-${MODPHP_VERSION}
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mapserver/php
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mapserver/perl

-	${INSTALL_PROGRAM} ${WRKSRC}/mapserv ${WRKINST}/${PREFIX-main}/cgi-bin
-	${INSTALL_DATA} ${WRKSRC}/mapscript/php/php_mapscript.so \
-		${PREFIX}/lib/php-${MODPHP_VERSION}/modules/mapscript.so
-	echo "; Enable Mapscript extension module\nextension=mapscript.so" \
+	${INSTALL_PROGRAM} ${PREFIX}/bin/mapserv ${WRKINST}/${PREFIX-main}/cgi-bin
+
+	echo "; Enable Mapscript extension module\nextension=php_mapscript.so" \
 		> ${PREFIX}/share/examples/php-${MODPHP_VERSION}/mapscript.ini
-.for i in ${UTILS}
-	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${PREFIX}/bin/
-.endfor
-	${INSTALL_SCRIPT} ${WRKSRC}/mapserver-config ${PREFIX}/bin/
-	${INSTALL_DATA}	${WRKSRC}/mapscript/php/examples/* \
-		${PREFIX}/share/examples/mapserver/php
+
 	${INSTALL_DATA}	${WRKSRC}/mapscript/perl/examples/* \
 		${PREFIX}/share/examples/mapserver/perl
+
 	cd ${WRKSRC}/mapscript/perl && ${MAKE} install

 .include <bsd.port.mk>
--- a/geo/mapserver/distinfo
+++ b/geo/mapserver/distinfo
@ -1,5 +1,2 @@
-MD5 (mapserver-6.0.2.tar.gz) = 2DHJBbGw33rAmoDD+ThzdA==
-RMD160 (mapserver-6.0.2.tar.gz) = GLUM/5JS7Kb3wqt0+LbfRcqP/IQ=
-SHA1 (mapserver-6.0.2.tar.gz) = 3R7hkmrbvTNvegmvxeY6v5pQg0w=
-SHA256 (mapserver-6.0.2.tar.gz) = doKElg3U3qt6T/CUj172q9PS9Nqk5r8Odw74NdoIw4I=
-SIZE (mapserver-6.0.2.tar.gz) = 2447372
+SHA256 (mapserver-6.2.1.tar.gz) = dwhzBiRkUd8s6jcR5gH1br+KVfKe3kyo5fBDPfrXQ9U=
+SIZE (mapserver-6.2.1.tar.gz) = 2814231
--- a/geo/mapserver/patches/patch-Makefile_in
+++ b/geo/mapserver/patches/patch-Makefile_in
@ -0,0 +1,12 @@
+$OpenBSD: patch-Makefile_in,v 1.1 2013/08/06 19:47:18 landry Exp $
+--- Makefile.in.orig	Thu Nov 15 21:52:40 2012
+++ Makefile.in	Thu Nov 15 21:56:24 2012
+@@ -359,7 +359,7 @@ mod_mapserver.la: $(LIBMAP) mod_mapserver.c
+ mapscript: mapscriptvars mapserver-config
+ 
+ $(LIBMAP): $(OBJS)
+-	$(LINK) -release $(MS_VERSION)  $(OBJS) $(SUP_LIBS) -o $(LIBMAP)
+	$(LINK) $(OBJS) $(SUP_LIBS) -o $(LIBMAP)
+ 
+ shp2pdf: $(LIBMAP) shp2pdf.$(OBJ_SUFFIX)
+ 	$(LINK) shp2pdf.$(OBJ_SUFFIX) $(LIBMAP) -o shp2pdf
--- a/geo/mapserver/patches/patch-configure
+++ b/geo/mapserver/patches/patch-configure
@ -1,12 +0,0 @@
-$OpenBSD: patch-configure,v 1.5 2013/06/03 23:07:47 naddy Exp $
--- configure.orig	Wed Apr 27 09:06:17 2011
-+++ configure	Thu May 26 19:59:16 2011
-@@ -3361,7 +3361,7 @@ if test $ac_cv_lib_m_exp = yes; then
-   XTRALIBS="$XTRALIBS -lm"
- fi
- 
-XTRALIBS=$XTRALIBS
-+XTRALIBS="$XTRALIBS -pthread"
- 
- 
- echo "$as_me:$LINENO: checking for __gxx_personality_v0 in -lstdc++" >&5
--- a/geo/mapserver/patches/patch-mapscript_php_Makefile_in
+++ b/geo/mapserver/patches/patch-mapscript_php_Makefile_in
@ -1,12 +1,21 @@
-$OpenBSD: patch-mapscript_php_Makefile_in,v 1.1 2011/06/22 20:16:43 landry Exp $
--- mapscript/php/Makefile.in.orig	Wed Jun 22 21:27:37 2011
-+++ mapscript/php/Makefile.in	Wed Jun 22 21:27:48 2011
-@@ -86,7 +86,7 @@ PHPPROJ_OBJS = php_mapscript_util.o php_proj.o $(PHP_R
+$OpenBSD: patch-mapscript_php_Makefile_in,v 1.2 2013/08/06 19:47:18 landry Exp $
+--- mapscript/php/Makefile.in.orig	Sat Apr 20 06:08:49 2013
+++ mapscript/php/Makefile.in	Sat Jul 20 10:10:32 2013
+@@ -86,7 +86,7 @@ MS_STATIC = @ALL_STATIC_LIB@
+ MS_LIBS =   $(RUNPATHS) @MS_LIB@ @ALL_LIB@ @XTRALIBS@ $(MS_STATIC)
+ PHP_EXT_DIR=`$(PHPCONFIG) --extension-dir`
+ 
+-LT_LDFLAGS=-rpath $(PHP_EXT_DIR) -module
+LT_LDFLAGS=-rpath $(PHP_EXT_DIR) -module -avoid-version
+ OBJ_SUFFIX=lo
+ LINK=$(LTLD) $(LD) $(LT_LDFLAGS)
+ MS_LIBS =   ../../libmapserver.la
+@@ -116,7 +116,7 @@ PHPPROJ_OBJS = php_mapscript_util.$(OBJ_SUFFIX) php_pr
 
 
- php_mapscript.so: $(PHPMS_OBJS) ../../libmapserver.a
-	$(LD) -o $@ $(PHPMS_OBJS) $(MS_LIBS)
-+	$(LD) -fPIC -o $@ $(PHPMS_OBJS) $(MS_LIBS)
+ php_mapscript.la: $(PHPMS_OBJS) ../../libmapserver.la
+-	$(LINK) -release $(MS_VERSION) -o $@ $(PHPMS_OBJS) $(MS_LIBS)
+	$(LINK) -o $@ $(PHPMS_OBJS) $(MS_LIBS)
 
- php_proj.so:  $(PHPPROJ_OBJS)
- 	$(LD) -o $@ $(PHPPROJ_OBJS) $(MS_LIBS)
+ php_proj.la:  $(PHPPROJ_OBJS) ../libmapserver.la
+ 	$(LINK) -release $(MS_VERSION) -o $@ $(PHPPROJ_OBJS) $(MS_LIBS)
--- a/geo/mapserver/pkg/PLIST-main
+++ b/geo/mapserver/pkg/PLIST-main
@ -1,4 +1,8 @@
-@comment $OpenBSD: PLIST-main,v 1.2 2012/01/24 12:03:19 sthen Exp $
+@comment $OpenBSD: PLIST-main,v 1.3 2013/08/06 19:47:18 landry Exp $
@bin cgi-bin/mapserv
+@cwd ${LOCALBASE}
+@bin bin/mapserv
+@comment lib/libmapserver.la
+@lib lib/libmapserver.so.${LIBmapserver_VERSION}
@cwd ${LOCALBASE}/share/doc/pkg-readmes
 ${FULLPKGNAME}
--- a/geo/mapserver/pkg/PLIST-perl
+++ b/geo/mapserver/pkg/PLIST-perl
@ -1,6 +1,4 @@
-@comment $OpenBSD: PLIST-perl,v 1.1.1.1 2009/06/04 17:55:39 landry Exp $
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/
+@comment $OpenBSD: PLIST-perl,v 1.2 2013/08/06 19:47:18 landry Exp $
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/mapscript/
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/mapscript/mapscript.bs
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/mapscript/mapscript.so
--- a/geo/mapserver/pkg/PLIST-php
+++ b/geo/mapserver/pkg/PLIST-php
@ -1,5 +1,6 @@
-@comment $OpenBSD: PLIST-php,v 1.3 2012/01/24 12:03:19 sthen Exp $
-lib/php-${MODPHP_VERSION}/modules/mapscript.so
+@comment $OpenBSD: PLIST-php,v 1.4 2013/08/06 19:47:19 landry Exp $
+@comment lib/php-${MODPHP_VERSION}/modules/php_mapscript.la
+lib/php-${MODPHP_VERSION}/modules/php_mapscript.so
 share/examples/php-${MODPHP_VERSION}/mapscript.ini
@sample ${SYSCONFDIR}/php-${MODPHP_VERSION}.sample/mapscript.ini
 share/doc/pkg-readmes/${FULLPKGNAME}
--- a/geo/mapserver/pkg/PLIST-utils
+++ b/geo/mapserver/pkg/PLIST-utils
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-utils,v 1.2 2011/06/22 20:16:43 landry Exp $
+@comment $OpenBSD: PLIST-utils,v 1.3 2013/08/06 19:47:19 landry Exp $
@bin bin/legend
 bin/mapserver-config
@bin bin/msencrypt
@ -22,9 +22,3 @@ share/examples/mapserver/perl/shp_in_shp.pl
 share/examples/mapserver/perl/shpinfo.pl
 share/examples/mapserver/perl/thin.pl
 share/examples/mapserver/perl/wxs.pl
-share/examples/mapserver/php/
-share/examples/mapserver/php/phpinfo_mapscript.phtml
-share/examples/mapserver/php/test_draw_legend_icon.phtml
-share/examples/mapserver/php/test_draw_map.phtml
-share/examples/mapserver/php/test_layer_mask.phtml
-share/examples/mapserver/php/test_writeshape.phtml