git: 4782cbe4e929 - main - print/libharu: adopt and update to 2.4.3 release (+)

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dima Panov <fluffy_at_FreeBSD.org>
Date: Fri, 14 Oct 2022 21:11:14 UTC
The branch main has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4782cbe4e929d29e585ba0b8193da57eba99ac2b

commit 4782cbe4e929d29e585ba0b8193da57eba99ac2b
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2022-10-14 20:59:18 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2022-10-14 21:09:27 +0000

    print/libharu: adopt and update to 2.4.3 release (+)
    
    Changelogs since 2.3.0 release:
        https://github.com/libharu/libharu/releases/tag/v2.4.0
        https://github.com/libharu/libharu/releases/tag/v2.4.1
        https://github.com/libharu/libharu/releases/tag/v2.4.2
        https://github.com/libharu/libharu/releases/tag/v2.4.3
---
 print/libharu/Makefile                        | 18 +++-----
 print/libharu/distinfo                        | 10 ++---
 print/libharu/files/patch-CMakeLists.txt      | 43 ++++--------------
 print/libharu/files/patch-demo_CMakeLists.txt | 65 ++++++++-------------------
 print/libharu/pkg-plist                       |  1 -
 5 files changed, 36 insertions(+), 101 deletions(-)

diff --git a/print/libharu/Makefile b/print/libharu/Makefile
index 8d0ad47810b0..74d345095d38 100644
--- a/print/libharu/Makefile
+++ b/print/libharu/Makefile
@@ -1,15 +1,10 @@
 PORTNAME=	libharu
-DISTVERSIONPREFIX=	RELEASE_
-DISTVERSION=	2_3_0
-PORTREVISION=	2
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2.4.3
 CATEGORIES=	print
 DIST_SUBDIR=	${PORTNAME}
 
-# Kitware (vtk) calls this version 2.4.0 with the addition of
-PATCHFILES=	157.diff:-p1 187.diff:-p1
-PATCH_SITES=	https://github.com/libharu/libharu/pull/
-
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Haru Free PDF Library
 WWW=		http://libharu.org/
 
@@ -17,13 +12,13 @@ LICENSE=	ZLIB
 
 LIB_DEPENDS=	libpng.so:graphics/png
 
-OPTIONS_DEFINE=	EXAMPLES
-
 USES=		cmake
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 
+OPTIONS_DEFINE=	EXAMPLES
+
 SOVERSION=	2
 PLIST_SUB+=	SOVERSION=${SOVERSION}
 PORTEXAMPLES=	*
@@ -31,9 +26,6 @@ PORTEXAMPLES=	*
 EXAMPLES_CMAKE_ON=	-DLIBHPDF_EXAMPLES:BOOL=ON  \
 			-DEXAMPLESDIR:STRING=share/examples/${PORTNAME}
 
-pre-configure:
-	${REINPLACE_CMD} -e 's|RC2|dev|;s|3|4|' ${WRKSRC}/include/hpdf_version.h
-
 post-install:
 	${LN} -s libhpdf.so ${STAGEDIR}${PREFIX}/lib/libhpdf.so.${SOVERSION}
 
diff --git a/print/libharu/distinfo b/print/libharu/distinfo
index a6c00c96cf04..70c54a01a823 100644
--- a/print/libharu/distinfo
+++ b/print/libharu/distinfo
@@ -1,7 +1,3 @@
-TIMESTAMP = 1653483669
-SHA256 (libharu/libharu-libharu-RELEASE_2_3_0_GH0.tar.gz) = 8f9e68cc5d5f7d53d1bc61a1ed876add1faf4f91070dbc360d8b259f46d9a4d2
-SIZE (libharu/libharu-libharu-RELEASE_2_3_0_GH0.tar.gz) = 1396413
-SHA256 (libharu/157.diff) = c65e567f04d3c0f995eb671ece25cf7f5170d6568d9d709e6f93f98b6a519f1d
-SIZE (libharu/157.diff) = 15274
-SHA256 (libharu/187.diff) = e211ca9a2633a2fccf2cb1dc320cc3d2e9ee99466b304fa6a57755414e89c162
-SIZE (libharu/187.diff) = 2416
+TIMESTAMP = 1665770182
+SHA256 (libharu/libharu-libharu-v2.4.3_GH0.tar.gz) = a2c3ae4261504a0fda25b09e7babe5df02b21803dd1308fdf105588f7589d255
+SIZE (libharu/libharu-libharu-v2.4.3_GH0.tar.gz) = 1411024
diff --git a/print/libharu/files/patch-CMakeLists.txt b/print/libharu/files/patch-CMakeLists.txt
index 45983863a210..ff54d7bd3079 100644
--- a/print/libharu/files/patch-CMakeLists.txt
+++ b/print/libharu/files/patch-CMakeLists.txt
@@ -1,38 +1,13 @@
---- CMakeLists.txt.orig	2013-10-30 13:11:59 UTC
+--- CMakeLists.txt.orig	2022-10-14 10:04:02 UTC
 +++ CMakeLists.txt
