From nobody Sat Feb 08 15:05:26 2025 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 4YqvKL5yYhz5n97n; Sat, 08 Feb 2025 15:05:26 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YqvKL4Mxzz3RbN; Sat, 08 Feb 2025 15:05:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739027126; 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=eHZ3dpQA2oH5QbEgUYCT9CrmNVwqm9tLyLecOhvAASo=; b=rclJJsgIUIdGxiw9LbT7clWeuNl19WygA5RJEb2fwkz1oz2QZqoxJCNvB+fDMv6gZ23hJb jzxGwwlSqaHTv5fmBA0DyYFR3QxHObrgtOYvOXMLJqb4OkQ5+Ga0HHj0HVcRZqksAnF0H1 xO9MUctVnxm5fvHJ7f5JBQJ9IIwMfTbehktB6XiK0FdLAVdqNJzmC4R30e3f0568mW4ms2 7if6MMJxqh9XCA23KygKTl2QIMzIjaaiiJklwYM0NWDWvJGHGER4F9w+7rTzkYgK8SyX26 T9LeGeIzRb4ZQWYIdi8pU6N18/GviGIEfSgPMLNaSpannukuhvTWduUl4jx4wA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739027126; 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=eHZ3dpQA2oH5QbEgUYCT9CrmNVwqm9tLyLecOhvAASo=; b=kncqVvGor90kh3lPaYJleVCTJCkrpROzoz8c+DvJHz1HUHHWBSLGFywcpXcXyoxL6Idy1f CXoyYNuSPrGaMXavUKps37x0dbzMhxD7cbM4Uj4VPmdZNCon7Dnm/xL6uoIsUJXcx/dOpG wkq/qVTodhs8dnmVBUCqUwQBcypn19GMFcSQCS1PB+QFRx6yPzFSnVVF0F/WXNx1kS2H9z sl9GWCSkBNTA1pl6kaGKTKCY50OSNX/3GPutdHrxS7k53KYn8uXNuhrqVOccAH7HKJgnhK wsef6MrGjF5aTiPzUlaXWis4cuwHzBMyybmJ3MAloaAeuVj9lqu3o7mQrZCz/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739027126; a=rsa-sha256; cv=none; b=jLUQNyLPet1CrU1OEvrUNpe8YYUnRVtnsmH53efahmej/9Ig9zbaeavFXjsT7s+KBHGWcG Qd38XhW82zwtLw9pY9h73rNg0qsCOI5Rg7WSeOYZwVfwZ97FHCV9epnd5bAdnh73pticji AFuYbXZVVQxqPM+MD90BeC2MINBR8ZgyklXRKI6yxqTr3TeMB16qhWhPvif7iZ9ujzHV8Y T9gIBrLWVqqmJskvcwbgvns2iaBsFbRub2hIDBGsA/fwRpBKgVWfo5QMHO6lwBi3TvwQIr bjKhbvUH8KHCRrSP4KqF9llCP3prHOfiVin2MAiW+35Hf1Bg5GXS2S8lM3n72g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YqvKL3nndz14x; Sat, 08 Feb 2025 15:05:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 518F5QpD049444; Sat, 8 Feb 2025 15:05:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 518F5QEb049441; Sat, 8 Feb 2025 15:05:26 GMT (envelope-from git) Date: Sat, 8 Feb 2025 15:05:26 GMT Message-Id: <202502081505.518F5QEb049441@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 8b6c49f551f0 - main - graphics/libboard: Update to 0.9.6 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b6c49f551f0508cbdf358f1ae7599c523ff7913 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=8b6c49f551f0508cbdf358f1ae7599c523ff7913 commit 8b6c49f551f0508cbdf358f1ae7599c523ff7913 Author: Daniel Engberg AuthorDate: 2025-02-08 11:28:38 +0000 Commit: Daniel Engberg CommitDate: 2025-02-08 13:51:16 +0000 graphics/libboard: Update to 0.9.6 * Remove USES= localbase * Remove USE_CXXSTD (already defined by project) * Remove if statement (not needed) * Adjust patch * Run tests in build dir to avoid plist issues Note: Previous update didn't update to 0.9.6 but kept the old version due to GH_TAGNAME begin left in port Makefile PR: 256776 Approved by: portmgr (maintainer timeout, 2+ weeks) --- graphics/libboard/Makefile | 24 +++++------ graphics/libboard/distinfo | 6 +-- graphics/libboard/files/patch-CMakeLists.txt | 18 +++++---- graphics/libboard/files/patch-src_Shapes.cpp | 11 ------ graphics/libboard/pkg-plist | 59 ++++++++++++++++++++++++---- 5 files changed, 76 insertions(+), 42 deletions(-) diff --git a/graphics/libboard/Makefile b/graphics/libboard/Makefile index 0f238df6a5bc..d47bfb25afd3 100644 --- a/graphics/libboard/Makefile +++ b/graphics/libboard/Makefile @@ -1,4 +1,5 @@ PORTNAME= libboard +DISTVERSIONPREFIX= v DISTVERSION= 0.9.6 CATEGORIES= graphics @@ -8,35 +9,30 @@ WWW= https://github.com/c-koi/libboard LICENSE= LGPL3 -USES= cmake compiler:c++11-lang localbase magick +USES= cmake compiler:c++11-lang magick +USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= c-koi -GH_TAGNAME= 5b38274 - -USE_CXXSTD= c++11 -CMAKE_ARGS= -DMYPROJ_RAN_ONCE:BOOL=YES \ - -DEXECUTABLE_OUTPUT_PATH:PATH="${STAGEDIR}${EXAMPLESDIR}" -USE_LDCONFIG= yes - -.if !defined(WITH_DEBUG) -LDFLAGS+= -s -.endif PORTDOCS= * +CMAKE_OFF= CMAKE_CXX_EXTENSIONS +CMAKE_ON= MYPROJ_RAN_ONCE + OPTIONS_DEFINE= DOXYGEN EXAMPLES DOCS DOXYGEN_IMPLIES= DOCS DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen post-install: ${MV} ${STAGEDIR}${PREFIX}/lib/libboard.so ${STAGEDIR}${PREFIX}/lib/libboard.so.0 - ${LN} -sf libboard.so.0 ${STAGEDIR}${PREFIX}/lib/libboard.so + ${RLN} ${STAGEDIR}${PREFIX}/lib/libboard.so.0 ${STAGEDIR}${PREFIX}/lib/libboard.so + ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/examples-bin/* ${STAGEDIR}${EXAMPLESDIR} do-test: - (cd ${STAGEDIR}${EXAMPLESDIR} && ./arithmetic bec) + (cd ${TEST_WRKSRC}/examples-bin && ./arithmetic bec) .for ex in 1 2 3 - (cd ${STAGEDIR}${EXAMPLESDIR} && ./example${ex}) + (cd ${TEST_WRKSRC}/examples-bin && ./example${ex}) .endfor .include diff --git a/graphics/libboard/distinfo b/graphics/libboard/distinfo index ab3952a6bcf0..f48eba0b9d77 100644 --- a/graphics/libboard/distinfo +++ b/graphics/libboard/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1709287277 -SHA256 (c-koi-libboard-0.9.6-5b38274_GH0.tar.gz) = 247cb53f1119b7b8505917f2e319bd38339d833652e83af43d4a034a4f8edcc7 -SIZE (c-koi-libboard-0.9.6-5b38274_GH0.tar.gz) = 270250 +TIMESTAMP = 1737195204 +SHA256 (c-koi-libboard-v0.9.6_GH0.tar.gz) = a5a06058b40828606dc61637f6c727278884a33fdb45528bc90c6eb93a97ea7d +SIZE (c-koi-libboard-v0.9.6_GH0.tar.gz) = 332288 diff --git a/graphics/libboard/files/patch-CMakeLists.txt b/graphics/libboard/files/patch-CMakeLists.txt index ce649d1b6902..504250ec2045 100644 --- a/graphics/libboard/files/patch-CMakeLists.txt +++ b/graphics/libboard/files/patch-CMakeLists.txt @@ -1,10 +1,7 @@ ---- CMakeLists.txt.orig 2016-06-09 17:30:46 UTC +--- CMakeLists.txt.orig 2024-02-28 16:26:45 UTC +++ CMakeLists.txt -@@ -147,10 +147,11 @@ SET_TARGET_PROPERTIES(board-dynamic PROP - - install(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h") +@@ -183,8 +183,8 @@ install(TARGETS board-dynamic DESTINATION lib) install(DIRECTORY include/board/ DESTINATION include/board FILES_MATCHING PATTERN "*.h") -+install(DIRECTORY include/board/ DESTINATION include/board FILES_MATCHING PATTERN "*.ih") install(TARGETS board DESTINATION lib) install(TARGETS board-dynamic DESTINATION lib) -install(DIRECTORY examples/ DESTINATION share/libboard/examples FILES_MATCHING PATTERN "*.cpp") @@ -12,5 +9,12 @@ +install(DIRECTORY examples/ DESTINATION share/examples/libboard FILES_MATCHING PATTERN "*.cpp") +install(FILES README.md LICENSE AUTHORS DESTINATION share/doc/libboard ) - FOREACH( EXAMPLE logo example1 example2 example3 example4 - arithmetic ellipse graph arrows ruler koch clipping + FILE(GLOB EXAMPLES examples/*.cpp) + +@@ -203,5 +203,6 @@ FOREACH( EXAMPLE_SRC_PATH ${EXAMPLES} ) + ${EXAMPLE_EXE} + ${ImageMagick_LIBRARIES} + ) ++ SET_TARGET_PROPERTIES(${EXAMPLE_EXE} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/examples-bin") + SET_TARGET_PROPERTIES(${EXAMPLE_EXE} PROPERTIES DEBUG_POSTFIX _d) + ENDFOREACH(EXAMPLE_SRC_PATH) diff --git a/graphics/libboard/files/patch-src_Shapes.cpp b/graphics/libboard/files/patch-src_Shapes.cpp deleted file mode 100644 index 506ea0267ace..000000000000 --- a/graphics/libboard/files/patch-src_Shapes.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Shapes.cpp.orig 2016-06-09 17:30:46 UTC -+++ src/Shapes.cpp -@@ -1908,7 +1908,7 @@ Text::Text( double x, double y, - } - - Text::Text(Point p, -- const std::__cxx11::string & text, -+ const std::string & text, - const Fonts::Font font, - double size, - Color color, diff --git a/graphics/libboard/pkg-plist b/graphics/libboard/pkg-plist index db47b3a729a7..f03a1d179d8e 100644 --- a/graphics/libboard/pkg-plist +++ b/graphics/libboard/pkg-plist @@ -1,31 +1,54 @@ include/Board.h include/BoardConfig.h -include/board/Board.ih +include/board/Arrow.h +include/board/Bezier.h +include/board/BoardFontText.h include/board/Color.h +include/board/Debug.h +include/board/Dot.h +include/board/Ellipse.h +include/board/Exception.h +include/board/Globals.h +include/board/Group.h include/board/Image.h +include/board/Line.h include/board/PSFonts.h include/board/Path.h include/board/PathBoundaries.h include/board/Point.h +include/board/Polyline.h include/board/Rect.h +include/board/RoughVisitor.h +include/board/Shape.h include/board/ShapeList.h -include/board/ShapeList.ih include/board/ShapeVisitor.h -include/board/Shapes.h -include/board/Shapes.ih +include/board/ShapeWithStyle.h +include/board/SketchFilter.h +include/board/Style.h +include/board/Text.h include/board/Tools.h -include/board/Tools.ih include/board/TransformMatrix.h -include/board/TransformMatrix.ih include/board/Transforms.h -include/board/Transforms.ih +include/board/Types.h lib/libboard.a lib/libboard.so lib/libboard.so.0 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Huffman +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Huffman.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Julia +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Julia.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/arithmetic %%PORTEXAMPLES%%%%EXAMPLESDIR%%/arithmetic.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/array +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/array.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/arrows %%PORTEXAMPLES%%%%EXAMPLESDIR%%/arrows.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bezier +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bezier.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_font_text +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/board_font_text.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/circled_framed +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/circled_framed.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/clipping %%PORTEXAMPLES%%%%EXAMPLESDIR%%/clipping.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ellipse @@ -42,8 +65,14 @@ lib/libboard.so.0 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/flag.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graph %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graph.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/holes +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/holes.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hull +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hull.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interpolate +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interpolate.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/koch %%PORTEXAMPLES%%%%EXAMPLESDIR%%/koch.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/line_segment @@ -52,11 +81,27 @@ lib/libboard.so.0 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/line_style.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/logo %%PORTEXAMPLES%%%%EXAMPLESDIR%%/logo.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rough +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rough.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ruler %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ruler.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sandbox +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sandbox.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scale_ellipse %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scale_ellipse.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sierpinski +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sierpinski.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/stroke_path %%PORTEXAMPLES%%%%EXAMPLESDIR%%/stroke_path.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_arrow +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_arrow.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_depth +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_depth.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tilings %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tilings.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/traversal +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/traversal.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/triangles +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/triangles.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xkcd +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xkcd.cpp