CVS commit: pkgsrc/geography/mapserver

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Thu Aug 22 16:58:00 UTC 2024

Modified Files:
        pkgsrc/geography/mapserver: Makefile options.mk

Log Message:
geography/mapserver: Rototill dependencies and options

Adjust dependencies to cmake's status output about what was
configured, sorted how cmake sorts them.  Drop gd and readline as not
mentioned and apparently not in the sources.

Drop Xpm option as apparently not in the sources.

Enable fastcgi by default, as it's small and my guess is that most
mapserver users would want it.

Enable pgsql (postgis) by default, as my guess is that most mapserver
users would want it; that's the normal place to store the data that
one would query via WFS.


To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 pkgsrc/geography/mapserver/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/geography/mapserver/options.mk

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.119 pkgsrc/geography/mapserver/Makefile:1.120
--- pkgsrc/geography/mapserver/Makefile:1.119   Thu Aug 22 15:34:00 2024
+++ pkgsrc/geography/mapserver/Makefile Thu Aug 22 16:58:00 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.119 2024/08/22 15:34:00 gdt Exp $
+# $NetBSD: Makefile,v 1.120 2024/08/22 16:58:00 gdt Exp $
 
 DISTNAME=      mapserver-8.2.1
+PKGREVISION=   1
 CATEGORIES=    geography www
 MASTER_SITES=  http://download.osgeo.org/mapserver/
 
@@ -38,18 +39,39 @@ CONF_FILES+=                share/examples/mapserver/m
 
 .include "options.mk"
 
-# \todo Adjust to current requirements.
-.include "../../converters/fribidi/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/protobuf-c/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
+# Mandatory dependencies (ordered by cmake configure status summary).
 .include "../../geography/gdal-lib/buildlink3.mk"
-.include "../../geography/geos/buildlink3.mk"
 .include "../../geography/proj/buildlink3.mk"
-.include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/gd/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../mk/readline.buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+# We might need 2.13.2, which seems to have an API break relative to
+# 2.13.0, but there's no NEWS that indicates that, so it is left to
+# anyone using old freetype to address this.
+.include "../../graphics/freetype2/buildlink3.mk"
+
+# Optional dependencies.
+# Lean to including optional features if they don't hurt much, as
+# mapserver is hardly for low-resources systems.
+.include "../../graphics/giflib/buildlink3.mk"
+# mysql: option
+.include "../../converters/fribidi/buildlink3.mk"
+.include "../../fonts/harfbuzz/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
+# svgcairo: no
+# rsvg: no
+# curl: no
+# pixman: no
 .include "../../textproc/libxml2/buildlink3.mk"
+# postgis: option
+.include "../../geography/geos/buildlink3.mk"
+# fastcgi: option
+.include "../../devel/protobuf-c/buildlink3.mk"
+# oracle spatial: not in pkgsrc
+# exempi xmp: no (?)
+
+# Dependencies cmake looks for, not listed above
+.include "../../devel/zlib/buildlink3.mk"
+#  found and "enabled" but not clearly present in built objects
+.include "../../converters/libiconv/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/geography/mapserver/options.mk
diff -u pkgsrc/geography/mapserver/options.mk:1.9 pkgsrc/geography/mapserver/options.mk:1.10
--- pkgsrc/geography/mapserver/options.mk:1.9   Thu Aug 22 14:51:24 2024
+++ pkgsrc/geography/mapserver/options.mk       Thu Aug 22 16:58:00 2024
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.9 2024/08/22 14:51:24 gdt Exp $
+# $NetBSD: options.mk,v 1.10 2024/08/22 16:58:00 gdt Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mapserver
-PKG_SUPPORTED_OPTIONS= fastcgi pgsql mysql x11
-PKG_SUGGESTED_OPTIONS= x11
+PKG_SUPPORTED_OPTIONS= fastcgi pgsql mysql
+PKG_SUGGESTED_OPTIONS= fastcgi pgsql
 
 .include "../../mk/bsd.options.mk"
 
@@ -11,6 +11,7 @@ PKG_SUGGESTED_OPTIONS=        x11
 #
 .if !empty(PKG_OPTIONS:Mfastcgi)
 .include "../../www/fcgi/buildlink3.mk"
+CMAKE_CONFIGURE_ARGS+=         -DWITH_FCGI=ON
 .else
 # Remediate cmake looking out of the bl3 tree.
 CMAKE_CONFIGURE_ARGS+=         -DWITH_FCGI=OFF
@@ -23,6 +24,7 @@ CMAKE_CONFIGURE_ARGS+=                -DWITH_FCGI=OFF
 # \todo Explain why this is bl3 rather than DEPENDS.  It doesn't make
 # sense, given how postgis works.
 .include "../../databases/postgresql-postgis2/buildlink3.mk"
+CMAKE_CONFIGURE_ARGS+=         -DWITH_POSTGIS=ON
 .else
 CMAKE_CONFIGURE_ARGS+=         -DWITH_POSTGIS=OFF
 .endif
@@ -32,13 +34,7 @@ CMAKE_CONFIGURE_ARGS+=               -DWITH_POSTGIS=O
 #
 .if !empty(PKG_OPTIONS:Mmysql)
 .include "../../mk/mysql.buildlink3.mk"
-# \todo Enable?
-.endif
-
-#
-# x11 (xpm) support
-#
-.if !empty(PKG_OPTIONS:Mx11)
-.include "../../x11/libXpm/buildlink3.mk"
-# \todo Enable/disable?
+CMAKE_CONFIGURE_ARGS+=         -DWITH_MYSQL=ON
+.else
+CMAKE_CONFIGURE_ARGS+=         -DWITH_MYSQL=OFF
 .endif