From nobody Sat May 27 10:04:04 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QSy785YX0z4Wq45; Sat, 27 May 2023 10:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QSy784zVpz3nL7; Sat, 27 May 2023 10:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685181844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hLgYutpDsPbSzoBOWm688Qk6DNRH5buARRNhxsJ70ZU=; b=nxvDRaWlxzcOsQof9lOulvqiwPuxAh/7fQ6/k7xQ3PvpMflbnHUXl7cn4xG2+b4jp7hLdV 5Gk4Mu8wHE0+EyGUWLZJneukY8xwqW/v/2h+DMi0d2MUwWVMakLTG/dEaO5uwelxbQu+0y cNkRqwi3FNSHjt92dw3BVWKwAC1OSacDti4hTrrB05s7+IwrtKEu9sQdRrt6pnngJaCZqt q9oWpHjs0ZhZ1fidtos6/etztVr/92wg0jKsnUJgxIiOLhwDKeVEcs3GUr4KbXtMlkOiNt jchiVFthdgb4HTPCEjRHMKOdAVe5EJ7qD3KmwWFZx1Uwsj4cI5uziqG6CqfNiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685181844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hLgYutpDsPbSzoBOWm688Qk6DNRH5buARRNhxsJ70ZU=; b=wdXLGp5vdoABbWm5YxPDMUyrJ9PFLmCTGZFeSbqyiGwdMrURB2+r2lb1JXZxw7vhZvMHaU pPApsZ0Ch0HZL0HQar49DVWQZ8yLOxepENurDic8aWnEZYxcRm7X/GGggEn0V/CfMIQinV 0obRI+GVs+eaYHR0ASI1Xq0K/Qxua1cWMQflsFwmTtAqjscy8bK78p+euRc+a+nuGKISJH qicBWbsK7/CjLnoPdMUKQeHACO459Z7zVIv9YqFtXfOWFKawmcXtoq17y5UuTjG2I/IdsL 1VdRnXZ0CMFIOsi0h52asDLf7VTazaLRieY8Btf+lJUwXzVjiuArt9sHLgSmoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685181844; a=rsa-sha256; cv=none; b=lnq1ub1ea/WQMLXtU5AXpA6ugqQ6rCYycyN0nzbQBcgwXNR/npb8D866hZPxDNh4TqwPCV e0YUjU7JD2U8AZE6Jk4m0kKUQwWRBs/du2O/d0zGFhtzpe9WmgEyReNp0KQAbsVfz7EtA7 iXKQszmSd0Gay6K+a0rHCgoGlqC9wc173ptYedjO/so8MRVp2H7zK6HtbJjUIZpPBInZet FwrL+T837hMAqv/p7orBrZ2h8ChlM07DPUBA7z8JFMN4SR8rKDOjJsgqZgn0b+NhqALGmc D+rdmZ081BClAhWPw+nTY5o/LF11xol4FgCEKNQOtzMauOGGSyMEV5rJ5GAoCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QSy783kgfzl23; Sat, 27 May 2023 10:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34RA4423092051; Sat, 27 May 2023 10:04:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34RA44bb092050; Sat, 27 May 2023 10:04:04 GMT (envelope-from git) Date: Sat, 27 May 2023 10:04:04 GMT Message-Id: <202305271004.34RA44bb092050@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: 82dd4ed320d7 - 2023Q2 - misc/vxl: Unbundle graphics/libgeotiff; Add CONFLICTS stmt; Add comment List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: 82dd4ed320d7ac309ae37a7685dca5a108669e0a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=82dd4ed320d7ac309ae37a7685dca5a108669e0a commit 82dd4ed320d7ac309ae37a7685dca5a108669e0a Author: Yuri Victorovich AuthorDate: 2023-05-27 10:00:13 +0000 Commit: Yuri Victorovich CommitDate: 2023-05-27 10:03:59 +0000 misc/vxl: Unbundle graphics/libgeotiff; Add CONFLICTS stmt; Add comment (cherry picked from commit 450c17d137dcb5e0a45bbf4a9ede339a28c0fcef) --- 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