-@@ -78,6 +78,8 @@ if(BUILD_SHARED_LIBS)
-   set(LIBHPDF_SHARED ON)
- endif(BUILD_SHARED_LIBS)
+@@ -139,8 +139,8 @@ install(FILES ${haru_HDRS} DESTINATION ${CMAKE_INSTALL
+ install(FILES ${haru_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
  
-+include_directories(${CMAKE_SOURCE_DIR}/include)
-+
- # =======================================================================
- # look for headers and libraries
- # =======================================================================
-@@ -99,6 +101,8 @@ if(PNG_FOUND)
-   set(ADDITIONAL_LIBRARIES ${ADDITIONAL_LIBRARIES} ${PNG_LIBRARIES})
- endif(PNG_FOUND)
- 
-+find_library(M_LIB m)
-+set(ADDITIONAL_LIBRARIES ${ADDITIONAL_LIBRARIES} ${M_LIB})
+ # install various files
+-install(FILES README.md CHANGES INSTALL DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/libharu)
+-install(DIRECTORY bindings DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/libharu)
++# install(FILES README.md CHANGES INSTALL DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/libharu)
++# install(DIRECTORY bindings DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/libharu)
  
  # =======================================================================
- # configure header files, add compiler flags
-@@ -110,7 +114,6 @@ endif(PNG_FOUND)
- if(MSVC_VERSION GREATER 1399)
-   add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE)
- endif(MSVC_VERSION GREATER 1399)
--include_directories(${CMAKE_SOURCE_DIR}/include)
- 
- 
- # these are options
-@@ -210,9 +213,7 @@ set(
- install(FILES ${haru_HDRS} DESTINATION include)
- 
- # install various files
--install(FILES README CHANGES INSTALL DESTINATION .)
- if(NOT DEVPAK)
--  install(DIRECTORY if DESTINATION .)
- endif(NOT DEVPAK)
- if(DEVPAK)
-   install(FILES ${CMAKE_BINARY_DIR}/libharu.DevPackage DESTINATION .)
+ # print out some information
diff --git a/print/libharu/files/patch-demo_CMakeLists.txt b/print/libharu/files/patch-demo_CMakeLists.txt
index cb142a8ed4fb..dffab94fda7e 100644
--- a/print/libharu/files/patch-demo_CMakeLists.txt
+++ b/print/libharu/files/patch-demo_CMakeLists.txt
@@ -1,47 +1,20 @@
---- demo/CMakeLists.txt.orig	2013-10-30 14:11:59.000000000 +0100
-+++ demo/CMakeLists.txt	2014-10-13 10:52:19.000000000 +0200
-@@ -61,7 +61,7 @@
-   # =======================================================================
-   foreach(demo ${demos_NAMES})
-     add_executable(${demo} ${demo}.c)
--    target_link_libraries(${demo} ${_LIBHPDF_LIB})
-+    target_link_libraries(${demo} ${_LIBHPDF_LIB} m)
-     if(DEMO_C_FLAGS)
-       set_target_properties(${demo} PROPERTIES COMPILE_FLAGS ${DEMO_C_FLAGS})
-     endif(DEMO_C_FLAGS)
-@@ -70,7 +70,7 @@
-   # some demos need grid_sheet.c compiled in
-   foreach(demo ${demos_with_grid_NAMES})
-     add_executable(${demo} ${demo}.c grid_sheet.c)
--    target_link_libraries(${demo} ${_LIBHPDF_LIB})
-+    target_link_libraries(${demo} ${_LIBHPDF_LIB} m)
-     if(DEMO_C_FLAGS)
-       set_target_properties(${demo} PROPERTIES COMPILE_FLAGS ${DEMO_C_FLAGS})
-     endif(DEMO_C_FLAGS)
-@@ -75,6 +75,7 @@
-       set_target_properties(${demo} PROPERTIES COMPILE_FLAGS ${DEMO_C_FLAGS})
-     endif(DEMO_C_FLAGS)
-   endforeach(demo)
-+  target_link_libraries(text_demo2 m)
-     
-   # the grid_sheet demo needs extra defines
-   add_executable(grid_sheet grid_sheet.c)
-@@ -86,15 +87,15 @@
-   # =======================================================================
-   install(
-     TARGETS ${demos_NAMES} ${demos_with_grid_NAMES} grid_sheet
--    DESTINATION demo
-+    DESTINATION ${EXAMPLESDIR}
-   )
-   foreach(demo ${demos_NAMES} ${demos_with_grid_NAMES} grid_sheet)
--    install(FILES ${demo}.c DESTINATION demo)
-+    install(FILES ${demo}.c DESTINATION ${EXAMPLESDIR})
-   endforeach(demo)
+--- demo/CMakeLists.txt.orig	2022-10-14 10:04:02 UTC
++++ demo/CMakeLists.txt
+@@ -85,14 +85,14 @@ install(
+ # =======================================================================
+ install(
+   TARGETS ${demos_NAMES} ${demos_with_grid_NAMES} grid_sheet
+-  DESTINATION demo
++  DESTINATION ${EXAMPLESDIR}
+ )
+ foreach(demo ${demos_NAMES} ${demos_with_grid_NAMES} grid_sheet)
+-  install(FILES ${demo}.c DESTINATION demo)
++  install(FILES ${demo}.c DESTINATION ${EXAMPLESDIR})
+ endforeach()
  
-   # install demo files
-   install(
-     DIRECTORY images mbtext pngsuite rawimage ttfont type1
--    DESTINATION demo
-+    DESTINATION ${EXAMPLESDIR}
-   )
- endif(LIBHPDF_EXAMPLES)
+ # install demo files
+ install(
+   DIRECTORY images mbtext pngsuite rawimage ttfont type1
+-  DESTINATION demo
++  DESTINATION ${EXAMPLESDIR}
+ )
diff --git a/print/libharu/pkg-plist b/print/libharu/pkg-plist
index 32bdcef683fc..f7f5daa49051 100644
--- a/print/libharu/pkg-plist
+++ b/print/libharu/pkg-plist
@@ -30,6 +30,5 @@ include/hpdf_types.h
 include/hpdf_u3d.h
 include/hpdf_utils.h
 include/hpdf_version.h
-lib/libhpdfs.a
 lib/libhpdf.so
 lib/libhpdf.so.%%SOVERSION%%