Good morning 2022,
niyalevi@gmail.com (Shadrock Uhuru), 2021.01.01 (Sat) 05:54 (CET):
> > From: Stuart Henderson <stu.lists@spacehopper.org>
> > To: misc@openbsd.org
> > Date: Tue, 28 Dec 2021 12:55:27 -0000 (UTC)
> > Subject: Re: raspberry pi 3b+ how to boot with hdmi
>
> > > On 2021-12-28, Shadrock Uhuru <niyalevi@gmail.com> wrote:
> > > i have successfully installed the latest snapshot onto a rpi3b+
> > > using a serial cable,
> > > after rebooting still with the serial cable everything startup fine,
> > > when i try to reboot with a hdmi monitor connected
> > > i get a few line at startup then the screen goes blank,
> > > what configuration do i change to make the hdmi monitor the primary
> > > display when booting ?
>
> > See the text around "To use video output on the framebuffer instead"
> > in the INSTALL.arm64 file distributed with the install sets.
>
> i now have output on the hdmi monitor,
> one thing that i've noticed is the boot up information
> stops after displaying the date and doesn't proceed to the login prompt,
> i can ping and ssh into the pi but no login prompt,
It might need something like this in /etc/ttys:
ttyC0 "/usr/libexec/getty std.9600" vt220 on secure
See ttys(5)!
Marcus
Friday, December 31, 2021
disk lights on but top showed nothing!
The lights on my server which shows that the disks are busy were on and not
just flashing and I looked at top and usually it's because security is
running, but this time NOTHING! I even killed Firefox and by far the
busiest thing on there was top! pftop didn't seem especially busy either!--
-Luke
just flashing and I looked at top and usually it's because security is
running, but this time NOTHING! I even killed Firefox and by far the
busiest thing on there was top! pftop didn't seem especially busy either!--
-Luke
Re: raspberry pi 3b+ how to boot with hdmi
> From: Stuart Henderson <stu.lists@spacehopper.org>
> To: misc@openbsd.org
> Date: Tue, 28 Dec 2021 12:55:27 -0000 (UTC)
> Subject: Re: raspberry pi 3b+ how to boot with hdmi
> > On 2021-12-28, Shadrock Uhuru <niyalevi@gmail.com> wrote:
> > hi everyone
> > i have successfully installed the latest snapshot onto a rpi3b+
> > using a serial cable,
> > after rebooting still with the serial cable everything startup fine,
> > when i try to reboot with a hdmi monitor connected
> > i get a few line at startup then the screen goes blank,
> > what configuration do i change to make the hdmi monitor the primary
> > display when booting ?
> See the text around "To use video output on the framebuffer instead"
> in the INSTALL.arm64 file distributed with the install sets.
hi stuart
thanks for the reply,
i now have output on the hdmi monitor,
one thing that i've noticed is the boot up information
stops after displaying the date and doesn't proceed to the login prompt,
i can ping and ssh into the pi but no login prompt,
is there still something i need to do ?
shadrock
> To: misc@openbsd.org
> Date: Tue, 28 Dec 2021 12:55:27 -0000 (UTC)
> Subject: Re: raspberry pi 3b+ how to boot with hdmi
> > On 2021-12-28, Shadrock Uhuru <niyalevi@gmail.com> wrote:
> > hi everyone
> > i have successfully installed the latest snapshot onto a rpi3b+
> > using a serial cable,
> > after rebooting still with the serial cable everything startup fine,
> > when i try to reboot with a hdmi monitor connected
> > i get a few line at startup then the screen goes blank,
> > what configuration do i change to make the hdmi monitor the primary
> > display when booting ?
> See the text around "To use video output on the framebuffer instead"
> in the INSTALL.arm64 file distributed with the install sets.
hi stuart
thanks for the reply,
i now have output on the hdmi monitor,
one thing that i've noticed is the boot up information
stops after displaying the date and doesn't proceed to the login prompt,
i can ping and ssh into the pi but no login prompt,
is there still something i need to do ?
shadrock
The License of the Official Website
Hi list,
I am a developer from China and we are considering translating the
official OpenBSD website (especially the FAQ) into Chinese.
But we have not found the license of the website.Could we do this?
If so,what license should we use?
Yours,
Suote127
I am a developer from China and we are considering translating the
official OpenBSD website (especially the FAQ) into Chinese.
But we have not found the license of the website.Could we do this?
If so,what license should we use?
Yours,
Suote127
Re: 转发: Apply for a new community group
On 22/01/01 02:26AM, Boling Hanjingxue wrote:
>
> I am Hanjingxue<https://github.com/Hanjingxue-Boling> from a newly
> established openBSD community, and we are building a Chinese openBSD
> community<https://github.com/openbsd-zh-association>. We would like
> that the openBSD project will add the "openBSD 中文结社" to the list
> of OpenBSD User Groups as well.
I'm not sure how this community is supposed to work and the linked
community page is effectively empty. I would expect things like a list
of upcoming events and at least some text to explain what you are doing.
Just saying 'Chinese OpenBSD Association' is too vague to be useful to
your readers.
Maybe grow your community a bit and then apply again?
>
> --------
> Detailed information:
> 0
> C China
> P Bejing
> T Chaoyang
> F Irregular
> O OpenBSD Chinese Association
> I BearChild
> M zh-openbsd@protonmail.com
> U https://github.com/openbsd-zh-association
> N OpenBSD|*BSD
>
> I am Hanjingxue<https://github.com/Hanjingxue-Boling> from a newly
> established openBSD community, and we are building a Chinese openBSD
> community<https://github.com/openbsd-zh-association>. We would like
> that the openBSD project will add the "openBSD 中文结社" to the list
> of OpenBSD User Groups as well.
I'm not sure how this community is supposed to work and the linked
community page is effectively empty. I would expect things like a list
of upcoming events and at least some text to explain what you are doing.
Just saying 'Chinese OpenBSD Association' is too vague to be useful to
your readers.
Maybe grow your community a bit and then apply again?
>
> --------
> Detailed information:
> 0
> C China
> P Bejing
> T Chaoyang
> F Irregular
> O OpenBSD Chinese Association
> I BearChild
> M zh-openbsd@protonmail.com
> U https://github.com/openbsd-zh-association
> N OpenBSD|*BSD
转发: Apply for a new community group
0
C China
P Bejing
T Chaoyang
F Irregular
O OpenBSD Chinese Association
I BearChild
M zh-openbsd@protonmail.com
U https://github.com/openbsd-zh-association
N OpenBSD|*BSD
________________________________
发件人: Boling Hanjingxue <BolingH@outlook.com>
发送时间: 2021年12月29日 0:00
收件人: misc@openbsd.org <misc@openbsd.org>
抄送: zh-openbsd@protonmail.com <zh-openbsd@protonmail.com>
主题: Apply for a new community group
Hi,
I am Hanjingxue<https://github.com/Hanjingxue-Boling> from a newly established openBSD community, and we are building a Chinese openBSD community<https://github.com/openbsd-zh-association>. We would like that the openBSD project will add the "openBSD 中文结社" to the list of OpenBSD User Groups as well.
Sincerely,
Hanjingxue Boling.
--------
Detailed information:
0
C China
P Bejing
T Chaoyang
F Irregular
O OpenBSD Chinese Association
I BearChild
M zh-openbsd@protonmail.com
U https://github.com/openbsd-zh-association
N OpenBSD|*BSD
C China
P Bejing
T Chaoyang
F Irregular
O OpenBSD Chinese Association
I BearChild
M zh-openbsd@protonmail.com
U https://github.com/openbsd-zh-association
N OpenBSD|*BSD
________________________________
发件人: Boling Hanjingxue <BolingH@outlook.com>
发送时间: 2021年12月29日 0:00
收件人: misc@openbsd.org <misc@openbsd.org>
抄送: zh-openbsd@protonmail.com <zh-openbsd@protonmail.com>
主题: Apply for a new community group
Hi,
I am Hanjingxue<https://github.com/Hanjingxue-Boling> from a newly established openBSD community, and we are building a Chinese openBSD community<https://github.com/openbsd-zh-association>. We would like that the openBSD project will add the "openBSD 中文结社" to the list of OpenBSD User Groups as well.
Sincerely,
Hanjingxue Boling.
--------
Detailed information:
0
C China
P Bejing
T Chaoyang
F Irregular
O OpenBSD Chinese Association
I BearChild
M zh-openbsd@protonmail.com
U https://github.com/openbsd-zh-association
N OpenBSD|*BSD
Re: PHP 500 error does not redirect to custom error page in httpd
<kolipe.c@exoticsilicon.com> wrote:
> > Oh, the problem is that httpd cannot intercept fast-cgi errors.
>
> Yes it can...
>
> ... if you hack the server_abort_http function in server_http.c :-)
>
> Have a look at our 404 page, for example:
>
> https://www.exoticsilicon.com/foobar
>
> That's httpd ;-)
Then please share your patch. Also, submit the patch to @tech for evaluation, perhaps it will be integrated.
> > Oh, the problem is that httpd cannot intercept fast-cgi errors.
>
> Yes it can...
>
> ... if you hack the server_abort_http function in server_http.c :-)
>
> Have a look at our 404 page, for example:
>
> https://www.exoticsilicon.com/foobar
>
> That's httpd ;-)
Then please share your patch. Also, submit the patch to @tech for evaluation, perhaps it will be integrated.
Re: PHP 500 error does not redirect to custom error page in httpd
On Fri, Dec 31, 2021 at 09:13:38PM +0000, iio7@protonmail.com wrote:
> Oh, the problem is that httpd cannot intercept fast-cgi errors.
Yes it can...
... if you hack the server_abort_http function in server_http.c :-)
Have a look at our 404 page, for example:
https://www.exoticsilicon.com/foobar
That's httpd ;-)
> Oh, the problem is that httpd cannot intercept fast-cgi errors.
Yes it can...
... if you hack the server_abort_http function in server_http.c :-)
Have a look at our 404 page, for example:
https://www.exoticsilicon.com/foobar
That's httpd ;-)
Re: PHP 500 error does not redirect to custom error page in httpd
Oh, the problem is that httpd cannot intercept fast-cgi errors.
> I have custom error pages working with the errdocs directive in
> httpd.conf.
>
> 400 not found and 500 internal error both works.
>
> If I manually create an internal error by misconfiguring httpd by
> using something like:
>
> fastcgi socket "/run/foo.sock"
>
> Then httpd will display the custom 500 page.
>
> However, when I manually raise a 500 error with PHP by throwing an
> exception, the browser receives a 500 responds header, but the custom
> 500 page is not shown when display errors is off.
>
> I understand that a 500 error IS a web server internal error, and PHP
> is kindda running on top of that, but should httpd not use the custom
> 500 error page when PHP is creating a 500 error?
>
> What have I misunderstood?
> I have custom error pages working with the errdocs directive in
> httpd.conf.
>
> 400 not found and 500 internal error both works.
>
> If I manually create an internal error by misconfiguring httpd by
> using something like:
>
> fastcgi socket "/run/foo.sock"
>
> Then httpd will display the custom 500 page.
>
> However, when I manually raise a 500 error with PHP by throwing an
> exception, the browser receives a 500 responds header, but the custom
> 500 page is not shown when display errors is off.
>
> I understand that a 500 error IS a web server internal error, and PHP
> is kindda running on top of that, but should httpd not use the custom
> 500 error page when PHP is creating a 500 error?
>
> What have I misunderstood?
Re: UPDATE: aom 3.2.0
On Thu, Dec 30, 2021 at 08:35:07PM -0500, Brad Smith wrote:
> Here is an udpate to aom 3.2.0.
>
>
> 2021-10-13 v3.2.0
> This release includes compression efficiency and perceptual quality
> improvements, speedup and memory optimizations, as well as some new
> features.
>
> - New Features
> * Introduced speeds 7, 8, and 9 for all intra mode.
> * Introduced speed 10 for real time mode.
> * Introduced an API that allows external partition decisions.
> * SVC: added support for compound prediction.
> * SVC: added support for fixed SVC modes.
>
> - Compression Efficiency Improvements
> * Intra-mode search improvement.
> * Improved real time (RT) mode BDrate savings by ~5% (RT speed 5)
> and ~12% (RT speed 6). The improvement was measured on the video
> conference set.
> * Improved real time mode for nonrd path (speed 7, 8, 9): BDrate
> gains of ~3-5%.
> * Rate control and RD adjustments based on ML research in VP9.
> Gains of ~0.5-1.0% for HD.
>
> - Perceptual Quality Improvements
> * Added a new mode --deltaq-mode=3 to improve perceptual quality
> based on a differential contrast model for still images.
> * Added a new mode â€"deltaq-mode=4 to improve perceptual quality
> based on user rated cq_level data set for still images.
> * Weighting of some intra mode and partition size choices to better
> manage and retain texture.
>
> - Speedup and Memory Optimizations
> * Further improved 2-pass good quality encoder speed:
> o Speed 2 speedup: 18%
> o Speed 3 speedup: 22%
> o Speed 4 speedup: 37%
> o Speed 5 speedup: 30%
> o Speed 6 speedup: 20%
> * Optimized the real time encoder (measured on the video conference
> set):
> o RT speed 5 speedup: 110%
> o RT speed 6 speedup: 77%
>
> - Bug Fixes
> * Issue 3069: Fix one-pass mode keyframe placement off-by-one error.
> * Issue 3156: Fix a bug in av1_quantize_lp AVX2 optimization.
Oops. Forgot cvs add of a patch before creating the diff.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/multimedia/aom/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- Makefile 16 Oct 2021 07:59:50 -0000 1.11
+++ Makefile 30 Dec 2021 21:54:23 -0000
@@ -4,10 +4,10 @@ COMMENT= Alliance for Open Media AV1 vid
GH_ACCOUNT= jbeich
GH_PROJECT= aom
-GH_TAGNAME= v3.1.3
+GH_TAGNAME= v3.2.0
CATEGORIES= multimedia
-SHARED_LIBS= aom 3.0
+SHARED_LIBS= aom 4.0
HOMEPAGE= https://aomedia.org/
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/multimedia/aom/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- distinfo 16 Oct 2021 07:59:50 -0000 1.11
+++ distinfo 17 Oct 2021 00:33:29 -0000
@@ -1,2 +1,2 @@
-SHA256 (aom-3.1.3.tar.gz) = AsTGVSzOgacQbwnF3fORKXnW6mtr32p2c/CICfvrTHQ=
-SIZE (aom-3.1.3.tar.gz) = 4614421
+SHA256 (aom-3.2.0.tar.gz) = 70kYL5n3PCMeZQIRWEqA/e3WqzGb4Gs/rU/8tW28Nic=
+SIZE (aom-3.2.0.tar.gz) = 4728473
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 -0000
+++ patches/patch-CMakeLists_txt 30 Dec 2021 21:47:22 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -739,7 +739,7 @@ if(ENABLE_EXAMPLES AND "${CMAKE_GENERATOR}" MATCHES "M
+ endif()
+
+ if(BUILD_SHARED_LIBS)
+- if(NOT WIN32 AND NOT APPLE)
++ if(NOT WIN32 AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
+ # The -z defs linker option reports unresolved symbol references from object
+ # files when building a shared library.
+ if("${CMAKE_VERSION}" VERSION_LESS "3.13")
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/multimedia/aom/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- pkg/PLIST 7 Mar 2020 13:32:40 -0000 1.2
+++ pkg/PLIST 30 Dec 2021 21:52:16 -0000
@@ -6,6 +6,7 @@ include/aom/aom.h
include/aom/aom_codec.h
include/aom/aom_decoder.h
include/aom/aom_encoder.h
+include/aom/aom_external_partition.h
include/aom/aom_frame_buffer.h
include/aom/aom_image.h
include/aom/aom_integer.h
> Here is an udpate to aom 3.2.0.
>
>
> 2021-10-13 v3.2.0
> This release includes compression efficiency and perceptual quality
> improvements, speedup and memory optimizations, as well as some new
> features.
>
> - New Features
> * Introduced speeds 7, 8, and 9 for all intra mode.
> * Introduced speed 10 for real time mode.
> * Introduced an API that allows external partition decisions.
> * SVC: added support for compound prediction.
> * SVC: added support for fixed SVC modes.
>
> - Compression Efficiency Improvements
> * Intra-mode search improvement.
> * Improved real time (RT) mode BDrate savings by ~5% (RT speed 5)
> and ~12% (RT speed 6). The improvement was measured on the video
> conference set.
> * Improved real time mode for nonrd path (speed 7, 8, 9): BDrate
> gains of ~3-5%.
> * Rate control and RD adjustments based on ML research in VP9.
> Gains of ~0.5-1.0% for HD.
>
> - Perceptual Quality Improvements
> * Added a new mode --deltaq-mode=3 to improve perceptual quality
> based on a differential contrast model for still images.
> * Added a new mode â€"deltaq-mode=4 to improve perceptual quality
> based on user rated cq_level data set for still images.
> * Weighting of some intra mode and partition size choices to better
> manage and retain texture.
>
> - Speedup and Memory Optimizations
> * Further improved 2-pass good quality encoder speed:
> o Speed 2 speedup: 18%
> o Speed 3 speedup: 22%
> o Speed 4 speedup: 37%
> o Speed 5 speedup: 30%
> o Speed 6 speedup: 20%
> * Optimized the real time encoder (measured on the video conference
> set):
> o RT speed 5 speedup: 110%
> o RT speed 6 speedup: 77%
>
> - Bug Fixes
> * Issue 3069: Fix one-pass mode keyframe placement off-by-one error.
> * Issue 3156: Fix a bug in av1_quantize_lp AVX2 optimization.
Oops. Forgot cvs add of a patch before creating the diff.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/multimedia/aom/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- Makefile 16 Oct 2021 07:59:50 -0000 1.11
+++ Makefile 30 Dec 2021 21:54:23 -0000
@@ -4,10 +4,10 @@ COMMENT= Alliance for Open Media AV1 vid
GH_ACCOUNT= jbeich
GH_PROJECT= aom
-GH_TAGNAME= v3.1.3
+GH_TAGNAME= v3.2.0
CATEGORIES= multimedia
-SHARED_LIBS= aom 3.0
+SHARED_LIBS= aom 4.0
HOMEPAGE= https://aomedia.org/
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/multimedia/aom/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- distinfo 16 Oct 2021 07:59:50 -0000 1.11
+++ distinfo 17 Oct 2021 00:33:29 -0000
@@ -1,2 +1,2 @@
-SHA256 (aom-3.1.3.tar.gz) = AsTGVSzOgacQbwnF3fORKXnW6mtr32p2c/CICfvrTHQ=
-SIZE (aom-3.1.3.tar.gz) = 4614421
+SHA256 (aom-3.2.0.tar.gz) = 70kYL5n3PCMeZQIRWEqA/e3WqzGb4Gs/rU/8tW28Nic=
+SIZE (aom-3.2.0.tar.gz) = 4728473
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 -0000
+++ patches/patch-CMakeLists_txt 30 Dec 2021 21:47:22 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -739,7 +739,7 @@ if(ENABLE_EXAMPLES AND "${CMAKE_GENERATOR}" MATCHES "M
+ endif()
+
+ if(BUILD_SHARED_LIBS)
+- if(NOT WIN32 AND NOT APPLE)
++ if(NOT WIN32 AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
+ # The -z defs linker option reports unresolved symbol references from object
+ # files when building a shared library.
+ if("${CMAKE_VERSION}" VERSION_LESS "3.13")
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/multimedia/aom/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- pkg/PLIST 7 Mar 2020 13:32:40 -0000 1.2
+++ pkg/PLIST 30 Dec 2021 21:52:16 -0000
@@ -6,6 +6,7 @@ include/aom/aom.h
include/aom/aom_codec.h
include/aom/aom_decoder.h
include/aom/aom_encoder.h
+include/aom/aom_external_partition.h
include/aom/aom_frame_buffer.h
include/aom/aom_image.h
include/aom/aom_integer.h
PHP 500 error does not redirect to custom error page in httpd
I have custom error pages working with the errdocs directive in
httpd.conf.
400 not found and 500 internal error both works.
If I manually create an internal error by misconfiguring httpd by using
something like:
fastcgi socket "/run/foo.sock"
Then httpd will display the custom 500 page.
However, when I manually raise a 500 error with PHP by throwing an
exception, the browser receives a 500 responds header, but the custom
500 page is not shown when display errors is off.
I understand that a 500 error IS a web server internal error, and PHP
is kindda running on top of that, but should httpd not use the custom
500 error page when PHP is creating a 500 error?
What have I misunderstood?
httpd.conf.
400 not found and 500 internal error both works.
If I manually create an internal error by misconfiguring httpd by using
something like:
fastcgi socket "/run/foo.sock"
Then httpd will display the custom 500 page.
However, when I manually raise a 500 error with PHP by throwing an
exception, the browser receives a 500 responds header, but the custom
500 page is not shown when display errors is off.
I understand that a 500 error IS a web server internal error, and PHP
is kindda running on top of that, but should httpd not use the custom
500 error page when PHP is creating a 500 error?
What have I misunderstood?
Re: Update sysutils/opam to 2.1.2
1) I get a bunch of failures like this when running "make test". we
probably have to neuter "-- strip-trailing-cr" usage?
var-option diff: unknown option -- strip-trailing-cr
usage: diff [-abdipTtw] [-c | -e | -f | -n | -q | -u] [-I pattern] [-L label]
file1 file2
diff [-abdipTtw] [-I pattern] [-L label] -C number file1 file2
diff [-abditw] [-I pattern] -D string file1 file2
diff [-abdipTtw] [-I pattern] [-L label] -U number file1 file2
diff [-abdiNPprsTtw] [-c | -e | -f | -n | -q | -u] [-I pattern]
[-L label] [-S name] [-X file] [-x pattern] dir1 dir2
[FAIL]
2) Running portcheck resulted in:
C++ libraries in WANTLIB with default COMPILER (most ports need
'COMPILER=base-clang ports-gcc' or 'COMPILER=base-clang ports-gcc
base-gcc')
On Fri, Dec 31, 2021 at 2:36 AM Christopher Zimmermann
<chrisz@openbsd.org> wrote:
>
> 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
> --- Makefile 10 Dec 2021 04:11:00 -0000 1.23
> +++ Makefile 31 Dec 2021 07:34:49 -0000
> @@ -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
> --- distinfo 23 Feb 2021 05:25:04 -0000 1.8
> +++ distinfo 31 Dec 2021 07:34:49 -0000
> @@ -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 -0000
> +++ patches/patch-Makefile_config_in 31 Dec 2021 07:34:49 -0000
> @@ -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 -0000
> +++ patches/patch-configure_ac 31 Dec 2021 07:34:49 -0000
> @@ -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 -0000 1.2
> +++ pkg/PLIST 31 Dec 2021 07:34:49 -0000
> @@ -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
probably have to neuter "-- strip-trailing-cr" usage?
var-option diff: unknown option -- strip-trailing-cr
usage: diff [-abdipTtw] [-c | -e | -f | -n | -q | -u] [-I pattern] [-L label]
file1 file2
diff [-abdipTtw] [-I pattern] [-L label] -C number file1 file2
diff [-abditw] [-I pattern] -D string file1 file2
diff [-abdipTtw] [-I pattern] [-L label] -U number file1 file2
diff [-abdiNPprsTtw] [-c | -e | -f | -n | -q | -u] [-I pattern]
[-L label] [-S name] [-X file] [-x pattern] dir1 dir2
[FAIL]
2) Running portcheck resulted in:
C++ libraries in WANTLIB with default COMPILER (most ports need
'COMPILER=base-clang ports-gcc' or 'COMPILER=base-clang ports-gcc
base-gcc')
On Fri, Dec 31, 2021 at 2:36 AM Christopher Zimmermann
<chrisz@openbsd.org> wrote:
>
> 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
> --- Makefile 10 Dec 2021 04:11:00 -0000 1.23
> +++ Makefile 31 Dec 2021 07:34:49 -0000
> @@ -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
> --- distinfo 23 Feb 2021 05:25:04 -0000 1.8
> +++ distinfo 31 Dec 2021 07:34:49 -0000
> @@ -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 -0000
> +++ patches/patch-Makefile_config_in 31 Dec 2021 07:34:49 -0000
> @@ -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 -0000
> +++ patches/patch-configure_ac 31 Dec 2021 07:34:49 -0000
> @@ -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 -0000 1.2
> +++ pkg/PLIST 31 Dec 2021 07:34:49 -0000
> @@ -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
Re: New: graphics/libyuv 0.0.1807
On Fri, Dec 31, 2021 at 09:19:34AM +0000, Stuart Henderson wrote:
>On 2021/12/31 06:51, Andrew Krasavin wrote:
>> 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:
>
>Given what you've said about libyuv, I think this approach could be
>problematic and that it makes more sense to use the bundled copy.
>
>As well as avoiding the problems you've mentioned, it reduces the
>risk of it interfering with build of the chromium-based ports
>(chromium/iridium/electron/qtwebengine) which won't expect a system copy
>of this library/headers.
>
Thank you for your reply.
Yes, google's approach to libyuv development creates some
inconveniences, but it looks like we've managed to solve them, and
in a rather "cheap" way.
I described the nuances of the libyuv port not to show "how hard it
was" (it wasn't hard), but to make the reasons for my decisions
clear.
Using a bundled version is definitely easier. However, it can cause
delayed problems typical for static builds. I like the idea of having
a port with normal versioning and keeping track of it, rather than
relying on a bunch of bundles with undefined and/or unknown versions.
Having tests in my port also seems to me to be an advantage over
bundled versions.
The question about Chromium/Electron/etc is interesting and needs
research.
At first glance, there should be no problem, since
1) chromium and others, if I'm not confused, use static rather than
dynamic linking for libyuv and don't rely on header files and/or
library in the system at all; the paths to libyuv header files are
hardcoded.
2) Some popular linux distributions that have chromium in their
repositories also have a package with libyuv. I haven't looked at
all their build scripts, but, for example, PKGBUILD for archlinux
definitely doesn't contain any libyuv-related hacks and workarounds.
3) Openh264 and usrsctp have recently been added to the ports tree,
which are also used in chromium and come as bundles within it.
(libyuv in distros: https://repology.org/project/libyuv/versions)
--
Wbr, Andrew Krasavin
>On 2021/12/31 06:51, Andrew Krasavin wrote:
>> 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:
>
>Given what you've said about libyuv, I think this approach could be
>problematic and that it makes more sense to use the bundled copy.
>
>As well as avoiding the problems you've mentioned, it reduces the
>risk of it interfering with build of the chromium-based ports
>(chromium/iridium/electron/qtwebengine) which won't expect a system copy
>of this library/headers.
>
Thank you for your reply.
Yes, google's approach to libyuv development creates some
inconveniences, but it looks like we've managed to solve them, and
in a rather "cheap" way.
I described the nuances of the libyuv port not to show "how hard it
was" (it wasn't hard), but to make the reasons for my decisions
clear.
Using a bundled version is definitely easier. However, it can cause
delayed problems typical for static builds. I like the idea of having
a port with normal versioning and keeping track of it, rather than
relying on a bunch of bundles with undefined and/or unknown versions.
Having tests in my port also seems to me to be an advantage over
bundled versions.
The question about Chromium/Electron/etc is interesting and needs
research.
At first glance, there should be no problem, since
1) chromium and others, if I'm not confused, use static rather than
dynamic linking for libyuv and don't rely on header files and/or
library in the system at all; the paths to libyuv header files are
hardcoded.
2) Some popular linux distributions that have chromium in their
repositories also have a package with libyuv. I haven't looked at
all their build scripts, but, for example, PKGBUILD for archlinux
definitely doesn't contain any libyuv-related hacks and workarounds.
3) Openh264 and usrsctp have recently been added to the ports tree,
which are also used in chromium and come as bundles within it.
(libyuv in distros: https://repology.org/project/libyuv/versions)
--
Wbr, Andrew Krasavin
Re: Is fw_update documentation outdated?
Hi Ingo,
On 2021/12/26 23:26, Ingo Schwarze wrote:
> Hi Alexander,
>
> Alexander wrote on Sun, Dec 26, 2021 at 08:11:51PM +0000:
> > On 2021/12/25 18:02, Ingo Schwarze wrote:
>
> >> The new fw_update shell script is not in CVS yet.
> >>
> >> This command provides a clue that could lead you to suspect the above:
> >>
> >> $ grep -m 1 OpenBSD $(which fw_update)
> >> # $OpenBSD$
> >>
> >> That's a CVS tag which has not been processed by CVS yet.
>
> > Just to keep the noise on the mailing list down in case I run into
> > something like this again at some point:
> > Is that tag the usual indicator of such uncommitted code
>
> No, it is not usual. In most cases of uncommitted patches that
> are being tested in snapshots, the patches change *.c files before
> compiling. Compiled files in OpenBSD usually do not contain the CVS
> IDs of the source files used. Some historical operating systems
> (and maybe even a few current systems, i'm not sure about that)
> did include SCCS or CVS tags into compiled files, and that's what
> the what(1) utility was designed for in the remote past:
>
> $ what /usr/src/bin/cat/*.c
> /usr/src/bin/cat/cat.c:
> $OpenBSD: cat.c,v 1.32 2021/10/24 21:24:21 deraadt Exp $
> $ what /bin/cat
> /bin/cat:
> $
>
> On some other or older systems, "what /bin/cat" might also return the
> CVS ID(s). But even that wouldn't really help for your purpose.
> In most cases, it would only be the ID of the latest commited
> revision; the patch being tested would typically change some lines
> of code, but it would usually not change the ID.
>
> You only saw the unexpanded $OpenBSD$ ID in this case because it
> was a completely new uncommitted file intended for later commit,
> and because it was not a compiled file but a script where the
> source code gets installed directly.
>
> In the rare cases where you do find such an unexpanded CVS ID, it's a
> medium strength indicator pointing to a possible uncommitted patch,
> but even then it's not 100% certain - there could be other, even more
> unusual reasons for seeing such a thing.
>
> > or are there other things I should look for before asking here again?
>
> In general, it can be quite hard to identify uncommitted changes,
> even for developers. A generally working way to identify them
> basically does not exist. (And maintaining an official list would
> be a horrendous make-work project.)
>
> Sometimes, compiling the tool that behaves strangely yourself
> from CVS -current sources and comparing behaviour to the same
> tool in the snapshot may help - if behaviour differs, that's
> a medium strength indicator of a possible uncommitted patch.
> Or, of course, you might have miscompiled it...
> Your specific example demonstrates that this suggestion does
> not always help: nothing to compile there, and you (rightly)
> failed to even find any sources...
>
> For users, i think best practice is as follows: if something does not
> work as you think it should, and if reviewing the manual pages, the
> FAQ, and searching through recent postings on tech@, bugs@, and misc@
> still leaves you wondering, then ask, providing as much much detail
> as you can: which exact OS version or snapshot, what exactly you did,
> what you expected, and what happened instead. If the tool misbehaves
> in the snapshot but works when you compile it yourself from -current,
> say so. In other words, your report was of very reasonable quality.
> Nobody will expect that you make a definitive statement like "this is a
> regression caused by an uncommitted patch in snapshots" in your report.
Thanks a lot. That's a very helpful explanation and I will keep that in
mind.
>
> If it appears to misbehave, it's worth a report. And if there
> is an uncommitted patch in snapshot, than hopefully at least one
> developer is watching closely. After all, asking Theo to put a
> patch into snapshots for testing but then *not* watch the bugs@
> mailing list for reports that might be related would make very
> little sense!
>
> Yours,
> Ingo
>
> P.S.
> Currently, it looks relatively unlikely that the new fw_update(8)
> is really going to loose the -n option; or else it might regrow
> it shortly after the initial commit. No guarantee though.
> Best advice for users is to wait for the dust in this area to settle.
I will do that ;) Thank you for making an os that is actually so
reliable and well-designed that I'm not worried at all right now.
Best regards,
Alexander
On 2021/12/26 23:26, Ingo Schwarze wrote:
> Hi Alexander,
>
> Alexander wrote on Sun, Dec 26, 2021 at 08:11:51PM +0000:
> > On 2021/12/25 18:02, Ingo Schwarze wrote:
>
> >> The new fw_update shell script is not in CVS yet.
> >>
> >> This command provides a clue that could lead you to suspect the above:
> >>
> >> $ grep -m 1 OpenBSD $(which fw_update)
> >> # $OpenBSD$
> >>
> >> That's a CVS tag which has not been processed by CVS yet.
>
> > Just to keep the noise on the mailing list down in case I run into
> > something like this again at some point:
> > Is that tag the usual indicator of such uncommitted code
>
> No, it is not usual. In most cases of uncommitted patches that
> are being tested in snapshots, the patches change *.c files before
> compiling. Compiled files in OpenBSD usually do not contain the CVS
> IDs of the source files used. Some historical operating systems
> (and maybe even a few current systems, i'm not sure about that)
> did include SCCS or CVS tags into compiled files, and that's what
> the what(1) utility was designed for in the remote past:
>
> $ what /usr/src/bin/cat/*.c
> /usr/src/bin/cat/cat.c:
> $OpenBSD: cat.c,v 1.32 2021/10/24 21:24:21 deraadt Exp $
> $ what /bin/cat
> /bin/cat:
> $
>
> On some other or older systems, "what /bin/cat" might also return the
> CVS ID(s). But even that wouldn't really help for your purpose.
> In most cases, it would only be the ID of the latest commited
> revision; the patch being tested would typically change some lines
> of code, but it would usually not change the ID.
>
> You only saw the unexpanded $OpenBSD$ ID in this case because it
> was a completely new uncommitted file intended for later commit,
> and because it was not a compiled file but a script where the
> source code gets installed directly.
>
> In the rare cases where you do find such an unexpanded CVS ID, it's a
> medium strength indicator pointing to a possible uncommitted patch,
> but even then it's not 100% certain - there could be other, even more
> unusual reasons for seeing such a thing.
>
> > or are there other things I should look for before asking here again?
>
> In general, it can be quite hard to identify uncommitted changes,
> even for developers. A generally working way to identify them
> basically does not exist. (And maintaining an official list would
> be a horrendous make-work project.)
>
> Sometimes, compiling the tool that behaves strangely yourself
> from CVS -current sources and comparing behaviour to the same
> tool in the snapshot may help - if behaviour differs, that's
> a medium strength indicator of a possible uncommitted patch.
> Or, of course, you might have miscompiled it...
> Your specific example demonstrates that this suggestion does
> not always help: nothing to compile there, and you (rightly)
> failed to even find any sources...
>
> For users, i think best practice is as follows: if something does not
> work as you think it should, and if reviewing the manual pages, the
> FAQ, and searching through recent postings on tech@, bugs@, and misc@
> still leaves you wondering, then ask, providing as much much detail
> as you can: which exact OS version or snapshot, what exactly you did,
> what you expected, and what happened instead. If the tool misbehaves
> in the snapshot but works when you compile it yourself from -current,
> say so. In other words, your report was of very reasonable quality.
> Nobody will expect that you make a definitive statement like "this is a
> regression caused by an uncommitted patch in snapshots" in your report.
Thanks a lot. That's a very helpful explanation and I will keep that in
mind.
>
> If it appears to misbehave, it's worth a report. And if there
> is an uncommitted patch in snapshot, than hopefully at least one
> developer is watching closely. After all, asking Theo to put a
> patch into snapshots for testing but then *not* watch the bugs@
> mailing list for reports that might be related would make very
> little sense!
>
> Yours,
> Ingo
>
> P.S.
> Currently, it looks relatively unlikely that the new fw_update(8)
> is really going to loose the -n option; or else it might regrow
> it shortly after the initial commit. No guarantee though.
> Best advice for users is to wait for the dust in this area to settle.
I will do that ;) Thank you for making an os that is actually so
reliable and well-designed that I'm not worried at all right now.
Best regards,
Alexander
Re: UPDATE net/prosody 0.11.11 from MAINTAINER
Am Wed, 29 Dec 2021 02:54:36 +0000
schrieb Lucas <lucas@sexy.is>:
> Hi ports,
>
> Prosody 0.11.11 release on 20-Dec. The release includes:
>
> ## Fixes and improvements
>
> * net.server_epoll: Prioritize network events over timers to
> improve performance under heavy load
> * mod_pep: Add some memory usage limits
> * mod_pep: Prevent creation of services for non-existent users
> * mod_pep: Free resources on user deletion (needed a restart
> previously)
>
> ## Minor changes
>
> * mod_pep: Free resources on reload
> * mod_c2s: Indicate stream secure state in error text when no
> stream features to offer
> * MUC: Fix logic for access to affiliation lists
> * net.server_epoll: Improvements to shutdown procedure
> [#1670](https://issues.prosody.im/1670)
> * net.server_epoll: Fix potential issue with rescheduling of timers
> * prosodyctl: Fix to ensure LuaFileSystem is loaded when needed
> * util.startup: Fix handling of unknown command line flags (e.g.
> `-h`)
> * Fix version number reported as 'unknown' on *BSD
>
> Given the last point, one of the hunks for makefile can be dropped as
> it was merged upstream.
>
> I tested it in -current amd64 given the amount of changes LibreSSL
> suffered during this cycle and it works fine. David, in Cc, arrived to
> the same patch and is a happy consumer on -stable amd64.
So far no issues on my amd64 production machine. Thank you!
--
greetings,
Florian Viehweger
schrieb Lucas <lucas@sexy.is>:
> Hi ports,
>
> Prosody 0.11.11 release on 20-Dec. The release includes:
>
> ## Fixes and improvements
>
> * net.server_epoll: Prioritize network events over timers to
> improve performance under heavy load
> * mod_pep: Add some memory usage limits
> * mod_pep: Prevent creation of services for non-existent users
> * mod_pep: Free resources on user deletion (needed a restart
> previously)
>
> ## Minor changes
>
> * mod_pep: Free resources on reload
> * mod_c2s: Indicate stream secure state in error text when no
> stream features to offer
> * MUC: Fix logic for access to affiliation lists
> * net.server_epoll: Improvements to shutdown procedure
> [#1670](https://issues.prosody.im/1670)
> * net.server_epoll: Fix potential issue with rescheduling of timers
> * prosodyctl: Fix to ensure LuaFileSystem is loaded when needed
> * util.startup: Fix handling of unknown command line flags (e.g.
> `-h`)
> * Fix version number reported as 'unknown' on *BSD
>
> Given the last point, one of the hunks for makefile can be dropped as
> it was merged upstream.
>
> I tested it in -current amd64 given the amount of changes LibreSSL
> suffered during this cycle and it works fine. David, in Cc, arrived to
> the same patch and is a happy consumer on -stable amd64.
So far no issues on my amd64 production machine. Thank you!
--
greetings,
Florian Viehweger
[update] devel/{intellij,pycharm} to 2021.3.1
diff 358770744b84460c08f7fa451a3c95a0618586ad /usr/ports
blob - 8e30a29efbd45f65b578c3274650877092ac8629
file + devel/intellij/Makefile
--- devel/intellij/Makefile
+++ devel/intellij/Makefile
@@ -2,7 +2,7 @@
COMMENT= IntelliJ IDEA Java IDE
-V= 2021.3
+V= 2021.3.1
DISTNAME= ideaIC-${V}-no-jbr
PKGNAME= intellij-${V}
CATEGORIES= devel
@@ -25,7 +25,7 @@ RUN_DEPENDS= devel/desktop-file-utils \
NO_TEST= Yes
-WRKDIST= ${WRKDIR}/idea-IC-213.5744.223
+WRKDIST= ${WRKDIR}/idea-IC-213.6461.79
IJ= ${PREFIX}/intellij
# If NO_BUILD is set, JAVA_HOME doesn't get defined. So do
blob - 5a536891cced01a586be407606bf7e90d47d34af
file + devel/intellij/distinfo
--- devel/intellij/distinfo
+++ devel/intellij/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ideaIC-2021.3-no-jbr.tar.gz) = 23VAQHpxfwbAOqr238nbXL4sB13gz8TubAF3WreMWU4=
-SIZE (ideaIC-2021.3-no-jbr.tar.gz) = 629835415
+SHA256 (ideaIC-2021.3.1-no-jbr.tar.gz) = tj+rNj94dyhQyH9HbnAKOOfmvqSAzo+zHArOxP4z3xI=
+SIZE (ideaIC-2021.3.1-no-jbr.tar.gz) = 636967985
blob - b5d869f9ba724a3c3435b013e20f2b76550ed8f8
file + devel/intellij/pkg/PLIST
--- devel/intellij/pkg/PLIST
+++ devel/intellij/pkg/PLIST
@@ -100,7 +100,7 @@ intellij/lib/asm-tree-7.1.jar
intellij/lib/asm-util-7.1.jar
intellij/lib/async-profiler.jar
intellij/lib/bootstrap.jar
-intellij/lib/build-marker-IC-213.5744.223
+intellij/lib/build-marker-IC-213.6461.79
intellij/lib/byte-buddy-agent.jar
intellij/lib/cds/
intellij/lib/cds/classesLogAgent.jar
@@ -401,15 +401,15 @@ intellij/plugins/cwm-plugin-projector/lib/cwm-plugin-p
intellij/plugins/cwm-plugin-projector/lib/projector/
intellij/plugins/cwm-plugin-projector/lib/projector/Java-WebSocket-1.4.0.jar
intellij/plugins/cwm-plugin-projector/lib/projector/kotlinx-serialization-protobuf-jvm-1.3.0.jar
-intellij/plugins/cwm-plugin-projector/lib/projector/projector-agent-initialization-f1e52565.jar
-intellij/plugins/cwm-plugin-projector/lib/projector/projector-awt-1f1cc5e8.jar
-intellij/plugins/cwm-plugin-projector/lib/projector/projector-common-f1e52565.jar
-intellij/plugins/cwm-plugin-projector/lib/projector/projector-common-jvm-f1e52565.jar
-intellij/plugins/cwm-plugin-projector/lib/projector/projector-server-1f1cc5e8.jar
-intellij/plugins/cwm-plugin-projector/lib/projector/projector-server-core-f1e52565.jar
-intellij/plugins/cwm-plugin-projector/lib/projector/projector-util-agent-f1e52565.jar
-intellij/plugins/cwm-plugin-projector/lib/projector/projector-util-loading-f1e52565.jar
-intellij/plugins/cwm-plugin-projector/lib/projector/projector-util-logging-jvm-f1e52565.jar
+intellij/plugins/cwm-plugin-projector/lib/projector/projector-awt-30f65afc.jar
+intellij/plugins/cwm-plugin-projector/lib/projector/projector-common-1731046c.jar
+intellij/plugins/cwm-plugin-projector/lib/projector/projector-common-jvm-1731046c.jar
+intellij/plugins/cwm-plugin-projector/lib/projector/projector-ij-common-1731046c.jar
+intellij/plugins/cwm-plugin-projector/lib/projector/projector-server-30f65afc.jar
+intellij/plugins/cwm-plugin-projector/lib/projector/projector-server-core-1731046c.jar
+intellij/plugins/cwm-plugin-projector/lib/projector/projector-util-agent-1731046c.jar
+intellij/plugins/cwm-plugin-projector/lib/projector/projector-util-loading-1731046c.jar
+intellij/plugins/cwm-plugin-projector/lib/projector/projector-util-logging-jvm-1731046c.jar
intellij/plugins/cwm-plugin/jre-build.txt
intellij/plugins/cwm-plugin/lib/
intellij/plugins/cwm-plugin/lib/bouncy-castle-pgp.jar
diff 358770744b84460c08f7fa451a3c95a0618586ad /usr/ports
blob - fd832632bc9c337d6feca649efdc2d6ce4e562bb
file + devel/pycharm/Makefile
--- devel/pycharm/Makefile
+++ devel/pycharm/Makefile
@@ -2,7 +2,7 @@
COMMENT= Python IDE based on IntelliJ IDEA
-V= 2021.3
+V= 2021.3.1
DISTNAME= pycharm-community-${V}
PKGNAME= pycharm-${V}
CATEGORIES= devel
blob - 528c20bbb9bf0ef2954b622300de32bce33ebfb2
file + devel/pycharm/distinfo
--- devel/pycharm/distinfo
+++ devel/pycharm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pycharm-community-2021.3-no-jbr.tar.gz) = ciRYYd+K2Wdqsk/WdxartbyGl03awWigRS7ORn6KsSk=
-SIZE (pycharm-community-2021.3-no-jbr.tar.gz) = 331975435
+SHA256 (pycharm-community-2021.3.1-no-jbr.tar.gz) = wRxr3D/4uAMq3baMophmtX4Bdt6as8n3EHPJ0z7LPUg=
+SIZE (pycharm-community-2021.3.1-no-jbr.tar.gz) = 338990714
blob - 2da2f39160fe64fec439c4ec7ca86173665498f0
file + devel/pycharm/pkg/PLIST
--- devel/pycharm/pkg/PLIST
+++ devel/pycharm/pkg/PLIST
@@ -36,7 +36,7 @@ pycharm/lib/asm-tree-7.1.jar
pycharm/lib/asm-util-7.1.jar
pycharm/lib/async-profiler.jar
pycharm/lib/bootstrap.jar
-pycharm/lib/build-marker-PC-213.5744.248
+pycharm/lib/build-marker-PC-213.6461.77
pycharm/lib/byte-buddy-agent.jar
pycharm/lib/cds/
pycharm/lib/cds/classesLogAgent.jar
@@ -141,15 +141,15 @@ pycharm/plugins/cwm-plugin-projector/lib/cwm-plugin-pr
pycharm/plugins/cwm-plugin-projector/lib/projector/
pycharm/plugins/cwm-plugin-projector/lib/projector/Java-WebSocket-1.4.0.jar
pycharm/plugins/cwm-plugin-projector/lib/projector/kotlinx-serialization-protobuf-jvm-1.3.0.jar
-pycharm/plugins/cwm-plugin-projector/lib/projector/projector-agent-initialization-f1e52565.jar
-pycharm/plugins/cwm-plugin-projector/lib/projector/projector-awt-1f1cc5e8.jar
-pycharm/plugins/cwm-plugin-projector/lib/projector/projector-common-f1e52565.jar
-pycharm/plugins/cwm-plugin-projector/lib/projector/projector-common-jvm-f1e52565.jar
-pycharm/plugins/cwm-plugin-projector/lib/projector/projector-server-1f1cc5e8.jar
-pycharm/plugins/cwm-plugin-projector/lib/projector/projector-server-core-f1e52565.jar
-pycharm/plugins/cwm-plugin-projector/lib/projector/projector-util-agent-f1e52565.jar
-pycharm/plugins/cwm-plugin-projector/lib/projector/projector-util-loading-f1e52565.jar
-pycharm/plugins/cwm-plugin-projector/lib/projector/projector-util-logging-jvm-f1e52565.jar
+pycharm/plugins/cwm-plugin-projector/lib/projector/projector-awt-30f65afc.jar
+pycharm/plugins/cwm-plugin-projector/lib/projector/projector-common-1731046c.jar
+pycharm/plugins/cwm-plugin-projector/lib/projector/projector-common-jvm-1731046c.jar
+pycharm/plugins/cwm-plugin-projector/lib/projector/projector-ij-common-1731046c.jar
+pycharm/plugins/cwm-plugin-projector/lib/projector/projector-server-30f65afc.jar
+pycharm/plugins/cwm-plugin-projector/lib/projector/projector-server-core-1731046c.jar
+pycharm/plugins/cwm-plugin-projector/lib/projector/projector-util-agent-1731046c.jar
+pycharm/plugins/cwm-plugin-projector/lib/projector/projector-util-loading-1731046c.jar
+pycharm/plugins/cwm-plugin-projector/lib/projector/projector-util-logging-jvm-1731046c.jar
pycharm/plugins/cwm-plugin/jre-build.txt
pycharm/plugins/cwm-plugin/lib/
pycharm/plugins/cwm-plugin/lib/bouncy-castle-pgp.jar
@@ -518,9 +518,13 @@ pycharm/plugins/python-ce/helpers/pip-20.3.4-py2.py3-n
pycharm/plugins/python-ce/helpers/pockets/
pycharm/plugins/python-ce/helpers/pockets/__init__.py
pycharm/plugins/python-ce/helpers/pockets/_version.py
+pycharm/plugins/python-ce/helpers/pockets/autolog.py
pycharm/plugins/python-ce/helpers/pockets/collections.py
+pycharm/plugins/python-ce/helpers/pockets/datetime.py
+pycharm/plugins/python-ce/helpers/pockets/decorators.py
pycharm/plugins/python-ce/helpers/pockets/inspect.py
pycharm/plugins/python-ce/helpers/pockets/iterators.py
+pycharm/plugins/python-ce/helpers/pockets/logging.py
pycharm/plugins/python-ce/helpers/pockets/string.py
pycharm/plugins/python-ce/helpers/profiler/
pycharm/plugins/python-ce/helpers/profiler/__init__.py
@@ -1760,6 +1764,7 @@ pycharm/plugins/python-ce/helpers/sphinxcontrib/
pycharm/plugins/python-ce/helpers/sphinxcontrib/__init__.py
pycharm/plugins/python-ce/helpers/sphinxcontrib/napoleon/
pycharm/plugins/python-ce/helpers/sphinxcontrib/napoleon/__init__.py
+pycharm/plugins/python-ce/helpers/sphinxcontrib/napoleon/_upstream.py
pycharm/plugins/python-ce/helpers/sphinxcontrib/napoleon/_version.py
pycharm/plugins/python-ce/helpers/sphinxcontrib/napoleon/docstring.py
pycharm/plugins/python-ce/helpers/syspath.py
Hello,
Here are some small updates to pycharm and intellij. Builds and
runs fine unless someone wants to tell me otherwise
Changelogs:
https://youtrack.jetbrains.com/articles/IDEA-A-89/IntelliJ-IDEA-2021.3.1-(213.6461.79-build)-Release-Notes
https://confluence.jetbrains.com/display/PYH/PyCharm+2021.3.1+Release+Notes
Lucas
blob - 8e30a29efbd45f65b578c3274650877092ac8629
file + devel/intellij/Makefile
--- devel/intellij/Makefile
+++ devel/intellij/Makefile
@@ -2,7 +2,7 @@
COMMENT= IntelliJ IDEA Java IDE
-V= 2021.3
+V= 2021.3.1
DISTNAME= ideaIC-${V}-no-jbr
PKGNAME= intellij-${V}
CATEGORIES= devel
@@ -25,7 +25,7 @@ RUN_DEPENDS= devel/desktop-file-utils \
NO_TEST= Yes
-WRKDIST= ${WRKDIR}/idea-IC-213.5744.223
+WRKDIST= ${WRKDIR}/idea-IC-213.6461.79
IJ= ${PREFIX}/intellij
# If NO_BUILD is set, JAVA_HOME doesn't get defined. So do
blob - 5a536891cced01a586be407606bf7e90d47d34af
file + devel/intellij/distinfo
--- devel/intellij/distinfo
+++ devel/intellij/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ideaIC-2021.3-no-jbr.tar.gz) = 23VAQHpxfwbAOqr238nbXL4sB13gz8TubAF3WreMWU4=
-SIZE (ideaIC-2021.3-no-jbr.tar.gz) = 629835415
+SHA256 (ideaIC-2021.3.1-no-jbr.tar.gz) = tj+rNj94dyhQyH9HbnAKOOfmvqSAzo+zHArOxP4z3xI=
+SIZE (ideaIC-2021.3.1-no-jbr.tar.gz) = 636967985
blob - b5d869f9ba724a3c3435b013e20f2b76550ed8f8
file + devel/intellij/pkg/PLIST
--- devel/intellij/pkg/PLIST
+++ devel/intellij/pkg/PLIST
@@ -100,7 +100,7 @@ intellij/lib/asm-tree-7.1.jar
intellij/lib/asm-util-7.1.jar
intellij/lib/async-profiler.jar
intellij/lib/bootstrap.jar
-intellij/lib/build-marker-IC-213.5744.223
+intellij/lib/build-marker-IC-213.6461.79
intellij/lib/byte-buddy-agent.jar
intellij/lib/cds/
intellij/lib/cds/classesLogAgent.jar
@@ -401,15 +401,15 @@ intellij/plugins/cwm-plugin-projector/lib/cwm-plugin-p
intellij/plugins/cwm-plugin-projector/lib/projector/
intellij/plugins/cwm-plugin-projector/lib/projector/Java-WebSocket-1.4.0.jar
intellij/plugins/cwm-plugin-projector/lib/projector/kotlinx-serialization-protobuf-jvm-1.3.0.jar
-intellij/plugins/cwm-plugin-projector/lib/projector/projector-agent-initialization-f1e52565.jar
-intellij/plugins/cwm-plugin-projector/lib/projector/projector-awt-1f1cc5e8.jar
-intellij/plugins/cwm-plugin-projector/lib/projector/projector-common-f1e52565.jar
-intellij/plugins/cwm-plugin-projector/lib/projector/projector-common-jvm-f1e52565.jar
-intellij/plugins/cwm-plugin-projector/lib/projector/projector-server-1f1cc5e8.jar
-intellij/plugins/cwm-plugin-projector/lib/projector/projector-server-core-f1e52565.jar
-intellij/plugins/cwm-plugin-projector/lib/projector/projector-util-agent-f1e52565.jar
-intellij/plugins/cwm-plugin-projector/lib/projector/projector-util-loading-f1e52565.jar
-intellij/plugins/cwm-plugin-projector/lib/projector/projector-util-logging-jvm-f1e52565.jar
+intellij/plugins/cwm-plugin-projector/lib/projector/projector-awt-30f65afc.jar
+intellij/plugins/cwm-plugin-projector/lib/projector/projector-common-1731046c.jar
+intellij/plugins/cwm-plugin-projector/lib/projector/projector-common-jvm-1731046c.jar
+intellij/plugins/cwm-plugin-projector/lib/projector/projector-ij-common-1731046c.jar
+intellij/plugins/cwm-plugin-projector/lib/projector/projector-server-30f65afc.jar
+intellij/plugins/cwm-plugin-projector/lib/projector/projector-server-core-1731046c.jar
+intellij/plugins/cwm-plugin-projector/lib/projector/projector-util-agent-1731046c.jar
+intellij/plugins/cwm-plugin-projector/lib/projector/projector-util-loading-1731046c.jar
+intellij/plugins/cwm-plugin-projector/lib/projector/projector-util-logging-jvm-1731046c.jar
intellij/plugins/cwm-plugin/jre-build.txt
intellij/plugins/cwm-plugin/lib/
intellij/plugins/cwm-plugin/lib/bouncy-castle-pgp.jar
diff 358770744b84460c08f7fa451a3c95a0618586ad /usr/ports
blob - fd832632bc9c337d6feca649efdc2d6ce4e562bb
file + devel/pycharm/Makefile
--- devel/pycharm/Makefile
+++ devel/pycharm/Makefile
@@ -2,7 +2,7 @@
COMMENT= Python IDE based on IntelliJ IDEA
-V= 2021.3
+V= 2021.3.1
DISTNAME= pycharm-community-${V}
PKGNAME= pycharm-${V}
CATEGORIES= devel
blob - 528c20bbb9bf0ef2954b622300de32bce33ebfb2
file + devel/pycharm/distinfo
--- devel/pycharm/distinfo
+++ devel/pycharm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pycharm-community-2021.3-no-jbr.tar.gz) = ciRYYd+K2Wdqsk/WdxartbyGl03awWigRS7ORn6KsSk=
-SIZE (pycharm-community-2021.3-no-jbr.tar.gz) = 331975435
+SHA256 (pycharm-community-2021.3.1-no-jbr.tar.gz) = wRxr3D/4uAMq3baMophmtX4Bdt6as8n3EHPJ0z7LPUg=
+SIZE (pycharm-community-2021.3.1-no-jbr.tar.gz) = 338990714
blob - 2da2f39160fe64fec439c4ec7ca86173665498f0
file + devel/pycharm/pkg/PLIST
--- devel/pycharm/pkg/PLIST
+++ devel/pycharm/pkg/PLIST
@@ -36,7 +36,7 @@ pycharm/lib/asm-tree-7.1.jar
pycharm/lib/asm-util-7.1.jar
pycharm/lib/async-profiler.jar
pycharm/lib/bootstrap.jar
-pycharm/lib/build-marker-PC-213.5744.248
+pycharm/lib/build-marker-PC-213.6461.77
pycharm/lib/byte-buddy-agent.jar
pycharm/lib/cds/
pycharm/lib/cds/classesLogAgent.jar
@@ -141,15 +141,15 @@ pycharm/plugins/cwm-plugin-projector/lib/cwm-plugin-pr
pycharm/plugins/cwm-plugin-projector/lib/projector/
pycharm/plugins/cwm-plugin-projector/lib/projector/Java-WebSocket-1.4.0.jar
pycharm/plugins/cwm-plugin-projector/lib/projector/kotlinx-serialization-protobuf-jvm-1.3.0.jar
-pycharm/plugins/cwm-plugin-projector/lib/projector/projector-agent-initialization-f1e52565.jar
-pycharm/plugins/cwm-plugin-projector/lib/projector/projector-awt-1f1cc5e8.jar
-pycharm/plugins/cwm-plugin-projector/lib/projector/projector-common-f1e52565.jar
-pycharm/plugins/cwm-plugin-projector/lib/projector/projector-common-jvm-f1e52565.jar
-pycharm/plugins/cwm-plugin-projector/lib/projector/projector-server-1f1cc5e8.jar
-pycharm/plugins/cwm-plugin-projector/lib/projector/projector-server-core-f1e52565.jar
-pycharm/plugins/cwm-plugin-projector/lib/projector/projector-util-agent-f1e52565.jar
-pycharm/plugins/cwm-plugin-projector/lib/projector/projector-util-loading-f1e52565.jar
-pycharm/plugins/cwm-plugin-projector/lib/projector/projector-util-logging-jvm-f1e52565.jar
+pycharm/plugins/cwm-plugin-projector/lib/projector/projector-awt-30f65afc.jar
+pycharm/plugins/cwm-plugin-projector/lib/projector/projector-common-1731046c.jar
+pycharm/plugins/cwm-plugin-projector/lib/projector/projector-common-jvm-1731046c.jar
+pycharm/plugins/cwm-plugin-projector/lib/projector/projector-ij-common-1731046c.jar
+pycharm/plugins/cwm-plugin-projector/lib/projector/projector-server-30f65afc.jar
+pycharm/plugins/cwm-plugin-projector/lib/projector/projector-server-core-1731046c.jar
+pycharm/plugins/cwm-plugin-projector/lib/projector/projector-util-agent-1731046c.jar
+pycharm/plugins/cwm-plugin-projector/lib/projector/projector-util-loading-1731046c.jar
+pycharm/plugins/cwm-plugin-projector/lib/projector/projector-util-logging-jvm-1731046c.jar
pycharm/plugins/cwm-plugin/jre-build.txt
pycharm/plugins/cwm-plugin/lib/
pycharm/plugins/cwm-plugin/lib/bouncy-castle-pgp.jar
@@ -518,9 +518,13 @@ pycharm/plugins/python-ce/helpers/pip-20.3.4-py2.py3-n
pycharm/plugins/python-ce/helpers/pockets/
pycharm/plugins/python-ce/helpers/pockets/__init__.py
pycharm/plugins/python-ce/helpers/pockets/_version.py
+pycharm/plugins/python-ce/helpers/pockets/autolog.py
pycharm/plugins/python-ce/helpers/pockets/collections.py
+pycharm/plugins/python-ce/helpers/pockets/datetime.py
+pycharm/plugins/python-ce/helpers/pockets/decorators.py
pycharm/plugins/python-ce/helpers/pockets/inspect.py
pycharm/plugins/python-ce/helpers/pockets/iterators.py
+pycharm/plugins/python-ce/helpers/pockets/logging.py
pycharm/plugins/python-ce/helpers/pockets/string.py
pycharm/plugins/python-ce/helpers/profiler/
pycharm/plugins/python-ce/helpers/profiler/__init__.py
@@ -1760,6 +1764,7 @@ pycharm/plugins/python-ce/helpers/sphinxcontrib/
pycharm/plugins/python-ce/helpers/sphinxcontrib/__init__.py
pycharm/plugins/python-ce/helpers/sphinxcontrib/napoleon/
pycharm/plugins/python-ce/helpers/sphinxcontrib/napoleon/__init__.py
+pycharm/plugins/python-ce/helpers/sphinxcontrib/napoleon/_upstream.py
pycharm/plugins/python-ce/helpers/sphinxcontrib/napoleon/_version.py
pycharm/plugins/python-ce/helpers/sphinxcontrib/napoleon/docstring.py
pycharm/plugins/python-ce/helpers/syspath.py
Hello,
Here are some small updates to pycharm and intellij. Builds and
runs fine unless someone wants to tell me otherwise
Changelogs:
https://youtrack.jetbrains.com/articles/IDEA-A-89/IntelliJ-IDEA-2021.3.1-(213.6461.79-build)-Release-Notes
https://confluence.jetbrains.com/display/PYH/PyCharm+2021.3.1+Release+Notes
Lucas
update games/supertuxkart
Here's an update to SuperTuxKart 1.3. It would be great to know if this
still works with SDL joystick support.
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/supertuxkart/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile 26 Feb 2021 18:20:34 -0000 1.31
+++ Makefile 31 Dec 2021 15:54:47 -0000
@@ -4,11 +4,9 @@ ONLY_FOR_ARCHS = amd64 i386 powerpc
COMMENT = kart racing game with OSS mascots
-V = 0.9.3
-BASENAME = supertuxkart-${V}
-DISTNAME = ${BASENAME}-src
-PKGNAME = ${BASENAME}
-REVISION = 1
+V = 1.3
+PKGNAME = supertuxkart-${V}
+DISTNAME = SuperTuxKart-${V}-src
CATEGORIES = games
@@ -19,30 +17,32 @@ MAINTAINER = Pascal Stumpf <pascal@stum
# GPLv3+
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} GL X11 Xrandr c curl freetype jpeg
-WANTLIB += m ogg openal png vorbis vorbisenc vorbisfile z SDL
+WANTLIB += ${COMPILER_LIBCXX} SDL2 c crypto curl freetype harfbuzz
+WANTLIB += jpeg m openal png sqlite3 vorbisfile z
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=supertuxkart/SuperTuxKart/}
+MASTER_SITES = https://github.com/supertuxkart/stk-code/releases/download/$V/
EXTRACT_SUFX = .tar.xz
MODULES = devel/cmake
COMPILER = base-clang ports-gcc
-RUN_DEPENDS = devel/desktop-file-utils
+RUN_DEPENDS = devel/desktop-file-utils \
+ x11/gtk+3,-guic
LIB_DEPENDS = audio/openal>=0.0.8p7 \
audio/libvorbis \
- devel/sdl \
+ devel/sdl2 \
+ devel/harfbuzz \
net/curl \
graphics/png \
- graphics/jpeg
+ graphics/jpeg \
+ databases/sqlite3
CONFIGURE_ARGS += -DUSE_WIIUSE=OFF \
- -DUSE_FRIBIDI=OFF \
- -DBUILD_RECORDER=OFF
-
-WRKDIST = ${WRKDIR}/supertuxkart-${V}
-FIX_CRLF_FILES = lib/irrlicht/include/IrrCompileConfig.h \
- lib/irrlicht/source/Irrlicht/CIrrDeviceSDL.cpp
+ -DBUILD_RECORDER=OFF \
+ -DUSE_DNS_C=ON \
+ -DUSE_SYSTEM_ENET=ON \
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${X11BASE}/include" \
+ -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS} -L${X11BASE}/lib"
NO_TEST = Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/supertuxkart/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 27 Nov 2017 15:45:19 -0000 1.9
+++ distinfo 31 Dec 2021 15:54:47 -0000
@@ -1,2 +1,2 @@
-SHA256 (supertuxkart-0.9.3-src.tar.xz) = 2AFOcQa6hPmLXsXxRiSdz/woT8QIP48jf/QgueIhnLA=
-SIZE (supertuxkart-0.9.3-src.tar.xz) = 544517772
+SHA256 (SuperTuxKart-1.3-src.tar.xz) = 7qvrDZgBaIohj28Kduo1RqRqMizKypolgUjsrP4IP/0=
+SIZE (SuperTuxKart-1.3-src.tar.xz) = 627753500
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 18 Mar 2020 18:57:46 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.5 2020/03/18 18:57:46 sebastia Exp $
-
-Index: CMakeLists.txt
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -416,6 +416,7 @@ target_link_libraries(supertuxkart
- ${JPEG_LIBRARIES}
- ${TURBOJPEG_LIBRARY}
- #${VPX_LIBRARIES}
-+ SDL
- )
-
- if(NOT SERVER_ONLY)
Index: patches/patch-lib_glew_include_GL_glew_h
===================================================================
RCS file: patches/patch-lib_glew_include_GL_glew_h
diff -N patches/patch-lib_glew_include_GL_glew_h
--- patches/patch-lib_glew_include_GL_glew_h 28 Jan 2019 15:30:56 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-$OpenBSD: patch-lib_glew_include_GL_glew_h,v 1.1 2019/01/28 15:30:56 jsg Exp $
-
-modify embedded copy of glew.h for recent Mesa versions
-
-Mesa >= 18.2.5 has newer OpenGL headers from Khronos which change the
-include guards.
-
-Index: lib/glew/include/GL/glew.h
---- lib/glew/include/GL/glew.h.orig
-+++ lib/glew/include/GL/glew.h
-@@ -93,7 +93,7 @@
- #if defined(__REGAL_H__)
- #error Regal.h included before glew.h
-
still works with SDL joystick support.
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/supertuxkart/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile 26 Feb 2021 18:20:34 -0000 1.31
+++ Makefile 31 Dec 2021 15:54:47 -0000
@@ -4,11 +4,9 @@ ONLY_FOR_ARCHS = amd64 i386 powerpc
COMMENT = kart racing game with OSS mascots
-V = 0.9.3
-BASENAME = supertuxkart-${V}
-DISTNAME = ${BASENAME}-src
-PKGNAME = ${BASENAME}
-REVISION = 1
+V = 1.3
+PKGNAME = supertuxkart-${V}
+DISTNAME = SuperTuxKart-${V}-src
CATEGORIES = games
@@ -19,30 +17,32 @@ MAINTAINER = Pascal Stumpf <pascal@stum
# GPLv3+
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} GL X11 Xrandr c curl freetype jpeg
-WANTLIB += m ogg openal png vorbis vorbisenc vorbisfile z SDL
+WANTLIB += ${COMPILER_LIBCXX} SDL2 c crypto curl freetype harfbuzz
+WANTLIB += jpeg m openal png sqlite3 vorbisfile z
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=supertuxkart/SuperTuxKart/}
+MASTER_SITES = https://github.com/supertuxkart/stk-code/releases/download/$V/
EXTRACT_SUFX = .tar.xz
MODULES = devel/cmake
COMPILER = base-clang ports-gcc
-RUN_DEPENDS = devel/desktop-file-utils
+RUN_DEPENDS = devel/desktop-file-utils \
+ x11/gtk+3,-guic
LIB_DEPENDS = audio/openal>=0.0.8p7 \
audio/libvorbis \
- devel/sdl \
+ devel/sdl2 \
+ devel/harfbuzz \
net/curl \
graphics/png \
- graphics/jpeg
+ graphics/jpeg \
+ databases/sqlite3
CONFIGURE_ARGS += -DUSE_WIIUSE=OFF \
- -DUSE_FRIBIDI=OFF \
- -DBUILD_RECORDER=OFF
-
-WRKDIST = ${WRKDIR}/supertuxkart-${V}
-FIX_CRLF_FILES = lib/irrlicht/include/IrrCompileConfig.h \
- lib/irrlicht/source/Irrlicht/CIrrDeviceSDL.cpp
+ -DBUILD_RECORDER=OFF \
+ -DUSE_DNS_C=ON \
+ -DUSE_SYSTEM_ENET=ON \
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${X11BASE}/include" \
+ -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS} -L${X11BASE}/lib"
NO_TEST = Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/supertuxkart/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 27 Nov 2017 15:45:19 -0000 1.9
+++ distinfo 31 Dec 2021 15:54:47 -0000
@@ -1,2 +1,2 @@
-SHA256 (supertuxkart-0.9.3-src.tar.xz) = 2AFOcQa6hPmLXsXxRiSdz/woT8QIP48jf/QgueIhnLA=
-SIZE (supertuxkart-0.9.3-src.tar.xz) = 544517772
+SHA256 (SuperTuxKart-1.3-src.tar.xz) = 7qvrDZgBaIohj28Kduo1RqRqMizKypolgUjsrP4IP/0=
+SIZE (SuperTuxKart-1.3-src.tar.xz) = 627753500
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 18 Mar 2020 18:57:46 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.5 2020/03/18 18:57:46 sebastia Exp $
-
-Index: CMakeLists.txt
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -416,6 +416,7 @@ target_link_libraries(supertuxkart
- ${JPEG_LIBRARIES}
- ${TURBOJPEG_LIBRARY}
- #${VPX_LIBRARIES}
-+ SDL
- )
-
- if(NOT SERVER_ONLY)
Index: patches/patch-lib_glew_include_GL_glew_h
===================================================================
RCS file: patches/patch-lib_glew_include_GL_glew_h
diff -N patches/patch-lib_glew_include_GL_glew_h
--- patches/patch-lib_glew_include_GL_glew_h 28 Jan 2019 15:30:56 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-$OpenBSD: patch-lib_glew_include_GL_glew_h,v 1.1 2019/01/28 15:30:56 jsg Exp $
-
-modify embedded copy of glew.h for recent Mesa versions
-
-Mesa >= 18.2.5 has newer OpenGL headers from Khronos which change the
-include guards.
-
-Index: lib/glew/include/GL/glew.h
---- lib/glew/include/GL/glew.h.orig
-+++ lib/glew/include/GL/glew.h
-@@ -93,7 +93,7 @@
- #if defined(__REGAL_H__)
- #error Regal.h included before glew.h
-
Re: fix lang/libv8 (was: Re: amd64 build failures 2021-12-30)
Stefan Hagen wrote:
> Christian Weisgerber wrote:
> > Here's a reminder that these ports still fail to build since the
> > LLVM 13 update:
> >
> > devel/qbs
> > lang/libv8
>
> I don't know what causes the segfault, but setting snapshot=off
> works around it.
>
> > misc/posixtestsuite
> >
> > Old logs:
> > http://build-failures.rhaalovely.net/amd64-clang/2021-12-06/
Again with revision bump.
Index: lang/libv8/Makefile
===================================================================
RCS file: /home/cvs/ports/lang/libv8/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- lang/libv8/Makefile 9 Jun 2021 19:50:08 -0000 1.23
+++ lang/libv8/Makefile 31 Dec 2021 15:04:53 -0000
@@ -12,7 +12,7 @@ COMMENT= V8 JavaScript for clients and s
V8_VERSION= 3.16.14.11
EPOCH= 0
-REVISION= 3
+REVISION= 4
V8_ARCH= ${MACHINE_ARCH:S/amd64/x64/:S/i386/ia32/}
V8_RELEASE= release
@@ -48,7 +48,7 @@ SUBST_VARS+= WRKDIR
SUBST_VARS+= V8_ARCH
MAKE_FLAGS+= library=shared ARCHES=${V8_ARCH} MODES=${V8_RELEASE} \
- DEFAULT_ARCHES=${V8_ARCH}
+ DEFAULT_ARCHES=${V8_ARCH} snapshot=off
MAKE_ENV+= V=1 \
CXX="${CXX}" \
> Christian Weisgerber wrote:
> > Here's a reminder that these ports still fail to build since the
> > LLVM 13 update:
> >
> > devel/qbs
> > lang/libv8
>
> I don't know what causes the segfault, but setting snapshot=off
> works around it.
>
> > misc/posixtestsuite
> >
> > Old logs:
> > http://build-failures.rhaalovely.net/amd64-clang/2021-12-06/
Again with revision bump.
Index: lang/libv8/Makefile
===================================================================
RCS file: /home/cvs/ports/lang/libv8/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- lang/libv8/Makefile 9 Jun 2021 19:50:08 -0000 1.23
+++ lang/libv8/Makefile 31 Dec 2021 15:04:53 -0000
@@ -12,7 +12,7 @@ COMMENT= V8 JavaScript for clients and s
V8_VERSION= 3.16.14.11
EPOCH= 0
-REVISION= 3
+REVISION= 4
V8_ARCH= ${MACHINE_ARCH:S/amd64/x64/:S/i386/ia32/}
V8_RELEASE= release
@@ -48,7 +48,7 @@ SUBST_VARS+= WRKDIR
SUBST_VARS+= V8_ARCH
MAKE_FLAGS+= library=shared ARCHES=${V8_ARCH} MODES=${V8_RELEASE} \
- DEFAULT_ARCHES=${V8_ARCH}
+ DEFAULT_ARCHES=${V8_ARCH} snapshot=off
MAKE_ENV+= V=1 \
CXX="${CXX}" \
fix misc/posixtestsuite (was: Re: amd64 build failures 2021-12-30)
Christian Weisgerber wrote:
> Here's a reminder that these ports still fail to build since the
> LLVM 13 update:
>
> devel/qbs
> lang/libv8
> misc/posixtestsuite
Here -Werror is set and some variables now throw an -Wunused-but-set error.
This happens frequently in this testsuite.
Shall we switch it off?
> Old logs:
> http://build-failures.rhaalovely.net/amd64-clang/2021-12-06/
Index: misc/posixtestsuite/Makefile
===================================================================
RCS file: /home/cvs/ports/misc/posixtestsuite/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- misc/posixtestsuite/Makefile 12 Jul 2019 20:47:53 -0000 1.6
+++ misc/posixtestsuite/Makefile 31 Dec 2021 14:56:41 -0000
@@ -3,7 +3,7 @@
COMMENT = open POSIX test suite
DISTNAME = posixtestsuite-1.5.2
-REVISION = 3
+REVISION = 4
CATEGORIES = misc
Index: misc/posixtestsuite/patches/patch-Makefile
===================================================================
RCS file: /home/cvs/ports/misc/posixtestsuite/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-Makefile
--- misc/posixtestsuite/patches/patch-Makefile 8 May 2018 22:14:19 -0000 1.2
+++ misc/posixtestsuite/patches/patch-Makefile 31 Dec 2021 14:16:18 -0000
@@ -22,7 +22,7 @@ Index: Makefile
$(MAKE) all | column -t -s:
-CFLAGS = -g -O2 -Wall -Werror -D_POSIX_C_SOURCE=200112L
-+CFLAGS = -g -O2 -Wall -Werror -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=600
++CFLAGS = -g -O2 -Wall -Werror -Wno-unused-but-set-variable -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=600
# add -std=c99, -std=gnu99 if compiler supports it (gcc-2.95.3 does not).
check_gcc = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi)
> Here's a reminder that these ports still fail to build since the
> LLVM 13 update:
>
> devel/qbs
> lang/libv8
> misc/posixtestsuite
Here -Werror is set and some variables now throw an -Wunused-but-set error.
This happens frequently in this testsuite.
Shall we switch it off?
> Old logs:
> http://build-failures.rhaalovely.net/amd64-clang/2021-12-06/
Index: misc/posixtestsuite/Makefile
===================================================================
RCS file: /home/cvs/ports/misc/posixtestsuite/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- misc/posixtestsuite/Makefile 12 Jul 2019 20:47:53 -0000 1.6
+++ misc/posixtestsuite/Makefile 31 Dec 2021 14:56:41 -0000
@@ -3,7 +3,7 @@
COMMENT = open POSIX test suite
DISTNAME = posixtestsuite-1.5.2
-REVISION = 3
+REVISION = 4
CATEGORIES = misc
Index: misc/posixtestsuite/patches/patch-Makefile
===================================================================
RCS file: /home/cvs/ports/misc/posixtestsuite/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-Makefile
--- misc/posixtestsuite/patches/patch-Makefile 8 May 2018 22:14:19 -0000 1.2
+++ misc/posixtestsuite/patches/patch-Makefile 31 Dec 2021 14:16:18 -0000
@@ -22,7 +22,7 @@ Index: Makefile
$(MAKE) all | column -t -s:
-CFLAGS = -g -O2 -Wall -Werror -D_POSIX_C_SOURCE=200112L
-+CFLAGS = -g -O2 -Wall -Werror -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=600
++CFLAGS = -g -O2 -Wall -Werror -Wno-unused-but-set-variable -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=600
# add -std=c99, -std=gnu99 if compiler supports it (gcc-2.95.3 does not).
check_gcc = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi)
Re: Ynt: howto separate isakmpd syslogs into another file
On 12/30/21 04:40, Hayri Can KAVAK wrote:
> Thanks Martijn; it worked by creating these files.
> ________________________________
> Gönderen: Martijn van Duren <openbsd+misc@list.imperialat.at> adına owner-misc@openbsd.org <owner-misc@openbsd.org>
> Gönderildi: 30 Aralık 2021 Perşembe 12:46
> Kime: Hayri Can KAVAK <hayricankavak@hotmail.com>; misc@openbsd.org <misc@openbsd.org>
> Konu: Re: howto separate isakmpd syslogs into another file
>
> On Thu, 2021-12-30 at 08:59 +0000, Hayri Can KAVAK wrote:
>> Hello,
>>
>> I'm trying to separate isakmpd/ipsec logs to another file instead of /var/log/messages.
>> Here my config at the top of /etc/syslog.conf
>> !!isakmpd
>> daemon.info /var/log/ipsec_info.log
>> daemon.debug /var/log/ipsec_debug.log
>> !*
>>
>> I restarted syslogd & isakmpd but nothing changed. It still logs to /var/log/messages.
>> How can i achieve this?
>>
>> Thanks in advance.
>
> The files /var/log/ipsec_{info,debug}.log need to exist before logging
> to them (and loaded in by sending SIGHUP to syslog(8)). syslogd(8) will
> not try to create the files. From syslogd(8):
>
> The logfiles already have to exist with the correct permissions.
>
>
> The default syslog.conf doesn't write messages for DAEMON to
> /var/log/messages, they should end up in /var/log/daemon. But without
> seeing your full syslog.conf I can't say what's going on there.
>
> Hope this helps.
>
> martijn@
>
--
Boyd Stephens
Netelysis
tel: 334.213.1128
email: bstephens@netelysis.com
> Thanks Martijn; it worked by creating these files.
> ________________________________
> Gönderen: Martijn van Duren <openbsd+misc@list.imperialat.at> adına owner-misc@openbsd.org <owner-misc@openbsd.org>
> Gönderildi: 30 Aralık 2021 Perşembe 12:46
> Kime: Hayri Can KAVAK <hayricankavak@hotmail.com>; misc@openbsd.org <misc@openbsd.org>
> Konu: Re: howto separate isakmpd syslogs into another file
>
> On Thu, 2021-12-30 at 08:59 +0000, Hayri Can KAVAK wrote:
>> Hello,
>>
>> I'm trying to separate isakmpd/ipsec logs to another file instead of /var/log/messages.
>> Here my config at the top of /etc/syslog.conf
>> !!isakmpd
>> daemon.info /var/log/ipsec_info.log
>> daemon.debug /var/log/ipsec_debug.log
>> !*
>>
>> I restarted syslogd & isakmpd but nothing changed. It still logs to /var/log/messages.
>> How can i achieve this?
>>
>> Thanks in advance.
>
> The files /var/log/ipsec_{info,debug}.log need to exist before logging
> to them (and loaded in by sending SIGHUP to syslog(8)). syslogd(8) will
> not try to create the files. From syslogd(8):
>
> The logfiles already have to exist with the correct permissions.
>
>
> The default syslog.conf doesn't write messages for DAEMON to
> /var/log/messages, they should end up in /var/log/daemon. But without
> seeing your full syslog.conf I can't say what's going on there.
>
> Hope this helps.
>
> martijn@
>
--
Boyd Stephens
Netelysis
tel: 334.213.1128
email: bstephens@netelysis.com
fix lang/libv8 (was: Re: amd64 build failures 2021-12-30)
Christian Weisgerber wrote:
> Here's a reminder that these ports still fail to build since the
> LLVM 13 update:
>
> devel/qbs
> lang/libv8
I don't know what causes the segfault, but setting snapshot=off
works around it.
> misc/posixtestsuite
>
> Old logs:
> http://build-failures.rhaalovely.net/amd64-clang/2021-12-06/
Index: lang/libv8/Makefile
===================================================================
RCS file: /home/cvs/ports/lang/libv8/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- lang/libv8/Makefile 9 Jun 2021 19:50:08 -0000 1.23
+++ lang/libv8/Makefile 31 Dec 2021 13:12:51 -0000
@@ -48,7 +48,7 @@ SUBST_VARS+= WRKDIR
SUBST_VARS+= V8_ARCH
MAKE_FLAGS+= library=shared ARCHES=${V8_ARCH} MODES=${V8_RELEASE} \
- DEFAULT_ARCHES=${V8_ARCH}
+ DEFAULT_ARCHES=${V8_ARCH} snapshot=off
MAKE_ENV+= V=1 \
CXX="${CXX}" \
> Here's a reminder that these ports still fail to build since the
> LLVM 13 update:
>
> devel/qbs
> lang/libv8
I don't know what causes the segfault, but setting snapshot=off
works around it.
> misc/posixtestsuite
>
> Old logs:
> http://build-failures.rhaalovely.net/amd64-clang/2021-12-06/
Index: lang/libv8/Makefile
===================================================================
RCS file: /home/cvs/ports/lang/libv8/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- lang/libv8/Makefile 9 Jun 2021 19:50:08 -0000 1.23
+++ lang/libv8/Makefile 31 Dec 2021 13:12:51 -0000
@@ -48,7 +48,7 @@ SUBST_VARS+= WRKDIR
SUBST_VARS+= V8_ARCH
MAKE_FLAGS+= library=shared ARCHES=${V8_ARCH} MODES=${V8_RELEASE} \
- DEFAULT_ARCHES=${V8_ARCH}
+ DEFAULT_ARCHES=${V8_ARCH} snapshot=off
MAKE_ENV+= V=1 \
CXX="${CXX}" \
Re: [update] games/warzone2100
Pascal Stumpf wrote:
> Almost forgot about this update. Here's the latest version 4.2.4.
>
> OK?
Almost... below again with fixes:
- added databases/sqlite3 to LIB_DEPENDS
- moved warzone2100.png from share/icons to share/warzone2100/icons
- added COMPILER=base-clang ports-gcc
OK?
Index: games/warzone2100/Makefile
===================================================================
RCS file: /home/cvs/ports/games/warzone2100/Makefile,v
retrieving revision 1.43
diff -u -p -u -p -r1.43 Makefile
--- games/warzone2100/Makefile 26 Feb 2021 18:20:34 -0000 1.43
+++ games/warzone2100/Makefile 31 Dec 2021 12:47:52 -0000
@@ -4,67 +4,47 @@ ONLY_FOR_ARCHS= amd64 i386
COMMENT= 3D realtime strategy on a future earth
-DISTNAME= warzone2100-3.2.3
+V= 4.2.4
+DISTNAME= warzone2100-$V
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=warzone2100/}
+MASTER_SITES= https://github.com/Warzone2100/warzone2100/releases/download/$V/
+DISTFILES= warzone2100-${V}{warzone2100_src}${EXTRACT_SUFX}
EXTRACT_SUFX= .tar.xz
-REVISION= 4
HOMEPAGE= https://wz2100.net/
# GPLv2+
PERMIT_PACKAGE= Yes
-WANTLIB += GL GLEW GLU Qt5Core Qt5Gui Qt5Script Qt5Widgets SDL2 X11
-WANTLIB += Xrandr c crypto fontconfig freetype fribidi harfbuzz iconv
-WANTLIB += intl m ogg openal physfs png pthread theora vorbis
-WANTLIB += vorbisfile z ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} SDL2 c curl freetype harfbuzz intl
+WANTLIB += m miniupnpc ogg openal physfs png sodium sqlite3 theoradec
+WANTLIB += vorbis vorbisfile z
-FIX_CRLF_FILES= 3rdparty/glm/core/type_half.inl
+MODULES= devel/cmake
-MODULES= x11/qt5
-COMPILER = base-clang ports-gcc
+COMPILER= base-clang ports-gcc
LIB_DEPENDS= audio/libogg \
audio/libvorbis \
audio/openal>=20110627 \
- devel/fribidi \
+ databases/sqlite3 \
+ devel/harfbuzz \
devel/physfs \
devel/sdl2 \
- graphics/glew \
graphics/png \
multimedia/libtheora \
- x11/qt5/qtscript
+ net/curl \
+ net/miniupnp/miniupnpc \
+ security/libsodium
BUILD_DEPENDS= archivers/unzip \
archivers/zip \
- textproc/asciidoc
+ devel/gettext,-tools \
+ graphics/vulkan-headers \
+ textproc/asciidoc \
+ textproc/asciidoctor
RUN_DEPENDS= devel/desktop-file-utils
-SEPARATE_BUILD= Yes
-USE_GMAKE= Yes
-CONFIGURE_STYLE= autoconf
-AUTOCONF_VERSION= 2.69
-CONFIGURE_ARGS+= --with-distributor="OpenBSD"
-CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
- LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
- ac_cv_path_MOC4="${LOCALBASE}/bin/moc4" \
- ac_cv_path_UIC4="${LOCALBASE}/bin/uic4"
-
-# XXX this is a horrible hack to make sure we get to our glm
-# which is 100% incompatible with ports glm
-MAKE_FLAGS += "DEFS=-DHAVE_CONFIG_H -I${WRKSRC}/includefirst"
-
-# libogg routines are called from the main program, so we need to
-# explicitly link against it. Wedge it in.
-MAKE_FLAGS += VORBIS_LIBS="`pkg-config --libs vorbis` -logg"
-
-pre-configure:
- mkdir -p ${WRKSRC}/includefirst
- ln -sf ${WRKSRC}/3rdparty/glm ${WRKSRC}/includefirst/glm
-.for _prog in git svn svnversion
- @cd ${WRKDIR}/bin && ln -sf /usr/bin/true ${_prog}
-.endfor
- @cd ${WRKDIR}/bin && ln -sf ${LOCALBASE}/bin/gflex flex
+WRKDIST = ${WRKDIR}/warzone2100
.include <bsd.port.mk>
Index: games/warzone2100/distinfo
===================================================================
RCS file: /home/cvs/ports/games/warzone2100/distinfo,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 distinfo
--- games/warzone2100/distinfo 24 May 2017 13:06:47 -0000 1.14
+++ games/warzone2100/distinfo 30 Dec 2021 21:56:06 -0000
@@ -1,2 +1,2 @@
-SHA256 (warzone2100-3.2.3.tar.xz) = /KuehgID59rNpu5gOE2kkKnUSur8B6ox/yX5xUi+dYI=
-SIZE (warzone2100-3.2.3.tar.xz) = 81314060
+SHA256 (warzone2100-4.2.4.tar.xz) = IkD1WkeKas9qtUUTTo9w4cEoGAoX+d+Cr2C5PTUFaEg=
+SIZE (warzone2100-4.2.4.tar.xz) = 338685080
Index: games/warzone2100/patches/patch-3rdparty_glm_core_type_half_inl
===================================================================
RCS file: games/warzone2100/patches/patch-3rdparty_glm_core_type_half_inl
diff -N games/warzone2100/patches/patch-3rdparty_glm_core_type_half_inl
--- games/warzone2100/patches/patch-3rdparty_glm_core_type_half_inl 26 Feb 2021 18:20:34 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-3rdparty_glm_core_type_half_inl,v 1.2 2021/02/26 18:20:34 naddy Exp $
-
-Index: 3rdparty/glm/core/type_half.inl
---- 3rdparty/glm/core/type_half.inl.orig
-+++ 3rdparty/glm/core/type_half.inl
-@@ -135,9 +135,9 @@ namespace detail
- // of float and half (127 versus 15).
- //
-
-- register int s = (i >> 16) & 0x00008000;
-- register int e = ((i >> 23) & 0x000000ff) - (127 - 15);
-- register int m = i & 0x007fffff;
-+ int s = (i >> 16) & 0x00008000;
-+ int e = ((i >> 23) & 0x000000ff) - (127 - 15);
-+ int m = i & 0x007fffff;
-
- //
- // Now reassemble s, e and m into a half:
Index: games/warzone2100/patches/patch-configure_ac
===================================================================
RCS file: games/warzone2100/patches/patch-configure_ac
diff -N games/warzone2100/patches/patch-configure_ac
--- games/warzone2100/patches/patch-configure_ac 27 May 2017 08:18:46 -0000 1.11
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.11 2017/05/27 08:18:46 espie Exp $
-Index: configure.ac
---- configure.ac.orig
-+++ configure.ac
-@@ -289,7 +289,7 @@ fi
- WZ_WARNINGS_GCC="-Wall -Wextra ${WZ_Wno_}unused-parameter ${WZ_Wno_}sign-compare -Wcast-align -Wwrite-strings -Wpointer-arith ${WZ_Wno_}format-security"
- AX_C_CHECK_FLAG([-Werror -Wno-expansion-to-defined -Wno-error=cpp], [#warning x], , WZ_WARNINGS_GCC="${WZ_WARNINGS_GCC} -Wno-expansion-to-defined")
- WZ_WARNINGS_GCC_C="${WZ_WARNINGS_GCC} -Wstrict-prototypes -Wdeclaration-after-statement ${CFLAGS_IGNORE_WARNINGS}"
--WZ_WARNINGS_GCC_CXX="${WZ_Wno_}enum-compare ${WZ_WARNINGS_GCC}"
-+WZ_WARNINGS_GCC_CXX="${WZ_WARNINGS_GCC}"
- if test "x$enable_debug" = "xyes" ; then
- if test "x$cc_icc" = "xyes" ; then
- WZ_CFLAGS="${WZ_CFLAGS} -O0 -g -Wcheck -Werror"
Index: games/warzone2100/patches/patch-doc_CMakeLists_txt
===================================================================
RCS file: games/warzone2100/patches/patch-doc_CMakeLists_txt
diff -N games/warzone2100/patches/patch-doc_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ games/warzone2100/patches/patch-doc_CMakeLists_txt 30 Dec 2021 21:56:06 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: doc/CMakeLists.txt
+--- doc/CMakeLists.txt.orig
++++ doc/CMakeLists.txt
+@@ -261,7 +261,7 @@ if(UNIX)
+ )
+ endif()
+
+- install(FILES "${_warzone2100_6_compressed}" DESTINATION "${CMAKE_INSTALL_MANDIR}/man6" COMPONENT Manpages)
++ install(FILES "${_warzone2100_6_uncompressed}" DESTINATION "${CMAKE_INSTALL_MANDIR}/man6" COMPONENT Manpages)
+ else()
+ message( WARNING "Unable to find gzip tool; skipping Unix man page generation" )
+ endif()
Index: games/warzone2100/patches/patch-icons_CMakeLists_txt
===================================================================
RCS file: games/warzone2100/patches/patch-icons_CMakeLists_txt
diff -N games/warzone2100/patches/patch-icons_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ games/warzone2100/patches/patch-icons_CMakeLists_txt 31 Dec 2021 13:01:03 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: icons/CMakeLists.txt
+--- icons/CMakeLists.txt.orig
++++ icons/CMakeLists.txt
+@@ -13,7 +13,7 @@ if(UNIX AND NOT APPLE AND NOT WIN32)
+ COMPONENT Core
+ )
+ install(FILES warzone2100.png
+- DESTINATION "${CMAKE_INSTALL_DATADIR}/icons"
++ DESTINATION "${CMAKE_INSTALL_DATADIR}/warzone2100/icons"
+ RENAME "warzone2100${WZ_OUTPUT_NAME_SUFFIX}.png"
+ COMPONENT Core
+ )
Index: games/warzone2100/patches/patch-icons_Makefile_in
===================================================================
RCS file: games/warzone2100/patches/patch-icons_Makefile_in
diff -N games/warzone2100/patches/patch-icons_Makefile_in
--- games/warzone2100/patches/patch-icons_Makefile_in 19 Dec 2016 12:29:01 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-icons_Makefile_in,v 1.2 2016/12/19 12:29:01 kirby Exp $
---- icons/Makefile.in.orig Sun Dec 4 01:18:34 2016
-+++ icons/Makefile.in Wed Dec 7 15:16:46 2016
-@@ -519,7 +519,6 @@ install-data-local:
- $(MKDIR_P) $(DESTDIR)$(appdatadir)
- $(INSTALL_DATA) $(srcdir)/warzone2100.png $(DESTDIR)$(icondir)/warzone2100.png
- $(INSTALL_DATA) $(srcdir)/warzone2100.desktop $(DESTDIR)$(applicationdir)/warzone2100.desktop
-- $(INSTALL_DATA) $(srcdir)/warzone2100.appdata.xml $(DESTDIR)$(appdatadir)/warzone2100.appdata.xml
-
- uninstall-local:
- $(RM) $(DESTDIR)$(icondir)/warzone2100.png
Index: games/warzone2100/patches/patch-lib_exceptionhandler_exceptionhandler_cpp
===================================================================
RCS file: /home/cvs/ports/games/warzone2100/patches/patch-lib_exceptionhandler_exceptionhandler_cpp,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-lib_exceptionhandler_exceptionhandler_cpp
--- games/warzone2100/patches/patch-lib_exceptionhandler_exceptionhandler_cpp 27 May 2017 08:18:46 -0000 1.4
+++ games/warzone2100/patches/patch-lib_exceptionhandler_exceptionhandler_cpp 30 Dec 2021 21:56:06 -0000
@@ -3,11 +3,11 @@ $OpenBSD: patch-lib_exceptionhandler_exc
Index: lib/exceptionhandler/exceptionhandler.cpp
--- lib/exceptionhandler/exceptionhandler.cpp.orig
+++ lib/exceptionhandler/exceptionhandler.cpp
-@@ -117,6 +117,7 @@ static LONG WINAPI windowsExceptionHandler(PEXCEPTION_
+@@ -47,7 +47,6 @@
# include <stdint.h>
# include <signal.h>
# include <string.h>
-+# include <errno.h>
+-# include <errno.h>
// POSIX headers:
# include <unistd.h>
Index: games/warzone2100/patches/patch-lib_netplay_netplay_cpp
===================================================================
RCS file: games/warzone2100/patches/patch-lib_netplay_netplay_cpp
diff -N games/warzone2100/patches/patch-lib_netplay_netplay_cpp
--- games/warzone2100/patches/patch-lib_netplay_netplay_cpp 27 May 2017 08:18:46 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-lib_netplay_netplay_cpp,v 1.1 2017/05/27 08:18:46 espie Exp $
-
-Index: lib/netplay/netplay.cpp
---- lib/netplay/netplay.cpp.orig
-+++ lib/netplay/netplay.cpp
-@@ -1783,7 +1783,7 @@ static void NETcheckPlayers(void)
- // We should not block here.
- bool NETrecvNet(NETQUEUE *queue, uint8_t *type)
- {
-- switch (upnp_status)
-+ switch (static_cast<int>(upnp_status))
- {
- case UPNP_ERROR_CONTROL_NOT_AVAILABLE:
- case UPNP_ERROR_DEVICE_NOT_FOUND:
Index: games/warzone2100/patches/patch-src_CMakeLists_txt
===================================================================
RCS file: games/warzone2100/patches/patch-src_CMakeLists_txt
diff -N games/warzone2100/patches/patch-src_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ games/warzone2100/patches/patch-src_CMakeLists_txt 30 Dec 2021 21:56:06 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: src/CMakeLists.txt
+--- src/CMakeLists.txt.orig
++++ src/CMakeLists.txt
+@@ -619,9 +619,6 @@ endif()
+ # Install
+ install(TARGETS warzone2100 COMPONENT Core DESTINATION "${WZ_APP_INSTALL_DEST}")
+
+-# For Portable packages only, copy the ".portable" file that triggers portable mode (Windows-only)
+-install(FILES "${CMAKE_SOURCE_DIR}/pkg/portable.in" COMPONENT PortableConfig DESTINATION "${WZ_APP_INSTALL_DEST}" RENAME ".portable")
+-
+ #####################
+ # Installing Required Runtime Dependencies
+
Index: games/warzone2100/patches/patch-src_Makefile_in
===================================================================
RCS file: games/warzone2100/patches/patch-src_Makefile_in
diff -N games/warzone2100/patches/patch-src_Makefile_in
--- games/warzone2100/patches/patch-src_Makefile_in 19 Dec 2016 12:29:01 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_Makefile_in,v 1.4 2016/12/19 12:29:01 kirby Exp $
-
-Fix SEPARATE_BUILD
-
---- src/Makefile.in.orig Sun Dec 4 01:18:34 2016
-+++ src/Makefile.in Wed Dec 7 15:16:46 2016
-@@ -1223,7 +1223,7 @@ uninstall-am: uninstall-binPROGRAMS
- .PHONY: autorevision.h
-
- autorevision.h autorevision.cache:
-- cd $(top_srcdir) && ./build_tools/autorevision -t h -o $(abs_builddir)/autorevision.cache > $(abs_builddir)/autorevision.h.new
-+ cd $(top_srcdir) && ./build_tools/autorevision -t h -o $(abs_srcdir)/autorevision.cache > $(abs_builddir)/autorevision.h.new
- cmp -s autorevision.h.new autorevision.h && rm autorevision.h.new || mv -f autorevision.h.new autorevision.h
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: games/warzone2100/pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/games/warzone2100/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 PLIST
--- games/warzone2100/pkg/PLIST 27 Jun 2018 21:03:51 -0000 1.12
+++ games/warzone2100/pkg/PLIST 31 Dec 2021 13:02:26 -0000
@@ -2,6 +2,7 @@
@bin bin/warzone2100
@man man/man6/warzone2100.6
share/applications/warzone2100.desktop
+share/doc/pkg-readmes/${PKGSTEM}
share/doc/warzone2100/
@comment share/doc/warzone2100/AUTHORS
@comment share/doc/warzone2100/COPYING
@@ -9,7 +10,9 @@ share/doc/warzone2100/
@comment share/doc/warzone2100/COPYING.README
@comment share/doc/warzone2100/ChangeLog
share/doc/warzone2100/README.md
+share/doc/warzone2100/Scripting.md
share/doc/warzone2100/ScriptingManual.htm
+share/doc/warzone2100/copyright
share/doc/warzone2100/docbook-xsl.css
share/doc/warzone2100/images/
share/doc/warzone2100/images/artillery-far-away.jpg
@@ -57,8 +60,22 @@ share/doc/warzone2100/images/transport.j
share/doc/warzone2100/images/unitordersmenu.jpg
share/doc/warzone2100/images/wss.png
share/doc/warzone2100/images/www.png
+share/doc/warzone2100/js-campaign.md
+share/doc/warzone2100/js-events.md
+share/doc/warzone2100/js-functions.md
+share/doc/warzone2100/js-globals.md
+share/doc/warzone2100/js-objects.md
share/doc/warzone2100/quickstartguide.html
-share/icons/warzone2100.png
+share/doc/warzone2100/warzone2100.6.html
+share/locale/af_ZA/
+share/locale/af_ZA/LC_MESSAGES/
+share/locale/af_ZA/LC_MESSAGES/warzone2100.mo
+share/locale/ar_SA/
+share/locale/ar_SA/LC_MESSAGES/
+share/locale/ar_SA/LC_MESSAGES/warzone2100.mo
+share/locale/bg_BG/
+share/locale/bg_BG/LC_MESSAGES/
+share/locale/bg_BG/LC_MESSAGES/warzone2100.mo
share/locale/ca_ES/
share/locale/ca_ES/LC_MESSAGES/
share/locale/ca_ES/LC_MESSAGES/warzone2100.mo
@@ -72,20 +89,33 @@ share/locale/es/LC_MESSAGES/warzone2100.
share/locale/et_EE/
share/locale/et_EE/LC_MESSAGES/
share/locale/et_EE/LC_MESSAGES/warzone2100.mo
+share/locale/fa_IR/
+share/locale/fa_IR/LC_MESSAGES/
+share/locale/fa_IR/LC_MESSAGES/warzone2100.mo
share/locale/fi/LC_MESSAGES/warzone2100.mo
share/locale/fr/LC_MESSAGES/warzone2100.mo
share/locale/fy/
share/locale/fy/LC_MESSAGES/
share/locale/fy/LC_MESSAGES/warzone2100.mo
share/locale/ga/LC_MESSAGES/warzone2100.mo
+share/locale/he_IL/
+share/locale/he_IL/LC_MESSAGES/
+share/locale/he_IL/LC_MESSAGES/warzone2100.mo
share/locale/hr/LC_MESSAGES/warzone2100.mo
share/locale/hu/LC_MESSAGES/warzone2100.mo
+share/locale/id/LC_MESSAGES/warzone2100.mo
+share/locale/id_ID/
+share/locale/id_ID/LC_MESSAGES/
+share/locale/id_ID/LC_MESSAGES/warzone2100.mo
share/locale/it/LC_MESSAGES/warzone2100.mo
share/locale/ko/LC_MESSAGES/warzone2100.mo
share/locale/la/
share/locale/la/LC_MESSAGES/
share/locale/la/LC_MESSAGES/warzone2100.mo
share/locale/lt/LC_MESSAGES/warzone2100.mo
+share/locale/my_MM/
+share/locale/my_MM/LC_MESSAGES/
+share/locale/my_MM/LC_MESSAGES/warzone2100.mo
share/locale/nb/LC_MESSAGES/warzone2100.mo
share/locale/nl/LC_MESSAGES/warzone2100.mo
share/locale/pl/LC_MESSAGES/warzone2100.mo
@@ -96,19 +126,50 @@ share/locale/ru/LC_MESSAGES/warzone2100.
share/locale/sk/LC_MESSAGES/warzone2100.mo
share/locale/sl/LC_MESSAGES/warzone2100.mo
share/locale/tr/LC_MESSAGES/warzone2100.mo
+share/locale/tt_RU/
+share/locale/tt_RU/LC_MESSAGES/
+share/locale/tt_RU/LC_MESSAGES/warzone2100.mo
share/locale/uk_UA/
share/locale/uk_UA/LC_MESSAGES/
share/locale/uk_UA/LC_MESSAGES/warzone2100.mo
share/locale/zh_CN/LC_MESSAGES/warzone2100.mo
share/locale/zh_TW/LC_MESSAGES/warzone2100.mo
share/metainfo/
+share/metainfo/warzone2100.appdata.xml
share/warzone2100/
share/warzone2100/base.wz
+share/warzone2100/fonts/
+share/warzone2100/fonts/DejaVu.LICENSE.txt
+share/warzone2100/fonts/DejaVuSans-Bold.ttf
+share/warzone2100/fonts/DejaVuSans.ttf
+share/warzone2100/icons/
+share/warzone2100/icons/warzone2100.png
share/warzone2100/mp.wz
share/warzone2100/music/
+share/warzone2100/music/albums/
+share/warzone2100/music/albums/legacy_soundtrack/
+share/warzone2100/music/albums/legacy_soundtrack/album.json
+share/warzone2100/music/albums/legacy_soundtrack/albumcover.png
+share/warzone2100/music/albums/legacy_soundtrack/license.txt
+share/warzone2100/music/albums/legacy_soundtrack/track10.ogg
+share/warzone2100/music/albums/legacy_soundtrack/track11.ogg
+share/warzone2100/music/albums/legacy_soundtrack/track12.ogg
+share/warzone2100/music/albums/legacy_soundtrack/track13.ogg
+share/warzone2100/music/albums/legacy_soundtrack/track14.ogg
+share/warzone2100/music/albums/legacy_soundtrack/track15.ogg
+share/warzone2100/music/albums/legacy_soundtrack/track16.ogg
+share/warzone2100/music/albums/legacy_soundtrack/track4.ogg
+share/warzone2100/music/albums/legacy_soundtrack/track5.ogg
+share/warzone2100/music/albums/legacy_soundtrack/track6.ogg
+share/warzone2100/music/albums/legacy_soundtrack/track7.ogg
+share/warzone2100/music/albums/legacy_soundtrack/track8.ogg
+share/warzone2100/music/albums/legacy_soundtrack/track9.ogg
+share/warzone2100/music/albums/original_soundtrack/
+share/warzone2100/music/albums/original_soundtrack/album.json
+share/warzone2100/music/albums/original_soundtrack/albumcover.png
+share/warzone2100/music/albums/original_soundtrack/track1.ogg
+share/warzone2100/music/albums/original_soundtrack/track2.ogg
+share/warzone2100/music/albums/original_soundtrack/track3.ogg
share/warzone2100/music/menu.ogg
-share/warzone2100/music/music.wpl
-share/warzone2100/music/track1.ogg
-share/warzone2100/music/track2.ogg
-share/warzone2100/music/track3.ogg
@tag update-desktop-database
+@tag gtk-update-icon-cache %D/share/icons/warzone2100
> Almost forgot about this update. Here's the latest version 4.2.4.
>
> OK?
Almost... below again with fixes:
- added databases/sqlite3 to LIB_DEPENDS
- moved warzone2100.png from share/icons to share/warzone2100/icons
- added COMPILER=base-clang ports-gcc
OK?
Index: games/warzone2100/Makefile
===================================================================
RCS file: /home/cvs/ports/games/warzone2100/Makefile,v
retrieving revision 1.43
diff -u -p -u -p -r1.43 Makefile
--- games/warzone2100/Makefile 26 Feb 2021 18:20:34 -0000 1.43
+++ games/warzone2100/Makefile 31 Dec 2021 12:47:52 -0000
@@ -4,67 +4,47 @@ ONLY_FOR_ARCHS= amd64 i386
COMMENT= 3D realtime strategy on a future earth
-DISTNAME= warzone2100-3.2.3
+V= 4.2.4
+DISTNAME= warzone2100-$V
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=warzone2100/}
+MASTER_SITES= https://github.com/Warzone2100/warzone2100/releases/download/$V/
+DISTFILES= warzone2100-${V}{warzone2100_src}${EXTRACT_SUFX}
EXTRACT_SUFX= .tar.xz
-REVISION= 4
HOMEPAGE= https://wz2100.net/
# GPLv2+
PERMIT_PACKAGE= Yes
-WANTLIB += GL GLEW GLU Qt5Core Qt5Gui Qt5Script Qt5Widgets SDL2 X11
-WANTLIB += Xrandr c crypto fontconfig freetype fribidi harfbuzz iconv
-WANTLIB += intl m ogg openal physfs png pthread theora vorbis
-WANTLIB += vorbisfile z ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} SDL2 c curl freetype harfbuzz intl
+WANTLIB += m miniupnpc ogg openal physfs png sodium sqlite3 theoradec
+WANTLIB += vorbis vorbisfile z
-FIX_CRLF_FILES= 3rdparty/glm/core/type_half.inl
+MODULES= devel/cmake
-MODULES= x11/qt5
-COMPILER = base-clang ports-gcc
+COMPILER= base-clang ports-gcc
LIB_DEPENDS= audio/libogg \
audio/libvorbis \
audio/openal>=20110627 \
- devel/fribidi \
+ databases/sqlite3 \
+ devel/harfbuzz \
devel/physfs \
devel/sdl2 \
- graphics/glew \
graphics/png \
multimedia/libtheora \
- x11/qt5/qtscript
+ net/curl \
+ net/miniupnp/miniupnpc \
+ security/libsodium
BUILD_DEPENDS= archivers/unzip \
archivers/zip \
- textproc/asciidoc
+ devel/gettext,-tools \
+ graphics/vulkan-headers \
+ textproc/asciidoc \
+ textproc/asciidoctor
RUN_DEPENDS= devel/desktop-file-utils
-SEPARATE_BUILD= Yes
-USE_GMAKE= Yes
-CONFIGURE_STYLE= autoconf
-AUTOCONF_VERSION= 2.69
-CONFIGURE_ARGS+= --with-distributor="OpenBSD"
-CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
- LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
- ac_cv_path_MOC4="${LOCALBASE}/bin/moc4" \
- ac_cv_path_UIC4="${LOCALBASE}/bin/uic4"
-
-# XXX this is a horrible hack to make sure we get to our glm
-# which is 100% incompatible with ports glm
-MAKE_FLAGS += "DEFS=-DHAVE_CONFIG_H -I${WRKSRC}/includefirst"
-
-# libogg routines are called from the main program, so we need to
-# explicitly link against it. Wedge it in.
-MAKE_FLAGS += VORBIS_LIBS="`pkg-config --libs vorbis` -logg"
-
-pre-configure:
- mkdir -p ${WRKSRC}/includefirst
- ln -sf ${WRKSRC}/3rdparty/glm ${WRKSRC}/includefirst/glm
-.for _prog in git svn svnversion
- @cd ${WRKDIR}/bin && ln -sf /usr/bin/true ${_prog}
-.endfor
- @cd ${WRKDIR}/bin && ln -sf ${LOCALBASE}/bin/gflex flex
+WRKDIST = ${WRKDIR}/warzone2100
.include <bsd.port.mk>
Index: games/warzone2100/distinfo
===================================================================
RCS file: /home/cvs/ports/games/warzone2100/distinfo,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 distinfo
--- games/warzone2100/distinfo 24 May 2017 13:06:47 -0000 1.14
+++ games/warzone2100/distinfo 30 Dec 2021 21:56:06 -0000
@@ -1,2 +1,2 @@
-SHA256 (warzone2100-3.2.3.tar.xz) = /KuehgID59rNpu5gOE2kkKnUSur8B6ox/yX5xUi+dYI=
-SIZE (warzone2100-3.2.3.tar.xz) = 81314060
+SHA256 (warzone2100-4.2.4.tar.xz) = IkD1WkeKas9qtUUTTo9w4cEoGAoX+d+Cr2C5PTUFaEg=
+SIZE (warzone2100-4.2.4.tar.xz) = 338685080
Index: games/warzone2100/patches/patch-3rdparty_glm_core_type_half_inl
===================================================================
RCS file: games/warzone2100/patches/patch-3rdparty_glm_core_type_half_inl
diff -N games/warzone2100/patches/patch-3rdparty_glm_core_type_half_inl
--- games/warzone2100/patches/patch-3rdparty_glm_core_type_half_inl 26 Feb 2021 18:20:34 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-3rdparty_glm_core_type_half_inl,v 1.2 2021/02/26 18:20:34 naddy Exp $
-
-Index: 3rdparty/glm/core/type_half.inl
---- 3rdparty/glm/core/type_half.inl.orig
-+++ 3rdparty/glm/core/type_half.inl
-@@ -135,9 +135,9 @@ namespace detail
- // of float and half (127 versus 15).
- //
-
-- register int s = (i >> 16) & 0x00008000;
-- register int e = ((i >> 23) & 0x000000ff) - (127 - 15);
-- register int m = i & 0x007fffff;
-+ int s = (i >> 16) & 0x00008000;
-+ int e = ((i >> 23) & 0x000000ff) - (127 - 15);
-+ int m = i & 0x007fffff;
-
- //
- // Now reassemble s, e and m into a half:
Index: games/warzone2100/patches/patch-configure_ac
===================================================================
RCS file: games/warzone2100/patches/patch-configure_ac
diff -N games/warzone2100/patches/patch-configure_ac
--- games/warzone2100/patches/patch-configure_ac 27 May 2017 08:18:46 -0000 1.11
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.11 2017/05/27 08:18:46 espie Exp $
-Index: configure.ac
---- configure.ac.orig
-+++ configure.ac
-@@ -289,7 +289,7 @@ fi
- WZ_WARNINGS_GCC="-Wall -Wextra ${WZ_Wno_}unused-parameter ${WZ_Wno_}sign-compare -Wcast-align -Wwrite-strings -Wpointer-arith ${WZ_Wno_}format-security"
- AX_C_CHECK_FLAG([-Werror -Wno-expansion-to-defined -Wno-error=cpp], [#warning x], , WZ_WARNINGS_GCC="${WZ_WARNINGS_GCC} -Wno-expansion-to-defined")
- WZ_WARNINGS_GCC_C="${WZ_WARNINGS_GCC} -Wstrict-prototypes -Wdeclaration-after-statement ${CFLAGS_IGNORE_WARNINGS}"
--WZ_WARNINGS_GCC_CXX="${WZ_Wno_}enum-compare ${WZ_WARNINGS_GCC}"
-+WZ_WARNINGS_GCC_CXX="${WZ_WARNINGS_GCC}"
- if test "x$enable_debug" = "xyes" ; then
- if test "x$cc_icc" = "xyes" ; then
- WZ_CFLAGS="${WZ_CFLAGS} -O0 -g -Wcheck -Werror"
Index: games/warzone2100/patches/patch-doc_CMakeLists_txt
===================================================================
RCS file: games/warzone2100/patches/patch-doc_CMakeLists_txt
diff -N games/warzone2100/patches/patch-doc_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ games/warzone2100/patches/patch-doc_CMakeLists_txt 30 Dec 2021 21:56:06 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: doc/CMakeLists.txt
+--- doc/CMakeLists.txt.orig
++++ doc/CMakeLists.txt
+@@ -261,7 +261,7 @@ if(UNIX)
+ )
+ endif()
+
+- install(FILES "${_warzone2100_6_compressed}" DESTINATION "${CMAKE_INSTALL_MANDIR}/man6" COMPONENT Manpages)
++ install(FILES "${_warzone2100_6_uncompressed}" DESTINATION "${CMAKE_INSTALL_MANDIR}/man6" COMPONENT Manpages)
+ else()
+ message( WARNING "Unable to find gzip tool; skipping Unix man page generation" )
+ endif()
Index: games/warzone2100/patches/patch-icons_CMakeLists_txt
===================================================================
RCS file: games/warzone2100/patches/patch-icons_CMakeLists_txt
diff -N games/warzone2100/patches/patch-icons_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ games/warzone2100/patches/patch-icons_CMakeLists_txt 31 Dec 2021 13:01:03 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: icons/CMakeLists.txt
+--- icons/CMakeLists.txt.orig
++++ icons/CMakeLists.txt
+@@ -13,7 +13,7 @@ if(UNIX AND NOT APPLE AND NOT WIN32)
+ COMPONENT Core
+ )
+ install(FILES warzone2100.png
+- DESTINATION "${CMAKE_INSTALL_DATADIR}/icons"
++ DESTINATION "${CMAKE_INSTALL_DATADIR}/warzone2100/icons"
+ RENAME "warzone2100${WZ_OUTPUT_NAME_SUFFIX}.png"
+ COMPONENT Core
+ )
Index: games/warzone2100/patches/patch-icons_Makefile_in
===================================================================
RCS file: games/warzone2100/patches/patch-icons_Makefile_in
diff -N games/warzone2100/patches/patch-icons_Makefile_in
--- games/warzone2100/patches/patch-icons_Makefile_in 19 Dec 2016 12:29:01 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-icons_Makefile_in,v 1.2 2016/12/19 12:29:01 kirby Exp $
---- icons/Makefile.in.orig Sun Dec 4 01:18:34 2016
-+++ icons/Makefile.in Wed Dec 7 15:16:46 2016
-@@ -519,7 +519,6 @@ install-data-local:
- $(MKDIR_P) $(DESTDIR)$(appdatadir)
- $(INSTALL_DATA) $(srcdir)/warzone2100.png $(DESTDIR)$(icondir)/warzone2100.png
- $(INSTALL_DATA) $(srcdir)/warzone2100.desktop $(DESTDIR)$(applicationdir)/warzone2100.desktop
-- $(INSTALL_DATA) $(srcdir)/warzone2100.appdata.xml $(DESTDIR)$(appdatadir)/warzone2100.appdata.xml
-
- uninstall-local:
- $(RM) $(DESTDIR)$(icondir)/warzone2100.png
Index: games/warzone2100/patches/patch-lib_exceptionhandler_exceptionhandler_cpp
===================================================================
RCS file: /home/cvs/ports/games/warzone2100/patches/patch-lib_exceptionhandler_exceptionhandler_cpp,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-lib_exceptionhandler_exceptionhandler_cpp
--- games/warzone2100/patches/patch-lib_exceptionhandler_exceptionhandler_cpp 27 May 2017 08:18:46 -0000 1.4
+++ games/warzone2100/patches/patch-lib_exceptionhandler_exceptionhandler_cpp 30 Dec 2021 21:56:06 -0000
@@ -3,11 +3,11 @@ $OpenBSD: patch-lib_exceptionhandler_exc
Index: lib/exceptionhandler/exceptionhandler.cpp
--- lib/exceptionhandler/exceptionhandler.cpp.orig
+++ lib/exceptionhandler/exceptionhandler.cpp
-@@ -117,6 +117,7 @@ static LONG WINAPI windowsExceptionHandler(PEXCEPTION_
+@@ -47,7 +47,6 @@
# include <stdint.h>
# include <signal.h>
# include <string.h>
-+# include <errno.h>
+-# include <errno.h>
// POSIX headers:
# include <unistd.h>
Index: games/warzone2100/patches/patch-lib_netplay_netplay_cpp
===================================================================
RCS file: games/warzone2100/patches/patch-lib_netplay_netplay_cpp
diff -N games/warzone2100/patches/patch-lib_netplay_netplay_cpp
--- games/warzone2100/patches/patch-lib_netplay_netplay_cpp 27 May 2017 08:18:46 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-lib_netplay_netplay_cpp,v 1.1 2017/05/27 08:18:46 espie Exp $
-
-Index: lib/netplay/netplay.cpp
---- lib/netplay/netplay.cpp.orig
-+++ lib/netplay/netplay.cpp
-@@ -1783,7 +1783,7 @@ static void NETcheckPlayers(void)
- // We should not block here.
- bool NETrecvNet(NETQUEUE *queue, uint8_t *type)
- {
-- switch (upnp_status)
-+ switch (static_cast<int>(upnp_status))
- {
- case UPNP_ERROR_CONTROL_NOT_AVAILABLE:
- case UPNP_ERROR_DEVICE_NOT_FOUND:
Index: games/warzone2100/patches/patch-src_CMakeLists_txt
===================================================================
RCS file: games/warzone2100/patches/patch-src_CMakeLists_txt
diff -N games/warzone2100/patches/patch-src_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ games/warzone2100/patches/patch-src_CMakeLists_txt 30 Dec 2021 21:56:06 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: src/CMakeLists.txt
+--- src/CMakeLists.txt.orig
++++ src/CMakeLists.txt
+@@ -619,9 +619,6 @@ endif()
+ # Install
+ install(TARGETS warzone2100 COMPONENT Core DESTINATION "${WZ_APP_INSTALL_DEST}")
+
+-# For Portable packages only, copy the ".portable" file that triggers portable mode (Windows-only)
+-install(FILES "${CMAKE_SOURCE_DIR}/pkg/portable.in" COMPONENT PortableConfig DESTINATION "${WZ_APP_INSTALL_DEST}" RENAME ".portable")
+-
+ #####################
+ # Installing Required Runtime Dependencies
+
Index: games/warzone2100/patches/patch-src_Makefile_in
===================================================================
RCS file: games/warzone2100/patches/patch-src_Makefile_in
diff -N games/warzone2100/patches/patch-src_Makefile_in
--- games/warzone2100/patches/patch-src_Makefile_in 19 Dec 2016 12:29:01 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_Makefile_in,v 1.4 2016/12/19 12:29:01 kirby Exp $
-
-Fix SEPARATE_BUILD
-
---- src/Makefile.in.orig Sun Dec 4 01:18:34 2016
-+++ src/Makefile.in Wed Dec 7 15:16:46 2016
-@@ -1223,7 +1223,7 @@ uninstall-am: uninstall-binPROGRAMS
- .PHONY: autorevision.h
-
- autorevision.h autorevision.cache:
-- cd $(top_srcdir) && ./build_tools/autorevision -t h -o $(abs_builddir)/autorevision.cache > $(abs_builddir)/autorevision.h.new
-+ cd $(top_srcdir) && ./build_tools/autorevision -t h -o $(abs_srcdir)/autorevision.cache > $(abs_builddir)/autorevision.h.new
- cmp -s autorevision.h.new autorevision.h && rm autorevision.h.new || mv -f autorevision.h.new autorevision.h
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: games/warzone2100/pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/games/warzone2100/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 PLIST
--- games/warzone2100/pkg/PLIST 27 Jun 2018 21:03:51 -0000 1.12
+++ games/warzone2100/pkg/PLIST 31 Dec 2021 13:02:26 -0000
@@ -2,6 +2,7 @@
@bin bin/warzone2100
@man man/man6/warzone2100.6
share/applications/warzone2100.desktop
+share/doc/pkg-readmes/${PKGSTEM}
share/doc/warzone2100/
@comment share/doc/warzone2100/AUTHORS
@comment share/doc/warzone2100/COPYING
@@ -9,7 +10,9 @@ share/doc/warzone2100/
@comment share/doc/warzone2100/COPYING.README
@comment share/doc/warzone2100/ChangeLog
share/doc/warzone2100/README.md
+share/doc/warzone2100/Scripting.md
share/doc/warzone2100/ScriptingManual.htm
+share/doc/warzone2100/copyright
share/doc/warzone2100/docbook-xsl.css
share/doc/warzone2100/images/
share/doc/warzone2100/images/artillery-far-away.jpg
@@ -57,8 +60,22 @@ share/doc/warzone2100/images/transport.j
share/doc/warzone2100/images/unitordersmenu.jpg
share/doc/warzone2100/images/wss.png
share/doc/warzone2100/images/www.png
+share/doc/warzone2100/js-campaign.md
+share/doc/warzone2100/js-events.md
+share/doc/warzone2100/js-functions.md
+share/doc/warzone2100/js-globals.md
+share/doc/warzone2100/js-objects.md
share/doc/warzone2100/quickstartguide.html
-share/icons/warzone2100.png
+share/doc/warzone2100/warzone2100.6.html
+share/locale/af_ZA/
+share/locale/af_ZA/LC_MESSAGES/
+share/locale/af_ZA/LC_MESSAGES/warzone2100.mo
+share/locale/ar_SA/
+share/locale/ar_SA/LC_MESSAGES/
+share/locale/ar_SA/LC_MESSAGES/warzone2100.mo
+share/locale/bg_BG/
+share/locale/bg_BG/LC_MESSAGES/
+share/locale/bg_BG/LC_MESSAGES/warzone2100.mo
share/locale/ca_ES/
share/locale/ca_ES/LC_MESSAGES/
share/locale/ca_ES/LC_MESSAGES/warzone2100.mo
@@ -72,20 +89,33 @@ share/locale/es/LC_MESSAGES/warzone2100.
share/locale/et_EE/
share/locale/et_EE/LC_MESSAGES/
share/locale/et_EE/LC_MESSAGES/warzone2100.mo
+share/locale/fa_IR/
+share/locale/fa_IR/LC_MESSAGES/
+share/locale/fa_IR/LC_MESSAGES/warzone2100.mo
share/locale/fi/LC_MESSAGES/warzone2100.mo
share/locale/fr/LC_MESSAGES/warzone2100.mo
share/locale/fy/
share/locale/fy/LC_MESSAGES/
share/locale/fy/LC_MESSAGES/warzone2100.mo
share/locale/ga/LC_MESSAGES/warzone2100.mo
+share/locale/he_IL/
+share/locale/he_IL/LC_MESSAGES/
+share/locale/he_IL/LC_MESSAGES/warzone2100.mo
share/locale/hr/LC_MESSAGES/warzone2100.mo
share/locale/hu/LC_MESSAGES/warzone2100.mo
+share/locale/id/LC_MESSAGES/warzone2100.mo
+share/locale/id_ID/
+share/locale/id_ID/LC_MESSAGES/
+share/locale/id_ID/LC_MESSAGES/warzone2100.mo
share/locale/it/LC_MESSAGES/warzone2100.mo
share/locale/ko/LC_MESSAGES/warzone2100.mo
share/locale/la/
share/locale/la/LC_MESSAGES/
share/locale/la/LC_MESSAGES/warzone2100.mo
share/locale/lt/LC_MESSAGES/warzone2100.mo
+share/locale/my_MM/
+share/locale/my_MM/LC_MESSAGES/
+share/locale/my_MM/LC_MESSAGES/warzone2100.mo
share/locale/nb/LC_MESSAGES/warzone2100.mo
share/locale/nl/LC_MESSAGES/warzone2100.mo
share/locale/pl/LC_MESSAGES/warzone2100.mo
@@ -96,19 +126,50 @@ share/locale/ru/LC_MESSAGES/warzone2100.
share/locale/sk/LC_MESSAGES/warzone2100.mo
share/locale/sl/LC_MESSAGES/warzone2100.mo
share/locale/tr/LC_MESSAGES/warzone2100.mo
+share/locale/tt_RU/
+share/locale/tt_RU/LC_MESSAGES/
+share/locale/tt_RU/LC_MESSAGES/warzone2100.mo
share/locale/uk_UA/
share/locale/uk_UA/LC_MESSAGES/
share/locale/uk_UA/LC_MESSAGES/warzone2100.mo
share/locale/zh_CN/LC_MESSAGES/warzone2100.mo
share/locale/zh_TW/LC_MESSAGES/warzone2100.mo
share/metainfo/
+share/metainfo/warzone2100.appdata.xml
share/warzone2100/
share/warzone2100/base.wz
+share/warzone2100/fonts/
+share/warzone2100/fonts/DejaVu.LICENSE.txt
+share/warzone2100/fonts/DejaVuSans-Bold.ttf
+share/warzone2100/fonts/DejaVuSans.ttf
+share/warzone2100/icons/
+share/warzone2100/icons/warzone2100.png
share/warzone2100/mp.wz
share/warzone2100/music/
+share/warzone2100/music/albums/
+share/warzone2100/music/albums/legacy_soundtrack/
+share/warzone2100/music/albums/legacy_soundtrack/album.json
+share/warzone2100/music/albums/legacy_soundtrack/albumcover.png
+share/warzone2100/music/albums/legacy_soundtrack/license.txt
+share/warzone2100/music/albums/legacy_soundtrack/track10.ogg
+share/warzone2100/music/albums/legacy_soundtrack/track11.ogg
+share/warzone2100/music/albums/legacy_soundtrack/track12.ogg
+share/warzone2100/music/albums/legacy_soundtrack/track13.ogg
+share/warzone2100/music/albums/legacy_soundtrack/track14.ogg
+share/warzone2100/music/albums/legacy_soundtrack/track15.ogg
+share/warzone2100/music/albums/legacy_soundtrack/track16.ogg
+share/warzone2100/music/albums/legacy_soundtrack/track4.ogg
+share/warzone2100/music/albums/legacy_soundtrack/track5.ogg
+share/warzone2100/music/albums/legacy_soundtrack/track6.ogg
+share/warzone2100/music/albums/legacy_soundtrack/track7.ogg
+share/warzone2100/music/albums/legacy_soundtrack/track8.ogg
+share/warzone2100/music/albums/legacy_soundtrack/track9.ogg
+share/warzone2100/music/albums/original_soundtrack/
+share/warzone2100/music/albums/original_soundtrack/album.json
+share/warzone2100/music/albums/original_soundtrack/albumcover.png
+share/warzone2100/music/albums/original_soundtrack/track1.ogg
+share/warzone2100/music/albums/original_soundtrack/track2.ogg
+share/warzone2100/music/albums/original_soundtrack/track3.ogg
share/warzone2100/music/menu.ogg
-share/warzone2100/music/music.wpl
-share/warzone2100/music/track1.ogg
-share/warzone2100/music/track2.ogg
-share/warzone2100/music/track3.ogg
@tag update-desktop-database
+@tag gtk-update-icon-cache %D/share/icons/warzone2100
amd64 build failures 2021-12-30
Here's a reminder that these ports still fail to build since the
LLVM 13 update:
devel/qbs
lang/libv8
misc/posixtestsuite
Old logs:
http://build-failures.rhaalovely.net/amd64-clang/2021-12-06/
--
Christian "naddy" Weisgerber naddy@mips.inka.de
LLVM 13 update:
devel/qbs
lang/libv8
misc/posixtestsuite
Old logs:
http://build-failures.rhaalovely.net/amd64-clang/2021-12-06/
--
Christian "naddy" Weisgerber naddy@mips.inka.de
Re: wip/help wanted: fcitx5{,-gtk}
On 21/12/31 11:00AM, Yifei Zhan wrote:
Oops, forgot to attach this one
>
> also attached, is a WIP port of fcitx5-gtk, it handles input within GTK3
> based applications, it works fine and lib deps check is happy. However
> I'm not sure the state of GTK on OpenBSD and how this should be imported.
>
> Should supports for GTK2/GTK4 also be packaged? or they are obsolete/not
> ready yet? If they are to be packaged, should subpackages be used?
Oops, forgot to attach this one
>
> also attached, is a WIP port of fcitx5-gtk, it handles input within GTK3
> based applications, it works fine and lib deps check is happy. However
> I'm not sure the state of GTK on OpenBSD and how this should be imported.
>
> Should supports for GTK2/GTK4 also be packaged? or they are obsolete/not
> ready yet? If they are to be packaged, should subpackages be used?
Re: wip/help wanted: fcitx5{,-gtk}
Yifei Zhan <openbsd@zhan.science> writes:
> Thanks Stefan and Omar for looking into this! Now these ports are in
> a much better shape :)
>
> On 21/12/30 08:27PM, Omar Polo wrote:
>> 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 missed that because I didn't know uthash is already included. Thanks
> for the heads-up!
>
>> regarding fcitx5 itself, why disable enchant? I've added
>> textproc/enchant2 as LDEP and it builds fine.
>
> I was in the build-hack-rebuild loop so I disabled it to increase my
> compile speed. I tested fcitx with enchant enabled and it works fine, so
> let's leave it enabled.
np :)
>> 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'm not totally sure about this as well, but your tweaks look good to
> me.
>
>> 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
>
>
> You can edit that file to enable and setup IME plugins you want, but
> it's more common to use fcitx5-config-qt for that. A typical workflow
> would look like this:
>
> 1. install fcitx5 fcitx5-gtk fcitx5-qt fcitx5-config-qt fcitx5-$IME_Plugin
> which $IME_Plugin to use depends on which language you want to type.
> (e.g. fcitx5-anthy for Japanese)
i suppose all of these fcitx5-* packages are yet to be submitted ^^"
> 2. setup session environment variables in ~/.xsession, and start fcitx
> when logging in
>
> export XMODIFIERS=@im=fcitx
> export GTK_IM_MODULE=fcitx
> export QT_IM_MODULE=fcitx
> /usr/local/bin/fcitx5
Oh, I should have guessed that, it's similar to fcitx4. Maybe we can
adopt the same wording as in fcitx' DESCR?
...
Usage requires setting the following in the environment:
export XMODIFIERS="@im=fcitx"
(and similar for the gtk and qt module)
> 3. re-login, then enable and maybe tweak your IME plugin in
> fcitx5-config-qt, after which fcitx will be functional.
>
> here attached is a further tweaked version based on Omar's:
>
> - revised license markers
> - set conflict marker against fcitx-* (fcitx4)
Since fcitx5 is meant to be the successor for fcitx4 which is no longer
developed, it may make sense to replace fcitx4 with 5 instead of keeping
both in the port tree? I'm not using either, so I'm probably missing
something here.
> also attached, is a WIP port of fcitx5-gtk, it handles input within GTK3
> based applications, it works fine and lib deps check is happy. However
> I'm not sure the state of GTK on OpenBSD and how this should be imported.
forgot to attach the tarball? ;)
> Should supports for GTK2/GTK4 also be packaged? or they are obsolete/not
> ready yet? If they are to be packaged, should subpackages be used?
>
> [2. application/x-gzip; fcitx5.tweaked.tar.gz]...
>
> [3. application/x-gzip; xcb-imdkit.tweaked.tar.gz]...
Cheers,
Omar Polo
> Thanks Stefan and Omar for looking into this! Now these ports are in
> a much better shape :)
>
> On 21/12/30 08:27PM, Omar Polo wrote:
>> 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 missed that because I didn't know uthash is already included. Thanks
> for the heads-up!
>
>> regarding fcitx5 itself, why disable enchant? I've added
>> textproc/enchant2 as LDEP and it builds fine.
>
> I was in the build-hack-rebuild loop so I disabled it to increase my
> compile speed. I tested fcitx with enchant enabled and it works fine, so
> let's leave it enabled.
np :)
>> 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'm not totally sure about this as well, but your tweaks look good to
> me.
>
>> 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
>
>
> You can edit that file to enable and setup IME plugins you want, but
> it's more common to use fcitx5-config-qt for that. A typical workflow
> would look like this:
>
> 1. install fcitx5 fcitx5-gtk fcitx5-qt fcitx5-config-qt fcitx5-$IME_Plugin
> which $IME_Plugin to use depends on which language you want to type.
> (e.g. fcitx5-anthy for Japanese)
i suppose all of these fcitx5-* packages are yet to be submitted ^^"
> 2. setup session environment variables in ~/.xsession, and start fcitx
> when logging in
>
> export XMODIFIERS=@im=fcitx
> export GTK_IM_MODULE=fcitx
> export QT_IM_MODULE=fcitx
> /usr/local/bin/fcitx5
Oh, I should have guessed that, it's similar to fcitx4. Maybe we can
adopt the same wording as in fcitx' DESCR?
...
Usage requires setting the following in the environment:
export XMODIFIERS="@im=fcitx"
(and similar for the gtk and qt module)
> 3. re-login, then enable and maybe tweak your IME plugin in
> fcitx5-config-qt, after which fcitx will be functional.
>
> here attached is a further tweaked version based on Omar's:
>
> - revised license markers
> - set conflict marker against fcitx-* (fcitx4)
Since fcitx5 is meant to be the successor for fcitx4 which is no longer
developed, it may make sense to replace fcitx4 with 5 instead of keeping
both in the port tree? I'm not using either, so I'm probably missing
something here.
> also attached, is a WIP port of fcitx5-gtk, it handles input within GTK3
> based applications, it works fine and lib deps check is happy. However
> I'm not sure the state of GTK on OpenBSD and how this should be imported.
forgot to attach the tarball? ;)
> Should supports for GTK2/GTK4 also be packaged? or they are obsolete/not
> ready yet? If they are to be packaged, should subpackages be used?
>
> [2. application/x-gzip; fcitx5.tweaked.tar.gz]...
>
> [3. application/x-gzip; xcb-imdkit.tweaked.tar.gz]...
Cheers,
Omar Polo
Re: UPDATE: net/nextcloudclient-3.4.1
On 12/31/21 00:58, Joel Carnat wrote:
> 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.
Woops. After a sleep night, I remembered that the package had to be
uninstalled for the compilation process to succeed. Everything works ok.
Sorry for the noise.
> 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.
Woops. After a sleep night, I remembered that the package had to be
uninstalled for the compilation process to succeed. Everything works ok.
Sorry for the noise.
Re: wip/help wanted: fcitx5{,-gtk}
Thanks Stefan and Omar for looking into this! Now these ports are in
a much better shape :)
On 21/12/30 08:27PM, Omar Polo wrote:
> 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 missed that because I didn't know uthash is already included. Thanks
for the heads-up!
> regarding fcitx5 itself, why disable enchant? I've added
> textproc/enchant2 as LDEP and it builds fine.
I was in the build-hack-rebuild loop so I disabled it to increase my
compile speed. I tested fcitx with enchant enabled and it works fine, so
let's leave it enabled.
> 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'm not totally sure about this as well, but your tweaks look good to
me.
>
> 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
You can edit that file to enable and setup IME plugins you want, but
it's more common to use fcitx5-config-qt for that. A typical workflow
would look like this:
1. install fcitx5 fcitx5-gtk fcitx5-qt fcitx5-config-qt fcitx5-$IME_Plugin
which $IME_Plugin to use depends on which language you want to type.
(e.g. fcitx5-anthy for Japanese)
2. setup session environment variables in ~/.xsession, and start fcitx
when logging in
export XMODIFIERS=@im=fcitx
export GTK_IM_MODULE=fcitx
export QT_IM_MODULE=fcitx
/usr/local/bin/fcitx5
3. re-login, then enable and maybe tweak your IME plugin in
fcitx5-config-qt, after which fcitx will be functional.
here attached is a further tweaked version based on Omar's:
- revised license markers
- set conflict marker against fcitx-* (fcitx4)
also attached, is a WIP port of fcitx5-gtk, it handles input within GTK3
based applications, it works fine and lib deps check is happy. However
I'm not sure the state of GTK on OpenBSD and how this should be imported.
Should supports for GTK2/GTK4 also be packaged? or they are obsolete/not
ready yet? If they are to be packaged, should subpackages be used?
a much better shape :)
On 21/12/30 08:27PM, Omar Polo wrote:
> 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 missed that because I didn't know uthash is already included. Thanks
for the heads-up!
> regarding fcitx5 itself, why disable enchant? I've added
> textproc/enchant2 as LDEP and it builds fine.
I was in the build-hack-rebuild loop so I disabled it to increase my
compile speed. I tested fcitx with enchant enabled and it works fine, so
let's leave it enabled.
> 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'm not totally sure about this as well, but your tweaks look good to
me.
>
> 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
You can edit that file to enable and setup IME plugins you want, but
it's more common to use fcitx5-config-qt for that. A typical workflow
would look like this:
1. install fcitx5 fcitx5-gtk fcitx5-qt fcitx5-config-qt fcitx5-$IME_Plugin
which $IME_Plugin to use depends on which language you want to type.
(e.g. fcitx5-anthy for Japanese)
2. setup session environment variables in ~/.xsession, and start fcitx
when logging in
export XMODIFIERS=@im=fcitx
export GTK_IM_MODULE=fcitx
export QT_IM_MODULE=fcitx
/usr/local/bin/fcitx5
3. re-login, then enable and maybe tweak your IME plugin in
fcitx5-config-qt, after which fcitx will be functional.
here attached is a further tweaked version based on Omar's:
- revised license markers
- set conflict marker against fcitx-* (fcitx4)
also attached, is a WIP port of fcitx5-gtk, it handles input within GTK3
based applications, it works fine and lib deps check is happy. However
I'm not sure the state of GTK on OpenBSD and how this should be imported.
Should supports for GTK2/GTK4 also be packaged? or they are obsolete/not
ready yet? If they are to be packaged, should subpackages be used?
Re: httpd HTTP/2 and HTTP/3 support
On 2021-12-31, Georg Pfuetzenreuter <georg@syscid.com> wrote:
> Hi,
> I searched but couldn't find any recent threads.
> Does httpd support HTTP/2?
No.
> Is support for the upcoming HTTP/3 planned?
guessing but I think this would also be "no".
> Hi,
> I searched but couldn't find any recent threads.
> Does httpd support HTTP/2?
No.
> Is support for the upcoming HTTP/3 planned?
guessing but I think this would also be "no".
(update) icewm-2.9.3
Hi,
Here's an little bump for icewm, works fine here on amd64.
timo
diff 662d3c88e627c51affd7cc20a8a157055592792b /usr/ports
blob - 6e7a702e37a8d0fccb933cde45689e72d847e279
file + x11/icewm/Makefile
--- x11/icewm/Makefile
+++ x11/icewm/Makefile
@@ -3,7 +3,7 @@
# unconditionally uses machine/apmvar.h and related structures/defines
ONLY_FOR_ARCHS= ${APM_ARCHS}
-V= 2.8.0
+V= 2.9.3
COMMENT= small and fast window manager
DISTNAME= icewm-${V}
EXTRACT_SUFX= .tar.lz
blob - f7d25af8f69ad0be4ca5407b4a99b7c4dbc593d0
file + x11/icewm/distinfo
--- x11/icewm/distinfo
+++ x11/icewm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (icewm-2.8.0.tar.lz) = ErfM5nuVsJ80hz9GlI5/HO+e3YhoITngVLeboWXFPkk=
-SIZE (icewm-2.8.0.tar.lz) = 1745937
+SHA256 (icewm-2.9.3.tar.lz) = DA26xolQYLsHlJH9e6z+tVyJlvRccu4qCvqPjGrCx6g=
+SIZE (icewm-2.9.3.tar.lz) = 1760889
blob - f65368be2fd27864867da150e47eabdf7235f234
file + x11/icewm/pkg/PLIST
--- x11/icewm/pkg/PLIST
+++ x11/icewm/pkg/PLIST
@@ -66,6 +66,7 @@ share/icewm/icons/app_16x16.xpm
share/icewm/icons/app_32x32.xpm
share/icewm/icons/bomb_16x16.xpm
share/icewm/icons/bomb_32x32.xpm
+share/icewm/icons/cancel-logout_16x16.xpm
share/icewm/icons/communicator-abook_16x16.xpm
share/icewm/icons/communicator-abook_32x32.xpm
share/icewm/icons/communicator-browser_16x16.xpm
@@ -139,6 +140,15 @@ share/icewm/icons/suspend_16x16.xpm
share/icewm/icons/suspend_32x32.xpm
share/icewm/icons/themes_16x16.xpm
share/icewm/icons/themes_32x32.xpm
+share/icewm/icons/tilebottom_48x48.png
+share/icewm/icons/tilebottomleft_48x48.png
+share/icewm/icons/tilebottomright_48x48.png
+share/icewm/icons/tilecenter_48x48.png
+share/icewm/icons/tileleft_48x48.png
+share/icewm/icons/tileright_48x48.png
+share/icewm/icons/tiletop_48x48.png
+share/icewm/icons/tiletopleft_48x48.png
+share/icewm/icons/tiletopright_48x48.png
share/icewm/icons/vim_16x16.xpm
share/icewm/icons/vim_32x32.xpm
share/icewm/icons/vim_48x48.xpm
Here's an little bump for icewm, works fine here on amd64.
timo
diff 662d3c88e627c51affd7cc20a8a157055592792b /usr/ports
blob - 6e7a702e37a8d0fccb933cde45689e72d847e279
file + x11/icewm/Makefile
--- x11/icewm/Makefile
+++ x11/icewm/Makefile
@@ -3,7 +3,7 @@
# unconditionally uses machine/apmvar.h and related structures/defines
ONLY_FOR_ARCHS= ${APM_ARCHS}
-V= 2.8.0
+V= 2.9.3
COMMENT= small and fast window manager
DISTNAME= icewm-${V}
EXTRACT_SUFX= .tar.lz
blob - f7d25af8f69ad0be4ca5407b4a99b7c4dbc593d0
file + x11/icewm/distinfo
--- x11/icewm/distinfo
+++ x11/icewm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (icewm-2.8.0.tar.lz) = ErfM5nuVsJ80hz9GlI5/HO+e3YhoITngVLeboWXFPkk=
-SIZE (icewm-2.8.0.tar.lz) = 1745937
+SHA256 (icewm-2.9.3.tar.lz) = DA26xolQYLsHlJH9e6z+tVyJlvRccu4qCvqPjGrCx6g=
+SIZE (icewm-2.9.3.tar.lz) = 1760889
blob - f65368be2fd27864867da150e47eabdf7235f234
file + x11/icewm/pkg/PLIST
--- x11/icewm/pkg/PLIST
+++ x11/icewm/pkg/PLIST
@@ -66,6 +66,7 @@ share/icewm/icons/app_16x16.xpm
share/icewm/icons/app_32x32.xpm
share/icewm/icons/bomb_16x16.xpm
share/icewm/icons/bomb_32x32.xpm
+share/icewm/icons/cancel-logout_16x16.xpm
share/icewm/icons/communicator-abook_16x16.xpm
share/icewm/icons/communicator-abook_32x32.xpm
share/icewm/icons/communicator-browser_16x16.xpm
@@ -139,6 +140,15 @@ share/icewm/icons/suspend_16x16.xpm
share/icewm/icons/suspend_32x32.xpm
share/icewm/icons/themes_16x16.xpm
share/icewm/icons/themes_32x32.xpm
+share/icewm/icons/tilebottom_48x48.png
+share/icewm/icons/tilebottomleft_48x48.png
+share/icewm/icons/tilebottomright_48x48.png
+share/icewm/icons/tilecenter_48x48.png
+share/icewm/icons/tileleft_48x48.png
+share/icewm/icons/tileright_48x48.png
+share/icewm/icons/tiletop_48x48.png
+share/icewm/icons/tiletopleft_48x48.png
+share/icewm/icons/tiletopright_48x48.png
share/icewm/icons/vim_16x16.xpm
share/icewm/icons/vim_32x32.xpm
share/icewm/icons/vim_48x48.xpm
Re: New: graphics/libyuv 0.0.1807
On Fri, Dec 31, 2021 at 09:19:34AM +0000, Stuart Henderson wrote:
> On 2021/12/31 06:51, Andrew Krasavin wrote:
> > 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:
>
> Given what you've said about libyuv, I think this approach could be
> problematic and that it makes more sense to use the bundled copy.
We can always use the bundle and if libyuv means too many problems, we
certainly will.
We've split it out because it was doable without much effort.
I've deemed it worthwile because we can reduce the tg_owt/tdesktop
monolith by a noticable chunk, hopefully providing a port that will be
usable by other ports as well.
FWIW, FreeBSD also has a libyuv port, but it also seems unused at the
moment and their telegram ports still use the bundled version.
> As well as avoiding the problems you've mentioned, it reduces the
> risk of it interfering with build of the chromium-based ports
> (chromium/iridium/electron/qtwebengine) which won't expect a system copy
> of this library/headers.
chromium picking it up also occured to me but I haven't looked into
that yet.
Maybe robert knows more about this? I'm happy to beat this into shape
if it can actually benefit the browsers.
> On 2021/12/31 06:51, Andrew Krasavin wrote:
> > 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:
>
> Given what you've said about libyuv, I think this approach could be
> problematic and that it makes more sense to use the bundled copy.
We can always use the bundle and if libyuv means too many problems, we
certainly will.
We've split it out because it was doable without much effort.
I've deemed it worthwile because we can reduce the tg_owt/tdesktop
monolith by a noticable chunk, hopefully providing a port that will be
usable by other ports as well.
FWIW, FreeBSD also has a libyuv port, but it also seems unused at the
moment and their telegram ports still use the bundled version.
> As well as avoiding the problems you've mentioned, it reduces the
> risk of it interfering with build of the chromium-based ports
> (chromium/iridium/electron/qtwebengine) which won't expect a system copy
> of this library/headers.
chromium picking it up also occured to me but I haven't looked into
that yet.
Maybe robert knows more about this? I'm happy to beat this into shape
if it can actually benefit the browsers.
Re: [maintainer update] gzdoom-4.7.1
Timo Myyrä <timo.myyra@bittivirhe.fi> [2021-12-19, 10:58 +0200]:
> Omar Polo <op@openbsd.org> [2021-12-15, 20:44 +0100]:
>
>> Timo Myyrä <timo.myyra@bittivirhe.fi> writes:
>>
>>> Hi,
>>>
>>> A bit delayed update to gzdoom. The upstream have made chopped the music
>>> part as standalone library which I sent to ports@ earlier (audio/zmusic)
>>> which is needed by this update.
>>>
>>> Quickly tested on doom1 which appeared to be working.
>>>
>>>[...]
>>>
>>> CONFIGURE_ARGS += -DNO_GTK=ON
>>> -CONFIGURE_ARGS += -DDYN_OPENAL=NO -DDYN_MPG123=NO -DDYN_SNDFILE=NO
>>> -CONFIGURE_ARGS += -DFLUIDSYNTHLIB1="libfluidsynth.so"
>>> +CONFIGURE_ARGS += -DDYN_OPENAL=NO
>>> +# Sync with audio/fluidsynth
>>> +CONFIGURE_ARGS += -DFLUIDSYNTHLIB1="libfluidsynth.so.2.0"
>>
>> this bit (and the relative patch to the CMakeList.txt) is no more needed
>> since the audio is moved to zmusic, and I can't find other instances of
>> FLUIDSYNTHLIB1, so they can be dropped
>>
>
> ah, good point. A grepped the sources but did not notice the
> FLUIDSYNTHLIB1 was added by local patch so I kept that.
>
>>> [...]
>>> - if ( UNIX )
>>> - include(CheckSymbolExists)
>>> -- check_symbol_exists( "fts_set" "fts.h" HAVE_FTS )
>>> -+ check_symbol_exists( "fts_set" "sys/types.h;sys/stat.h;fts.h" HAVE_FTS )
>>
>> this is still needed otherwise it doesn't find fts_set (there's
>> virtually the same patch on zmusic too)
>>
>
> Good catch.
>
>>> [...]
>>
>> It breaks the build if graphics/glslang is installed. gzdoom uses its
>> own bundled version of the vulkan sdk but the compiler ends up including
>> the system header instead of the bundled one. There are different
>> solution for this:
>>
>> 1. cherry-pick this diff
>> https://github.com/alexey-lysiuk/gzdoom/commit/5c9fb205d9231abbd8a3bf744850db02c0754057
>>
>> (see https://github.com/coelckers/gzdoom/issues/1382)
>>
>> 2. add `CONFIGURE_ARGS += -DHAVE_VULKAN=OFF' to completely disable
>> vulkan, or
>>
>> 3. use the same trick sdk@ used for net/tdlib-purple:
>>
>> CONFIGURE_ARGS += -DCMAKE_CXX_FLAGS="${CXXFLAGS} -I. -I${LOCALBASE}/include"
>>
>>
>
> Yeah, I think we can go with the third option.
>
>> 1) is probably overkill for us, 2) is what I initially did but 3) is
>> probably the more pragmatic solution. I went with the third option in
>> the diff below, but either is fine I guess.
>>
>> I'm also re-attaching the tweaked audio/zmusic tarball for convenience
>> (which is ok op@ to import if someone wants to). see
>> https://marc.info/?l=openbsd-ports&m=163916682506561&w=2
>>
>> Tested on amdgpu with the shareware IWAD file mentioned in README and
>> works fine!
>>
>> Thanks,
>>
>> Omar Polo
>
> Ok from me for these fixes.
>
> Timo
>
>>
>> Index: Makefile
>> ===================================================================
>> RCS file: /home/cvs/ports/games/gzdoom/Makefile,v
>> retrieving revision 1.13
>> diff -u -p -r1.13 Makefile
>> --- Makefile 25 Oct 2021 07:19:59 -0000 1.13
>> +++ Makefile 15 Dec 2021 19:59:09 -0000
>> @@ -8,12 +8,11 @@ ONLY_FOR_ARCHS = i386 amd64
>>
>> COMMENT = OpenGL engine for idTech 1 games like doom,hexen,heretic...
>>
>> -V = 4.3.3
>> +V = 4.7.1
>> GH_ACCOUNT = coelckers
>> GH_PROJECT = gzdoom
>> GH_TAGNAME = g${V}
>> DISTNAME = gzdoom-${V}
>> -REVISION = 1
>>
>> CATEGORIES= games
>>
>> @@ -24,21 +23,21 @@ MAINTAINER = Timo Myyra <timo.myyra@bit
>> # GPLv3
>> PERMIT_PACKAGE = Yes
>>
>> -WANTLIB += ${COMPILER_LIBCXX} SDL2 bz2 c execinfo jpeg m mpg123
>> -WANTLIB += openal sndfile z
>> +WANTLIB += ${COMPILER_LIBCXX} SDL2 bz2 c execinfo jpeg m
>> +WANTLIB += openal z zmusic
>>
>> +# C++17
>> COMPILER = base-clang ports-gcc
>>
>> MODULES = devel/cmake
>>
>> CONFIGURE_ARGS += -DNO_GTK=ON
>> -CONFIGURE_ARGS += -DDYN_OPENAL=NO -DDYN_MPG123=NO -DDYN_SNDFILE=NO
>> -CONFIGURE_ARGS += -DFLUIDSYNTHLIB1="libfluidsynth.so"
>> +CONFIGURE_ARGS += -DDYN_OPENAL=NO
>> CONFIGURE_ARGS += -DHAVE_STDINT_H=1
>> +CONFIGURE_ARGS += -DCMAKE_CXX_FLAGS="${CXXFLAGS} -I. -I${LOCALBASE}/include"
>>
>> -LIB_DEPENDS = audio/libsndfile \
>> - audio/mpg123 \
>> - audio/openal \
>> +LIB_DEPENDS = audio/openal \
>> + audio/zmusic \
>> archivers/bzip2 \
>> graphics/jpeg \
>> devel/sdl2
>> Index: distinfo
>> ===================================================================
>> RCS file: /home/cvs/ports/games/gzdoom/distinfo,v
>> retrieving revision 1.5
>> diff -u -p -r1.5 distinfo
>> --- distinfo 9 Mar 2020 12:18:50 -0000 1.5
>> +++ distinfo 15 Dec 2021 18:03:21 -0000
>> @@ -1,2 +1,2 @@
>> -SHA256 (gzdoom-4.3.3.tar.gz) = j+a/WQcdxgPmEenoIs2KaTTMSB0KKhmNkhr4gSZmG2A=
>> -SIZE (gzdoom-4.3.3.tar.gz) = 13704956
>> +SHA256 (gzdoom-4.7.1.tar.gz) = RUJXWCvgV2UB7vHvyZ/n6nDxxNeZNUnbPLxwnOdfwQI=
>> +SIZE (gzdoom-4.7.1.tar.gz) = 19562412
>> Index: patches/patch-libraries_glslang_glslang_Include_PoolAlloc_h
>> ===================================================================
>> RCS file: patches/patch-libraries_glslang_glslang_Include_PoolAlloc_h
>> diff -N patches/patch-libraries_glslang_glslang_Include_PoolAlloc_h
>> --- patches/patch-libraries_glslang_glslang_Include_PoolAlloc_h 6 Aug 2020 11:11:12 -0000 1.1
>> +++ /dev/null 1 Jan 1970 00:00:00 -0000
>> @@ -1,18 +0,0 @@
>> -$OpenBSD: patch-libraries_glslang_glslang_Include_PoolAlloc_h,v 1.1 2020/08/06 11:11:12 edd Exp $
>> -
>> -Fix build on base Clang 10.
>> -
>> -It's the same fix as this:
>> -https://github.com/KhronosGroup/glslang/pull/2010/commits/24b3e8384e93f3e73b6aa14ea00a30574112f9ba
>> -
>> -Index: libraries/glslang/glslang/Include/PoolAlloc.h
>> ---- libraries/glslang/glslang/Include/PoolAlloc.h.orig
>> -+++ libraries/glslang/glslang/Include/PoolAlloc.h
>> -@@ -304,7 +304,6 @@ class pool_allocator { (public)
>> - size_type max_size() const { return static_cast<size_type>(-1) / sizeof(T); }
>> - size_type max_size(int size) const { return static_cast<size_type>(-1) / size; }
>> -
>> -- void setAllocator(TPoolAllocator* a) { allocator = *a; }
>> - TPoolAllocator& getAllocator() const { return allocator; }
>> -
>> - protected:
>> Index: patches/patch-libraries_wildmidi_wildmidi_wildmidi_lib_h
>> ===================================================================
>> RCS file: patches/patch-libraries_wildmidi_wildmidi_wildmidi_lib_h
>> diff -N patches/patch-libraries_wildmidi_wildmidi_wildmidi_lib_h
>> --- patches/patch-libraries_wildmidi_wildmidi_wildmidi_lib_h 6 Dec 2019 17:40:24 -0000 1.1
>> +++ /dev/null 1 Jan 1970 00:00:00 -0000
>> @@ -1,13 +0,0 @@
>> -$OpenBSD: patch-libraries_wildmidi_wildmidi_wildmidi_lib_h,v 1.1 2019/12/06 17:40:24 solene Exp $
>> -
>> -Index: libraries/wildmidi/wildmidi/wildmidi_lib.h
>> ---- libraries/wildmidi/wildmidi/wildmidi_lib.h.orig
>> -+++ libraries/wildmidi/wildmidi/wildmidi_lib.h
>> -@@ -28,6 +28,7 @@
>> - #define WILDMIDI_LIB_H
>> -
>> - #include "../../music_common/fileio.h"
>> -+#include <stdarg.h>
>> -
>> - namespace WildMidi
>> - {
>> Index: patches/patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp
>> ===================================================================
>> RCS file: patches/patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp
>> diff -N patches/patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp
>> --- patches/patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp 9 Mar 2020 12:18:50 -0000 1.2
>> +++ /dev/null 1 Jan 1970 00:00:00 -0000
>> @@ -1,18 +0,0 @@
>> -$OpenBSD: patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp,v 1.2 2020/03/09 12:18:50 solene Exp $
>> -
>> -Index: libraries/zmusic/mididevices/music_fluidsynth_mididevice.cpp
>> ---- libraries/zmusic/mididevices/music_fluidsynth_mididevice.cpp.orig
>> -+++ libraries/zmusic/mididevices/music_fluidsynth_mididevice.cpp
>> -@@ -141,8 +141,12 @@ class FluidSynthMIDIDevice : public SoftSynthMIDIDevic
>> - #define FLUIDSYNTHLIB1 "libfluidsynth.1.dylib"
>> - #define FLUIDSYNTHLIB2 "libfluidsynth.2.dylib"
>> - #else // !__APPLE__
>> -+#ifndef FLUIDSYNTHLIB1
>> - #define FLUIDSYNTHLIB1 "libfluidsynth.so.1"
>> -+
> Omar Polo <op@openbsd.org> [2021-12-15, 20:44 +0100]:
>
>> Timo Myyrä <timo.myyra@bittivirhe.fi> writes:
>>
>>> Hi,
>>>
>>> A bit delayed update to gzdoom. The upstream have made chopped the music
>>> part as standalone library which I sent to ports@ earlier (audio/zmusic)
>>> which is needed by this update.
>>>
>>> Quickly tested on doom1 which appeared to be working.
>>>
>>>[...]
>>>
>>> CONFIGURE_ARGS += -DNO_GTK=ON
>>> -CONFIGURE_ARGS += -DDYN_OPENAL=NO -DDYN_MPG123=NO -DDYN_SNDFILE=NO
>>> -CONFIGURE_ARGS += -DFLUIDSYNTHLIB1="libfluidsynth.so"
>>> +CONFIGURE_ARGS += -DDYN_OPENAL=NO
>>> +# Sync with audio/fluidsynth
>>> +CONFIGURE_ARGS += -DFLUIDSYNTHLIB1="libfluidsynth.so.2.0"
>>
>> this bit (and the relative patch to the CMakeList.txt) is no more needed
>> since the audio is moved to zmusic, and I can't find other instances of
>> FLUIDSYNTHLIB1, so they can be dropped
>>
>
> ah, good point. A grepped the sources but did not notice the
> FLUIDSYNTHLIB1 was added by local patch so I kept that.
>
>>> [...]
>>> - if ( UNIX )
>>> - include(CheckSymbolExists)
>>> -- check_symbol_exists( "fts_set" "fts.h" HAVE_FTS )
>>> -+ check_symbol_exists( "fts_set" "sys/types.h;sys/stat.h;fts.h" HAVE_FTS )
>>
>> this is still needed otherwise it doesn't find fts_set (there's
>> virtually the same patch on zmusic too)
>>
>
> Good catch.
>
>>> [...]
>>
>> It breaks the build if graphics/glslang is installed. gzdoom uses its
>> own bundled version of the vulkan sdk but the compiler ends up including
>> the system header instead of the bundled one. There are different
>> solution for this:
>>
>> 1. cherry-pick this diff
>> https://github.com/alexey-lysiuk/gzdoom/commit/5c9fb205d9231abbd8a3bf744850db02c0754057
>>
>> (see https://github.com/coelckers/gzdoom/issues/1382)
>>
>> 2. add `CONFIGURE_ARGS += -DHAVE_VULKAN=OFF' to completely disable
>> vulkan, or
>>
>> 3. use the same trick sdk@ used for net/tdlib-purple:
>>
>> CONFIGURE_ARGS += -DCMAKE_CXX_FLAGS="${CXXFLAGS} -I. -I${LOCALBASE}/include"
>>
>>
>
> Yeah, I think we can go with the third option.
>
>> 1) is probably overkill for us, 2) is what I initially did but 3) is
>> probably the more pragmatic solution. I went with the third option in
>> the diff below, but either is fine I guess.
>>
>> I'm also re-attaching the tweaked audio/zmusic tarball for convenience
>> (which is ok op@ to import if someone wants to). see
>> https://marc.info/?l=openbsd-ports&m=163916682506561&w=2
>>
>> Tested on amdgpu with the shareware IWAD file mentioned in README and
>> works fine!
>>
>> Thanks,
>>
>> Omar Polo
>
> Ok from me for these fixes.
>
> Timo
>
>>
>> Index: Makefile
>> ===================================================================
>> RCS file: /home/cvs/ports/games/gzdoom/Makefile,v
>> retrieving revision 1.13
>> diff -u -p -r1.13 Makefile
>> --- Makefile 25 Oct 2021 07:19:59 -0000 1.13
>> +++ Makefile 15 Dec 2021 19:59:09 -0000
>> @@ -8,12 +8,11 @@ ONLY_FOR_ARCHS = i386 amd64
>>
>> COMMENT = OpenGL engine for idTech 1 games like doom,hexen,heretic...
>>
>> -V = 4.3.3
>> +V = 4.7.1
>> GH_ACCOUNT = coelckers
>> GH_PROJECT = gzdoom
>> GH_TAGNAME = g${V}
>> DISTNAME = gzdoom-${V}
>> -REVISION = 1
>>
>> CATEGORIES= games
>>
>> @@ -24,21 +23,21 @@ MAINTAINER = Timo Myyra <timo.myyra@bit
>> # GPLv3
>> PERMIT_PACKAGE = Yes
>>
>> -WANTLIB += ${COMPILER_LIBCXX} SDL2 bz2 c execinfo jpeg m mpg123
>> -WANTLIB += openal sndfile z
>> +WANTLIB += ${COMPILER_LIBCXX} SDL2 bz2 c execinfo jpeg m
>> +WANTLIB += openal z zmusic
>>
>> +# C++17
>> COMPILER = base-clang ports-gcc
>>
>> MODULES = devel/cmake
>>
>> CONFIGURE_ARGS += -DNO_GTK=ON
>> -CONFIGURE_ARGS += -DDYN_OPENAL=NO -DDYN_MPG123=NO -DDYN_SNDFILE=NO
>> -CONFIGURE_ARGS += -DFLUIDSYNTHLIB1="libfluidsynth.so"
>> +CONFIGURE_ARGS += -DDYN_OPENAL=NO
>> CONFIGURE_ARGS += -DHAVE_STDINT_H=1
>> +CONFIGURE_ARGS += -DCMAKE_CXX_FLAGS="${CXXFLAGS} -I. -I${LOCALBASE}/include"
>>
>> -LIB_DEPENDS = audio/libsndfile \
>> - audio/mpg123 \
>> - audio/openal \
>> +LIB_DEPENDS = audio/openal \
>> + audio/zmusic \
>> archivers/bzip2 \
>> graphics/jpeg \
>> devel/sdl2
>> Index: distinfo
>> ===================================================================
>> RCS file: /home/cvs/ports/games/gzdoom/distinfo,v
>> retrieving revision 1.5
>> diff -u -p -r1.5 distinfo
>> --- distinfo 9 Mar 2020 12:18:50 -0000 1.5
>> +++ distinfo 15 Dec 2021 18:03:21 -0000
>> @@ -1,2 +1,2 @@
>> -SHA256 (gzdoom-4.3.3.tar.gz) = j+a/WQcdxgPmEenoIs2KaTTMSB0KKhmNkhr4gSZmG2A=
>> -SIZE (gzdoom-4.3.3.tar.gz) = 13704956
>> +SHA256 (gzdoom-4.7.1.tar.gz) = RUJXWCvgV2UB7vHvyZ/n6nDxxNeZNUnbPLxwnOdfwQI=
>> +SIZE (gzdoom-4.7.1.tar.gz) = 19562412
>> Index: patches/patch-libraries_glslang_glslang_Include_PoolAlloc_h
>> ===================================================================
>> RCS file: patches/patch-libraries_glslang_glslang_Include_PoolAlloc_h
>> diff -N patches/patch-libraries_glslang_glslang_Include_PoolAlloc_h
>> --- patches/patch-libraries_glslang_glslang_Include_PoolAlloc_h 6 Aug 2020 11:11:12 -0000 1.1
>> +++ /dev/null 1 Jan 1970 00:00:00 -0000
>> @@ -1,18 +0,0 @@
>> -$OpenBSD: patch-libraries_glslang_glslang_Include_PoolAlloc_h,v 1.1 2020/08/06 11:11:12 edd Exp $
>> -
>> -Fix build on base Clang 10.
>> -
>> -It's the same fix as this:
>> -https://github.com/KhronosGroup/glslang/pull/2010/commits/24b3e8384e93f3e73b6aa14ea00a30574112f9ba
>> -
>> -Index: libraries/glslang/glslang/Include/PoolAlloc.h
>> ---- libraries/glslang/glslang/Include/PoolAlloc.h.orig
>> -+++ libraries/glslang/glslang/Include/PoolAlloc.h
>> -@@ -304,7 +304,6 @@ class pool_allocator { (public)
>> - size_type max_size() const { return static_cast<size_type>(-1) / sizeof(T); }
>> - size_type max_size(int size) const { return static_cast<size_type>(-1) / size; }
>> -
>> -- void setAllocator(TPoolAllocator* a) { allocator = *a; }
>> - TPoolAllocator& getAllocator() const { return allocator; }
>> -
>> - protected:
>> Index: patches/patch-libraries_wildmidi_wildmidi_wildmidi_lib_h
>> ===================================================================
>> RCS file: patches/patch-libraries_wildmidi_wildmidi_wildmidi_lib_h
>> diff -N patches/patch-libraries_wildmidi_wildmidi_wildmidi_lib_h
>> --- patches/patch-libraries_wildmidi_wildmidi_wildmidi_lib_h 6 Dec 2019 17:40:24 -0000 1.1
>> +++ /dev/null 1 Jan 1970 00:00:00 -0000
>> @@ -1,13 +0,0 @@
>> -$OpenBSD: patch-libraries_wildmidi_wildmidi_wildmidi_lib_h,v 1.1 2019/12/06 17:40:24 solene Exp $
>> -
>> -Index: libraries/wildmidi/wildmidi/wildmidi_lib.h
>> ---- libraries/wildmidi/wildmidi/wildmidi_lib.h.orig
>> -+++ libraries/wildmidi/wildmidi/wildmidi_lib.h
>> -@@ -28,6 +28,7 @@
>> - #define WILDMIDI_LIB_H
>> -
>> - #include "../../music_common/fileio.h"
>> -+#include <stdarg.h>
>> -
>> - namespace WildMidi
>> - {
>> Index: patches/patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp
>> ===================================================================
>> RCS file: patches/patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp
>> diff -N patches/patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp
>> --- patches/patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp 9 Mar 2020 12:18:50 -0000 1.2
>> +++ /dev/null 1 Jan 1970 00:00:00 -0000
>> @@ -1,18 +0,0 @@
>> -$OpenBSD: patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp,v 1.2 2020/03/09 12:18:50 solene Exp $
>> -
>> -Index: libraries/zmusic/mididevices/music_fluidsynth_mididevice.cpp
>> ---- libraries/zmusic/mididevices/music_fluidsynth_mididevice.cpp.orig
>> -+++ libraries/zmusic/mididevices/music_fluidsynth_mididevice.cpp
>> -@@ -141,8 +141,12 @@ class FluidSynthMIDIDevice : public SoftSynthMIDIDevic
>> - #define FLUIDSYNTHLIB1 "libfluidsynth.1.dylib"
>> - #define FLUIDSYNTHLIB2 "libfluidsynth.2.dylib"
>> - #else // !__APPLE__
>> -+#ifndef FLUIDSYNTHLIB1
>> - #define FLUIDSYNTHLIB1 "libfluidsynth.so.1"
>> -+
Re: New: graphics/libyuv 0.0.1807
On 2021/12/31 06:51, Andrew Krasavin wrote:
> 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:
Given what you've said about libyuv, I think this approach could be
problematic and that it makes more sense to use the bundled copy.
As well as avoiding the problems you've mentioned, it reduces the
risk of it interfering with build of the chromium-based ports
(chromium/iridium/electron/qtwebengine) which won't expect a system copy
of this library/headers.
> 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:
Given what you've said about libyuv, I think this approach could be
problematic and that it makes more sense to use the bundled copy.
As well as avoiding the problems you've mentioned, it reduces the
risk of it interfering with build of the chromium-based ports
(chromium/iridium/electron/qtwebengine) which won't expect a system copy
of this library/headers.
Thursday, December 30, 2021
httpd HTTP/2 and HTTP/3 support
Hi,
I searched but couldn't find any recent threads.
Does httpd support HTTP/2?
Is support for the upcoming HTTP/3 planned?
I checked some websites run by OpenBSD's httpd, like openbsd.org itself,
and they seem to all be served via HTTP/1.1.
Thanks for any insights!
I searched but couldn't find any recent threads.
Does httpd support HTTP/2?
Is support for the upcoming HTTP/3 planned?
I checked some websites run by OpenBSD's httpd, like openbsd.org itself,
and they seem to all be served via HTTP/1.1.
Thanks for any insights!
Update sysutils/opam to 2.1.2
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
--- Makefile 10 Dec 2021 04:11:00 -0000 1.23
+++ Makefile 31 Dec 2021 07:34:49 -0000
@@ -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
--- distinfo 23 Feb 2021 05:25:04 -0000 1.8
+++ distinfo 31 Dec 2021 07:34:49 -0000
@@ -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 -0000
+++ patches/patch-Makefile_config_in 31 Dec 2021 07:34:49 -0000
@@ -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 -0000
+++ patches/patch-configure_ac 31 Dec 2021 07:34:49 -0000
@@ -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 -0000 1.2
+++ pkg/PLIST 31 Dec 2021 07:34:49 -0000
@@ -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
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
--- Makefile 10 Dec 2021 04:11:00 -0000 1.23
+++ Makefile 31 Dec 2021 07:34:49 -0000
@@ -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
--- distinfo 23 Feb 2021 05:25:04 -0000 1.8
+++ distinfo 31 Dec 2021 07:34:49 -0000
@@ -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 -0000
+++ patches/patch-Makefile_config_in 31 Dec 2021 07:34:49 -0000
@@ -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 -0000
+++ patches/patch-configure_ac 31 Dec 2021 07:34:49 -0000
@@ -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 -0000 1.2
+++ pkg/PLIST 31 Dec 2021 07:34:49 -0000
@@ -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
Subscribe to:
Posts (Atom)