From nobody Mon Dec 25 16:16:19 2023 X-Original-To: dev-commits-ports-main@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 4SzNLr01PJz54x3T; Mon, 25 Dec 2023 16:16:20 +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 4SzNLq4zlhz4KSX; Mon, 25 Dec 2023 16:16:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703520979; 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=9Y6djxOkxwP/LKdgmhuSsLGqHVs54uSF9JkUFTsLW2Q=; b=R7cLJwveTZe/SkCDq+TSk1FjP9uxi2jOB+ZpXJ1fpBBBhMKyoCq+ocN+UnhbKEfMwdjb+0 H9xKlQYKNg/1ROYlVXX4eU9e4WUaqby1cd6Lh9JdPwzb3cYXDO9BYkpxbKumQWrEYPSFIT AeeRpLRc2FSPNtbcyeoZ0qbXrdeH7ZZRGfk6RX8PiLS5E/oJHwx6jad3VWjvSAUgAAB0FS Dc64TnGAocc+qwaLyaD8huh3xK+uNlxBeM4PGiPhSGuNbCTsO5NCDI3drPA5Ff2BIR89OM 25P7yQp++O4Z2PyRUWj/w9BRtiwUm/apx8KhbH8244nYYrkwUwqgmpMOmL26fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703520979; a=rsa-sha256; cv=none; b=smQJTjw6vkm4894oj8rXD1L8tSIl9JqzEGMsQZamdJaYUrBFtZGbIbb4h7WQGsf1uQoQpl uX1v5vYnCisKioqA89IMYSRGmDnn/mtm/wzfFkW/dxw30wnrvtLRTpjBWW+heu3qPMBdV4 KkpRNsvDQuM4SMs86qQ8SadhBPxrdg+W4/iQbBQDVLx3lyBz0NNqIcnWNtCwTB8NVwpL/a 1JKk/t58y8i/q/OUI7SVPTnZo0Fypnx6CvcvRrTZay3SiZMIn++piJxqra5lf5u6lTnZh6 YP6lrJAlLwgGdd1Nge/Islam6jMrOdQVaFyfrlInwZTsRGQ8saBHEOYjxIwTKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703520979; 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=9Y6djxOkxwP/LKdgmhuSsLGqHVs54uSF9JkUFTsLW2Q=; b=fbS6fPrwzGSgzWB5vR5tTP5QO2QVgk0rBkhVCJ7GM8wIgCSRnTPpWuJrznFUBpwDCFz61z jkBpxbojIODWj54tVGdz2sQIi7MyAYf2kOpLoD8SFKVM3q1Xzh9+deUqYGHNf0uGPFKdzX 5Esl6y2YXvG6jEgDb0X3/BMBzn5O2ewPp9gfrs8ZlB0o02edl7ElWK6I5JGIZI48D4aTjT ShhFS3ofHI+RRYydpAqqr4AtvUvAqFoewwIFvLHgHkmYfcxvRh+U1Ah38o0lB6N+THdDVx c6pEu9cw5/1jk+gnj7xlFxefjW5nVaObTSBKZakpTM8veIH9p12fvSenMaJGMw== 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 4SzNLq45TBz3Zw; Mon, 25 Dec 2023 16:16:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPGGJxN009786; Mon, 25 Dec 2023 16:16:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPGGJ00009783; Mon, 25 Dec 2023 16:16:19 GMT (envelope-from git) Date: Mon, 25 Dec 2023 16:16:19 GMT Message-Id: <202312251616.3BPGGJ00009783@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 45e0a4924cd5 - main - devel/shapelib: Update to 1.6.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 45e0a4924cd56458e477963a2d852238077516f1 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=45e0a4924cd56458e477963a2d852238077516f1 commit 45e0a4924cd56458e477963a2d852238077516f1 Author: Po-Chuan Hsieh AuthorDate: 2023-12-25 16:02:58 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-12-25 16:10:50 +0000 devel/shapelib: Update to 1.6.0 - Add GitHub to MASTER_SITES - Remove my LOCAL from MASTER_SITES - Update WWW - Update LICENSE - Bump PORTREVISION of dependent ports for shlib change Changes: https://github.com/OSGeo/shapelib/releases http://shapelib.maptools.org/release.html Security: CVE-2022-0699 --- comms/xastir/Makefile | 2 +- devel/shapelib/Makefile | 21 +++++++++------------ devel/shapelib/distinfo | 6 +++--- devel/shapelib/files/patch-Makefile.in | 11 +++++++++++ devel/shapelib/pkg-plist | 14 +++----------- graphics/cloudcompare/Makefile | 2 +- graphics/gpsmanshp/Makefile | 2 +- mail/cyrus-imapd30/Makefile | 2 +- mail/cyrus-imapd32/Makefile | 2 +- mail/cyrus-imapd34/Makefile | 2 +- mail/cyrus-imapd36/Makefile | 2 +- mail/cyrus-imapd38/Makefile | 2 +- science/gnudatalanguage/Makefile | 1 + 13 files changed, 35 insertions(+), 34 deletions(-) diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile index 5b509f5448b7..3ae01fd4b16f 100644 --- a/comms/xastir/Makefile +++ b/comms/xastir/Makefile @@ -1,7 +1,7 @@ PORTNAME= xastir DISTVERSIONPREFIX= Release- DISTVERSION= 2.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= comms hamradio MAINTAINER= carl@stagecraft.cx diff --git a/devel/shapelib/Makefile b/devel/shapelib/Makefile index 1feb901c7037..c6231cb895fe 100644 --- a/devel/shapelib/Makefile +++ b/devel/shapelib/Makefile @@ -1,18 +1,18 @@ PORTNAME= shapelib -PORTVERSION= 1.5.0 +PORTVERSION= 1.6.0 CATEGORIES= devel geography MASTER_SITES= https://download.osgeo.org/shapelib/ \ - LOCAL/sunpoet + https://github.com/OSGeo/shapelib/releases/download/v${PORTVERSION}/ MAINTAINER= sunpoet@FreeBSD.org COMMENT= C API for reading and writing ArcView Shapefiles -WWW= http://shapelib.maptools.org/ +WWW= http://shapelib.maptools.org/ \ + https://github.com/OSGeo/shapelib -LICENSE= LGPL20 -LICENSE_FILE= ${WRKSRC}/COPYING - -OPTIONS_DEFINE= DOCS -OPTIONS_SUB= yes +LICENSE= LGPL20+ MIT +LICENSE_COMB= dual +LICENSE_FILE_LGPL20+ = ${WRKSRC}/LICENSE-LGPL +LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT USES= libtool localbase pathfix @@ -21,13 +21,10 @@ GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes +# bin/dbfdump CONFLICTS_INSTALL= p5-DBD-XBase post-install: ${INSTALL_PROGRAM} ${WRKSRC}/.libs/shptest ${STAGEDIR}${PREFIX}/bin/ -post-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR}/ - ${INSTALL_DATA} ${WRKSRC}/web/* ${STAGEDIR}${DOCSDIR}/ - .include diff --git a/devel/shapelib/distinfo b/devel/shapelib/distinfo index 1bd7757ab2bb..0183be183247 100644 --- a/devel/shapelib/distinfo +++ b/devel/shapelib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551437743 -SHA256 (shapelib-1.5.0.tar.gz) = 1fc0a480982caef9e7b9423070b47750ba34cd0ba82668f2e638fab1d07adae1 -SIZE (shapelib-1.5.0.tar.gz) = 547686 +TIMESTAMP = 1703495787 +SHA256 (shapelib-1.6.0.tar.gz) = 19528b24377241705637320c367943031ad5088665d1fb0e1eaa52a71264a6c4 +SIZE (shapelib-1.6.0.tar.gz) = 528882 diff --git a/devel/shapelib/files/patch-Makefile.in b/devel/shapelib/files/patch-Makefile.in new file mode 100644 index 000000000000..445b6fa4642c --- /dev/null +++ b/devel/shapelib/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2023-12-20 18:05:21 UTC ++++ Makefile.in +@@ -817,7 +817,7 @@ clean-libLTLIBRARIES: + rm -f $${locs}; \ + } + +-libshp.la: $(libshp_la_OBJECTS) $(libshp_la_DEPENDENCIES) $(EXTRA_libshp_la_DEPENDENCIES) ++$(top_builddir)/libshp.la: $(libshp_la_OBJECTS) $(libshp_la_DEPENDENCIES) $(EXTRA_libshp_la_DEPENDENCIES) + $(AM_V_CCLD)$(libshp_la_LINK) -rpath $(libdir) $(libshp_la_OBJECTS) $(libshp_la_LIBADD) $(LIBS) + + dbfadd$(EXEEXT): $(dbfadd_OBJECTS) $(dbfadd_DEPENDENCIES) $(EXTRA_dbfadd_DEPENDENCIES) diff --git a/devel/shapelib/pkg-plist b/devel/shapelib/pkg-plist index 335cc7079f39..01db8febd261 100644 --- a/devel/shapelib/pkg-plist +++ b/devel/shapelib/pkg-plist @@ -1,4 +1,5 @@ bin/Shape_PointInPoly +bin/csv2shp bin/dbfadd bin/dbfcat bin/dbfcreate @@ -22,15 +23,6 @@ bin/shpwkb include/shapefil.h lib/libshp.a lib/libshp.so -lib/libshp.so.2 -lib/libshp.so.2.1.0 +lib/libshp.so.4 +lib/libshp.so.4.0.0 libdata/pkgconfig/shapelib.pc -%%PORTDOCS%%%%DOCSDIR%%/codepage.html -%%PORTDOCS%%%%DOCSDIR%%/dbf_api.html -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/license.html -%%PORTDOCS%%%%DOCSDIR%%/manifest.html -%%PORTDOCS%%%%DOCSDIR%%/maptools.css -%%PORTDOCS%%%%DOCSDIR%%/release.html -%%PORTDOCS%%%%DOCSDIR%%/shapelib-tools.html -%%PORTDOCS%%%%DOCSDIR%%/shp_api.html diff --git a/graphics/cloudcompare/Makefile b/graphics/cloudcompare/Makefile index ce31bb585362..ba3507436efb 100644 --- a/graphics/cloudcompare/Makefile +++ b/graphics/cloudcompare/Makefile @@ -1,7 +1,7 @@ PORTNAME= cloudcompare DISTVERSIONPREFIX= v DISTVERSION= 2.12.4 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MAINTAINER= nc@FreeBSD.org diff --git a/graphics/gpsmanshp/Makefile b/graphics/gpsmanshp/Makefile index 591e109c566e..11d986183635 100644 --- a/graphics/gpsmanshp/Makefile +++ b/graphics/gpsmanshp/Makefile @@ -1,6 +1,6 @@ PORTNAME= gpsmanshp PORTVERSION= 1.2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics tcl geography MASTER_SITES= SF/${PORTNAME}/distr DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/mail/cyrus-imapd30/Makefile b/mail/cyrus-imapd30/Makefile index a896cb26ca6f..a5c0917b4ca9 100644 --- a/mail/cyrus-imapd30/Makefile +++ b/mail/cyrus-imapd30/Makefile @@ -1,6 +1,6 @@ PORTNAME= cyrus-imapd PORTVERSION= 3.0.18 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/ PKGNAMESUFFIX= 30 diff --git a/mail/cyrus-imapd32/Makefile b/mail/cyrus-imapd32/Makefile index bc0a4ead2245..0fbdc554944c 100644 --- a/mail/cyrus-imapd32/Makefile +++ b/mail/cyrus-imapd32/Makefile @@ -1,6 +1,6 @@ PORTNAME= cyrus-imapd PORTVERSION= 3.2.11 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/ PKGNAMESUFFIX= 32 diff --git a/mail/cyrus-imapd34/Makefile b/mail/cyrus-imapd34/Makefile index e1d619fda416..f55fcd9355b2 100644 --- a/mail/cyrus-imapd34/Makefile +++ b/mail/cyrus-imapd34/Makefile @@ -1,6 +1,6 @@ PORTNAME= cyrus-imapd PORTVERSION= 3.4.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/ PKGNAMESUFFIX= ${CYRUS_IMAPD_VER} diff --git a/mail/cyrus-imapd36/Makefile b/mail/cyrus-imapd36/Makefile index 023889024429..e0a34659f2eb 100644 --- a/mail/cyrus-imapd36/Makefile +++ b/mail/cyrus-imapd36/Makefile @@ -1,6 +1,6 @@ PORTNAME= cyrus-imapd PORTVERSION= 3.6.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${DISTVERSION}/ PKGNAMESUFFIX= ${CYRUS_IMAPD_VER} diff --git a/mail/cyrus-imapd38/Makefile b/mail/cyrus-imapd38/Makefile index 4e4b78f63459..c2ba0f78775f 100644 --- a/mail/cyrus-imapd38/Makefile +++ b/mail/cyrus-imapd38/Makefile @@ -1,6 +1,6 @@ PORTNAME= cyrus-imapd PORTVERSION= 3.8.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${DISTVERSION}/ PKGNAMESUFFIX= ${CYRUS_IMAPD_VER} diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile index 0a5f9ea405bb..b596d6885bcd 100644 --- a/science/gnudatalanguage/Makefile +++ b/science/gnudatalanguage/Makefile @@ -1,5 +1,6 @@ PORTNAME= gnudatalanguage PORTVERSION= 1.0.4 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= science lang .if defined(BUILD_PYTHON_MODULE)