Re: Update libtool
Rafael Ávila de Espíndola writes: >>> lang/rust: >>> LLVM ERROR: invalid sh_type for string table section [index 34]: expected >>> SHT_STRTAB, but got SHT_NULL >> >> Could you try with the following diff on lang/rust ? It removes the >> dependency on libtool. It build fine on -current tree. > > Will try it tonight after work. It passes with your patch. I found that odd and tried it again without the your patch and the build finished fine. I guess it was just a reliability issue with my laptop. So in the end I was able to build every package with USE_LIBTOOL = gnu Cheers, Rafael
Re: NEW: libgdx, a Java-based framework for games
On Sat, Feb 20, 2021 at 05:49:28PM -0700, Thomas Frohwein wrote:
> Hi,
>
> This is a port of libgdx, a framework for games in Java. It has been
> used for a variety of high-profile indie games in recent years. Notable
> titles include Slay the Spire, Pathway, and others [1].
>
> This port has been made with the main purpose to allow some of those
> games to run, rather than development (although game development might
> also be possible with it). It builds a number of different backend
> libraries (JNI), as well as Java classes that are able to recognize
> OpenBSD as a valid operating system, rather than erroring out.
>
> This has mainly been tested with Slay the Spire, and the port comes
> with 2 helper scripts (libgdx-setup and libgdx-run) that allow for ease
> of use with Slay the Spire. I am hoping to expand the usability of the
> port and the included scripts to include other games in the near
> future.
>
> The version of libgdx is 1.9.11 because that is the apparently last one
> that doesn't break backwards compability for Slay the Spire. It can
> also run the game Mewnbase (although the setup is currently much more
> complicated). I anticipate that multiple separate versions of the port
> may be worth having in the future to support at least some of the
> better games with incompatible libgdx backend versions. I haven't found
> one yet that requires a different version than 1.9.11 and runs well, so
> I'm deferring multi-version setup for now.
>
> A few technical notes on the port:
>
> - maven pulls in a bunch of dependencies from online [2]. The way I
> work around this is with the m2repo-libgdx-${VERSION} package that
> contains all of them, and the '-o' switch for offline mode. I have
> reviewed the build logs for any hints of it still trying to download
> and have done a build with the internet connection turned off and all
> is good for offline building.
> - There are many dependencies, with licenses summarized in the Makefile
> (Apache 2.0, BSD, LGPL, Eclipse Public License)
>
> If you own Slay the Spire, you can test the port by going into the
> game's directory where 'desktop-1.0.jar' is located, then run:
>
> $ libgdx-setup
> $ libgdx-run
>
> The game works very well overall, but online features and gamepad are
> not supported at the moment. There is also a high-frequency flickering
> of transparent/fading objects that I haven't been able to debug yet.
> Occasionally, it fails to load libopenal on startup.
>
> On another technical note: a few of the patch-* filenames are too long
> for tar(1), so I made the tarball with gtar. I was able to unpack it
> with tar(1) without issues.
>
> [1] https://libgdx.com/
> [2] https://mvnrepository.com/
I tested this builds for me on amd64, and the wrapper scripts work for
me with Slay the Spire (after some self-inflicted foot injuries).
There are some improvements that can be made but that can always happen
in-tree.
-Bryan.
NEW: libgdx, a Java-based framework for games
Hi,
This is a port of libgdx, a framework for games in Java. It has been
used for a variety of high-profile indie games in recent years. Notable
titles include Slay the Spire, Pathway, and others [1].
This port has been made with the main purpose to allow some of those
games to run, rather than development (although game development might
also be possible with it). It builds a number of different backend
libraries (JNI), as well as Java classes that are able to recognize
OpenBSD as a valid operating system, rather than erroring out.
This has mainly been tested with Slay the Spire, and the port comes
with 2 helper scripts (libgdx-setup and libgdx-run) that allow for ease
of use with Slay the Spire. I am hoping to expand the usability of the
port and the included scripts to include other games in the near
future.
The version of libgdx is 1.9.11 because that is the apparently last one
that doesn't break backwards compability for Slay the Spire. It can
also run the game Mewnbase (although the setup is currently much more
complicated). I anticipate that multiple separate versions of the port
may be worth having in the future to support at least some of the
better games with incompatible libgdx backend versions. I haven't found
one yet that requires a different version than 1.9.11 and runs well, so
I'm deferring multi-version setup for now.
A few technical notes on the port:
- maven pulls in a bunch of dependencies from online [2]. The way I
work around this is with the m2repo-libgdx-${VERSION} package that
contains all of them, and the '-o' switch for offline mode. I have
reviewed the build logs for any hints of it still trying to download
and have done a build with the internet connection turned off and all
is good for offline building.
- There are many dependencies, with licenses summarized in the Makefile
(Apache 2.0, BSD, LGPL, Eclipse Public License)
If you own Slay the Spire, you can test the port by going into the
game's directory where 'desktop-1.0.jar' is located, then run:
$ libgdx-setup
$ libgdx-run
The game works very well overall, but online features and gamepad are
not supported at the moment. There is also a high-frequency flickering
of transparent/fading objects that I haven't been able to debug yet.
Occasionally, it fails to load libopenal on startup.
On another technical note: a few of the patch-* filenames are too long
for tar(1), so I made the tarball with gtar. I was able to unpack it
with tar(1) without issues.
[1] https://libgdx.com/
[2] https://mvnrepository.com/
libgdx.tgz
Description: Binary data
Re: Update or remove mail/avenger
On Wed, Feb 10, 2021 at 09:42:09AM +0100, Klemens Nanni wrote: > We package 0.8.3 05-Apr-2012 but 0.8.4 in 13-Jul-2013 and 0.8.5 in > 08-Oct-2018 were released; the NEWS file in the latest tarball says: > > * Changes in release 0.8.5 > > Various changes to make it compile with newer g++ and libcrypto. > > Manually parse /etc/resolv.conf, rather than attempting to make use of > the res data structure (which at least on OpenBSD no longer actually > contains the addresses of resolvers). > > * Changes in release 0.8.4 > > Switch to new resolver library interface, as previous way of reloading > resolv.conf is no longer compatible with glibc. > > Set IP_FREEBIND option if available. > > Added systemd avenger.service file. > > > Does anyone still use this "highly-configurable, MTA-independent SMTP > server daemon" on OpenBSD? I'm inclined to assume the answer is "no", > especially if the latest release from over two years ago contains > DNS and crypto relevant specifically for OpenBSD. > > Does anyone want to look at updating and testing this port or shall we > send it to the attic? > > PS: http://www.mailavenger.org/NEWS is sitll missing 0.8.5 changes, so > best look at the actual tarball. Ping.
Re: Remove lang/arena in the name of -fno-common
On Fri, Feb 19, 2021 at 09:45:59PM -0800, Greg Steuck wrote: > The project morphed into Intend C in 2008: > https://web.archive.org/web/20081120121438/http://www.minimalinux.org/arena/ OK kn
nagios update, unbreak -fno-common
built only, I don't use this. anyone want to test before it goes in?
Index: Makefile
===
RCS file: /cvs/ports/net/nagios/nagios/Makefile,v
retrieving revision 1.86
diff -u -p -r1.86 Makefile
--- Makefile26 Sep 2019 21:59:30 - 1.86
+++ Makefile20 Feb 2021 18:41:11 -
@@ -5,22 +5,20 @@ ONLY_FOR_ARCHS= ${LP64_ARCHS} # time_t f
COMMENT-main= host and service monitor
COMMENT-web= cgis and webpages for nagios
-V= 4.3.1
+V= 4.4.6
DISTNAME= nagios-$V
PKGNAME-main= nagios-$V
PKGNAME-web= nagios-web-$V
CATEGORIES=net
-REVISION-main= 1
-REVISION-web= 2
-HOMEPAGE= http://www.nagios.org/
+HOMEPAGE= https://www.nagios.org/
# GPLv2 only
PERMIT_PACKAGE=Yes
MULTI_PACKAGES=-main -web
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagios/}
+MASTER_SITES= https://assets.nagios.com/downloads/nagioscore/releases/
MODULES= lang/php
@@ -36,7 +34,7 @@ USE_GMAKE=Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=--datadir=${PREFIX-web}/nagios \
--libexecdir=${PREFIX}/libexec/nagios \
- --sbindir=${PREFIX-web}/cgi-bin/nagios \
+ --with-cgibindir=${PREFIX-web}/cgi-bin/nagios \
--with-cgiurl=/cgi-bin/nagios \
--with-checkresult-dir=/var/spool/nagios \
--with-command-group=www \
Index: distinfo
===
RCS file: /cvs/ports/net/nagios/nagios/distinfo,v
retrieving revision 1.31
diff -u -p -r1.31 distinfo
--- distinfo17 Apr 2017 17:29:13 - 1.31
+++ distinfo20 Feb 2021 18:41:11 -
@@ -1,2 +1,2 @@
-SHA256 (nagios-4.3.1.tar.gz) = 38L18UbrUIsqKNKK98M47562BDJ+/cUBQmQgJvfnn4I=
-SIZE (nagios-4.3.1.tar.gz) = 11095797
+SHA256 (nagios-4.4.6.tar.gz) = qw1aUsrwHm9NzYQlLE6131ok+Qu3+VHwOHXu9U9asPQ=
+SIZE (nagios-4.4.6.tar.gz) = 11333414
Index: patches/patch-base_Makefile_in
===
RCS file: /cvs/ports/net/nagios/nagios/patches/patch-base_Makefile_in,v
retrieving revision 1.6
diff -u -p -r1.6 patch-base_Makefile_in
--- patches/patch-base_Makefile_in 7 Nov 2013 10:31:38 - 1.6
+++ patches/patch-base_Makefile_in 20 Feb 2021 18:41:11 -
@@ -1,15 +1,17 @@
$OpenBSD: patch-base_Makefile_in,v 1.6 2013/11/07 10:31:38 rpe Exp $
base/Makefile.in.orig Wed Oct 16 01:36:42 2013
-+++ base/Makefile.in Fri Nov 1 17:45:15 2013
-@@ -180,9 +180,8 @@ install-unstripped:
- $(MAKE) install-basic
+
+Index: base/Makefile.in
+--- base/Makefile.in.orig
base/Makefile.in
+@@ -173,9 +173,8 @@ devclean: distclean
+ rm -f wpres-phash.h
- install-basic:
+ install:
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
-- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
-- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
+- $(INSTALL) -s -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
+- $(INSTALL) -s -m 774 $(INSTALL_OPTS) @nagiostats_name@
$(DESTDIR)$(BINDIR)
+ $(BSD_INSTALL_PROGRAM) @nagios_name@ $(DESTDIR)$(prefix)/sbin
+ $(BSD_INSTALL_PROGRAM) @nagiostats_name@ $(DESTDIR)$(BINDIR)
- strip-post-install:
- $(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@
+ install-unstripped:
+ $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
Index: patches/patch-configure
===
RCS file: /cvs/ports/net/nagios/nagios/patches/patch-configure,v
retrieving revision 1.17
diff -u -p -r1.17 patch-configure
--- patches/patch-configure 17 Apr 2017 17:29:13 - 1.17
+++ patches/patch-configure 20 Feb 2021 18:41:11 -
@@ -1,7 +1,9 @@
$OpenBSD: patch-configure,v 1.17 2017/04/17 17:29:13 rpe Exp $
configure.orig Fri Apr 14 13:17:17 2017
-+++ configure Fri Apr 14 13:20:45 2017
-@@ -1085,7 +1085,7 @@ do
+
+Index: configure
+--- configure.orig
configure
+@@ -1137,7 +1137,7 @@ do
ac_prev=sysconfdir ;;
-sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=*
\
| --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
@@ -10,7 +12,7 @@ $OpenBSD: patch-configure,v 1.17 2017/04
-target | --target | --targe | --targ | --tar | --ta | --t)
ac_prev=target_alias ;;
-@@ -4775,7 +4775,7 @@ cat >>confdefs.h <<_ACEOF
+@@ -6240,7 +6240,7 @@ cat >>confdefs.h <<_ACEOF
#define DEFAULT_NAGIOS_GROUP "$nagios_grp"
_ACEOF
@@ -19,7 +21,7 @@ $OpenBSD: patch-configure,v 1.17 2017/04
-@@ -5169,7 +5169,7 @@ $as_echo_n "checking for gdImagePng in -lgd (order 1).
+@@ -6671,7 +6671,7 @@ $as_echo_n "checking for gdImagePng in -lgd (order 1).
$as_echo_n "(cached) " >&6
else
ac_save_LIBS="$LIBS"
@@ -28,16 +30,18 @@ $OpenBSD: patch-configure,v 1.17 2017/04
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end
Re: Remove math/abs in the name of -fno-common?
On Saturday, February 20th, 2021 at 12:31 AM, Greg Steuck wrote: > The MASTER_SITES page was last available in 2003. > > https://web.archive.org/web/2003110100*/http://www.ping.be/bertin/ > > OK to remove? I was able to get it building with -fno-common and it wasn't too difficult, and the program still runs perfectly fine, but at this point 20+ year old software that doesn't appear in any package repositories except for FreeBSD, OpenBSD, and pkgsrc (according to Repology) can go I think. Yes, ok to remove. ~Brian
Re: update: databases/pgpool for -fno-common
On Sat, Feb 20, 2021 at 06:16:34PM +, Stuart Henderson wrote: > On 2021/02/20 18:41, Landry Breuil wrote: > > Hi, > > > > the pgpool version we ship is from mid-2018 and fails to build with > > clang 10. Since there, upstream has released 4.0, 4.1 and 4.2 branches, > > while 3.7 is still maintained. > > > > so i went the easy route and upgraded to 3.7.18. > > ok for now to unbreak, but this is badly in need of a branch update: > Yes ok to unbreak. Thank you. I will work to update it to the latest version. > 4.0 - 2018-10-19 > > This version adds support for SCRAM and CERT authentication, improves > load balancing control and import PostgreSQL 11 new SQL parser > > 4.1 - 2019-10-31 > > This version implements long awaited features including > statement_level_load_balance and auto_failback. Also it enhances number > of areas related to performance. Finally it imports PostgreSQL 12's new > SQL parser. > > 4.2 - 2020-11-26 > > Many enhancements are added to this version for easier configuration > and administration. Moreover new clustering mode which allows not only > write consistency but read consistency in multiple PostgreSQL servers. > Also SSL is improved to allow more secure operation. New PostgreSQL 13 > SQL parse is imported. >
Re: update: databases/pgpool for -fno-common
On 2021/02/20 18:41, Landry Breuil wrote: > Hi, > > the pgpool version we ship is from mid-2018 and fails to build with > clang 10. Since there, upstream has released 4.0, 4.1 and 4.2 branches, > while 3.7 is still maintained. > > so i went the easy route and upgraded to 3.7.18. ok for now to unbreak, but this is badly in need of a branch update: 4.0 - 2018-10-19 This version adds support for SCRAM and CERT authentication, improves load balancing control and import PostgreSQL 11 new SQL parser 4.1 - 2019-10-31 This version implements long awaited features including statement_level_load_balance and auto_failback. Also it enhances number of areas related to performance. Finally it imports PostgreSQL 12's new SQL parser. 4.2 - 2020-11-26 Many enhancements are added to this version for easier configuration and administration. Moreover new clustering mode which allows not only write consistency but read consistency in multiple PostgreSQL servers. Also SSL is improved to allow more secure operation. New PostgreSQL 13 SQL parse is imported.
FIX net/honeyd -fno-common build error
Fix taken from FreeBSD.
OK?
diff --git Makefile Makefile
index 24ebef0ddd7..bed32c9ad7d 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
COMMENT= utility to create virtual hosts on a network
DISTNAME= honeyd-1.5c
-REVISION= 12
+REVISION= 13
CATEGORIES=net
MASTER_SITES= http://www.citi.umich.edu/u/provos/honeyd/ \
http://niels.xtdnet.nl/honeyd/
diff --git patches/patch-personality_c patches/patch-personality_c
new file mode 100644
index 000..e1d658643d0
--- /dev/null
+++ patches/patch-personality_c
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Fix -fno-common build error. Taken from
+https://svnweb.freebsd.org/ports?view=revision&revision=549600
+
+Index: personality.c
+--- personality.c.orig
personality.c
+@@ -65,6 +65,9 @@
+ #include "template.h"
+ #include "debug.h"
+
++personalities_t personalities;
++xp_fprints_t xp_fprints;
++
+ /* ET - Moved SPLAY_HEAD to personality.h so xprobe_assoc.c could use it. */
+ int npersons;
+
diff --git patches/patch-personality_h patches/patch-personality_h
new file mode 100644
index 000..cc3c32e2273
--- /dev/null
+++ patches/patch-personality_h
@@ -0,0 +1,28 @@
+$OpenBSD$
+
+Fix -fno-common build error. Taken from
+https://svnweb.freebsd.org/ports?view=revision&revision=549600
+
+Index: personality.h
+--- personality.h.orig
personality.h
+@@ -179,7 +179,8 @@ void xprobe_personality_init(void);
+ void print_perstree(void);
+
+ /* Splay stuff here so other modules can use it */
+-SPLAY_HEAD(perstree, personality) personalities;
++typedef SPLAY_HEAD(perstree, personality) personalities_t;
++extern personalities_t personalities;
+ static int
+ perscompare(struct personality *a, struct personality *b)
+ {
+@@ -187,7 +188,8 @@ perscompare(struct personality *a, struct personality
+ }
+ SPLAY_PROTOTYPE(perstree, personality, node, perscompare);
+
+-SPLAY_HEAD(xp_fprint_tree, xp_fingerprint) xp_fprints;
++typedef SPLAY_HEAD(xp_fprint_tree, xp_fingerprint) xp_fprints_t;
++extern xp_fprints_t xp_fprints;
+ static int
+ xp_fprint_compare(struct xp_fingerprint *a, struct xp_fingerprint *b)
+ {
diff --git patches/patch-stats_h patches/patch-stats_h
new file mode 100644
index 000..d869d69e102
--- /dev/null
+++ patches/patch-stats_h
@@ -0,0 +1,37 @@
+$OpenBSD$
+
+Fix -fno-common build error. Taken from
+https://svnweb.freebsd.org/ports?view=revision&revision=549600
+
+Index: stats.h
+--- stats.h.orig
stats.h
+@@ -89,10 +89,12 @@ struct stats {
+ reserved:4;
+ };
+
+-enum {
++typedef enum {
+ M_COUNTER, M_TV_START, M_TV_END, M_RECORD, M_MAX
+-} measurement_tags;
++} measurement_tags_t;
+
++extern measurement_tags_t measurement_tags;
++
+ struct measurement {
+ uint32_t counter;
+ struct timeval tv_start;
+@@ -103,9 +105,11 @@ struct measurement {
+ #define SHA1_DIGESTSIZE 20
+ #endif
+
+-enum {
++typedef enum {
+ SIG_NAME, SIG_DIGEST, SIG_DATA, SIG_COMPRESSED_DATA, SIG_MAX
+-} signature_tags;
++} signature_tags_t;
++
++extern signature_tags_t signature_tags;
+
+ struct signature {
+ char *name;
diff --git patches/patch-tagging_h patches/patch-tagging_h
new file mode 100644
index 000..8593f9cbbd9
--- /dev/null
+++ patches/patch-tagging_h
@@ -0,0 +1,39 @@
+$OpenBSD$
+
+Fix -fno-common build error. Taken from
+https://svnweb.freebsd.org/ports?view=revision&revision=549600
+
+Index: tagging.h
+--- tagging.h.orig
tagging.h
+@@ -44,12 +44,14 @@ struct hash {
+ u_char digest[SHINGLE_SIZE];
+ };
+
+-enum {
++typedef enum {
+ REC_TV_START, REC_TV_END, REC_SRC, REC_DST, REC_SRC_PORT, REC_DST_PORT,
+ REC_PROTO, REC_STATE, REC_OS_FP, REC_HASH, REC_BYTES, REC_FLAGS,
+ REC_MAX_TAGS
+-} record_tags;
++} record_tags_t;
+
++extern record_tags_t record_tags;
++
+ #define RECORD_STATE_NEW 0x01
+
+ struct record {
+@@ -69,9 +71,11 @@ struct record {
+ TAILQ_HEAD(hashq, hash) hashes; /* optional */
+ };
+
+-enum {
++typedef enum {
+ ADDR_TYPE, ADDR_BITS, ADDR_ADDR, ADDR_MAX_TAGS
+-} address_tags;
++} address_tags_t;
++
++extern address_tags_t address_tags;
+
+ void record_marshal(struct evbuffer *, struct record *);
+
diff --git pkg/PLIST pkg/PLIST
index 44ae4e01d0f..bb1e3e5de11 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -11,7 +11,7 @@ include/honeyd/hooks.h
include/honeyd/plugins.h
include/honeyd/plugins_config.h
lib/honeyd/
-lib/honeyd/libhoneyd.so
+@so lib/honeyd/libhoneyd.so
@man man/man1/honeydctl.1
@man man/man8/honeyd.8
share/honeyd/
update: databases/pgpool for -fno-common
Hi,
the pgpool version we ship is from mid-2018 and fails to build with
clang 10. Since there, upstream has released 4.0, 4.1 and 4.2 branches,
while 3.7 is still maintained.
so i went the easy route and upgraded to 3.7.18. Some things are red
herrings though:
pgpool-regclass.c:124:7: warning: implicit declaration of function
'SplitIdentifierString' is invalid in C99 [-Wimplicit-function-declaration]
if (!SplitIdentifierString(rawname, '.', &namelist))
protocol/child.c:2206:4: warning: implicit declaration of function 'load_hba'
is invalid in C99 [-Wimplicit-function-declaration]
load_hba(get_hba_file_name());
protocol/child.c:2416:3: warning: implicit declaration of function
'ClientAuthentication' is invalid in C99 [-Wimplicit-function-declaration]
ClientAuthentication(frontend);
afaict those are psql functions, it's just that pgpool doesnt include the
corresponding header ? Not planning to dig more in this port, at least this
unbreaks it..
Landry
Index: Makefile
===
RCS file: /cvs/ports/databases/pgpool/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile12 Jul 2019 21:15:34 - 1.13
+++ Makefile20 Feb 2021 17:36:40 -
@@ -2,7 +2,7 @@
COMMENT= connection pool server for PostgreSQL
-DISTNAME= pgpool-II-3.7.5
+DISTNAME= pgpool-II-3.7.18
CATEGORIES=databases
Index: distinfo
===
RCS file: /cvs/ports/databases/pgpool/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo10 Sep 2018 12:29:24 - 1.9
+++ distinfo20 Feb 2021 17:36:40 -
@@ -1,2 +1,2 @@
-SHA256 (pgpool-II-3.7.5.tar.gz) = UQrHzQDiKW3FCtHMvIb5MI38Ns+pjQQGa5o3pUZMR8E=
-SIZE (pgpool-II-3.7.5.tar.gz) = 3276279
+SHA256 (pgpool-II-3.7.18.tar.gz) = 0I4zuZYUjHukHw5PWjMLU5Ec1srJTHh3gIewaMjaCX4=
+SIZE (pgpool-II-3.7.18.tar.gz) = 3447131
Index: pkg/PLIST
===
RCS file: /cvs/ports/databases/pgpool/pkg/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- pkg/PLIST 19 Dec 2017 09:02:03 - 1.3
+++ pkg/PLIST 20 Feb 2021 17:36:40 -
@@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.3 2017/12/19 09:02:03 pea Exp $
@newgroup _pgpool:690
@newuser _pgpool:690:_pgpool:daemon:pgpool daemon:/nonexistent:/sbin/nologin
+@rcscript ${RCDIR}/pgpool
@bin bin/pcp_attach_node
@bin bin/pcp_detach_node
@bin bin/pcp_node_count
@@ -20,10 +21,10 @@
include/pcp.h
include/pool_process_reporting.h
include/pool_type.h
-lib/libpcp.a
+@static-lib lib/libpcp.a
lib/libpcp.la
@lib lib/libpcp.so.${LIBpcp_VERSION}
-lib/postgresql/pgpool-regclass.so
+@so lib/postgresql/pgpool-regclass.so
@man man/man8/pgpool.8
share/examples/pgpool-II/
share/examples/pgpool-II/pcp.conf.sample
@@ -43,4 +44,3 @@
share/postgresql/extension/pgpool-regclass.sql
share/postgresql/extension/pgpool_regclass--1.0.sql
share/postgresql/extension/pgpool_regclass.control
-@rcscript ${RCDIR}/pgpool
Re: FIX: OpenMDNS-fno-common
On Wed 03/02/2021 11:22, Gonzalo L. Rodriguez wrote:
> Hello,
>
> I notified Haesbaert about it, but for now we can do the easy way.
>
> OK? Comments?
Instead of using CFLAGS+=-fcommon take fix from FreeBSD:
diff --git Makefile Makefile
index d8a148f08a6..8988c32fe0f 100644
--- Makefile
+++ Makefile
@@ -4,7 +4,7 @@ COMMENT = MDNS/DNS-SD daemon
DISTNAME = openmdns-0.7
CATEGORIES = net
-REVISION = 1
+REVISION = 2
MAINTAINER = Gonzalo L. R.
diff --git patches/patch-mdnsd_control_c patches/patch-mdnsd_control_c
new file mode 100644
index 000..a43c36f26eb
--- /dev/null
+++ patches/patch-mdnsd_control_c
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix -fno-common build error. Taken from
+https://svnweb.freebsd.org/ports?view=revision&revision=549579
+
+Index: mdnsd/control.c
+--- mdnsd/control.c.orig
mdnsd/control.c
+@@ -53,6 +53,8 @@ void control_group_add_service(struct ctl_conn *, st
+
+ extern struct mdnsd_conf *conf;
+
++struct control_state control_state;
++
+ void
+ control_lookup(struct ctl_conn *c, struct imsg *imsg)
+ {
diff --git patches/patch-mdnsd_control_h patches/patch-mdnsd_control_h
new file mode 100644
index 000..cf40e16d158
--- /dev/null
+++ patches/patch-mdnsd_control_h
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Fix -fno-common build error. Taken from
+https://svnweb.freebsd.org/ports?view=revision&revision=549579
+
+Index: mdnsd/control.h
+--- mdnsd/control.h.orig
mdnsd/control.h
+@@ -26,10 +26,12 @@
+
+ #include "mdnsd.h"
+
+-struct {
++struct control_state {
+ struct eventev;
+ int fd;
+-} control_state;
++};
++
++extern struct control_state control_state;
+
+ enum blockmodes {
+ BM_NORMAL,
diff --git patches/patch-mdnsd_mdns_c patches/patch-mdnsd_mdns_c
new file mode 100644
index 000..3d721004478
--- /dev/null
+++ patches/patch-mdnsd_mdns_c
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Fix -fno-common build error. Taken from
+https://svnweb.freebsd.org/ports?view=revision&revision=549579
+
+Index: mdnsd/mdns.c
+--- mdnsd/mdns.c.orig
mdnsd/mdns.c
+@@ -45,6 +45,9 @@ extern struct mdnsd_conf *conf;
+ struct question_tree question_tree;
+ struct cache_tree cache_tree;
+
++pg_q pg_queue;
++pge_q pge_queue;
++
+ /*
+ * RR cache
+ */
diff --git patches/patch-mdnsd_mdnsd_c patches/patch-mdnsd_mdnsd_c
new file mode 100644
index 000..95e7a716905
--- /dev/null
+++ patches/patch-mdnsd_mdnsd_c
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix -fno-common build error. Taken from
+https://svnweb.freebsd.org/ports?view=revision&revision=549579
+
+Index: mdnsd/mdnsd.c
+--- mdnsd/mdnsd.c.orig
mdnsd/mdnsd.c
+@@ -45,6 +45,8 @@ int mdns_sock(void);
+ void fetchmyname(char [MAXHOSTNAMELEN]);
+ void fetchhinfo(struct hinfo *);
+
++ctl_conns_t ctl_conns;
++
+ struct mdnsd_conf *conf = NULL;
+ extern char *malloc_options;
+
diff --git patches/patch-mdnsd_mdnsd_h patches/patch-mdnsd_mdnsd_h
new file mode 100644
index 000..8eed0becf0b
--- /dev/null
+++ patches/patch-mdnsd_mdnsd_h
@@ -0,0 +1,32 @@
+$OpenBSD$
+
+Fix -fno-common build error. Taken from
+https://svnweb.freebsd.org/ports?view=revision&revision=549579
+
+Index: mdnsd/mdnsd.h
+--- mdnsd/mdnsd.h.orig
mdnsd/mdnsd.h
+@@ -223,9 +223,11 @@ struct pge {
+ };
+
+ /* Publish Group Queue, should hold all publishing groups */
+-TAILQ_HEAD(, pg) pg_queue;
++typedef TAILQ_HEAD(, pg) pg_q;
++extern pg_q pg_queue;
+ /* Publish Group Entry Queue, should hold all publishing group entries */
+-TAILQ_HEAD(, pge) pge_queue;
++typedef TAILQ_HEAD(, pge) pge_q;
++extern pge_q pge_queue;
+
+ struct kif {
+ charifname[IF_NAMESIZE];
+@@ -397,7 +399,8 @@ int rr_send_an(struct rr *);
+ void conflict_resolve_by_rr(struct rr *);
+
+ /* control.c */
+-TAILQ_HEAD(ctl_conns, ctl_conn) ctl_conns;
++typedef TAILQ_HEAD(ctl_conns, ctl_conn) ctl_conns_t;
++extern ctl_conns_t ctl_conns;
+ int control_send_rr(struct ctl_conn *, struct rr *, int);
+ int control_send_ms(struct ctl_conn *, struct mdns_service *, int);
+ int control_try_answer_ms(struct ctl_conn *, char[MAXHOSTNAMELEN]);
diff --git pkg/PLIST pkg/PLIST
index 078e28e8f81..662f4af4855 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,9 +1,9 @@
@comment $OpenBSD: PLIST,v 1.5 2018/09/04 12:46:18 espie Exp $
@newgroup _mdnsd:664
@newuser _mdnsd:664:_mdnsd:daemon:MDNS Daemon:/var/empty:/sbin/nologin
+@rcscript ${RCDIR}/mdnsd
@bin bin/mdnsctl
@bin bin/mdnsd
@man man/man8/mdnsctl.8
@man man/man8/mdnsd.8
share/doc/pkg-readmes/${PKGSTEM}
-@rcscript ${RCDIR}/mdnsd
Build failures from -fno-common (2021-02-20)
Here is the updated list of ports that now fail to build due to the new -fno-common compiler default. audio/gtkpodUPDATEports@openbsd.org audio/nspmod- ports@openbsd.org audio/wmtune- ports@openbsd.org cad/graywolf- jus...@atlantide.mooo.com comms/birda - ports@openbsd.org comms/efax - i...@openbsd.org comms/jpilot- ports@openbsd.org comms/scmxx UPDATEports@openbsd.org comms/seyon - ports@openbsd.org comms/xdx - ports@openbsd.org databases/pgpoolUPDATEp...@openbsd.org devel/mingw - p...@irofti.net devel/remakeUPDATEports@openbsd.org editors/tea UPDATEports@openbsd.org education/gamgi UPDATEports@openbsd.org emulators/libretro-genesis-plus-gx - ports@openbsd.org emulators/pcsxr - ports@openbsd.org games/corewars - ports@openbsd.org games/egobooUPDATEports@openbsd.org games/freedroidrpg - ports@openbsd.org games/gnurobbo - ports@openbsd.org games/mirrormagic - ports@openbsd.org games/oolite- n...@openbsd.org games/sdlpop- rob...@openbsd.org games/vms-empire- ports@openbsd.org graphics/dpic - ports@openbsd.org graphics/gimp/liquid-rescale- ports@openbsd.org inputmethods/cellwriter - vas...@lxmx.com.au lang/arena - ports@openbsd.org lang/moarvm UPDATEpas...@stumpf.co mail/avengerUPDATEports@openbsd.org mail/sma- ports@openbsd.org mail/wmmultipop3- ports@openbsd.org mail/wmpop3 - ports@openbsd.org math/abs- ports@openbsd.org misc/logjam - ports@openbsd.org misc/wmmand - ports@openbsd.org multimedia/audiopreview - ports@openbsd.org multimedia/lives- ports@openbsd.org net/angst - ports@openbsd.org net/argus - ste...@openbsd.org net/argus-clients - ste...@openbsd.org net/dicoUPDATEports@openbsd.org net/ekg - ports@openbsd.org net/ettercap- ports@openbsd.org net/honeyd - ports@openbsd.org net/ipv6-toolkit- bl...@openbsd.org net/jftpgw - ports@openbsd.org net/msdl- ports@openbsd.org net/nagios/nagios UPDATEports@openbsd.org net/openmdns- gonz...@openbsd.org net/plushs - ports@openbsd.org net/tcpreplay UPDATEni...@openbsd.org net/weex- ports@openbsd.org net/yersinia- ste...@openbsd.org productivity/xinvest- ports@openbsd.org productivity/xquote - ports@openbsd.org security/bsd-airtools - ports@openbsd.org security/flasm - rpoin...@openbsd.org security/foremost - ports@openbsd.org security/gringotts - p...@openbsd.org security/ipguard- ports@openbsd.org security/ossec-hids UPDATEp...@irofti.net security/tempwatch - ports@openbsd.org sysutils/radmind- ports@openbsd.org sysutils/wmmon - ports@openbsd.org sysutils/wmwlmon- mar...@nazgul.ch www/sarg- ports@openbsd.org x11/agar/test UPDATEports@openbsd.org x11/fbpanel - ports@openbsd.org x11/gnustep/corebase- sebas...@openbsd.org x11/gnustep/gworkspace - sebas..
[MAINTAINER UPDATE] graphics/openvdb -> 8.0.1
Update graphics/openvdb to 8.0.1 Changelog:https://github.com/dreamworksanimation/openvdb/releases *release of OpenVDB AX, an open source C++ library. *ABI-breaking changes that improve performance & reduce memory usage. *various bug fixes. Build & Run tested with blender on amd64 Index: Makefile === RCS file: /cvs/ports/graphics/openvdb/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- Makefile26 Jan 2021 13:44:04 - 1.1.1.1 +++ Makefile19 Feb 2021 15:38:15 - @@ -4,9 +4,9 @@ COMMENT=tools for storage and manipulat GH_ACCOUNT=dreamworksanimation GH_PROJECT=openvdb -GH_TAGNAME=v7.1.0 +GH_TAGNAME=v8.0.1 -SHARED_LIBS += openvdb 0.0 # 7.1 +SHARED_LIBS += openvdb 1.0 # 8.0 CATEGORIES=graphics Index: distinfo === RCS file: /cvs/ports/graphics/openvdb/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo26 Jan 2021 13:44:04 - 1.1.1.1 +++ distinfo19 Feb 2021 15:38:15 - @@ -1,2 +1,2 @@ -SHA256 (openvdb-7.1.0.tar.gz) = DDWIwcpuZHYQc4ZU7Cxqr0GiA/15f2Cfvqscn3w9wRY= -SIZE (openvdb-7.1.0.tar.gz) = 1956052 +SHA256 (openvdb-8.0.1.tar.gz) = poRdp8YE0scuQUHImJMKyKI3VSHlNfaWws2SvrvkPE8= +SIZE (openvdb-8.0.1.tar.gz) = 2299276 Index: patches/patch-CMakeLists_txt === RCS file: /cvs/ports/graphics/openvdb/patches/patch-CMakeLists_txt,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-CMakeLists_txt --- patches/patch-CMakeLists_txt26 Jan 2021 13:44:04 - 1.1.1.1 +++ patches/patch-CMakeLists_txt19 Feb 2021 15:38:15 - @@ -2,14 +2,14 @@ $OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 zlib 1.2.7 not available on OpenBSD CMakeLists.txt.origThu Dec 3 15:33:54 2020 -+++ CMakeLists.txt Thu Dec 3 15:34:09 2020 -@@ -234,7 +234,7 @@ if(NOT DISABLE_DEPENDENCY_VERSION_CHECKS) - set(MINIMUM_BOOST_VERSION 1.61) - set(MINIMUM_ILMBASE_VERSION 2.2) - set(MINIMUM_OPENEXR_VERSION 2.2) +--- CMakeLists.txt.origSat Feb 6 00:51:38 2021 CMakeLists.txt Fri Feb 19 15:20:45 2021 +@@ -216,7 +216,7 @@ if(NOT DISABLE_DEPENDENCY_VERSION_CHECKS) + set(MINIMUM_BOOST_VERSION 1.61) # @warning should be 1.66, but H18 ships with 1.61 + set(MINIMUM_ILMBASE_VERSION 2.2) # @warning should be 2.3, but H18 ships with 2.2 + set(MINIMUM_OPENEXR_VERSION 2.2) # @warning should be 2.3, but H18 ships with 2.2 - set(MINIMUM_ZLIB_VERSION 1.2.7) + set(MINIMUM_ZLIB_VERSION 1.2.3) - set(MINIMUM_TBB_VERSION 2017.0) + set(MINIMUM_TBB_VERSION 2018.0) + set(MINIMUM_LLVM_VERSION 6.0.0) - set(MINIMUM_PYTHON_VERSION 2.7) Index: pkg/PLIST === RCS file: /cvs/ports/graphics/openvdb/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 26 Jan 2021 13:44:04 - 1.1.1.1 +++ pkg/PLIST 19 Feb 2021 15:38:15 - @@ -7,6 +7,7 @@ include/openvdb/MetaMap.h include/openvdb/Metadata.h include/openvdb/Platform.h include/openvdb/PlatformConfig.h +include/openvdb/TypeList.h include/openvdb/Types.h include/openvdb/io/ include/openvdb/io/Archive.h @@ -86,6 +87,7 @@ include/openvdb/tools/LevelSetSphere.h include/openvdb/tools/LevelSetTracker.h include/openvdb/tools/LevelSetUtil.h include/openvdb/tools/Mask.h +include/openvdb/tools/Merge.h include/openvdb/tools/MeshToVolume.h include/openvdb/tools/Morphology.h include/openvdb/tools/MultiResGrid.h @@ -137,7 +139,6 @@ include/openvdb/util/logging.h include/openvdb/version.h lib/cmake/OpenVDB/ lib/cmake/OpenVDB/FindBlosc.cmake -lib/cmake/OpenVDB/FindCppUnit.cmake lib/cmake/OpenVDB/FindIlmBase.cmake lib/cmake/OpenVDB/FindJemalloc.cmake lib/cmake/OpenVDB/FindLog4cplus.cmake
Re: [update] security/cfssl -> 1.5.0
On 2021/02/17 09:33, karlis.mikels...@lf.lv wrote: > > Please find ttached diff to update security/cfssl to latest stable > > version 1.5.0. > > Release notes: https://github.com/cloudflare/cfssl/releases/tag/v1.5.0 > > > > Tested on amd64. > Any comments on this? > > Kind regards, > Karlis > Thanks, committed. btw it would save time to re-include the diff when sending a follow-up mail, avoids having to dig in ports@ archive to find it.
sphinx 3.5.1
Here's a diff for Sphinx 3.5.1 and set of build+run dependencies in
py-sphinxcontrib.tgz (unpack in textproc).
I haven't started working through the ports that depend on sphinx yet
(almost certainly they'll need plist updates and maybe other fixes)
but in the meantime I'm looking for an ok to import py-sphinxcontrib/*.
They're used in the build of sphinx so can't depend on it, so they can
be imported prior to updating.
Tests are in reasonable shape, some failures due to warnings in epub
files, some http fetches blocked from _pbuild, couple look utf8-related,
nothing serious afaict.
Index: Makefile
===
RCS file: /cvs/ports/textproc/py-sphinx/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- Makefile20 Feb 2021 13:20:17 - 1.34
+++ Makefile20 Feb 2021 15:23:39 -
@@ -2,10 +2,9 @@
COMMENT = Python documentation generator
-MODPY_EGG_VERSION =1.5.6
+MODPY_EGG_VERSION =3.5.1
DISTNAME = Sphinx-${MODPY_EGG_VERSION}
PKGNAME = py-sphinx-${MODPY_EGG_VERSION}
-REVISION = 2
CATEGORIES = textproc
@@ -21,36 +20,36 @@ FLAVOR =python3
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
+MODPY_PYTEST = Yes
RUN_DEPENDS = devel/py-babel${MODPY_FLAVOR} \
- devel/py-six${MODPY_FLAVOR} \
graphics/py-imagesize${MODPY_FLAVOR} \
textproc/py-alabaster${MODPY_FLAVOR} \
textproc/py-docutils${MODPY_FLAVOR} \
textproc/py-pygments${MODPY_FLAVOR} \
textproc/py-snowballstemmer${MODPY_FLAVOR} \
+ textproc/py-sphinxcontrib/applehelp${MODPY_FLAVOR} \
+ textproc/py-sphinxcontrib/devhelp${MODPY_FLAVOR} \
+ textproc/py-sphinxcontrib/htmlhelp${MODPY_FLAVOR} \
+ textproc/py-sphinxcontrib/jsmath${MODPY_FLAVOR} \
+ textproc/py-sphinxcontrib/qthelp${MODPY_FLAVOR} \
+
textproc/py-sphinxcontrib/serializinghtml${MODPY_FLAVOR} \
www/py-jinja2${MODPY_FLAVOR} \
www/py-requests${MODPY_FLAVOR}
-BUILD_DEPENDS =${RUN_DEPENDS}
+BUILD_DEPENDS =${RUN_DEPENDS} \
+ devel/gettext,-tools \
+ textproc/py-sphinxcontrib/websupport${MODPY_FLAVOR}
TEST_DEPENDS = devel/py-mock${MODPY_FLAVOR} \
- devel/py-nose${MODPY_FLAVOR} \
+ devel/py-html5lib${MODPY_FLAVOR} \
print/texlive/texmf,-full
+PORTHOME = ${WRKDIR}
post-build:
- cd ${WRKSRC} && ${MAKE_ENV} PYTHONPATH=${WRKSRC} \
- ${MODPY_BIN} sphinx-build.py doc doc/_build/html
-
-DOCS = ${PREFIX}/share/doc/${MODPY_PY_PREFIX}sphinx
+ cd ${WRKSRC}/doc && ${MAKE_ENV} PYTHONPATH=${WRKSRC} gmake html
+DOCS = ${PREFIX}/share/doc/${MODPY_PY_PREFIX}sphinx
post-install:
${INSTALL_DATA_DIR} ${DOCS}
cd ${WRKSRC}/doc/_build/html && pax -rw * ${DOCS}
- for i in ${PREFIX}/bin/*; do \
- mv $${i} $${i}${MODPY_BIN_SUFFIX} ;\
- done
-
-do-test:
- cd ${WRKSRC} && env SPHINX_TEST_TEMPDIR=${WRKDIR} \
- ${LOCALBASE}/bin/nosetests${MODPY_BIN_SUFFIX} --first-package-wins
.include
Index: distinfo
===
RCS file: /cvs/ports/textproc/py-sphinx/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo10 Dec 2020 02:20:31 - 1.9
+++ distinfo20 Feb 2021 15:23:39 -
@@ -1,2 +1,2 @@
-SHA256 (Sphinx-1.5.6.tar.gz) = Vlpy3TndbqLoxUjTTBJ8mB5LyurWmixFam4z72kVGs4=
-SIZE (Sphinx-1.5.6.tar.gz) = 4410607
+SHA256 (Sphinx-3.5.1.tar.gz) = EdUh54fZNywolHJRPYByd8qvsWhLM+tPCPdXTEBYk6k=
+SIZE (Sphinx-3.5.1.tar.gz) = 5905170
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/py-sphinx/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- pkg/PLIST 20 Feb 2021 13:20:18 - 1.11
+++ pkg/PLIST 20 Feb 2021 15:23:39 -
@@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.11 2021/02/20 13:20:18 sthen Exp $
-@pkgpath textproc/py-sphinx
@conflict py-sphinx-<1.5.6p0
+@pkgpath textproc/py-sphinx
bin/sphinx-apidoc
bin/sphinx-autogen
bin/sphinx-build
@@ -20,65 +20,91 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
lib/python${MODPY_VERSION}/site-packages/sphinx/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sphinx/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sphinx/${MODPY_PYCACHE}addnodes.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/sphinx/${MODPY_PYCACHE}apidoc.${MODPY_PYC_MAGIC_TAG}pyc
lib/py
Re: Update games/love to 11.3
> Hi, it compiles for me but haven't found a game that works with it.
> I guess it's too new.
The done thing in distributing love games seems to be to just require a
particular version, or nowadays stick it all in an AppImage for Linux. I
don't know if it's feasible to maintain every major version though, or
if that's even desirable, but that means some games won't be playable
without modifications.
> Multi version package (seperate port) seems the way to go,
> but it's non-trivial. Must not clash with v0.8
> See for example lang/lua/{5.1,5.2,5.3}
Thanks, I'll take a look. This might be a little over my head, but I'll
give it a try!
> I'm the one who told you to test OBJCXX=c++
> Seems the standard way would be to use
> OBJCXX="${CXX}" in the Makefile
Thanks for your help! You're 100% correct, I'll change that.
Will
[update] net/sniproxy -> 0.6.2
Hello,
net/sniproxy has numerous fixes that have been committed to the original
project but never included in a release. Amongst them, an fd leak, an
use after free, etc. The original developer doesn't seem very interested
in making releases anymore. Therefore, I forked the project and made a
release which includes all the patches. This also allows to remove all
the local OpenBSD patches within that port. I might also add some
features which are currently in the proposed pull requests.
Here is the diff, what do you think?
Thank you
Index: Makefile
===
RCS file: /cvs/ports/net/sniproxy/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile9 Feb 2021 15:06:50 - 1.2
+++ Makefile20 Feb 2021 09:34:01 -
@@ -2,15 +2,13 @@
COMMENT = name-based proxying of HTTPS without decrypting traffic
-GH_ACCOUNT = dlundquist
+GH_ACCOUNT = renaudallard
GH_PROJECT = sniproxy
-GH_TAGNAME = 0.6.0
-
-REVISION = 0
+GH_TAGNAME = 0.6.2
CATEGORIES = net
-HOMEPAGE = https://github.com/dlundquist/sniproxy
+HOMEPAGE = https://github.com/renaudallard/sniproxy
MAINTAINER = Renaud Allard
Index: distinfo
===
RCS file: /cvs/ports/net/sniproxy/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo8 Apr 2020 04:56:52 - 1.1.1.1
+++ distinfo20 Feb 2021 09:34:01 -
@@ -1,2 +1,2 @@
-SHA256 (sniproxy-0.6.0.tar.gz) = 1zx3qfqBma56xVHAMy0+Cj/yNGI/U9ZTaaj6Vg2YgOI=
-SIZE (sniproxy-0.6.0.tar.gz) = 78515
+SHA256 (sniproxy-0.6.2.tar.gz) = jz2s0OLIm3cRfYaF+1cIwjGM25WUEtpnX9xmjmZTuLY=
+SIZE (sniproxy-0.6.2.tar.gz) = 78616
Index: patches/patch-sniproxy_conf
===
RCS file: patches/patch-sniproxy_conf
diff -N patches/patch-sniproxy_conf
--- patches/patch-sniproxy_conf 8 Apr 2020 04:56:52 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-sniproxy_conf,v 1.1.1.1 2020/04/08 04:56:52 bket Exp $
-
-Index: sniproxy.conf
sniproxy.conf.orig
-+++ sniproxy.conf
-@@ -2,8 +2,8 @@
- # lines that start with # are comments
- # lines with only white space are ignored
-
--user nobody
--group nogroup
-+user _sniproxy
-+group _sniproxy
-
- # PID file, needs to be placed in directory writable by user
- pidfile /var/run/sniproxy.pid
Index: patches/patch-src_config_c
===
RCS file: patches/patch-src_config_c
diff -N patches/patch-src_config_c
--- patches/patch-src_config_c 9 Feb 2021 15:06:50 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_config_c,v 1.1 2021/02/09 15:06:50 tb Exp $
-
-Fix incorrect format string
-
-Index: src/config.c
src/config.c.orig
-+++ src/config.c
-@@ -234,7 +234,7 @@ init_config(const char *filename, struct ev_loop *loop
- err("error parsing %s at %jd near:", filename, whence);
- fseek(file, -20, SEEK_CUR);
- for (int i = 0; i < 5; i++)
--err(" %jd\t%s", ftell(file), fgets(line, sizeof(line), file));
-+err(" %ld\t%s", ftell(file), fgets(line, sizeof(line), file));
-
- free_config(config, loop);
- config = NULL;
Index: patches/patch-src_http_h
===
RCS file: patches/patch-src_http_h
diff -N patches/patch-src_http_h
--- patches/patch-src_http_h9 Feb 2021 15:06:50 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_http_h,v 1.1 2021/02/09 15:06:50 tb Exp $
-
-https://github.com/dlundquist/sniproxy/pull/349
-
-Index: src/http.h
src/http.h.orig
-+++ src/http.h
-@@ -29,6 +29,6 @@
- #include
- #include "protocol.h"
-
--const struct Protocol *const http_protocol;
-+extern const struct Protocol *const http_protocol;
-
- #endif
Index: patches/patch-src_tls_h
===
RCS file: patches/patch-src_tls_h
diff -N patches/patch-src_tls_h
--- patches/patch-src_tls_h 9 Feb 2021 15:06:50 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_tls_h,v 1.1 2021/02/09 15:06:50 tb Exp $
-
-https://github.com/dlundquist/sniproxy/pull/349
-
-Index: src/tls.h
src/tls.h.orig
-+++ src/tls.h
-@@ -28,6 +28,6 @@
-
- #include "protocol.h"
-
--const struct Protocol *const tls_protocol;
-+extern const struct Protocol *const tls_protocol;
-
- #endif
smime.p7s
Description: S/MIME Cryptographic Signature
Re: [update] lang/go to 1.16
On 21-02-20 10:39:40, Stuart Henderson wrote: > On 2021/02/20 17:53, Joel Sing wrote: > > > -MAKE_ENV += GO386=387 > > > > We'll presumably want to keep this with GO386=softfloat - otherwise the > > go binary package will only be useable on i386 CPUs with SSE support. > > Yes, it's needed for ALIX/WRAP/net5501/net4801 which still just about > work with OpenBSD (as long as you don't run anything consuming much RAM > until after reorder_kernel is done, the LLVM linker is quite greedy). Right, although you're more likely to run binary packages (hence the go.port.mk change) on such a machine, rather than the go toolchain itself (which the Makefile part should only cover). That said, I have no strong preference here :)
Re: education/gamgi: set "-fcommon", update to 0.17.3g
Klemens Nanni: > > That's a hint that it's defined in a header file that is included > > everywhere. You just need to mark it extern and copy the definition > > into a *.c file. > Right, but if I mark that symbol `extern' others now show up as well: I see. There are a lot of tables that are defined in a handful of *.c files and the declaration in the corresponding *.h files is missing an "extern". That's straightforward to fix... > I don't want to patch all of those. ... but it affects 700 variables or so. I guess -fcommon is the pragmatic solution. -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: Update games/love to 11.3
On Sat, 20 Feb 2021 09:49:11 +
"Will Luckin" wrote:
> > Have you tested love2d games that use pre-11.3 with this update? I have
> > looked at love2d updates previously and they were _not_ backwards
> > compatible. My impression was that this ports needs a multi-version
> > approach to not break applications that rely on the old version.
> > However, I haven't found an opportunity to implement this yet.
>
> There are breaking changes with every love major release, I think, so
> games written for 0.8 would need updating to work with 0.11.3. I didn't
> realise this would be a problem because OpenBSD doesn't have any other
> but 0.8 packaged currently.
>
> 0.8 is quite old, from 2012, and missing a lot of new additions to love
> so 0.11.3 is definitely preferable for new users.
>
> Do you think it would be wise to create a seperate port?
>
Hi, it compiles for me but haven't found a game that works with it.
I guess it's too new.
Multi version package (seperate port) seems the way to go,
but it's non-trivial. Must not clash with v0.8
See for example lang/lua/{5.1,5.2,5.3}
I'm the one who told you to test OBJCXX=c++
Seems the standard way would be to use
OBJCXX="${CXX}" in the Makefile
Greetings Ben
Re: [update] mpd/ncmpc/ncmpcpp
On Sat 20/02/2021 08:37, Landry Breuil wrote:
> Hi,
>
> found those were a bit outdated, changelogs at
> https://rybczak.net/ncmpcpp/
> https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.22.6/NEWS
> https://github.com/MusicPlayerDaemon/ncmpc/blob/v0.45/NEWS
>
> mpd updates from 0.21 to 0.22 because of some additions to the protocol,
> added BDEP on sphinx because the manpage isnt in the src tarball so
> needs to be generated from the rst file.
>
> Please test !
Build and (lightly) run tested on amd64. OK mpd and ncmpc
It seems that ncmpcpp does not depend on libiconv, as such remove it
from LDEP and sync WANTLIB. While here sync patches. Based on your diff:
diff --git Makefile Makefile
index 5216990772e..168e25b4b0d 100644
--- Makefile
+++ Makefile
@@ -5,8 +5,7 @@ BROKEN-hppa = bindings.h:85:4: error: type 'Binding'
is not a direct base of 'B
COMMENT = ncurses mpd client inspired by ncmpc
-DISTNAME = ncmpcpp-0.8.2
-REVISION = 1
+DISTNAME = ncmpcpp-0.9.2
EXTRACT_SUFX = .tar.bz2
@@ -17,17 +16,16 @@ HOMEPAGE = https://rybczak.net/ncmpcpp/
# GPLv2
PERMIT_PACKAGE = Yes
-WANTLIB += boost_date_time-mt boost_filesystem-mt boost_locale-mt
-WANTLIB += boost_program_options-mt boost_regex-mt boost_system-mt
-WANTLIB += boost_thread-mt c crypto curl ereadline iconv m mpdclient
-WANTLIB += curses nghttp2 pthread ssl ${LIBCXX} tag z
-WANTLIB += ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} boost_chrono-mt boost_date_time-mt
+WANTLIB += boost_filesystem-mt boost_locale-mt boost_program_options-mt
+WANTLIB += boost_regex-mt boost_system-mt boost_thread-mt c crypto
+WANTLIB += curl curses ereadline icudata icui18n icuuc m mpdclient
+WANTLIB += nghttp2 ssl tag z
MASTER_SITES = ${HOMEPAGE}stable/
LIB_DEPENDS = audio/libmpdclient>=2.4 \
audio/taglib \
- converters/libiconv \
devel/boost \
devel/readline \
net/curl
diff --git distinfo distinfo
index fd53b891b20..f1807f24c59 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (ncmpcpp-0.8.2.tar.bz2) = ZQuj6AiWJLetnkzBm8GsYCjtt1I8wRH6FobqRMCSFVQ=
-SIZE (ncmpcpp-0.8.2.tar.bz2) = 465713
+SHA256 (ncmpcpp-0.9.2.tar.bz2) = +qv2FXyMsbJKBZryduFi+p+aO5zTgQxDuRKIYMk4Ohs=
+SIZE (ncmpcpp-0.9.2.tar.bz2) = 486266
diff --git patches/patch-configure patches/patch-configure
index 8b99053d03a..b3c1b09f417 100644
--- patches/patch-configure
+++ patches/patch-configure
@@ -3,7 +3,7 @@ $OpenBSD: patch-configure,v 1.11 2018/02/11 10:37:51 dcoppa Exp
$
Index: configure
--- configure.orig
+++ configure
-@@ -19500,7 +19500,7 @@ CPPFLAGS=$boost_thread_save_CPPFLAGS
+@@ -20542,7 +20542,7 @@ CPPFLAGS=$boost_thread_save_CPPFLAGS
diff --git patches/patch-doc_ncmpcpp_1 patches/patch-doc_ncmpcpp_1
index 68e41d9c40e..949c7934e1a 100644
--- patches/patch-doc_ncmpcpp_1
+++ patches/patch-doc_ncmpcpp_1
@@ -8,7 +8,7 @@ Index: doc/ncmpcpp.1
.SH "NAME"
ncmpcpp \- An ncurses Music Player Daemon (MPD) client.
.SH "SYNOPSIS"
-@@ -298,7 +298,7 @@ Slave screen that has to be displayed at start (nothin
+@@ -325,7 +325,7 @@ Slave screen that has to be displayed at start (nothin
.TP
.B startup_slave_screen_focus = yes/no
If set to yes, slave screen will be the active one after startup. Otherwise
master screen will be.
@@ -17,11 +17,11 @@ Index: doc/ncmpcpp.1
.B locked_screen_width_part = 20-80
If you want to lock a screen, ncmpcpp asks for % of locked screen's width to
be reserved before that and provides a default value, which is the one you can
set here.
.TP
-@@ -415,7 +415,6 @@ Border color of pop-up windows. If set to 'none', no b
+@@ -445,7 +445,6 @@ Border color of pop-up windows. If set to 'none', no b
.TP
.B active_window_border = COLOR
Color of active window's border.
-.TP
.SH "BINDINGS"
- When ncmpcpp starts, it tries to read user's bindings from
~/.ncmpcpp/bindings and $XDG_CONFIG_HOME/ncmpcpp/bindings files. If no bindings
file is found, ncmpcpp uses the defaults. An example bindings file with the
default values can be found usually in /usr/share/doc/ncmpcpp (exact location
may depend on used distribution or configure prefix).
-
+ When ncmpcpp starts, it tries to read bindings from
+ $XDG_CONFIG_HOME/ncmpcpp/bindings and ~/.ncmpcpp/bindings files. If no
bindings
diff --git patches/patch-src_ncmpcpp_cpp patches/patch-src_ncmpcpp_cpp
deleted file mode 100644
index ee24f3c24c3..000
--- patches/patch-src_ncmpcpp_cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-$OpenBSD: patch-src_ncmpcpp_cpp,v 1.13 2017/06/09 15:09:51 dcoppa Exp $
-
-OpenBSD lacks sigignore(), use the one from NetBSD
-
-Index: src/ncmpcpp.cpp
src/ncmpcpp.cpp.orig
-+++ src/ncmpcpp.cpp
-@@ -68,6 +68,18 @@ void sighandler(int sig)
- #endif // __sun && __SVR4
- }
-
-+int n_sigignore(int sig)
-+{
-+ struct sigaction sa;
-+
-+ sa.sa_handler
Re: Update games/love to 11.3
> Have you tested love2d games that use pre-11.3 with this update? I have > looked at love2d updates previously and they were _not_ backwards > compatible. My impression was that this ports needs a multi-version > approach to not break applications that rely on the old version. > However, I haven't found an opportunity to implement this yet. There are breaking changes with every love major release, I think, so games written for 0.8 would need updating to work with 0.11.3. I didn't realise this would be a problem because OpenBSD doesn't have any other but 0.8 packaged currently. 0.8 is quite old, from 2012, and missing a lot of new additions to love so 0.11.3 is definitely preferable for new users. Do you think it would be wise to create a seperate port?
Re: [update] lang/go to 1.16
On 2021/02/20 17:53, Joel Sing wrote: > > -MAKE_ENV +=GO386=387 > > We'll presumably want to keep this with GO386=softfloat - otherwise the > go binary package will only be useable on i386 CPUs with SSE support. Yes, it's needed for ALIX/WRAP/net5501/net4801 which still just about work with OpenBSD (as long as you don't run anything consuming much RAM until after reorder_kernel is done, the LLVM linker is quite greedy).
