From nobody Tue Oct 03 10:49:49 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 4S0F2P6h9Xz4w6Dv; Tue, 3 Oct 2023 10:49:49 +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 4S0F2P69z9z4KGv; Tue, 3 Oct 2023 10:49:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696330189; 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=V+vj7edMYg7uWwZTrrOGiItHSlhHRr1aB8ZnxiNMAO8=; b=u680yHjgmHkYkx8hlPt2kl1DVqXT/Wz+3Mz5eW5BesxcqElJXxGJSvk5QMnUNaF4N9lW+6 jEIERyLZ02y49PwR2BDNpi5scqP29LE/r13iL52BEA3Qan0L2NCWSWNePQ8uzSQj2SMgEG +PCNssGZ/Fe0UnCrFHMTcMLkzRonqiu5rRCEdVFX41v874/QKSI7F9GELRbG2GhXN406lm LaxBi1HQm2akz8HO8J6nBd+28cEE1wApu458N0tOiWRISuzSMlWQtWs5sM9HG1B+cmD2zg RnYhIyi0AjcVF0hM9cE6pEQ72s1OpSyXaWKk8O4xob9fyRhTg5Uzguc/3tLFbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696330189; a=rsa-sha256; cv=none; b=WGqwabFpAmbdB1YpIr6IXXTjVoNkT7hRdKMRY/qxd1kaaii9Fy2vvWabPc16+XB2ILOWac 34U93dRrb3+u49dUuRoSocqtCAaShGie00WpUdN0GDXaFPJzTBvArmDF69+Jg5Z5ctce1D pS5ydG5fAYI0XFCRTUMtBHjnYA8z7beF/54+luq6GdJiIr7JqAnCVCHB5CiBNBpFv+0ojs ra6SGHMHrw0HqMOwQC+8K+McwjaQmEA7s64Aj0HHNX1Nepz10M1rz1Z3Qu5yRm5KKFuMUU +1Ad/denquxF2EshY+jqqil7kB4l3gzRvT56OWWpjgbF6wi6SPFbFRtgwOoYyQ== 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=1696330189; 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=V+vj7edMYg7uWwZTrrOGiItHSlhHRr1aB8ZnxiNMAO8=; b=lvf5M19gm5GfPi9wEc7Q4u6BqX1+RO9JxYA/gRW00gnZdRx7GqepwHyiDwVX+FKHj3KFN0 I4grFkufMByckTjFCYMpYQC7gv4k/3ESnCweX/CDMuYnHRyOXQo9RO6jQ29siniKaWe5CM fmTrmCpgm/jCUIzCLzZq2oW98hIV3hDJVc7SfhypmdEZZyKwABOPFNehY5uGwl6it0jqmK kblpwDdbvCYK00/EQ0c55Gwy89BWH9RD7x/LCg6pp4uC9wDz3+KYTwwhy+DNMApBgH14JE ktBAST1FFyUkzF0zeIJR6lZKn4PIDP964sCekZG1SBGOq/+cf9aLAiX8kdH2QQ== 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 4S0F2P5Bg1zs4Z; Tue, 3 Oct 2023 10:49:49 +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 393Ann3Q019357; Tue, 3 Oct 2023 10:49:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 393AnnP5019354; Tue, 3 Oct 2023 10:49:49 GMT (envelope-from git) Date: Tue, 3 Oct 2023 10:49:49 GMT Message-Id: <202310031049.393AnnP5019354@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: bbdd834993b9 - main - graphics/mapnik: Fix building with Boost v1.8.3 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: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bbdd834993b9fdc973764ff7af907ae462b6640d Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=bbdd834993b9fdc973764ff7af907ae462b6640d commit bbdd834993b9fdc973764ff7af907ae462b6640d Author: dhummel AuthorDate: 2023-10-02 06:40:29 +0000 Commit: Fernando Apesteguía CommitDate: 2023-10-03 10:49:24 +0000 graphics/mapnik: Fix building with Boost v1.8.3 PR: 274166 Reported by: dhummel@eml.cc (maintainer) --- graphics/mapnik/Makefile | 18 ++++++++++++------ graphics/mapnik/distinfo | 2 ++ graphics/mapnik/pkg-plist | 1 + 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/graphics/mapnik/Makefile b/graphics/mapnik/Makefile index 30d608c78a54..02a15f0f5a0b 100644 --- a/graphics/mapnik/Makefile +++ b/graphics/mapnik/Makefile @@ -1,14 +1,16 @@ PORTNAME= mapnik DISTVERSIONPREFIX= v DISTVERSION= 3.1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics geography MASTER_SITES= https://github.com/mapnik/mapnik/releases/download/${DISTVERSIONFULL}/ -PATCH_SITES= https://github.com/mapnik/mapnik/commit/ +PATCH_SITES= https://github.com/mapnik/mapnik/commit/ \ + https://gitlab.archlinux.org/archlinux/packaging/packages/mapnik/-/raw/f9f723222c0af50e4db747e7c4e8138dbc769f53/ PATCHFILES= 8944e81367d2b3b91a41e24116e1813c01491e5d.patch \ 83779b7b6bdd229740b1b5e12a4a8fe27114cb7d.patch \ - 7f0daee8b37d8cf6eff32529b1762ffd5104f3f3.patch + 7f0daee8b37d8cf6eff32529b1762ffd5104f3f3.patch \ + boost-1.83.patch PATCH_DIST_STRIP= -p1 -F3 MAINTAINER= david.hummel@gmail.com @@ -19,7 +21,10 @@ LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu -LIB_DEPENDS= libboost_system.so:devel/boost-libs \ +LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \ + libboost_program_options.so:devel/boost-libs \ + libboost_regex.so:devel/boost-libs \ + libboost_system.so:devel/boost-libs \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libicuuc.so:devel/icu @@ -37,8 +42,8 @@ CONFIGURE_ARGS= CPP_TESTS=False \ CUSTOM_LDFLAGS="${LDFLAGS}" \ DEMO=False \ DESTDIR="${STAGEDIR}" \ - FAST=True \ INPUT_PLUGINS="`${ECHO} ${INPUT_PLUGINS} | ${TR} ' ' ,`" \ + PGSQL2SQLITE=True \ SVG2PNG=True \ SYSTEM_FONTS=${LOCALBASE}/share/fonts/dejavu \ XMLPARSER=libxml2 @@ -75,7 +80,7 @@ POSTGIS_USES= pgsql PGRASTER_VARS= INPUT_PLUGINS+=pgraster PGRASTER_USES= pgsql SQLITE3_VARS= INPUT_PLUGINS+=sqlite -SQLITE3_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 +SQLITE3_USES= sqlite:3 PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_MAKE_ARGS_OFF= PNG=False @@ -110,6 +115,7 @@ post-patch: post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mapnik-index \ ${STAGEDIR}${PREFIX}/bin/mapnik-render \ + ${STAGEDIR}${PREFIX}/bin/pgsql2sqlite \ ${STAGEDIR}${PREFIX}/bin/shapeindex \ ${STAGEDIR}${PREFIX}/bin/svg2png @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so diff --git a/graphics/mapnik/distinfo b/graphics/mapnik/distinfo index df164881b392..d5f8a9c6102a 100644 --- a/graphics/mapnik/distinfo +++ b/graphics/mapnik/distinfo @@ -7,3 +7,5 @@ SHA256 (83779b7b6bdd229740b1b5e12a4a8fe27114cb7d.patch) = c80ca2cded88dfebff4efc SIZE (83779b7b6bdd229740b1b5e12a4a8fe27114cb7d.patch) = 698 SHA256 (7f0daee8b37d8cf6eff32529b1762ffd5104f3f3.patch) = 2bb3ab61ed128fd5ae48e8e0943d8d0ae37b070418c21774ba987a4973f21800 SIZE (7f0daee8b37d8cf6eff32529b1762ffd5104f3f3.patch) = 1071 +SHA256 (boost-1.83.patch) = 356271f4550c2b370ae48bbce9cebb58c5803507f2b14bc8e84f3813871d0645 +SIZE (boost-1.83.patch) = 1704 diff --git a/graphics/mapnik/pkg-plist b/graphics/mapnik/pkg-plist index ad33d31d5aad..461d9cc6d300 100644 --- a/graphics/mapnik/pkg-plist +++ b/graphics/mapnik/pkg-plist @@ -1,6 +1,7 @@ bin/mapnik-config bin/mapnik-index bin/mapnik-render +bin/pgsql2sqlite bin/shapeindex bin/svg2png include/mapnik/agg/agg_alpha_mask_u8.h