From: A Tammy <openbsd.ports@aisha.cc>
Subject: Re: [update] print/libharu 2.3.0 -> 2.4.4
To: Johannes Thyssen Tishman <johannes@thyssentishman.com>, ports@openbsd.org
Date: Thu, 29 Aug 2024 11:26:39 -0400


On 8/28/24 7:30 AM, Johannes Thyssen Tishman wrote:
> Please find below (or attached) an update for print/libharu to version
> 2.4.4.


Committed, thanks!


>
> diff /usr/ports
> commit - a44d028a155810398a8e3f78e5a7eebb2471e38e
> path + /usr/ports
> blob - 41085d94e88765f56d51a4e461f913393bd51a64
> file + print/libharu/Makefile
> --- print/libharu/Makefile
> +++ print/libharu/Makefile
> @@ -1,37 +1,28 @@
> -COMMENT =	PDF creation library
> +COMMENT =		PDF creation library
>  
> -VERSION =	2_3_0
> -GH_ACCOUNT =	libharu
> -GH_PROJECT =	libharu
> -GH_TAGNAME =	RELEASE_${VERSION}
> -DISTNAME =	${GH_PROJECT}-${VERSION:S/_/./g}
> -SHARED_LIBS=	hpdf 0.1 #2.3
> -CATEGORIES =	print
> +DIST_TUPLE +=		github libharu libharu v2.4.4 .
>  
> -HOMEPAGE =	http://libharu.org/
> +SHARED_LIBS=		hpdf	1.0 #2.4.4
>  
> +CATEGORIES =		print
> +HOMEPAGE =		http://libharu.org/
> +
>  # ZLIB/PNG
>  PERMIT_PACKAGE =	Yes
>  
> -AUTOCONF_VERSION =	2.69
> -AUTOMAKE_VERSION =	1.14
> +WANTLIB =		m png z
>  
> -CONFIGURE_STYLE =	gnu
> -CONFIGURE_ARGS =	--with-png=${LOCALBASE}
> +MODULES =		devel/cmake \
> +			lang/python
>  
> -#  for libtoolize
> -BUILD_DEPENDS =	devel/libtool \
> -		${MODGNU_AUTOCONF_DEPENDS} \
> -		${MODGNU_AUTOMAKE_DEPENDS}
> +LIB_DEPENDS =		graphics/png
>  
> -LIB_DEPENDS =	graphics/png
> -WANTLIB =	m png z
> +FIX_CRLF_FILES =	bindings/python/c_func.py \
> +			bindings/python/demo/outline_demo_jp.py
>  
> -WRKDIST =	${WRKDIR}/libharu-RELEASE_${VERSION}
> +post-install:
> +	${MODPY_COMPILEALL} \
> +		${PREFIX}/share/libharu/bindings/python/ \
> +		${PREFIX}/share/libharu/bindings/python/demo/
>  
> -pre-configure:
> -	cd ${WRKSRC} && ${MAKE_PROGRAM} LIBTOOLIZE=libtoolize \
> -		AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
> -		AUTOCONF_VERSION=${AUTOCONF_VERSION} -f build.mk
> -
>  .include <bsd.port.mk>
> blob - 50fb4e7f96bd3b35e7a56514d6b6f3100c080bcf
> file + print/libharu/distinfo
> --- print/libharu/distinfo
> +++ print/libharu/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (libharu-2.3.0.tar.gz) = j55ozF1ffVPRvGGh7Ydq3R+vT5EHDbw2DYsln0bZpNI=
> -SIZE (libharu-2.3.0.tar.gz) = 1396413
> +SHA256 (libharu-libharu-v2.4.4.tar.gz) = InqwrmKXmtZcJ6m8Nthap3eU2zN1oKMK8YrN9NhxruY=
> +SIZE (libharu-libharu-v2.4.4.tar.gz) = 1411606
> blob - /dev/null
> file + print/libharu/patches/patch-bindings_python_c_func_py (mode 644)
> --- /dev/null
> +++ print/libharu/patches/patch-bindings_python_c_func_py
> @@ -0,0 +1,9 @@
> +Index: bindings/python/c_func.py
> +--- bindings/python/c_func.py.orig
> ++++ bindings/python/c_func.py
> +@@ -5,4 +5,4 @@ def printf(format, *optional):
> +         optional=optional[0]
> +     if format.endswith('\n'):
> +         format=format[:-1]
> +-    print format % optional
> ++    print(format % optional)
> blob - /dev/null
> file + print/libharu/patches/patch-bindings_python_demo_outline_demo_jp_py (mode 644)
> --- /dev/null
> +++ print/libharu/patches/patch-bindings_python_demo_outline_demo_jp_py
> @@ -0,0 +1,12 @@
> +Index: bindings/python/demo/outline_demo_jp.py
> +--- bindings/python/demo/outline_demo_jp.py.orig
> ++++ bindings/python/demo/outline_demo_jp.py
> +@@ -33,7 +33,7 @@ from haru.hpdf_errorcode import *
> + 
> + for i in dir():
> +     if 'CreateOutLine' in i:
> +-        print i
> ++        print(i)
> + 
> + 
> + @HPDF_Error_Handler(None, HPDF_UINT, HPDF_UINT, c_void_p)
> blob - 7b4df1f3ec275a0f86b349255616d86091c5300c
> file + /dev/null
> --- print/libharu/patches/patch-src_Makefile_am
> +++ /dev/null
> @@ -1,9 +0,0 @@
> ---- src/Makefile.am.orig	Sat Mar 16 13:32:31 2013
> -+++ src/Makefile.am	Sat Mar 16 13:34:23 2013
> -@@ -19,5 +19,5 @@ libhpdf_la_SOURCES =	hpdf_annotation.c hpdf_array.c hp
> - 
> - INCLUDES = -I$(top_srcdir)/include 
> - libhpdf_la_LIBADD = @LTLIBOBJS@
> --libhpdf_la_LDFLAGS = -release @VERSION@
> -+libhpdf_la_LDFLAGS =
> - EXTRA_DIST = CMakeLists.txt
> blob - 7206036dc873e7b1d3dfdf0805a117e7b93cea82
> file + print/libharu/pkg/PLIST
> --- print/libharu/pkg/PLIST
> +++ print/libharu/pkg/PLIST
> @@ -31,6 +31,187 @@ include/hpdf_types.h
>  include/hpdf_u3d.h
>  include/hpdf_utils.h
>  include/hpdf_version.h
> -lib/libhpdf.a
> -lib/libhpdf.la
>  @lib lib/libhpdf.so.${LIBhpdf_VERSION}
> +share/libharu/
> +share/libharu/CHANGES
> +share/libharu/INSTALL
> +share/libharu/README.md
> +share/libharu/bindings/
> +share/libharu/bindings/c#/
> +share/libharu/bindings/c#/README.c#
> +share/libharu/bindings/c#/demo/
> +share/libharu/bindings/c#/demo/Encryption.cs
> +share/libharu/bindings/c#/demo/FontDemo.cs
> +share/libharu/bindings/c#/demo/ImageDemo.cs
> +share/libharu/bindings/c#/demo/JPFontDemo.cs
> +share/libharu/bindings/c#/demo/LineDemo.cs
> +share/libharu/bindings/c#/demo/OutlineDemo.cs
> +share/libharu/bindings/c#/demo/Permission.cs
> +share/libharu/bindings/c#/demo/RawImageDemo.cs
> +share/libharu/bindings/c#/demo/SlideShowDemo.cs
> +share/libharu/bindings/c#/demo/TextDemo.cs
> +share/libharu/bindings/c#/hpdf.cs
> +share/libharu/bindings/delphi/
> +share/libharu/bindings/delphi/ExtGStateDemo.dpr
> +share/libharu/bindings/delphi/LineDemo.dpr
> +share/libharu/bindings/delphi/README.delphi
> +share/libharu/bindings/delphi/hpdf.pas
> +share/libharu/bindings/delphi/hpdf_consts.pas
> +share/libharu/bindings/delphi/hpdf_types.pas
> +share/libharu/bindings/freebasic/
> +share/libharu/bindings/freebasic/README.freebasic
> +share/libharu/bindings/freebasic/hpdf.bi
> +share/libharu/bindings/freebasic/hpdf_consts.bi
> +share/libharu/bindings/freebasic/hpdf_types.bi
> +share/libharu/bindings/freebasic/hpdftest.bas
> +share/libharu/bindings/oberon-2/
> +share/libharu/bindings/oberon-2/README.oberon-2
> +share/libharu/bindings/oberon-2/build.bat
> +share/libharu/bindings/oberon-2/hpdf.ob2
> +share/libharu/bindings/oberon-2/test.ob2
> +share/libharu/bindings/oberon-2/test.prj
> +share/libharu/bindings/python/
> +share/libharu/bindings/python/History.txt
> +share/libharu/bindings/python/README.python
> +share/libharu/bindings/python/__init__.py
> +${MODPY_COMMENT}share/libharu/bindings/python/${MODPY_PYCACHE}/
> +share/libharu/bindings/python/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/${MODPY_PYCACHE}c_func.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/${MODPY_PYCACHE}c_func.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/${MODPY_PYCACHE}hpdf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/${MODPY_PYCACHE}hpdf.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/${MODPY_PYCACHE}hpdf_consts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/${MODPY_PYCACHE}hpdf_consts.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/${MODPY_PYCACHE}hpdf_errorcode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/${MODPY_PYCACHE}hpdf_errorcode.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/${MODPY_PYCACHE}hpdf_types.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/${MODPY_PYCACHE}hpdf_types.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/c_func.py
> +share/libharu/bindings/python/demo/
> +${MODPY_COMMENT}share/libharu/bindings/python/demo/${MODPY_PYCACHE}/
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}arc_demo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}arc_demo.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}character_map.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}character_map.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}chfont_demo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}chfont_demo.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}cnfont_demo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}cnfont_demo.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}encoding_list.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}encoding_list.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}encryption.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}encryption.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}ext_gstate_demo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}ext_gstate_demo.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}font_demo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}font_demo.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}grid_sheet.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}grid_sheet.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}image_demo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}image_demo.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}jpeg_demo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}jpeg_demo.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}jpfont_demo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}jpfont_demo.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}line_demo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}line_demo.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}link_annotation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}link_annotation.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}make_rawimage.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}make_rawimage.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}outline_demo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}outline_demo.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}outline_demo_jp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}outline_demo_jp.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}permission.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}permission.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}png_demo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}png_demo.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}raw_image_demo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}raw_image_demo.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}slide_show_demo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}slide_show_demo.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}text_annotation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}text_annotation.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}text_demo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}text_demo.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}text_demo2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}text_demo2.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}ttfont_demo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}ttfont_demo.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}ttfont_demo_cn.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}ttfont_demo_cn.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}ttfont_demo_jp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +share/libharu/bindings/python/demo/${MODPY_PYCACHE}ttfont_demo_jp.${MODPY_PYC_MAGIC_TAG}pyc
> +share/libharu/bindings/python/demo/arc_demo.py
> +share/libharu/bindings/python/demo/character_map.py
> +share/libharu/bindings/python/demo/chfont_demo.py
> +share/libharu/bindings/python/demo/cnfont_demo.py
> +share/libharu/bindings/python/demo/encoding_list.py
> +share/libharu/bindings/python/demo/encryption.py
> +share/libharu/bindings/python/demo/ext_gstate_demo.py
> +share/libharu/bindings/python/demo/font_demo.py
> +share/libharu/bindings/python/demo/grid_sheet.py
> +share/libharu/bindings/python/demo/image_demo.py
> +share/libharu/bindings/python/demo/jpeg_demo.py
> +share/libharu/bindings/python/demo/jpfont_demo.py
> +share/libharu/bindings/python/demo/line_demo.py
> +share/libharu/bindings/python/demo/link_annotation.py
> +share/libharu/bindings/python/demo/make_rawimage.py
> +share/libharu/bindings/python/demo/outline_demo.py
> +share/libharu/bindings/python/demo/outline_demo_jp.py
> +share/libharu/bindings/python/demo/permission.py
> +share/libharu/bindings/python/demo/png_demo.py
> +share/libharu/bindings/python/demo/raw_image_demo.py
> +share/libharu/bindings/python/demo/slide_show_demo.py
> +share/libharu/bindings/python/demo/text_annotation.py
> +share/libharu/bindings/python/demo/text_demo.py
> +share/libharu/bindings/python/demo/text_demo2.py
> +share/libharu/bindings/python/demo/ttfont_demo.py
> +share/libharu/bindings/python/demo/ttfont_demo_cn.py
> +share/libharu/bindings/python/demo/ttfont_demo_jp.py
> +share/libharu/bindings/python/hpdf.py
> +share/libharu/bindings/python/hpdf_consts.py
> +share/libharu/bindings/python/hpdf_errorcode.py
> +share/libharu/bindings/python/hpdf_types.py
> +share/libharu/bindings/ruby/
> +share/libharu/bindings/ruby/Makefile.msvc
> +share/libharu/bindings/ruby/demo/
> +share/libharu/bindings/ruby/demo/arc_demo.rb
> +share/libharu/bindings/ruby/demo/demo.rb
> +share/libharu/bindings/ruby/demo/encryption.rb
> +share/libharu/bindings/ruby/demo/ext_gstater_demo.rb
> +share/libharu/bindings/ruby/demo/font_demo.rb
> +share/libharu/bindings/ruby/demo/jpfont_demo.rb
> +share/libharu/bindings/ruby/demo/line_demo.rb
> +share/libharu/bindings/ruby/demo/slide_show_demo.rb
> +share/libharu/bindings/ruby/demo/text_demo2.rb
> +share/libharu/bindings/ruby/demo/ttfont_demo.rb
> +share/libharu/bindings/ruby/extconf.rb
> +share/libharu/bindings/ruby/extconf.rb.all
> +share/libharu/bindings/ruby/extconf.rb.nopnglib
> +share/libharu/bindings/ruby/extconf.rb.nozlib
> +share/libharu/bindings/ruby/hpdf.c
> +share/libharu/bindings/vb.net/
> +share/libharu/bindings/vb.net/README.vbnet
> +share/libharu/bindings/vb.net/demo/
> +share/libharu/bindings/vb.net/demo/Encryption.vb
> +share/libharu/bindings/vb.net/demo/FontDemo.vb
> +share/libharu/bindings/vb.net/demo/ImageDemo.vb
> +share/libharu/bindings/vb.net/demo/LineDemo.vb
> +share/libharu/bindings/vb.net/demo/OutlineDemo.vb
> +share/libharu/bindings/vb.net/demo/Permission.vb
> +share/libharu/bindings/vb.net/demo/RawImageDemo.vb
> +share/libharu/bindings/vb.net/demo/SlideShowDemo.vb
> +share/libharu/bindings/vb.net/demo/TextDemo.vb
> +share/libharu/bindings/vb.net/hpdfvb.vb
> +share/libharu/bindings/vb6/
> +share/libharu/bindings/vb6/Form1.frm
> +share/libharu/bindings/vb6/MSSCCPRJ.SCC
> +share/libharu/bindings/vb6/Project1.vbp
> +share/libharu/bindings/vb6/Project1.vbw
> +share/libharu/bindings/vb6/README.vb
> +share/libharu/bindings/vb6/hpdf.bas
> +share/libharu/bindings/vb6/hpdf_consts.bas
> +share/libharu/bindings/vb6/hpdf_types.bas