Re: update: graphics/gnofract4d

2021-12-30 Thread Stuart Henderson
On 2021/12/29 21:04, Josh Grosse wrote:
> Attached is a "v3" diff, because:
> 
> On Wed, Dec 29, 2021 at 08:54:23PM -0500, Josh Grosse wrote:
> 
> > > Removing py-gtk2 without a replacement rings alarm bells. Checking
> > > the requirements list on https://github.com/fract4d/gnofract4d
> > > it's going to want at least RDEP on py-gobject3 and py-cairo (with
> > > ${MODPY_FLAVOR}) and gtk+3 and BDEP on glib2 for glib-compile-resources.
> 
> gtk+3,-guic is already an RDEP.  glib2 added as a BDEP.

gtk+3,-guic (gtk-update-icon-cache) is not gtk+3

> + devel/py-gobject3,${MODPY_FLAVOR} \
> + graphics/py-cairo,${MODPY_FLAVOR}

no , before MODPY_FLAVOR

I'll fix and commit



Re: [NEW] misc/jrnlc

2021-12-30 Thread Matthias Schmidt
Hi Stuart,

* Stuart Henderson wrote:
> On 2021/12/29 18:11, Matthias Schmidt wrote:
> > attached is a tarball for a new port.  I noticed one strange thing
> > during the port's creation.  make fetch doesn't download the tarball
> > from github although I use the same syntax as other ports and the
> > Makefile template.  The download path is different from the one on the
> > website...  Once I downloaded the tarball to the distfiles, I could
> > easily create the port.
> 
> No idea what's up with your fetch (showing what haopens would help) but
> it works for me.

When I remove the distfile and run make fetch again, I get a size mismatch
although the size should be correct.

$ doas rm /usr/ports/distfiles/jrnlc-2021.b.tar.gz
$ make fetch
===>  Checking files for jrnlc-2021.b
>> Fetch https://github.com/thexhr/jrnlc/archive/2021.b/jrnlc-2021.b.tar.gz
>> Size does not match for jrnlc-2021.b.tar.gz
>> Fetch https://ftp.openbsd.org/pub/OpenBSD/distfiles/jrnlc-2021.b.tar.gz
>> Size does not match for jrnlc-2021.b.tar.gz
[...]

When I now fetch the file from the URL above by hand and rerun make makesum
I get the same distinfo as before.

$ ftp https://github.com/thexhr/jrnlc/archive/2021.b/jrnlc-2021.b.tar.gz
Trying 140.82.121.4...
Requesting https://github.com/thexhr/jrnlc/archive/2021.b/jrnlc-2021.b.tar.gz
Redirected to https://codeload.github.com/thexhr/jrnlc/tar.gz/2021.b
Trying 140.82.121.10...
Requesting https://codeload.github.com/thexhr/jrnlc/tar.gz/2021.b
14729 bytes received in 0.01 seconds (828.97 KB/s)

I now move the tarball to distfiles, rerun make makesum and then compare the
 orginal distinfo and the save copy, they're the same.

