Re: Disable libinput in qt5 and qt6

2023-10-19 Thread Rafael Sadowski
On Tue Oct 17, 2023 at 12:09:55PM +, Klemens Nanni wrote:
> On Tue, Oct 17, 2023 at 01:47:02PM +0200, Rafael Sadowski wrote:
> > I would like to unhook libinput sooner rather than later to unhook KDE
> > plasma.  But let us first disable it over all.
> 
> You want to hook wayland/libinput-openbsd *to* the build to eventually
> hook x11/kde-plasma/ *to* to the build, right?

Correct that is the plan.

> 
> > 
> > The list of FreeBSD looks somehow too small. Can someone grep in a bulk
> > build?
> > 
> > https://www.freshports.org/x11/libinput/
> > 
> > OK to disable libinput auto detection in Qt?
> 
> So libinput-openbsd is not used yet, there is not other libinput in ports,
> which means this diff ought to be a NOOP now, but will prevent ports from
> automatically picking up libinput via Qt5 or Qt6 in the future?

Yes I'll prevent Qt and other ports to picking up libinput.  If someone
wants to use it as a dependency then we should enable and test it
explicitly.

> 
> > 
> > Index: qt5/qtbase/Makefile
> > ===
> > RCS file: /cvs/ports/x11/qt5/qtbase/Makefile,v
> > retrieving revision 1.64
> > diff -u -p -r1.64 Makefile
> > --- qt5/qtbase/Makefile 1 Sep 2023 13:13:27 -   1.64
> > +++ qt5/qtbase/Makefile 17 Oct 2023 11:42:56 -
> > @@ -15,6 +15,8 @@ PKGNAME-tds = qt5-tds-${VERSION}
> >  PKG_ARCH-global =  *
> >  PKG_ARCH-examples =*
> >  
> > +REVISION-main =0
> > +
> >  DPB_PROPERTIES =   parallel
> >  
> >  SHARED_LIBS +=  Qt5Concurrent4.0 # 5.15
> > @@ -141,6 +143,8 @@ CONFIGURE_ARGS +=   -confirm-license \
> >  # We have to wait until arm64 is vulkan ready.
> >  #BUILD_DEPENDS =   graphics/vulkan-loader
> >  CONFIGURE_ARGS +=  -no-vulkan
> > +
> > +CONFIGURE_ARGS +=  -no-libinput
> >  
> >  # Let's wait a little until we have more experience and test results
> >  #LIB_DEPENDS +=sysutils/libudev-openbsd
> > Index: qt6/qtbase/Makefile
> > ===
> > RCS file: /cvs/ports/x11/qt6/qtbase/Makefile,v
> > retrieving revision 1.25
> > diff -u -p -r1.25 Makefile
> > --- qt6/qtbase/Makefile 28 Jul 2023 08:44:09 -  1.25
> > +++ qt6/qtbase/Makefile 17 Oct 2023 11:42:57 -
> > @@ -11,6 +11,8 @@ PKGNAME-mysql =   qt6-mysql-${VERSION}
> >  PKGNAME-global =   qt6-global-${VERSION}
> >  PKGNAME-psql = qt6-postgresql-${VERSION}
> >  
> > +REVISION-main  0

I know I have forgotten a "=" here.

> > +
> >  PKG_ARCH-global =  *
> >  
> >  DPB_PROPERTIES =   parallel
> > @@ -115,6 +117,7 @@ CONFIGURE_ARGS +=   -DCMAKE_INSTALL_PREFIX
> > -DBUILD_WITH_PCH=OFF \
> > -DQT_FEATURE_journald=OFF \
> > -DQT_FEATURE_libudev=OFF \
> > +   -DQT_FEATURE_libinput=OFF \
> > -DQT_FEATURE_openssl_linked=ON \
> > -DQT_FEATURE_dtls=OFF
> >  
> > 
> 



Re: Clean up sysutils/u-boot a bit

2023-10-19 Thread Jonathan Gray
On Thu, Oct 19, 2023 at 08:17:29PM +0200, Mark Kettenis wrote:
> Back when I split up the port, Stuart suggested to see if some
> simplification of the do-build rule would be possible.  I think the
> most sensible thing to do is to move this from Makefile.inc into the
> per-directory Makefile.  There is a tiny bit of duplication, but I
> think the result is more manageable, especially if we add more per-SoC
> directories.
> 
> Since this doesn't change the output, no REVISION bump is needed is it?
> 
> ok?

looks good
ok jsg@

> 
> 
> Index: sysutils/u-boot/Makefile.inc
> ===
> RCS file: /cvs/ports/sysutils/u-boot/Makefile.inc,v
> retrieving revision 1.8
> diff -u -p -r1.8 Makefile.inc
> --- sysutils/u-boot/Makefile.inc  17 Oct 2023 19:36:22 -  1.8
> +++ sysutils/u-boot/Makefile.inc  19 Oct 2023 18:00:06 -
> @@ -57,82 +57,6 @@ FILES=\
>   spl/sunxi-spl.bin \
>   spl/u-boot-spl.bin
>  
> -do-build:
> -.for BOARD in ${BOARDS}
> - cd ${WRKSRC} && \
> - mkdir -p build/${BOARD} && \
> - ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
> - O="build/${BOARD}" \
> - -f ${MAKE_FILE} "${BOARD}"_defconfig
> -.if "${BOARD:M*-rk3399*}"
> - cd ${WRKSRC} && \
> - ${SETENV} ${MAKE_ENV} BL31=${RK3399_BL31} ${MAKE_PROGRAM} \
> - ${MAKE_FLAGS} O="build/${BOARD}" \
> - -f ${MAKE_FILE} ${ALL_TARGET}
> -.elif "${BOARD:M*-rk3328}"
> - cd ${WRKSRC} && \
> - ${SETENV} ${MAKE_ENV} BL31=${RK3328_BL31} ${MAKE_PROGRAM} \
> - ${MAKE_FLAGS} O="build/${BOARD}" \
> - -f ${MAKE_FILE} ${ALL_TARGET}
> -.elif "${BOARD:M*-rk3566*}"
> - cd ${WRKSRC}/build/${BOARD} && \
> - ../../scripts/config --set-val BAUDRATE 115200
> - cd ${WRKSRC} && \
> - ${SETENV} ${MAKE_ENV} ROCKCHIP_TPL=${RK3566_TPL} ${MAKE_PROGRAM} \
> - ${MAKE_FLAGS} O="build/${BOARD}" \
> - -f ${MAKE_FILE} ${ALL_TARGET}
> -.elif "${BOARD:M*-rk3568*}"
> - cd ${WRKSRC}/build/${BOARD} && \
> - ../../scripts/config --set-val BAUDRATE 115200
> - cd ${WRKSRC} && \
> - ${SETENV} ${MAKE_ENV} ROCKCHIP_TPL=${RK3568_TPL} ${MAKE_PROGRAM} \
> - ${MAKE_FLAGS} O="build/${BOARD}" \
> - -f ${MAKE_FILE} ${ALL_TARGET}
> -.elif "${BOARD:M*sifive_*}"
> - cd ${WRKSRC} && \
> - ${SETENV} ${MAKE_ENV} OPENSBI=${FW_DYNAMIC} ${MAKE_PROGRAM} \
> - ${MAKE_FLAGS} O="build/${BOARD}" \
> - -f ${MAKE_FILE} ${ALL_TARGET}
> -.else
> - cd ${WRKSRC} && \
> - ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
> - O="build/${BOARD}" \
> - -f ${MAKE_FILE} ${ALL_TARGET}
> -.endif
> -.if "${BOARD:M*-rk3288}"
> - cd ${WRKSRC}/build/${BOARD} && \
> - tools/mkimage -n rk3288 -T rksd -d tpl/u-boot-tpl.bin \
> - idbloader.img && \
> - cat spl/u-boot-spl-dtb.bin >> idbloader.img
> -.endif
> -.endfor
> -.for BOARD in ${SUNXI64}
> -.if "${BOARD:M*_h64*}"
> - cd ${WRKSRC} && \
> - mkdir -p build/${BOARD} && \
> - ${SETENV} ${MAKE_ENV} BL31=${SUNXI_H6_BL31} ${MAKE_PROGRAM} \
> - ${MAKE_FLAGS} O="build/${BOARD}" \
> - -f ${MAKE_FILE} "${BOARD}"_defconfig && \
> - ${SETENV} ${MAKE_ENV} BL31=${SUNXI_H6_BL31} ${MAKE_PROGRAM} \
> - ${MAKE_FLAGS} O="build/${BOARD}" \
> - -f ${MAKE_FILE} ${ALL_TARGET}
> -.else
> - cd ${WRKSRC} && \
> - mkdir -p build/${BOARD} && \
> - ${SETENV} ${MAKE_ENV} BL31=${SUNXI_BL31} ${MAKE_PROGRAM} \
> - ${MAKE_FLAGS} O="build/${BOARD}" \
> - -f ${MAKE_FILE} "${BOARD}"_defconfig && \
> - ${SETENV} ${MAKE_ENV} BL31=${SUNXI_BL31} ${MAKE_PROGRAM} \
> - ${MAKE_FLAGS} O="build/${BOARD}" \
> - -f ${MAKE_FILE} ${ALL_TARGET}
> -.endif
> - if [[ -f ${WRKSRC}/build/${BOARD}/spl/sunxi-spl.bin && \
> -   -f ${WRKSRC}/build/${BOARD}/u-boot.itb ]]; then \
> - cd ${WRKSRC}/build/${BOARD} && \
> - cat spl/sunxi-spl.bin u-boot.itb > 
> u-boot-sunxi-with-spl.bin ; \
> - fi
> -.endfor
> -
>  do-install:
>   ${INSTALL_DATA_DIR} ${PREFIX}/share/u-boot
>  .for BOARD in ${BOARDS} ${SUNXI64}
> Index: sysutils/u-boot/aarch64/Makefile
> ===
> RCS file: /cvs/ports/sysutils/u-boot/aarch64/Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 Makefile
> --- sysutils/u-boot/aarch64/Makefile  2 Sep 2023 14:33:03 -   1.4
> +++ sysutils/u-boot/aarch64/Makefile  19 Oct 2023 18:00:06 -
> @@ -46,4 +46,55 @@ SUNXI_H6_BL31= ${LOCALBASE}/share/arm-tr
>  
>  MODPY_ADJ_FILES= arch/arm/mach-rockchip/make_fit_atf.py
>  
> +do-build:
> +.for BOARD in ${BOARDS}
> + cd ${WRKSRC} && \
> + mkdir -p build/${BOARD} && \
> + ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM

