CVS commit: pkgsrc/geography/mapserver

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Thu Aug 22 15:34:00 UTC 2024

Modified Files:
        pkgsrc/geography/mapserver: Makefile distinfo

Log Message:
geography/mapserver: Work around recent FreeType2 API breakage

Assume that because there was an API break expected to result in
compilation failures, the API minimum in the freetype bl3 is past the
break.  (If not, that should be fixed, not adding it here.)


To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 pkgsrc/geography/mapserver/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/geography/mapserver/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/mapserver/Makefile
diff -u pkgsrc/geography/mapserver/Makefile:1.118 pkgsrc/geography/mapserver/Makefile:1.119
--- pkgsrc/geography/mapserver/Makefile:1.118   Wed Aug 21 19:28:08 2024
+++ pkgsrc/geography/mapserver/Makefile Thu Aug 22 15:34:00 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.118 2024/08/21 19:28:08 wiz Exp $
+# $NetBSD: Makefile,v 1.119 2024/08/22 15:34:00 gdt Exp $
 
 DISTNAME=      mapserver-8.2.1
 CATEGORIES=    geography www
@@ -10,6 +10,8 @@ COMMENT=      Environment for building spatia
 LICENSE=       mit
 
 USE_LANGUAGES=         c c++
+USE_CC_FEATURES=       c99
+USE_CXX_FEATURES=      c++11
 USE_TOOLS+=            pkg-config
 
 .include "../../devel/cmake/build.mk"
@@ -30,20 +32,9 @@ post-install:
        mv ${DESTDIR}/${PREFIX}/etc/mapserver-sample.conf ${DESTDIR}/${PREFIX}/share/examples/mapserver/mapserver.conf
 CONF_FILES+=           share/examples/mapserver/mapserver.conf ${PKG_SYSCONFDIR}/mapserver.conf
 
-
-# \todo Convert to cmake or prune.
-CONFIGURE_ARGS+=       --with-cairo
-CONFIGURE_ARGS+=       --with-freetype
-CONFIGURE_ARGS+=       --with-gdal
-CONFIGURE_ARGS+=       --with-gd=${BUILDLINK_PREFIX.gd}
-CONFIGURE_ARGS+=       --with-geos
-CONFIGURE_ARGS+=       --with-libiconv
-CONFIGURE_ARGS+=       --with-ogr
-CONFIGURE_ARGS+=       --with-png
-CONFIGURE_ARGS+=       --with-proj
-CONFIGURE_ARGS+=       --with-wcs
-CONFIGURE_ARGS+=       --with-wfs
-CONFIGURE_ARGS+=       --with-zlib
+# Upstream does not document dependencies.  Instead they say to try to
+# build and when you see an error guess at what to add until it
+# builds.  (Really!)
 
 .include "options.mk"
 

Index: pkgsrc/geography/mapserver/distinfo
diff -u pkgsrc/geography/mapserver/distinfo:1.14 pkgsrc/geography/mapserver/distinfo:1.15
--- pkgsrc/geography/mapserver/distinfo:1.14    Sat Aug 17 12:54:20 2024
+++ pkgsrc/geography/mapserver/distinfo Thu Aug 22 15:34:00 2024
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.14 2024/08/17 12:54:20 gdt Exp $
+$NetBSD: distinfo,v 1.15 2024/08/22 15:34:00 gdt Exp $
 
 BLAKE2s (mapserver-8.2.1.tar.gz) = 325560853662f953b41a259cbf0c57f3835e49d1811ab14ecc04a9e97915ecee
 SHA512 (mapserver-8.2.1.tar.gz) = 616c3486212da10ef4e0d024cb4d3260368dae92a4c594248e323ef5e04a01fd427299fad5f553afc8c00ccc9ee228f70bb0fa3959da8a61c0738e9c52d1a20f
 Size (mapserver-8.2.1.tar.gz) = 2965922 bytes
+SHA1 (patch-src_mapagg.cpp) = c0c950a60fa7d7c73e7868041217c094f3e7255e
+SHA1 (patch-src_renderers_agg_src_agg__font__freetype.cpp) = 611b29fb3da961aa326b97aaff11c14d8131d943