maintainer update: net/swirc 3.2.7 -> 3.3.0
Hi ports@, Swirc 3.3.0 out ## [3.3.0] - 2021-06-27 ## - **Added** function `errdesc_by_last_err()` and made use of it - **Added** key F3 (scroll nicklist up) and F4 (scroll nicklist down) - **Added** new modes and options for TLS/SSL connections - **Added** nicklist - **Added** null checks - **Added** preprogrammed network name [libera](https://libera.chat/) - **Added** support for partial writes in `net_ssl_send()` - **Added** theme item `nicklist_nick_color` - **Added** theme item `nicklist_privilege_color` - **Added** theme item `nicklist_vline_color` - Asserted that the program is terminated correctly - **Defined** and made use of `addrof()` - **Defined** and made use of `g_textdeco_chars` - Deleted `ToastActivator_i.c` - Deleted `ToastActivator_p.c` - Deleted `dlldata.c` - Deleted command `/n` - Explicitly set client mode for TLS/SSL connections - **Fixed** "use after free" bug in `/cycle` - **Fixed** a bug in `/quit` that resulted in SIGPIPE due to calling `SSL_shutdown()` on an already shutdown socket. - **Fixed** the behavior of `net_ssl_recv()` by checking the condition of `SSL_pending()`. - **Fixed** unchecked return values - Made improvements to the following files: - `io-loop.c` - `irc.c` - `network-openssl.c` - `network.cpp` - `pthrMutex.c` - `readline.c` - `readlineAPI.c` - `sig-unix.c` - `sig-w32.c` - `vcMutex.c` - `window.c` - Modified the scrolling behavior - Moved defines - Reformatted and reindented files - Renamed functions and patterns - **Rewrote the printtext module in C++ and made multiple improvements**! - Upgraded to: - [Curl](https://curl.se/) 7.77.0 - [LibreSSL](https://www.libressl.org/) 3.3.3 I attach a diff. Markus ? patches Index: Makefile === RCS file: /cvs/ports/net/swirc/Makefile,v retrieving revision 1.11 diff -u -p -r1.11 Makefile --- Makefile 14 Mar 2021 11:31:40 - 1.11 +++ Makefile 28 Jun 2021 23:26:52 - @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.11 2021/03/14 11:31:40 solene Exp $ COMMENT = curses icb and irc client -DISTNAME = swirc-3.2.7 +DISTNAME = swirc-3.3.0 CATEGORIES = net HOMEPAGE = https://www.nifty-networks.net/swirc/ Index: distinfo === RCS file: /cvs/ports/net/swirc/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- distinfo 14 Mar 2021 11:31:40 - 1.10 +++ distinfo 28 Jun 2021 23:26:52 - @@ -1,2 +1,2 @@ -SHA256 (swirc-3.2.7.tgz) = ZMrWx8vypccHN8Va0wwU2ZT8bYTbGe3LHIOWJBTXCZo= -SIZE (swirc-3.2.7.tgz) = 248669 +SHA256 (swirc-3.3.0.tgz) = T6rhCrPgjVRPU3fHupTYbX1sOkx55BsRsbhk+qsOV2Q= +SIZE (swirc-3.3.0.tgz) = 249498
[update] emulators/mednafen-1.27.1
Hi,
This new release drops dependency on libsndfile and instead uses libFLAC,
additionally I also removed a few libs from WANTLIB according to
`make lib-depends-check' and changelog is available on $HOMEPAGE.
Only tested on amd64, does it work on other archs? OK to commit?
Index: Makefile
===
RCS file: /cvs/ports/emulators/mednafen/Makefile,v
retrieving revision 1.31
diff -u -p -u -r1.31 Makefile
--- Makefile20 Nov 2020 23:39:02 - 1.31
+++ Makefile28 Jun 2021 08:42:49 -
@@ -3,7 +3,7 @@
BROKEN-hppa = ../../include/mednafen/state.h:21:7: error: 'exception_ptr' in
namespace 'std' does not name a type
COMMENT = emulates numerous game consoles
-DISTNAME = mednafen-1.26.1
+DISTNAME = mednafen-1.27.1
CATEGORIES = emulators games
HOMEPAGE = https://mednafen.github.io
@@ -16,13 +16,12 @@ PERMIT_PACKAGE =Yes
MASTER_SITES = ${HOMEPAGE}/releases/files/
EXTRACT_SUFX = .tar.xz
-WANTLIB += SDL2 c iconv intl m pthread sndfile sndio usbhid z
-WANTLIB += FLAC ogg samplerate vorbis vorbisenc ${COMPILER_LIBCXX}
+WANTLIB += FLAC SDL2 c iconv intl m pthread z ${COMPILER_LIBCXX}
USE_GMAKE =Yes
COMPILER = base-clang ports-gcc
-LIB_DEPENDS = audio/libsndfile \
+LIB_DEPENDS = audio/flac \
devel/gettext,-runtime \
devel/sdl2
Index: distinfo
===
RCS file: /cvs/ports/emulators/mednafen/distinfo,v
retrieving revision 1.15
diff -u -p -u -r1.15 distinfo
--- distinfo20 Nov 2020 23:39:02 - 1.15
+++ distinfo28 Jun 2021 08:42:49 -
@@ -1,2 +1,2 @@
-SHA256 (mednafen-1.26.1.tar.xz) = hCkHwlxCksm6SXycuSKcfRDgTiLLR0DRVKtpDmWH/fQ=
-SIZE (mednafen-1.26.1.tar.xz) = 3319756
+SHA256 (mednafen-1.27.1.tar.xz) = 86ibLzL0DDIyWTgI0F4MIcvfRDaIrOBMnCfkz01ZVfs=
+SIZE (mednafen-1.27.1.tar.xz) = 3363540
Re: UPDATE: sqlite2mdoc 0.1.4 -> 0.1.10
On Mon, Jun 28, 2021 at 10:29:16AM -0400, Kristaps Dzonsons wrote: > I didn't realise I was the MAINTAINER of this... updating to the newest > release, 0.1.10. Since 0.1.4, sqlite2mdoc has iteratively cleaned up the > mdoc(7) generated from sqlite3.h. > > This also turns on the regression test. OK kn
Re: Convenience changes for Go
On Wed, Jun 23, 2021 at 07:48:01AM -0600, Aaron Bieber wrote:
> Hi,
>
> Here is a diff that adds:
>
> - -trimpath to MODGO_FLAGS: This removes paths like
>"/build/pobj/blablablablbal" from the resulting binary.
> - Teaches modgo-gen-modules-helper how to pass a version to the
>get_dist_info stuff.
> - Adds a new make target: "modgo-gen-current-modules". This will
>generate the MODGO_ bits for the currently defined
>MODGO_MODNAME. (existing target generates them for what ever Go
>things the latest version of a MODGO_MODNAME is).
>
> The -trimpath is mostly cosmetic, but it also gets us a bit closer to
> "reproducible builds". This would potentially let us produce the same
> binaries that an upstream does for releases (assuming build flags and
> '-X' things are all the same).
>
> The new target lets one bump a port to an explicit version (i.e. not the
> latest, or a latest that has not yet propagated through the Go module
> ecosystem).
>
> Thoughts? Cluesticks? OKs?
>
> Cheers,
> Aaron
>
> diff ad22f1f0930c176e1bc87c0d5537a6033669c23a /usr/ports
> blob - 60b84fb0ae310786ee5c71a2e4e4e741f0904da9
> file + infrastructure/bin/modgo-gen-modules-helper
> --- infrastructure/bin/modgo-gen-modules-helper
> +++ infrastructure/bin/modgo-gen-modules-helper
> @@ -31,7 +31,8 @@ use lib ( "$portdir/infrastructure/lib", "$FindBin::Bi
>
> use OpenBSD::PortGen::Port::Go;
>
> -my ( $module ) = @ARGV;
> +my ( $module, $version ) = @ARGV;
> +$module = "${module}\@${version}" if ($version ne "");
>
> my $port = OpenBSD::PortGen::Port::Go->new;
> my $portinfo = $port->get_dist_info($module);
> blob - 924c64a51696a59fd6dc5456b1f3f7abda7e38d6
> file + lang/go/go.port.mk
That part looks wrong.
I expect that having one single parameter will complain loudly about
$version being undefined.
You want to distinguish between 1 parameter and two.
So probably
die if @ARGV < 1;
my $module = shift;
if (@ARGV == 1) {
$module .= '@'. shift;
}
or something like that.
(comparing version with "" opens all kinds of issues.
Note that *all* portgen stuff should have
"use strict;"
near use warnings.
Re: make documentation
On Sun, Jun 27, 2021 at 12:40:21PM +1000, Reuben ua Bríġ wrote: > i would like to prefix this by saying i am writing this as a user > giving feedback and not a developing giving patches and anyone who has > a problem with that can go shove it rather than telling me to shut up. > > i noticed for a lot of the ports to openbsd, even in base, a lot of > documentation is either missing or, how shall i put it, over-compiled. > > some examples in my memory are: > > texlive* installs e.g. PDF documenation and removes TeX sources, even > though in many cases the TeX sources are an integral part of the > documentation. > > man-pages-posix installs cat files rather than man files. (b.t.w. the > man tools do work with section 0, you just need change the file > extension: i would suggest .3p for compatibility with current section.) > > anyway i think users would benefit from including more documentation > when it is in the sources, but, you know, its your time, so dont do it > if you dont want, just dont be prissy about it. > > TeXlive is already problematic enough to package properly, it is huge and each new release takes some hand-holding. Plus, it's the largest packages we ship. If you really need the source, I suggest you just grab the distfiles and per-use them... or open some kind of bug-report with the guys who actually ship TeXlive. Specifically: out of the (literally) thousands of pdf files we ship, there are probably some TeX source that should go along with it, but there's no way we're shipping them all, and there's no way we're sorting through them by hand !
[update] games/hyperrogue 11.3o -> 12.0b
Hi,
I heard that a new Hyperrogue version came out, so i wanted to see if
segfaults at build time on macppc were fixed. They're not, sadly.
The changelog is very long to read [0]. What impacts us the most is that
upstream changed their build system to a simple Makefile, but this
makes things harder for us. It also requires GNU make now.
Most of the port changes come straight from FreeBSD, adapted for our
infrastructure.
Port changes:
- Drop all autotools things, and move CONFIGURE_* to MAKE_*. I
preferred to put CXXFLAGS and LDFLAGS out of MAKE_ENV, mostly
because CXXFLAGS is now too long to fit nicely.
- Add HYPERPATH to CXXFLAGS, so resources are properly found.
- Bring back GLEW and PNG support, they're off by default.
- Add a patch from FreeBSD [1] to remove all hardcoded optimisations.
They're shipping 12.0a so i had to remove more of them. Also
add a consistent flags set for clang and ports-gcc.
- The Makefile has no install target, so i've made our own. PLIST
diff seems happy with it, so this looks correct to me. Maybe
there is a less naive way to do so :)
Testing:
On amd64, it builds and works fine with amdgpu (RX560).
On macppc, langen still segfaults. Upstream's Makefile allows easily to
build it with custom CXXFLAGS, so i tried -O{0,1} to no avail.
Comments/feedback are welcome,
Charlène.
[0]
https://github.com/zenorogue/hyperrogue/blob/master/changelog.txt#L3997
[1]
https://github.com/freebsd/freebsd-ports/blob/main/games/hyperrogue/files/patch-Makefile
Index: Makefile
===
RCS file: /cvs/ports/games/hyperrogue/Makefile,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 Makefile
--- Makefile28 Jun 2020 02:37:25 - 1.16
+++ Makefile29 Jun 2021 16:28:21 -
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.16 2020/06/28 02:37:25 bcallah Exp $
-V =11.3o
+V =12.0b
COMMENT = roguelike game in a non-Euclidean world
CATEGORIES = games x11
@@ -20,26 +20,40 @@ WANTLIB += c m png z
# C++11
COMPILER = base-clang ports-gcc
-BUILD_DEPENDS =${MODGNU_AUTOCONF_DEPENDS} \
- ${MODGNU_AUTOMAKE_DEPENDS}
-
LIB_DEPENDS = devel/sdl-gfx \
devel/sdl-mixer \
devel/sdl-ttf \
graphics/glew \
graphics/png
-CONFIGURE_STYLE = autoreconf
-CONFIGURE_ENV =CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include
-I${X11BASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-MAKE_FLAGS = CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS} -std=c++11"
-
-AUTOCONF_VERSION = 2.69
-AUTOMAKE_VERSION = 1.16
-
-# Correct version number
-pre-configure:
- sed -i 's,10.4i,${V},g' ${WRKSRC}/configure.ac
+CXXFLAGS +=-I${LOCALBASE}/include -I${X11BASE}/include \
+ -DHYPERPATH="\\\"${LOCALBASE}/share/hyperrogue/\\\""
+LDFLAGS += -L${LOCALBASE}/lib -L${X11BASE}/lib
+
+MAKE_ENV +=CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+ LDFLAGS="${LDFLAGS}" CXX="${CXX}" \
+ HYPERROGUE_USE_GLEW=1 \
+ HYPERROGUE_USE_PNG=1
+
+USE_GMAKE =Yes
+ALL_TARGET = hyperrogue
+
+# There is no install target
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/hyperrogue ${PREFIX}/bin
+
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/hyperrogue
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/hyperrogue/sounds
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/hyperrogue/music
+
+ ${INSTALL_DATA} ${WRKSRC}/*.ttf \
+ ${WRKSRC}/*.dat \
+ ${WRKSRC}/hyperrogue-music.txt \
+ ${PREFIX}/share/hyperrogue
+ ${INSTALL_DATA} ${WRKSRC}/sounds/* ${PREFIX}/share/hyperrogue/sounds
+ ${INSTALL_DATA} ${WRKSRC}/music/* ${PREFIX}/share/hyperrogue/music
+
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/hyperrogue
+ ${INSTALL_DATA} ${WRKSRC}/README.md ${PREFIX}/share/doc/hyperrogue
.include
Index: distinfo
===
RCS file: /cvs/ports/games/hyperrogue/distinfo,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 distinfo
--- distinfo28 Jun 2020 02:37:25 - 1.13
+++ distinfo29 Jun 2021 16:28:21 -
@@ -1,2 +1,2 @@
-SHA256 (hyperrogue-11.3o.tar.gz) = y8luUVxGjuvwGEzu1SRLUoZLv5sOhEaUAaNime0kdQs=
-SIZE (hyperrogue-11.3o.tar.gz) = 69246164
+SHA256 (hyperrogue-12.0b.tar.gz) = v6el52DKYSfIwlOlUdpEoW+PQXabJF3B4YRVARavV5w=
+SIZE (hyperrogue-12.0b.tar.gz) = 79894443
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile 29 Jun 2021 16:28:21 -
@@ -0,0 +1,94 @@
+$OpenBSD$
+
+Remove hardcoded optimisation flags and -Werror, add a consistent
+flag set for clang and ports-gcc
+
+Index: Makefile
+--- Make
Re: [update] games/hyperrogue 11.3o -> 12.0b
Hi Charlene -- On 06/29/2021 12:42 PM, Charlene Wendling wrote: Hi, I heard that a new Hyperrogue version came out, so i wanted to see if segfaults at build time on macppc were fixed. They're not, sadly. Thank you for doing the heavy lifting on this. One small nit, NO_TEST=Yes seems to be needed. OK for me with that. ~Brian
NEW: games/tic80
Hi ports -- Attached is a new port, TIC-80. TIC-80 is a fantasy computer to make, play and share tiny games. For those of you familiar with PICO-8, TIC-80 is an open source alternative. --- pkg/DESCR: TIC-80 is a fantasy computer for making, playing and sharing tiny games. There are built-in tools for development: code, sprites, maps, sound editors and the command line, which is enough to create a mini retro game. You will get a cartridge file, which can be stored and played locally, or uploaded to the TIC-80 website to be shared and played online. Also, the game can be packed into a player that works on all popular platforms and distributed as you wish. To make a retro styled game the whole process of creation takes place under some technical limitations: 240x136 pixel display, 16 color palette, 256 8x8 color sprites and 4 channel sound. --- I did a good bit of massaging to make the TIC-80 build more suitable for ports. First, upstream does not appear to offer their own source tarballs, relying on GitHub auto-generated tarballs. Unfortunately, TIC-80 also insists on building all its direct dependencies, and expects those direct dependencies to be a part of the build tree, none of which you get with the auto-generated tarball. Because of this, I made my own source tarball that includes the dependencies we need. Second, I have chosen to use the ports versions of all the direct dependencies that are available in ports. This is similar to what I did with HandBrake. I have not experienced any issues with doing this, and I think that it overall makes TIC-80 fit better in the ports tree. So the tarball I made with contains TIC-80 and only the dependencies not already available in ports. Third, I chose to build the "PRO" version rather than the normal version. It offers a few more features, and appears to be donations requested not donations required. And in any event, the one additional source file compiled for PRO mode is licensed under the same MIT license as the rest of TIC-80. The AUR package also builds the PRO version. TIC-80 works well for me on amd64. I am interested in hearing about big endian systems. OK? ~Brian tic80.tgz Description: GNU Zip compressed data
Re: NEW: games/tic80
On Tue, 29 Jun 2021 17:54:56 +
Brian Callahan wrote:
> Hi ports --
>
> Attached is a new port, TIC-80. TIC-80 is a fantasy computer to make,
> play and share tiny games.
> For those of you familiar with PICO-8, TIC-80 is an open source
> alternative.
[...]
> TIC-80 works well for me on amd64. I am interested in hearing about
> big endian systems.
I've tested on macppc.
It builds but does not work. There is no sound, the welcome
screen is red, carts either segfault or display a white window.
Big endian support has been refused upstream [0], the code has
never been written to do so and would need a major refactoring to
make things maintainable. The PR code is interesting to fix
similar issues in other ports though.
Meanwhile, it builds and works fine on amd64, testing in an
empty chroot revealed no missing depends.
> OK?
OK cwen@, but as you probably guessed with NOT_FOR_ARCHS=${BE_ARCHS}
> ~Brian
[0] https://github.com/nesbox/TIC-80/pull/1057/
Re: [update] games/hyperrogue 11.3o -> 12.0b
On Tue, 29 Jun 2021 17:28:19 +
Brian Callahan wrote:
> Hi Charlene --
>
> On 06/29/2021 12:42 PM, Charlene Wendling wrote:
> > Hi,
> >
> > I heard that a new Hyperrogue version came out, so i wanted to see
> > if segfaults at build time on macppc were fixed. They're not, sadly.
> >
>
> Thank you for doing the heavy lifting on this.
> One small nit, NO_TEST=Yes seems to be needed.
Oh, you're right, i'm always confused with that one.
Here is a fixed diff below if more people want to try.
> OK for me with that.
>
> ~Brian
>
Index: Makefile
===
RCS file: /cvs/ports/games/hyperrogue/Makefile,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 Makefile
--- Makefile28 Jun 2020 02:37:25 - 1.16
+++ Makefile29 Jun 2021 19:24:58 -
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.16 2020/06/28 02:37:25 bcallah Exp $
-V =11.3o
+V =12.0b
COMMENT = roguelike game in a non-Euclidean world
CATEGORIES = games x11
@@ -20,26 +20,41 @@ WANTLIB += c m png z
# C++11
COMPILER = base-clang ports-gcc
-BUILD_DEPENDS =${MODGNU_AUTOCONF_DEPENDS} \
- ${MODGNU_AUTOMAKE_DEPENDS}
-
LIB_DEPENDS = devel/sdl-gfx \
devel/sdl-mixer \
devel/sdl-ttf \
graphics/glew \
graphics/png
-CONFIGURE_STYLE = autoreconf
-CONFIGURE_ENV =CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include
-I${X11BASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-MAKE_FLAGS = CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS} -std=c++11"
-
-AUTOCONF_VERSION = 2.69
-AUTOMAKE_VERSION = 1.16
-
-# Correct version number
-pre-configure:
- sed -i 's,10.4i,${V},g' ${WRKSRC}/configure.ac
+CXXFLAGS +=-I${LOCALBASE}/include -I${X11BASE}/include \
+ -DHYPERPATH="\\\"${LOCALBASE}/share/hyperrogue/\\\""
+LDFLAGS += -L${LOCALBASE}/lib -L${X11BASE}/lib
+
+MAKE_ENV +=CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+ LDFLAGS="${LDFLAGS}" CXX="${CXX}" \
+ HYPERROGUE_USE_GLEW=1 \
+ HYPERROGUE_USE_PNG=1
+
+USE_GMAKE =Yes
+NO_TEST = Yes
+ALL_TARGET = hyperrogue
+
+# There is no install target
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/hyperrogue ${PREFIX}/bin
+
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/hyperrogue
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/hyperrogue/sounds
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/hyperrogue/music
+
+ ${INSTALL_DATA} ${WRKSRC}/*.ttf \
+ ${WRKSRC}/*.dat \
+ ${WRKSRC}/hyperrogue-music.txt \
+ ${PREFIX}/share/hyperrogue
+ ${INSTALL_DATA} ${WRKSRC}/sounds/* ${PREFIX}/share/hyperrogue/sounds
+ ${INSTALL_DATA} ${WRKSRC}/music/* ${PREFIX}/share/hyperrogue/music
+
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/hyperrogue
+ ${INSTALL_DATA} ${WRKSRC}/README.md ${PREFIX}/share/doc/hyperrogue
.include
Index: distinfo
===
RCS file: /cvs/ports/games/hyperrogue/distinfo,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 distinfo
--- distinfo28 Jun 2020 02:37:25 - 1.13
+++ distinfo29 Jun 2021 19:24:58 -
@@ -1,2 +1,2 @@
-SHA256 (hyperrogue-11.3o.tar.gz) = y8luUVxGjuvwGEzu1SRLUoZLv5sOhEaUAaNime0kdQs=
-SIZE (hyperrogue-11.3o.tar.gz) = 69246164
+SHA256 (hyperrogue-12.0b.tar.gz) = v6el52DKYSfIwlOlUdpEoW+PQXabJF3B4YRVARavV5w=
+SIZE (hyperrogue-12.0b.tar.gz) = 79894443
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile 29 Jun 2021 19:24:58 -
@@ -0,0 +1,94 @@
+$OpenBSD$
+
+Remove hardcoded optimisation flags and -Werror, add a consistent
+flag set for clang and ports-gcc
+
+Index: Makefile
+--- Makefile.orig
Makefile
+@@ -42,7 +42,6 @@ endif
+ ## Begin customization points for each OS and TOOLCHAIN we support.
+
+
+-ifeq (${OS},linux)
+ CXXFLAGS_EARLY += -DLINUX
+ EXE_EXTENSION :=
+ LDFLAGS_GL := -lGL
+@@ -51,7 +50,6 @@ ifeq (${OS},linux)
+ LDFLAGS_SDL := -lSDL -lSDL_gfx -lSDL_mixer -lSDL_ttf -lpthread -lz
+ OBJ_EXTENSION := .o
+ hyper_RES :=
+-endif
+
+ ifeq (${OS},mingw)
+ CXXFLAGS_EARLY += -DWINDOWS -mwindows -D_A_VOLID=8
+@@ -79,28 +77,11 @@ ifeq (${OS},osx)
+ hyper_RES :=
+ endif
+
+-ifeq (${TOOLCHAIN},clang)
+- CXXFLAGS_STD = -std=c++11
+- CXXFLAGS_EARLY += -march=native -fPIC
+- CXXFLAGS_EARLY += -W -Wall -Wextra -Werror -pedantic
+- CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough
-Wno-maybe-uninitialized -Wno-unknown-warning-option
+-endif
++CXXFLAGS_STD = -std=c++11
++CXXFLAGS_EARLY += -fPIC
++CXXFLAGS_EARLY += -W -Wall -Wextra -pedantic
++CXXFLAGS_EARLY += -Wno-unused-parameter -
boehm-gc : riscv64 support
Hi, the patch below adds support for OpenBSD/riscv64 to boehm-gc. All tests pass: make check-TESTS PASS: cordtest PASS: gctest PASS: leaktest PASS: middletest PASS: smashtest PASS: hugetest PASS: realloc_test PASS: staticrootstest PASS: test_atomic_ops PASS: threadleaktest PASS: threadkey_test PASS: subthreadcreate_test PASS: initsecondarythread_test PASS: test_cpp PASS: disclaim_test PASS: disclaim_bench PASS: disclaim_weakmap_test Testsuite summary for gc 8.0.4 # TOTAL: 17 # PASS: 17 # SKIP: 0 # XFAIL: 0 # FAIL: 0 # XPASS: 0 # ERROR: 0 ok ? Index: patches/patch-include_private_gcconfig_h === RCS file: /cvs/OpenBSD/ports/devel/boehm-gc/patches/patch-include_private_gcconfig_h,v retrieving revision 1.24 diff -u -p -u -r1.24 patch-include_private_gcconfig_h --- patches/patch-include_private_gcconfig_h5 Feb 2021 18:37:48 - 1.24 +++ patches/patch-include_private_gcconfig_h29 Jun 2021 20:10:45 - @@ -30,6 +30,15 @@ Index: include/private/gcconfig.h # if defined(OPENBSD) && defined(__sh__) #define SH #define mach_type_known +@@ -670,7 +675,7 @@ EXTERN_C_BEGIN + # endif + # define mach_type_known + # endif +-# if defined(__riscv) && defined(LINUX) ++# if defined(__riscv) && (defined(LINUX) || defined(OPENBSD)) + # define RISCV + # define mach_type_known + # endif @@ -1076,7 +1081,12 @@ EXTERN_C_BEGIN # endif # ifdef OPENBSD @@ -99,7 +108,33 @@ Index: include/private/gcconfig.h # ifndef GC_OPENBSD_THREADS EXTERN_C_END # include -@@ -2906,6 +2926,8 @@ EXTERN_C_BEGIN +@@ -2884,6 +2904,25 @@ EXTERN_C_BEGIN + # define LINUX_STACKBOTTOM + # define DYNAMIC_LOADING + # endif ++# ifdef OPENBSD ++# define OS_TYPE "OPENBSD" ++# ifndef GC_OPENBSD_THREADS ++EXTERN_C_END ++# include ++# include ++EXTERN_C_BEGIN ++# ifdef USRSTACK ++# define STACKBOTTOM ((ptr_t)USRSTACK) ++# else ++# define HEURISTIC2 ++# endif ++# endif ++ extern int __data_start[]; ++# define DATASTART ((ptr_t)__data_start) ++ extern int _end[]; ++# define DATAEND ((ptr_t)(&_end)) ++# define DYNAMIC_LOADING ++# endif + # endif /* RISCV */ + + #if defined(__GLIBC__) && !defined(DONT_USE_LIBC_PRIVATES) +@@ -2906,6 +2945,8 @@ EXTERN_C_BEGIN #elif defined(LINUX) && defined(USE_MMAP) /* The kernel may do a somewhat better job merging mappings etc.*/ /* with anonymous mappings. */ -- Matthieu Herrb
Re: UPDATE misc/gpsd
On Sat, June 26, 2021 12:33, Landry Breuil wrote: > Le Thu, Jun 24, 2021 at 11:02:04AM +0300, Kirill Bychkov a ?crit : >> On Sun, June 6, 2021 21:24, Kirill Bychkov wrote: >> > On Sun, May 23, 2021 20:48, Kirill Bychkov wrote: >> >> On Fri, May 14, 2021 13:15, Kirill Bychkov wrote: >> >>> Hi ports@, >> >>> Attached is an update to gpsd. All consumers seems to be happy with it. >> >>> OK? Comments? >> >> >> >> Ping. >> >> >> >> >> > Ping >> >> Anyone? > > Reads good, but shouldnt patches/patch-SConstruct be also removed if the > file was moved upstream to SConscript ? > > Landry Yep. Missed cvs rm. Also reported by solene@ Fixed diff attached. > gpsd-3.22.diff Description: Binary data
UPDATE: graphics/feh 3.6.3 => 3.7
Hi ports -- Attached is an update to feh. Changelog is here: https://feh.finalrewind.org/archive/3.7/ Everything is good on amd64. Big endian tests appreciated. OK? ~Brian Index: Makefile === RCS file: /cvs/ports/graphics/feh/Makefile,v retrieving revision 1.105 diff -u -p -r1.105 Makefile --- Makefile 13 Feb 2021 15:07:08 - 1.105 +++ Makefile 28 Jun 2021 16:04:42 - @@ -2,7 +2,7 @@ COMMENT= lightweight image viewer -DISTNAME= feh-3.6.3 +DISTNAME= feh-3.7 EXTRACT_SUFX= .tar.bz2 CATEGORIES= graphics FIX_EXTRACT_PERMISSIONS=Yes Index: distinfo === RCS file: /cvs/ports/graphics/feh/distinfo,v retrieving revision 1.67 diff -u -p -r1.67 distinfo --- distinfo 13 Feb 2021 15:07:08 - 1.67 +++ distinfo 28 Jun 2021 16:04:42 - @@ -1,2 +1,2 @@ -SHA256 (feh-3.6.3.tar.bz2) = Q3Qg838RYU4AjQZuKjve/Px4FEyCEpmLK6zdXSHqI7Q= -SIZE (feh-3.6.3.tar.bz2) = 2116771 +SHA256 (feh-3.7.tar.bz2) = B82xB2w7d3cGTPCB9yI0ZgCu7+tWjLylhXV3eWmmu0E= +SIZE (feh-3.7.tar.bz2) = 2118355 Index: patches/patch-man_feh_pre === RCS file: /cvs/ports/graphics/feh/patches/patch-man_feh_pre,v retrieving revision 1.51 diff -u -p -r1.51 patch-man_feh_pre --- patches/patch-man_feh_pre 13 Feb 2021 15:07:08 - 1.51 +++ patches/patch-man_feh_pre 28 Jun 2021 16:04:42 - @@ -2,7 +2,7 @@ $OpenBSD: patch-man_feh_pre,v 1.51 2021/ Index: man/feh.pre --- man/feh.pre.orig +++ man/feh.pre -@@ -1347,7 +1347,7 @@ which +@@ -1376,7 +1376,7 @@ which defaults to .Pa ~/.config/feh/ . If the files are not found in that directory, it will also try Index: patches/patch-src_getopt_c === RCS file: patches/patch-src_getopt_c diff -N patches/patch-src_getopt_c --- patches/patch-src_getopt_c 9 Sep 2011 09:51:43 - 1.2 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_getopt_c,v 1.2 2011/09/09 09:51:43 dcoppa Exp $ - -missing header - src/getopt.c.orig Wed Jul 7 11:40:32 2010 -+++ src/getopt.c Wed Jul 7 11:40:47 2010 -@@ -36,6 +36,7 @@ - #endif - - #include -+#include - - /* Comment out all this code if we are using the GNU C Library, and are not -actually compiling the library itself. This code is part of the GNU C Index: patches/patch-src_options_c === RCS file: /cvs/ports/graphics/feh/patches/patch-src_options_c,v retrieving revision 1.16 diff -u -p -r1.16 patch-src_options_c --- patches/patch-src_options_c 13 Apr 2020 18:46:02 - 1.16 +++ patches/patch-src_options_c 28 Jun 2021 16:04:42 - @@ -2,7 +2,7 @@ $OpenBSD: patch-src_options_c,v 1.16 202 Index: src/options.c --- src/options.c.orig +++ src/options.c -@@ -162,7 +162,7 @@ static void feh_load_options_for_theme(char *theme) +@@ -164,7 +164,7 @@ static void feh_load_options_for_theme(char *theme) free(oldrcpath);
Re: boehm-gc : riscv64 support
On Tue, Jun 29 2021, Matthieu Herrb wrote: > Hi, > > the patch below adds support for OpenBSD/riscv64 to boehm-gc. All > tests pass: > > make check-TESTS > PASS: cordtest > PASS: gctest > PASS: leaktest > PASS: middletest > PASS: smashtest > PASS: hugetest > PASS: realloc_test > PASS: staticrootstest > PASS: test_atomic_ops > PASS: threadleaktest > PASS: threadkey_test > PASS: subthreadcreate_test > PASS: initsecondarythread_test > PASS: test_cpp > PASS: disclaim_test > PASS: disclaim_bench > PASS: disclaim_weakmap_test > > Testsuite summary for gc 8.0.4 > > # TOTAL: 17 > # PASS: 17 > # SKIP: 0 > # XFAIL: 0 > # FAIL: 0 > # XPASS: 0 > # ERROR: 0 > > > ok ? Looks similar to the glue needed for aarch64 or powerprc64, ok jca@ > Index: patches/patch-include_private_gcconfig_h > === > RCS file: > /cvs/OpenBSD/ports/devel/boehm-gc/patches/patch-include_private_gcconfig_h,v > retrieving revision 1.24 > diff -u -p -u -r1.24 patch-include_private_gcconfig_h > --- patches/patch-include_private_gcconfig_h 5 Feb 2021 18:37:48 - > 1.24 > +++ patches/patch-include_private_gcconfig_h 29 Jun 2021 20:10:45 - > @@ -30,6 +30,15 @@ Index: include/private/gcconfig.h > # if defined(OPENBSD) && defined(__sh__) > #define SH > #define mach_type_known > +@@ -670,7 +675,7 @@ EXTERN_C_BEGIN > + # endif > + # define mach_type_known > + # endif > +-# if defined(__riscv) && defined(LINUX) > ++# if defined(__riscv) && (defined(LINUX) || defined(OPENBSD)) > + # define RISCV > + # define mach_type_known > + # endif > @@ -1076,7 +1081,12 @@ EXTERN_C_BEGIN > # endif > # ifdef OPENBSD > @@ -99,7 +108,33 @@ Index: include/private/gcconfig.h > # ifndef GC_OPENBSD_THREADS > EXTERN_C_END > # include > -@@ -2906,6 +2926,8 @@ EXTERN_C_BEGIN > +@@ -2884,6 +2904,25 @@ EXTERN_C_BEGIN > + # define LINUX_STACKBOTTOM > + # define DYNAMIC_LOADING > + # endif > ++# ifdef OPENBSD > ++# define OS_TYPE "OPENBSD" > ++# ifndef GC_OPENBSD_THREADS > ++EXTERN_C_END > ++# include > ++# include > ++EXTERN_C_BEGIN > ++# ifdef USRSTACK > ++# define STACKBOTTOM ((ptr_t)USRSTACK) > ++# else > ++# define HEURISTIC2 > ++# endif > ++# endif > ++ extern int __data_start[]; > ++# define DATASTART ((ptr_t)__data_start) > ++ extern int _end[]; > ++# define DATAEND ((ptr_t)(&_end)) > ++# define DYNAMIC_LOADING > ++# endif > + # endif /* RISCV */ > + > + #if defined(__GLIBC__) && !defined(DONT_USE_LIBC_PRIVATES) > +@@ -2906,6 +2945,8 @@ EXTERN_C_BEGIN > #elif defined(LINUX) && defined(USE_MMAP) > /* The kernel may do a somewhat better job merging mappings etc.*/ > /* with anonymous mappings. */ -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