NEW: graphics/nanosvg-20221222

2023-10-19 Thread Renato Aguiar
Here is a port of graphics/nanosvg which will be used later as 
build dependency for cad/prusaslicer 2.6.1.


nanosvg.tar.gz
Description: Binary data


pkg/DESCR:

NanoSVG is a simple stupid single-header-file SVG parse. The 
output of the

parser is a list of cubic bezier shapes.

The library suits well for anything from rendering scalable icons 
in your editor

application to prototyping a game.


--
Renato Aguiar


Re: UPDATE: sysutils/vultr-cli-2.19.0

2023-10-19 Thread Daniel Jakots
On Thu, 19 Oct 2023 13:53:17 -0400, Adriano Barbosa
 wrote:

> Hi.
> Update for sysutils/vultr-cli-2.19.0

Committed, thanks!

> Changelog: https://github.com/vultr/vultr-cli/releases/tag/v2.19.0
> - Add golangci-lint config and fix linter errors (#353)
> - Add project name back to the archive file names (#346)
> - Add summarize list options for VKE, VLB & database (#348)
> - Bump golang.org/x/oauth2 from 0.11.0 to 0.12.0 (#351)
> - Fix documentation for VPC2 command options (#350)
> - Release v2.19.0 #minor
> - Remove the useless cobra init help toggle flag (#349)
> - Remove unnecessary Go dependency from .goreleaser (#97)
> - Rework the printer output code (#355)
> - Update to go v1.21 (#347)
> 
> Obrigado!
> --
> Adriano
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/vultr-cli/Makefile,v
> retrieving revision 1.15
> diff -u -p -r1.15 Makefile
> --- Makefile  26 Aug 2023 17:26:51 -  1.15
> +++ Makefile  19 Oct 2023 17:49:23 -
> @@ -1,7 +1,7 @@
>  COMMENT =Vultr Command Line Interface
>  
>  MODGO_MODNAME =  github.com/vultr/vultr-cli/v2
> -MODGO_VERSION =  v2.18.2
> +MODGO_VERSION =  v2.19.0
>  
>  DISTNAME =   vultr-cli-${MODGO_VERSION}
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/sysutils/vultr-cli/distinfo,v
> retrieving revision 1.12
> diff -u -p -r1.12 distinfo
> --- distinfo  26 Aug 2023 17:26:51 -  1.12
> +++ distinfo  19 Oct 2023 17:49:24 -
> @@ -320,8 +320,8 @@ SHA256 (go_modules/golang.org/x/crypto/@
>  SHA256
> (go_modules/golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod)
> = srEtCfgZFfvPQiYAnlD579qL03V9IFXY7AeXfmW8Zhg= SHA256
> (go_modules/golang.org/x/crypto/@v/v0.0.0-20210421170649-83a5a9bb288b.mod)
> = 3aGNGfup9HvKgmnPSu9YDgzpksc+KqVKvyJiFrHjpyk= SHA256
> (go_modules/golang.org/x/crypto/@v/v0.0.0-20220722155217-630584e8d5aa.mod)
> = ryyI7r/wPjoq/ssbA2afxU6dEiyI97Ls/tBR7F28i7s= -SHA256
> (go_modules/golang.org/x/crypto/@v/v0.12.0.mod) =
> E5IvYZekDrnn/Aa1z1b11eQRlR8ZxZ++x7hTJHagMsY= -SHA256
> (go_modules/golang.org/x/crypto/@v/v0.12.0.zip) =
> KbeIvY8SKSFK+DG/mUEqCdGQlt6jxivDKBZWtkCT0S0= +SHA256
> (go_modules/golang.org/x/crypto/@v/v0.13.0.mod) =
> 5/Nu6cqqredrdWX8aGItzI/a9tBd3uPn1cyuSWiNn00= +SHA256
> (go_modules/golang.org/x/crypto/@v/v0.13.0.zip) =
> tY2QL0in9ZWihYm27UvoteLuGjSW7KR3A56A625+ulc= SHA256
> (go_modules/golang.org/x/crypto/@v/v0.9.0.mod) =
> nSAXdDfn8DoYKFjPQHQ6ImKD1dQRrVyFp5TiS6AiYLE= SHA256
> (go_modules/golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod)
> = n/HQfKjAlFhFDrX0B2qgOQ71x9sMepQhUOiCWKeLU4M= SHA256
> (go_modules/golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod)
> = n/HQfKjAlFhFDrX0B2qgOQ71x9sMepQhUOiCWKeLU4M= @@ -395,8 +395,8 @@
> SHA256 (go_modules/golang.org/x/net/@v/v SHA256
> (go_modules/golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod)
> = /vWJbRA6C85QVf216W6DCUQzR5JDeGU0dxjtzrYzNIo= SHA256
> (go_modules/golang.org/x/net/@v/v0.0.0-2022202133-69e39bad7dc2.mod)
> = +pFfXQIs+wy4Zaou4306d0G0BvhOtKg3hi4pzGmrTvQ= SHA256
> (go_modules/golang.org/x/net/@v/v0.10.0.mod) =
> 07fiNv8J5jIr5IkXAhbgGNMiGGLxoFPctj5T6rhTPBc= -SHA256
> (go_modules/golang.org/x/net/@v/v0.14.0.mod) =
> J5QJ9uHSLmOn4Mk3QOYvDhLmTVOnzEi6MpGYxDOCvRI= -SHA256
> (go_modules/golang.org/x/net/@v/v0.14.0.zip) =
> /dXKVlNkS2XZBicF7K5wsVZmBUf5bUYGZZlg/gwFOHE= +SHA256
> (go_modules/golang.org/x/net/@v/v0.15.0.mod) =
> PRBkbW8I2OioVtbyLyzXBsPivgES63dyY8/ROSx25LQ= +SHA256
> (go_modules/golang.org/x/net/@v/v0.15.0.zip) =
> 6JGUHwqD38hfgpkOKcvxk53KWVLQQkFmbIoifUGf3tM= SHA256
> (go_modules/golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod)
> = y7thjah9T5Q7VL/U9NOi//NhApjwT77rPbOIywdfNRo= SHA256
> (go_modules/golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod)
> = hp9E5OzVzaUxZVEKMIUVZw3X7ckgBegHnKClyGRSmys= SHA256
> (go_modules/golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod)
> = hp9E5OzVzaUxZVEKMIUVZw3X7ckgBegHnKClyGRSmys= @@ -406,8 +406,8 @@
> SHA256 (go_modules/golang.org/x/oauth2/@ SHA256
> (go_modules/golang.org/x/oauth2/@v/v0.0.0-20201109201403-9fd604954f58.mod)
> = za+QVQWwIB3g6jOqvSK/UzAXReMXoE6srZZmHhscP8o= SHA256
> (go_modules/golang.org/x/oauth2/@v/v0.0.0-20201208152858-08078c50e5b5.mod)
> = za+QVQWwIB3g6jOqvSK/UzAXReMXoE6srZZmHhscP8o= SHA256
> (go_modules/golang.org/x/oauth2/@v/v0.0.0-20210218202405-ba52d332ba99.mod)
> = za+QVQWwIB3g6jOqvSK/UzAXReMXoE6srZZmHhscP8o= -SHA256
> (go_modules/golang.org/x/oauth2/@v/v0.11.0.mod) =
> ErhfdqpriKyeB4FHaajsCzrPQDKXe6xAXgAfBk+/uYc= -SHA256
> (go_modules/golang.org/x/oauth2/@v/v0.11.0.zip) =
> Bvm8Z3drq6eK5EN0T4RsGT5o13WzM5tjB4jMoDiC3ac= +SHA256
> (go_modules/golang.org/x/oauth2/@v/v0.12.0.mod) =
> ibnrqeavGKHWIUEIHMbKbx/ffAzBS+ssth8e/beppsw= +SHA256
> (go_modules/golang.org/x/oauth2/@v/v0.12.0.zip) =
> sjpR7gIeMRjhMgGalP/sUTiiSkvUDkjj3TNeSiTql8o= SHA256
> (go_modules/golang.org/x/oauth2/@v/v0.7

Re: maintainer update. net/miniflux --> 2.0.49

2023-10-19 Thread Daniel Jakots
On Wed, 18 Oct 2023 09:36:43 +0200, Paco Esteban  wrote:

> Hi ports@,
> 
> This is an update for net/miniflux to its latest version 2.0.49
> 
> Here you can find the changelog:
> https://github.com/miniflux/v2/releases/tag/2.0.49
> 
> Builds and works for me on amd64.
> 
> Ok to commit ?

ok danj@

> diff /usr/ports
> commit - c0f1d1012a8c7385da266b3000fdaa6e9fd52073
> path + /usr/ports
> blob - ac0361511f21d9de6741ce9ba4cf41df1dbbfd13
> file + net/miniflux/Makefile
> --- net/miniflux/Makefile
> +++ net/miniflux/Makefile
> @@ -1,6 +1,6 @@
>  COMMENT =minimalist and opinionated feed reader
>  
> -V =  2.0.47
> +V =  2.0.49
>  
>  MODGO_MODNAME =  miniflux.app/v2
>  MODGO_VERSION =  v${V}
> blob - dc80c873c46d2d246576b20ecddd03acf7e40c66
> file + net/miniflux/distinfo
> --- net/miniflux/distinfo
> +++ net/miniflux/distinfo
> @@ -4,15 +4,16 @@ SHA256
> (go_modules/cloud.google.com/go/compute/metadat SHA256
> (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.3.zip) =
> KShk29Cx3jepaOKF6UmIXlczhIN9gc02lb5c4uI5GIc= SHA256
> (go_modules/github.com/!puerkito!bio/goquery/@v/v1.8.1.mod) =
> PdJrWoVK5qjme4hGGMZqgUbSeLV9376VsbWDWV5lIfo= SHA256
> (go_modules/github.com/!puerkito!bio/goquery/@v/v1.8.1.zip) =
> mHy89bC7F4vWBNfgA2iLfRttK0QgiWu3Kx+RGMxtu1c= -SHA256
> (go_modules/github.com/alecthomas/kingpin/v2/@v/v2.3.1.mod) =
> FSS1kPj2LKNeHWx/Txq1lsIYVkQ9I4Vt+4CyKDzbuZA= -SHA256
> (go_modules/github.com/alecthomas/kingpin/v2/@v/v2.3.1.zip) =
> KjImgdeUYd15PB6KmK3wYvbvVUq806sGmB7vlNecE2s= +SHA256
> (go_modules/github.com/abadojack/whatlanggo/@v/v1.0.1.mod) =
> jHniF4Hvg4kbhyMbZLrpnNEw3q3ZdMXkreYvyoea+bk= +SHA256
> (go_modules/github.com/abadojack/whatlanggo/@v/v1.0.1.zip) =
> L3RTvhuh+PD/XUbq+xVEjSXEetcS20FNdxqIiKl9uJo= +SHA256
> (go_modules/github.com/alecthomas/kingpin/v2/@v/v2.3.2.mod) =
> 17OszAg8LYhxB+e5mY0rfap993NS0WnmnW+75plfuL0= +SHA256
> (go_modules/github.com/alecthomas/kingpin/v2/@v/v2.3.2.zip) =
> jzMPNcpCm2acOXzy5rWLjNaJT7bWQ39wmZMdLRQAuQk= SHA256
> (go_modules/github.com/alecthomas/units/@v/v0.0.0-20211218093645-b94a6e3cc137.mod)
> = ftH6kO7vq7UGWGCrf2fdM/5ysTVwVCejb0515qgQBls= SHA256
> (go_modules/github.com/alecthomas/units/@v/v0.0.0-20211218093645-b94a6e3cc137.zip)
> = tiQ310pSMImvRroBFezhzhG8peMh/h4dTJduzKbueKo= SHA256
> (go_modules/github.com/andybalholm/cascadia/@v/v1.3.1.mod) =
> Nz9xoR93/QzAdAw9khO/1momaUfm/DV5vjOC9m0aFBc= SHA256
> (go_modules/github.com/andybalholm/cascadia/@v/v1.3.1.zip) =
> c15xY/d3QlTNT5atOAteqMz3AtrFOZ2+MN0DhxcsWlE= SHA256
> (go_modules/github.com/beorn7/perks/@v/v1.0.1.mod) =
> yHCz/lC2lE+rCVsGII2ciJh2PpFzyx7tMljD1YMJumY= SHA256
> (go_modules/github.com/beorn7/perks/@v/v1.0.1.zip) =
> Jb2eLZSsp3Dm28H1NyX4T2r0Qy9jHTXdLEb5bvBRLxo= -SHA256
> (go_modules/github.com/cespare/xxhash/v2/@v/v2.1.2.mod) =
> oJD46q9ZzCrfFjKZ6+/nl+Hco/at0sjoimo7kLpTiwI= SHA256
> (go_modules/github.com/cespare/xxhash/v2/@v/v2.2.0.mod) =
> oJD46q9ZzCrfFjKZ6+/nl+Hco/at0sjoimo7kLpTiwI= SHA256
> (go_modules/github.com/cespare/xxhash/v2/@v/v2.2.0.zip) =
> /BgM2wwA+/+9Obd0pyzbXwwyrOJTcNUTUZWRiow/vSU= SHA256
> (go_modules/github.com/cheekybits/is/@v/v0.0.0-20150225183255-68e9c0620927.mod)
> = wo1aGMOmDgJ++Tmy/juUYTaa7qDjgoEuKX1jE40yIGM= @@ -34,11 +35,8 @@
> SHA256 (go_modules/github.com/go-kit/log/@v/v0.2.1.mod SHA256
> (go_modules/github.com/go-kit/log/@v/v0.2.1.zip) =
> UmNLUCudCqlFgz2TWCz/wb3Zv6OYEOfHDQaI4zC3UZg= SHA256
> (go_modules/github.com/go-logfmt/logfmt/@v/v0.5.1.mod) =
> pjttroy/srYD56wCM4IMuYObhlVV3Nj7oid7j9coaaA= SHA256
> (go_modules/github.com/go-logfmt/logfmt/@v/v0.5.1.zip) =
> ngMM0JtYTlmi9bqqJM9gBSB1fXMq8PiZPMQS3TCGcDo= -SHA256
> (go_modules/github.com/go-telegram-bot-api/telegram-bot-api/@v/v4.6.4+incompatible.mod)
> = BqnGTTFLx/rYnBZvy2UMTuCVuT+YdngInFagTjxLEPA= -SHA256
> (go_modules/github.com/go-telegram-bot-api/telegram-bot-api/@v/v4.6.4+incompatible.zip)
> = oNJUngfGfgZjN8xurdi+KpYdE7ST1DJWAwENTjXlGd8= SHA256
> (go_modules/github.com/golang/protobuf/@v/v1.2.0.mod) =
> wKIDG/J3CHdJ2MzEMkSfaxN1eH6shkHdL5MAdCMar7Q= SHA256
> (go_modules/github.com/golang/protobuf/@v/v1.3.1.mod) =
> wKIDG/J3CHdJ2MzEMkSfaxN1eH6shkHdL5MAdCMar7Q= -SHA256
> (go_modules/github.com/golang/protobuf/@v/v1.3.5.mod) =
> s6wk4gSR2Eb+rulQiL3gkmzl4kU4UCUPUkdEFuZhKUQ= SHA256
> (go_modules/github.com/golang/protobuf/@v/v1.5.0.mod) =
> c4y7HelrZ6YjisO4CBzYsb+w2uvPbJu+jL221zuuzRk= SHA256
> (go_modules/github.com/golang/protobuf/@v/v1.5.2.mod) =
> fI52EFJ6/Xckx+i36EPxMrDbYejJ3UncWJ1DDokpvMQ= SHA256
> (go_modules/github.com/golang/protobuf/@v/v1.5.3.mod) =
> fI52EFJ6/Xckx+i36EPxMrDbYejJ3UncWJ1DDokpvMQ= @@ -59,14 +57,12 @@
> SHA256 (go_modules/github.com/kr/pretty/@v/v0.3.1.mod) SHA256
> (go_modules/github.com/kr/pretty/@v/v0.3.1.zip) =
> 7PWkrySCbDrXWM4GQQygji1Y5NlQU747nd4uFIUsDNw= SHA256
> (go_modules/github.com/lib/pq/@v/v1.10.9.mod) =
> lMFIhoiyuYIqluE3XjIAKmUswa7nFSD2v6h77I63nAY= SHA256
> (go_modules/github.com/lib/pq/@v/v1.10.9.zip) =
> Z5Gnr2f4RqhjNTUAEsTvrdCFAJbr8iNQt7IOAeIW5vI= -SHA256

Clean up sysutils/u-boot a bit

2023-10-19 Thread Mark Kettenis
Back when I split up the port, Stuart suggested to see if some
simplification of the do-build rule would be possible.  I think the
most sensible thing to do is to move this from Makefile.inc into the
per-directory Makefile.  There is a tiny bit of duplication, but I
think the result is more manageable, especially if we add more per-SoC
directories.

Since this doesn't change the output, no REVISION bump is needed is it?

ok?


Index: sysutils/u-boot/Makefile.inc
===
RCS file: /cvs/ports/sysutils/u-boot/Makefile.inc,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile.inc
--- sysutils/u-boot/Makefile.inc17 Oct 2023 19:36:22 -  1.8
+++ sysutils/u-boot/Makefile.inc19 Oct 2023 18:00:06 -
@@ -57,82 +57,6 @@ FILES=\
spl/sunxi-spl.bin \
spl/u-boot-spl.bin
 
-do-build:
-.for BOARD in ${BOARDS}
-   cd ${WRKSRC} && \
-   mkdir -p build/${BOARD} && \
-   ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
-   O="build/${BOARD}" \
-   -f ${MAKE_FILE} "${BOARD}"_defconfig
-.if "${BOARD:M*-rk3399*}"
-   cd ${WRKSRC} && \
-   ${SETENV} ${MAKE_ENV} BL31=${RK3399_BL31} ${MAKE_PROGRAM} \
-   ${MAKE_FLAGS} O="build/${BOARD}" \
-   -f ${MAKE_FILE} ${ALL_TARGET}
-.elif "${BOARD:M*-rk3328}"
-   cd ${WRKSRC} && \
-   ${SETENV} ${MAKE_ENV} BL31=${RK3328_BL31} ${MAKE_PROGRAM} \
-   ${MAKE_FLAGS} O="build/${BOARD}" \
-   -f ${MAKE_FILE} ${ALL_TARGET}
-.elif "${BOARD:M*-rk3566*}"
-   cd ${WRKSRC}/build/${BOARD} && \
-   ../../scripts/config --set-val BAUDRATE 115200
-   cd ${WRKSRC} && \
-   ${SETENV} ${MAKE_ENV} ROCKCHIP_TPL=${RK3566_TPL} ${MAKE_PROGRAM} \
-   ${MAKE_FLAGS} O="build/${BOARD}" \
-   -f ${MAKE_FILE} ${ALL_TARGET}
-.elif "${BOARD:M*-rk3568*}"
-   cd ${WRKSRC}/build/${BOARD} && \
-   ../../scripts/config --set-val BAUDRATE 115200
-   cd ${WRKSRC} && \
-   ${SETENV} ${MAKE_ENV} ROCKCHIP_TPL=${RK3568_TPL} ${MAKE_PROGRAM} \
-   ${MAKE_FLAGS} O="build/${BOARD}" \
-   -f ${MAKE_FILE} ${ALL_TARGET}
-.elif "${BOARD:M*sifive_*}"
-   cd ${WRKSRC} && \
-   ${SETENV} ${MAKE_ENV} OPENSBI=${FW_DYNAMIC} ${MAKE_PROGRAM} \
-   ${MAKE_FLAGS} O="build/${BOARD}" \
-   -f ${MAKE_FILE} ${ALL_TARGET}
-.else
-   cd ${WRKSRC} && \
-   ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
-   O="build/${BOARD}" \
-   -f ${MAKE_FILE} ${ALL_TARGET}
-.endif
-.if "${BOARD:M*-rk3288}"
-   cd ${WRKSRC}/build/${BOARD} && \
-   tools/mkimage -n rk3288 -T rksd -d tpl/u-boot-tpl.bin \
-   idbloader.img && \
-   cat spl/u-boot-spl-dtb.bin >> idbloader.img
-.endif
-.endfor
-.for BOARD in ${SUNXI64}
-.if "${BOARD:M*_h64*}"
-   cd ${WRKSRC} && \
-   mkdir -p build/${BOARD} && \
-   ${SETENV} ${MAKE_ENV} BL31=${SUNXI_H6_BL31} ${MAKE_PROGRAM} \
-   ${MAKE_FLAGS} O="build/${BOARD}" \
-   -f ${MAKE_FILE} "${BOARD}"_defconfig && \
-   ${SETENV} ${MAKE_ENV} BL31=${SUNXI_H6_BL31} ${MAKE_PROGRAM} \
-   ${MAKE_FLAGS} O="build/${BOARD}" \
-   -f ${MAKE_FILE} ${ALL_TARGET}
-.else
-   cd ${WRKSRC} && \
-   mkdir -p build/${BOARD} && \
-   ${SETENV} ${MAKE_ENV} BL31=${SUNXI_BL31} ${MAKE_PROGRAM} \
-   ${MAKE_FLAGS} O="build/${BOARD}" \
-   -f ${MAKE_FILE} "${BOARD}"_defconfig && \
-   ${SETENV} ${MAKE_ENV} BL31=${SUNXI_BL31} ${MAKE_PROGRAM} \
-   ${MAKE_FLAGS} O="build/${BOARD}" \
-   -f ${MAKE_FILE} ${ALL_TARGET}
-.endif
-   if [[ -f ${WRKSRC}/build/${BOARD}/spl/sunxi-spl.bin && \
- -f ${WRKSRC}/build/${BOARD}/u-boot.itb ]]; then \
-   cd ${WRKSRC}/build/${BOARD} && \
-   cat spl/sunxi-spl.bin u-boot.itb > 
u-boot-sunxi-with-spl.bin ; \
-   fi
-.endfor
-
 do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/u-boot
 .for BOARD in ${BOARDS} ${SUNXI64}
Index: sysutils/u-boot/aarch64/Makefile
===
RCS file: /cvs/ports/sysutils/u-boot/aarch64/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- sysutils/u-boot/aarch64/Makefile2 Sep 2023 14:33:03 -   1.4
+++ sysutils/u-boot/aarch64/Makefile19 Oct 2023 18:00:06 -
@@ -46,4 +46,55 @@ SUNXI_H6_BL31=   ${LOCALBASE}/share/arm-tr
 
 MODPY_ADJ_FILES= arch/arm/mach-rockchip/make_fit_atf.py
 
+do-build:
+.for BOARD in ${BOARDS}
+   cd ${WRKSRC} && \
+   mkdir -p build/${BOARD} && \
+   ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
+   O="build/${BOARD}" \
+   -f ${MAKE_FILE} "${BOARD}"_defconfig
+.if "${BOARD:M*-rk3399*}"
+   cd ${WRKSRC} && \
+   ${SETENV} $

UPDATE: sysutils/vultr-cli-2.19.0

2023-10-19 Thread Adriano Barbosa
Hi.
Update for sysutils/vultr-cli-2.19.0

Changelog: https://github.com/vultr/vultr-cli/releases/tag/v2.19.0
- Add golangci-lint config and fix linter errors (#353)
- Add project name back to the archive file names (#346)
- Add summarize list options for VKE, VLB & database (#348)
- Bump golang.org/x/oauth2 from 0.11.0 to 0.12.0 (#351)
- Fix documentation for VPC2 command options (#350)
- Release v2.19.0 #minor
- Remove the useless cobra init help toggle flag (#349)
- Remove unnecessary Go dependency from .goreleaser (#97)
- Rework the printer output code (#355)
- Update to go v1.21 (#347)

Obrigado!
--
Adriano


Index: Makefile
===
RCS file: /cvs/ports/sysutils/vultr-cli/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile26 Aug 2023 17:26:51 -  1.15
+++ Makefile19 Oct 2023 17:49:23 -
@@ -1,7 +1,7 @@
 COMMENT =  Vultr Command Line Interface
 
 MODGO_MODNAME =github.com/vultr/vultr-cli/v2
-MODGO_VERSION =v2.18.2
+MODGO_VERSION =v2.19.0
 
 DISTNAME = vultr-cli-${MODGO_VERSION}
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/vultr-cli/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo26 Aug 2023 17:26:51 -  1.12
+++ distinfo19 Oct 2023 17:49:24 -
@@ -320,8 +320,8 @@ SHA256 (go_modules/golang.org/x/crypto/@
 SHA256 
(go_modules/golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod) = 
srEtCfgZFfvPQiYAnlD579qL03V9IFXY7AeXfmW8Zhg=
 SHA256 
(go_modules/golang.org/x/crypto/@v/v0.0.0-20210421170649-83a5a9bb288b.mod) = 
3aGNGfup9HvKgmnPSu9YDgzpksc+KqVKvyJiFrHjpyk=
 SHA256 
(go_modules/golang.org/x/crypto/@v/v0.0.0-20220722155217-630584e8d5aa.mod) = 
ryyI7r/wPjoq/ssbA2afxU6dEiyI97Ls/tBR7F28i7s=
-SHA256 (go_modules/golang.org/x/crypto/@v/v0.12.0.mod) = 
E5IvYZekDrnn/Aa1z1b11eQRlR8ZxZ++x7hTJHagMsY=
-SHA256 (go_modules/golang.org/x/crypto/@v/v0.12.0.zip) = 
KbeIvY8SKSFK+DG/mUEqCdGQlt6jxivDKBZWtkCT0S0=
+SHA256 (go_modules/golang.org/x/crypto/@v/v0.13.0.mod) = 
5/Nu6cqqredrdWX8aGItzI/a9tBd3uPn1cyuSWiNn00=
+SHA256 (go_modules/golang.org/x/crypto/@v/v0.13.0.zip) = 
tY2QL0in9ZWihYm27UvoteLuGjSW7KR3A56A625+ulc=
 SHA256 (go_modules/golang.org/x/crypto/@v/v0.9.0.mod) = 
nSAXdDfn8DoYKFjPQHQ6ImKD1dQRrVyFp5TiS6AiYLE=
 SHA256 (go_modules/golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod) 
= n/HQfKjAlFhFDrX0B2qgOQ71x9sMepQhUOiCWKeLU4M=
 SHA256 (go_modules/golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod) 
= n/HQfKjAlFhFDrX0B2qgOQ71x9sMepQhUOiCWKeLU4M=
@@ -395,8 +395,8 @@ SHA256 (go_modules/golang.org/x/net/@v/v
 SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod) 
= /vWJbRA6C85QVf216W6DCUQzR5JDeGU0dxjtzrYzNIo=
 SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-2022202133-69e39bad7dc2.mod) 
= +pFfXQIs+wy4Zaou4306d0G0BvhOtKg3hi4pzGmrTvQ=
 SHA256 (go_modules/golang.org/x/net/@v/v0.10.0.mod) = 
07fiNv8J5jIr5IkXAhbgGNMiGGLxoFPctj5T6rhTPBc=
-SHA256 (go_modules/golang.org/x/net/@v/v0.14.0.mod) = 
J5QJ9uHSLmOn4Mk3QOYvDhLmTVOnzEi6MpGYxDOCvRI=
-SHA256 (go_modules/golang.org/x/net/@v/v0.14.0.zip) = 
/dXKVlNkS2XZBicF7K5wsVZmBUf5bUYGZZlg/gwFOHE=
+SHA256 (go_modules/golang.org/x/net/@v/v0.15.0.mod) = 
PRBkbW8I2OioVtbyLyzXBsPivgES63dyY8/ROSx25LQ=
+SHA256 (go_modules/golang.org/x/net/@v/v0.15.0.zip) = 
6JGUHwqD38hfgpkOKcvxk53KWVLQQkFmbIoifUGf3tM=
 SHA256 
(go_modules/golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod) = 
y7thjah9T5Q7VL/U9NOi//NhApjwT77rPbOIywdfNRo=
 SHA256 
(go_modules/golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod) = 
hp9E5OzVzaUxZVEKMIUVZw3X7ckgBegHnKClyGRSmys=
 SHA256 
(go_modules/golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod) = 
hp9E5OzVzaUxZVEKMIUVZw3X7ckgBegHnKClyGRSmys=
@@ -406,8 +406,8 @@ SHA256 (go_modules/golang.org/x/oauth2/@
 SHA256 
(go_modules/golang.org/x/oauth2/@v/v0.0.0-20201109201403-9fd604954f58.mod) = 
za+QVQWwIB3g6jOqvSK/UzAXReMXoE6srZZmHhscP8o=
 SHA256 
(go_modules/golang.org/x/oauth2/@v/v0.0.0-20201208152858-08078c50e5b5.mod) = 
za+QVQWwIB3g6jOqvSK/UzAXReMXoE6srZZmHhscP8o=
 SHA256 
(go_modules/golang.org/x/oauth2/@v/v0.0.0-20210218202405-ba52d332ba99.mod) = 
za+QVQWwIB3g6jOqvSK/UzAXReMXoE6srZZmHhscP8o=
-SHA256 (go_modules/golang.org/x/oauth2/@v/v0.11.0.mod) = 
ErhfdqpriKyeB4FHaajsCzrPQDKXe6xAXgAfBk+/uYc=
-SHA256 (go_modules/golang.org/x/oauth2/@v/v0.11.0.zip) = 
Bvm8Z3drq6eK5EN0T4RsGT5o13WzM5tjB4jMoDiC3ac=
+SHA256 (go_modules/golang.org/x/oauth2/@v/v0.12.0.mod) = 
ibnrqeavGKHWIUEIHMbKbx/ffAzBS+ssth8e/beppsw=
+SHA256 (go_modules/golang.org/x/oauth2/@v/v0.12.0.zip) = 
sjpR7gIeMRjhMgGalP/sUTiiSkvUDkjj3TNeSiTql8o=
 SHA256 (go_modules/golang.org/x/oauth2/@v/v0.7.0.mod) = 
2hj9v9bSpoSmI3MfXqI+PpFFlQVTaBRZdjZZHydjFb4=
 SHA256 
(go_modules/golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod) = 
Qh9hOWhtWJHz3FpWPQmVeA0yefZcrU0iXOpSaGeUFhw=
 SHA256 
(go_modules/golang.

Re: [UPDATE] Enable erlang26 flavors in erlang.port.mk

2023-10-19 Thread Volker Schlecht
I'd like to pick up on the patches to erlang.port.mk I proposed a while
ago to handle erlang flavours in the same way as lua and ruby do.

At this point, the main motivation is to be able to install rebar3 for both
versions of erlang simultaneously, mainly for my personal entertainment, but
also because it's going to make eventually moving all the erlang ports to
26.x a lot easier :-)

This has been working for quite a while for me now ... Feedback? ok?

On Mon Sep 18, 2023 at 6:52 PM CEST, Volker Schlecht wrote:
[...]
> On 9/5/23 15:02, Volker Schlecht wrote:
[...]
> > On Sat Jul 1, 2023 at 5:02 PM CEST, Volker Schlecht wrote:
[...]
Index: erlang.port.mk
===
RCS file: /cvs/ports/lang/erlang/erlang.port.mk,v
retrieving revision 1.36
diff -u -p -r1.36 erlang.port.mk
--- erlang.port.mk	27 Sep 2023 21:41:16 -	1.36
+++ erlang.port.mk	19 Oct 2023 17:30:09 -
@@ -5,29 +5,63 @@ CATEGORIES +=		lang/erlang
 USE_GMAKE ?=		Yes
 
 # Default Erlang version to use if MODERL_VERSION is not set.
-# XXX: Keep in sync with devel/rebar3/Makefile
-MODERL_DEFAULT_VERSION =25
+_MODERL_DEFAULT_VERSION =	25
 
-# If the port already has flavors, append ours to it unless the port requires
-# a specific version of Erlang.
-.if !defined(MODERL_VERSION) && !defined(FLAVORS)
-FLAVORS ?=		erlang25
-.else
-FLAVORS +=		erlang25
-.endif
+# Default Erlang flavor to use if MODERL_VERSION is not set,
+# and MODERL_HANDLE_FLAVORS is set.
+_MODERL_DEFAULT_FLAVOR =	erlang${_MODERL_DEFAULT_VERSION}
+
+# Whether the erlang module should automatically add FLAVORs.
+MODERL_HANDLE_FLAVORS ?=	No
 
-FLAVOR?=		# empty
+# This permits adding FLAVORS automatically, unless FLAVORS are
+# already defined or the port defines MODERL_VERSION to tie the port
+# to a specific erlang version.
+.if !defined(MODERL_VERSION)
+.  if ${MODERL_HANDLE_FLAVORS:L:Myes}
 
-# When no flavor is explicitly set, assume MODERL_DEFAULT_VERSION
-MODERL_VERSION ?=	${MODERL_DEFAULT_VERSION}
-_MODERL_FLAVOR ?=	# empty
+# If erlang.port.mk should handle FLAVORS, define a separate FLAVOR
+# for each erlang runtime
+.if !defined(FLAVORS)
+FLAVORS =	erlang25 erlang26
+.endif
+
+FULLPKGNAME ?=	${MODERL_PKG_PREFIX}-${PKGNAME}
+
+FLAVOR ?=
+.if empty(FLAVOR)
+FLAVOR =	${MODERL_DEFAULT_FLAVOR}
+.endif
+.  endif
+.endif
 
-.if ${MODERL_VERSION} == 25
+MODERL_PKG_PREFIX =	erl${MODERL_VERSION}
+
+.if defined(MODERL_VERSION)
+.  if ${MODERL_VERSION} == 25
 _MODERL_FLAVOR =	erlang25
-.else
+.  elif ${MODERL_VERSION} == 26
+_MODERL_FLAVOR =	erlang26
+.  else
 ERRORS +=		"Invalid MODERL_VERSION set: ${MODERL_VERSION}."
+.  endif
+.else
+# When only flavour is set, derive version
+.  if !empty(FLAVOR)
+.if ${FLAVOR} == erlang25
+MODERL_VERSION ?=	25
+_MODERL_FLAVOR ?=	erlang25
+.elif ${FLAVOR} == erlang26
+MODERL_VERSION ?=	26
+_MODERL_FLAVOR ?=	erlang26
+.endif
+.  endif
 .endif
 
+# Fall back to default
+MODERL_VERSION ?=	${_MODERL_DEFAULT_VERSION}
+_MODERL_FLAVOR ?=	${_MODERL_DEFAULT_FLAVOR}
+
 # If no configure style is set, then assume "rebar3"
 .if ${CONFIGURE_STYLE} == ""
 CONFIGURE_STYLE =	rebar3
@@ -54,6 +88,7 @@ _MODERL_RDEPS +=	${r},${_MODERL_FLAVOR}
 _MODERL_TDEPS +=	${t},${_MODERL_FLAVOR}
 .endfor
 
+
 MODERL_BUILDDEP ?=	Yes
 MODERL_RUNDEP ?=	Yes
 
@@ -94,6 +129,7 @@ MODERL_ERLC =		${LOCALBASE}/bin/erlc${MO
 _MODERL_LINKS +=	erl${MODERL_VERSION} erl \
 			erlc${MODERL_VERSION} erlc \
 			erl_call${MODERL_VERSION} erl_call \
+			epmd${MODERL_VERSION} epmd \
 			escript${MODERL_VERSION} escript
 
 .if !empty(_MODERL_LINKS)
Index: Makefile
===
RCS file: /cvs/ports/lang/lfe/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile	25 Aug 2023 17:42:45 -	1.2
+++ Makefile	19 Oct 2023 17:28:57 -
@@ -3,6 +3,7 @@ COMMENT =		Lisp Flavoured Erlang (LFE)
 GH_ACCOUNT =		lfe
 GH_PROJECT =		lfe
 GH_TAGNAME =		2.1.2
+REVISION = 		0
 
 CATEGORIES =		lang
 
Index: Makefile
===
RCS file: /cvs/ports/devel/rebar3/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile	21 Sep 2023 09:50:04 -	1.13
+++ Makefile	19 Oct 2023 17:44:52 -
@@ -10,34 +10,14 @@ MAINTAINER =		Volker Schlecht https://repo.hex.pm/tarballs/
-
-.if ${FLAVOR:Merlang25} || ${FLAVOR:Merlang26}
-_EV =   ${FLAVOR:C/.*([0-9][0-9]+\$)/\1/}
-RUN_DEPENDS =   lang/erlang/${_EV}
-ERL_VERSION =   ${_EV}
-.else
-ERRORS +=   "Invalid FLAVOR set: ${FLAVOR}"
-.endif
-
-EXTRACT_ONLY =		rebar3-${GH_TAGNAME}.tar.gz
+MODULES =		lang/erlang
 
 # for tests
-HEX_MODULES += \
-	meck			0.8.13
+MODERL_MODULES += 	meck	0.8.13
+MODERL_HANDLE_FLAVORS=	Yes
+CONFIGURE_STYLE =	None
 
 DISTFILES =		rebar3-{}${GH_TAGNAME}.tar.gz
-.for _m _v in ${HEX_MODULES}
-DISTFILES.mod += ${_m}-${_v}.tar
-.endfor
-
-BUILD_DEPENDS += 	${RUN_DEPENDS}
-
-SUBST_VARS = 		E

Re: [new] textproc/urlscan 1.0.1 - a better urlview replacement

2023-10-19 Thread Stefan Hagen
Stuart Henderson wrote (2023-10-18 15:10 CEST):
> On 2023/10/18 14:14, Stefan Hagen wrote:
> > Hi all,
> > 
> > attached is a new port, which is bascially urlview, but better.
> > 
> 
> MODPY_PYBUILD = hatchling
> 
> BUILD_DEPENDS = devel/py-hatchling${MODPY_FLAVOR} \
>   devel/py-hatch-vcs${MODPY_FLAVOR}
> 
> please replace the above MODPY_PYBUILD + BUILD_DEPENDS lines with
> 
> MODPY_PYBUILD = hatch-vcs
> 
> > Most notably, it shows context parts from the email, so it's easier to
> > know which link belongs to which reference text.
> > 
> > cat pkg/DESCR:
> > Urlscan is a small program that is designed to integrate with the
> > "mutt" mailreader to allow you to easily launch a Web browser for URLs
> > contained in email messages. It is a replacement for the "urlview"
> > program.
> 
> When I test, it lists the collected URLs and allows me to select.
> When I press enter on one of these, it then opens in links (as
> identified by pstree) but the screen doesn't change from urlscan's
> display. The only way to exit seems to be blindly typing commands
> from the browser, or ^C.

You're right. I could not make it work this way either. I assume it
has been built with graphical browsers in mind.

Starting it in a new terminal works: urlscan --run "xterm -e lynx"

Updated port attached. One more OK for import?

- Stefan


urlscan.tgz
Description: application/tar-gz


sparc64 bulk build report

2023-10-19 Thread kmos
Bulk build on sparc64-0a.ports.openbsd.org

Started : Mon Oct 16 22:21:27 MDT 2023
Finished: Thu Oct 19 10:15:21 MDT 2023
Duration: 2 Days 11 hours 54 minutes

Built using OpenBSD 7.4-current (GENERIC.MP) #1902: Sun Oct 15 14:17:23 MDT 2023

Built 9448 packages

Number of packages built each day:
Oct 16: 3288
Oct 17: 4071
Oct 18: 2068
Oct 19: 21



Critical path missing pkgs:
http://build-failures.rhaalovely.net/sparc64/2023-10-16/summary.log

Build failures: 63
http://build-failures.rhaalovely.net/sparc64/2023-10-16/astro/calcmysky.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/audio/libcanberra.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/audio/libsmackerdec.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/audio/ncmpc.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/cad/dxf2gcode.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/comms/gnuradio.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/databases/leveldb.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/databases/ruby-amalgalite,ruby31.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/devel/appstream.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/devel/avr/gcc.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/devel/difftastic.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/devel/jdk/1.8.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/devel/kf5/kcompletion.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/devel/kf5/kunitconversion.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/devel/mtxclient.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/devel/py-sh,python3.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/devel/py-thrift,python3.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/devel/qcoro.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/devel/vim-command-t.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/devel/xsd.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/devel/yder.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/games/cataclysm-dda,no_x11.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/games/choria.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/games/fheroes2.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/games/gnukem.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/games/scid.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/games/xmoto.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/graphics/asymptote.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/graphics/glslang.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/graphics/kdiagram.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/graphics/makehuman.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/graphics/nomacs.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/graphics/rawstudio.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/graphics/ruby-rmagick,ruby31.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/graphics/spirv-tools.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/graphics/tesseract/tesseract.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/inputmethods/ibus.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/inputmethods/libime.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/mail/mu.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/mail/rspamd,hyperscan.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/math/R.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/math/gunits.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/math/openfst.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/misc/feathernotes.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/security/clamav.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/shells/nsh,static.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/sysutils/firmware/apple-boot.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/sysutils/u-boot-asahi.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/telephony/baresip/baresip,-gtk.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/textproc/libmarisa,,-main.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/textproc/redland-bindings,-main.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/textproc/xxdiff.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/www/webkitgtk4.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/x11/gnome/gjs.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/x11/grantlee-qt5.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/x11/gromit-mpx.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/x11/kde-applications/kde-dev-scripts.log
http://build-failures.rhaalovely.net/sparc64/2023-10-16/x11/

comms/hylafax now marked as BROKEN

2023-10-19 Thread Landry Breuil
Le Thu, Oct 19, 2023 at 04:42:55PM +0200, Theo Buehler a écrit :
> On Thu, Oct 12, 2023 at 05:48:08PM +0200, Landry Breuil wrote:
> > hi,
> > 
> > here's an update for
> > https://gitlab.com/libtiff/libtiff/-/releases/v4.6.0 which might break
> > things that rely at runtime on now-removed binaries. no change in
> > library symbols but i havent checked much the API itself. switch to
> > cmake while here..
> > 
> > a bulk would be welcome :)
> 
> bulk completed with comms/hylafax being the only victim. As discussed
> elsewhere, I don't think it's appropriate to enable unsupported and not
> recommended binaries for this piece of abandonware.
> 
> The public code changes are very minor, so definitely no need for a bump.
> 
> ok to commit and mark hylafax broken.

this is now commited, if anyone was using comms/hylafax, please speak up
and do the work to update to the hylafax plus fork, make it work with
tiff 4.6, otherwise it'll soon get removed and wont be in 7.5 as it is.

Landry



Re: [update] graphics/tiff 4.6.0 and switch to cmake

2023-10-19 Thread Theo Buehler
On Thu, Oct 12, 2023 at 05:48:08PM +0200, Landry Breuil wrote:
> hi,
> 
> here's an update for
> https://gitlab.com/libtiff/libtiff/-/releases/v4.6.0 which might break
> things that rely at runtime on now-removed binaries. no change in
> library symbols but i havent checked much the API itself. switch to
> cmake while here..
> 
> a bulk would be welcome :)

bulk completed with comms/hylafax being the only victim. As discussed
elsewhere, I don't think it's appropriate to enable unsupported and not
recommended binaries for this piece of abandonware.

The public code changes are very minor, so definitely no need for a bump.

ok to commit and mark hylafax broken.



Re: Support for TLS 1.0 in recent wpa_supplicant builds

2023-10-19 Thread Stuart Henderson
On 2023/10/08 20:49, haywirrr wrote:
> Hi Stuart,
> 
> I was able to get wpa_supplicant working with OpenSSL 3.0/3.1 after
> applying the following 5 patches:

I've added the openssl flavour to wpa_supplicant in -current ports
and included your patches (I tracked down the original commits and
added proper references in the patches).



[new] cad/opencascade

2023-10-19 Thread Johannes Thyssen Tishman
Please find attached a port for opencascade (occt) intended for the
replacement of the outdated and unmaintained[1] cad/oce in
cad/{kicad,prusaslicer} (and for a future FreeCAD port). For context,
oce is a community driven fork of the Open CASCADE library (occt)
which is also why the ports share a lot in common (many bits were
taken from cad/oce). The replacement is very straightforward and
almost drop-in (see kicad.diff and prusaslicer.diff). With this
change I also suggest the removal of cad/oce as it conflicts with
cad/opencascade and it would no longer make sense to keep it.

Tested both consumers which seem to work great. However more testing
would be appreciated.

I've cc's Renato (maintainer of prusaslicer) and ian@ as he worked
on the wip port as well.

ian@: You were listed as the MAINTAINER of this port in the wip
version[2], but since I'm making this submission without your
consent, I've taken it over. Please let me know if you want it back
or if you'd like to co-maintain it together.

Feedback, OKs?

Kind regards,
Johannes

[1] https://github.com/tpaviot/oce/issues/745
[2] https://github.com/jasperla/openbsd-wip/tree/master/cad/opencascade



opencascade-7.7.2.tar.gz
Description: GNU Zip compressed data
Index: Makefile
===
RCS file: /cvs/ports/cad/kicad/Makefile,v
retrieving revision 1.64
diff -u -p -r1.64 Makefile
--- Makefile19 Sep 2023 15:16:35 -  1.64
+++ Makefile19 Oct 2023 06:49:38 -
@@ -9,7 +9,7 @@ V = 6.0.11
 COMMENT =  schematic and PCB editing software
 DISTNAME = kicad-${V}
 EPOCH =0
-REVISION = 1
+REVISION = 2
 
 SHARED_LIBS += kicad_3dsg1.0 # 2.0
 
@@ -60,7 +60,7 @@ RUN_DEPENDS = cad/kicad-share/footprint
x11/gtk+4,-guic
 
 LIB_DEPENDS =  cad/ngspice/libngspice \
-   cad/oce \
+   cad/opencascade \
graphics/cairo \
net/curl \
x11/wxWidgets
Index: Makefile
===
RCS file: /cvs/ports/cad/prusaslicer/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile19 Sep 2023 20:09:06 -  1.2
+++ Makefile19 Oct 2023 07:38:47 -
@@ -1,7 +1,7 @@
 COMMENT =  g-code generator for 3D printers
 
 V =2.5.2
-REVISION = 0
+REVISION = 1
 PKGNAME =  prusaslicer-${V}
 
 GH_ACCOUNT =   prusa3d
@@ -21,15 +21,16 @@ WANTLIB += ${COMPILER_LIBCXX} CGAL GL GL
 WANTLIB += TKG2d TKG3d TKGeomAlgo TKGeomBase TKHLR TKLCAF TKMath
 WANTLIB += TKMesh TKPrim TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase
 WANTLIB += TKService TKShHealing TKTopAlgo TKV3d TKVCAF TKXCAF
-WANTLIB += TKXDESTEP TKXSBase TKernel atk-1.0 boost_atomic-mt
+WANTLIB += TKXDE TKXDESTEP TKXSBase TKernel X11 atk-1.0 boost_atomic-mt
 WANTLIB += boost_chrono-mt boost_date_time-mt boost_filesystem-mt
 WANTLIB += boost_iostreams-mt boost_locale-mt boost_log-mt boost_log_setup-mt
 WANTLIB += boost_regex-mt boost_system-mt boost_thread-mt c cairo
-WANTLIB += cairo-gobject curl dbus-1 expat gdk-3 gdk_pixbuf-2.0
-WANTLIB += gio-2.0 glib-2.0 gmp gobject-2.0 gtk-3 harfbuzz hidapi-libusb
-WANTLIB += intl jpeg m mpfr nlopt openvdb pango-1.0 pangocairo-1.0
-WANTLIB += png qhull_r tbb tiff wx_baseu-3.2 wx_gtk3u_core-3.2
-WANTLIB += wx_gtk3u_gl-3.2 wx_gtk3u_html-3.2 z
+WANTLIB += cairo-gobject curl dbus-1 execinfo expat fontconfig
+WANTLIB += freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmp
+WANTLIB += gobject-2.0 gtk-3 harfbuzz hidapi-libusb intl jpeg
+WANTLIB += m mpfr nlopt openvdb pango-1.0 pangocairo-1.0 png qhull_r
+WANTLIB += tbb tiff wx_baseu-3.2 wx_gtk3u_core-3.2 wx_gtk3u_gl-3.2
+WANTLIB += wx_gtk3u_html-3.2 z
 
 COMPILER = base-clang ports-gcc
 
@@ -45,8 +46,7 @@ BUILD_DEPENDS =   devel/cereal \
devel/gmp,-cxx \
math/eigen3
 
-LIB_DEPENDS =  archivers/blosc \
-   cad/oce \
+LIB_DEPENDS =  cad/opencascade \
comms/libhidapi \
devel/gmp \
devel/tbb \
Index: patches/patch-src_occt_wrapper_CMakeLists_txt
===
RCS file: 
/cvs/ports/cad/prusaslicer/patches/patch-src_occt_wrapper_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-src_occt_wrapper_CMakeLists_txt
--- patches/patch-src_occt_wrapper_CMakeLists_txt   12 Sep 2023 00:46:55 
-  1.1.1.1
+++ patches/patch-src_occt_wrapper_CMakeLists_txt   19 Oct 2023 07:38:47 
-
@@ -1,7 +1,7 @@
 Index: src/occt_wrapper/CMakeLists.txt
 --- src/occt_wrapper/CMakeLists.txt.orig
 +++ src/occt_wrapper/CMakeLists.txt
-@@ -19,9 +19,10 @@ include(GenerateExportHeader)
+@@ -19,9 +19,11 @@ incl

Re: new net/go-sendxmpp

2023-10-19 Thread Paco Esteban
On Thu, 12 Oct 2023, Solène Rapenne wrote:

> On Sun, 2023-09-24 at 15:12 +0200, Solene Rapenne wrote:
> > this program is meant to replace net/sendxmpp which is unmaintained
> > and
> > broken for most users (one person reported it worked for them but
> > would
> > be happy to switch to something maintained)
> > 
> > it's just a command line tool that takes a message in parameter or on
> > stdin and send it to XMPP contacts/MUC. It's working well and
> > maintained
> > 
> > ok to import?
> > 
> > Once done, I'll ask to remove net/sendxmpp and add a quirk entry to
> > automatically upgrade net/sendxmpp to net/go-sendxmpp, and add a FAQ
> > entry about this change because the configuration file format changed.
> 
> ping :)
> 

Works fine for me on amd64.
I think you can remove the PKGNAME line from the Makefile, as default
for go ports is:
PKGNAME  = ${DISTNAME:S/-v/-/}

Other than that, ok paco

Also ok to remove net/sendxmpp, but I guess you should contact pea@

-- 
Paco Esteban.
0x5818130B8A6DBC03