$ doas mv jrnlc-2021.b.tar.gz /usr/ports/distfiles/
$ mv distinfo distinfo.old
$ rm distinfo
$ make makesum
===>  Checking files for jrnlc-2021.b
`/usr/ports/distfiles/jrnlc-2021.b.tar.gz' is up to date.
$ diff -u distinfo distinfo.old
$

I like to understand where the error is coming from...

> WANTLIB needs uodating and there are whitespace nits, here's an updated
> Makefile.

Thanks, attached is a new tarball with your Makefile.

Cheers

Matthias



Re: [NEW] misc/jrnlc

2021-12-30 Thread Stuart Henderson
On 2021/12/30 11:03, Matthias Schmidt wrote:
> Hi Stuart,
> 
> * Stuart Henderson wrote:
> > On 2021/12/29 18:11, Matthias Schmidt wrote:
> > > attached is a tarball for a new port.  I noticed one strange thing
> > > during the port's creation.  make fetch doesn't download the tarball
> > > from github although I use the same syntax as other ports and the
> > > Makefile template.  The download path is different from the one on the
> > > website...  Once I downloaded the tarball to the distfiles, I could
> > > easily create the port.
> > 
> > No idea what's up with your fetch (showing what haopens would help) but
> > it works for me.
> 
> When I remove the distfile and run make fetch again, I get a size mismatch
> although the size should be correct.
> 
> $ doas rm /usr/ports/distfiles/jrnlc-2021.b.tar.gz
> $ make fetch
> ===>  Checking files for jrnlc-2021.b
> >> Fetch https://github.com/thexhr/jrnlc/archive/2021.b/jrnlc-2021.b.tar.gz
> >> Size does not match for jrnlc-2021.b.tar.gz
> >> Fetch https://ftp.openbsd.org/pub/OpenBSD/distfiles/jrnlc-2021.b.tar.gz
> >> Size does not match for jrnlc-2021.b.tar.gz

Something is wrong with your fetches, because at least this second one
should report a 404 error. Perhaps you have redefined FETCH_CMD and it isn't
working correctly.



Re: UPDATE: libtorrent-rasterbar 1.2.15

2021-12-30 Thread Nam Nguyen
Brad Smith writes:

> Here is an update to libtorrent-rasterbar 1.2.15.

This is OK namn@, with a tweak to bump library major. I am looking for
another OK.

brad's diff tweaked with major bump is provided inline for convenience.

I propose a major bump because of removed symbols.
check_sym output:
https://namtsui.com/public/check_sym_libtorrent_1_2_15.txt
various headers related to major bump:
set_proxy_settings:
https://github.com/arvidn/libtorrent/commit/c83139e834457e440a91994667a4b5a50f668d6d
compare_peer / compare_peer_erase:
https://github.com/arvidn/libtorrent/commit/c430ca0b87f757a3181a97f7c43a76a9f28f6d4b
do_pause:
https://github.com/arvidn/libtorrent/commit/eea0820aa33e43d6875f79211f0f0651908a4265

Patch is removed because:
https://github.com/arvidn/libtorrent/commit/9cc638cdc6592c8570f4fc6333c51f2a7324279e

>
> This builds with C++17 as a workaround for newer Boost as mentioned
> in the ticket. This allows libtorrent-rasterber to function without
> crashing. I want to move forward with Boost 1.77.
>
> Tested with qbittorrent.

Tested with deluge and qbittorrent. make test similar to before passing
47 and skipping 2. There is no test_pex, which was skipped before.

>
>
> 1.2.15 released
>
> * cache DNS lookups for SOCKS5 proxy
> * fix stalled pieces on disk-full errors
> * fix build configuration issue on NetBSD, OpenBSD and DragonFly
> * make UTF-8 sanitization a bit stricter. This will re-write invalid 
> UTF-8
>   code points encoding surrogate pairs
> * fix restoring last_seen_complete from resume data
> * fix issue on MacOS where the DHT was not restarted on a network-up 
> notification
> * make remove_torrent flags be treated as flags (instead of an enum)
>
> 1.2.14 released
>
> * improve handling of seed flag in PEX messages
> * fix issue of accruing unlimited DHT node candidates when DHT is 
> disabled
> * fix bug in parsing chunked encoding
> * fix incorrect reporting of active_duration when entering 
> graceful-pause
> * fix python binding for functions taking string_view
> * fix python binding for torrent_info constructor overloads
> * issue python deprecation warnings for some deprecated functions in 
> the python bindings
> * fix python binding for torrent_info::add_url_seed, add_tracker and 
> add_http_seed

Index: Makefile
===
RCS file: /cvs/ports/net/libtorrent-rasterbar/Makefile,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 Makefile
--- Makefile2 Nov 2021 00:01:39 -   1.18
+++ Makefile30 Dec 2021 10:41:46 -
@@ -2,11 +2,10 @@
 
 COMMENT =  C++ library implementing a BitTorrent client
 
-MODPY_EGG_VERSION =1.2.13
+MODPY_EGG_VERSION =1.2.15
 DISTNAME = libtorrent-rasterbar-${MODPY_EGG_VERSION}
-REVISION = 1
 
-SHARED_LIBS += torrent-rasterbar 4.0   # 10.0.0
+SHARED_LIBS += torrent-rasterbar 5.0   # 10.0.0
 
 CATEGORIES =   net devel
 
@@ -37,6 +36,10 @@ CONFIGURE_ARGS = --enable-python-binding
--with-boost-system=boost_system-mt \

--with-boost-python=boost_python${MODPY_VERSION:C/\.//g}-mt \
--with-libiconv
+
+# https://github.com/arvidn/libtorrent/issues/6468
+CONFIGURE_ARGS +=  --with-cxx-standard=17
+
 CONFIGURE_ENV +=   CPPFLAGS="-Wno-deprecated-declarations \
  -Wno-macro-redefined \
  -pthread" \
Index: distinfo
===
RCS file: /cvs/ports/net/libtorrent-rasterbar/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo22 May 2021 21:47:28 -  1.9
+++ distinfo30 Dec 2021 10:41:46 -
@@ -1,2 +1,2 @@
-SHA256 (libtorrent-rasterbar-1.2.13.tar.gz) = 
l20ncf/NVk8IpjNR6cIuhCqqjNKfb3/iXRacA4qEToU=
-SIZE (libtorrent-rasterbar-1.2.13.tar.gz) = 4160116
+SHA256 (libtorrent-rasterbar-1.2.15.tar.gz) = 
yK2GOGhMCpA+urwwSQB54xsaamONoq3sWovvag5iIUs=
+SIZE (libtorrent-rasterbar-1.2.15.tar.gz) = 4163049
Index: patches/patch-include_libtorrent_buffer_hpp
===
RCS file: patches/patch-include_libtorrent_buffer_hpp
diff -N patches/patch-include_libtorrent_buffer_hpp
--- patches/patch-include_libtorrent_buffer_hpp 6 Feb 2020 20:00:16 -   
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,25 +0,0 @@
-$OpenBSD: patch-include_libtorrent_buffer_hpp,v 1.1 2020/02/06 20:00:16 
rsadowski Exp $
-
-malloc_usable_size and malloc_size are unavailable
-
-Index: include/libtorrent/buffer.hpp
 include/libtorrent/buffer.hpp.orig
-+++ include/libtorrent/buffer.hpp
-@@ -50,7 +50,7 @@ POSSIBILITY OF SUCH DAMAGE.
- #elif defined __FreeBSD__
- #include 
- #elif defined TORRENT_BSD
--#include 
-+#include 
- #endif
- 
- 

Re: [NEW] misc/jrnlc

2021-12-30 Thread Matthias Schmidt
* Stuart Henderson wrote:
> 
> Something is wrong with your fetches, because at least this second one
> should report a 404 error. Perhaps you have redefined FETCH_CMD and it isn't
> working correctly.

You nailed it!  I used curl in FETCH_CMD.  Unsetting it make it work
like charm.

Cheers and thanks

Matthias



Update to musikcube 0.96.10

2021-12-30 Thread Matthias Schmidt
Hi,

attached is a diff to upgrade musikcube to 0.96.10.  The changelog is too
much to mention here, so here's the link:
https://github.com/clangen/musikcube/releases

Important is that upstream fixed the build on OpenBSD in 0.96.9 so
compared to 0.96.6 it builds now out of the box.  I had to regenerate
the Cmake patch.  Tested here and works fine.

Cheers

Matthias


diff -ur musikcube.orig/Makefile musikcube/Makefile
--- musikcube.orig/Makefile Thu Dec 30 14:14:03 2021
+++ musikcube/Makefile  Thu Dec 30 14:15:51 2021
@@ -4,7 +4,7 @@
 
 GH_ACCOUNT =   clangen
 GH_PROJECT =   musikcube
-GH_TAGNAME =   0.96.5
+GH_TAGNAME =   0.96.10
 
 CATEGORIES =   audio
 
diff -ur musikcube.orig/distinfo musikcube/distinfo
--- musikcube.orig/distinfo Thu Dec 30 14:14:03 2021
+++ musikcube/distinfo  Thu Dec 30 14:15:51 2021
@@ -1,2 +1,2 @@
-SHA256 (musikcube-0.96.5.tar.gz) = 7gBmfqFypVfADeSF+7qj/ePrXsGGfJS18XBcG3KAdJA=
-SIZE (musikcube-0.96.5.tar.gz) = 9474635
+SHA256 (musikcube-0.96.10.tar.gz) = 
kf2YTmi272bxvh7N8MhGB0U+xuyAYy7OaIrHRcdxnqU=
+SIZE (musikcube-0.96.10.tar.gz) = 9509759
diff -ur musikcube.orig/patches/patch-CMakeLists_txt 
musikcube/patches/patch-CMakeLists_txt
--- musikcube.orig/patches/patch-CMakeLists_txt Thu Dec 30 14:14:03 2021
+++ musikcube/patches/patch-CMakeLists_txt  Thu Dec 30 14:15:51 2021
@@ -1,14 +1,13 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2021/08/29 13:04:47 solene Exp $
+$OpenBSD$
 
-Index: CMakeLists.txt
 CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -98,7 +98,7 @@ endif()
- # we use a bundled version of taglib because the latest release is from 2016,
- # and the upstream git repo is hundreds of commits ahead and has a number of
- # important bugfixes.
--set(USE_BUNDLED_TAGLIB "true")
-+set(USE_BUNDLED_TAGLIB "false")
- 
- add_subdirectory(src/musikcore)
- add_subdirectory(src/core_c_demo)
+--- CMakeLists.txt.origTue Dec 28 23:55:45 2021
 CMakeLists.txt Thu Dec 30 14:17:32 2021
+@@ -101,7 +101,7 @@
+ # has a number of important bugfixes.
+ if (NOT DEFINED ENABLE_BUNDLED_TAGLIB)
+   message(STATUS "[build] ENABLE_BUNDLED_TAGLIB not defined, setting to 
'true'")
+-  set(ENABLE_BUNDLED_TAGLIB "true")
++  set(ENABLE_BUNDLED_TAGLIB "false")
+ else()
+   message(STATUS "[build] ENABLE_BUNDLED_TAGLIB specified as 
'${ENABLE_BUNDLED_TAGLIB}'")
+ endif()



Re: Update to musikcube 0.96.10

2021-12-30 Thread Stuart Henderson
On 2021/12/30 14:24, Matthias Schmidt wrote:
> Hi,
> 
> attached is a diff to upgrade musikcube to 0.96.10.  The changelog is too
> much to mention here, so here's the link:
> https://github.com/clangen/musikcube/releases
> 
> Important is that upstream fixed the build on OpenBSD in 0.96.9 so
> compared to 0.96.6 it builds now out of the box.  I had to regenerate
> the Cmake patch.  Tested here and works fine.
> 
> Cheers
> 
>   Matthias
> 
> 
> diff -ur musikcube.orig/Makefile musikcube/Makefile
> --- musikcube.orig/Makefile   Thu Dec 30 14:14:03 2021
> +++ musikcube/MakefileThu Dec 30 14:15:51 2021
> @@ -4,7 +4,7 @@
>  
>  GH_ACCOUNT = clangen
>  GH_PROJECT = musikcube
> -GH_TAGNAME = 0.96.5
> +GH_TAGNAME = 0.96.10
>  
>  CATEGORIES = audio
>  
> diff -ur musikcube.orig/distinfo musikcube/distinfo
> --- musikcube.orig/distinfo   Thu Dec 30 14:14:03 2021
> +++ musikcube/distinfoThu Dec 30 14:15:51 2021
> @@ -1,2 +1,2 @@
> -SHA256 (musikcube-0.96.5.tar.gz) = 
> 7gBmfqFypVfADeSF+7qj/ePrXsGGfJS18XBcG3KAdJA=
> -SIZE (musikcube-0.96.5.tar.gz) = 9474635
> +SHA256 (musikcube-0.96.10.tar.gz) = 
> kf2YTmi272bxvh7N8MhGB0U+xuyAYy7OaIrHRcdxnqU=
> +SIZE (musikcube-0.96.10.tar.gz) = 9509759
> diff -ur musikcube.orig/patches/patch-CMakeLists_txt 
> musikcube/patches/patch-CMakeLists_txt
> --- musikcube.orig/patches/patch-CMakeLists_txt   Thu Dec 30 14:14:03 2021
> +++ musikcube/patches/patch-CMakeLists_txtThu Dec 30 14:15:51 2021
> @@ -1,14 +1,13 @@
> -$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2021/08/29 13:04:47 solene Exp $
> +$OpenBSD$
>  
> -Index: CMakeLists.txt
>  CMakeLists.txt.orig
> -+++ CMakeLists.txt
> -@@ -98,7 +98,7 @@ endif()
> - # we use a bundled version of taglib because the latest release is from 
> 2016,
> - # and the upstream git repo is hundreds of commits ahead and has a number of
> - # important bugfixes.
> --set(USE_BUNDLED_TAGLIB "true")
> -+set(USE_BUNDLED_TAGLIB "false")
> - 
> - add_subdirectory(src/musikcore)
> - add_subdirectory(src/core_c_demo)
> +--- CMakeLists.txt.orig  Tue Dec 28 23:55:45 2021
>  CMakeLists.txt   Thu Dec 30 14:17:32 2021

Don't hand-generate the patch files, use "make update-patches", but...

> +@@ -101,7 +101,7 @@
> + # has a number of important bugfixes.
> + if (NOT DEFINED ENABLE_BUNDLED_TAGLIB)
> +   message(STATUS "[build] ENABLE_BUNDLED_TAGLIB not defined, setting to 
> 'true'")
> +-  set(ENABLE_BUNDLED_TAGLIB "true")
> ++  set(ENABLE_BUNDLED_TAGLIB "false")

...no need to patch for this any more. They have added the "if (NOT DEFINED..."
above so you can set -DENABLE_BUNDLED_TAGLIB=false in CONFIGURE_ARGS.

> + else()
> +   message(STATUS "[build] ENABLE_BUNDLED_TAGLIB specified as 
> '${ENABLE_BUNDLED_TAGLIB}'")
> + endif()
> 



[maintainer update] remind 3.3.10 -> 3.3.11

2021-12-30 Thread Martin Ziemer
This patch updates remind from 3.3.10 to 3.3.11.

Tested on two amd64 systems. (One with and one without tkremind)

Index: Makefile
===
RCS file: /cvs/ports/misc/remind/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- Makefile5 Dec 2021 07:44:27 -   1.49
+++ Makefile30 Dec 2021 15:17:48 -
@@ -2,8 +2,8 @@
 
 COMMENT=   scripting language for reminders, with a Tk front end
 
-DISTNAME=  remind-03.03.10
-PKGNAME=   remind-3.3.10
+DISTNAME=  remind-03.03.11
+PKGNAME=   remind-3.3.11
 
 CATEGORIES=misc
 
Index: distinfo
===
RCS file: /cvs/ports/misc/remind/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- distinfo5 Dec 2021 07:44:27 -   1.21
+++ distinfo30 Dec 2021 15:17:48 -
@@ -1,2 +1,2 @@
-SHA256 (remind-03.03.10.tar.gz) = BqFt3f4+hfz4njzOI1mkrUJhR7zOqzT/TNWS+sk2XEc=
-SIZE (remind-03.03.10.tar.gz) = 420644
+SHA256 (remind-03.03.11.tar.gz) = CCZ7CENeI8zNUgtBYesGWbqf53OCr9hBTN1ibegB4lo=
+SIZE (remind-03.03.11.tar.gz) = 422444



Re: Update to musikcube 0.96.10

2021-12-30 Thread Matthias Schmidt
Hi,

* Stuart Henderson wrote:
> 
> Don't hand-generate the patch files, use "make update-patches", but...
> 
> > +@@ -101,7 +101,7 @@
> > + # has a number of important bugfixes.
> > + if (NOT DEFINED ENABLE_BUNDLED_TAGLIB)
> > +   message(STATUS "[build] ENABLE_BUNDLED_TAGLIB not defined, setting to 
> > 'true'")
> > +-  set(ENABLE_BUNDLED_TAGLIB "true")
> > ++  set(ENABLE_BUNDLED_TAGLIB "false")
> 
> ...no need to patch for this any more. They have added the "if (NOT 
> DEFINED..."
> above so you can set -DENABLE_BUNDLED_TAGLIB=false in CONFIGURE_ARGS.

[x] done.  Recompiled and it still works as expected.  New diff
attached:

diff -urN musikcube.orig/Makefile musikcube/Makefile
--- musikcube.orig/Makefile Thu Dec 30 14:14:03 2021
+++ musikcube/Makefile  Thu Dec 30 15:51:37 2021
@@ -4,7 +4,7 @@
 
 GH_ACCOUNT =   clangen
 GH_PROJECT =   musikcube
-GH_TAGNAME =   0.96.5
+GH_TAGNAME =   0.96.10
 
 CATEGORIES =   audio
 
@@ -24,6 +24,8 @@
 COMPILER = base-clang ports-gcc
 
 MODULES =  devel/cmake
+
+CONFIGURE_ARGS += -DENABLE_BUNDLED_TAGLIB=false
 
 LIB_DEPENDS =  audio/libopenmpt \
audio/taglib \
diff -urN musikcube.orig/distinfo musikcube/distinfo
--- musikcube.orig/distinfo Thu Dec 30 14:14:03 2021
+++ musikcube/distinfo  Thu Dec 30 14:15:51 2021
@@ -1,2 +1,2 @@
-SHA256 (musikcube-0.96.5.tar.gz) = 7gBmfqFypVfADeSF+7qj/ePrXsGGfJS18XBcG3KAdJA=
-SIZE (musikcube-0.96.5.tar.gz) = 9474635
+SHA256 (musikcube-0.96.10.tar.gz) = 
kf2YTmi272bxvh7N8MhGB0U+xuyAYy7OaIrHRcdxnqU=
+SIZE (musikcube-0.96.10.tar.gz) = 9509759
diff -urN musikcube.orig/patches/patch-CMakeLists_txt 
musikcube/patches/patch-CMakeLists_txt
--- musikcube.orig/patches/patch-CMakeLists_txt Thu Dec 30 14:14:03 2021
+++ musikcube/patches/patch-CMakeLists_txt  Thu Jan  1 01:00:00 1970
@@ -1,14 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2021/08/29 13:04:47 solene Exp $
-
-Index: CMakeLists.txt
 CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -98,7 +98,7 @@ endif()
- # we use a bundled version of taglib because the latest release is from 2016,
- # and the upstream git repo is hundreds of commits ahead and has a number of
- # important bugfixes.
--set(USE_BUNDLED_TAGLIB "true")
-+set(USE_BUNDLED_TAGLIB "false")
- 
- add_subdirectory(src/musikcore)
- add_subdirectory(src/core_c_demo)



update games/irrlamb (was: Re: update devel/bullet)

2021-12-30 Thread Pascal Stumpf
Here's an update for games/irrlamb, which now no longer uses
devel/bullet.  It has an internal copy of Irrlicht, but working around
this to use the version from ports seems to not create any issues.



Index: Makefile
===
RCS file: /cvs/ports/games/irrlamb/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile12 Jul 2019 20:46:19 -  1.12
+++ Makefile30 Dec 2021 15:36:07 -
@@ -1,43 +1,42 @@
 # $OpenBSD: Makefile,v 1.12 2019/07/12 20:46:19 sthen Exp $
 
-V =0.2.1
+V =1.0.1
 COMMENT =  third person, 3D physics game
-DISTNAME = irrlamb-$V-src
+DISTNAME = irrlamb-$Vr613-src
 PKGNAME =  irrlamb-$V
 CATEGORIES =   games x11
-REVISION = 2
 
 # GPLv3+
 PERMIT_PACKAGE =   Yes
 
-WANTLIB += BulletCollision BulletDynamics BulletSoftBody Irrlicht
-WANTLIB += X11 Xext Xrandr Xxf86vm freetype ogg sqlite3 vorbis
-WANTLIB += LinearMath c m openal vorbisfile
-WANTLIB += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB}
+WANTLIB += ${COMPILER_LIBCXX} GL GLU Irrlicht X11 Xext Xrandr
+WANTLIB += Xxf86vm c freetype jpeg m ogg openal png sqlite3 vorbis
+WANTLIB += vorbisfile z
 
 MASTER_SITES = https://github.com/jazztickets/irrlamb/releases/download/v$V/
 
-MODULES =  devel/cmake \
-   lang/lua
-MODLUA_VERSION =   5.3
+MODULES =  devel/cmake
 
 COMPILER = base-clang ports-gcc
 
 LIB_DEPENDS =  audio/libvorbis \
audio/openal \
databases/sqlite3 \
-   devel/bullet \
x11/irrlicht
 
 RUN_DEPENDS =  devel/desktop-file-utils
 
-WRKDIST =  ${WRKDIR}/irrlamb-$V
+WRKDIST =  ${WRKDIR}/irrlamb-$Vr613
 
 NO_TEST =  Yes
 
+post-extract:
+   rm -rf ${WRKSRC}/src/irrlicht
+
 post-patch:
sed -i -e "s,games/,,g" ${WRKSRC}/CMakeLists.txt \
  ${WRKSRC}/deployment/irrlamb
sed -i -e "s,games,bin,g" ${WRKSRC}/CMakeLists.txt
+   ${SUBST_CMD} ${WRKSRC}/CMakeLists.txt
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/games/irrlamb/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo3 Nov 2017 21:08:47 -   1.3
+++ distinfo30 Dec 2021 15:36:07 -
@@ -1,2 +1,2 @@
-SHA256 (irrlamb-0.2.1-src.tar.gz) = 
5G+hzMjpkbOPyrO2ontnBsPBVRUD3wHJZd0oOMcWGiI=
-SIZE (irrlamb-0.2.1-src.tar.gz) = 3230205
+SHA256 (irrlamb-1.0.1r613-src.tar.gz) = 
i7fUmkHFcXD0EExkF2+XWYa5lkZ1Lyl0mkodq9cCdQo=
+SIZE (irrlamb-1.0.1r613-src.tar.gz) = 17654369
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt30 Dec 2021 15:36:07 -
@@ -0,0 +1,55 @@
+$OpenBSD$
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
 CMakeLists.txt
+@@ -29,7 +29,6 @@ if(WIN32)
+ elseif(UNIX)
+   add_definitions(-DPLATFORM=0)
+   add_definitions(-DLUA_USE_LINUX)
+-  set(EXTRA_LIBS ${EXTRA_LIBS} dl)
+ endif()
+ 
+ # compiler flags
+@@ -72,7 +71,7 @@ find_package(Threads REQUIRED)
+ 
+ # include paths
+ include_directories("src")
+-include_directories("src/irrlicht/include")
++include_directories("${LOCALBASE}/include/irrlicht")
+ include_directories("src/OPCODE")
+ include_directories("src/libccd")
+ include_directories("src/libccd/custom")
+@@ -98,6 +97,7 @@ add_executable(${CMAKE_PROJECT_NAME} ${SRC_ALL})
+ 
+ # link libraries
+ target_link_libraries(${CMAKE_PROJECT_NAME}
++  Irrlicht
+   ${OPENGL_LIBRARIES}
+   ${FREETYPE_LIBRARIES}
+   ${OPENAL_LIBRARY}
+@@ -115,15 +115,15 @@ if(WIN32)
+ else()
+ 
+   # linux installation
+-  install(TARGETS ${CMAKE_PROJECT_NAME} RUNTIME DESTINATION 
share/games/${CMAKE_PROJECT_NAME})
+-  install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/fonts DESTINATION 
share/games/${CMAKE_PROJECT_NAME})
+-  install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/levels DESTINATION 
share/games/${CMAKE_PROJECT_NAME})
+-  install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/meshes DESTINATION 
share/games/${CMAKE_PROJECT_NAME})
+-  install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/scripts DESTINATION 
share/games/${CMAKE_PROJECT_NAME})
+-  install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/shaders DESTINATION 
share/games/${CMAKE_PROJECT_NAME})
+-  install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/sounds DESTINATION 
share/games/${CMAKE_PROJECT_NAME})
+-  install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/textures DESTINATION 
share/games/${CMAKE_PROJECT_NAME})
+-  install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/ui DESTINATION 
share/games/${CMAKE_PROJECT_NAME})
++  install(TARGETS ${CMAKE_PROJECT_NAME} RUNTIME DESTINATION 
share/${CMAKE_PROJECT_NAME})
++  install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/fonts DESTINATION 
share/${

Re: update games/irrlamb (was: Re: update devel/bullet)

2021-12-30 Thread Omar Polo
Pascal Stumpf  writes:

> Here's an update for games/irrlamb, which now no longer uses
> devel/bullet.  It has an internal copy of Irrlicht, but working around
> this to use the version from ports seems to not create any issues.

Thanks!

I tried to update it but failed, was plaining to give it another shot in
January.

the diff looks fine and irrlamb works fine, i've played it for about
half an hour and there's nothing to report, all usual checks are ok too.

just one minor nit below

> Index: Makefile
> ===
> RCS file: /cvs/ports/games/irrlamb/Makefile,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile
> --- Makefile  12 Jul 2019 20:46:19 -  1.12
> +++ Makefile  30 Dec 2021 15:36:07 -
> @@ -1,43 +1,42 @@
>  # $OpenBSD: Makefile,v 1.12 2019/07/12 20:46:19 sthen Exp $
>  
> -V =  0.2.1
> +V =  1.0.1
>  COMMENT =third person, 3D physics game
> -DISTNAME =   irrlamb-$V-src
> +DISTNAME =   irrlamb-$Vr613-src
>  PKGNAME =irrlamb-$V
>  CATEGORIES = games x11
> -REVISION =   2
>  
>  # GPLv3+
>  PERMIT_PACKAGE = Yes
>  
> -WANTLIB += BulletCollision BulletDynamics BulletSoftBody Irrlicht
> -WANTLIB += X11 Xext Xrandr Xxf86vm freetype ogg sqlite3 vorbis
> -WANTLIB += LinearMath c m openal vorbisfile
> -WANTLIB += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB}
> +WANTLIB += ${COMPILER_LIBCXX} GL GLU Irrlicht X11 Xext Xrandr
> +WANTLIB += Xxf86vm c freetype jpeg m ogg openal png sqlite3 vorbis
> +WANTLIB += vorbisfile z
>  
>  MASTER_SITES =   
> https://github.com/jazztickets/irrlamb/releases/download/v$V/
>  
> -MODULES =devel/cmake \
> - lang/lua
> -MODLUA_VERSION = 5.3
> +MODULES =devel/cmake
>  
>  COMPILER =   base-clang ports-gcc
>  
>  LIB_DEPENDS =audio/libvorbis \
>   audio/openal \
>   databases/sqlite3 \
> - devel/bullet \
>   x11/irrlicht
>  
>  RUN_DEPENDS =devel/desktop-file-utils
>  
> -WRKDIST =${WRKDIR}/irrlamb-$V
> +WRKDIST =${WRKDIR}/irrlamb-$Vr613
>  
>  NO_TEST =Yes
>  
> +post-extract:
> + rm -rf ${WRKSRC}/src/irrlicht
> +
>  post-patch:
>   sed -i -e "s,games/,,g" ${WRKSRC}/CMakeLists.txt \
> ${WRKSRC}/deployment/irrlamb
>   sed -i -e "s,games,bin,g" ${WRKSRC}/CMakeLists.txt

this bit makes the second half of patch-CMakeLists_txt redundant.  I
think we should either remove it and keep the patch (but still
substitute in deployment/irrlamb!) or viceversa.

> [...]
> Index: patches/patch-CMakeLists_txt
> ===
> RCS file: patches/patch-CMakeLists_txt
> diff -N patches/patch-CMakeLists_txt
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-CMakeLists_txt  30 Dec 2021 15:36:07 -
> @@ -0,0 +1,55 @@
> +$OpenBSD$
> +
> +Index: CMakeLists.txt
> +--- CMakeLists.txt.orig
>  CMakeLists.txt
> +@@ -29,7 +29,6 @@ if(WIN32)
> + elseif(UNIX)
> + add_definitions(-DPLATFORM=0)
> + add_definitions(-DLUA_USE_LINUX)
> +-set(EXTRA_LIBS ${EXTRA_LIBS} dl)
> + endif()
> + 
> + # compiler flags
> +@@ -72,7 +71,7 @@ find_package(Threads REQUIRED)
> + 
> + # include paths
> + include_directories("src")
> +-include_directories("src/irrlicht/include")
> ++include_directories("${LOCALBASE}/include/irrlicht")
> + include_directories("src/OPCODE")
> + include_directories("src/libccd")
> + include_directories("src/libccd/custom")
> +@@ -98,6 +97,7 @@ add_executable(${CMAKE_PROJECT_NAME} ${SRC_ALL})
> + 
> + # link libraries
> + target_link_libraries(${CMAKE_PROJECT_NAME}
> ++Irrlicht
> + ${OPENGL_LIBRARIES}
> + ${FREETYPE_LIBRARIES}
> + ${OPENAL_LIBRARY}
> +@@ -115,15 +115,15 @@ if(WIN32)
> + else()
> + 
> + # linux installation
> +-install(TARGETS ${CMAKE_PROJECT_NAME} RUNTIME DESTINATION 
> share/games/${CMAKE_PROJECT_NAME})
> +-install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/fonts DESTINATION 
> share/games/${CMAKE_PROJECT_NAME})
> +-install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/levels DESTINATION 
> share/games/${CMAKE_PROJECT_NAME})
> +-install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/meshes DESTINATION 
> share/games/${CMAKE_PROJECT_NAME})
> +-install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/scripts DESTINATION 
> share/games/${CMAKE_PROJECT_NAME})
> +-install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/shaders DESTINATION 
> share/games/${CMAKE_PROJECT_NAME})
> +-install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/sounds DESTINATION 
> share/games/${CMAKE_PROJECT_NAME})
> +-install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/textures DESTINATION 
> share/games/${CMAKE_PROJECT_NAME})
> +-install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/ui DESTINATION 
> share/games/${CMAKE_PROJECT_NAME})
> ++install(TARGETS ${CMAKE_PROJECT_NAME} RUNTIME DESTINATION 
> share/${CMAKE_PROJECT_NAME})
> ++install(DIRECTORY ${PROJECT_SOURCE_DIR}

Re: wip/help wanted: fcitx5

2021-12-30 Thread Stefan Hagen
Hello,

Yifei Zhan wrote:
> Here is a WIP port for fcitx5, the successor of inputmethods/fcitx. I 
> would like to find someone to import this as fcitx4 is no longer being 
> actively developed. ("no new issue and PR should be created.") [0]
> 
> At the moment I'm able to build/package/test/install it with no problem 
> and I've been daily driving[1] it on both my arm64 and amd64 systems for 
> about a month. However I'm unable to tame `make port-lib-depends-check`:
> 
> fcitx5-5.0.11(inputmethods/fcitx5):
> Missing lib: cairo.13 (/usr/local/lib/fcitx5/libclassicui.so) (NOT REACHABLE)
> Missing lib: event_core.2 (/usr/local/lib/libFcitx5Utils.so.0.0) (NOT 
> REACHABLE)
> Missing lib: harfbuzz.16 (/usr/local/lib/fcitx5/libclassicui.so) (NOT 
> REACHABLE)
> Missing lib: pango-1.0.3801 (/usr/local/lib/fcitx5/libclassicui.so) (NOT 
> REACHABLE)
> Missing lib: pangocairo-1.0.3801 (/usr/local/lib/fcitx5/libclassicui.so) (NOT 
> REACHABLE)
> Missing lib: xkbcommon-x11.1 (/usr/local/lib/fcitx5/libxcb.so) (NOT REACHABLE)
> Missing lib: xkbcommon.1 (/usr/local/lib/libFcitx5Core.so.0.0) (NOT REACHABLE)
> *** Error 1 in target 'port-lib-depends-check' (ignored)
> 
> I tried to figure out this by reading the source of 
> port-lib-depends-check, but with little success, anyone know how can I 
> tame this?

These libs are used, but not referenced in the Makefile. This means this 
port only builds if the libs are already present on the system. A "make" 
in the ports directory would not lead to them getting installed.

I have attached the port and updated the libraries. The above libs had 
to be added to WANTLIB and LIB_DEPENDS.

You can roughly follow this workflow to find the LIB_DEPENDS entry.
Let's take this entry:

> Missing lib: harfbuzz.16 (/usr/local/lib/fcitx5/libclassicui.so) (NOT 
> REACHABLE)

$ objdump -p /usr/local/lib/fcitx5/libclassicui.so | grep harfbuzz
  NEEDED  libharfbuzz.so.16.2

This gives you the exact file, which is referenced by your library. To 
include it into the port, we need to find out in which port this file 
is.

$ pkglocate libharfbuzz.so.16.2
harfbuzz-3.2.0:devel/harfbuzz,-main:/usr/local/lib/libharfbuzz.so.16.2

pkglocate is very handy for this. Now we know which package is requred 
and can add it to lib depends:

LIB_DEPENDS += devel/harfbuzz,-main

> [0]: https://github.com/fcitx/fcitx/blob/master/README 
> [1]: I also ported many fcitx5 IME IM modules but they would be too many 
> for this email...

Some other nitpicks:
- after = and += comes a tab, not a space. (exception for big wantlib blocks)
- align the sequence to the template in 
/usr/ports/infrastructure/templates/Makefile.template
  this is not a technical requirement, but makes ports easier to read,
  when the different blocks are roughly in the same spot.

I hope this helps!

Best Regards,
Stefan


fcitx5.tgz
Description: application/tar-gz


Re: wip/help wanted: fcitx5

2021-12-30 Thread Omar Polo
Yifei Zhan  writes:

> Hi,
>
> Here is a WIP port for fcitx5, the successor of inputmethods/fcitx. I 
> would like to find someone to import this as fcitx4 is no longer being 
> actively developed. ("no new issue and PR should be created.") [0]
>
> At the moment I'm able to build/package/test/install it with no problem 
> and I've been daily driving[1] it on both my arm64 and amd64 systems for 
> about a month. However I'm unable to tame `make port-lib-depends-check`:
>
> fcitx5-5.0.11(inputmethods/fcitx5):
> Missing lib: cairo.13 (/usr/local/lib/fcitx5/libclassicui.so) (NOT REACHABLE)
> Missing lib: event_core.2 (/usr/local/lib/libFcitx5Utils.so.0.0) (NOT 
> REACHABLE)
> Missing lib: harfbuzz.16 (/usr/local/lib/fcitx5/libclassicui.so) (NOT 
> REACHABLE)
> Missing lib: pango-1.0.3801 (/usr/local/lib/fcitx5/libclassicui.so) (NOT 
> REACHABLE)
> Missing lib: pangocairo-1.0.3801 (/usr/local/lib/fcitx5/libclassicui.so) (NOT 
> REACHABLE)
> Missing lib: xkbcommon-x11.1 (/usr/local/lib/fcitx5/libxcb.so) (NOT REACHABLE)
> Missing lib: xkbcommon.1 (/usr/local/lib/libFcitx5Core.so.0.0) (NOT REACHABLE)
> *** Error 1 in target 'port-lib-depends-check' (ignored)
>
> I tried to figure out this by reading the source of 
> port-lib-depends-check, but with little success, anyone know how can I 
> tame this?
>
> [0]: https://github.com/fcitx/fcitx/blob/master/README 
> [1]: I also ported many fcitx5 IME IM modules but they would be too many 
> for this email...
>
> [2. application/x-gzip; fcitx5.wip.tar.gz]...

Hello,

(adding to what Stefan said)

I noticed that both ports have

V = ...
PKGNAME =   foo-$V
DISTNAME =  ${PKGNAME}

which I think it's redundant, since $V is not used anywhere else in the
makefiles you could simply do

DISTNAME =  foo-x.y.z


regarding xcb-imd, I was told that ports that use extra-cmake-modules
should use the devel/kf5 module which takes care of adding the needed
build depends.  (It also needs `MODQT5_DEPS = No' otherwise qtbase ends
up as LDEPS.)

