databases/ruby-sequel: Update to 5.59.0

2022-08-12 Thread wen heping
Hi,

   Here is a patch to update databases/ruby-sequel to 5.59.0.
It build and run well on amd64-current system.
   Only 1 port depends on it, build and run well too.


Cheers !
wenIndex: Makefile
===
RCS file: /cvs/ports/databases/ruby-sequel/Makefile,v
retrieving revision 1.51
diff -u -p -r1.51 Makefile
--- Makefile14 Mar 2022 21:30:35 -  1.51
+++ Makefile13 Aug 2022 01:39:47 -
@@ -1,6 +1,6 @@
 COMMENT =  lightweight database library and ORM for Ruby
 
-DISTNAME = sequel-5.54.0
+DISTNAME = sequel-5.59.0
 CATEGORIES =   databases
 
 HOMEPAGE = http://sequel.jeremyevans.net/
Index: distinfo
===
RCS file: /cvs/ports/databases/ruby-sequel/distinfo,v
retrieving revision 1.35
diff -u -p -r1.35 distinfo
--- distinfo14 Mar 2022 21:30:35 -  1.35
+++ distinfo13 Aug 2022 01:39:47 -
@@ -1,2 +1,2 @@
-SHA256 (sequel-5.54.0.gem) = zg5mG93BsWh4kf8OJ4K7C6Tvy6hilnf8XSdT7bcJ6/M=
-SIZE (sequel-5.54.0.gem) = 777216
+SHA256 (sequel-5.59.0.gem) = vo2wZGgDCZFBDWB8ajp9t7P8cL9oWEHF+sSAJDaWtUo=
+SIZE (sequel-5.59.0.gem) = 792064
Index: pkg/PLIST
===
RCS file: /cvs/ports/databases/ruby-sequel/pkg/PLIST,v
retrieving revision 1.37
diff -u -p -r1.37 PLIST
--- pkg/PLIST   14 Mar 2022 21:30:35 -  1.37
+++ pkg/PLIST   13 Aug 2022 01:39:47 -
@@ -81,6 +81,11 @@ ${GEM_LIB}/gems/${DISTNAME}/doc/release_
 ${GEM_LIB}/gems/${DISTNAME}/doc/release_notes/5.52.0.txt
 ${GEM_LIB}/gems/${DISTNAME}/doc/release_notes/5.53.0.txt
 ${GEM_LIB}/gems/${DISTNAME}/doc/release_notes/5.54.0.txt
+${GEM_LIB}/gems/${DISTNAME}/doc/release_notes/5.55.0.txt
+${GEM_LIB}/gems/${DISTNAME}/doc/release_notes/5.56.0.txt
+${GEM_LIB}/gems/${DISTNAME}/doc/release_notes/5.57.0.txt
+${GEM_LIB}/gems/${DISTNAME}/doc/release_notes/5.58.0.txt
+${GEM_LIB}/gems/${DISTNAME}/doc/release_notes/5.59.0.txt
 ${GEM_LIB}/gems/${DISTNAME}/doc/release_notes/5.6.0.txt
 ${GEM_LIB}/gems/${DISTNAME}/doc/release_notes/5.7.0.txt
 ${GEM_LIB}/gems/${DISTNAME}/doc/release_notes/5.8.0.txt
@@ -222,6 +227,7 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/sequel/e
 ${GEM_LIB}/gems/${DISTNAME}/lib/sequel/extensions/index_caching.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/sequel/extensions/inflector.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/sequel/extensions/integer64.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/sequel/extensions/is_distinct_from.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/sequel/extensions/looser_typecasting.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/sequel/extensions/migration.rb
 
${GEM_LIB}/gems/${DISTNAME}/lib/sequel/extensions/mssql_emulate_lateral_with_apply.rb
@@ -263,6 +269,7 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/sequel/e
 ${GEM_LIB}/gems/${DISTNAME}/lib/sequel/extensions/sql_comments.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/sequel/extensions/sql_expr.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/sequel/extensions/sql_log_normalizer.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/sequel/extensions/sqlite_json_ops.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/sequel/extensions/string_agg.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/sequel/extensions/string_date_time.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/sequel/extensions/symbol_aref.rb
@@ -293,6 +300,7 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/sequel/p
 ${GEM_LIB}/gems/${DISTNAME}/lib/sequel/plugins/association_pks.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/sequel/plugins/association_proxies.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/sequel/plugins/async_thread_pool.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/sequel/plugins/auto_restrict_eager_graph.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/sequel/plugins/auto_validations.rb
 
${GEM_LIB}/gems/${DISTNAME}/lib/sequel/plugins/auto_validations_constraint_validations_presence_message.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/sequel/plugins/before_after_save.rb
@@ -344,6 +352,7 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/sequel/p
 ${GEM_LIB}/gems/${DISTNAME}/lib/sequel/plugins/prepared_statements.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/sequel/plugins/prepared_statements_safe.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/sequel/plugins/rcte_tree.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/sequel/plugins/require_valid_schema.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/sequel/plugins/serialization.rb
 
${GEM_LIB}/gems/${DISTNAME}/lib/sequel/plugins/serialization_modification_detection.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/sequel/plugins/sharding.rb


Re: [Update] cad/kicad 6.0.6 -> 6.0.7

2022-08-12 Thread Michael Dinon
i
Kind regards,
Mike


On Mon, Aug 1, 2022 at 2:31 PM Tracey Emery  wrote:

