git: b2f64c35edad - main - graphics/mapcache: Simplify by converting to CMAKE_BOOL PR: 254857 Submitted by: amdmi3@

[Wen Heping]

The branch main has been updated by wen:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b2f64c35edada1f6a6f0ae1c4b14db850f8f4578

commit b2f64c35edada1f6a6f0ae1c4b14db850f8f4578
Author:     Wen Heping <wen at FreeBSD.org>
AuthorDate: 2021-04-13 06:47:14 +0000
Commit:     Wen Heping <wen at FreeBSD.org>
CommitDate: 2021-04-13 06:47:14 +0000

    graphics/mapcache: Simplify by converting to CMAKE_BOOL
    PR:     254857
    Submitted by:   amdmi3@
---
 graphics/mapcache/Makefile | 35 +++++++++++++----------------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/graphics/mapcache/Makefile b/graphics/mapcache/Makefile
index 98310754e743..f9c3162ad68d 100644
--- a/graphics/mapcache/Makefile
+++ b/graphics/mapcache/Makefile
@@ -19,7 +19,8 @@ LIB_DEPENDS=		libpng.so:graphics/png \
 
 USES=			cmake jpeg localbase
 USE_LDCONFIG=		yes
-CMAKE_ARGS+=		-DWITH_OGR=1 -DWITH_PIXMAN=1 -DWITH_BERKELEY_DB=0
+CMAKE_ON=		WITH_OGR WITH_PIXMAN
+CMAKE_OFF=		WITH_BERKELEY_DB
 
 OPTIONS_DEFINE=		APACHE FASTCGI SQLITE MEMCACHE TIFF TIFF_WRITE \
 			GEOTIFF PCRE GDAL GEOS
@@ -28,51 +29,41 @@ OPTIONS_SUB=		yes
 
 APACHE_DESC=		Native apache module
 APACHE_USES=		apache
-APACHE_CMAKE_ON=	-DWITH_APACHE=1 \
-			-DAPACHE_INCLUDE_DIR=${LOCALBASE}/${APACHEINCLUDEDIR} \
+APACHE_CMAKE_BOOL=	WITH_APACHE
+APACHE_CMAKE_ON=	-DAPACHE_INCLUDE_DIR=${LOCALBASE}/${APACHEINCLUDEDIR} \
 			-DAPACHE_MODULE_DIR=${LOCALBASE}/${APACHEMODDIR}
-APACHE_CMAKE_OFF=	-DWITH_APACHE=0
 
 FASTCGI_LIB_DEPENDS=	libfcgi.so:www/fcgi
-FASTCGI_CMAKE_ON=	-DWITH_FCGI=1
-FASTCGI_CMAKE_OFF=	-DWITH_FCGI=0
+FASTCGI_CMAKE_BOOL=	WITH_FCGI
 
 SQLITE_DESC=		Use sqlite as a cache backend
 SQLITE_USES=		sqlite
-SQLITE_CMAKE_ON=	-DWITH_SQLITE=1
-SQLITE_CMAKE_OFF=	-DWITH_SQLITE=0
+SQLITE_CMAKE_BOOL=	WITH_SQLITE
 
 MEMCACHE_DESC=		Use memcache as a cache backend
-MEMCACHE_CMAKE_ON=	-DWITH_MEMCACHE=1
-MEMCACHE_CMAKE_OFF=	-DWITH_MEMCACHE=0
+MEMCACHE_CMAKE_BOOL=	WITH_MEMCACHE
 
 TIFF_DESC=		Use TIFFs as a cache backend
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
-TIFF_CMAKE_ON=		-DWITH_TIFF=1
-TIFF_CMAKE_OFF=		-DWITH_TIFF=0
+TIFF_CMAKE_BOOL=	WITH_TIFF
 
 TIFF_WRITE_DESC=	Support for writable TIFF cache backends (implies TIFF)
 TIFF_WRITE_LIB_DEPENDS=	libtiff.so:graphics/tiff
-TIFF_WRITE_CMAKE_ON=	-DWITH_TIFF_WRITE_SUPPORT=1
-TIFF_WRITE_CMAKE_OFF=	-DWITH_TIFF_WRITE_SUPPORT=0
+TIFF_WRITE_CMAKE_BOOL=	WITH_TIFF_WRITE_SUPPORT
 TIFF_WRITE_IMPLIES=	TIFF
 
 GEOTIFF_DESC=		GeoTIFF metadata creation for TIFF cache backends
 GEOTIFF_LIB_DEPENDS=	libgeotiff.so:graphics/libgeotiff
-GEOTIFF_CMAKE_ON=	-DWITH_GEOTIFF=1
-GEOTIFF_CMAKE_OFF=	-DWITH_GEOTIFF=0
+GEOTIFF_CMAKE_BOOL=	WITH_GEOTIFF
 
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
-PCRE_CMAKE_ON=		-DWITH_PCRE=1
-PCRE_CMAKE_OFF=		-DWITH_PCRE=0
+PCRE_CMAKE_BOOL=	WITH_PCRE
 
 GDAL_DESC=		GDAL library support
 GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
-GDAL_CMAKE_ON=		-DWITH_GDAL=1 -DWITH_OGR=1
-GDAL_CMAKE_OFF=		-DWITH_GDAL=0 -DWITH_OGR=0
+GDAL_CMAKE_BOOL=	WITH_GDAL WITH_OGR
 
 GEOS_LIB_DEPENDS=	libgeos_c.so:graphics/geos
-GEOS_CMAKE_ON=		-DWITH_GEOS=1
-GEOS_CMAKE_OFF=		-DWITH_GEOS=0
+GEOS_CMAKE_BOOL=	WITH_GEOS
 
 .include <bsd.port.mk>