There's no need to patch CMakeLists to change the default of the
options, just pass them as

CONFIGURE_ARGS +=   -DUSE_SYSTEM_UTHASH=OFF

but why disable uthash?  it builds fine with that enabled, it just needs
CFLAGS += -I${LOCALBASE}/include, so I'm adding it to BUILD_DEPENDS.

I'm dropping -Wno-dev as I don't think we need to add flags to silence
cmake warnings.  I'm also dropping DISTFILES in xcb-imdkit as that's the
default value.

make update-plist wants to add the lib/cmake directory.

As a final note, xcb-imdkit doesn't build with base gcc (needs C11) and
thus set COMPILER and COMPILER_LANGS accordingly.


regarding fcitx5 itself, why disable enchant?  I've added
textproc/enchant2 as LDEP and it builds fine.

Instead of patching CMakeList.txt to add /usr/X11R6/include (which is
also hardcoded), you can just adjust CXXFLAGS from the makefile.  Ditto
for patch-src_im_keyboard_isocodes_cpp

I've moved the *_DEPENDS after MODULE as per Makefile.template.

These entries from the PLIST are suspicious:

etc/
etc/xdg/
etc/xdg/autostart/
etc/xdg/autostart/org.fcitx.Fcitx5.desktop

They should end up in ${PREFIX}/share/examples/xdg/... and then
@sample'd as happens for other ports.  cmake/kf5/qt is not really my
area, but throwing a -DCMAKE_INSTALL_SYSCONFDIR in CONFIGURE_ARGS fixed
the plist, not really sure why it's not happening by default...  A grep
confirms that there are some other instances of that in the port tree
already (devel/ccache, net/icinga, net/mosquitto, ...) so maybe it's not
completely wrong.