> Hello,
>
> Here is a simple update to kicad and friends, bringing us to 6.0.7.
>
> Changelog is available at:
> https://www.kicad.org/blog/2022/07/KiCad-6.0.7-Release/
>
> Tested out on am64. ok?
>
> --
>
> Tracey Emery
>
> Index: kicad/Makefile
> ===
> RCS file: /home/cvs/ports/cad/kicad/Makefile,v
> retrieving revision 1.55
> diff -u -p -r1.55 Makefile
> --- kicad/Makefile  26 Jun 2022 16:40:02 -  1.55
> +++ kicad/Makefile  1 Aug 2022 18:27:12 -
> @@ -2,7 +2,7 @@
>  BROKEN-powerpc =   segfaults when trying to run the PCB editor
>  BROKEN-riscv64 =   kicad-5.1.10/include/system/libcontext.h:93:36:
> error: expected ';' after top level declarator
>
> -V =6.0.6
> +V =6.0.7
>  COMMENT =  schematic and PCB editing software
>  DISTNAME = kicad-${V}
>  EPOCH =0
> Index: kicad/distinfo
> ===
> RCS file: /home/cvs/ports/cad/kicad/distinfo,v
> retrieving revision 1.15
> diff -u -p -r1.15 distinfo
> --- kicad/distinfo  26 Jun 2022 16:40:02 -  1.15
> +++ kicad/distinfo  1 Aug 2022 14:10:26 -
> @@ -1,2 +1,2 @@
> -SHA256 (kicad-6.0.6.tar.gz) = j5A+7vOF0kBqw/oqt02jWBsxC+LS/K4litIRW3OCigo=
> -SIZE (kicad-6.0.6.tar.gz) = 45086249
> +SHA256 (kicad-6.0.7.tar.gz) = py6IsV82DXbqdCeSOlBz2140tfjPxL44nPwksSpx5/k=
> +SIZE (kicad-6.0.7.tar.gz) = 45143677
> Index: kicad-share/Makefile.inc
> ===
> RCS file: /home/cvs/ports/cad/kicad-share/Makefile.inc,v
> retrieving revision 1.14
> diff -u -p -r1.14 Makefile.inc
> --- kicad-share/Makefile.inc26 Jun 2022 16:40:39 -  1.14
> +++ kicad-share/Makefile.inc1 Aug 2022 14:06:08 -
> @@ -6,7 +6,7 @@ NOT_FOR_ARCHS = powerpc
>
>  PKG_ARCH ?=*
>
> -V ?=   6.0.6
> +V ?=   6.0.7
>  EXTRACT_SUFX ?=.tar.bz2
>
>  DISTNAME=  kicad-${KICAD_PROJECT}-$V
> Index: kicad-share/footprints/distinfo
> ===
> RCS file: /home/cvs/ports/cad/kicad-share/footprints/distinfo,v
> retrieving revision 1.9
> diff -u -p -r1.9 distinfo
> --- kicad-share/footprints/distinfo 26 Jun 2022 16:40:39 -  1.9
> +++ kicad-share/footprints/distinfo 1 Aug 2022 14:08:35 -
> @@ -1,2 +1,2 @@
> -SHA256 (kicad-footprints-6.0.6.tar.bz2) =
> x9yESBlnCVbadZMUpdBkSPd27Vb/XW65tTjbgZCVUj0=
> -SIZE (kicad-footprints-6.0.6.tar.bz2) = 23614649
> +SHA256 (kicad-footprints-6.0.7.tar.bz2) =
> DqG7dKtBgvf84gYW/N+beRHlY7IJIwp6rztrOEHN6Ko=
> +SIZE (kicad-footprints-6.0.7.tar.bz2) = 23625445
> Index: kicad-share/footprints/pkg/PLIST
> ===
> RCS file: /home/cvs/ports/cad/kicad-share/footprints/pkg/PLIST,v
> retrieving revision 1.8
> diff -u -p -r1.8 PLIST
> --- kicad-share/footprints/pkg/PLIST26 Jun 2022 16:40:39 -  1.8
> +++ kicad-share/footprints/pkg/PLIST1 Aug 2022 15:34:11 -
> @@ -9023,7 +9023,7 @@ share/kicad/footprints/Package_CSP.prett
>
>  
> share/kicad/footprints/Package_CSP.pretty/LFCSP-WD-10-1EP_3x3mm_P0.5mm_EP1.64x2.38mm_ThermalVias.kicad_mod
>
>  
> share/kicad/footprints/Package_CSP.pretty/LFCSP-WD-8-1EP_3x3mm_P0.65mm_EP1.6x2.44mm.kicad_mod
>
>  
> share/kicad/footprints/Package_CSP.pretty/LFCSP-WD-8-1EP_3x3mm_P0.65mm_EP1.6x2.44mm_ThermalVias.kicad_mod
>
> -share/kicad/footprints/Package_CSP.pretty/Maxim_WLCSP-32_3.0x2.17mm_Layout7x5_P0.4mm_Ball0.27mm_Pad0.25mm.kicad_mod
>
> +share/kicad/footprints/Package_CSP.pretty/Maxim_WLCSP-35_3.0x2.17mm_Layout7x5_P0.4mm_Ball0.27mm_Pad0.25mm.kicad_mod
>  share/kicad/footprints/Package_CSP.pretty/ST_WLCSP-100_Die422.kicad_mod
>  share/kicad/footprints/Package_CSP.pretty/ST_WLCSP-100_Die446.kicad_mod
>  share/kicad/footprints/Package_CSP.pretty/ST_WLCSP-100_Die452.kicad_mod
> @@ -10293,13 +10293,17 @@ share/kicad/footprints/Package_SO.pretty
>
>  
> share/kicad/footprints/Package_SO.pretty/TSOP-II-32_21.0x10.2mm_P1.27mm.kicad_mod
>
>  
> share/kicad/footprints/Package_SO.pretty/TSOP-II-44_10.16x18.41mm_P0.8mm.kicad_mod
>
>  
> share/kicad/footprints/Package_SO.pretty/TSOP-II-54_22.2x10.16mm_P0.8mm.kicad_mod
>
> +share/kicad/footprints/Package_SO.pretty/TSSOP-100_6.1x20.8mm_P0.4mm.kicad_mod
>  share/kicad/footprints/Package_SO.pretty/TSSOP-10_3x3mm_P0.5mm.kicad_mod
>
>  
> share/kicad/footprints/Package_SO.pretty/TSSOP-14-1EP_4.4x5mm_P0.65mm.kicad_mod
>
> +share/kicad/footprints/Package_SO.pretty/TSSOP-14_4.4x3.6mm_P0.4mm.kicad_mod
>
>  share/kicad/footprints/Package_SO.pretty/TSSOP-14_4.4x5mm_P0.65mm.kicad_mod
>
>  
> share/kicad/footprints/Package_SO.pretty/TSSOP-16-1EP_4.4x5mm_P0.65mm.kicad_mod
>
>  
> share/kicad/footprints/Package_SO.pretty

Disable python/PyPI module of portgen

2022-08-12 Thread Kurt Mosiejczuk
portgen's Python/PyPI module has been rotting. At this point it does not
generate a port that is usable. These diffs disable the functionality and
pull metion of it from the portgen(1) man page.

It doesn't delete the modules yet, in case someone wants to whip it back
into shape.

ok?

--Kurt
Index: portgen.1
===
RCS file: /cvs/src/share/man/man1/portgen.1,v
retrieving revision 1.8
diff -u -p -r1.8 portgen.1
--- portgen.1   13 Jan 2022 18:39:14 -  1.8
+++ portgen.1   12 Aug 2022 20:15:54 -
@@ -63,8 +63,6 @@ values:
 .Bl -inset -offset indent -compact
 .It Cm p5
 for Perl modules on CPAN.
-.It Cm py
-for Python modules on PyPI.
 .It Cm ruby
 for Ruby gems.
 .It Cm go
Index: portgen
===
RCS file: /cvs/ports/infrastructure/bin/portgen,v
retrieving revision 1.5
diff -u -p -r1.5 portgen
--- portgen 5 Jan 2022 09:12:50 -   1.5
+++ portgen 12 Aug 2022 20:17:54 -
@@ -43,7 +43,6 @@ my ( $type, $module ) = @ARGV;
 
 my $map = {
p5 => 'CPAN',
-   py => 'PyPI',
ruby => 'Ruby',
go => 'Go',
 };


Re: qcad segfault on 7.1 amd64

2022-08-12 Thread Andy Bradford
Thus said Stuart Henderson on Fri, 12 Aug 2022 13:34:57 +0100:

> It  should  work  with  "make clean;  make  DEBUG=-g  repackage"  (see
> https://www.openbsd.org/faq/ports/ports.html#Backtrace) - this doesn't
> use the  DEBUG_PACKAGES mechanism  to produce detached  debug symbols,
> and so shouldn't fail in the same way.

Aha, I'll  give that a try.  I thought that  DEBUG was a "boolean"  so I
just set it as  "make DEBUG=1" and when that failed I  looked at the man
page and found DEBUG_PACKAGES.

> I have one possible  idea which I am trying now (it  will be some time
> before my build finishes to test it).

I'll try  with DEBUG=-g as well,  but as you  say, it will be  some time
before it finishes.

Andy



PostgreSQL 14.5

2022-08-12 Thread Jeremy Evans
Apparently I was not paying attention back in June when they released
14.4. In my defense, no CVE in the 14.4 release.  The 14.5 release
fixes CVE-2022-2625.

Release announcements:

https://www.postgresql.org/about/news/postgresql-144-released-2470/
https://www.postgresql.org/about/news/postgresql-145-138-1212-1117-1022-and-15-beta-3-released-2496/

No regressions in some basic tests.  OKs?  After this is committed,
I'll backport to -stable.

Thanks,
Jeremy

Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.288
diff -u -p -r1.288 Makefile
--- Makefile21 May 2022 15:36:16 -  1.288
+++ Makefile12 Aug 2022 16:59:59 -
@@ -5,11 +5,10 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
 COMMENT-plpython=Python procedural language for PostgreSQL
 COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
 
-VERSION=   14.3
+VERSION=   14.5
 PREV_MAJOR=13
 DISTNAME=  postgresql-${VERSION}
 PKGNAME-main=  postgresql-client-${VERSION}
-REVISION-server=1
 
 DPB_PROPERTIES=parallel
 
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.93
diff -u -p -r1.93 distinfo
--- distinfo14 May 2022 17:51:54 -  1.93
+++ distinfo12 Aug 2022 17:00:49 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-14.3.tar.gz) = GO/zBDhwPdel8qfKkWdBvOPJnq20AlvGJoryaOjpCcU=
-SIZE (postgresql-14.3.tar.gz) = 28930973
+SHA256 (postgresql-14.5.tar.gz) = kOrTk9vGVMsAdeqvDsIFjmuYZs7UeP7TzytopbwE6yQ=
+SIZE (postgresql-14.5.tar.gz) = 28988974
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.106
diff -u -p -r1.106 PLIST-docs
--- pkg/PLIST-docs  14 May 2022 17:51:55 -  1.106
+++ pkg/PLIST-docs  12 Aug 2022 18:14:47 -
@@ -271,6 +271,7 @@ share/doc/postgresql/html/ecpg-errors.ht
 share/doc/postgresql/html/ecpg-informix-compat.html
 share/doc/postgresql/html/ecpg-library.html
 share/doc/postgresql/html/ecpg-lo.html
