git: 8b6c49f551f0 - main - graphics/libboard: Update to 0.9.6

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Daniel Engberg <diizzy_at_FreeBSD.org>
Date: Sat, 08 Feb 2025 15:05:26 UTC
The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8b6c49f551f0508cbdf358f1ae7599c523ff7913

commit 8b6c49f551f0508cbdf358f1ae7599c523ff7913
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2025-02-08 11:28:38 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
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 <bsd.port.mk>
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