I can't understand how it's supposed to be used, I ran fcitx5 and it
switched from my custom dvorak to the us layout, fcitx5-configtool says
that I'm "currently running Fcitx with GUI, but fcitx5-config-qt
couldn't be found" and then opens up Emacs on the ~/.config/fcitx5/conf
directory.  I guess I should edit that file to customize it?
Unfortunately there's no documentation in the package, I'll dig in
HOMEPAGE later


Tests are passing for both, good!

I think both ports looks fine :)

Cheers!

Omar Polo



xcb-imdkit.tar.gz
Description: Binary data


fcitx5.tar.gz
Description: Binary data


UPDATE: comms/libhidapi 0.11.0

2021-12-30 Thread Raphael Graf
Hi

This is an update for comms/libhidapi to version 0.11.0.

The repository on github was moved from signal11/hidapi to libusb/hidapi.

Notable changes are listed here:
https://github.com/libusb/hidapi/releases

The attached port of hidapitester (https://github.com/todbot/hidapitester)
can be used for testing the functionality. Note that the HID devices need to
attach as ugen, not uhid/uhidev. (The hidapitester port is not meant to be
imported for now, but I found it useful for testing.)

I have compile-tested comms/sigrok devel/openocd and emulators/dolphin.



Index: Makefile
===
RCS file: /cvs/ports/comms/libhidapi/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile12 Apr 2021 10:53:55 -  1.6
+++ Makefile30 Dec 2021 19:31:34 -
@@ -5,17 +5,16 @@ COMMENT = library for communicating with
 # XXX Any consumer should be patched to use hidapi_hid_init() instead of
 # hid_init(3) to avoid conflict with base usbhid(3).
 
-V =0.8.0pre20160128
-DISTNAME = libhidapi-${V}
-REVISION = 0
+V =0.11.0
+DISTNAME = libhidapi-${V}
 
-GH_ACCOUNT =   signal11
+GH_ACCOUNT =   libusb
 GH_PROJECT =   hidapi
-GH_COMMIT =a6a622ffb680c55da0de787ff93b80280498330f
+GH_TAGNAME =   hidapi-${V}
 
 #libhidapi is symlink to hidapi-libusb. Same version numbers should be kept.
-SHARED_LIBS +=  hidapi-libusb  0.0 # 0.0
-SHARED_LIBS +=  hidapi 0.0 # 0.0
+SHARED_LIBS +=  hidapi-libusb  0.1 # 0.0
+SHARED_LIBS +=  hidapi 0.1 # 0.0
 
 CATEGORIES =   comms
 
Index: distinfo
===
RCS file: /cvs/ports/comms/libhidapi/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo18 Jun 2018 23:37:01 -  1.1.1.1
+++ distinfo30 Dec 2021 19:31:34 -
@@ -1,2 +1,2 @@
-SHA256 (libhidapi-0.8.0pre20160128-a6a622ff.tar.gz) = 
ZvagI/auGUBb5QEGFmRuEiRsA7IAqucuLAU6IkUD5IE=
-SIZE (libhidapi-0.8.0pre20160128-a6a622ff.tar.gz) = 103980
+SHA256 (libhidapi-0.11.0.tar.gz) = OR2OUvLWpc924rDAec/v4lSXuh1GWRMSlwgfwM10RjI=
+SIZE (libhidapi-0.11.0.tar.gz) = 232631
Index: patches/patch-README_md
===
RCS file: patches/patch-README_md
diff -N patches/patch-README_md
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-README_md 30 Dec 2021 19:31:34 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+rename hid_init() to hidapi_hid_init() to avoid collision with usbhid
+
+Index: README.md
+--- README.md.orig
 README.md
+@@ -102,7 +102,7 @@ int main(int argc, char* argv[])
+   int i;
+ 
+   // Initialize the hidapi library
+-  res = hid_init();
++  res = hidapi_hid_init();
+ 
+   // Open the device using the VID, PID,
+   // and optionally the Serial number.
Index: patches/patch-README_txt
===
RCS file: patches/patch-README_txt
diff -N patches/patch-README_txt
--- patches/patch-README_txt18 Jun 2018 23:37:01 -  1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-README_txt,v 1.1.1.1 2018/06/18 23:37:01 thfr Exp $
-
-rename hid_init() to hidapi_hid_init() to avoid collision with usbhid
-
-Index: README.txt
 README.txt.orig
-+++ README.txt
-@@ -64,7 +64,7 @@ int main(int argc, char* argv[])
-   int i;
- 
-   // Initialize the hidapi library
--  res = hid_init();
-+  res = hidapi_hid_init();
- 
-   // Open the device using the VID, PID,
-   // and optionally the Serial number.
Index: patches/patch-configure_ac
===
RCS file: /cvs/ports/comms/libhidapi/patches/patch-configure_ac,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-configure_ac
--- patches/patch-configure_ac  18 Jun 2018 23:37:01 -  1.1.1.1
+++ patches/patch-configure_ac  30 Dec 2021 19:31:34 -
@@ -8,7 +8,7 @@ remove librt check
 Index: configure.ac
 --- configure.ac.orig
 +++ configure.ac
-@@ -53,7 +53,7 @@ hidapi_prog_error() {
+@@ -48,7 +48,7 @@ hidapi_prog_error() {
  AC_MSG_CHECKING([operating system])
  AC_MSG_RESULT($host)
  case $host in
@@ -17,17 +17,17 @@ Index: configure.ac
AC_MSG_RESULT([ (Linux back-end)])
AC_DEFINE(OS_LINUX, 1, [Linux implementations])
AC_SUBST(OS_LINUX)
-@@ -61,13 +61,7 @@ case $host in
+@@ -56,13 +56,7 @@ case $host in
os="linux"
threads="pthreads"
  
 -  # HIDAPI/hidraw libs
 -  PKG_CHECK_MODULES([libudev], [libudev], true, [hidapi_lib_error 
libudev])
--  LIBS_HIDRAW_PR+=" $libudev_LIBS"
--  CFLAGS_HIDRAW+=" $libudev_CFLAGS"
+-  LIBS_HIDRAW_PR="${LIBS_HIDRAW_PR} $libudev_LIBS"
+-  CFLAGS_HIDRAW="${CFLAGS_HIDRAW} $libudev_CFLAGS"
 -
# HIDAPI/libusb libs
--  AC_CHECK_LIB([rt], [clock_gettime], [LIBS_LIB

aarch64 bulk build report

2021-12-30 Thread phessler
bulk build on arm64.ports.openbsd.org
started on  Wed Dec 29 03:31:46 MST 2021
finished at Thu Dec 30 16:21:04 MST 2021
lasted 1D12h49m
done with kern.version=OpenBSD 7.0-current (GENERIC.MP) #1468: Tue Dec 28 
13:20:04 MST 2021

built packages:9432
Dec 29:3443
Dec 30:5988


critical path missing pkgs:  
http://build-failures.rhaalovely.net/aarch64/2021-12-29/summary.log

build failures: 27
http://build-failures.rhaalovely.net/aarch64/2021-12-29/databases/db/v4,no_java,no_tcl.log
http://build-failures.rhaalovely.net/aarch64/2021-12-29/databases/mariadb.log
http://build-failures.rhaalovely.net/aarch64/2021-12-29/devel/jdk/11.log
http://build-failures.rhaalovely.net/aarch64/2021-12-29/devel/jdk/17.log
http://build-failures.rhaalovely.net/aarch64/2021-12-29/games/freeciv,-client.log
http://build-failures.rhaalovely.net/aarch64/2021-12-29/games/jbrickshooter.log
http://build-failures.rhaalovely.net/aarch64/2021-12-29/games/lwjgl.log
http://build-failures.rhaalovely.net/aarch64/2021-12-29/graphics/opencv.log
http://build-failures.rhaalovely.net/aarch64/2021-12-29/graphics/vulkan-loader.log
http://build-failures.rhaalovely.net/aarch64/2021-12-29/java/jBCrypt.log
http://build-failures.rhaalovely.net/aarch64/2021-12-29/java/jna.log
http://build-failures.rhaalovely.net/aarch64/2021-12-29/java/tanukiwrapper.log
http://build-failures.rhaalovely.net/aarch64/2021-12-29/lang/abcl.log
http://build-failures.rhaalovely.net/aarch64/2021-12-29/lang/kawa.log
http://build-failures.rhaalovely.net/aarch64/2021-12-29/misc/pdmenu.log
http://build-failures.rhaalovely.net/aarch64/2021-12-29/misc/posixtestsuite.log
http://build-failures.rhaalovely.net/aarch64/2021-12-29/net/i2p.log
http://build-failures.rhaalovely.net/aarch64/2021-12-29/net/openfire.log
http://build-failures.rhaalovely.net/aarch64/2021-12-29/net/termshark.log
http://build-failures.rhaalovely.net/aarch64/2021-12-29/print/gutenprint.log
http://build-failures.rhaalovely.net/aarch64/2021-12-29/sysutils/gitlab-runner.log
http://build-failures.rhaalovely.net/aarch64/2021-12-29/sysutils/rundeck.log
http://build-failures.rhaalovely.net/aarch64/2021-12-29/sysutils/telegraf.log
http://build-failures.rhaalovely.net/aarch64/2021-12-29/textproc/p5-SWISH-API.log
http://build-failures.rhaalovely.net/aarch64/2021-12-29/textproc/pdftk.log
http://build-failures.rhaalovely.net/aarch64/2021-12-29/www/icedtea-web.log
http://build-failures.rhaalovely.net/aarch64/2021-12-29/www/seamonkey,-lightning.log



Re: UPDATE: net/nextcloudclient-3.4.1

2021-12-30 Thread Joel Carnat

On 12/22/21 01:03, Adriano Barbosa wrote:

Hi.
Update for net/nextcloudclient v3.4.1
Changelog: https://github.com/nextcloud/desktop/releases/tag/v3.4.1

Thank you for testing.


Hi,

Building on OpenBSD 7.0/amd64, I get the attached errors.
I'm using -STABLE for system and ports. Only net/nextcloudclient has 
been updated via cvs.


Shall I update some more package and test the building again?

Regards,
Joel C.===>  Building for nextcloudclient-3.4.1
[1/5] cd /usr/ports/pobj/nextcloudclient-3.4.1/build-amd64/src/cmd && /usr/local/bin/cmake -E cmake_autogen /usr/ports/pobj/nextcloudclient-3.4.1/build-amd64/src/cmd/CMakeFiles/nextcloudcmd_autogen.dir/AutogenInfo.json Release && /usr/local/bin/cmake -E touch /usr/ports/pobj/nextcloudclient-3.4.1/build-amd64/src/cmd/nextcloudcmd_autogen/timestamp && /usr/local/bin/cmake -E cmake_transform_depfile Ninja gccdepfile /usr/ports/pobj/nextcloudclient-3.4.1/desktop-3.4.1 /usr/ports/pobj/nextcloudclient-3.4.1/desktop-3.4.1/src/cmd /usr/ports/pobj/nextcloudclient-3.4.1/build-amd64 /usr/ports/pobj/nextcloudclient-3.4.1/build-amd64/src/cmd /usr/ports/pobj/nextcloudclient-3.4.1/build-amd64/src/cmd/nextcloudcmd_autogen/deps /usr/ports/pobj/nextcloudclient-3.4.1/build-amd64/CMakeFiles/d/8a6b8d61e4455f664fefef252868c7f0278caa5b7616532411ce11e0bd2c6664.d
AutoGen: Refreshing parse cache because it doesn't exist.
AutoMoc: Generating "BIN:/src/cmd/nextcloudcmd_autogen/moc_predefs.h", because it doesn't exist.
/usr/ports/pobj/nextcloudclient-3.4.1/bin/c++ -dM -E -c /usr/local/share/cmake/Modules/CMakeCXXCompilerABI.cpp -DQT_CONCURRENT_LIB -DQT_CORE_LIB -DQT_DBUS_LIB -DQT_DISABLE_DEPRECATED_BEFORE=0x00 -DQT_GUI_LIB -DQT_MESSAGELOGCONTEXT -DQT_NETWORK_LIB -DQT_NO_DEBUG -DQT_SVG_LIB -DQT_USE_QSTRINGBUILDER -DQT_WEBSOCKETS_LIB -DQT_WIDGETS_LIB -DUNICODE -DWITH_WEBENGINE=1 -D_UNICODE -I/usr/ports/pobj/nextcloudclient-3.4.1/build-amd64 -I/usr/ports/pobj/nextcloudclient-3.4.1/desktop-3.4.1/src -I/usr/ports/pobj/nextcloudclient-3.4.1/build-amd64/src -I/usr/ports/pobj/nextcloudclient-3.4.1/desktop-3.4.1/src/libsync -I/usr/ports/pobj/nextcloudclient-3.4.1/build-amd64/src/libsync -I/usr/ports/pobj/nextcloudclient-3.4.1/build-amd64/src/csync -I/usr/ports/pobj/nextcloudclient-3.4.1/desktop-3.4.1/src/csync -I/usr/ports/pobj/nextcloudclient-3.4.1/desktop-3.4.1/src/csync/std -I/usr/local/include/X11/qt5 -I/usr/local/include/X11/qt5/QtCore -I/usr/local/lib/qt5/mkspecs/openbsd-clang -I/usr/local/include/X11/qt5/QtConcurrent -I/usr/local/include/X11/qt5/QtNetwork -I/usr/local/include/X11/qt5/QtWebSockets -I/usr/local/include/X11/qt5/QtWidgets -I/usr/local/include/X11/qt5/QtGui -I/usr/X11R6/include -I/usr/local/include/X11/qt5/QtSvg -I/usr/local/include/X11/qt5/QtDBus -I/usr/local/include -I/usr/include -I/usr/local/include/inotify -I/usr/include/c++/v1 -I/usr/lib/clang/11.1.0/include
AutoGen: Parsing "SRC:/src/cmd/cmd.h"
AutoGen: Parsing "SRC:/src/cmd/cmd.cpp"
AutoMoc: Generating "BIN:/src/cmd/nextcloudcmd_autogen/EWIEGA46WW/moc_cmd.cpp", because it doesn't exist, from "SRC:/src/cmd/cmd.h"
/usr/local/lib/qt5/bin/moc -DQT_CONCURRENT_LIB -DQT_CORE_LIB -DQT_DBUS_LIB -DQT_DISABLE_DEPRECATED_BEFORE=0x00 -DQT_GUI_LIB -DQT_MESSAGELOGCONTEXT -DQT_NETWORK_LIB -DQT_NO_DEBUG -DQT_SVG_LIB -DQT_USE_QSTRINGBUILDER -DQT_WEBSOCKETS_LIB -DQT_WIDGETS_LIB -DUNICODE -DWITH_WEBENGINE=1 -D_UNICODE -I/usr/ports/pobj/nextcloudclient-3.4.1/build-amd64 -I/usr/ports/pobj/nextcloudclient-3.4.1/desktop-3.4.1/src -I/usr/ports/pobj/nextcloudclient-3.4.1/build-amd64/src -I/usr/ports/pobj/nextcloudclient-3.4.1/desktop-3.4.1/src/libsync -I/usr/ports/pobj/nextcloudclient-3.4.1/build-amd64/src/libsync -I/usr/ports/pobj/nextcloudclient-3.4.1/build-amd64/src/csync -I/usr/ports/pobj/nextcloudclient-3.4.1/desktop-3.4.1/src/csync -I/usr/ports/pobj/nextcloudclient-3.4.1/desktop-3.4.1/src/csync/std -I/usr/local/include/X11/qt5 -I/usr/local/include/X11/qt5/QtCore -I/usr/local/lib/qt5/mkspecs/openbsd-clang -I/usr/local/include/X11/qt5/QtConcurrent -I/usr/local/include/X11/qt5/QtNetwork -I/usr/local/include/X11/qt5/QtWebSockets -I/usr/local/include/X11/qt5/QtWidgets -I/usr/local/include/X11/qt5/QtGui -I/usr/X11R6/include -I/usr/local/include/X11/qt5/QtSvg -I/usr/local/include/X11/qt5/QtDBus -I/usr/local/include -I/usr/include -I/usr/local/include/inotify -I/usr/include/c++/v1 -I/usr/lib/clang/11.1.0/include --include /usr/ports/pobj/nextcloudclient-3.4.1/build-amd64/src/cmd/nextcloudcmd_autogen/moc_predefs.h --output-dep-file -o /usr/ports/pobj/nextcloudclient-3.4.1/build-amd64/src/cmd/nextcloudcmd_autogen/EWIEGA46WW/moc_cmd.cpp /usr/ports/pobj/nextcloudclient-3.4.1/desktop-3.4.1/src/cmd/cmd.h
AutoMoc: Reading dependencies from "BIN:/src/cmd/nextcloudcmd_autogen/EWIEGA46WW/moc_cmd.cpp.d"
AutoMoc: Generating MOC compilation "BIN:/src/cmd/nextcloudcmd_autogen/mocs_compilation.cpp"
AutoMoc: Merging MOC dependencies into "BIN:/src/cmd/nextcloudcmd_autogen/deps"
AutoGen: Writing the parse cache file "BIN:/src/cmd/CMakeFiles/nextcloudcmd_a

Re: New: Ruby 3.1.0

2021-12-30 Thread vtamara

Hi, I tried it and it compiles, although I added:

BUILD_DEPENDS += devel/dwz

make regress produces 5 errors and I obtain other errors trying to run a 
rails application. I will check more.


Blessings.

El 2021-12-25 15:20, Jeremy Evans escribió:

Here's a port for the recently released Ruby 3.1.0. Major improvements
are:

* In-process JIT compiler (which respects W^X)
* New debugger
* Improved error reporting
* Autocomplete in irb shell

Release notes at:
https://www.ruby-lang.org/en/news/2021/12/25/ruby-3-1-0-released/

Diff below to allow building ruby31 packages for ports.

Tested on amd64.  OK to import?

Thanks,
Jeremy

Index: ruby.port.mk
===
RCS file: /cvs/ports/lang/ruby/ruby.port.mk,v
retrieving revision 1.105
diff -u -p -r1.105 ruby.port.mk
--- ruby.port.mk6 Oct 2021 21:10:19 -   1.105
+++ ruby.port.mk9 Nov 2021 12:36:46 -
@@ -24,7 +24,7 @@ MODRUBY_HANDLE_FLAVORS ?= No
 # If ruby.pork.mk should handle FLAVORs, define a separate FLAVOR
 # for each ruby interpreter
 .if !defined(FLAVORS)
-FLAVORS=   ruby27 ruby30
+FLAVORS=   ruby27 ruby30 ruby31
 .  if !${CONFIGURE_STYLE:L:Mext}
 FLAVORS+=  jruby
 .  endif
@@ -52,7 +52,7 @@ FLAVOR =  ruby30

 # Check for conflicting FLAVORs and set MODRUBY_REV appropriately 
based

 # on the FLAVOR.
-.for i in ruby27 ruby30 jruby
+.for i in ruby27 ruby30 ruby31 jruby
 .  if ${FLAVOR:M$i}
 MODRUBY_REV = ${i:C/ruby([0-9])/\1./}
 .if ${FLAVOR:N$i:Mruby27} || \


--
Dios, gracias por tu amor infinito.
--
  Vladimir Támara Patiño.  http://vtamara.pasosdeJesus.org/
  http://www.pasosdejesus.org/dominio_publico_colombia.html



New: graphics/libyuv 0.0.1807

2021-12-30 Thread Andrew Krasavin

Hello.

This is another dependency for our telegram-desktop port (more
accurately, for tg_owt port). It seems more correct to get the shared
library as a separate port, that's why we refused to use the bundled
version.

Keep in mind that Google supplies libyuv primarily as part of
Chromium and maintains build correctness only for the static library.
Unfortunately, it seems that these are not just words. For example,
one can observe this:

$ objdump -p /usr/local/lib/libyuv.so.0.0 | grep NEEDED | \
  grep -c "jpeg" 
0


but

$ strings /usr/local/lib/libyuv.so.0.0 | grep -c "jpeg"
14

The consequences of this are errors like "libyuv.so.0.0: undefined
symbol 'jpeg_resync_to_restart'" when linking to the library, unless
the '-ljpeg' flag is also specified. That is why we added libjpeg to
the 'Requires' in libyuv.pc. This fixes such errors.

The other point is versioning. Upstream does not care about this and
there are no usual ways (vcs tag, release on github, etc.) to
determine the version.
To find out the version and the corresponding commit,
do the following:

1) clone the libyuv repository from googlecode or from my mirror; cd
to the libyuv directory
2) git blame -l ./include/libyuv/version.h | \
 awk '/#define LIBYUV_VERSION/ {printf "ci: %s, ver:%s\n", $1, $NF}'

The port also includes the yuvconvert utility.

Without Klemens Nanni's advice and comments, this port would
definitely have been made worse.

I'll maintain the package.

---
Information for inst:libyuv-0.0.1807

Comment:
library for freeswitch yuv graphics manipulation

Required by:
tg_owt-0.0.0.20211214

Description:
libyuv is an open source project that includes YUV conversion and
scaling functionality. Converts all webcam formats to YUV (I420).
Convert YUV to formats for rendering/effects. Rotate by 90 degrees to
adjust for mobile devices in portrait mode. Scale YUV to prepare
content for compression, with point, bilinear or box filter.

Maintainer: Andrew Krasavin ,  Klemens Nanni 


WWW: https://chromium.googlesource.com/libyuv/libyuv/

Objections? Feedback?
--
Wbr, Andrew Krasavin


libyuv.tgz
Description: Binary data


[sparc64] Fix build of games/hlsteam

2021-12-30 Thread Kurt Mosiejczuk
games/hlsteam won't compile with base-gcc

This fixes the build on sparc64.

ok?

(cc MAINTAINER)

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/games/hlsteam/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile23 Dec 2021 02:28:30 -  1.2
+++ Makefile31 Dec 2021 03:57:14 -
@@ -13,6 +13,10 @@ MAINTAINER = Thomas Frohwein 

Update sysutils/opam to 2.1.2

2021-12-30 Thread Christopher Zimmermann

Hi,

this update of opam changes to the build-utils shipped with opam and 
drops dependencies on our ports utils. This makes ports dune version 
independent of opam. OK?


Christopher

Index: Makefile
===
RCS file: /cvs/ports/sysutils/opam/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile10 Dec 2021 04:11:00 -  1.23
+++ Makefile31 Dec 2021 07:34:49 -
@@ -4,10 +4,9 @@ COMMENT =  OCaml source-based package ma
 
 CATEGORIES =		sysutils devel
 
-V =			2.0.8

+V =2.1.2
 PKGNAME =  opam-${V}
 DISTNAME = opam-full-${V}
-REVISION = 1
 
 MASTER_SITES =		https://github.com/ocaml/opam/releases/download/${V}/
 
@@ -21,11 +20,7 @@ PERMIT_PACKAGE =	Yes

 WANTLIB =  ${COMPILER_LIBCXX} c m
 
 BUILD_DEPENDS =		lang/ocaml \

-   sysutils/findlib \
-   devel/dune \
-   devel/ocaml-cppo \
-   archivers/bzip2 \
-   net/curl
+   archivers/bzip2
 
 RUN_DEPENDS =		archivers/unzip \

archivers/bzip2 \
@@ -38,7 +33,8 @@ USE_GMAKE =   Yes
 
 CONFIGURE_ENV +=	CFLAGS="${CFLAGS}" \

LDFLAGS="${LDFLAGS}"
-CONFIGURE_STYLE =  gnu
+CONFIGURE_STYLE =  gnu autoconf no-autoheader
+AUTOCONF_VERSION = 2.69
 
 ALL_TARGET =		lib-ext all

 INSTALL_TARGET =   install
Index: distinfo
===
RCS file: /cvs/ports/sysutils/opam/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo23 Feb 2021 05:25:04 -  1.8
+++ distinfo31 Dec 2021 07:34:49 -
@@ -1,2 +1,2 @@
-SHA256 (opam-full-2.0.8.tar.gz) = e50pIz2WM+9QunZt8uORErFc0Fwcb+34C8tUjevN2b0=
-SIZE (opam-full-2.0.8.tar.gz) = 8006252
+SHA256 (opam-full-2.1.2.tar.gz) = 3h4+//1ZQuAQHvg9zerVSMxlqT4TmGrstKJkoFlFft4=
+SIZE (opam-full-2.1.2.tar.gz) = 9442446
Index: patches/patch-Makefile_config_in
===
RCS file: patches/patch-Makefile_config_in
diff -N patches/patch-Makefile_config_in
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile_config_in31 Dec 2021 07:34:49 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+don't use system wide installed ocaml packages
+
+Index: Makefile.config.in
+--- Makefile.config.in.orig
 Makefile.config.in
+@@ -17,7 +17,6 @@ OCAMLFIND = @OCAMLFIND@
+ OCAML = @OCAML@
+ OCAMLC = @OCAMLC@
+ OCAMLOPT = @OCAMLOPT@
+-DUNE = @DUNE@
+ DUNE_SECONDARY = @DUNE_SECONDARY@
+ LN_S = @LN_S@
+ 
Index: patches/patch-configure_ac

===
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-configure_ac  31 Dec 2021 07:34:49 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+don't use system wide installed ocaml packages
+
+Index: configure.ac
+--- configure.ac.orig
 configure.ac
+@@ -255,8 +255,6 @@ AS_IF([test "x${enable_certificate_check}" = "xno"], [
+ 
+ AC_CHECK_PROGS(FETCH,[curl wget],no)
+ 
+-AC_CHECK_TOOL(DUNE,dune)

+-AC_CHECK_TOOL(CPPO,cppo)
+ AC_CHECK_TOOL(PATCH,patch)
+ AC_CHECK_TOOL(BUNZIP2,bunzip2)
+ 
Index: pkg/PLIST

===
RCS file: /cvs/ports/sysutils/opam/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   22 May 2020 19:31:20 -  1.2
+++ pkg/PLIST   31 Dec 2021 07:34:49 -
@@ -25,6 +25,8 @@
 @man man/man1/opam-installer.1
 @man man/man1/opam-lint.1
 @man man/man1/opam-list.1
+@man man/man1/opam-lock.1
+@man man/man1/opam-option.1
 @man man/man1/opam-pin.1
 @man man/man1/opam-reinstall.1
 @man man/man1/opam-remote.1
@@ -47,6 +49,7 @@ share/doc/opam/depexts-plugins
 share/doc/opam/depopts-and-features
 share/doc/opam/pages/
 share/doc/opam/pages/About.md
+share/doc/opam/pages/Distribution.md
 share/doc/opam/pages/External_solvers.md
 share/doc/opam/pages/FAQ.md
 share/doc/opam/pages/Install.md