+share/doc/postgresql/html/ecpg-oracle-compat.html
 share/doc/postgresql/html/ecpg-pgtypes.html
 share/doc/postgresql/html/ecpg-preproc.html
 share/doc/postgresql/html/ecpg-process.html
@@ -705,6 +706,8 @@ share/doc/postgresql/html/regress.html
 share/doc/postgresql/html/release-14-1.html
 share/doc/postgresql/html/release-14-2.html
 share/doc/postgresql/html/release-14-3.html
+share/doc/postgresql/html/release-14-4.html
+share/doc/postgresql/html/release-14-5.html
 share/doc/postgresql/html/release-14.html
 share/doc/postgresql/html/release-prior.html
 share/doc/postgresql/html/release.html



Re: WIP, RFC: handling python ports with pyproject.toml and various backends (pep517)

2022-08-12 Thread Kurt Mosiejczuk
On Fri, Aug 12, 2022 at 03:43:32PM +0100, Stuart Henderson wrote:

> Updated to add a missing BUILD_DEPENDS, fix a copy+paste error that
> jca@ spotted, and use grep to show the build backend if pyproject.toml
> is present and MODPY_PEP517 isn't set (as an aid to port maintainers;
> I may tweak how that's done when I have more experience using it).

> I'd like to start using it to clean up some of the pep517-based ports
> in tree already and iterate further from there, does anyone have
> concerns?

> Using "MODPY_PEP517=hatchling" requires the 2 ports I've just sent
> separately.

This looks sane to me. ok kmos

--Kurt

> Index: python.port.mk
> ===
> RCS file: /cvs/ports/lang/python/python.port.mk,v
> retrieving revision 1.147
> diff -u -p -r1.147 python.port.mk
> --- python.port.mk4 Aug 2022 19:15:59 -   1.147
> +++ python.port.mk12 Aug 2022 14:20:15 -
> @@ -147,8 +147,23 @@ RUN_DEPENDS +=   ${MODPY_RUN_DEPENDS}
>  TEST_DEPENDS +=  ${MODPY_TEST_DEPENDS}
>  .endif
>  
> +MODPY_SETUPTOOLS ?=
> +MODPY_SETUPUTILS ?=
> +MODPY_PEP517 ?=  No
> +MODPY_PI ?=
> +
>  _MODPY_PRE_BUILD_STEPS = :
> -.if defined(MODPY_SETUPTOOLS) && ${MODPY_SETUPTOOLS:L} == "yes"
> +
> +.if ${MODPY_PEP517:L} == "no"
> +_MODPY_PRE_BUILD_STEPS += ; if [ -e ${WRKSRC}/pyproject.toml ] && \
> + ! grep -q ^build-backend.*setuptools ${WRKSRC}/pyproject.toml; then \
> + printf "\n***\n\nOpenBSD ports: should this use MODPY_PEP517?\n"; \
> + grep ^build-backend ${WRKSRC}/pyproject.toml || true; \
> + printf "\n***\n\n"; fi
> +.endif
> +
> +
> +.if ${MODPY_SETUPTOOLS:L} == "yes"
>  # The setuptools module provides a package locator (site.py) that is
>  # required at runtime for the pkg_resources stuff to work
>  .  if ${MODPY_MAJOR_VERSION} == 2
> @@ -160,6 +175,7 @@ MODPY_SETUPUTILS_DEPEND ?= devel/py-setu
>  MODPY_RUN_DEPENDS += ${MODPY_SETUPUTILS_DEPEND}
>  BUILD_DEPENDS += ${MODPY_SETUPUTILS_DEPEND}
>  MODPY_SETUPUTILS =   Yes
> +
>  # The setuptools uses test target
>  TEST_TARGET ?=   test
>  _MODPY_USERBASE =
> @@ -174,6 +190,16 @@ _MODPY_PRE_BUILD_STEPS += ;${MODPY_CMD} 
>  # that plugin will cause failure at the end of build.
>  # In the absence of a targetted means of disabling this, use a big hammer:
>  DPB_PROPERTIES +=nojunk
> +.elif ${MODPY_PEP517:L} != no
> +BUILD_DEPENDS += devel/py-installer${MODPY_FLAVOR} \
> + devel/py-pip${MODPY_FLAVOR}
> +.  if ${MODPY_PEP517:L:Mflit_core}
> +BUILD_DEPENDS += devel/py-flit_core${MODPY_FLAVOR}
> +.  elif ${MODPY_PEP517:L:Mflit}
> +BUILD_DEPENDS += devel/py-flit${MODPY_FLAVOR}
> +.  elif ${MODPY_PEP517:L:Mhatch}
> +BUILD_DEPENDS += devel/py-hatchling${MODPY_FLAVOR}
> +.  endif
>  .else
>  # Try to detect the case where a port will build regardless of setuptools
>  # but the final plist will be different if it's present.
> @@ -192,7 +218,7 @@ MODPY_SETUPUTILS =No
>  _MODPY_USERBASE =${WRKDIR}
>  .endif
>  
> -.if defined(MODPY_PI) && ${MODPY_PI:L} == "yes"
> +.if ${MODPY_PI:L} == "yes"
>  _MODPY_EGG_NAME =${DISTNAME:S/-${MODPY_EGG_VERSION}//}
>  MODPY_PI_DIR ?=  
> ${DISTNAME:C/^([a-zA-Z0-9]).*/\1/}/${_MODPY_EGG_NAME}
>  MASTER_SITES =   ${MASTER_SITE_PYPI:=${MODPY_PI_DIR}/}
> @@ -268,6 +294,17 @@ MODPY_ADJ_FILES ?=
>  MODPYTHON_pre-configure += cd ${WRKSRC} && ${MODPY_BIN_ADJ} 
> ${MODPY_ADJ_FILES}
>  .endif
>  
> +.if ${MODPY_PEP517:L} != no
> +MODPY_BUILD_TARGET = ${_MODPY_PRE_BUILD_STEPS}; \
> + cd ${WRKSRC} && pip wheel -v --no-index --no-cache --no-deps 
> --no-build-isolation .
> +MODPY_INSTALL_TARGET = \
> + ${INSTALL_DATA_DIR} ${WRKINST}${MODPY_LIBDIR}; \
> + ${MODPY_BIN} -m installer -d ${WRKINST} ${WRKSRC}/*.whl
> +MODPY_TEST_TARGET =  ${MODPY_TEST_CMD}
> +.  if ${MODPY_PYTEST:L} == "yes"
> +MODPY_TEST_TARGET += ${MODPY_PYTEST_ARGS}
> +.  endif
> +.else
>  MODPY_BUILD_TARGET = ${_MODPY_PRE_BUILD_STEPS}; \
>   ${MODPY_CMD} ${MODPY_DISTUTILS_BUILD} ${MODPY_DISTUTILS_BUILDARGS}
>  MODPY_INSTALL_TARGET = \
> @@ -275,10 +312,11 @@ MODPY_INSTALL_TARGET = \
>   ${MODPY_DISTUTILS_INSTALL} ${MODPY_DISTUTILS_INSTALLARGS}
>  
>  MODPY_TEST_TARGET =  ${MODPY_TEST_CMD}
> -.if ${MODPY_PYTEST:L} == "yes"
> +.  if ${MODPY_PYTEST:L} == "yes"
>  MODPY_TEST_TARGET += ${MODPY_PYTEST_ARGS}
> -.elif ${MODPY_SETUPUTILS:L} == "yes"
> +.  elif ${MODPY_SETUPUTILS:L} == "yes"
>  MODPY_TEST_TARGET += ${TEST_TARGET}
> +.  endif
>  .endif
>  
>  # dirty way to do it with no modifications in bsd.port.mk
> 



Re: devel/py-hatchling, devel/py-editables

2022-08-12 Thread Kurt Mosiejczuk
On Fri, Aug 12, 2022 at 03:42:18PM +0100, Stuart Henderson wrote:
> Software using Python PEP517 builds use various backends, one is the old
> familiar setuptools, another is flit_core which we have in ports, here's
> a port for another one, Hatchling, plus a required dependency.

> OK to import?  (the do-build/do-install mess in py-hatchling will go away
> with the python.port.mk changes I'm sending separately).

ok kmos to import

(I am about to ok the python.port.mk change too, so if you want to
commit that first and then just import the cleaned up version, ok)

--Kurt

> py-hatchling:

> Hatchling is the extensible, standards compliant build backend used by Hatch.

> py-editables:

> This library supports the building of wheels which, when installed, will
> expose packages in a local directory on sys.path in "editable mode".
> In other words, changes to the package source will be reflected in the
> package visible to Python, without needing a reinstall.





Re: WIP, RFC: handling python ports with pyproject.toml and various backends (pep517)

2022-08-12 Thread Stuart Henderson
On 2022/08/04 21:08, Stuart Henderson wrote:
> Some Python ports now use pyproject.toml with various build backends. It
> seems that the best way for us to work with these is going to be to use
> "pip wheel" to generate a wheel, and py-installer to place files from
> that wheel into the fake-install directory.
> 
> There are a few flit_core-based ports where so far I've been using
> "python -m flit_core.wheel" directly to generate the wheel, and all of
> these are working by instead using "pip wheel -v --no-index --no-cache
> --no-deps --no-build-isolation ."
> 
> Also it looks like the same works for other ports using hatchling
> (I need to do some rearrangement to split combined py2+3 py- ports
> off into a separate py2- so I can update the py3 version to get
> deps updated before we can use that).
> 
> So here are some WIP changes to python.port.mk and those ports to
> handle it more nicely.
> 
> Does anyone else have any kind of handle on this stuff? If so does
> this seem sane?

Updated to add a missing BUILD_DEPENDS, fix a copy+paste error that
jca@ spotted, and use grep to show the build backend if pyproject.toml
is present and MODPY_PEP517 isn't set (as an aid to port maintainers;
I may tweak how that's done when I have more experience using it).

I'd like to start using it to clean up some of the pep517-based ports
in tree already and iterate further from there, does anyone have
concerns?

Using "MODPY_PEP517=hatchling" requires the 2 ports I've just sent
separately.

Index: python.port.mk
===
RCS file: /cvs/ports/lang/python/python.port.mk,v
retrieving revision 1.147
diff -u -p -r1.147 python.port.mk
--- python.port.mk  4 Aug 2022 19:15:59 -   1.147
+++ python.port.mk  12 Aug 2022 14:20:15 -
@@ -147,8 +147,23 @@ RUN_DEPENDS += ${MODPY_RUN_DEPENDS}
 TEST_DEPENDS +=${MODPY_TEST_DEPENDS}
 .endif
 
+MODPY_SETUPTOOLS ?=
+MODPY_SETUPUTILS ?=
+MODPY_PEP517 ?=No
+MODPY_PI ?=
+
 _MODPY_PRE_BUILD_STEPS = :
-.if defined(MODPY_SETUPTOOLS) && ${MODPY_SETUPTOOLS:L} == "yes"
+
+.if ${MODPY_PEP517:L} == "no"
+_MODPY_PRE_BUILD_STEPS += ; if [ -e ${WRKSRC}/pyproject.toml ] && \
+   ! grep -q ^build-backend.*setuptools ${WRKSRC}/pyproject.toml; then \
+   printf "\n***\n\nOpenBSD ports: should this use MODPY_PEP517?\n"; \
+   grep ^build-backend ${WRKSRC}/pyproject.toml || true; \
+   printf "\n***\n\n"; fi
+.endif
+
+
+.if ${MODPY_SETUPTOOLS:L} == "yes"
 # The setuptools module provides a package locator (site.py) that is
 # required at runtime for the pkg_resources stuff to work
 .  if ${MODPY_MAJOR_VERSION} == 2
@@ -160,6 +175,7 @@ MODPY_SETUPUTILS_DEPEND ?= devel/py-setu
 MODPY_RUN_DEPENDS +=   ${MODPY_SETUPUTILS_DEPEND}
 BUILD_DEPENDS +=   ${MODPY_SETUPUTILS_DEPEND}
 MODPY_SETUPUTILS = Yes
+
 # The setuptools uses test target
 TEST_TARGET ?= test
 _MODPY_USERBASE =
@@ -174,6 +190,16 @@ _MODPY_PRE_BUILD_STEPS += ;${MODPY_CMD} 
 # that plugin will cause failure at the end of build.
 # In the absence of a targetted means of disabling this, use a big hammer:
 DPB_PROPERTIES +=  nojunk
+.elif ${MODPY_PEP517:L} != no
+BUILD_DEPENDS +=   devel/py-installer${MODPY_FLAVOR} \
+   devel/py-pip${MODPY_FLAVOR}
+.  if ${MODPY_PEP517:L:Mflit_core}
+BUILD_DEPENDS +=   devel/py-flit_core${MODPY_FLAVOR}
+.  elif ${MODPY_PEP517:L:Mflit}
+BUILD_DEPENDS +=   devel/py-flit${MODPY_FLAVOR}
+.  elif ${MODPY_PEP517:L:Mhatch}
+BUILD_DEPENDS +=   devel/py-hatchling${MODPY_FLAVOR}
+.  endif
 .else
 # Try to detect the case where a port will build regardless of setuptools
 # but the final plist will be different if it's present.
@@ -192,7 +218,7 @@ MODPY_SETUPUTILS =  No
 _MODPY_USERBASE =  ${WRKDIR}
 .endif
 
-.if defined(MODPY_PI) && ${MODPY_PI:L} == "yes"
+.if ${MODPY_PI:L} == "yes"
 _MODPY_EGG_NAME =  ${DISTNAME:S/-${MODPY_EGG_VERSION}//}
 MODPY_PI_DIR ?=
${DISTNAME:C/^([a-zA-Z0-9]).*/\1/}/${_MODPY_EGG_NAME}
 MASTER_SITES = ${MASTER_SITE_PYPI:=${MODPY_PI_DIR}/}
