PROPOSAL expand pf.conf example in README of net/dhcpcd
Diff below expands the pf.conf example given in README of net/dhcpcd. I
had some difficulties with getting IPv6 to work on a specific host,
which was caused by a strict pf configuration, i.e. outgoing traffic was
limited. I think this small addition would have helped me.
Comments/OK?
diff --git Makefile Makefile
index 36f9ab313a9..7d6ca5d923e 100644
--- Makefile
+++ Makefile
@@ -6,7 +6,7 @@ GH_ACCOUNT= NetworkConfiguration
GH_PROJECT=dhcpcd
GH_TAGNAME=dhcpcd-9.4.1
DISTNAME= ${GH_TAGNAME}
-REVISION= 0
+REVISION= 1
EPOCH= 0
diff --git pkg/README pkg/README
index 4e1a6d5b7ac..ea1dc42c80c 100644
--- pkg/README
+++ pkg/README
@@ -15,6 +15,7 @@ pppoe0 interface and assigning it to multiple local networks.
Also ensure that pf.conf(5) allows DHCPv6 traffic to pass, for example:
pass in quick on pppoe0 proto udp from fe80::/10 port dhcpv6-server to
fe80::/10 port dhcpv6-client
+ pass out quick on pppoe0 proto udp from fe80::/10 port dhcpv6-client to
ff02::1:2 port dhcpv6-server
As usual with IPv6, you will also need to allow address resolution
(with IPv6 this is done "in band" using icmp6 packets which must be allowed
Re: Proposal/Question: drop databases/riak?
Volker Schlecht writes: > Bump and correction: > > It has been broken for almost *three* years. > > Any thoughts? I'm game to delete riak unless somebody speaks up in the next week? > > On 12/30/22 09:59, Volker Schlecht wrote: >> Cc: Maintainer >> Hi, >> the version of riak in ports has been broken for almost two years >> now, so I would consider it a safe assumption that there's not a >> whole lot of interest in that port. >> While I could (and would be willing to) try to update it to a more >> recent version, that builds and works with erlang 25.x, I'm really >> not sure if it's effort well spent: >> * Nobody seemed to miss it for two years on OpenBSD >> * None of the other BSDs provide ports/packages for it >> * Barely a Linux distribution provides packages for it >> https://repology.org/projects/?search=riak >> At the same time, if/when my proposed update to benchmarks/tsung >> gets in, broken databases/riak will be the only port holding back a >> removal of lang/erlang/21 and devel/rebar, both of which are not >> enjoying significant upstream support anymore. >> Any thoughts? >> cu, >> Volker
Re: [Update] Build benchmarks/tsung with erlang25
Thanks for the diff Volker. I committed it after confirming `make test` looks better now. Volker Schlecht writes: > bump > > On 12/28/22 23:29, Volker Schlecht wrote: >> Forgot a REVISION bump there. >> On 12/28/22 11:55, Volker Schlecht wrote: >>> Attached is a proposal to build benchmarks/tsung with erlang25. >>> >>> I pulled in an upstream patch to fix an already failing testcase >>> that was already reported by gnezdo@: >>> https://github.com/processone/tsung/issues/385 >>> >>> The only remaining failing testcase has apparently been failing >>> already in previous versions. >>> >>> benchmarks/tsung is the only remaining non-broken port that depends >>> on erlang21, so if we could get tsung updated, we could possibly >>> drop erlang/21 from ports ... it won't build databases/riak anyway.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gne...@cvs.openbsd.org 2023/01/07 22:45:18 Modified files: benchmarks/tsung: Makefile Added files: benchmarks/tsung/patches: patch-src_test_ts_test_utils_erl Log message: Build benchmarks/tsung with erlang25 Includes a fix for https://github.com/processone/tsung/issues/385 By Volker Schlecht openbsd-ports AT schlecht DOT dev
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2023/01/07 20:42:44 Modified files: sysutils/findlib: Makefile distinfo sysutils/findlib/pkg: PFRAG.dynlink-native PLIST Log message: update findlib to 1.9.6; needed for ocaml > 4.12 ocaml 4.13 changed capitalization of some of the lib files which confuses some of the findlib build tests (and then leads to fallback code which depends on ocamlbuild). A newer version of findlib addresses this. In addition, findlib 1.9.4 added proper DESTDIR support, so we can drop FAKE_FLAGS from the port Makefile as part of this update. Diff from Volker Schlecht; and tested by myself on amd64.
[patch] update for ocaml-menhir
Here is an update of ocaml-menhir from 2019/09/24 to 2021/10/12.
One big change is that the build system switches to dune.
There is only one consumer of menhir (lang/compcert) and I've tested that
still works.
Newer versions of menhir require dune 2.8.0 or later.
ok?
Index: Makefile
===
RCS file: /cvs/ports/devel/ocaml-menhir/Makefile,v
retrieving revision 1.24
diff -u -p -u -r1.24 Makefile
--- Makefile11 Mar 2022 18:50:53 - 1.24
+++ Makefile8 Jan 2023 03:18:48 -
@@ -1,13 +1,13 @@
COMMENT = OCaml parser generator for LR(1) grammars
-V =20190924
+V =20211012
DISTNAME = menhir-${V}
PKGNAME = ocaml-${DISTNAME}
-REVISION = 3
MASTER_SITES = https://gitlab.inria.fr/fpottier/menhir/-/archive/${V}/
HOMEPAGE = http://cristal.inria.fr/~fpottier/menhir/
+
CATEGORIES = devel
# QPLv1/LGPLv2
@@ -16,18 +16,21 @@ PERMIT_PACKAGE =Yes
MODULES = lang/ocaml
WANTLIB = c m pthread
-BUILD_DEPENDS =sysutils/findlib devel/ocaml-ocamlbuild
-RUN_DEPENDS = sysutils/findlib
-USE_GMAKE =Yes
-MAKE_FLAGS = docdir='${WRKINST}${PREFIX}/share/doc/ocaml-menhir' \
- mandir='${WRKINST}${PREFIX}/man/man1'
+BUILD_DEPENDS =sysutils/findlib \
+ devel/dune
+
+RUN_DEPENDS = sysutils/findlib
NO_TEST = Yes
-.include
-.if ! ${PROPERTIES:Mocaml_native}
-MAKE_FLAGS += TARGET=byte
-.endif
+do-build:
+ cd ${WRKSRC} && dune build -j ${MAKE_JOBS}
+
+do-install:
+ cd ${WRKSRC} && dune install -j ${MAKE_JOBS}
+
+post-install:
+ mv ${PREFIX}/doc ${PREFIX}/share/doc/ocaml-menhir
.include
Index: distinfo
===
RCS file: /cvs/ports/devel/ocaml-menhir/distinfo,v
retrieving revision 1.10
diff -u -p -u -r1.10 distinfo
--- distinfo26 Oct 2019 02:10:03 - 1.10
+++ distinfo8 Jan 2023 03:18:48 -
@@ -1,2 +1,2 @@
-SHA256 (menhir-20190924.tar.gz) = /sETYhGAn04UQ6djdnWVREhT7Vbd0sy2CE2sYaqJu3s=
-SIZE (menhir-20190924.tar.gz) = 2491000
+SHA256 (menhir-20211012.tar.gz) = g7dB0/3P8yA+pCj9/R8UXXt/NqpBZDjQartakIz5yNY=
+SIZE (menhir-20211012.tar.gz) = 1154256
Index: pkg/PFRAG.dynlink-native
===
RCS file: /cvs/ports/devel/ocaml-menhir/pkg/PFRAG.dynlink-native,v
retrieving revision 1.2
diff -u -p -u -r1.2 PFRAG.dynlink-native
--- pkg/PFRAG.dynlink-native11 Mar 2022 18:50:53 - 1.2
+++ pkg/PFRAG.dynlink-native8 Jan 2023 03:18:48 -
@@ -1,2 +1,2 @@
-@bin lib/ocaml/menhirLib/menhirLib.cmxs
-@bin lib/ocaml/menhirSdk/menhirSdk.cmxs
+lib/ocaml/menhirLib/menhirLib.cmxs
+lib/ocaml/menhirSdk/menhirSdk.cmxs
Index: pkg/PFRAG.native
===
RCS file: /cvs/ports/devel/ocaml-menhir/pkg/PFRAG.native,v
retrieving revision 1.4
diff -u -p -u -r1.4 PFRAG.native
--- pkg/PFRAG.native11 Mar 2022 18:50:53 - 1.4
+++ pkg/PFRAG.native8 Jan 2023 03:18:48 -
@@ -1,5 +1,10 @@
%%dynlink%%
lib/ocaml/menhirLib/menhirLib.cmx
-lib/ocaml/menhirLib/menhirLib.o
+lib/ocaml/menhirLib/menhirLib.cmxa
lib/ocaml/menhirSdk/menhirSdk.cmx
-lib/ocaml/menhirSdk/menhirSdk.o
+lib/ocaml/menhirSdk/menhirSdk.cmxa
+lib/ocaml/menhirSdk/menhirSdk__Cmly_api.cmx
+lib/ocaml/menhirSdk/menhirSdk__Cmly_format.cmx
+lib/ocaml/menhirSdk/menhirSdk__Cmly_read.cmx
+lib/ocaml/menhirSdk/menhirSdk__Keyword.cmx
+lib/ocaml/menhirSdk/menhirSdk__Version.cmx
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/ocaml-menhir/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -u -r1.13 PLIST
--- pkg/PLIST 11 Mar 2022 18:50:53 - 1.13
+++ pkg/PLIST 8 Jan 2023 03:18:48 -
@@ -1,192 +1,60 @@
%%native%%
@bin bin/menhir
+lib/ocaml/coq-menhirlib/
+lib/ocaml/coq-menhirlib/META
+lib/ocaml/coq-menhirlib/dune-package
+lib/ocaml/menhir/
+lib/ocaml/menhir/META
+lib/ocaml/menhir/dune-package
lib/ocaml/menhirLib/
lib/ocaml/menhirLib/META
+lib/ocaml/menhirLib/dune-package
+lib/ocaml/menhirLib/menhirLib.a
+lib/ocaml/menhirLib/menhirLib.cma
lib/ocaml/menhirLib/menhirLib.cmi
-lib/ocaml/menhirLib/menhirLib.cmo
+lib/ocaml/menhirLib/menhirLib.cmt
+lib/ocaml/menhirLib/menhirLib.cmti
lib/ocaml/menhirLib/menhirLib.ml
lib/ocaml/menhirLib/menhirLib.mli
lib/ocaml/menhirSdk/
lib/ocaml/menhirSdk/META
+lib/ocaml/menhirSdk/cmly_api.ml
+lib/ocaml/menhirSdk/cmly_format.ml
+lib/ocaml/menhirSdk/cmly_read.ml
+lib/ocaml/menhirSdk/cmly_read.mli
+lib/ocaml/menhirSdk/dune-package
+lib/ocaml/menhirSdk/keyword.ml
+lib/ocaml/menhirSdk/keyword.mli
+lib/ocaml/menhirSdk/menhirSdk.a
+lib/ocaml/menhirSdk/menhirSdk.cma
lib/ocaml/menhirSdk/menhirSdk.cmi
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/01/07 20:05:07 Modified files: audio : Makefile databases : Makefile devel : Makefile graphics : Makefile net: Makefile security : Makefile sysutils : Makefile textproc : Makefile www: Makefile x11: Makefile Log message: Build ruby32 FLAVORs of ruby gem ext ports by default For devel/ruby-sorted_set and graphics/ruby-rqrcode-core, do not do FLAVORed builds by default, as these are pure ruby libraries with no native component.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2023/01/07 19:57:02 Modified files: www/jupyter-notebook: Makefile distinfo www/jupyter-notebook/pkg: PLIST Log message: update to jupyter-notebook 6.2.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/01/07 19:50:28 Modified files: audio/ruby-taglib: Makefile distinfo audio/ruby-taglib/pkg: PLIST Log message: Update to ruby-taglib 1.1.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/01/07 19:50:00 Modified files: x11/ruby-tk: Makefile distinfo Log message: Avoid warning on Ruby 3.2 using distpatch Switch to using Tk 8.6.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/01/07 19:48:46 Modified files: www/ruby-passenger: Makefile Added files: www/ruby-passenger/patches: patch-src_ruby_supportlib_phusion_passenger_platform_info_operating_system_rb Log message: Allow building on Ruby 3.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/01/07 19:48:15 Modified files: sysutils/ruby-shadow: Makefile distinfo Log message: Add distpatches from GitHub pull requests to allow building and avoid warnings on Ruby 3.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/01/07 19:47:02 Modified files: devel/ruby-prof: Makefile distinfo devel/ruby-prof/pkg: PLIST Log message: Update to ruby-prof 1.4.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/01/07 19:46:28 Modified files: databases/ruby-tiny_tds: Makefile distinfo Added files: databases/ruby-tiny_tds/patches: patch-ext_tiny_tds_result_c Log message: Update to tiny_tds 2.1.5 Add patch to avoid warning on Ruby 3.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/01/07 19:44:58 Modified files: lang/ruby/3.2 : Makefile Added files: lang/ruby/3.2/patches: patch-lib_rubygems_update_suggestion_rb Log message: Avoid printing of nagging rubygems update message
Re: [NEW] audio/alsa-lib-1.2.8
Hi, aaauuuggghhh, here is the archive. sorry! On Sat, 07 Jan 2023 21:23:19 +0900, Stuart Henderson wrote: > > On 2023/01/07 20:11, SASANO Takayoshi wrote: > > Hello, > > > > alsa-lib.tgz (take3) attached. > > > > > The most common method to deal with this in ports is to continue to > > > use /usr/local but install under subdirectories with a non-standard > > > prefix, often 'e'; for example libraries under /usr/local/lib/ealsa > > > and headers under /usr/local/include/ealsa. > > > > Many code uses so putting include files to > > /usr//include/ealsa is hard to use. > > > I show my idea via attached archive, almost all alsa components are > > installed into /usr/local/ealsa. > > There's no attachment; there's no big problem though; install headers > to /usr/local/include/ealsa/alsa and add -I/usr/local/include/ealsa to > preprocessor flags when building against it. > > > pc file for pkg-config is renamed and installed into /usr/local/lib. > > > > - /usr/local/lib/pkgconfig/ealsa-topology.pc (alsa-topology.pc) > > - /usr/local/lib/pkgconfig/ealsa.pc (alsa.pc) > > > > m4 script for aclocal is kept original. > > > > - /usr/local/share/aclocal/alsa.m4 > > > > > > by the way, CONFIGURE_ARGS in Makefile looks ignored when CONFIGURE_STYLE > > is autoreconf. even if CONFIGURE_STYLE = --prefix=/usr/local/ealsa, > > config.log says "--prefix=/usr/local/ealsa --prefix=/usr/local", I saw. > > It's not ignored, but there's no way to override prefix like that in > ports infrastructure. > -- SASANO Takayoshi (JG1UAA) alsa-lib.tgz Description: Binary data
[NEW] net/ntfy
Hi, attached is a new port for the ntfy (https://ntfy.sh/) server. ntfy (pronounce: notify) is a simple HTTP-based pub-sub notification service. It allows you to send notifications to your phone or desktop via scripts from any computer, entirely without signup or cost. There is a free version of the service at ntfy.sh. There's also an open source Android app (see Google Play or F-Droid), and an open source iOS app (see App Store). Comments? -m ntfy-1.30.1.tgz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/01/07 14:19:43 Modified files: net/eduvpn/vpn-user-portal: Makefile distinfo net/eduvpn/vpn-user-portal/patches: patch-libexec_daemon-sync_php patch-libexec_stats_php Log message: update to vpn-user-portal-3.2.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/01/07 13:49:39 Modified files: sysutils/htop : Makefile Added files: sysutils/htop/patches: patch-openbsd_OpenBSDProcessList_c Log message: now that they're available, include userland thread names in htop's display (either in COMM or in "Command (merged)" if set to show thread names)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2023/01/07 13:38:43 Modified files: math : Makefile Log message: Add labplot
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2023/01/07 13:37:25 Log message: Import labplot-2.9.0, OK kn@ LabPlot is a program for two- and three-dimensional graphical presentation of data sets and functions. LabPlot allows you to work with multiple plots which each can have multiple graphs. The graphs can be produced from data or from functions. Status: Vendor Tag: rsadowski Release Tags: rsadowski_20230107 N ports/math/labplot/Makefile N ports/math/labplot/distinfo N ports/math/labplot/patches/patch-src_backend_gsl_parser_y N ports/math/labplot/pkg/DESCR N ports/math/labplot/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2023/01/07 13:21:38 Modified files: graphics/libraw: Makefile distinfo graphics/libraw/patches: patch-libraw_pc_in patch-libraw_r_pc_in Added files: graphics/libraw/patches: patch-src_decoders_fp_dng_cpp Log message: Update LibRaw to 0.21.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2023/01/07 13:21:36 Modified files: x11/kde-applications/libkdcraw: Makefile Added files: x11/kde-applications/libkdcraw/patches: patch-src_kdcraw_cpp Log message: Unbreak build with LibRaw-0.21.0, patches from upstrea
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2023/01/07 13:21:34 Modified files: graphics/krita : Makefile Added files: graphics/krita/patches: patch-plugins_impex_raw_3rdparty_libkdcraw_src_kdcraw_cpp Log message: Unbreak build with LibRaw-0.21.0, patches from upstrea
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2023/01/07 13:21:31 Modified files: graphics/gthumb: Makefile Added files: graphics/gthumb/patches: patch-extensions_raw_files_gth-metadata-provider-raw_c patch-extensions_raw_files_gth-metadata-provider-raw_h patch-extensions_raw_files_main_c Log message: Unbreak build with LibRaw-0.21.0, patches from upstream
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2023/01/07 13:21:28 Modified files: graphics/gegl04: Makefile Added files: graphics/gegl04/patches: patch-operations_external_raw-load_c Log message: Unbreak build with LibRaw-0.21.0, patches from upstrea
devel/meson: use explicit setup command in configure
I saw this in net/libnice:
$ make configure
...
Found ninja-1.11.1 at /usr/local/bin/ninja
WARNING: Running the setup command as `meson [options]` instead of
`meson setup [options]` is ambiguous and deprecated.
$
>From meson(1):
The setup command is the default operation. If no actual command is
specified, Meson will assume you meant to do a setup. That means that
you can set up a build directory without the setup command like this:
meson [ options ] [ build directory ] [ source directory ]
So this should incur no behaviour change while silencing the warning.
OK?
Index: meson.port.mk
===
RCS file: /cvs/ports/devel/meson/meson.port.mk,v
retrieving revision 1.90
diff -u -p -r1.90 meson.port.mk
--- meson.port.mk 25 Dec 2022 10:19:01 - 1.90
+++ meson.port.mk 7 Jan 2023 20:04:51 -
@@ -54,7 +54,7 @@ MODMESON_CONFIGURE_ARGS += ${_MODMESON_S
.if ${CONFIGURE_STYLE} == "meson"
CONFIGURE_ARGS += ${MODMESON_CONFIGURE_ARGS}
CONFIGURE_ENV += ${MODMESON_CONFIGURE_ENV}
-MODMESON_configure=${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/meson \
+MODMESON_configure=${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/meson setup
\
${CONFIGURE_ARGS} ${WRKSRC} ${WRKBUILD}
. if !target(do-build)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/01/07 13:08:49 Modified files: textproc/oniguruma: Makefile Log message: add a comment reminding to bump www/h2o because the mruby flavour uses oniguruma's static library
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/01/07 13:05:13 Modified files: www/h2o: Makefile Log message: build robustness/reproducibility fixes for the mruby flavour of www/h2o - building the mruby part of this uses autoconf in an otherwise cmake-based port build, so it can't use the normal ports infrastructure which passes in autoconf cache variables to prevent it from finding gawk/ggred/gsed/gmkdir during the build. pass in the necessary variables by MAKE_ENV instead. - building mruby uses the static oniguruma library from ports if found at build time, otherwise builds its own bundled version. add BUILD_DEPENDS to make sure the ports version of oniguruma is found. problem reported by tb@, ok tb@ please commit otto@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2023/01/07 12:11:55 Modified files: graphics/py-seaborn: Makefile distinfo graphics/py-seaborn/pkg: PLIST Log message: update to py-seaborn 0.12.2
Re: games/love: bring in multiple versions
On Thu, Dec 29, 2022 at 11:45:23AM +0100, Omar Polo wrote: [...] Just took a look at this - there is an extra PLIST file at games/love/11/PLIST that is different from games/love/11/pkg/PLIST. I would probably at comment `# C++11` above the COMPILERS line in the Makefile.inc. Will try to test the different versions, but this came up immediately.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/01/07 10:32:07 Modified files: net/tdesktop : Makefile distinfo Log message: update to tdesktop 4.5.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2023/01/07 10:12:55 Modified files: security/openssl/1.1: Makefile security/openssl/3.0: Makefile Log message: Build newer openssl with -Wl,--no-execute-only. Most perlasm is busted on xonly aarch64. ok phessler sthen
Re: [fix] devel/gitea, bash as rundep + socket path creation
A propos gitea, anyone intested to switch to forgejo (gitea fork because of unfriendly takeover of gitea) ? https://forgejo.org/ https://forgejo.org/faq/ -- Matthieu Herrb
Re: [Update] sysutils/findlib 1.9.6
This diff looks good to me so ok daniel@ for it to be committed. But a few notes online below. > On Jan 7, 2023, at 8:11 AM, Volker Schlecht > wrote: > > Updates findlib to 1.9.6 in preparation for an eventual / possible / future > update of OCaml. Please make sure to send diff to maintainer so they can have a chance to weigh in. In the future I think you should say what testing was done. I built all the reverse dependencies on my end and also checked the two ports that have runtime deps on findlib. > > * Does not add a build dependency on ocamlbuild - it took me a while to > figure out where I screwed up there ... I think this deserves an explanation in the commit of why we need to do an update of findlib in order to support ocaml 4.13 or later. > * The FAKE_FLAGS lead to fake installing into the wrong directory with 1.9.6 This is mentioned in the changes for findlib 1.9.4 that proper DESTDIR support was added. I think this should be mentioned in the commit. Your explanation above is not complete. > * update-plist removed the @bin markers from PFRAG.dynlink-native, and I'm > not sure why they used to be there in the first place. > Fine with me.
Re: [fix] devel/gitea, bash as rundep + socket path creation
On 2023/01/07 16:53, Stefan Hagen wrote: > But actually, I don't see a reason for this directory at all. The rc script starts gitea with uid _gitea, so it doesn't have access to write to /var/www/run with default perms.
Re: [fix] devel/gitea, bash as rundep + socket path creation
Klemens Nanni wrote (2023-01-07 16:04 CET):
> 07.01.2023 14:48, Stefan Hagen пишет:
> > Hi,
> >
> > I've set up a Gitea Server and noticed two inaccuracies in the port.
> >
> > 1. gitea sets up a post-receive hook which is used internally and
> >requires a bash. Without it, it errors out on the first repository
> >push.
>
> OK kn
>
> >
> > 2. After setting up the socket path as described in the README, gitea
> >doesn't start anymore. The reason is the non existent path component.
> >The socket itself is created automatically. The path component is not.
>
> See inline.
>
> > +Create the socket path with the following command:
> > +# mkdir /var/www/run/gitea && chown _gitea /var/www/run/gitea
>
> install -d -o _gitea /var/www/run/gitea
>
> But can't you just @sample it in PLIST?
> Then it'll get created on update automatically.
pkg_add gitea sets up gitea to be reachable on port 3000.
No socket is used.
The MESSAGE describes how to switch the setup to a setup using httpd via
fastcgi. For this, the socket path is needed. So I described the info
there too.
But actually, I don't see a reason for this directory at all.
I think we can remove it.
Best Regards,
Stefan
Index: Makefile
===
RCS file: /cvs/ports/www/gitea/Makefile,v
retrieving revision 1.86
diff -u -p -u -p -r1.86 Makefile
--- Makefile23 Dec 2022 22:09:27 - 1.86
+++ Makefile7 Jan 2023 15:47:40 -
@@ -3,6 +3,7 @@ COMMENT = compact self-hosted Git servi
VERSION = 1.17.4
DISTNAME = gitea-src-${VERSION}
PKGNAME = gitea-${VERSION}
+REVISION = 0
MASTER_SITES =
https://github.com/go-gitea/gitea/releases/download/v${VERSION}/
@@ -27,7 +28,8 @@ MODGO_LDFLAGS += -X code.gitea.io/gitea/
MODGO_LDFLAGS += -X main.Version=${VERSION}
MODGO_LDFLAGS += -X 'main.Tags=${GO_TAGS}'
-RUN_DEPENDS = devel/git
+RUN_DEPENDS = devel/git \
+ shells/bash
ALL_TARGET = code.gitea.io/gitea
WRKSRC = ${MODGO_WORKSPACE}/src/${ALL_TARGET}
Index: pkg/README
===
RCS file: /cvs/ports/www/gitea/pkg/README,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 README
--- pkg/README 6 Mar 2022 11:05:26 - 1.6
+++ pkg/README 7 Jan 2023 15:47:40 -
@@ -43,7 +43,7 @@ Relevant configuration directives in ${S
listen on $ext_addr tls port 443
tls certificate "/etc/ssl/gitea.example.com.pem"
tls key "/etc/ssl/private/gitea.example.com.key"
- location "*" { fastcgi socket "/run/gitea/gitea.sock" }
+ location "*" { fastcgi socket "/run/gitea.sock" }
}
Relevant configuration directives in ${SYSCONFDIR}/gitea/app.ini:
@@ -52,7 +52,7 @@ Relevant configuration directives in ${S
PROTOCOL = fcgi+unix
DOMAIN = gitea.example.com
ROOT_URL = https://%(DOMAIN)s/
- HTTP_ADDR = /var/www/run/gitea/gitea.sock
+ HTTP_ADDR = /var/www/run/gitea.sock
LOCAL_ROOT_URL = %(ROOT_URL)s
Customizing gitea
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2023/01/07 08:49:26 Modified files: security/libgcrypt: Makefile Log message: libgcrypt: link with -Wl,--no-execute-only until we have a better fix. There's a lot of handwritten armv8 assembly and fixing this for xonly will be a whack-a-mole. ok phessler sthen
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/01/07 08:44:15 Modified files: databases/db : Makefile.inc Log message: knock out the build of databases/db -java on aarch64 until the breakage in jdk from execute-only changes can be mended or worked around, no point breaking a large number of port builds while we have a workaround even if it's not ideal ok phessler@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/01/07 08:12:04 Modified files: net/tg_owt : Makefile distinfo Log message: update to latest tg_owt and libyuv
Re: [fix] devel/gitea, bash as rundep + socket path creation
07.01.2023 14:48, Stefan Hagen пишет:
> Hi,
>
> I've set up a Gitea Server and noticed two inaccuracies in the port.
>
> 1. gitea sets up a post-receive hook which is used internally and
>requires a bash. Without it, it errors out on the first repository
>push.
OK kn
>
> 2. After setting up the socket path as described in the README, gitea
>doesn't start anymore. The reason is the non existent path component.
>The socket itself is created automatically. The path component is not.
See inline.
>
> The patch below addresses both issues.
>
> OK? (maintainer on CC)>
> Best Regards,
> Stefan
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/gitea/Makefile,v
> retrieving revision 1.86
> diff -u -p -u -p -r1.86 Makefile
> --- Makefile 23 Dec 2022 22:09:27 - 1.86
> +++ Makefile 7 Jan 2023 14:36:08 -
> @@ -3,6 +3,7 @@ COMMENT = compact self-hosted Git servi
> VERSION =1.17.4
> DISTNAME = gitea-src-${VERSION}
> PKGNAME =gitea-${VERSION}
> +REVISION = 0
>
> MASTER_SITES =
> https://github.com/go-gitea/gitea/releases/download/v${VERSION}/
>
> @@ -27,7 +28,8 @@ MODGO_LDFLAGS += -X code.gitea.io/gitea/
> MODGO_LDFLAGS += -X main.Version=${VERSION}
> MODGO_LDFLAGS += -X 'main.Tags=${GO_TAGS}'
>
> -RUN_DEPENDS =devel/git
> +RUN_DEPENDS =devel/git \
> + shells/bash
>
> ALL_TARGET = code.gitea.io/gitea
> WRKSRC = ${MODGO_WORKSPACE}/src/${ALL_TARGET}
> Index: pkg/README
> ===
> RCS file: /cvs/ports/www/gitea/pkg/README,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 README
> --- pkg/README6 Mar 2022 11:05:26 - 1.6
> +++ pkg/README7 Jan 2023 14:36:08 -
> @@ -55,6 +55,9 @@ Relevant configuration directives in ${S
> HTTP_ADDR = /var/www/run/gitea/gitea.sock
> LOCAL_ROOT_URL = %(ROOT_URL)s
>
> +Create the socket path with the following command:
> +# mkdir /var/www/run/gitea && chown _gitea /var/www/run/gitea
install -d -o _gitea /var/www/run/gitea
But can't you just @sample it in PLIST?
Then it'll get created on update automatically.
> +
> Customizing gitea
> =
> For custom public files, templates, gitignores, labels, licenses and READMEs,
>
[fix] devel/gitea, bash as rundep + socket path creation
Hi,
I've set up a Gitea Server and noticed two inaccuracies in the port.
1. gitea sets up a post-receive hook which is used internally and
requires a bash. Without it, it errors out on the first repository
push.
2. After setting up the socket path as described in the README, gitea
doesn't start anymore. The reason is the non existent path component.
The socket itself is created automatically. The path component is not.
The patch below addresses both issues.
OK? (maintainer on CC)
Best Regards,
Stefan
Index: Makefile
===
RCS file: /cvs/ports/www/gitea/Makefile,v
retrieving revision 1.86
diff -u -p -u -p -r1.86 Makefile
--- Makefile23 Dec 2022 22:09:27 - 1.86
+++ Makefile7 Jan 2023 14:36:08 -
@@ -3,6 +3,7 @@ COMMENT = compact self-hosted Git servi
VERSION = 1.17.4
DISTNAME = gitea-src-${VERSION}
PKGNAME = gitea-${VERSION}
+REVISION = 0
MASTER_SITES =
https://github.com/go-gitea/gitea/releases/download/v${VERSION}/
@@ -27,7 +28,8 @@ MODGO_LDFLAGS += -X code.gitea.io/gitea/
MODGO_LDFLAGS += -X main.Version=${VERSION}
MODGO_LDFLAGS += -X 'main.Tags=${GO_TAGS}'
-RUN_DEPENDS = devel/git
+RUN_DEPENDS = devel/git \
+ shells/bash
ALL_TARGET = code.gitea.io/gitea
WRKSRC = ${MODGO_WORKSPACE}/src/${ALL_TARGET}
Index: pkg/README
===
RCS file: /cvs/ports/www/gitea/pkg/README,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 README
--- pkg/README 6 Mar 2022 11:05:26 - 1.6
+++ pkg/README 7 Jan 2023 14:36:08 -
@@ -55,6 +55,9 @@ Relevant configuration directives in ${S
HTTP_ADDR = /var/www/run/gitea/gitea.sock
LOCAL_ROOT_URL = %(ROOT_URL)s
+Create the socket path with the following command:
+# mkdir /var/www/run/gitea && chown _gitea /var/www/run/gitea
+
Customizing gitea
=
For custom public files, templates, gitignores, labels, licenses and READMEs,
Re: [Update] sysutils/findlib 1.9.6
> On Jan 7, 2023, at 8:11 AM, Volker Schlecht > wrote: > > Updates findlib to 1.9.6 in preparation for an eventual / possible / future > update of OCaml. I’ll take a look but ocaml cannot be updated until ocaml-camlp5 is updated. I suggest you target that port next and that we aim to move to ocaml 4.13.1 not the 4.14 series. > > * Does not add a build dependency on ocamlbuild - it took me a while to > figure out where I screwed up there ... > * The FAKE_FLAGS lead to fake installing into the wrong directory with 1.9.6 > * update-plist removed the @bin markers from PFRAG.dynlink-native, and I'm > not sure why they used to be there in the first place. >
Re: [Update] lang/compcert 3.12
> On Jan 6, 2023, at 5:19 PM, Volker Schlecht > wrote: > > As discussed off-list, here's an update to lang/compcert. > Builds and tests ok on amd64, builds ok on i386 with test failures in > test/abi. > > "sharedir" is now a configure option upstream, so I removed those parts from > patch-configure and added the share path to CONFIGURE_ARGS. > This is committed. I suggest getting coq updated next. The version we have in tree was tested with ocaml versions up to 4.11 if I remember correctly. So it’s a bit stale. I suggest going to ocaml 4.13 next so whatever version of coq was tested with ocaml 4.13 should be good. Compcert 3.12 supports up to coq 8.15.2. So definitely nothing newer than that version.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: mes...@cvs.openbsd.org 2023/01/07 06:18:45 Modified files: www/yt-dlp : Makefile distinfo www/yt-dlp/patches: patch-setup_py www/yt-dlp/pkg : PLIST Log message: update to 2023.01.06 changelog: https://github.com/yt-dlp/yt-dlp/releases/tag/2023.01.06
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2023/01/07 06:11:42 Modified files: lang/compcert : Makefile distinfo lang/compcert/patches: patch-Makefile patch-configure Log message: update to CompCert 3.12; from Volker Schlecht
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/01/07 06:10:45 Modified files: converters/recode: Makefile distinfo Added files: converters/recode/patches: patch-src_Makefile_in Log message: update to recode-3.7.13
[Update] sysutils/findlib 1.9.6
Updates findlib to 1.9.6 in preparation for an eventual / possible /
future update of OCaml.
* Does not add a build dependency on ocamlbuild - it took me a while to
figure out where I screwed up there ...
* The FAKE_FLAGS lead to fake installing into the wrong directory with 1.9.6
* update-plist removed the @bin markers from PFRAG.dynlink-native, and
I'm not sure why they used to be there in the first place.Index: Makefile
===
RCS file: /cvs/ports/sysutils/findlib/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- Makefile 11 Mar 2022 19:57:25 - 1.43
+++ Makefile 7 Jan 2023 11:07:42 -
@@ -1,7 +1,6 @@
COMMENT= OCaml package manager
CATEGORIES= sysutils
-DISTNAME= findlib-1.8.1
-REVISION= 4
+DISTNAME= findlib-1.9.6
MASTER_SITES= http://download.camlcity.org/download/
@@ -23,7 +22,6 @@ CONFIGURE_ARGS= -no-custom \
-config ${SYSCONFDIR}/findlib.conf
USE_GMAKE= Yes
-FAKE_FLAGS= prefix=${DESTDIR}
NO_TEST= Yes
.include
Index: distinfo
===
RCS file: /cvs/ports/sysutils/findlib/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo 7 Sep 2019 18:45:02 - 1.13
+++ distinfo 7 Jan 2023 11:07:42 -
@@ -1,2 +1,2 @@
-SHA256 (findlib-1.8.1.tar.gz) = joXPpX6HRXFUMt8xFml8j0HLJLXsFtHVrNJeAZbTQwM=
-SIZE (findlib-1.8.1.tar.gz) = 261544
+SHA256 (findlib-1.9.6.tar.gz) = LfmWJ5rha2Bttf9Yefk9v63giY258aPoL3+EX6opMKI=
+SIZE (findlib-1.9.6.tar.gz) = 271246
Index: pkg/PFRAG.dynlink-native
===
RCS file: /cvs/ports/sysutils/findlib/pkg/PFRAG.dynlink-native,v
retrieving revision 1.6
diff -u -p -r1.6 PFRAG.dynlink-native
--- pkg/PFRAG.dynlink-native 11 Mar 2022 19:57:25 - 1.6
+++ pkg/PFRAG.dynlink-native 7 Jan 2023 11:07:42 -
@@ -1,3 +1,3 @@
-@bin lib/ocaml/findlib/findlib.cmxs
-@bin lib/ocaml/findlib/findlib_dynload.cmxs
-@bin lib/ocaml/findlib/findlib_top.cmxs
+lib/ocaml/findlib/findlib.cmxs
+lib/ocaml/findlib/findlib_dynload.cmxs
+lib/ocaml/findlib/findlib_top.cmxs
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/findlib/pkg/PLIST,v
retrieving revision 1.20
diff -u -p -r1.20 PLIST
--- pkg/PLIST 11 Mar 2022 19:57:25 - 1.20
+++ pkg/PLIST 7 Jan 2023 11:07:42 -
@@ -13,18 +13,27 @@ lib/ocaml/dynlink/META
lib/ocaml/findlib/
lib/ocaml/findlib/META
lib/ocaml/findlib/Makefile.config
+lib/ocaml/findlib/Makefile.packages
lib/ocaml/findlib/findlib.cma
lib/ocaml/findlib/findlib.cmi
lib/ocaml/findlib/findlib.mli
+lib/ocaml/findlib/findlib_config.cmi
+lib/ocaml/findlib/findlib_config.ml
lib/ocaml/findlib/findlib_dynload.cma
lib/ocaml/findlib/findlib_top.cma
+lib/ocaml/findlib/fl_args.cmi
lib/ocaml/findlib/fl_dynload.cmi
lib/ocaml/findlib/fl_dynload.mli
+lib/ocaml/findlib/fl_lint.cmi
+lib/ocaml/findlib/fl_meta.cmi
lib/ocaml/findlib/fl_metascanner.cmi
lib/ocaml/findlib/fl_metascanner.mli
lib/ocaml/findlib/fl_metatoken.cmi
lib/ocaml/findlib/fl_package_base.cmi
lib/ocaml/findlib/fl_package_base.mli
+lib/ocaml/findlib/fl_split.cmi
+lib/ocaml/findlib/fl_topo.cmi
+lib/ocaml/findlib/ocaml_args.cmi
lib/ocaml/findlib/topfind.cmi
lib/ocaml/findlib/topfind.mli
@comment will be installed by graphics/ocaml-graphics
Re: aarch64 bulk build report
On 2023/01/07 02:55, phess...@openbsd.org wrote: > bulk build on arm64.ports.openbsd.org > started on Fri Jan 6 00:27:36 MST 2023 > finished at Sat Jan 7 02:54:37 MST 2023 > lasted 1D02h27m > done with kern.version=OpenBSD 7.2-current (GENERIC.MP) #1955: Thu Jan 5 > 18:56:38 MST 2023 > > built packages:9812 11540 previously, so there's a lot of fallout from execute-only. Key problems: - gpgme (uses gnupg at runtime during build) and x11/gnome/gcr both failing suggest a problem with libgcrypt -> knocks out 600+ ports - gcc -> everything that touches fortran - node -> build dep of firefox/chromium etc - jdk -> db (java subpackage) -> 350-odd ports | +--> most of the other individual ports which showed as failing here And there's also something up with ocaml -> hevea causing the coccinelle failure (fair chance that other ocaml ports may have problems at run time) > Jan 6:9810 > Jan 7:1 > > > critical path missing pkgs: > http://build-failures.rhaalovely.net/aarch64/2023-01-06/summary.log > > build failures: 34 > http://build-failures.rhaalovely.net/aarch64/2023-01-06/audio/hydrogen.log > http://build-failures.rhaalovely.net/aarch64/2023-01-06/databases/db/v4.log > http://build-failures.rhaalovely.net/aarch64/2023-01-06/devel/arm-none-eabi/gcc-linaro.log > http://build-failures.rhaalovely.net/aarch64/2023-01-06/devel/avr/gcc.log > http://build-failures.rhaalovely.net/aarch64/2023-01-06/devel/coccinelle.log > http://build-failures.rhaalovely.net/aarch64/2023-01-06/devel/jdk/11.log > http://build-failures.rhaalovely.net/aarch64/2023-01-06/devel/jdk/17.log > http://build-failures.rhaalovely.net/aarch64/2023-01-06/devel/ti-msp430gcc.log > http://build-failures.rhaalovely.net/aarch64/2023-01-06/devel/xtensa-elf/gcc.log > http://build-failures.rhaalovely.net/aarch64/2023-01-06/devel/xtensa-esp32-elf/newlib.log > http://build-failures.rhaalovely.net/aarch64/2023-01-06/devel/xtensa-esp32s2-elf/newlib.log > http://build-failures.rhaalovely.net/aarch64/2023-01-06/devel/xtensa-esp32s3-elf/newlib.log > http://build-failures.rhaalovely.net/aarch64/2023-01-06/devel/xtensa-lx106-elf/newlib.log > http://build-failures.rhaalovely.net/aarch64/2023-01-06/games/jbrickshooter.log > http://build-failures.rhaalovely.net/aarch64/2023-01-06/games/libgdx/1.9.11.log > http://build-failures.rhaalovely.net/aarch64/2023-01-06/games/libgdx/1.9.9.log > http://build-failures.rhaalovely.net/aarch64/2023-01-06/games/lwjgl.log > http://build-failures.rhaalovely.net/aarch64/2023-01-06/java/jBCrypt.log > http://build-failures.rhaalovely.net/aarch64/2023-01-06/java/tanukiwrapper.log > http://build-failures.rhaalovely.net/aarch64/2023-01-06/lang/gcc/11,-ada.log > http://build-failures.rhaalovely.net/aarch64/2023-01-06/lang/gcc/8.log > http://build-failures.rhaalovely.net/aarch64/2023-01-06/lang/kawa.log > http://build-failures.rhaalovely.net/aarch64/2023-01-06/lang/node.log > http://build-failures.rhaalovely.net/aarch64/2023-01-06/math/coq.log > http://build-failures.rhaalovely.net/aarch64/2023-01-06/net/i2p.log > http://build-failures.rhaalovely.net/aarch64/2023-01-06/net/openfire.log > http://build-failures.rhaalovely.net/aarch64/2023-01-06/security/gpgme.log > http://build-failures.rhaalovely.net/aarch64/2023-01-06/security/keepassxc,browser.log > http://build-failures.rhaalovely.net/aarch64/2023-01-06/sysutils/rundeck.log > http://build-failures.rhaalovely.net/aarch64/2023-01-06/textproc/bibtex2html.log > http://build-failures.rhaalovely.net/aarch64/2023-01-06/textproc/pdftk.log > http://build-failures.rhaalovely.net/aarch64/2023-01-06/www/icedtea-web.log > http://build-failures.rhaalovely.net/aarch64/2023-01-06/x11/gnome/gcr.log > > recurrent failures > new failures > +++ ls-failures Sat Jan 7 02:55:07 2023 > +failures/audio/hydrogen.log > +failures/databases/db/v4.log > +failures/devel/arm-none-eabi/gcc-linaro.log > +failures/devel/avr/gcc.log > +failures/devel/coccinelle.log > +failures/devel/jdk/11.log > +failures/devel/jdk/17.log > +failures/devel/ti-msp430gcc.log > +failures/devel/xtensa-elf/gcc.log > +failures/devel/xtensa-esp32-elf/newlib.log > +failures/devel/xtensa-esp32s2-elf/newlib.log > +failures/devel/xtensa-esp32s3-elf/newlib.log > +failures/devel/xtensa-lx106-elf/newlib.log > +failures/games/jbrickshooter.log > +failures/games/libgdx/1.9.11.log > +failures/games/libgdx/1.9.9.log > +failures/games/lwjgl.log > +failures/java/jBCrypt.log > +failures/java/tanukiwrapper.log > +failures/lang/gcc/11,-ada.log > +failures/lang/gcc/8.log > +failures/lang/kawa.log > +failures/lang/node.log > +failures/math/coq.log > +failures/net/i2p.log > +failures/net/openfire.log > +failures/security/gpgme.log > +failures/security/keepassxc,browser.log > +failures/sysutils/rundeck.log > +failures/textproc/bibtex2html.log > +failures/textproc/pdftk.log > +failures/www/icedtea-web.log > +failures/x11/gnome/gcr.log > resolved failures > --- ../old/aarch64/last//ls-failures Thu Jan 5 10:52:33 2023 >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/01/07 05:49:27 Modified files: graphics/ffmpeg: Makefile multimedia/x264: Makefile Log message: add FFmpeg/x264 debug packages, from Brad.
Re: [NEW] audio/alsa-lib-1.2.8
On 2023/01/07 13:25, Antoine Jacoutot wrote: > On Sat, Jan 07, 2023 at 08:11:22PM +0900, SASANO Takayoshi wrote: > > Hello, > > > > alsa-lib.tgz (take3) attached. > > > > > The most common method to deal with this in ports is to continue to > > > use /usr/local but install under subdirectories with a non-standard > > > prefix, often 'e'; for example libraries under /usr/local/lib/ealsa > > > and headers under /usr/local/include/ealsa. > > > > Many code uses so putting include files to > > /usr//include/ealsa is hard to use. > > > > I show my idea via attached archive, almost all alsa components are > > installed into /usr/local/ealsa. > > I really find this weird. > We only do this "e" stuff for things we have in base already (like openssl). > For stuff that we want to keep "hidden" we usually just install in a subdir, > like libinotify, heimdal etc. If you have a good idea that is unlikely to be picked up then yes. I don't particularly want to look into 100-odd ports to find a "safe" directory name for that though ;)
Re: [NEW] audio/alsa-lib-1.2.8
On Sat, Jan 07, 2023 at 08:11:22PM +0900, SASANO Takayoshi wrote: > Hello, > > alsa-lib.tgz (take3) attached. > > > The most common method to deal with this in ports is to continue to > > use /usr/local but install under subdirectories with a non-standard > > prefix, often 'e'; for example libraries under /usr/local/lib/ealsa > > and headers under /usr/local/include/ealsa. > > Many code uses so putting include files to > /usr//include/ealsa is hard to use. > > I show my idea via attached archive, almost all alsa components are > installed into /usr/local/ealsa. I really find this weird. We only do this "e" stuff for things we have in base already (like openssl). For stuff that we want to keep "hidden" we usually just install in a subdir, like libinotify, heimdal etc. -- Antoine
Re: [NEW] audio/alsa-lib-1.2.8
On 2023/01/07 20:11, SASANO Takayoshi wrote: > Hello, > > alsa-lib.tgz (take3) attached. > > > The most common method to deal with this in ports is to continue to > > use /usr/local but install under subdirectories with a non-standard > > prefix, often 'e'; for example libraries under /usr/local/lib/ealsa > > and headers under /usr/local/include/ealsa. > > Many code uses so putting include files to > /usr//include/ealsa is hard to use. > I show my idea via attached archive, almost all alsa components are > installed into /usr/local/ealsa. There's no attachment; there's no big problem though; install headers to /usr/local/include/ealsa/alsa and add -I/usr/local/include/ealsa to preprocessor flags when building against it. > pc file for pkg-config is renamed and installed into /usr/local/lib. > > - /usr/local/lib/pkgconfig/ealsa-topology.pc (alsa-topology.pc) > - /usr/local/lib/pkgconfig/ealsa.pc (alsa.pc) > > m4 script for aclocal is kept original. > > - /usr/local/share/aclocal/alsa.m4 > > > by the way, CONFIGURE_ARGS in Makefile looks ignored when CONFIGURE_STYLE > is autoreconf. even if CONFIGURE_STYLE = --prefix=/usr/local/ealsa, > config.log says "--prefix=/usr/local/ealsa --prefix=/usr/local", I saw. It's not ignored, but there's no way to override prefix like that in ports infrastructure.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2023/01/07 04:38:20 Modified files: www: Makefile Log message: Hook up lighttpd,ldap,pgsql and lighttpd,pgsql
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2023/01/07 04:30:39 Modified files: www/lighttpd : Makefile distinfo www/lighttpd/files: lighttpd.conf www/lighttpd/pkg: DESCR PLIST Added files: www/lighttpd/patches: patch-doc_CMakeLists_txt patch-src_CMakeLists_txt patch-src_mod_openssl_c www/lighttpd/pkg: PFRAG.pgsql Log message: Update lighttpd to 1.4.68 - Switch to CMake - Changelog: https://www.lighttpd.net/2023/1/3/1.4.68/ - New flavor: pgsql - Enable PostgreSQL support for authentication and virtual hosting. Update diff from Brad, thanks
Re: [NEW] audio/alsa-lib-1.2.8
Hello, > Having two audio layers with different semantics increases the > probability of subtle audio problems (stuttering, desynchronization, > etc.), which are very time-consuming to fix. Furthermore, > alsa-over-sndio is very unlikely to work in all > program/device/configuration combinations. alsa-plugins has ALSA->JACK and ALSA->PluseAudio plugin and they could compiled in my -current box. But JACK and PulseAudio on OpenBSD goes sndio sink, so I am afraid that there is something trouble for using alsa-plugins via these audio frameworks. Simply enable OSS plugin only, I think (because alsa is for test purpose). > I'd suggest adding a sndio backend. The API is designed to make this > process as simple as possible. Let us know if you want to try this > approach, I can help with the code. Porting applications to support sndio is the best solution. Indeed I added sndio backend for DireWolf software TNC, but many other ham radio software (for alsa) remains... -- SASANO Takayoshi (JG1UAA)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2023/01/07 04:19:53 Modified files: graphics/opencv: Makefile distinfo graphics/opencv/patches: patch-cmake_OpenCVFindLibsGrfmt_cmake patch-modules_core_src_system_cpp graphics/opencv/pkg: PLIST-java PLIST-main Log message: Update OpenCV to 4.7.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2023/01/07 04:18:58 Modified files: x11/qt6: Makefile.version x11/qt6/qt3d : distinfo x11/qt6/qt5compat: distinfo x11/qt6/qtbase : distinfo x11/qt6/qtbase/patches: patch-src_corelib_plugin_qelfparser_p_cpp x11/qt6/qtcharts: distinfo x11/qt6/qtconnectivity: distinfo x11/qt6/qtdatavis3d: distinfo x11/qt6/qtdeclarative: Makefile distinfo x11/qt6/qtimageformats: distinfo x11/qt6/qtlanguageserver: distinfo x11/qt6/qtlottie: distinfo x11/qt6/qtmultimedia: Makefile distinfo x11/qt6/qtnetworkauth: distinfo x11/qt6/qtpositioning: distinfo x11/qt6/qtquick3d: Makefile distinfo x11/qt6/qtquick3d/pkg: PLIST x11/qt6/qtquicktimeline: distinfo x11/qt6/qtremoteobjects: distinfo x11/qt6/qtscxml: distinfo x11/qt6/qtsensors: distinfo x11/qt6/qtserialbus: distinfo x11/qt6/qtserialport: distinfo x11/qt6/qtshadertools: distinfo x11/qt6/qtsvg : distinfo x11/qt6/qttools: distinfo x11/qt6/qttranslations: distinfo x11/qt6/qtvirtualkeyboard: distinfo x11/qt6/qtwayland: distinfo Log message: Update Qt6 to 6.4.2
Re: [NEW] audio/alsa-lib-1.2.8
Hello, alsa-lib.tgz (take3) attached. > The most common method to deal with this in ports is to continue to > use /usr/local but install under subdirectories with a non-standard > prefix, often 'e'; for example libraries under /usr/local/lib/ealsa > and headers under /usr/local/include/ealsa. Many code uses so putting include files to /usr//include/ealsa is hard to use. I show my idea via attached archive, almost all alsa components are installed into /usr/local/ealsa. pc file for pkg-config is renamed and installed into /usr/local/lib. - /usr/local/lib/pkgconfig/ealsa-topology.pc (alsa-topology.pc) - /usr/local/lib/pkgconfig/ealsa.pc (alsa.pc) m4 script for aclocal is kept original. - /usr/local/share/aclocal/alsa.m4 by the way, CONFIGURE_ARGS in Makefile looks ignored when CONFIGURE_STYLE is autoreconf. even if CONFIGURE_STYLE = --prefix=/usr/local/ealsa, config.log says "--prefix=/usr/local/ealsa --prefix=/usr/local", I saw. patches/patch-configure_ac contains workaround, prefix="$prefix/ealsa". Regards, -- SASANO Takayoshi (JG1UAA)
Re: UPDATE: lighttpd 1.4.68
On Sat, Jan 07, 2023 at 04:34:10AM -0500, Brad Smith wrote:
> On Fri, Jan 06, 2023 at 09:15:18PM +0100, Rafael Sadowski wrote:
> > > +.if ${FLAVOR:Mpgsql}
> > > +CONFIGURE_ARGS+= -DWITH_PGSQL=ON
> > > +LIB_DEPENDS+=databases/postgresql
> > > +WANTLIB+=pq
> > > +.endif
> > > +
> > > +CFLAGS+= -I${LOCALBASE}/include
> > > +LDFLAGS+=-L${LOCALBASE}/lib
> >
> > Is LDFLAGS needed? If yes MODCMAKE_LDFLAGS is the better solution.
>
> Yes, it is. Some of the dependencies use pkg-config files / foo-config
> and some do not.
Remove CONFIGURE_ENV after that.
Index: Makefile
===
RCS file: /home/cvs/ports/www/lighttpd/Makefile,v
retrieving revision 1.172
diff -u -p -u -p -r1.172 Makefile
--- Makefile8 Nov 2022 11:17:18 - 1.172
+++ Makefile7 Jan 2023 10:32:45 -
@@ -1,10 +1,9 @@
COMMENT= secure, fast, compliant, and very flexible web-server
-DISTNAME= lighttpd-1.4.67
+DISTNAME= lighttpd-1.4.68
CATEGORIES=www net
MASTER_SITES= https://download.lighttpd.net/lighttpd/releases-1.4.x/
EXTRACT_SUFX= .tar.xz
-REVISION= 0
HOMEPAGE= https://www.lighttpd.net/
@@ -15,42 +14,44 @@ PERMIT_PACKAGE= Yes
WANTLIB= c crypto m pcre2-8 ssl z ${MODLUA_WANTLIB}
-COMPILER= base-clang ports-gcc base-gcc
+COMPILER= base-clang ports-gcc
-MODULES= lang/lua
+MODULES= devel/cmake \
+ lang/lua
MODLUA_SA= Yes
LIB_DEPENDS+= devel/pcre2 \
${MODLUA_LIB_DEPENDS}
RUN_DEPENDS+= www/spawn-fcgi
-LIBTOOL_FLAGS= --tag=disable-static
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --libdir="${PREFIX}/lib/lighttpd" \
---with-lua \
---with-openssl
-CONFIGURE_ENV+=CC_FOR_BUILD="${CC}" \
- CFLAGS_FOR_BUILD="${CFLAGS}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- LUA_CFLAGS="`pkg-config --cflags ${MODLUA_DEP}`" \
- LUA_LIBS="`pkg-config --libs ${MODLUA_DEP}`"
+CONFIGURE_ARGS+=-DWITH_LUA=ON \
+ -DWITH_LUA_VERSION=${MODLUA_DEP} \
+ -DWITH_OPENSSL=ON
-FLAVORS= ldap mysql
+FLAVORS= ldap mysql pgsql
FLAVOR?=
.if ${FLAVOR:Mldap}
-CONFIGURE_ARGS+= --with-ldap
+CONFIGURE_ARGS+= -DWITH_LDAP=ON
LIB_DEPENDS+= databases/openldap
-WANTLIB+= lber ldap sasl2
+WANTLIB+= lber ldap
.endif
.if ${FLAVOR:Mmysql}
-CONFIGURE_ARGS+= --with-mysql
+CONFIGURE_ARGS+= -DWITH_MYSQL=ON
LIB_DEPENDS+= databases/mariadb
-WANTLIB+= mariadb pthread
+WANTLIB+= mariadb
.endif
+.if ${FLAVOR:Mpgsql}
+CONFIGURE_ARGS+= -DWITH_PGSQL=ON
+LIB_DEPENDS+= databases/postgresql
+WANTLIB+= pq
+.endif
+
+CFLAGS+= -I${LOCALBASE}/include
+MODCMAKE_LDFLAGS+= -L${LOCALBASE}/lib
+
post-extract:
@cp -f ${FILESDIR}/lighttpd.conf ${WRKSRC}/doc
@@ -70,6 +71,5 @@ post-install:
${PREFIX}/share/examples/lighttpd/access.log
${INSTALL_DATA} /dev/null \
${PREFIX}/share/examples/lighttpd/error.log
- rm -f ${PREFIX}/lib/lighttpd/*.la
.include
Index: distinfo
===
RCS file: /home/cvs/ports/www/lighttpd/distinfo,v
retrieving revision 1.70
diff -u -p -u -p -r1.70 distinfo
--- distinfo4 Oct 2022 11:34:23 - 1.70
+++ distinfo4 Jan 2023 15:13:45 -
@@ -1,2 +1,2 @@
-SHA256 (lighttpd-1.4.67.tar.xz) = fgTXZ/UajYJLMuJIPvKVCYKSDUJ9EnLvRmf0nW+J81g=
-SIZE (lighttpd-1.4.67.tar.xz) = 1039872
+SHA256 (lighttpd-1.4.68.tar.xz) = 5W83rlK2PhraTXbOeABa/7blbuova9sM4X1tNulYM4Q=
+SIZE (lighttpd-1.4.68.tar.xz) = 1030612
Index: files/lighttpd.conf
===
RCS file: /home/cvs/ports/www/lighttpd/files/lighttpd.conf,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 lighttpd.conf
--- files/lighttpd.conf 18 Aug 2010 11:16:55 - 1.1
+++ files/lighttpd.conf 6 Jan 2023 01:01:10 -
@@ -22,11 +22,9 @@ server.modules = (
# "mod_evhost",
# "mod_userdir",
# "mod_cgi",
-# "mod_compress",
+# "mod_deflate",
# "mod_ssi",
-# "mod_usertrack",
# "mod_expire",
-# "mod_secdownload",
# "mod_rrdtool",
"mod_accesslog" )
Index: patches/patch-doc_CMakeLists_txt
===
RCS file: patches/patch-doc_CMakeLists_txt
diff -N patches/patch-doc_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-doc_CMakeLists_txt5 Jan 2023 20:10:31 -
@@ -0,0 +1,11 @@
+[cmake] add doc/CMakeLists.txt to dist tar
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/01/07 03:08:15 Modified files: x11/gnome/maps : Makefile distinfo Log message: Update to gnome-maps-43.3.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/01/07 03:06:08 Modified files: x11/gnome/libadwaita: Makefile distinfo x11/gnome/libadwaita/pkg: PLIST Log message: Update to libadwaita-1.2.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/01/07 03:01:39 Modified files: mail/evolution-ews: Makefile distinfo mail/evolution-ews/patches: patch-cmake_modules_SetupBuildFlags_cmake Log message: Update to evolution-ews-3.46.3.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/01/07 03:01:29 Modified files: mail/evolution : Makefile distinfo mail/evolution/pkg: PLIST Log message: Update to evolution-3.46.3.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/01/07 03:01:17 Modified files: databases/evolution-data-server: Makefile distinfo Log message: Update to evolution-data-server-3.46.3.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/01/07 02:59:19 Modified files: sysutils/terragrunt: Makefile distinfo Log message: Update to terragrunt-0.42.7.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/01/07 02:56:38 Modified files: x11/gnome/secrets: Makefile distinfo x11/gnome/secrets/pkg: PLIST Log message: Update to secrets-7.1.
aarch64 bulk build report
bulk build on arm64.ports.openbsd.org started on Fri Jan 6 00:27:36 MST 2023 finished at Sat Jan 7 02:54:37 MST 2023 lasted 1D02h27m done with kern.version=OpenBSD 7.2-current (GENERIC.MP) #1955: Thu Jan 5 18:56:38 MST 2023 built packages:9812 Jan 6:9810 Jan 7:1 critical path missing pkgs: http://build-failures.rhaalovely.net/aarch64/2023-01-06/summary.log build failures: 34 http://build-failures.rhaalovely.net/aarch64/2023-01-06/audio/hydrogen.log http://build-failures.rhaalovely.net/aarch64/2023-01-06/databases/db/v4.log http://build-failures.rhaalovely.net/aarch64/2023-01-06/devel/arm-none-eabi/gcc-linaro.log http://build-failures.rhaalovely.net/aarch64/2023-01-06/devel/avr/gcc.log http://build-failures.rhaalovely.net/aarch64/2023-01-06/devel/coccinelle.log http://build-failures.rhaalovely.net/aarch64/2023-01-06/devel/jdk/11.log http://build-failures.rhaalovely.net/aarch64/2023-01-06/devel/jdk/17.log http://build-failures.rhaalovely.net/aarch64/2023-01-06/devel/ti-msp430gcc.log http://build-failures.rhaalovely.net/aarch64/2023-01-06/devel/xtensa-elf/gcc.log http://build-failures.rhaalovely.net/aarch64/2023-01-06/devel/xtensa-esp32-elf/newlib.log http://build-failures.rhaalovely.net/aarch64/2023-01-06/devel/xtensa-esp32s2-elf/newlib.log http://build-failures.rhaalovely.net/aarch64/2023-01-06/devel/xtensa-esp32s3-elf/newlib.log http://build-failures.rhaalovely.net/aarch64/2023-01-06/devel/xtensa-lx106-elf/newlib.log http://build-failures.rhaalovely.net/aarch64/2023-01-06/games/jbrickshooter.log http://build-failures.rhaalovely.net/aarch64/2023-01-06/games/libgdx/1.9.11.log http://build-failures.rhaalovely.net/aarch64/2023-01-06/games/libgdx/1.9.9.log http://build-failures.rhaalovely.net/aarch64/2023-01-06/games/lwjgl.log http://build-failures.rhaalovely.net/aarch64/2023-01-06/java/jBCrypt.log http://build-failures.rhaalovely.net/aarch64/2023-01-06/java/tanukiwrapper.log http://build-failures.rhaalovely.net/aarch64/2023-01-06/lang/gcc/11,-ada.log http://build-failures.rhaalovely.net/aarch64/2023-01-06/lang/gcc/8.log http://build-failures.rhaalovely.net/aarch64/2023-01-06/lang/kawa.log http://build-failures.rhaalovely.net/aarch64/2023-01-06/lang/node.log http://build-failures.rhaalovely.net/aarch64/2023-01-06/math/coq.log http://build-failures.rhaalovely.net/aarch64/2023-01-06/net/i2p.log http://build-failures.rhaalovely.net/aarch64/2023-01-06/net/openfire.log http://build-failures.rhaalovely.net/aarch64/2023-01-06/security/gpgme.log http://build-failures.rhaalovely.net/aarch64/2023-01-06/security/keepassxc,browser.log http://build-failures.rhaalovely.net/aarch64/2023-01-06/sysutils/rundeck.log http://build-failures.rhaalovely.net/aarch64/2023-01-06/textproc/bibtex2html.log http://build-failures.rhaalovely.net/aarch64/2023-01-06/textproc/pdftk.log http://build-failures.rhaalovely.net/aarch64/2023-01-06/www/icedtea-web.log http://build-failures.rhaalovely.net/aarch64/2023-01-06/x11/gnome/gcr.log recurrent failures new failures +++ ls-failures Sat Jan 7 02:55:07 2023 +failures/audio/hydrogen.log +failures/databases/db/v4.log +failures/devel/arm-none-eabi/gcc-linaro.log +failures/devel/avr/gcc.log +failures/devel/coccinelle.log +failures/devel/jdk/11.log +failures/devel/jdk/17.log +failures/devel/ti-msp430gcc.log +failures/devel/xtensa-elf/gcc.log +failures/devel/xtensa-esp32-elf/newlib.log +failures/devel/xtensa-esp32s2-elf/newlib.log +failures/devel/xtensa-esp32s3-elf/newlib.log +failures/devel/xtensa-lx106-elf/newlib.log +failures/games/jbrickshooter.log +failures/games/libgdx/1.9.11.log +failures/games/libgdx/1.9.9.log +failures/games/lwjgl.log +failures/java/jBCrypt.log +failures/java/tanukiwrapper.log +failures/lang/gcc/11,-ada.log +failures/lang/gcc/8.log +failures/lang/kawa.log +failures/lang/node.log +failures/math/coq.log +failures/net/i2p.log +failures/net/openfire.log +failures/security/gpgme.log +failures/security/keepassxc,browser.log +failures/sysutils/rundeck.log +failures/textproc/bibtex2html.log +failures/textproc/pdftk.log +failures/www/icedtea-web.log +failures/x11/gnome/gcr.log resolved failures --- ../old/aarch64/last//ls-failuresThu Jan 5 10:52:33 2023 -failures/graphics/openscenegraph.log -failures/x11/xfce4/xfce4-taskmanager.log
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/01/07 02:46:47 Modified files: sysutils/exoscale-cli: Makefile distinfo Log message: Update to exoscale-cli-1.64.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/01/07 02:44:16 Modified files: sysutils/awscli: Makefile distinfo sysutils/awscli/pkg: PLIST Log message: Update to awscli-1.27.45.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/01/07 02:43:59 Modified files: net/py-boto3 : Makefile distinfo Log message: Update to py3-boto3-1.26.45.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/01/07 02:43:46 Modified files: net/py-botocore: Makefile distinfo Log message: Update to py3-botocore-1.29.45.
Re: UPDATE: lighttpd 1.4.68
On Fri, Jan 06, 2023 at 09:15:18PM +0100, Rafael Sadowski wrote:
> > +.if ${FLAVOR:Mpgsql}
> > +CONFIGURE_ARGS+= -DWITH_PGSQL=ON
> > +LIB_DEPENDS+= databases/postgresql
> > +WANTLIB+= pq
> > +.endif
> > +
> > +CFLAGS+= -I${LOCALBASE}/include
> > +LDFLAGS+= -L${LOCALBASE}/lib
>
> Is LDFLAGS needed? If yes MODCMAKE_LDFLAGS is the better solution.
Yes, it is. Some of the dependencies use pkg-config files / foo-config
and some do not.
Index: Makefile
===
RCS file: /home/cvs/ports/www/lighttpd/Makefile,v
retrieving revision 1.172
diff -u -p -u -p -r1.172 Makefile
--- Makefile8 Nov 2022 11:17:18 - 1.172
+++ Makefile7 Jan 2023 09:28:53 -
@@ -1,10 +1,9 @@
COMMENT= secure, fast, compliant, and very flexible web-server
-DISTNAME= lighttpd-1.4.67
+DISTNAME= lighttpd-1.4.68
CATEGORIES=www net
MASTER_SITES= https://download.lighttpd.net/lighttpd/releases-1.4.x/
EXTRACT_SUFX= .tar.xz
-REVISION= 0
HOMEPAGE= https://www.lighttpd.net/
@@ -15,42 +14,45 @@ PERMIT_PACKAGE= Yes
WANTLIB= c crypto m pcre2-8 ssl z ${MODLUA_WANTLIB}
-COMPILER= base-clang ports-gcc base-gcc
+COMPILER= base-clang ports-gcc
-MODULES= lang/lua
+MODULES= devel/cmake \
+ lang/lua
MODLUA_SA= Yes
LIB_DEPENDS+= devel/pcre2 \
${MODLUA_LIB_DEPENDS}
RUN_DEPENDS+= www/spawn-fcgi
-LIBTOOL_FLAGS= --tag=disable-static
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --libdir="${PREFIX}/lib/lighttpd" \
---with-lua \
---with-openssl
-CONFIGURE_ENV+=CC_FOR_BUILD="${CC}" \
- CFLAGS_FOR_BUILD="${CFLAGS}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- LUA_CFLAGS="`pkg-config --cflags ${MODLUA_DEP}`" \
- LUA_LIBS="`pkg-config --libs ${MODLUA_DEP}`"
+CONFIGURE_ARGS+=-DWITH_LUA=ON \
+ -DWITH_LUA_VERSION=${MODLUA_DEP} \
+ -DWITH_OPENSSL=ON
+CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
-FLAVORS= ldap mysql
+FLAVORS= ldap mysql pgsql
FLAVOR?=
.if ${FLAVOR:Mldap}
-CONFIGURE_ARGS+= --with-ldap
+CONFIGURE_ARGS+= -DWITH_LDAP=ON
LIB_DEPENDS+= databases/openldap
-WANTLIB+= lber ldap sasl2
+WANTLIB+= lber ldap
.endif
.if ${FLAVOR:Mmysql}
-CONFIGURE_ARGS+= --with-mysql
+CONFIGURE_ARGS+= -DWITH_MYSQL=ON
LIB_DEPENDS+= databases/mariadb
-WANTLIB+= mariadb pthread
+WANTLIB+= mariadb
.endif
+.if ${FLAVOR:Mpgsql}
+CONFIGURE_ARGS+= -DWITH_PGSQL=ON
+LIB_DEPENDS+= databases/postgresql
+WANTLIB+= pq
+.endif
+
+CFLAGS+= -I${LOCALBASE}/include
+MODCMAKE_LDFLAGS+= -L${LOCALBASE}/lib
+
post-extract:
@cp -f ${FILESDIR}/lighttpd.conf ${WRKSRC}/doc
@@ -70,6 +72,5 @@ post-install:
${PREFIX}/share/examples/lighttpd/access.log
${INSTALL_DATA} /dev/null \
${PREFIX}/share/examples/lighttpd/error.log
- rm -f ${PREFIX}/lib/lighttpd/*.la
.include
Index: distinfo
===
RCS file: /home/cvs/ports/www/lighttpd/distinfo,v
retrieving revision 1.70
diff -u -p -u -p -r1.70 distinfo
--- distinfo4 Oct 2022 11:34:23 - 1.70
+++ distinfo4 Jan 2023 15:13:45 -
@@ -1,2 +1,2 @@
-SHA256 (lighttpd-1.4.67.tar.xz) = fgTXZ/UajYJLMuJIPvKVCYKSDUJ9EnLvRmf0nW+J81g=
-SIZE (lighttpd-1.4.67.tar.xz) = 1039872
+SHA256 (lighttpd-1.4.68.tar.xz) = 5W83rlK2PhraTXbOeABa/7blbuova9sM4X1tNulYM4Q=
+SIZE (lighttpd-1.4.68.tar.xz) = 1030612
Index: files/lighttpd.conf
===
RCS file: /home/cvs/ports/www/lighttpd/files/lighttpd.conf,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 lighttpd.conf
--- files/lighttpd.conf 18 Aug 2010 11:16:55 - 1.1
+++ files/lighttpd.conf 6 Jan 2023 01:01:10 -
@@ -22,11 +22,9 @@ server.modules = (
# "mod_evhost",
# "mod_userdir",
# "mod_cgi",
-# "mod_compress",
+# "mod_deflate",
# "mod_ssi",
-# "mod_usertrack",
# "mod_expire",
-# "mod_secdownload",
# "mod_rrdtool",
"mod_accesslog" )
Index: patches/patch-doc_CMakeLists_txt
===
RCS file: patches/patch-doc_CMakeLists_txt
diff -N patches/patch-doc_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-doc_CMakeLists_txt5 Jan 2023 20:10:31 -
@@ -0,0 +1,11 @@
+[cmake] add doc/CMakeLists.txt to dist tar ball (#3181)
+da8abbfad414f2f8078e0b50302d691f8b21bbe0
+
+Index: doc/CMakeLists.txt
+---
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/01/07 02:29:01 Modified files: x11/gnome/gvfs : Makefile distinfo x11/gnome/gvfs/pkg: PLIST-main Log message: Update to gvfs-1.50.3.
misc/rlwrap: unicode xclipboard behaviour
Excuse me, after enabling UTF8 I noticed this funny behaviour that didn't seem very good. In ~ the default fvwm xterm with rlwrap and xclip packages from ports on both arm64 and amd64 $ printf "a\xe2\x98\xbdb" | xclip -i $ rlwrap ed in contrast to $ printf "a\xe2\x98\xbdb" | xclip -i $ ed Which works as expected. ed could be something else, I tried with rlwrap ecl and rlwrap sbcl. pkg_info rlwrap lists ports@openbsd.org as the maintainer. Sorry if it was something I caused myself, or the intended functionality.
