git: 450c17d137dc - main - misc/vxl: Unbundle graphics/libgeotiff; Add CONFLICTS stmt; Add comment

The branch main has been updated by yuri:

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

commit 450c17d137dcb5e0a45bbf4a9ede339a28c0fcef
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-05-27 10:00:13 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-05-27 10:02:09 +0000

    misc/vxl: Unbundle graphics/libgeotiff; Add CONFLICTS stmt; Add comment
---
 misc/vxl/Makefile  |  8 ++++++--
 misc/vxl/pkg-plist | 15 ---------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/misc/vxl/Makefile b/misc/vxl/Makefile
index 4da9575bd8b7..7fc97454f835 100644
--- a/misc/vxl/Makefile
+++ b/misc/vxl/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	vxl
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.3.2
+PORTREVISION=	1
 CATEGORIES=	misc science
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -10,7 +11,8 @@ WWW=		https://vxl.github.io/
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/core/vxl_copyright.h
 
-LIB_DEPENDS=	libpng.so:graphics/png \
+LIB_DEPENDS=	libgeotiff.so:graphics/libgeotiff \
+		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
 USES=		cmake compiler:c++11-lang jpeg
@@ -22,7 +24,9 @@ CONFLICTS_BUILD=	openjpeg15
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	BUILD_TESTING
 
-do-test:
+CONFLICTS_BUILD=	dcmtk # because it is bundled
+
+do-test: # 1 test fails, see https://github.com/vxl/vxl/issues/920
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
diff --git a/misc/vxl/pkg-plist b/misc/vxl/pkg-plist
index d0fa93e22a2d..d20b7cf6c5db 100644
--- a/misc/vxl/pkg-plist
+++ b/misc/vxl/pkg-plist
@@ -1090,18 +1090,6 @@ include/vxl/core/vxl_version.h
 include/vxl/v3p/bzlib/bzlib.h
 include/vxl/v3p/bzlib/bzlib_private.h
 include/vxl/v3p/clipper/clipper.hxx
-include/vxl/v3p/geotiff/cpl_serv.h
-include/vxl/v3p/geotiff/defs.h
-include/vxl/v3p/geotiff/geo_config.h
-include/vxl/v3p/geotiff/geo_keyp.h
-include/vxl/v3p/geotiff/geo_normalize.h
-include/vxl/v3p/geotiff/geo_tiffp.h
-include/vxl/v3p/geotiff/geokeys.h
-include/vxl/v3p/geotiff/geonames.h
-include/vxl/v3p/geotiff/geotiff.h
-include/vxl/v3p/geotiff/geotiffio.h
-include/vxl/v3p/geotiff/geovalues.h
-include/vxl/v3p/geotiff/xtiffio.h
 include/vxl/v3p/netlib/arpack/dgetv0.h
 include/vxl/v3p/netlib/arpack/dsaitr.h
 include/vxl/v3p/netlib/arpack/dsapps.h
@@ -1502,9 +1490,6 @@ lib/libbzip2.so.3.3.2.0
 lib/libclipper.so
 lib/libclipper.so.3.3
 lib/libclipper.so.3.3.2.0
-lib/libgeotiff.so
-lib/libgeotiff.so.3.3
-lib/libgeotiff.so.3.3.2.0
 lib/libnetlib.so
 lib/libnetlib.so.3.3
 lib/libnetlib.so.3.3.2.0