@@ -268,6 +294,17 @@ MODPY_ADJ_FILES ?=
 MODPYTHON_pre-configure += cd ${WRKSRC} && ${MODPY_BIN_ADJ} ${MODPY_ADJ_FILES}
 .endif
 
+.if ${MODPY_PEP517:L} != no
+MODPY_BUILD_TARGET = ${_MODPY_PRE_BUILD_STEPS}; \
+   cd ${WRKSRC} && pip wheel -v --no-index --no-cache --no-deps 
--no-build-isolation .
+MODPY_INSTALL_TARGET = \
+   ${INSTALL_DATA_DIR} ${WRKINST}${MODPY_LIBDIR}; \
+   ${MODPY_BIN} -m installer -d ${WRKINST} ${WRKSRC}/*.whl
+MODPY_TEST_TARGET =${MODPY_TEST_CMD}
+.  if ${MODPY_PYTEST:L} == "yes"
+MODPY_TEST_TARGET +=   ${MODPY_PYTEST_ARGS}
+.  endif
+.else
 MODPY_BUILD_TARGET = ${_MODPY_PRE_BUILD_STEPS}; \
${MODPY_CMD} ${MODPY_DISTUTILS_BUILD} ${MODPY_DISTUTILS_BUILDARGS}
 MODPY_INSTALL_TARGET = \
@@ -275,10 +312,11 @@ MODPY_INSTALL_TARGET = \
${MODPY_DISTUTILS_INSTALL} ${MODPY_DISTUTILS_INSTALLARGS}
 
 MODPY_T

devel/py-hatchling, devel/py-editables

2022-08-12 Thread Stuart Henderson
Software using Python PEP517 builds use various backends, one is the old
familiar setuptools, another is flit_core which we have in ports, here's
a port for another one, Hatchling, plus a required dependency.

OK to import?  (the do-build/do-install mess in py-hatchling will go away
with the python.port.mk changes I'm sending separately).

py-hatchling:

Hatchling is the extensible, standards compliant build backend used by Hatch.

py-editables:

This library supports the building of wheels which, when installed, will
expose packages in a local directory on sys.path in "editable mode".
In other words, changes to the package source will be reflected in the
package visible to Python, without needing a reinstall.



py-hatchling,etc.tgz
Description: application/tar-gz


Re: qcad segfault on 7.1 amd64

2022-08-12 Thread Stuart Henderson
On 2022/08/12 16:07, Rafael Sadowski wrote:
> On Fri Aug 12, 2022 at 01:34:57PM +0100, Stuart Henderson wrote:
> > [moving to ports@ where there's a slightly higher chance someone
> > else reading might have an idea what's happening]
> > 
> > On 2022-08-11, Andy Bradford 
> >  wrote:
> > > Hello,
> > >
> > > I was  running qcad without  problems on 6.9  and decided to  upgrade to
> > > 7.1. After upgrading from 6.9->7.0->7.1 qcad now segfaults.
> > 
> > Confirmed on -current as well.
> 
> Me too and also with an update qcad-3.27.6.7.

My idea was USE_WXNEEDED (because the trace was somewhere in scripting)
but that didn't help.


> > 
> > > $ qcad 
> > > QCAD version  3.24.3
> > > Warning:  RPropertyTypeId::generateId: property already initialized:  
> > > 7RObject : "" : "Invisible"
> > > Segmentation fault 
> > >
> > > Unfortunately it does not leave a core file (ulimit -c is "unlimited"):
> > >
> > > I installed gdb to see if that would provide any info (of course without
> > > symbols it may not be as helpful):
> > >
> > > (gdb) run
> > > Starting program: /usr/local/bin/qcad 
> > > QCAD version  3.24.3
> > > Warning:  RPropertyTypeId::generateId: property already initialized:  
> > > 7RObject : "" : "Invisible"
> > > [New thread 291749]
> > > [New thread 341567]
> > >
> > > Thread 1 received signal SIGSEGV, Segmentation fault.
> > > 0x00e806e924e0 in QScriptEnginePrivate::mark(QTJSC::MarkStack&) () 
> > > from /usr/local/lib/qt5/libQt5Script.so.3.0
> > > (gdb) bt
> > > #0  0x00e806e924e0 in QScriptEnginePrivate::mark(QTJSC::MarkStack&) 
> > > () from /usr/local/lib/qt5/libQt5Script.so.3.0
> > > #1  0x00e806e0db6c in QTJSC::Heap::markRoots() () from 
> > > /usr/local/lib/qt5/libQt5Script.so.3.0
> > > #2  0x00e806e0c905 in QTJSC::Heap::allocate(unsigned long) () from 
> > > /usr/local/lib/qt5/libQt5Script.so.3.0
> > > #3  0x00e806e9b4ee in QScriptEnginePrivate::newVariant(QVariant 
> > > const&) () from /usr/local/lib/qt5/libQt5Script.so.3.0
> > > #4  0x00e806e9cb71 in QScriptEngine::newVariant(QVariant const&) () 
> > > from /usr/local/lib/qt5/libQt5Script.so.3.0
> > > #5  0x00e7e648c3b1 in qtscript_create_Qt_class(QScriptEngine*) () 
> > > from /usr/local/share/qcad/plugins/script/libqtscript_core.so.1.0
> > > #6  0x00e7e65315f9 in 
> > > qtscript_initialize_com_trolltech_qt_core_bindings(QScriptValue&) () from 
> > > /usr/local/share/qcad/plugins/script/libqtscript_core.so.1.0
> > > #7  0x00e7e6390b43 in non-virtual thunk to 
> > > com_trolltech_qt_core_ScriptPlugin::initialize(QString const&, 
> > > QScriptEngine*) () from 
> > > /usr/local/share/qcad/plugins/script/libqtscript_core.so.1.0
> > > #8  0x00e806ea3719 in QScriptEngine::importExtension(QString const&) 
> > > () from /usr/local/lib/qt5/libQt5Script.so.3.0
> > > #9  0x00e7881d2eb0 in RScriptHandlerEcma::RScriptHandlerEcma() () 
> > > from /usr/local/lib/libqcadecmaapi.so.1.0
> > > #10 0x00e7881dee8b in RScriptHandlerEcma::factory() () from 
> > > /usr/local/lib/libqcadecmaapi.so.1.0
> > > #11 0x00e7defcb0cd in 
> > > RScriptHandlerRegistry::createScriptHandler(QString const&) () from 
> > > /usr/local/lib/libqcadcore.so.1.0
> > > #12 0x00e7defcb1fe in 
> > > RScriptHandlerRegistry::getGlobalScriptHandler(QString const&) () from 
> > > /usr/local/lib/libqcadcore.so.1.0
> > > #13 0x00e57ffd0393 in ?? ()
> > > #14 0x00e57ffcf6a2 in ?? ()
> > > #15 0x in ?? ()
> > > (gdb) 
> > > (gdb) quit
> > > A debugging session is active.
> > >
> > > Inferior 1 [process 56629] will be killed.
> > >
> > > Quit anyway? (y or n) n
> > > Not confirmed.
> > > (gdb) next
> > > Single stepping until exit from function 
> > > _ZN20QScriptEnginePrivate4markERN5QTJSC9MarkStackE,
> > > which has no line number information.
> > >
> > > Program terminated with signal SIGSEGV, Segmentation fault.
> > > The program no longer exists.
> > > (gdb) quit
> > >
> > >
> > > I tried to build the port by altering the Makefile by adding:
> > >
> > > DEBUG_PACKAGES =  ${BUILD_PACKAGES}
> > >
> > > But it failed to build the package:
> > >
> > >> Extracting debug info from 
> > >> /usr/ports/pobj/qcad-3.24.3.0/fake-amd64/usr/local/share/qcad/plugins/imageformats/libqgif.so
> > > Warning: no debug-info in 
> > > /usr/ports/pobj/qcad-3.24.3.0/fake-amd64/usr/local/share/qcad/plugins/imageformats/libqgif.so
> > > dwz: 
> > > /usr/ports/pobj/qcad-3.24.3.0/fake-amd64/usr/local/share/qcad/plugins/imageformats/.debug/libqgif.so.dbg:
> > >  .debug_info section not present
> > > objcopy: 
> > > /usr/ports/pobj/qcad-3.24.3.0/fake-amd64/usr/local/share/qcad/plugins/imageformats/.debug/libqgif.so.dbg:
> > >  Invalid operation
> > > *** Error 1 in /usr/ports/pobj/qcad-3.24.3.0/fake-amd64 
> > > (debug-pkg/Makefile:74 
> > > '/usr/ports/pobj/qcad-3.24.3.0/fake-amd64/usr/local/share/qcad/plugins/imageformats/.debug/libqgif.so.dbg')
> > > *** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:3070 
> > > '_cop

Re: qcad segfault on 7.1 amd64

2022-08-12 Thread Rafael Sadowski
On Fri Aug 12, 2022 at 01:34:57PM +0100, Stuart Henderson wrote:
> [moving to ports@ where there's a slightly higher chance someone
> else reading might have an idea what's happening]
> 
> On 2022-08-11, Andy Bradford 
>  wrote:
> > Hello,
> >
> > I was  running qcad without  problems on 6.9  and decided to  upgrade to
> > 7.1. After upgrading from 6.9->7.0->7.1 qcad now segfaults.
> 
> Confirmed on -current as well.

Me too and also with an update qcad-3.27.6.7.

> 
> > $ qcad 
> > QCAD version  3.24.3
> > Warning:  RPropertyTypeId::generateId: property already initialized:  
> > 7RObject : "" : "Invisible"
> > Segmentation fault 
> >
> > Unfortunately it does not leave a core file (ulimit -c is "unlimited"):
> >
> > I installed gdb to see if that would provide any info (of course without
> > symbols it may not be as helpful):
> >
> > (gdb) run
> > Starting program: /usr/local/bin/qcad 
> > QCAD version  3.24.3
> > Warning:  RPropertyTypeId::generateId: property already initialized:  
> > 7RObject : "" : "Invisible"
> > [New thread 291749]
> > [New thread 341567]
> >
> > Thread 1 received signal SIGSEGV, Segmentation fault.
> > 0x00e806e924e0 in QScriptEnginePrivate::mark(QTJSC::MarkStack&) () from 
> > /usr/local/lib/qt5/libQt5Script.so.3.0
> > (gdb) bt
> > #0  0x00e806e924e0 in QScriptEnginePrivate::mark(QTJSC::MarkStack&) () 
> > from /usr/local/lib/qt5/libQt5Script.so.3.0
> > #1  0x00e806e0db6c in QTJSC::Heap::markRoots() () from 
> > /usr/local/lib/qt5/libQt5Script.so.3.0
> > #2  0x00e806e0c905 in QTJSC::Heap::allocate(unsigned long) () from 
> > /usr/local/lib/qt5/libQt5Script.so.3.0
> > #3  0x00e806e9b4ee in QScriptEnginePrivate::newVariant(QVariant const&) 
> > () from /usr/local/lib/qt5/libQt5Script.so.3.0
> > #4  0x00e806e9cb71 in QScriptEngine::newVariant(QVariant const&) () 
> > from /usr/local/lib/qt5/libQt5Script.so.3.0
> > #5  0x00e7e648c3b1 in qtscript_create_Qt_class(QScriptEngine*) () from 
> > /usr/local/share/qcad/plugins/script/libqtscript_core.so.1.0
> > #6  0x00e7e65315f9 in 
> > qtscript_initialize_com_trolltech_qt_core_bindings(QScriptValue&) () from 
> > /usr/local/share/qcad/plugins/script/libqtscript_core.so.1.0
> > #7  0x00e7e6390b43 in non-virtual thunk to 
> > com_trolltech_qt_core_ScriptPlugin::initialize(QString const&, 
> > QScriptEngine*) () from 
> > /usr/local/share/qcad/plugins/script/libqtscript_core.so.1.0
> > #8  0x00e806ea3719 in QScriptEngine::importExtension(QString const&) () 
> > from /usr/local/lib/qt5/libQt5Script.so.3.0
> > #9  0x00e7881d2eb0 in RScriptHandlerEcma::RScriptHandlerEcma() () from 
> > /usr/local/lib/libqcadecmaapi.so.1.0
> > #10 0x00e7881dee8b in RScriptHandlerEcma::factory() () from 
> > /usr/local/lib/libqcadecmaapi.so.1.0
> > #11 0x00e7defcb0cd in 
> > RScriptHandlerRegistry::createScriptHandler(QString const&) () from 
> > /usr/local/lib/libqcadcore.so.1.0
> > #12 0x00e7defcb1fe in 
> > RScriptHandlerRegistry::getGlobalScriptHandler(QString const&) () from 
> > /usr/local/lib/libqcadcore.so.1.0
> > #13 0x00e57ffd0393 in ?? ()
> > #14 0x00e57ffcf6a2 in ?? ()
> > #15 0x in ?? ()
> > (gdb) 
> > (gdb) quit
> > A debugging session is active.
> >
> > Inferior 1 [process 56629] will be killed.
> >
> > Quit anyway? (y or n) n
> > Not confirmed.
> > (gdb) next
> > Single stepping until exit from function 
> > _ZN20QScriptEnginePrivate4markERN5QTJSC9MarkStackE,
> > which has no line number information.
> >
> > Program terminated with signal SIGSEGV, Segmentation fault.
> > The program no longer exists.
> > (gdb) quit
> >
> >
> > I tried to build the port by altering the Makefile by adding:
> >
> > DEBUG_PACKAGES =${BUILD_PACKAGES}
> >
> > But it failed to build the package:
> >
> >> Extracting debug info from 
> >> /usr/ports/pobj/qcad-3.24.3.0/fake-amd64/usr/local/share/qcad/plugins/imageformats/libqgif.so
> > Warning: no debug-info in 
> > /usr/ports/pobj/qcad-3.24.3.0/fake-amd64/usr/local/share/qcad/plugins/imageformats/libqgif.so
> > dwz: 
> > /usr/ports/pobj/qcad-3.24.3.0/fake-amd64/usr/local/share/qcad/plugins/imageformats/.debug/libqgif.so.dbg:
> >  .debug_info section not present
> > objcopy: 
> > /usr/ports/pobj/qcad-3.24.3.0/fake-amd64/usr/local/share/qcad/plugins/imageformats/.debug/libqgif.so.dbg:
> >  Invalid operation
> > *** Error 1 in /usr/ports/pobj/qcad-3.24.3.0/fake-amd64 
> > (debug-pkg/Makefile:74 
> > '/usr/ports/pobj/qcad-3.24.3.0/fake-amd64/usr/local/share/qcad/plugins/imageformats/.debug/libqgif.so.dbg')
> > *** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:3070 
> > '_copy-debug-info': @cd /usr/ports/pobj/qcad-3.24.3.0/fake-amd64 &&  exec 
> > /u...)
> > *** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2142 
> > '/usr/ports/packages/amd64/all/qcad-3.24.3.0p2.tgz': @cd 
> > /usr/ports/cad/qcad...)
> > *** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2628 
> > '_internal-package': @case X${_DEPENDS_CACHE} i

Re: qcad segfault on 7.1 amd64

2022-08-12 Thread Stuart Henderson
[moving to ports@ where there's a slightly higher chance someone
else reading might have an idea what's happening]

On 2022-08-11, Andy Bradford 
 wrote:
> Hello,
>
> I was  running qcad without  problems on 6.9  and decided to  upgrade to
> 7.1. After upgrading from 6.9->7.0->7.1 qcad now segfaults.

Confirmed on -current as well.

> $ qcad 
> QCAD version  3.24.3
> Warning:  RPropertyTypeId::generateId: property already initialized:  
> 7RObject : "" : "Invisible"
> Segmentation fault 
>
> Unfortunately it does not leave a core file (ulimit -c is "unlimited"):
>
> I installed gdb to see if that would provide any info (of course without
> symbols it may not be as helpful):
>
> (gdb) run
> Starting program: /usr/local/bin/qcad 
> QCAD version  3.24.3
> Warning:  RPropertyTypeId::generateId: property already initialized:  
> 7RObject : "" : "Invisible"
> [New thread 291749]
> [New thread 341567]
>
> Thread 1 received signal SIGSEGV, Segmentation fault.
> 0x00e806e924e0 in QScriptEnginePrivate::mark(QTJSC::MarkStack&) () from 
> /usr/local/lib/qt5/libQt5Script.so.3.0
> (gdb) bt
> #0  0x00e806e924e0 in QScriptEnginePrivate::mark(QTJSC::MarkStack&) () 
> from /usr/local/lib/qt5/libQt5Script.so.3.0
> #1  0x00e806e0db6c in QTJSC::Heap::markRoots() () from 
> /usr/local/lib/qt5/libQt5Script.so.3.0
> #2  0x00e806e0c905 in QTJSC::Heap::allocate(unsigned long) () from 
> /usr/local/lib/qt5/libQt5Script.so.3.0
> #3  0x00e806e9b4ee in QScriptEnginePrivate::newVariant(QVariant const&) 
> () from /usr/local/lib/qt5/libQt5Script.so.3.0
> #4  0x00e806e9cb71 in QScriptEngine::newVariant(QVariant const&) () from 
> /usr/local/lib/qt5/libQt5Script.so.3.0
> #5  0x00e7e648c3b1 in qtscript_create_Qt_class(QScriptEngine*) () from 
> /usr/local/share/qcad/plugins/script/libqtscript_core.so.1.0
> #6  0x00e7e65315f9 in 
> qtscript_initialize_com_trolltech_qt_core_bindings(QScriptValue&) () from 
> /usr/local/share/qcad/plugins/script/libqtscript_core.so.1.0
> #7  0x00e7e6390b43 in non-virtual thunk to 
> com_trolltech_qt_core_ScriptPlugin::initialize(QString const&, 
> QScriptEngine*) () from 
> /usr/local/share/qcad/plugins/script/libqtscript_core.so.1.0
> #8  0x00e806ea3719 in QScriptEngine::importExtension(QString const&) () 
> from /usr/local/lib/qt5/libQt5Script.so.3.0
> #9  0x00e7881d2eb0 in RScriptHandlerEcma::RScriptHandlerEcma() () from 
> /usr/local/lib/libqcadecmaapi.so.1.0
> #10 0x00e7881dee8b in RScriptHandlerEcma::factory() () from 
> /usr/local/lib/libqcadecmaapi.so.1.0
> #11 0x00e7defcb0cd in RScriptHandlerRegistry::createScriptHandler(QString 
> const&) () from /usr/local/lib/libqcadcore.so.1.0
> #12 0x00e7defcb1fe in 
> RScriptHandlerRegistry::getGlobalScriptHandler(QString const&) () from 
> /usr/local/lib/libqcadcore.so.1.0
> #13 0x00e57ffd0393 in ?? ()
> #14 0x00e57ffcf6a2 in ?? ()
> #15 0x in ?? ()
> (gdb) 
> (gdb) quit
> A debugging session is active.
>
> Inferior 1 [process 56629] will be killed.
>
> Quit anyway? (y or n) n
> Not confirmed.
> (gdb) next
> Single stepping until exit from function 
> _ZN20QScriptEnginePrivate4markERN5QTJSC9MarkStackE,
> which has no line number information.
>
> Program terminated with signal SIGSEGV, Segmentation fault.
> The program no longer exists.
> (gdb) quit
>
>
> I tried to build the port by altering the Makefile by adding:
>
> DEBUG_PACKAGES =  ${BUILD_PACKAGES}
>
> But it failed to build the package:
>
>> Extracting debug info from 
>> /usr/ports/pobj/qcad-3.24.3.0/fake-amd64/usr/local/share/qcad/plugins/imageformats/libqgif.so
> Warning: no debug-info in 
> /usr/ports/pobj/qcad-3.24.3.0/fake-amd64/usr/local/share/qcad/plugins/imageformats/libqgif.so
> dwz: 
> /usr/ports/pobj/qcad-3.24.3.0/fake-amd64/usr/local/share/qcad/plugins/imageformats/.debug/libqgif.so.dbg:
>  .debug_info section not present
> objcopy: 
> /usr/ports/pobj/qcad-3.24.3.0/fake-amd64/usr/local/share/qcad/plugins/imageformats/.debug/libqgif.so.dbg:
>  Invalid operation
> *** Error 1 in /usr/ports/pobj/qcad-3.24.3.0/fake-amd64 
> (debug-pkg/Makefile:74 
> '/usr/ports/pobj/qcad-3.24.3.0/fake-amd64/usr/local/share/qcad/plugins/imageformats/.debug/libqgif.so.dbg')
> *** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:3070 
> '_copy-debug-info': @cd /usr/ports/pobj/qcad-3.24.3.0/fake-amd64 &&  exec 
> /u...)
> *** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2142 
> '/usr/ports/packages/amd64/all/qcad-3.24.3.0p2.tgz': @cd 
> /usr/ports/cad/qcad...)
> *** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2628 
> '_internal-package': @case X${_DEPENDS_CACHE} in  X) _DEPENDS_CACHE=$( 
> mktem...)
> *** Error 2 in /usr/ports/cad/qcad 
> (/usr/ports/infrastructure/mk/bsd.port.mk:2607 'package': 
> @lock=qcad-3.24.3.0p2;  export _LOCKS_HELD=" qc...)

Seems that's failing because it does not actually build these files
itself, rather copies them from /usr/local/lib/qt5/plugins/imageformats/
in qtbase,

Re: UPDATE: net/sacc 1.01 -> 1.06

2022-08-12 Thread Hiltjo Posthuma
On Fri, Aug 12, 2022 at 11:27:31AM +0200, Hiltjo Posthuma wrote:
> Hi,
> 
> The patch below updates the sacc gopher client from 1.01 to 1.06.
> The suffix of the release tarball file also changed on the FTP server.
> 

Oops I made the same mistake as geomyidae, as they both now have TLS support.

so the line WANTLIB should have tls too:

WANTLIB += c curses tls

> 
> diff --git net/sacc/Makefile net/sacc/Makefile
> index 077016b5ca8..b6879289a0d 100644
> --- net/sacc/Makefile
> +++ net/sacc/Makefile
> @@ -1,6 +1,5 @@
>  COMMENT =simple console gopher client
> -DISTNAME =   sacc-1.01
> -EXTRACT_SUFX =   .tgz
> +DISTNAME =   sacc-1.06
>  CATEGORIES = net
>  
>  HOMEPAGE =   gopher://bitreich.org/1/scm/sacc
> diff --git net/sacc/distinfo net/sacc/distinfo
> index 3a9bc86d5cb..9c0b7caa5e2 100644
> --- net/sacc/distinfo
> +++ net/sacc/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (sacc-1.01.tgz) = y1eEss1pqKAnaQG5mhCTrHf7o3xsL7XCk12HxJZJJbo=
> -SIZE (sacc-1.01.tgz) = 12011
> +SHA256 (sacc-1.06.tar.gz) = IBQY1lNwE+KU1MxiKuXOtNVB49L51p8ZhoupN6BnwrM=
> +SIZE (sacc-1.06.tar.gz) = 14540
> 
> -- 
> Kind regards,
> Hiltjo
> 

-- 
Kind regards,
Hiltjo



Re: UPDATE: libtorrent-rasterbar 1.2.16

2022-08-12 Thread Stuart Henderson
On 2022/08/11 18:27, Nam Nguyen wrote:
> Stuart Henderson writes:
> 
> > Don't roll your own "libtorrent.cpython-${MODPY_VERSION:C/\.//g}.so",
> > either use MODPY_PYC_MAGIC_TAG (as is used in the PLIST), or a
> > wildcard e.g. libtorrent*.so
> 
> Thanks. Here is a fresh diff cribbed from thfr@'s games/gogrepo. I
> learned about about :S and :C from make(1). I used this to remove quotes
> from MODPY_PYC_MAGIC_TAG.

> + mv ${EGG}/libtorrent.${MODPY_PYC_MAGIC_TAG:S/"//g}so ${EGG}/..

No need to remove the quotes, the shell invoked by make doesn't mind
them anyway, so just this is enough (and I think probably better):

+   mv ${EGG}/libtorrent.${MODPY_PYC_MAGIC_TAG}so ${EGG}/..

otherwise OK

(I'm not sure why they're present in python.port.mk in the first place,
I'll do some tests and see if they can be removed..)



Re: [update] lang/go 1.19

2022-08-12 Thread Theo Buehler
On Tue, Aug 09, 2022 at 04:37:39PM +1000, Joel Sing wrote:
> It would also be sensible for it to go through a bulk or mini-bulk to
> ensure that there is no fallout (or that it is managable).

I put this through a bulk and informed jsing and maintainers of the
issues.  Here's a quick list:

net/dendriteneeds update because of quic-go
net/syncthing   needs upstream update of quic-go

net/termshark   needs workaround for Makefile hack/Go cache changes
sysutils/beats/packetbeat   ditto

sysutils/grafanabuild runs out of fds



Re: sparc64 bulk build report

2022-08-12 Thread Stuart Henderson
On 2022/08/12 11:45, Martin REINDL wrote:
> Am 12.08.2022 um 11:21 schrieb Stuart Henderson:
> > I think that wants "COMPILER_LANGS= c" as well
> > 
> 
> Even though it is mostly egfortran?

The COMPILER mechanism only deals with c/c++; the default is "c
c++" and in that case you will get library dependencies on C++
libraries added on ports-gcc archs

MODGCC4_LANGS is a separate thing and that still includes fortran,
check by setting COMPILER=ports-gcc, with and without using
COMPILER_LANGS, and e.g. "make show=MODGCC4_LANGS" and "make show=WANTLIB".



Re: UPDATE: net/geomyidae 0.50.1 -> 0.51

2022-08-12 Thread Omar Polo
On 2022/08/12 11:29:28 +0200, Hiltjo Posthuma  wrote:
> Hi,
> 
> The patch below updates net/geomyidae from 0.50.1 to 0.51.
> 
> BTW maybe the patch-Makefile patch procedure can be changed to override
> the MANDIR variable in the Makefile? This would avoid having to maintain
> and bump the patch for each release.

indeed, and it's also possible to drop a couple of lines from the
post-install target too.

btw, make port-lib-depends-check complained that `tls' was missing
from WANTLIB.

(+cc maintainer)

Index: Makefile
===
RCS file: /home/cvs/ports/net/geomyidae/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile13 Apr 2022 11:06:32 -  1.11
+++ Makefile12 Aug 2022 09:45:45 -
@@ -1,6 +1,6 @@
 COMMENT =  Gopher protocol daemon
 
-DISTNAME = geomyidae-v0.50.1
+DISTNAME = geomyidae-v0.51
 PKGNAME =  ${DISTNAME:S/-v/-/}
 
 CATEGORIES =   net
@@ -13,18 +13,17 @@ MAINTAINER =Joerg Jung ftp://bitreich.org/releases/geomyidae/
 
-MAKE_FLAGS =   CC="${CC}" CFLAGS="${CFLAGS} -Wall"
+MAKE_FLAGS =   CC="${CC}" CFLAGS="${CFLAGS} -Wall" \
+   MANDIR="${PREFIX}/man/man8"
 MAKE_ENV = LDFLAGS="${LDFLAGS}"
 
 NO_TEST =  Yes
 
 post-install:
-   ${INSTALL_PROGRAM} ${WRKBUILD}/geomyidae ${PREFIX}/bin
-   ${INSTALL_MAN} ${WRKBUILD}/geomyidae.8 ${PREFIX}/man/man8
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/geomyidae
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/geomyidae
cd ${WRKSRC} && ${INSTALL_DATA} CGI.md README \
Index: distinfo
===
RCS file: /home/cvs/ports/net/geomyidae/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo13 Apr 2022 11:06:32 -  1.6
+++ distinfo12 Aug 2022 09:36:27 -
@@ -1,2 +1,2 @@
-SHA256 (geomyidae-v0.50.1.tar.gz) = 
Rn7facnjCOD21rn58NB1hxuz0fToUcVdlrfefApB1Xk=
-SIZE (geomyidae-v0.50.1.tar.gz) = 31832
+SHA256 (geomyidae-v0.51.tar.gz) = z65VWzcw4FYRTyAi7Gi83dnQWTpIZbNMcdrKlJqdiow=
+SIZE (geomyidae-v0.51.tar.gz) = 33384
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile  13 Apr 2022 11:06:32 -  1.5
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-Index: Makefile
 Makefile.orig
-+++ Makefile
-@@ -7,7 +7,7 @@ VERSION = 0.50.1
- 
- PREFIX = /usr/local
- BINDIR = ${PREFIX}/bin
--MANDIR = ${PREFIX}/share/man/man8
-+MANDIR = ${PREFIX}/man/man8
- 
- # Comment to disable TLS support
- TLS_CFLAGS = -DENABLE_TLS



Re: sparc64 bulk build report

2022-08-12 Thread Martin REINDL

Am 12.08.2022 um 11:21 schrieb Stuart Henderson:

I think that wants "COMPILER_LANGS= c" as well



Even though it is mostly egfortran?



UPDATE: net/geomyidae 0.50.1 -> 0.51

2022-08-12 Thread Hiltjo Posthuma
Hi,

The patch below updates net/geomyidae from 0.50.1 to 0.51.

BTW maybe the patch-Makefile patch procedure can be changed to override
the MANDIR variable in the Makefile? This would avoid having to maintain
and bump the patch for each release.


diff --git net/geomyidae/Makefile net/geomyidae/Makefile
index 22cbad38431..76393c321ef 100644
--- net/geomyidae/Makefile
+++ net/geomyidae/Makefile
@@ -1,6 +1,6 @@
 COMMENT =  Gopher protocol daemon
 
-DISTNAME = geomyidae-v0.50.1
+DISTNAME = geomyidae-v0.51
 PKGNAME =  ${DISTNAME:S/-v/-/}
 
 CATEGORIES =   net
diff --git net/geomyidae/distinfo net/geomyidae/distinfo
index 4240c49f40f..8257add4f14 100644
--- net/geomyidae/distinfo
+++ net/geomyidae/distinfo
@@ -1,2 +1,2 @@
-SHA256 (geomyidae-v0.50.1.tar.gz) = 
Rn7facnjCOD21rn58NB1hxuz0fToUcVdlrfefApB1Xk=
-SIZE (geomyidae-v0.50.1.tar.gz) = 31832
+SHA256 (geomyidae-v0.51.tar.gz) = z65VWzcw4FYRTyAi7Gi83dnQWTpIZbNMcdrKlJqdiow=
+SIZE (geomyidae-v0.51.tar.gz) = 33384
diff --git net/geomyidae/patches/patch-Makefile 
net/geomyidae/patches/patch-Makefile
index b28543585a2..3c4e8f022aa 100644
--- net/geomyidae/patches/patch-Makefile
+++ net/geomyidae/patches/patch-Makefile
@@ -1,7 +1,7 @@
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
-@@ -7,7 +7,7 @@ VERSION = 0.50.1
+@@ -7,7 +7,7 @@ VERSION = 0.51
  
  PREFIX = /usr/local
  BINDIR = ${PREFIX}/bin

-- 
Kind regards,
Hiltjo



UPDATE: net/sacc 1.01 -> 1.06

2022-08-12 Thread Hiltjo Posthuma
Hi,

The patch below updates the sacc gopher client from 1.01 to 1.06.
The suffix of the release tarball file also changed on the FTP server.


diff --git net/sacc/Makefile net/sacc/Makefile
index 077016b5ca8..b6879289a0d 100644
--- net/sacc/Makefile
+++ net/sacc/Makefile
@@ -1,6 +1,5 @@
 COMMENT =  simple console gopher client
-DISTNAME = sacc-1.01
-EXTRACT_SUFX = .tgz
+DISTNAME = sacc-1.06
 CATEGORIES =   net
 
 HOMEPAGE = gopher://bitreich.org/1/scm/sacc
diff --git net/sacc/distinfo net/sacc/distinfo
index 3a9bc86d5cb..9c0b7caa5e2 100644
--- net/sacc/distinfo
+++ net/sacc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sacc-1.01.tgz) = y1eEss1pqKAnaQG5mhCTrHf7o3xsL7XCk12HxJZJJbo=
-SIZE (sacc-1.01.tgz) = 12011
+SHA256 (sacc-1.06.tar.gz) = IBQY1lNwE+KU1MxiKuXOtNVB49L51p8ZhoupN6BnwrM=
+SIZE (sacc-1.06.tar.gz) = 14540

-- 
Kind regards,
Hiltjo



Re: sparc64 bulk build report

2022-08-12 Thread Stuart Henderson

I think that wants "COMPILER_LANGS= c" as well

--
 Sent from a phone, apologies for poor formatting.

On 12 August 2022 08:03:28 Martin Reindl  wrote:


On Thu, Aug 11, 2022 at 11:55:46PM -0600, k...@openbsd.org wrote:

Bulk build on sparc64-0a.ports.openbsd.org

http://build-failures.rhaalovely.net/sparc64/2022-08-09/math/arpack.log


Can anyone test please?


Index: Makefile
===
RCS file: /cvs/ports/math/arpack/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- Makefile24 May 2022 19:28:58 -  1.24
+++ Makefile12 Aug 2022 06:51:28 -
@@ -7,7 +7,7 @@ PKGNAME =   arpack-${GH_TAGNAME}
GH_ACCOUNT =opencollab
GH_PROJECT =arpack-ng
EPOCH = 0
-REVISION = 0
+REVISION = 1

MULTI_PACKAGES =-main -mpi
FLAVORS =   no_mpi
@@ -22,6 +22,8 @@ HOMEPAGE =https://github.com/opencollab

# BSD 3-Clause
PERMIT_PACKAGE =Yes
+
+COMPILER = base-clang ports-gcc

MODULES =   fortran \
devel/cmake




Re: sparc64 bulk build report

2022-08-12 Thread Martin Reindl
On Thu, Aug 11, 2022 at 11:55:46PM -0600, k...@openbsd.org wrote:
> Bulk build on sparc64-0a.ports.openbsd.org
> 
> http://build-failures.rhaalovely.net/sparc64/2022-08-09/math/arpack.log

Can anyone test please?


Index: Makefile
===
RCS file: /cvs/ports/math/arpack/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- Makefile24 May 2022 19:28:58 -  1.24
+++ Makefile12 Aug 2022 06:51:28 -
@@ -7,7 +7,7 @@ PKGNAME =   arpack-${GH_TAGNAME}
 GH_ACCOUNT =   opencollab
 GH_PROJECT =   arpack-ng
 EPOCH =0
-REVISION = 0
+REVISION = 1
 
 MULTI_PACKAGES =   -main -mpi
 FLAVORS =  no_mpi
@@ -22,6 +22,8 @@ HOMEPAGE =https://github.com/opencollab
 
 # BSD 3-Clause
 PERMIT_PACKAGE =   Yes
+
+COMPILER = base-clang ports-gcc
 
 MODULES =  fortran \
devel/cmake