Fix x11/remmina -fno-common from upstream

[Greg Steuck]

With this remmina still starts. I don't use it, so haven't tested any further.

OK?

>From 186c110fb0d4e38902631e5f1ec81d0d7e82a9a1 Mon Sep 17 00:00:00 2001
From: Greg Steuck 
Date: Thu, 4 Feb 2021 22:18:59 -0800
Subject: [PATCH] Fix x11/remmina -fno-common from upstream

---
 x11/remmina/patches/patch-src_remmina_stats_c | 27 +++
 1 file changed, 27 insertions(+)
 create mode 100644 x11/remmina/patches/patch-src_remmina_stats_c

diff --git x11/remmina/patches/patch-src_remmina_stats_c 
x11/remmina/patches/patch-src_remmina_stats_c
new file mode 100644
index 000..16ede22637d
--- /dev/null
+++ x11/remmina/patches/patch-src_remmina_stats_c
@@ -0,0 +1,27 @@
+$OpenBSD$
+
+Makes compile with -fno-common. Taken from upstream:
+https://github.com/FreeRDP/Remmina/commit/27f84d1c0a2e4c2432281f25ef3026bb00bbdc15
+
+Index: src/remmina_stats.c
+--- src/remmina_stats.c.orig
 src/remmina_stats.c
+@@ -158,8 +158,6 @@
+ #endif
+ #include "remmina_stats.h"
+ 
+-struct utsname u;
+-
+ struct ProfilesData {
+   GHashTable *proto_count;
+   GHashTable *proto_date;
+@@ -805,9 +803,6 @@ JsonNode *remmina_stats_get_all()
+   n = remmina_stats_get_version();
+   json_builder_set_member_name(b, "REMMINAVERSION");
+   json_builder_add_value(b, n);
+-
+-  if (uname(&u) == -1)
+-  g_print("uname:");
+ 
+   n = remmina_stats_get_os_info();
+   json_builder_set_member_name(b, "SYSTEM");
-- 
2.30.0

Re: Question about lang/ghc module (trying to port git-annex)

[James Cook]

> > From what I gathered the v2-install target is largely unusable for
> > installing packages outside of .cabal tree. At least neither I nor
> > FreeBSD maintainer found a way to leverage that. Hence the manual
> > install flow.
> 
> I probably don't know all the subtleties, but when I run
> "cabal v2-install", I get a nice set of files under
> ~/.cabal/ghc-XXX/git-annex-XXX, including the man pages and all three
> needed binaries. I would guess that just copying those files to the
> destination would do the trick for most cabal executable packages, but
> I haven't actually tried it. Maybe it's better to be cautious.

I mean ~/.cabal/store/ghc-XXX/git-annex-XXX.

Also forgot to mention the following git-annex patch (already reported
upstream) is needed if anyone does want to experiment with using cabal
v2-install to get git-annex man pages.

diff --git a/Build/Mans.hs b/Build/Mans.hs
index 9fb29d4a3..672dcd71c 100644
--- a/Build/Mans.hs
+++ b/Build/Mans.hs
@@ -38,7 +38,8 @@ buildMans = do
if (Just srcm > destm)
then do
r <- system $ unwords
-   [ "./Build/mdwn2man"
+   [ "perl"
+   , "Build/mdwn2man"
, progName src
, "1"
, src

Re: Question about lang/ghc module (trying to port git-annex)

[James Cook]

On Thu, Feb 04, 2021 at 11:13:43AM -0800, Greg Steuck wrote:
> James Cook  writes:
> 
> > I don't think that's an rsync problem. Unfortunately the
> > git-annex-shell binary is missing, and that's pretty critical (needed
> > to access the repository from other machines; sort of like git
> > push/pull).
> 
> This part is easy, patch attached.

Thanks, I can now access my git-annex repositories remotely without an
awful kludge.

> > Incidentally, the man pages also seem to be missing.
> 
> Would you like to try your hand in extending post-install target with
> some man formatting magic like we have in other ports?

Done (commit a1c5aec8) in my "git-annex" branch:

https://github.com/falsifian/ports/commits/git-annex

It's not pretty. I replicated some logic from Build/Man.hs, which is
called from Setup.hs. Normally cabal v2-install would do that work for
us (putting the result in .cabal/store/ghc-XXX/git-annex-XXX) but I
don't know if it's worth getting that working.

Caveat: I took a shortcut when testing this: instead of re-running
"make build" I just made the post-build target after adding this in.
I'll try building from scratch later if you don't beat me to it.

On that branch I also removed the runtime dep on devel/git-lfs (it's
just one of a large number of optional backends).

> > Alternatively, I think the cabal (v2-)install commands installs what's
> > needed (at least, it gets git-annex-shell, which is the really
> > important thing). Is there some way to take advantage of that in your
> > cabal infrastrsucture?
> 
> From what I gathered the v2-install target is largely unusable for
> installing packages outside of .cabal tree. At least neither I nor
> FreeBSD maintainer found a way to leverage that. Hence the manual
> install flow.

I probably don't know all the subtleties, but when I run
"cabal v2-install", I get a nice set of files under
~/.cabal/ghc-XXX/git-annex-XXX, including the man pages and all three
needed binaries. I would guess that just copying those files to the
destination would do the trick for most cabal executable packages, but
I haven't actually tried it. Maybe it's better to be cautious.

-- 
James

Re: Ports documentation: document that TRUSTED_PKG_PATH is needed in doas.conf?

[Thomas Frohwein]

On Thu, Feb 04, 2021 at 05:52:09AM +, James Cook wrote:

[...]

> > > > If you are going to allow pkg_add with "nopass" you might just as well
> > > > write "permit nopass myuser". An account which can run pkg_add as root
> > > > has full control of the system.
> > > 
> > > I don't have strong opinions about that. My point is just that the
> > > current documentation left me with a setup that didn't work.
> > > 
> > > How about recommending keepenv instead, if that's better?
> > 
> > I think sthen@ may have been a little too subtle about what a giant
> > footgun your proposal is.
> > 
> > "permit nopass myuser" is equivalent to myuser being root and you might
> > as well run everything as root then and toss out all security
> > considerations that come from logging in as a non-root user.
> > 
> > This has no place in the FAQ in my opinion.

[...]

> Of course, now I know how to solve the error. But I thought I'd found a
> bug in the documentation, because the documentation led me to a bad
> setup.
> 
> My suggested doas.conf comes (almost) directly from the existing
> documentation for PORTS_PRIVSEP.

I think you did find an inconsistency in the documentation and thanks
for raising it. Just would like to point out that commit [1] happened
in response to the discussion of the issue.

[1] https://marc.info/?l=openbsd-cvs&m=161247673822783&w=2

Re: Update micro editor to v2.0.8

[Aaron Bieber]

On Sun, 31 Jan 2021 at 21:00:47 +0100, Thaison Nguyen wrote:
> Hi,
> I have added your patch to the Makefile. Thanks for that.
> I had to add WRKDIST=${WRKSRC}, else the correct directory for patching 
> was not found.
> 
> OK?
> 
> On Sat, 30 Jan 2021, Aaron Bieber wrote:
> 
> > On Sat, 30 Jan 2021 at 15:39:41 +0100, Thaison Nguyen wrote:
> > > Hi,
> > > 
> > > do you mean like this?
> > > I have not seen any Makefile yet, where PORTS_PRIVSEP=Yes is set.
> > > The only place where I have seen this is /etc/mk.conf.
> > > 
> > 
> > Correct. It is a mk.conf option and without '-modcacherw' set 'make clean'
> > breaks.
> > 
> > > 
> > > On Mon, 25 Jan 2021, Aaron Bieber wrote:
> > > 
> > > > On Fri, 22 Jan 2021 at 15:35:04 +0100, Thaison Nguyen wrote:
> > > > > Hi,
> > > > > 
> > > > > I have updated micro to the latest version (2.0.8). I had to change 
> > > > > quite 
> > > > > a lot because of the go modules. The modules list I have retrieved 
> > > > > using 
> > > > > the new macro.
> > > > > I have only tested it on amd64.
> > > > > 
> > > > > OK?
> > > > > 
> > > > 
> > > > Looks good! One of the things our Go build stuff sets is "-modcacherw" 
> > > > - this
> > > > fixes cleanup issues when running with PORTS_PRIVSEP=Yes set.
> > > > 
> > > > OK abieber@ once a patch is added to set that. :D
> > > > 

Ok, I didn't realize do-build and friends were being set (I put them close to
the top for readability and assumed since the weren't there they didn't exist
:P).

Also! I didn't realize that the 'go run' stuff that creates VERSION and HASH
(in micro's Makefile) was calling a tool that pulled down external deps.

Here is an updated diff that removes the patch in favor of setting
MODGO_LDFLAGS - this also fixes the "Unknow version" puke that happened with
exiting.

This diff is OK abieber@ :D

diff 959be099d23332f10112d9ce7adcbd45c49859af /usr/ports
blob - e7eb74da799f82876c361fb3d20bbc8ff85131b6
file + editors/micro/Makefile
--- editors/micro/Makefile
+++ editors/micro/Makefile
@@ -2,11 +2,13 @@
 
 COMMENT =  modern and intuitive terminal-based text editor
 
-V =1.1.3
-DISTNAME = micro-${V}-src
-PKGNAME =  micro-${V}
-REVISION = 0
+MODGO_MODNAME =github.com/zyedidia/micro/v2
+MODGO_VERSION =v2.0.8
 
+# Snagged from https://github.com/zyedidia/micro/releases/tag/${MODGO_VERSION}
+TAG_HASH = cfcb2e4
+
+DISTNAME = micro-${MODGO_VERSION}
 CATEGORIES =   editors
 HOMEPAGE = https://micro-editor.github.io/
 MAINTAINER =   Edd Barrett 
@@ -16,18 +18,66 @@ PERMIT_PACKAGE =Yes
 
 WANTLIB += c pthread
 
-MASTER_SITES = 
https://github.com/zyedidia/micro/releases/download/v${V}/
+WRKDIST =  ${WRKSRC}
 
 MODULES =  lang/go
 MODGO_TYPE =bin
-WRKDIST =  ${WRKDIR}/micro
 
-do-build:
-   cd ${WRKSRC} && ${MAKE_ENV} ${MAKE} build-quick ${MAKE_FLAGS}
+MODGO_LDFLAGS +=   -X 
github.com/zyedidia/micro/v2/internal/util.Version=${MODGO_VERSION:S/v//}
+MODGO_LDFLAGS +=   -X 
github.com/zyedidia/micro/v2/internal/util.CommitHash=${TAG_HASH}
 
-do-install:
-   ${INSTALL_PROGRAM} ${WRKSRC}/micro ${PREFIX}/bin
-
 NO_TEST =  Yes
 
+MODGO_MODULES =\
+   github.com/blang/semver  v3.5.1+incompatible \
+   github.com/chzyer/logex  v1.1.10 \
+   github.com/chzyer/readline   
v0.0.0-20180603132655-2972be24d48e \
+   github.com/chzyer/test   
v0.0.0-20180213035817-a1ea475d72b1 \
+   github.com/davecgh/go-spew   v1.1.1 \
+   github.com/dustin/go-humanizev1.0.0 \
+   github.com/gdamore/encoding  v1.0.0 \
+   github.com/go-errors/errors  v1.0.1 \
+   github.com/kballard/go-shellquote
v0.0.0-20180428030007-95032a82bc51 \
+   github.com/kr/pretty v0.1.0 \
+   github.com/kr/ptyv1.1.1 \
+   github.com/kr/text   v0.1.0 \
+   github.com/lucasb-eyer/go-colorful   v1.0.3 \
+   github.com/mattn/go-isatty   v0.0.11 \
+   github.com/mattn/go-runewidthv0.0.7 \
+   github.com/mitchellh/go-homedir  v1.1.0 \
+   github.com/p-e-w/go-runewidth
v0.0.10-0.20200613030200-3e1705c5c059 \
+   github.com/pmezard/go-difflibv1.0.0 \
+   github.com/robertkrimen/otto 
v0.0.0-20191219234010-c382bd3c16ff \
+   github.com/sergi/go-diff v1.1.0 \
+   github.com/stretchr/objx v0.1.0 \
+   github.com/stretchr/testify  v1.4.0 \
+   github.com/xo/terminfo   
v0.0.0-20200218205459-454e5b68f9e8 \
+   github.com/yuin/gopher-lua   
v0.0.0-20191220021717-ab39c6098bdb \
+   github.com/zyedidia/clipboardv1.0.3 \
+   github.com/zyedidia/glob 
v0.0.0-20170209203856-dd4023a66dc3 \
+   github.com/

[update] sysutils/wmcube 0.98 -> 1.0.2 (+ -fno-common fix)

[Charlene Wendling]

This is an update for wmcube, to 1.0.2. This adds color schemes, smooth
fonts, more logos, a manual page and various fixes.

Port-wise:

- Move to dockapps.net, HOMEPAGE is not reachable
- Fix an hardcoded path to logo files (introduced in 1.0.0,
  so our current package is not affected)
- Remove the Makefile patch, and override things with MAKE_FLAGS. That
  also allows us to simplify the port, since we won't have to fix MSDOS
  line endings, and that's why i've attached the diff
- Due to the previous change, don't use upstream's install target,
  avoiding further patching
- Drop the wmgeneral/list.h patch. Upstream "fixed" that in 1.0.2
- Fix the build with -fno-common

Testing:

It has been built and tested on macppc and amd64 without issues.

OK? 

Charlène.


wmcube.diff
Description: Binary data

Re: audio/wmmp3: -fno-common fix (and more)

[Charlene Wendling]

On Thu, 4 Feb 2021 23:05:05 +0100
Charlene Wendling  wrote:

> On Thu, 4 Feb 2021 22:07:08 +0100
> Charlene Wendling  wrote:
> 
> > 
> > The below diff:
> > 
> > - moves HOMEPAGE and MASTER_SITES to dockapps.net, since it was not
> >   reachable. The distfile checksum is the same.
> > - removes an hardcoded path to madplay; we could move to mpg123 but
> > i did not want to include a breaking change
> > - fixes missing includes spotted by clang
> > - fixes the build with -fno-common (from Gentoo [0])
> > 
> > It builds and works fine on macppc and amd64.
> > 
> > OK?
> > 
> > Charlène.
> > 
> > 
> > [0]
> > https://gitweb.gentoo.org/repo/gentoo.git/tree/x11-plugins/wmmp3/files/wmmp3-0.12-fno-common.patch
> 
> SUBST_CMD should be run in pre-configure, not in post-patch.

Typoed pre-configure, sorry for the noise.


Index: Makefile
===
RCS file: /cvs/ports/audio/wmmp3/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- Makefile12 Jul 2019 20:43:42 -  1.24
+++ Makefile4 Feb 2021 22:22:47 -
@@ -3,17 +3,17 @@
 COMMENT=   wm-dockapp; front end for an mp3 player
 
 DISTNAME=  wmmp3-0.12
-REVISION=  4
+REVISION=  5
 CATEGORIES=audio x11 x11/windowmaker
 
-HOMEPAGE=  http://www.dotfiles.com/software/wmmp3/
+HOMEPAGE=  https://www.dockapps.net/wmmp3
 
 # GPL
 PERMIT_PACKAGE=Yes
 
 WANTLIB=   X11 Xext Xpm c
 
-MASTER_SITES=  ${HOMEPAGE}
+MASTER_SITES=  https://www.dockapps.net/download/
 
 RUN_DEPENDS=   audio/madplay
 
@@ -23,6 +23,9 @@ CONFIGURE_STYLE=  gnu
 
 SAMPLE_DIR=${PREFIX}/share/examples/wmmp3
 SUBST_VARS+=   SAMPLE_DIR
+
+pre-configure:
+   @${SUBST_CMD} ${WRKSRC}/main.c
 
 do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/wmmp3 ${PREFIX}/bin
Index: patches/patch-main_c
===
RCS file: /cvs/ports/audio/wmmp3/patches/patch-main_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-main_c
--- patches/patch-main_c4 Aug 2003 13:31:28 -   1.2
+++ patches/patch-main_c4 Feb 2021 22:22:47 -
@@ -1,16 +1,17 @@
 $OpenBSD: patch-main_c,v 1.2 2003/08/04 13:31:28 wilfried Exp $
 main.c.orig2000-04-03 02:11:46.0 +0200
-+++ main.c 2003-08-04 15:05:48.0 +0200
+Index: main.c
+--- main.c.orig
 main.c
 @@ -125,7 +125,7 @@ void loadconfig()
  errno = 0;
  
  /* set defualts in case anything fails */
 -set_mpg123("/usr/local/bin/mpg123");
-+set_mpg123("/usr/local/bin/madplay");
++set_mpg123("${LOCALBASE}/bin/madplay");
  set_mp3ext(".mp3");
  set_playlistext(".m3u");
  
-@@ -230,7 +230,7 @@ int check_options(int argc, char *argv[]
+@@ -230,7 +230,7 @@ int check_options(int argc, char *argv[])
  return option_entered;
  }
  
Index: patches/patch-main_h
===
RCS file: patches/patch-main_h
diff -N patches/patch-main_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-main_h4 Feb 2021 22:22:47 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Add missing include
+
+Index: main.h
+--- main.h.orig
 main.h
+@@ -14,6 +14,7 @@
+ 
+ #define __MAIN_H__
+ 
++#include 
+ #include 
+ #include 
+ #include 
Index: patches/patch-mpg123ctl_h
===
RCS file: patches/patch-mpg123ctl_h
diff -N patches/patch-mpg123ctl_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-mpg123ctl_h   4 Feb 2021 22:22:47 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Add missing include
+
+Index: mpg123ctl.h
+--- mpg123ctl.h.orig
 mpg123ctl.h
+@@ -14,6 +14,7 @@
+ 
+ #define __MPG123CTL__
+ 
++#include 
+ #include 
+ #include 
+ #include 
Index: patches/patch-wmgeneral_c
===
RCS file: patches/patch-wmgeneral_c
diff -N patches/patch-wmgeneral_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-wmgeneral_c   4 Feb 2021 22:22:47 -
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+Fix the build with -fno-common
+
+Index: wmgeneral.c
+--- wmgeneral.c.orig
 wmgeneral.c
+@@ -58,6 +58,11 @@
+  /* X11 Variables */
+ /*/
+ 
++Display *display;
++Window Root, iconwin, win;
++XpmIcon wmgen;
++XpmIcon wmfont;
++
+ int screen;
+ int x_fd;
+ int d_depth;
Index: patches/patch-wmgeneral_h
===
RCS file: patches/patch-wmgeneral_h
diff -N patches/patch-wmgeneral_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-wmgeneral_h   4 Feb 2021 22:22:47 -
@@ -0,0 +1,22 @@
+$OpenBSD$
+
+Fix the build with -fno-common
+
+Index: wmgeneral.h
+--- wmgeneral.h.orig
 wmgeneral.h
+@@ -41,10 +41,10 @@ typedef struct {
+  /* Global variable */
+ /***/
+ 
+-Display *display;
+-Window

Re: audio/wmmp3: -fno-common fix (and more)

[Charlene Wendling]

On Thu, 4 Feb 2021 22:07:08 +0100
Charlene Wendling  wrote:

> 
> The below diff:
> 
> - moves HOMEPAGE and MASTER_SITES to dockapps.net, since it was not
>   reachable. The distfile checksum is the same.
> - removes an hardcoded path to madplay; we could move to mpg123 but i
>   did not want to include a breaking change
> - fixes missing includes spotted by clang
> - fixes the build with -fno-common (from Gentoo [0])
> 
> It builds and works fine on macppc and amd64.
> 
> OK?
> 
> Charlène.
> 
> 
> [0]
> https://gitweb.gentoo.org/repo/gentoo.git/tree/x11-plugins/wmmp3/files/wmmp3-0.12-fno-common.patch

SUBST_CMD should be run in pre-configure, not in post-patch

Index: Makefile
===
RCS file: /cvs/ports/audio/wmmp3/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- Makefile12 Jul 2019 20:43:42 -  1.24
+++ Makefile4 Feb 2021 22:02:43 -
@@ -3,17 +3,17 @@
 COMMENT=   wm-dockapp; front end for an mp3 player
 
 DISTNAME=  wmmp3-0.12
-REVISION=  4
+REVISION=  5
 CATEGORIES=audio x11 x11/windowmaker
 
-HOMEPAGE=  http://www.dotfiles.com/software/wmmp3/
+HOMEPAGE=  https://www.dockapps.net/wmmp3
 
 # GPL
 PERMIT_PACKAGE=Yes
 
 WANTLIB=   X11 Xext Xpm c
 
-MASTER_SITES=  ${HOMEPAGE}
+MASTER_SITES=  https://www.dockapps.net/download/
 
 RUN_DEPENDS=   audio/madplay
 
@@ -23,6 +23,9 @@ CONFIGURE_STYLE=  gnu
 
 SAMPLE_DIR=${PREFIX}/share/examples/wmmp3
 SUBST_VARS+=   SAMPLE_DIR
+
+pre_configure:
+   @${SUBST_CMD} ${WRKSRC}/main.c
 
 do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/wmmp3 ${PREFIX}/bin
Index: patches/patch-main_c
===
RCS file: /cvs/ports/audio/wmmp3/patches/patch-main_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-main_c
--- patches/patch-main_c4 Aug 2003 13:31:28 -   1.2
+++ patches/patch-main_c4 Feb 2021 22:02:43 -
@@ -1,16 +1,17 @@
 $OpenBSD: patch-main_c,v 1.2 2003/08/04 13:31:28 wilfried Exp $
 main.c.orig2000-04-03 02:11:46.0 +0200
-+++ main.c 2003-08-04 15:05:48.0 +0200
+Index: main.c
+--- main.c.orig
 main.c
 @@ -125,7 +125,7 @@ void loadconfig()
  errno = 0;
  
  /* set defualts in case anything fails */
 -set_mpg123("/usr/local/bin/mpg123");
-+set_mpg123("/usr/local/bin/madplay");
++set_mpg123("${LOCALBASE}/bin/madplay");
  set_mp3ext(".mp3");
  set_playlistext(".m3u");
  
-@@ -230,7 +230,7 @@ int check_options(int argc, char *argv[]
+@@ -230,7 +230,7 @@ int check_options(int argc, char *argv[])
  return option_entered;
  }
  
Index: patches/patch-main_h
===
RCS file: patches/patch-main_h
diff -N patches/patch-main_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-main_h4 Feb 2021 22:02:43 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Add missing include
+
+Index: main.h
+--- main.h.orig
 main.h
+@@ -14,6 +14,7 @@
+ 
+ #define __MAIN_H__
+ 
++#include 
+ #include 
+ #include 
+ #include 
Index: patches/patch-mpg123ctl_h
===
RCS file: patches/patch-mpg123ctl_h
diff -N patches/patch-mpg123ctl_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-mpg123ctl_h   4 Feb 2021 22:02:43 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Add missing include
+
+Index: mpg123ctl.h
+--- mpg123ctl.h.orig
 mpg123ctl.h
+@@ -14,6 +14,7 @@
+ 
+ #define __MPG123CTL__
+ 
++#include 
+ #include 
+ #include 
+ #include 
Index: patches/patch-wmgeneral_c
===
RCS file: patches/patch-wmgeneral_c
diff -N patches/patch-wmgeneral_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-wmgeneral_c   4 Feb 2021 22:02:43 -
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+Fix the build with -fno-common
+
+Index: wmgeneral.c
+--- wmgeneral.c.orig
 wmgeneral.c
+@@ -58,6 +58,11 @@
+  /* X11 Variables */
+ /*/
+ 
++Display *display;
++Window Root, iconwin, win;
++XpmIcon wmgen;
++XpmIcon wmfont;
++
+ int screen;
+ int x_fd;
+ int d_depth;
Index: patches/patch-wmgeneral_h
===
RCS file: patches/patch-wmgeneral_h
diff -N patches/patch-wmgeneral_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-wmgeneral_h   4 Feb 2021 22:02:43 -
@@ -0,0 +1,22 @@
+$OpenBSD$
+
+Fix the build with -fno-common
+
+Index: wmgeneral.h
+--- wmgeneral.h.orig
 wmgeneral.h
+@@ -41,10 +41,10 @@ typedef struct {
+  /* Global variable */
+ /***/
+ 
+-Display *display;
+-Window Root, iconwin, win;
+-XpmIcon wmgen;
+-XpmIcon wmfont;
++extern Display *display;
++extern Window Root, iconwin, win;
++extern XpmIcon wmgen;
++extern X

Re: Creating package debug... Fatal error: can't parse comment is too long

[Mikolaj Kucharski]

Marc, Stuart,

Does that mean it's okay to commit below change?

Index: bsd.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1542
diff -u -p -u -r1.1542 bsd.port.mk
--- bsd.port.mk 26 Jun 2020 11:51:16 -  1.1542
+++ bsd.port.mk 1 Jan 2021 19:48:31 -
@@ -1201,7 +1201,7 @@ _pkg_cookie${_S} = ${_PACKAGE_COOKIE${_S
 .  if ${DEBUG_PACKAGES:M${_S}}
 _DBG_PKG_ARGS${_S} := ${PKG_ARGS${_S}}
 _DBG_PKG_ARGS${_S} += 
-P${FULLPKGPATH${_S}}:${FULLPKGNAME${_S}}:${FULLPKGNAME${_S}}
-_DBG_PKG_ARGS${_S} += -DCOMMENT="debug info for ${FULLPKGNAME${_S}}"
+_DBG_PKG_ARGS${_S} += -DCOMMENT="debug info for ${PKGSTEM${_S}}"
 _DBG_PKG_ARGS${_S} += -d"-debug info for ${FULLPKGNAME${_S}}"
 # XXX revisit that fullpkgpath later ?
 _DBG_PKG_ARGS${_S} += -DFULLPKGPATH=debug/${FULLPKGPATH${_S}}


Full thread at https://marc.info/?t=16095308942&r=1&w=2

On Tue, Feb 02, 2021 at 01:05:14PM +0100, Marc Espie wrote:
> On Tue, Feb 02, 2021 at 11:45:24AM +, Stuart Henderson wrote:
> > On 2021/02/02 10:05, Marc Espie wrote:
> > > On Sun, Jan 24, 2021 at 09:50:50PM +, Stuart Henderson wrote:
> > > > You are correct that it will require bumping every port that has
> > > > debug packages. It might be better to only change the comment
> > > > if it's too long (so that existing ones aren't changed).
> > > 
> > > Actually, I'm not sure it's strictly required. In fact it's not.
> > > 
> > > See, debug packages don't go through register-plist, so changes
> > > are not really a problem with them.
> > 
> > Oh, that's a bit of luck!
> 
> More of a design property actually :)
> 
> There's an explicit test in the packaging loop to avoid registering
> debug-packages, for several reasons
> - their packing-lists don't exist independently of normal packages
> - I don't think you'd fancy twice that many files in the plist directory
> - it allowed for rapid development while in-tree, as the generating code
> has had to evolve several times.
> 

-- 
Regards,
 Mikolaj

audio/wmmp3: -fno-common fix (and more)

[Charlene Wendling]

The below diff:

- moves HOMEPAGE and MASTER_SITES to dockapps.net, since it was not
  reachable. The distfile checksum is the same.
- removes an hardcoded path to madplay; we could move to mpg123 but i
  did not want to include a breaking change
- fixes missing includes spotted by clang
- fixes the build with -fno-common (from Gentoo [0])

It builds and works fine on macppc and amd64.

OK?

Charlène.


[0]
https://gitweb.gentoo.org/repo/gentoo.git/tree/x11-plugins/wmmp3/files/wmmp3-0.12-fno-common.patch


Index: Makefile
===
RCS file: /cvs/ports/audio/wmmp3/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- Makefile12 Jul 2019 20:43:42 -  1.24
+++ Makefile4 Feb 2021 21:02:24 -
@@ -3,17 +3,17 @@
 COMMENT=   wm-dockapp; front end for an mp3 player
 
 DISTNAME=  wmmp3-0.12
-REVISION=  4
+REVISION=  5
 CATEGORIES=audio x11 x11/windowmaker
 
-HOMEPAGE=  http://www.dotfiles.com/software/wmmp3/
+HOMEPAGE=  https://www.dockapps.net/wmmp3
 
 # GPL
 PERMIT_PACKAGE=Yes
 
 WANTLIB=   X11 Xext Xpm c
 
-MASTER_SITES=  ${HOMEPAGE}
+MASTER_SITES=  https://www.dockapps.net/download/
 
 RUN_DEPENDS=   audio/madplay
 
@@ -23,6 +23,9 @@ CONFIGURE_STYLE=  gnu
 
 SAMPLE_DIR=${PREFIX}/share/examples/wmmp3
 SUBST_VARS+=   SAMPLE_DIR
+
+post-patch:
+   @${SUBST_CMD} ${WRKSRC}/main.c
 
 do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/wmmp3 ${PREFIX}/bin
Index: patches/patch-main_c
===
RCS file: /cvs/ports/audio/wmmp3/patches/patch-main_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-main_c
--- patches/patch-main_c4 Aug 2003 13:31:28 -   1.2
+++ patches/patch-main_c4 Feb 2021 21:02:24 -
@@ -1,16 +1,17 @@
 $OpenBSD: patch-main_c,v 1.2 2003/08/04 13:31:28 wilfried Exp $
 main.c.orig2000-04-03 02:11:46.0 +0200
-+++ main.c 2003-08-04 15:05:48.0 +0200
+Index: main.c
+--- main.c.orig
 main.c
 @@ -125,7 +125,7 @@ void loadconfig()
  errno = 0;
  
  /* set defualts in case anything fails */
 -set_mpg123("/usr/local/bin/mpg123");
-+set_mpg123("/usr/local/bin/madplay");
++set_mpg123("${LOCALBASE}/bin/madplay");
  set_mp3ext(".mp3");
  set_playlistext(".m3u");
  
-@@ -230,7 +230,7 @@ int check_options(int argc, char *argv[]
+@@ -230,7 +230,7 @@ int check_options(int argc, char *argv[])
  return option_entered;
  }
  
Index: patches/patch-main_h
===
RCS file: patches/patch-main_h
diff -N patches/patch-main_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-main_h4 Feb 2021 21:02:24 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Add missing include
+
+Index: main.h
+--- main.h.orig
 main.h
+@@ -14,6 +14,7 @@
+ 
+ #define __MAIN_H__
+ 
++#include 
+ #include 
+ #include 
+ #include 
Index: patches/patch-mpg123ctl_h
===
RCS file: patches/patch-mpg123ctl_h
diff -N patches/patch-mpg123ctl_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-mpg123ctl_h   4 Feb 2021 21:02:24 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Add missing include
+
+Index: mpg123ctl.h
+--- mpg123ctl.h.orig
 mpg123ctl.h
+@@ -14,6 +14,7 @@
+ 
+ #define __MPG123CTL__
+ 
++#include 
+ #include 
+ #include 
+ #include 
Index: patches/patch-wmgeneral_c
===
RCS file: patches/patch-wmgeneral_c
diff -N patches/patch-wmgeneral_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-wmgeneral_c   4 Feb 2021 21:02:24 -
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+Fix the build with -fno-common
+
+Index: wmgeneral.c
+--- wmgeneral.c.orig
 wmgeneral.c
+@@ -58,6 +58,11 @@
+  /* X11 Variables */
+ /*/
+ 
++Display *display;
++Window Root, iconwin, win;
++XpmIcon wmgen;
++XpmIcon wmfont;
++
+ int screen;
+ int x_fd;
+ int d_depth;
Index: patches/patch-wmgeneral_h
===
RCS file: patches/patch-wmgeneral_h
diff -N patches/patch-wmgeneral_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-wmgeneral_h   4 Feb 2021 21:02:24 -
@@ -0,0 +1,22 @@
+$OpenBSD$
+
+Fix the build with -fno-common
+
+Index: wmgeneral.h
+--- wmgeneral.h.orig
 wmgeneral.h
+@@ -41,10 +41,10 @@ typedef struct {
+  /* Global variable */
+ /***/
+ 
+-Display *display;
+-Window Root, iconwin, win;
+-XpmIcon wmgen;
+-XpmIcon wmfont;
++extern Display *display;
++extern Window Root, iconwin, win;
++extern XpmIcon wmgen;
++extern XpmIcon wmfont;
+ 
+ /***/
+  /* Function Prototypes */

Re: textproc/zoem -fno-common fix

[Theo Buehler]

On Thu, Feb 04, 2021 at 09:39:19PM +0100, Theo Buehler wrote:
> Straightforward fix. The version.h header is oth generated and packaged,
> I thought it better to fix both the generating script and the header.
> 
> Upstream has been dormant during the past decade, but they have updated
> their homepage to use TLS.
> 
> Basic macros still work.

Right after sending I noticed that there is a later version. It adds
readline support, so it's a bit of an improvement. -fno-common fix is
essentially the same as before. Basic functionality still works.

Index: Makefile
===
RCS file: /cvs/ports/textproc/zoem/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile12 Jul 2019 20:50:17 -  1.12
+++ Makefile4 Feb 2021 20:56:03 -
@@ -2,16 +2,16 @@
 
 COMMENT=   interpretive macro/programming language
 
-V= 09-149
+V= 11-166
 DISTNAME=  zoem-${V}
 PKGNAME=   zoem-${V:S,-,_,}
 CATEGORIES=textproc lang
 
-HOMEPAGE=  http://micans.org/zoem/
+HOMEPAGE=  https://micans.org/zoem/
 
 # GPLv2
 PERMIT_PACKAGE=Yes
-WANTLIB=   c m 
+WANTLIB=   c m curses readline
 
 MASTER_SITES=  ${HOMEPAGE}/src/
 
Index: distinfo
===
RCS file: /cvs/ports/textproc/zoem/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo18 Jan 2015 03:15:32 -  1.9
+++ distinfo4 Feb 2021 20:47:35 -
@@ -1,2 +1,2 @@
-SHA256 (zoem-09-149.tar.gz) = cCByIFYp3pM9db86G9TndQIwmiZFHhlGQnyx/Zc8VNU=
-SIZE (zoem-09-149.tar.gz) = 570150
+SHA256 (zoem-11-166.tar.gz) = EmeiIq4u6ZipHb5m3xnPmYoOfbRcflmCEEmua3kfN/4=
+SIZE (zoem-11-166.tar.gz) = 463646
Index: patches/patch-src_Makefile_in
===
RCS file: /cvs/ports/textproc/zoem/patches/patch-src_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_Makefile_in
--- patches/patch-src_Makefile_in   23 Dec 2009 22:09:20 -  1.2
+++ patches/patch-src_Makefile_in   4 Feb 2021 20:49:15 -
@@ -1,7 +1,8 @@
 $OpenBSD: patch-src_Makefile_in,v 1.2 2009/12/23 22:09:20 jasper Exp $
 src/Makefile.in.orig   Fri May 29 14:24:17 2009
-+++ src/Makefile.inWed Dec 23 21:56:37 2009
-@@ -101,7 +101,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+Index: src/Makefile.in
+--- src/Makefile.in.orig
 src/Makefile.in
+@@ -100,7 +100,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
  LIBOBJS = @LIBOBJS@
@@ -10,7 +11,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.2 20
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MAINT = @MAINT@
-@@ -158,7 +158,7 @@ ops-env.c ops-constant.c curly.c digest.c entry.c \
+@@ -169,7 +169,7 @@ ops-env.c ops-constant.c curly.c digest.c entry.c \
  iface.c source.c sink.c filter.c key.c dict.c ops.c parse.c read.c \
  segment.c util.c zoem.c version.c
  
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/zoem/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST   23 Dec 2009 22:09:20 -  1.5
+++ pkg/PLIST   4 Feb 2021 20:50:51 -
@@ -1,11 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.5 2009/12/23 22:09:20 jasper Exp $
 @bin bin/zoem
 @man man/man1/zoem.1
-@man man/man7/pud-base.7
-@man man/man7/pud-faq.7
-@man man/man7/pud-man.7
-@man man/man7/pud-ref.7
-@man man/man7/pud.7
 share/doc/zoem/
 share/doc/zoem/doc/
 share/doc/zoem/doc/zoem.azm
@@ -13,28 +8,6 @@ share/doc/zoem/doc/zoem.html
 share/doc/zoem/doc/zoem.ps
 share/doc/zoem/doc/zum.azm
 share/doc/zoem/doc/zum.html
-share/doc/zoem/mac/
-share/doc/zoem/mac/buzzz.1
-share/doc/zoem/mac/buzzz.azm
-share/doc/zoem/mac/buzzz.html
-share/doc/zoem/mac/buzzz.ps
-share/doc/zoem/mac/buzzz.txt
-share/doc/zoem/mac/index.html
-share/doc/zoem/mac/pud-base.html
-share/doc/zoem/mac/pud-base.ps
-share/doc/zoem/mac/pud-base.txt
-share/doc/zoem/mac/pud-faq.html
-share/doc/zoem/mac/pud-faq.ps
-share/doc/zoem/mac/pud-faq.txt
-share/doc/zoem/mac/pud-man.html
-share/doc/zoem/mac/pud-man.ps
-share/doc/zoem/mac/pud-man.txt
-share/doc/zoem/mac/pud-ref.html
-share/doc/zoem/mac/pud-ref.ps
-share/doc/zoem/mac/pud-ref.txt
-share/doc/zoem/mac/pud.html
-share/doc/zoem/mac/pud.ps
-share/doc/zoem/mac/pud.txt
 share/examples/zoem/
 share/examples/zoem/8q.azm
 share/examples/zoem/8q.ozm
@@ -52,11 +25,6 @@ share/examples/zoem/nest.azm
 share/examples/zoem/nest.ozm
 share/examples/zoem/power-of-2.azm
 share/examples/zoem/power-of-2.ozm
-share/examples/zoem/pud-base.azm
-share/examples/zoem/pud-faq.azm
-share/examples/zoem/pud-man.azm
-share/examples/zoem/pud-ref.azm
-share/examples/zoem/pud.azm
 share/examples/zoem/reverse.azm
 share/examples/zoem/reverse.ozm
 share/examples/zoem/scope.azm
@@ -73,13 +41,3 @@ share/examples/zoem/txt-table.azm
 share/examples/zoem/txt-table.ozm
 share/examples/zoem/xml.azm
 share/exam

Re: textproc/pinfo: fix for -fno-common and -O0

[Marc Espie]

On Thu, Feb 04, 2021 at 09:10:16PM +0100, Theo Buehler wrote:
> Obvious fix to avoid duplicate definition of use_manual. The conversion
> from inline to static inline fixes the build with -O0. I ran into that
> because I tested with CFLAGS=-fno-common which removed -O2. I can land
> that separately if desired. Regen plist while there.
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/textproc/pinfo/Makefile,v
> retrieving revision 1.18
> diff -u -p -r1.18 Makefile
> --- Makefile  12 Jul 2019 20:50:10 -  1.18
> +++ Makefile  4 Feb 2021 19:57:03 -
> @@ -3,7 +3,7 @@
>  COMMENT= info viewer with lynx-style navigation
>  
>  DISTNAME=pinfo-0.6.9
> -REVISION=1
> +REVISION=2
>  CATEGORIES=  textproc devel
>  
>  HOMEPAGE=https://alioth.debian.org/frs/?group_id=30592
> Index: patches/patch-src_filehandling_functions_c
> ===
> RCS file: 
> /cvs/ports/textproc/pinfo/patches/patch-src_filehandling_functions_c,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-src_filehandling_functions_c
> --- patches/patch-src_filehandling_functions_c19 Nov 2007 18:31:03 
> -  1.2
> +++ patches/patch-src_filehandling_functions_c4 Feb 2021 19:53:53 
> -
> @@ -1,6 +1,7 @@
>  $OpenBSD: patch-src_filehandling_functions_c,v 1.2 2007/11/19 18:31:03 
> mgrimm Exp $
>  src/filehandling_functions.c.origSun Jul  8 17:06:45 2007
> -+++ src/filehandling_functions.c Sun Jul  8 17:09:39 2007
> +Index: src/filehandling_functions.c
> +--- src/filehandling_functions.c.orig
>  src/filehandling_functions.c
>  @@ -139,6 +139,7 @@ dirpage_lookup(char **type, char ***message, long *lin
>   char name[256];
>   char file[256];
> @@ -35,3 +36,21 @@ $OpenBSD: patch-src_filehandling_functio
>   strncpy(file, filestart + 1, fileend - filestart - 1);
>   file[fileend - filestart - 1] = 0;
>   strncpy(name, fileend + 1, dot - fileend - 1);
> +@@ -551,7 +551,7 @@ seek_tag_table(FILE * id,int quiet)
> + return 1;
> + }
> + 
> +-inline void
> ++static inline void
> + buildcommand(char *dest, char *command, char *filename, const char 
> *tmpfilename)
> + {
> + strcpy(dest, command);
> +@@ -561,7 +561,7 @@ buildcommand(char *dest, char *command, char *filename
> + strcat(dest, tmpfilename);
> + }
> + 
> +-inline void
> ++static inline void
> + builddircommand(char *dest, char *command, char *filename, const char 
> *tmpfilename)
> + {
> + strcpy(dest, command);
> Index: patches/patch-src_initializelinks_c
> ===
> RCS file: patches/patch-src_initializelinks_c
> diff -N patches/patch-src_initializelinks_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_initializelinks_c   4 Feb 2021 19:54:55 -
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: src/initializelinks.c
> +--- src/initializelinks.c.orig
>  src/initializelinks.c
> +@@ -75,7 +75,7 @@ compare_tag_table_string(char *base, char *compared)
> +  * checks if an item belongs to tag table. returns 1 on success and 0 on
> +  * failure.  It should be optimised...
> +  */
> +-inline int
> ++static inline int
> + exists_in_tag_table(char *item)
> + {
> + if (gettagtablepos(item) != -1)
> Index: patches/patch-src_parse_config_h
> ===
> RCS file: patches/patch-src_parse_config_h
> diff -N patches/patch-src_parse_config_h
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_parse_config_h  4 Feb 2021 19:51:07 -
> @@ -0,0 +1,16 @@
> +$OpenBSD$
> +
> +Fix for -fno-common
> +
> +Index: src/parse_config.h
> +--- src/parse_config.h.orig
>  src/parse_config.h
> +@@ -85,7 +85,7 @@ typedef struct colours
> + colours;
> + #endif /* NO_COLOR_CURSES */
> + 
> +-int use_manual;
> ++extern int use_manual;
> + 
> + int parse_config (void);
> + int parse_line (char *line);
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/textproc/pinfo/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- pkg/PLIST 19 Nov 2007 18:31:03 -  1.3
> +++ pkg/PLIST 4 Feb 2021 19:57:22 -
> @@ -1,5 +1,5 @@
>  @comment $OpenBSD: PLIST,v 1.3 2007/11/19 18:31:03 mgrimm Exp $
> -bin/pinfo
> +@bin bin/pinfo
>  @info info/pinfo.info
>  @man man/man1/pinfo.1
>  share/examples/pinfo/
> @@ -7,8 +7,6 @@ share/examples/pinfo/pinforc
>  @sample ${SYSCONFDIR}/pinforc
>  share/locale/cs/LC_MESSAGES/pinfo.mo
>  share/locale/de/LC_MESSAGES/pinfo.mo
> -share/locale/eu/
> -share/locale/eu/LC_MESSAGES/
>  share/locale/eu/LC_MESSAGES/pinfo.mo
>  share/locale/ja/LC_MESSAGES/pinfo.mo
>  share/locale/nl/LC_MESSAGES/pinfo.mo
> 
obvious okay

telephony/kamailio update: if you're using this, please test!

[Stuart Henderson]

This updates kamailio to a much more recent version (prompted by the old
version failing to build with compilers that use -fno-common by default).

If you're using it, especially if you're using it with libressl, please
test and report back. (I can provide packages for amd64 -current if that
makes it easier..)

Index: Makefile
===
RCS file: /cvs/ports/telephony/kamailio/Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile
--- Makefile4 Feb 2021 18:43:58 -   1.47
+++ Makefile4 Feb 2021 19:29:37 -
@@ -2,7 +2,7 @@
 
 COMMENT-main = mature and flexible open source SIP server
 
-VERSION =  5.0.6
+VERSION =  5.4.3
 
 DISTNAME = kamailio-${VERSION}_src
 
@@ -17,7 +17,6 @@ PKGNAME-snmpstats =   kamailio-snmpstats-$
 PKGNAME-perl = kamailio-perl-${VERSION}
 PKGNAME-presence = kamailio-presence-${VERSION}
 PKGNAME-radius =   kamailio-radius-${VERSION}
-REVISION = 1
 
 CATEGORIES =   telephony
 HOMEPAGE = http://www.kamailio.org/
@@ -25,10 +24,9 @@ HOMEPAGE =   http://www.kamailio.org/
 # GPLv2+
 PERMIT_PACKAGE =   Yes
 
-SHARED_LIBS =  srdb1   4.0 # 1.0
+SHARED_LIBS =  srdb1   5.0 # 1.0
 SHARED_LIBS += srdb2   4.0 # 1.0
 SHARED_LIBS += trie4.0 # 1.0
-SHARED_LIBS += srutils 3.0 # 1.0
 
 MAKE_ENV = CC="${CC}" \
CC_EXTRA_OPTS="${CFLAGS} -DOPENSSL_NO_BUF_FREELISTS 
-DHAVE_ARC4RANDOM -I${LOCALBASE}/include" \
@@ -37,7 +35,8 @@ MAKE_ENV =CC="${CC}" \
 MASTER_SITES = http://www.kamailio.org/pub/kamailio/${VERSION}/src/
 WRKDIST =  ${WRKDIR}/kamailio-${VERSION}
 
-WANTLIB-main = c crypto curl expat event_core event_extra iconv m \
+WANTLIB-main = ${COMPILER_LIBCXX} \
+   c crypto curl expat event_core event_extra iconv m \
pcre pthread ssl lzma xml2 curses readline unistring z
 
 LIB_DEPENDS-main = converters/libiconv \
@@ -51,6 +50,7 @@ KAMAILIO_GROUPS = kstandard kcpl khttp_a
 
 FLAVOR ?=
 MULTI_PACKAGES =   -main
+DEBUG_PACKAGES =   ${BUILD_PACKAGES}
 
 USE_GMAKE =Yes
 NO_TEST =  Yes
@@ -68,15 +68,14 @@ MAKE_FLAGS =LIBDIR=lib \
group_include="${KAMAILIO_GROUPS}" \
LIBsrdb1_VERSION=${LIBsrdb1_VERSION} \
LIBsrdb2_VERSION=${LIBsrdb2_VERSION} \
-   LIBtrie_VERSION=${LIBtrie_VERSION} \
-   LIBsrutils_VERSION=${LIBsrutils_VERSION} \
+   LIBtrie_VERSION=${LIBtrie_VERSION}
 
 PSEUDO_FLAVORS +=  no_berkeley
 .if !${FLAVOR:Mno_berkeley}
 MULTI_PACKAGES +=  -berkeley
 COMMENT-berkeley = kamailio berkeley db module
 KAMAILIO_GROUPS += kberkeley
-WANTLIB-berkeley = c db pthread lib/kamailio/srdb1 lib/kamailio/srdb2
+WANTLIB-berkeley = c db m pthread lib/kamailio/srdb1 lib/kamailio/srdb2
 LIB_DEPENDS-berkeley = databases/db/v4,-main,no_java telephony/kamailio,-main
 .endif
 
@@ -85,7 +84,7 @@ PSEUDO_FLAVORS += no_postgresql
 MULTI_PACKAGES +=  -postgresql
 COMMENT-postgresql =   kamailio postgresql module
 KAMAILIO_GROUPS += kpostgres
-WANTLIB-postgresql =   pq pthread lib/kamailio/srdb1 lib/kamailio/srdb2
+WANTLIB-postgresql =   m pq pthread lib/kamailio/srdb1 lib/kamailio/srdb2
 LIB_DEPENDS-postgresql = databases/postgresql,-main telephony/kamailio,-main
 .endif
 
@@ -94,7 +93,7 @@ PSEUDO_FLAVORS += no_mysql
 MULTI_PACKAGES +=  -mysql
 COMMENT-mysql =kamailio mysql module
 KAMAILIO_GROUPS += kmysql
-WANTLIB-mysql =crypto m pthread ssl z mysqlclient \
+WANTLIB-mysql =m mariadb pthread \
lib/kamailio/srdb1 lib/kamailio/srdb2
 LIB_DEPENDS-mysql =databases/mariadb,-main telephony/kamailio,-main
 .endif
@@ -104,7 +103,7 @@ PSEUDO_FLAVORS +=   no_ldap
 MULTI_PACKAGES +=  -ldap
 COMMENT-ldap = kamailio LDAP modules
 KAMAILIO_GROUPS += kldap
-WANTLIB-ldap = ldap pthread lib/kamailio/srdb2
+WANTLIB-ldap = ldap m pthread lib/kamailio/srdb2
 LIB_DEPENDS-ldap = databases/openldap,-main telephony/kamailio,-main
 .endif
 
@@ -123,7 +122,7 @@ PSEUDO_FLAVORS +=   no_snmpstats
 MULTI_PACKAGES +=  -snmpstats
 COMMENT-snmpstats =kamailio snmpstats module
 KAMAILIO_GROUPS += ksnmpstats
-WANTLIB-snmpstats =netsnmp netsnmpagent netsnmpmibs pthread
+WANTLIB-snmpstats =m netsnmp netsnmpagent netsnmpmibs pthread
 LIB_DEPENDS-snmpstats =net/net-snmp
 .endif
 
@@ -132,7 +131,7 @@ PSEUDO_FLAVORS +=   no_carrierroute
 MULTI_PACKAGES +=  -carrierroute
 COMMENT-carrierroute = kamailio carrierroute module
 KAMAILIO_GROUPS += kcarrierroute
-WANTLIB-carrierroute = pthread lib/kamailio/srdb1 lib/kamailio/trie
+WANTLIB-carrierroute = m pthread lib/kamailio/srdb1 l

textproc/zoem -fno-common fix

[Theo Buehler]

Straightforward fix. The version.h header is oth generated and packaged,
I thought it better to fix both the generating script and the header.

Upstream has been dormant during the past decade, but they have updated
their homepage to use TLS.

Basic macros still work.

Index: Makefile
===
RCS file: /cvs/ports/textproc/zoem/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile12 Jul 2019 20:50:17 -  1.12
+++ Makefile4 Feb 2021 20:26:17 -
@@ -6,8 +6,9 @@ V=  09-149
 DISTNAME=  zoem-${V}
 PKGNAME=   zoem-${V:S,-,_,}
 CATEGORIES=textproc lang
+REVISION=  0
 
-HOMEPAGE=  http://micans.org/zoem/
+HOMEPAGE=  https://micans.org/zoem/
 
 # GPLv2
 PERMIT_PACKAGE=Yes
Index: patches/patch-setversion
===
RCS file: patches/patch-setversion
diff -N patches/patch-setversion
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-setversion4 Feb 2021 20:21:24 -
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Fix for -fno-common
+
+Index: setversion
+--- setversion.orig
 setversion
+@@ -25,8 +25,8 @@ vsh='src/version.h'
+ echo -n '' > $vsh
+ echo '#ifndef zoem_version_h__' >> $vsh
+ echo '#define zoem_version_h__' >> $vsh
+-echo 'char *zoemDateTag;' >> $vsh
+-echo 'char *zoemNumTag;' >> $vsh
++echo 'extern char *zoemDateTag;' >> $vsh
++echo 'extern char *zoemNumTag;' >> $vsh
+ echo '#endif' >> $vsh
+ 
+ vsc='src/version.c'
Index: patches/patch-src_version_h
===
RCS file: patches/patch-src_version_h
diff -N patches/patch-src_version_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_version_h 4 Feb 2021 20:36:08 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Fix for -fno-common
+
+Index: src/version.h
+--- src/version.h.orig
 src/version.h
+@@ -1,5 +1,5 @@
+ #ifndef zoem_version_h__
+ #define zoem_version_h__
+-char *zoemDateTag;
+-char *zoemNumTag;
++extern char *zoemDateTag;
++extern char *zoemNumTag;
+ #endif

textproc/pinfo: fix for -fno-common and -O0

[Theo Buehler]

Obvious fix to avoid duplicate definition of use_manual. The conversion
from inline to static inline fixes the build with -O0. I ran into that
because I tested with CFLAGS=-fno-common which removed -O2. I can land
that separately if desired. Regen plist while there.

Index: Makefile
===
RCS file: /cvs/ports/textproc/pinfo/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile12 Jul 2019 20:50:10 -  1.18
+++ Makefile4 Feb 2021 19:57:03 -
@@ -3,7 +3,7 @@
 COMMENT=   info viewer with lynx-style navigation
 
 DISTNAME=  pinfo-0.6.9
-REVISION=  1
+REVISION=  2
 CATEGORIES=textproc devel
 
 HOMEPAGE=  https://alioth.debian.org/frs/?group_id=30592
Index: patches/patch-src_filehandling_functions_c
===
RCS file: /cvs/ports/textproc/pinfo/patches/patch-src_filehandling_functions_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_filehandling_functions_c
--- patches/patch-src_filehandling_functions_c  19 Nov 2007 18:31:03 -  
1.2
+++ patches/patch-src_filehandling_functions_c  4 Feb 2021 19:53:53 -
@@ -1,6 +1,7 @@
 $OpenBSD: patch-src_filehandling_functions_c,v 1.2 2007/11/19 18:31:03 mgrimm 
Exp $
 src/filehandling_functions.c.orig  Sun Jul  8 17:06:45 2007
-+++ src/filehandling_functions.c   Sun Jul  8 17:09:39 2007
+Index: src/filehandling_functions.c
+--- src/filehandling_functions.c.orig
 src/filehandling_functions.c
 @@ -139,6 +139,7 @@ dirpage_lookup(char **type, char ***message, long *lin
char name[256];
char file[256];
@@ -35,3 +36,21 @@ $OpenBSD: patch-src_filehandling_functio
strncpy(file, filestart + 1, fileend - filestart - 1);
file[fileend - filestart - 1] = 0;
strncpy(name, fileend + 1, dot - fileend - 1);
+@@ -551,7 +551,7 @@ seek_tag_table(FILE * id,int quiet)
+   return 1;
+ }
+ 
+-inline void
++static inline void
+ buildcommand(char *dest, char *command, char *filename, const char 
*tmpfilename)
+ {
+   strcpy(dest, command);
+@@ -561,7 +561,7 @@ buildcommand(char *dest, char *command, char *filename
+   strcat(dest, tmpfilename);
+ }
+ 
+-inline void
++static inline void
+ builddircommand(char *dest, char *command, char *filename, const char 
*tmpfilename)
+ {
+   strcpy(dest, command);
Index: patches/patch-src_initializelinks_c
===
RCS file: patches/patch-src_initializelinks_c
diff -N patches/patch-src_initializelinks_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_initializelinks_c 4 Feb 2021 19:54:55 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/initializelinks.c
+--- src/initializelinks.c.orig
 src/initializelinks.c
+@@ -75,7 +75,7 @@ compare_tag_table_string(char *base, char *compared)
+  * checks if an item belongs to tag table. returns 1 on success and 0 on
+  * failure.  It should be optimised...
+  */
+-inline int
++static inline int
+ exists_in_tag_table(char *item)
+ {
+   if (gettagtablepos(item) != -1)
Index: patches/patch-src_parse_config_h
===
RCS file: patches/patch-src_parse_config_h
diff -N patches/patch-src_parse_config_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_parse_config_h4 Feb 2021 19:51:07 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix for -fno-common
+
+Index: src/parse_config.h
+--- src/parse_config.h.orig
 src/parse_config.h
+@@ -85,7 +85,7 @@ typedef struct colours
+ colours;
+ #endif /* NO_COLOR_CURSES */
+ 
+-int use_manual;
++extern int use_manual;
+ 
+ int parse_config (void);
+ int parse_line (char *line);
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/pinfo/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   19 Nov 2007 18:31:03 -  1.3
+++ pkg/PLIST   4 Feb 2021 19:57:22 -
@@ -1,5 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.3 2007/11/19 18:31:03 mgrimm Exp $
-bin/pinfo
+@bin bin/pinfo
 @info info/pinfo.info
 @man man/man1/pinfo.1
 share/examples/pinfo/
@@ -7,8 +7,6 @@ share/examples/pinfo/pinforc
 @sample ${SYSCONFDIR}/pinforc
 share/locale/cs/LC_MESSAGES/pinfo.mo
 share/locale/de/LC_MESSAGES/pinfo.mo
-share/locale/eu/
-share/locale/eu/LC_MESSAGES/
 share/locale/eu/LC_MESSAGES/pinfo.mo
 share/locale/ja/LC_MESSAGES/pinfo.mo
 share/locale/nl/LC_MESSAGES/pinfo.mo

[update] x11/wmtime 1.0 -> 1.4 (-fno-common fix)

[Charlene Wendling]

Here is an update for wmtime to 0.4. The main change is that it uses
libdockapp now.

Port-wise:

- drop wmgeneral stuff (it's in libdockapp)
- remove the upstream Makefile patch, explaining that ours expanded
- once again, i had to add libconv flags

Testing:

This builds and works fine on macppc and amd64.

OK? 

Charlène.


Index: Makefile
===
RCS file: /cvs/ports/x11/wmtime/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- Makefile12 Jul 2019 21:02:30 -  1.19
+++ Makefile4 Feb 2021 19:38:09 -
@@ -2,23 +2,32 @@
 
 COMMENT=   time/date applet for WindowMaker
 
-DISTNAME=  wmtime-1.0b2
-REVISION=  2
+DISTNAME=  wmtime-1.4
 CATEGORIES=x11 x11/windowmaker
 
+HOMEPAGE=  https://www.dockapps.net/wmtime
+
 # GPL
 PERMIT_PACKAGE=Yes
 
-WANTLIB=   X11 Xext Xpm c m
+WANTLIB += X11 Xext Xpm c dockapp iconv m
 
-MASTER_SITES=  http://mirror2.unixfreunde.de/ \
-   http://web.cs.mun.ca/~gstarkes/wmaker/dockapps/files/
+MASTER_SITES=  https://www.dockapps.net/download/
 
-MAKE_FLAGS=CC="${CC}"
+LIB_DEPENDS=   converters/libiconv \
+   devel/libdockapp>=0.7.3
 
-WRKDIST=${WRKDIR}/wmtime.app
-WRKSRC=${WRKDIST}/wmtime
+MAKE_FLAGS+=   CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+   MANDIR="${PREFIX}/man/man1"
 
 NO_TEST=   Yes
+
+CFLAGS+=   -I${X11BASE}/include -I${LOCALBASE}/include
+
+LDFLAGS+=  -L${X11BASE}/lib -L${LOCALBASE}/lib -liconv
+
+WRKDIST=   ${WRKDIR}/dockapps-7d1ef92
+
+ALL_TARGET+=   wmtime
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/x11/wmtime/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo18 Jan 2015 03:16:04 -  1.4
+++ distinfo4 Feb 2021 19:38:09 -
@@ -1,2 +1,2 @@
-SHA256 (wmtime-1.0b2.tar.gz) = +6R8IM7ej5d73TzB5Rs+1su1Tx1oAi2Q+cSnDBVynZY=
-SIZE (wmtime-1.0b2.tar.gz) = 20680
+SHA256 (wmtime-1.4.tar.gz) = lY/qJBAAlJ755JK950FQlVLdw6mbSyhd2e7XkDVTQ5Y=
+SIZE (wmtime-1.4.tar.gz) = 19045
Index: patches/patch-wmgeneral_list_h
===
RCS file: patches/patch-wmgeneral_list_h
diff -N patches/patch-wmgeneral_list_h
--- patches/patch-wmgeneral_list_h  5 May 2017 13:48:23 -   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-wmgeneral_list_h,v 1.1 2017/05/05 13:48:23 jca Exp $
-
-Index: wmgeneral/list.h
 wmgeneral/list.h.orig
-+++ wmgeneral/list.h
-@@ -29,9 +29,7 @@ Boston, MA 02111-1307, USA.  */
- #ifndef __LIST_H_
- #define __LIST_H_
- 
--#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
--# define INLINE inline
--#else
-+#if 1
- # define INLINE
- #endif
- 
Index: patches/patch-wmtime_Makefile
===
RCS file: patches/patch-wmtime_Makefile
diff -N patches/patch-wmtime_Makefile
--- patches/patch-wmtime_Makefile   26 Dec 2000 18:22:14 -  1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,30 +0,0 @@
-$OpenBSD: patch-wmtime_Makefile,v 1.1.1.1 2000/12/26 18:22:14 naddy Exp $
 wmtime/Makefile.orig   Tue May 19 23:04:53 1998
-+++ wmtime/MakefileTue Dec 26 19:02:32 2000
-@@ -1,18 +1,23 @@
--LIBDIR = -L/usr/X11R6/lib
-+LIBDIR = -L${X11BASE}/lib
- LIBS   = -lXpm -lXext -lX11 -lm
- OBJS =wmtime.o \
-   ../wmgeneral/wmgeneral.o \
-   ../wmgeneral/misc.o \
-   ../wmgeneral/list.o
- 
-+all: wmtime
-+
- .c.o:
--  cc -c -O2 -Wall $< -o $*.o
-+  $(CC) $(CFLAGS) -I$(X11BASE)/include -c $< -o $@
- 
- wmtime: $(OBJS)
--  cc -o wmtime $^ $(LIBDIR) $(LIBS)
-+  $(CC) -o wmtime $(OBJS) $(LIBDIR) $(LIBS)
- 
- clean::
-   for i in $(OBJS) ; do \
-   rm $$i; \
-   done
-   rm wmtime
-+
-+install:
-+  ${BSD_INSTALL_PROGRAM} wmtime ${PREFIX}/bin
Index: patches/patch-wmtime_wmtime_c
===
RCS file: /cvs/ports/x11/wmtime/patches/patch-wmtime_wmtime_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-wmtime_wmtime_c
--- patches/patch-wmtime_wmtime_c   5 May 2017 13:47:35 -   1.2
+++ patches/patch-wmtime_wmtime_c   4 Feb 2021 19:38:09 -
@@ -1,26 +1,15 @@
 $OpenBSD: patch-wmtime_wmtime_c,v 1.2 2017/05/05 13:47:35 jca Exp $
-Index: wmtime/wmtime.c
 wmtime/wmtime.c.orig
-+++ wmtime/wmtime.c
-@@ -98,7 +98,7 @@ void printversion(void);
- void wmtime_routine(int, char **);
- void get_lang();
+Index: wmtime.c
+--- wmtime.c.orig
 wmtime.c
+@@ -282,8 +282,8 @@ void wmtime_routine(int argc, char **argv) {
  
--void main(int argc, char *argv[]) {
-+int main(int argc, char *argv[]) {
- 
-   int i;
-   
-@@ -187,9 +187,9 @@ void wmtime_routine(int argc, char **argv) {
struct tm   *time_struct;

Re: x11/xtacy fix (Re: updated -fno-common failure list, 3 Feb)

[Stuart Henderson]

On 2021/02/05 02:05, Yozo TODA wrote:
> > x11/xtacy
> 
> only two additional patches are needed to compile with -fno-common;
> patch-trippy_c and patch-trippy_h.

Thank you, committed

> -- yozo.

> $OpenBSD$
> 
> the definitions of "global" vars moved to trippy.c
> 
> Index: trippy.c
> --- trippy.c.orig
> +++ trippy.c
> @@ -65,6 +65,25 @@
>  
>  #define VERSION "1.14"
>  
> +/* ** global vars definition block starts ** */
> +Display *display;
> +Screen *scr;
> +int screen;
> +int nwindows, nvisible;
> +int *visible;
> +Window *window;
> +Colormap colmap; /* One map to bind them... */
> +unsigned int *CX, *CY, *M, *HC;
> +Colormap colmap;
> +
> +int numcolors;
> +int share_colors;
> +GC *color_gcs;
> +long** colors; /* [NCOLORS][3]; */
> +double SinTbl[32];
> +char *progname;
> +/* ** global vars definition block ends ** */
> +
>  struct foo options;
>  int *jj;
>  int startup=0;

> $OpenBSD$
> 
> the definitions of "global" vars moved to trippy.c
> 
> Index: trippy.h
> --- trippy.h.orig
> +++ trippy.h
> @@ -189,24 +189,24 @@ void exit_xload();
>  #define max(x,y) ((x>y)?x:y)
>  #define min(x,y) ((x  
> -Display *display;
> -Screen *scr;
> +extern Display *display;
> +extern Screen *scr;
>  
> -int screen;
> -int nwindows, nvisible;
> -int *visible;
> -Window *window;
> -Colormap colmap; /* One map to bind them... */
> -unsigned int *CX, *CY, *M, *HC;
> +extern int screen;
> +extern int nwindows, nvisible;
> +extern int *visible;
> +extern Window *window;
> +extern Colormap colmap; /* One map to bind them... */
> +extern unsigned int *CX, *CY, *M, *HC;
>  
> -int numcolors;
> -int share_colors;
> -GC *color_gcs;
> -long** colors; /* [NCOLORS][3]; */
> -double SinTbl[32];
> +extern int numcolors;
> +extern int share_colors;
> +extern GC *color_gcs;
> +extern long** colors; /* [NCOLORS][3]; */
> +extern double SinTbl[32];
>  extern Cursor mycursor ;
>  
> -char *progname;
> +extern char *progname;
>  
>  #if defined (__cplusplus) || defined (c_plusplus)
>  }

Re: Question about lang/ghc module (trying to port git-annex)

[Greg Steuck]

James Cook  writes:

> I don't think that's an rsync problem. Unfortunately the
> git-annex-shell binary is missing, and that's pretty critical (needed
> to access the repository from other machines; sort of like git
> push/pull).

This part is easy, patch attached.

> Incidentally, the man pages also seem to be missing.

Would you like to try your hand in extending post-install target with
some man formatting magic like we have in other ports?

> Alternatively, I think the cabal (v2-)install commands installs what's
> needed (at least, it gets git-annex-shell, which is the really
> important thing). Is there some way to take advantage of that in your
> cabal infrastrsucture?

>From what I gathered the v2-install target is largely unusable for
installing packages outside of .cabal tree. At least neither I nor
FreeBSD maintainer found a way to leverage that. Hence the manual
install flow.

>From f190225986ed8e355ecd0622812539f82e35ac36 Mon Sep 17 00:00:00 2001
From: Greg Steuck 
Subject: [PATCH] fixup: git-annex post-install

All 975 tests passed (977.23s)
---
 devel/git-annex/Makefile  | 5 +
 devel/git-annex/pkg/PLIST | 2 ++
 2 files changed, 7 insertions(+)

diff --git devel/git-annex/Makefile devel/git-annex/Makefile
index 63996c8f9c3..134fe5a030f 100644
--- devel/git-annex/Makefile
+++ devel/git-annex/Makefile
@@ -27,6 +27,11 @@ MAKE_ENV =   LC_ALL=en_US.UTF-8
 MODCABAL_STEM =git-annex
 MODCABAL_VERSION = 8.20210127
 
+# Manual reimplementation of postCopy hook of Setup.hs
+post-install:
+   @ln -s git-annex ${PREFIX}/bin/git-annex-shell
+   @ln -s git-annex ${PREFIX}/bin/git-remote-tor-annex
+
 # Produced by:
 # $ cabal-bundler --openbsd git-annex-8.20210127
 # Then manually remove:git-annex   8.20210127  0
diff --git devel/git-annex/pkg/PLIST devel/git-annex/pkg/PLIST
index 2a5b445b27d..d52ede016f8 100644
--- devel/git-annex/pkg/PLIST
+++ devel/git-annex/pkg/PLIST
@@ -1,2 +1,4 @@
 @comment $OpenBSD: PLIST,v$
 @bin bin/${MODCABAL_STEM}
+bin/${MODCABAL_STEM}-shell
+bin/git-remote-tor-annex
-- 
2.30.0

Re: FIX: lang/gcc/8 ICEs on hppa

[Kurt Miller]

On Thu, 2021-02-04 at 08:48 -0500, k...@intricatesoftware.com wrote:
> gcc 8 ICEs on python 2 and 3 on hppa:
> 
> In file included from Include/Python.h:94,
>  from Objects/complexobject.c:8:
> Objects/complexobject.c: In function '_Py_c_pow':
> Include/complexobject.h:21:15: internal compiler error: in 
> expand_expr_addr_expr_1, at expr.c:8026
>  #define c_pow _Py_c_pow
>    ^
> Objects/complexobject.c:128:1: note: in expansion of macro 'c_pow'
>  c_pow(Py_complex a, Py_complex b)
>  ^
> libbacktrace could not find executable to open
> Please submit a full bug report,
> with preprocessed source if appropriate.
> See  for instructions.
> 
> I found this bug report and fix for gcc 9 that fixes the ICE
> on hppa and opens up a bunch of ports to be built that depend
> on python 2/3:
> 
> https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89487
> 
> So far I've only tested this on hppa with small number of ports.
> Can bulk builders include this patch on other arches to get better
> test coverage?

Please disregard this patch. When I checked on the build this
morning, I looked at the wrong window and saw dpb completed
without errors. In fact this does not fix the ICE on hppa.
Sorry for the noise.

-Kurt

Re: Security UPDATE www/privoxy

[Bjorn Ketelaars]

On Thu 04/02/2021 18:08, Stuart Henderson wrote:
> On 2021/02/04 18:39, Bjorn Ketelaars wrote:
> > A newer version of privoxy is available, which addresses 2 CVE's:
> > 
> > CVE-2021-20217
> > Prevent an assertion from getting triggered by a crafted CGI request.
> > 
> > CVE-2021-20216
> > Fixed a memory leak when decompression fails "unexpectedly".
> > 
> > Lightly run tested on amd64.
> > 
> > I think it makes sense to backport this update to 6.8.
> > 
> > Comments, OK?
> 
> There's a missing $(DESTDIR) on line 971 of GNUmakefile.in that breaks
> packaging if privoxy is already installed
> 
> >  @group
> > +share/examples/privoxy/templates/edit-actions-for-url-string-filter
> 
> That one needs an @sample adding too
> 
> >  share/examples/privoxy/templates/edit-actions-list
> >  @owner _privoxy
> >  @group _privoxy

Thanks you for the feedback. New diff:


diff --git Makefile Makefile
index 7a4eaea8135..5a78a32cb51 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
 
 COMMENT=   web proxy with advanced filtering capabilities
 
-V= 3.0.29
+V= 3.0.31
 DISTNAME=  privoxy-${V}-stable
 PKGNAME=   privoxy-${V}
 CATEGORIES=www
@@ -16,6 +16,7 @@ WANTLIB += c crypto pcre pcreposix pthread ssl z
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=ijbswa/}
 EXTRACT_SUFX=  -src.tar.gz
+FIX_EXTRACT_PERMISSIONS=   Yes
 
 # there are tests which can be run with tools/privoxy-regression-test.pl
 # they require privoxy to be running, and http_proxy=http://127.0.0.1:8118/
diff --git distinfo distinfo
index a2fcc27dfab..dc802138e1a 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (privoxy-3.0.29-stable-src.tar.gz) = 
JcYGnv2vV31HwlfaY7A81tBj+3kOGcw5YD2C5dtySJ0=
-SIZE (privoxy-3.0.29-stable-src.tar.gz) = 1830550
+SHA256 (privoxy-3.0.31-stable-src.tar.gz) = 
B3cpo6rHkiKk6NiKZQ2QKNFv1LDWA42o9fXkcSDQBOs=
+SIZE (privoxy-3.0.31-stable-src.tar.gz) = 1839901
diff --git patches/patch-GNUmakefile_in patches/patch-GNUmakefile_in
index c82ff15d249..ca289ca00e9 100644
--- patches/patch-GNUmakefile_in
+++ patches/patch-GNUmakefile_in
@@ -12,3 +12,12 @@ Index: GNUmakefile.in
  
  
  #
+@@ -968,7 +968,7 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
+   $(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\
+   $(ECHO) Installing fresh $$i;\
+   $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || 
exit 1;\
+-  elif [ -s "$(CONF_DEST)/$$i" ]; then \
++  elif [ -s "$(DESTDIR)$(CONF_DEST)/$$i" ]; then \
+   $(ECHO) Installing $$i as $$i.new ;\
+   $(INSTALL) $$INSTALL_CONF $$i 
$(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
+   NEW=1;\
diff --git pkg/PLIST pkg/PLIST
index 69363c61998..26f328642a1 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -6,7 +6,7 @@ bin/privoxy-log-parser.pl
 bin/privoxy-regression-test.pl
 bin/uagen.pl
 bin/url-pattern-translator.pl
-@man man/man1/privoxy.1
+@man man/man8/privoxy.8
 @bin sbin/privoxy
 share/doc/privoxy/
 share/doc/privoxy/AUTHORS
@@ -32,7 +32,6 @@ share/doc/privoxy/faq/index.html
 share/doc/privoxy/faq/installation.html
 share/doc/privoxy/faq/misc.html
 share/doc/privoxy/faq/trouble.html
-share/doc/privoxy/images/
 share/doc/privoxy/index.html
 share/doc/privoxy/man-page/
 share/doc/privoxy/man-page/privoxy-man-page.html
@@ -191,6 +190,12 @@ 
share/examples/privoxy/templates/edit-actions-for-url-filter
 @sample ${SYSCONFDIR}/privoxy/templates/edit-actions-for-url-filter
 @owner
 @group
+share/examples/privoxy/templates/edit-actions-for-url-string-filter
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/edit-actions-for-url-string-filter
+@owner
+@group
 share/examples/privoxy/templates/edit-actions-list
 @owner _privoxy
 @group _privoxy

x11/xtacy fix (Re: updated -fno-common failure list, 3 Feb)

[Yozo TODA]

> x11/xtacy

only two additional patches are needed to compile with -fno-common;
patch-trippy_c and patch-trippy_h.

-- yozo.
$OpenBSD$

the definitions of "global" vars moved to trippy.c

Index: trippy.c
--- trippy.c.orig
+++ trippy.c
@@ -65,6 +65,25 @@
 
 #define VERSION "1.14"
 
+/* ** global vars definition block starts ** */
+Display *display;
+Screen *scr;
+int screen;
+int nwindows, nvisible;
+int *visible;
+Window *window;
+Colormap colmap; /* One map to bind them... */
+unsigned int *CX, *CY, *M, *HC;
+Colormap colmap;
+
+int numcolors;
+int share_colors;
+GC *color_gcs;
+long** colors; /* [NCOLORS][3]; */
+double SinTbl[32];
+char *progname;
+/* ** global vars definition block ends ** */
+
 struct foo options;
 int *jj;
 int startup=0;
$OpenBSD$

the definitions of "global" vars moved to trippy.c

Index: trippy.h
--- trippy.h.orig
+++ trippy.h
@@ -189,24 +189,24 @@ void exit_xload();
 #define max(x,y) ((x>y)?x:y)
 #define min(x,y) ((x

Re: Security UPDATE www/privoxy

[Stuart Henderson]

On 2021/02/04 18:39, Bjorn Ketelaars wrote:
> A newer version of privoxy is available, which addresses 2 CVE's:
> 
> CVE-2021-20217
> Prevent an assertion from getting triggered by a crafted CGI request.
> 
> CVE-2021-20216
> Fixed a memory leak when decompression fails "unexpectedly".
> 
> Lightly run tested on amd64.
> 
> I think it makes sense to backport this update to 6.8.
> 
> Comments, OK?

There's a missing $(DESTDIR) on line 971 of GNUmakefile.in that breaks
packaging if privoxy is already installed

>  @group
> +share/examples/privoxy/templates/edit-actions-for-url-string-filter

That one needs an @sample adding too

>  share/examples/privoxy/templates/edit-actions-list
>  @owner _privoxy
>  @group _privoxy
> 

Security UPDATE www/privoxy

[Bjorn Ketelaars]

A newer version of privoxy is available, which addresses 2 CVE's:

CVE-2021-20217
Prevent an assertion from getting triggered by a crafted CGI request.

CVE-2021-20216
Fixed a memory leak when decompression fails "unexpectedly".

Lightly run tested on amd64.

I think it makes sense to backport this update to 6.8.

Comments, OK?


diff --git Makefile Makefile
index 7a4eaea8135..5a78a32cb51 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
 
 COMMENT=   web proxy with advanced filtering capabilities
 
-V= 3.0.29
+V= 3.0.31
 DISTNAME=  privoxy-${V}-stable
 PKGNAME=   privoxy-${V}
 CATEGORIES=www
@@ -16,6 +16,7 @@ WANTLIB += c crypto pcre pcreposix pthread ssl z
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=ijbswa/}
 EXTRACT_SUFX=  -src.tar.gz
+FIX_EXTRACT_PERMISSIONS=   Yes
 
 # there are tests which can be run with tools/privoxy-regression-test.pl
 # they require privoxy to be running, and http_proxy=http://127.0.0.1:8118/
diff --git distinfo distinfo
index a2fcc27dfab..dc802138e1a 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (privoxy-3.0.29-stable-src.tar.gz) = 
JcYGnv2vV31HwlfaY7A81tBj+3kOGcw5YD2C5dtySJ0=
-SIZE (privoxy-3.0.29-stable-src.tar.gz) = 1830550
+SHA256 (privoxy-3.0.31-stable-src.tar.gz) = 
B3cpo6rHkiKk6NiKZQ2QKNFv1LDWA42o9fXkcSDQBOs=
+SIZE (privoxy-3.0.31-stable-src.tar.gz) = 1839901
diff --git pkg/PLIST pkg/PLIST
index 69363c61998..c303dbc7a60 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -6,7 +6,7 @@ bin/privoxy-log-parser.pl
 bin/privoxy-regression-test.pl
 bin/uagen.pl
 bin/url-pattern-translator.pl
-@man man/man1/privoxy.1
+@man man/man8/privoxy.8
 @bin sbin/privoxy
 share/doc/privoxy/
 share/doc/privoxy/AUTHORS
@@ -32,7 +32,6 @@ share/doc/privoxy/faq/index.html
 share/doc/privoxy/faq/installation.html
 share/doc/privoxy/faq/misc.html
 share/doc/privoxy/faq/trouble.html
-share/doc/privoxy/images/
 share/doc/privoxy/index.html
 share/doc/privoxy/man-page/
 share/doc/privoxy/man-page/privoxy-man-page.html
@@ -191,6 +190,7 @@ share/examples/privoxy/templates/edit-actions-for-url-filter
 @sample ${SYSCONFDIR}/privoxy/templates/edit-actions-for-url-filter
 @owner
 @group
+share/examples/privoxy/templates/edit-actions-for-url-string-filter
 share/examples/privoxy/templates/edit-actions-list
 @owner _privoxy
 @group _privoxy

Re: Remove audio/xhippo

[Klemens Nanni]

On Sun, Jan 31, 2021 at 11:00:13PM +0100, Klemens Nanni wrote:
> Upstream at https://www.gnu.org/software/xhippo/ no longer provides
> distfiles since at least 2019, FreeBSD also has marked the port as such;
> the website says
> 
>   The GNU xhippo has been decommissioned.
> 
> I think we should stop carrying such cruft.
> 
> Other ports such as audio/mkplaylist do similar jobs, most media players
> also have such functionality, e.g. VLC does.

https://repology.org/project/xhippo/versions says HP-UX, OpenBSD, pkgsrc
and Rosalinux are the only ones packaging it.

Here's a fix, but I still prefer retiring the port.

OK/Objections for the two options?


Index: Makefile
===
RCS file: /cvs/ports/audio/xhippo/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- Makefile12 Jul 2019 21:02:13 -  1.44
+++ Makefile3 Feb 2021 13:55:18 -
@@ -4,7 +4,7 @@ COMMENT=generic playlist manager for UN
 
 DISTNAME=  xhippo-3.5
 CATEGORIES=audio
-REVISION = 5
+REVISION = 6
 
 HOMEPAGE=  https://www.gnu.org/software/xhippo/
 
Index: patches/patch-xhippo_h
===
RCS file: patches/patch-xhippo_h
diff -N patches/patch-xhippo_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-xhippo_h  4 Feb 2021 17:23:25 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix "-fno-common" build.
+
+Index: xhippo.h
+--- xhippo.h.orig
 xhippo.h
+@@ -182,7 +182,7 @@ extern guint contextid, 
+ extern gint last_played,
+   last_row_hit,
+   last_row_clicked;
+-fileaction *last_action;
++extern fileaction *last_action;
+ 
+ /* Configuration options */
+ extern gboolean mode_play_on_start, 

Re: lang/pcc: -fcommon

[Theo Buehler]

Here's a starting point for an update for pcc to 1.1.0. It builds with
-fno-common and depends on the attached new port of pcc-libs.

On amd64, it compiles a working hello world successfully (with -fPIC)
and produces a usable cat binary with 

  cd /usr/src/bin/cat && make CC=pcc DEBUG=-fpic STATIC=

I would probably still go with 1.0.0 and -fcommon as in my previous
mail, but if anyone is interested in finishing this up, I think it's
not too far off track.

Index: Makefile
===
RCS file: /cvs/ports/lang/pcc/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile31 Aug 2020 22:20:49 -  1.21
+++ Makefile4 Feb 2021 17:12:07 -
@@ -2,9 +2,8 @@
 
 COMMENT =  portable C compiler
 
-PCCVER =   1.0.0
+PCCVER =   1.1.0
 DISTNAME = pcc-${PCCVER}
-REVISION = 17
 EXTRACT_SUFX = .tgz
 
 CATEGORIES =   lang
@@ -18,6 +17,8 @@ ONLY_FOR_ARCHS = i386 amd64
 PERMIT_PACKAGE =   Yes
 
 WANTLIB += c
+
+RUN_DEPENDS =  devel/pcc-libs
 
 MASTER_SITES = http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/ \
ftp://pcc.ludd.ltu.se/pub/pcc-releases/
Index: distinfo
===
RCS file: /cvs/ports/lang/pcc/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo18 Jan 2015 03:14:19 -  1.2
+++ distinfo4 Feb 2021 16:57:49 -
@@ -1,2 +1,2 @@
-SHA256 (pcc-1.0.0.tgz) = WALbukbW6j+brapVuQRKBBa7QQAgwkpcKoouqvQRVss=
-SIZE (pcc-1.0.0.tgz) = 652308
+SHA256 (pcc-1.1.0.tgz) = 2eP+2Ex2fc3e+2sfhU1dqJIfP2XYvQKZd0NBL0FHTWQ=
+SIZE (pcc-1.1.0.tgz) = 848427
Index: pkg/PLIST
===
RCS file: /cvs/ports/lang/pcc/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   19 Apr 2012 14:47:17 -  1.1.1.1
+++ pkg/PLIST   4 Feb 2021 17:11:08 -
@@ -1,12 +1,9 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2012/04/19 14:47:17 okan Exp $
 @bin bin/pcc
-lib/pcc/
-lib/pcc/${CONFIG}/
-lib/pcc/${CONFIG}/${PCCVER}.RELEASE/
-lib/pcc/${CONFIG}/${PCCVER}.RELEASE/include/
-lib/pcc/${CONFIG}/${PCCVER}.RELEASE/lib/
+@bin bin/pcpp
 @bin libexec/ccom
 @bin libexec/cpp
+@bin libexec/cxxcom
 @man man/man1/ccom.1
 @man man/man1/cpp.1
 @man man/man1/pcc.1
Index: patches/patch-cc_cc_cc_c
===
RCS file: patches/patch-cc_cc_cc_c
diff -N patches/patch-cc_cc_cc_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-cc_cc_cc_c4 Feb 2021 17:12:13 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: cc/cc/cc.c
+--- cc/cc/cc.c.orig
 cc/cc/cc.c
+@@ -206,7 +206,7 @@ char *cppmdadd[] = CPPMDADD;
+ #define PCCLIBDIR NULL
+ #endif
+ #ifndef DEFLIBDIRS/* default library search paths */
+-#ifdef MULTIARCH_PATH
++#ifndef MULTIARCH_PATH
+ #define DEFLIBDIRS{ "/usr/lib/", 0 }
+ #else
+ #define DEFLIBDIRS{ "/usr/lib/", "/usr/lib/" MULTIARCH_PATH "/", 0 }
Index: patches/patch-cc_ccom_scan_l
===
RCS file: patches/patch-cc_ccom_scan_l
diff -N patches/patch-cc_ccom_scan_l
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-cc_ccom_scan_l4 Feb 2021 17:12:13 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: cc/ccom/scan.l
+--- cc/ccom/scan.l.orig
 cc/ccom/scan.l
+@@ -236,7 +236,8 @@ L?\"(\\.|[^\\"])*\"{ yylval.strp = yytext; return 
C_S
+ 
+ %%
+ 
+-int lineno, issyshdr;
++extern int lineno;
++int issyshdr;
+ char *ftitle = "";
+ 
+ int
Index: patches/patch-cc_cxxcom_scan_l
===
RCS file: patches/patch-cc_cxxcom_scan_l
diff -N patches/patch-cc_cxxcom_scan_l
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-cc_cxxcom_scan_l  4 Feb 2021 17:12:13 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: cc/cxxcom/scan.l
+--- cc/cxxcom/scan.l.orig
 cc/cxxcom/scan.l
+@@ -220,7 +220,8 @@ L?\"(\\.|[^\\"])*\"{ yylval.strp = yytext; return 
C_S
+ 
+ %%
+ 
+-int lineno, issyshdr;
++extern int lineno;
++int issyshdr;
+ char *ftitle = "";
+ 
+ static int


pcc-libs-1.1.0.tgz
Description: application/tar-gz

games/wmtictactoe: -fno-common fix

[Charlene Wendling]

Hi,

FreeBSD has been creative while fixing it [0]. This fixes the build
with -fno-common. Runtime has been tested successfully on amd64 and
macppc.

I've found the hard way that it requires permissions fixing while
issueing update-patches, and, while here, let's move upstream to
dockapps.net and refresh WANTLIB. The distfile checksum did not change.

OK?

Charlène.


[0]
https://svnweb.freebsd.org/ports/head/games/wmtictactoe/Makefile?view=markup&pathrev=549081#l22


Index: Makefile
===
RCS file: /cvs/ports/games/wmtictactoe/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- Makefile12 Jul 2019 20:46:26 -  1.19
+++ Makefile4 Feb 2021 16:59:00 -
@@ -4,12 +4,18 @@ COMMENT=  wm-dockapp; TicTacToe game
 
 DISTNAME=  wmtictactoe-1.1-1
 PKGNAME=   wmtictactoe-1.1.1
-REVISION = 2
+REVISION=  3
+FIX_EXTRACT_PERMISSIONS=   Yes
+
 CATEGORIES=games x11 x11/windowmaker
 
+HOMEPAGE=  https://www.dockapps.net/wmtictactoe
+
 # GPL
 PERMIT_PACKAGE=Yes
-WANTLIB=   X11 Xext Xpm c xcb
+WANTLIB=   X11 Xext Xpm c
+
+MASTER_SITES=  https://www.dockapps.net/download/
 
 NO_TEST=   Yes
 
Index: patches/patch-wmgeneral_wmgeneral_c
===
RCS file: patches/patch-wmgeneral_wmgeneral_c
diff -N patches/patch-wmgeneral_wmgeneral_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-wmgeneral_wmgeneral_c 4 Feb 2021 16:59:00 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix the build with -fno-common
+
+Index: wmgeneral/wmgeneral.c
+--- wmgeneral/wmgeneral.c.orig
 wmgeneral/wmgeneral.c
+@@ -65,6 +65,8 @@ char *Geometry = "";
+ GCNormalGC;
+ XpmIcon   wmgen;
+ Pixmappixmask;
++Display *display;
++Window  Root, iconwin, win;
+ 
+   /*/
+  /* Mouse Regions */
Index: patches/patch-wmgeneral_wmgeneral_h
===
RCS file: patches/patch-wmgeneral_wmgeneral_h
diff -N patches/patch-wmgeneral_wmgeneral_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-wmgeneral_wmgeneral_h 4 Feb 2021 16:59:00 -
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Fix the build with -fno-common
+
+Index: wmgeneral/wmgeneral.h
+--- wmgeneral/wmgeneral.h.orig
 wmgeneral/wmgeneral.h
+@@ -36,8 +36,8 @@ typedef struct {
+  /* Global variable */
+ /***/
+ 
+-Display   *display;
+-Window  Root, iconwin, win;
++extern Display*display;
++extern Window  Root, iconwin, win;
+ 
+ 
+   /***/
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/wmtictactoe/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   9 Feb 2001 13:02:38 -   1.1.1.1
+++ pkg/PLIST   4 Feb 2021 16:59:00 -
@@ -1,2 +1,2 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2001/02/09 13:02:38 wilfried Exp $
-bin/wmtictactoe
+@bin bin/wmtictactoe

Re: [maintainer update] graphics/chafa to 1.6.0

[Florian Viehweger]

Hi,


>this updates graphics/chafa to 1.6.0

did someone had the chance to test this?

--
greetings,

Florian Viehweger

Re: [maintainer update] graphics/chafa to 1.6.0

[Florian Viehweger]

Am 24. Januar 2021 08:17:22 UTC schrieb Florian Viehweger 
:
>Hi,
>
>this updates graphics/chafa to 1.6.0
>
>* Added support for fullwidth symbols that take up two character
>  cells. These are common in East Asian scripts. Single-cell and
>  double-cell symbols can be mixed, and -f symbols mode will use both
>  if possible.
>
>* New symbol tags: Alpha, digit, alnum, narrow, wide, ambiguous, ugly,
>  bad. "Ambiguous" symbols have uncertain widths and may render poorly
>  in some terminals. "Ugly" denotes symbols that are unsuitable for
>  Chafa's cell-based graphics (multicolor emoji, ideographic
>  descriptors, etc). "Bad" is a superset of these two categories. Bad
>  symbols are always excluded unless explicitly enabled with e.g.
>  CHAFA_SYMBOL_TAG_BAD (--symbols +bad in the frontend).
>
>* The font loader (--glyph-file option) now does a better job with
>  proportional fonts.
>
>* Added options for controlling lossless optimization of output.
>  Currently, attribute reuse and character repetition (REP sequence)
>  are implemented.
>
>* Added -O option to the frontend. This controls the optimization level.
>
>* Added a simple abstraction layer for terminal control sequences
>  (ChafaTermInfo and ChafaTermDb). This allows for improved terminal
>  support.
>
>* FbTerm is now supported with TERM=fbterm in the environment.
>
>* Bug fixes:
>  github#43  Fix signal handler (reported by Markus Elfring).
>  [unfiled]  Crash when invalid font paths were passed on command line.
>  [unfiled]  Small typo in fontgen's README (Tim Gates).
>  [unfiled]  Bad contrast adjustment in images with transparency.
>
>
>'make test' passes, as well as 'portcheck -N'. No issues found on amd64
>and i386.
>
>Feedback welcome.
>
>
>Index: Makefile
>===
>RCS file: /cvs/ports/graphics/chafa/Makefile,v
>retrieving revision 1.2
>diff -u -p -u -p -r1.2 Makefile
>--- Makefile   24 Sep 2020 20:05:22 -  1.2
>+++ Makefile   23 Jan 2021 15:36:15 -
>@@ -1,9 +1,9 @@
> # $OpenBSD: Makefile,v 1.2 2020/09/24 20:05:22 danj Exp $
> 
> COMMENT = character art facsimile generator
>-DISTNAME =chafa-1.4.1
>+DISTNAME =chafa-1.6.0
> 
>-SHARED_LIBS +=chafa 0.0 # 4.0
>+SHARED_LIBS +=chafa 0.0 # 5.0
> 
> CATEGORIES =  graphics
> 
>Index: distinfo
>===
>RCS file: /cvs/ports/graphics/chafa/distinfo,v
>retrieving revision 1.1.1.1
>diff -u -p -u -p -r1.1.1.1 distinfo
>--- distinfo   22 Sep 2020 22:08:23 -  1.1.1.1
>+++ distinfo   23 Jan 2021 15:36:15 -
>@@ -1,2 +1,2 @@
>-SHA256 (chafa-1.4.1.tar.xz) =
>RtNANPTJbRIOBjn4eiZZBCfMKelf5UiekDpI7JZAK6M= -SIZE (chafa-1.4.1.tar.xz)
>= 389428 +SHA256 (chafa-1.6.0.tar.xz) =
>BwbhAabg6AYzWutXRF4va+/+C+Kadh9WGXnoFpHCxoE= +SIZE (chafa-1.6.0.tar.xz)
>= 417888 Index: pkg/PLIST
>===
>RCS file: /cvs/ports/graphics/chafa/pkg/PLIST,v
>retrieving revision 1.1.1.1
>diff -u -p -u -p -r1.1.1.1 PLIST
>--- pkg/PLIST  22 Sep 2020 22:08:23 -  1.1.1.1
>+++ pkg/PLIST  23 Jan 2021 15:36:15 -
>@@ -6,6 +6,9 @@ include/chafa/chafa-canvas.h
> include/chafa/chafa-common.h
> include/chafa/chafa-features.h
> include/chafa/chafa-symbol-map.h
>+include/chafa/chafa-term-db.h
>+include/chafa/chafa-term-info.h
>+include/chafa/chafa-term-seq-def.h
> include/chafa/chafa-util.h
> include/chafa/chafa-version-macros.h
> include/chafa/chafa.h
>@@ -24,6 +27,8 @@ share/gtk-doc/html/chafa/ch02.html
> share/gtk-doc/html/chafa/chafa-ChafaCanvas.html
> share/gtk-doc/html/chafa/chafa-ChafaCanvasConfig.html
> share/gtk-doc/html/chafa/chafa-ChafaSymbolMap.html
>+share/gtk-doc/html/chafa/chafa-ChafaTermDb.html
>+share/gtk-doc/html/chafa/chafa-ChafaTermInfo.html
> share/gtk-doc/html/chafa/chafa-Features.html
> share/gtk-doc/html/chafa/chafa-Miscellaneous.html
> share/gtk-doc/html/chafa/chafa-building.html
>
>
>-- 
>greetings,
>
>Florian Viehweger
>

--
greetings,

Florian Viehweger

lang/pcc: -fcommon

[Theo Buehler]

Fixing pcc 1.0.0 for -fno-common is a bit hairy. It is relatively easy
to update the port itself to 1.1.0 (and it requires two obvious patches
for -fno-common), but the resulting pcc binary seems useless without
pcc-libs. Porting those seems to require more effort than I want to
invest.  Thus, I suggest to add -fcommon and leave a comment in hopes
that the person updating to 1.1.0 will care enough about it to remove
-fcommon.

Index: Makefile
===
RCS file: /cvs/ports/lang/pcc/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile31 Aug 2020 22:20:49 -  1.21
+++ Makefile4 Feb 2021 13:55:15 -
@@ -4,7 +4,7 @@ COMMENT =   portable C compiler
 
 PCCVER =   1.0.0
 DISTNAME = pcc-${PCCVER}
-REVISION = 17
+REVISION = 18
 EXTRACT_SUFX = .tgz
 
 CATEGORIES =   lang
@@ -18,6 +18,9 @@ ONLY_FOR_ARCHS = i386 amd64
 PERMIT_PACKAGE =   Yes
 
 WANTLIB += c
+
+# pcc 1.1.0 is easily fixed for -fno-common, but requires porting pcc-libs
+CFLAGS += -fcommon
 
 MASTER_SITES = http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/ \
ftp://pcc.ludd.ltu.se/pub/pcc-releases/

Re: UPDATE: devel/boehm-gc 8.0.4

[Kurt Miller]

On Thu, 2021-02-04 at 15:25 +0100, Janne Johansson wrote:
> Den tors 4 feb. 2021 kl 14:47 skrev Janne Johansson :
> 
> > 
> > > 
> > > k...@intricatesoftware.com wrote:
> > > > 
> > > > Update to 8.0.4 with the following additional changes:
> > > > Additional testing on mips, powerpc, etc. would be appreciated.
> > Mips64:
> > 
> > make  check-TESTS
> > 
> > 
> > Testsuite summary for gc 8.0.4
> > 
> > 
> > # TOTAL: 17
> > # PASS:  17
> > 
> > 
> > w3m still building...
> > 
> w3m on wikipedia and other sites works fine too.
> 

Great. Thank you for testing it.

-Kurt

Re: UPDATE: devel/boehm-gc 8.0.4

[Janne Johansson]

Den tors 4 feb. 2021 kl 14:47 skrev Janne Johansson :

> > k...@intricatesoftware.com wrote:
> > > Update to 8.0.4 with the following additional changes:
> > > Additional testing on mips, powerpc, etc. would be appreciated.
>
> Mips64:
>
> make  check-TESTS
>
> 
> Testsuite summary for gc 8.0.4
>
> 
> # TOTAL: 17
> # PASS:  17
>
> 
> w3m still building...
>

w3m on wikipedia and other sites works fine too.

-- 
May the most significant bit of your life be positive.

Re: UPDATE: devel/boehm-gc 8.0.4

[Kurt Miller]

On Wed, 2021-02-03 at 22:42 +, Stuart Henderson wrote:
> On 2021/02/02 18:40, k...@intricatesoftware.com wrote:
> > 
> > Update to 8.0.4 with the following additional changes:
> > - Use mmap via the configure argument instead of hard-coding it.
> > - Define USE_MMAP_ANON for all OpenBSD arch to match upstream
> >   code conventions.
> > - Remove unused ELF_CLASS define for OpenBSD.
> > - Remove old HAVE_DL_ITERATE_PHDR workaround for OpenBSD.
> > - Don't use old GC_find_limit_openbsd() which is only needed for
> >   uthreads.
> > 
> > I've tested this on i386, amd64, sparc64 and aarch64 using the
> > port's regress tests and by using w3m. Note that on aarch64 the
> > current boehm-gc port isn't stable and w3m will crash it pretty
> > easily. This update has not fixed that (aarch64 is still unstable
> > but the regress tests pass).
> > 
> > Additional testing on mips, powerpc, etc. would be appreciated.
> I'm OK with this, it's a significant clean-up for what is one of the
> trickiest ports in the tree, but tests on other arches would be welcome.
> 
> Note to testers: building w3m against the new boehm-gc and browsing
> a selection of pages is good for testing; following a few links around
> wikipedia or something is often enough to pick up problems.
> 
> Kurt, I know it's just papering over the problem but what do you think
> about setting -O1 in the w3m port for aarch64 for now?
> 

Thanks. I'd like a bit more time to investigate w3m on aarch64, but if
I can't figure it out, sure we can set it to -O1 so it works.

-Kurt

Re: UPDATE: devel/boehm-gc 8.0.4

[Kurt Miller]

On Wed, 2021-02-03 at 23:37 -0500, George Koehler wrote:
> On Tue, 2 Feb 2021 18:40:50 -0500 (EST)
> k...@intricatesoftware.com wrote:
> 
> > 
> > Update to 8.0.4 with the following additional changes:
> > - Use mmap via the configure argument instead of hard-coding it.
> > - Define USE_MMAP_ANON for all OpenBSD arch to match upstream
> >   code conventions.
> > - Remove unused ELF_CLASS define for OpenBSD.
> > - Remove old HAVE_DL_ITERATE_PHDR workaround for OpenBSD.
> > - Don't use old GC_find_limit_openbsd() which is only needed for
> >   uthreads.
> > 
> > I've tested this on i386, amd64, sparc64 and aarch64 using the
> > port's regress tests and by using w3m
> Your update to 8.0.4 passes the port's "make test" on powerpc and
> powerpc64.  It works with net/clic on powerpc64.  ok gkoehler@
> 
> This update fixes -fno-common
> 
> I like how you adjusted the patches, and you tested the port on
> multiple platforms.  I had added the mmap patch along with the
> powerpc64 support, but upstream has changed their mmap code, so you
> needed to adjust the patch.  Defining USE_MMAP_ANON for each arch
> is exactly what upstream does for systems like Mac (DARWIN).  Another
> way is at include/private/gcconfig.h.orig:2906, where upstream defines
> USE_MMAP_ANON for all arches of LINUX.--George

Thanks for the review and tests. Indeed I missed that part of
gcconfig.h, thanks for pointing it out. My intent was to have
the configure argument control the use of mmap, but I see that
I didn't get that quite right due to this part:

#if defined(USE_MMAP_ANON) && !defined(USE_MMAP)
#   define USE_MMAP 1
#elif defined(LINUX) && defined(USE_MMAP)
/* The kernel may do a somewhat better job merging mappings etc.*/
/* with anonymous mappings. */
#   define USE_MMAP_ANON
#endif

The way I have it now it always uses mmap, so I'd like to
revise that to remove the USE_MMAP_ANON per arch and adjust
this section above as follows to allow the configure argument
to control the use of mmap:

#if defined(USE_MMAP_ANON) && !defined(USE_MMAP)
#   define USE_MMAP 1
#elif defined(LINUX) && defined(USE_MMAP)
/* The kernel may do a somewhat better job merging mappings etc.*/
/* with anonymous mappings. */
#   define USE_MMAP_ANON
#elif defined(OPENBSD) && defined(USE_MMAP)
#   define USE_MMAP_ANON
#endif

I'm not sure if my MUA will mangle the in-line diff so I'll
attach it was well.

Index: Makefile
===
RCS file: /cvs/ports/devel/boehm-gc/Makefile,v
retrieving revision 1.75
diff -u -p -u -r1.75 Makefile
--- Makefile24 Aug 2020 21:31:13 -  1.75
+++ Makefile4 Feb 2021 14:13:31 -
@@ -3,8 +3,8 @@
 COMMENT-main=  garbage collection and memory leak detection for C and C++
 COMMENT-atomic=access to hardware provided atomic memory operations
 
-VERSION=   7.6.0
-LIBAO_VERSION= 7.6.6
+VERSION=   8.0.4
+LIBAO_VERSION= 7.6.10
 # has various machine-dependent parts; updates definitely need
 # tests on more than just amd64.
 
@@ -12,7 +12,6 @@ DISTNAME= gc-${VERSION}
 
 PKGNAME-atomic=libatomic_ops-${LIBAO_VERSION}
 PKGNAME-main=  boehm-gc-${VERSION}
-REVISION=  6
 
 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
    libatomic_ops-${LIBAO_VERSION}${EXTRACT_SUFX}
@@ -20,11 +19,11 @@ DISTFILES=  ${DISTNAME}${EXTRACT_SUFX} \
 MULTI_PACKAGES=-main -atomic
 DEBUG_PACKAGES=${BUILD_PACKAGES}
 
-SHARED_LIBS += gc  4.0 # 1.3
-SHARED_LIBS += gccpp   0.0 # 1.3
-SHARED_LIBS += cord2.3 # 1.3
-SHARED_LIBS +=  atomic_ops 2.0 # 1.3
-SHARED_LIBS +=  atomic_ops_gpl 2.0 # 1.3
+SHARED_LIBS += gc  5.0 # 5.3
+SHARED_LIBS += gccpp   1.0 # 5.0
+SHARED_LIBS += cord3.0 # 5.0
+SHARED_LIBS +=  atomic_ops 3.0 # 2.1
+SHARED_LIBS +=  atomic_ops_gpl 3.0 # 2.2
 
 CATEGORIES=devel
 
@@ -49,7 +48,9 @@ CONFIGURE_STYLE= gnu
 
 CONFIGURE_ARGS= --with-libatomic-ops=no \
    --enable-cplusplus \
-   --enable-threads=pthreads
+   --enable-threads=pthreads \
+   --enable-mmap \
+   --enable-static=yes
 
 post-extract:
    @perl -pi -e "s,/usr/local,${PREFIX},g" ${WRKSRC}/doc/gc.man
Index: distinfo
===
RCS file: /cvs/ports/devel/boehm-gc/distinfo,v
retrieving revision 1.11
diff -u -p -u -r1.11 distinfo
--- distinfo30 Dec 2018 17:08:09 -  1.11
+++ distinfo4 Feb 2021 14:13:31 -
@@ -1,4 +1,4 @@
-SHA256 (gc-7.6.0.tar.gz) = oUoosRKb6Q5VzW9xEn/8VZThCR1dVBMVKMJM0MA7fZA=
-SHA256 (libatomic_ops-7.6.6.tar.gz) = 
mf6rxfVId/MU20+t6xCfCz4dGlSvtrSz37oecH444HQ=
-SIZE (gc-7.6.0.tar.gz) = 751
-SIZE (libatomic_ops-7.6.6.tar.gz) = 498187
+SHA256 (gc-8.0.4.tar.gz) = Q2oN3GexrAsEBbYalnW8qeB1yBVvTevR0G86VsfN

Re: UPDATE: devel/boehm-gc 8.0.4

[Kurt Miller]

On Thu, 2021-02-04 at 02:06 +0100, Charlene Wendling wrote:
> On Tue, 2 Feb 2021 18:40:50 -0500 (EST)
> k...@intricatesoftware.com wrote:
> 
> > 
> > Update to 8.0.4 with the following additional changes:
> > - Use mmap via the configure argument instead of hard-coding it.
> > - Define USE_MMAP_ANON for all OpenBSD arch to match upstream
> >   code conventions.
> > - Remove unused ELF_CLASS define for OpenBSD.
> > - Remove old HAVE_DL_ITERATE_PHDR workaround for OpenBSD.
> > - Don't use old GC_find_limit_openbsd() which is only needed for
> >   uthreads.
> > 
> > I've tested this on i386, amd64, sparc64 and aarch64 using the
> > port's regress tests and by using w3m. Note that on aarch64 the
> > current boehm-gc port isn't stable and w3m will crash it pretty
> > easily. This update has not fixed that (aarch64 is still unstable
> > but the regress tests pass).
> > 
> > Additional testing on mips, powerpc, etc. would be appreciated.
> I tested on macppc:
> 
> - all 17 tests are passing
> - w3m's runtime is still fine

Thank you for the test report.

-Kurt

FIX: lang/gcc/8 ICEs on hppa

[kurt]

gcc 8 ICEs on python 2 and 3 on hppa:

In file included from Include/Python.h:94,
 from Objects/complexobject.c:8:
Objects/complexobject.c: In function '_Py_c_pow':
Include/complexobject.h:21:15: internal compiler error: in 
expand_expr_addr_expr_1, at expr.c:8026
 #define c_pow _Py_c_pow
   ^
Objects/complexobject.c:128:1: note: in expansion of macro 'c_pow'
 c_pow(Py_complex a, Py_complex b)
 ^
libbacktrace could not find executable to open
Please submit a full bug report,
with preprocessed source if appropriate.
See  for instructions.

I found this bug report and fix for gcc 9 that fixes the ICE
on hppa and opens up a bunch of ports to be built that depend
on python 2/3:

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89487

So far I've only tested this on hppa with small number of ports.
Can bulk builders include this patch on other arches to get better
test coverage?

Index: Makefile
===
RCS file: /cvs/ports/lang/gcc/8/Makefile,v
retrieving revision 1.39
diff -u -p -u -r1.39 Makefile
--- Makefile24 Jan 2021 04:41:50 -  1.39
+++ Makefile4 Feb 2021 13:30:19 -
@@ -18,7 +18,7 @@ DPB_PROPERTIES = parallel
 V = 8.4.0
 FULL_VERSION = $V
 FULL_PKGVERSION = $V
-REVISION = 4
+REVISION = 5
 
 ADASTRAP-amd64 = adastrap-amd64-8.3.0-2.tar.xz
 ADASTRAP-arm = adastrap-arm-4.9.4-0.tar.xz
Index: patches/patch-gcc_tree-loop-distribution_c
===
RCS file: patches/patch-gcc_tree-loop-distribution_c
diff -N patches/patch-gcc_tree-loop-distribution_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-gcc_tree-loop-distribution_c  4 Feb 2021 13:30:19 -
@@ -0,0 +1,46 @@
+$OpenBSD$
+
+Backport fix for PR tree-optimization/89487
+
+Index: gcc/tree-loop-distribution.c
+--- gcc/tree-loop-distribution.c.orig
 gcc/tree-loop-distribution.c
+@@ -161,6 +161,9 @@ static vec loop_nest;
+ /* Vector of data references in the loop to be distributed.  */
+ static vec datarefs_vec;
+ 
++/* If there is nonaddressable data reference in above vector.  */
++static bool has_nonaddressable_dataref_p;
++
+ /* Store index of data reference in aux field.  */
+ #define DR_INDEX(dr)  ((uintptr_t) (dr)->aux)
+ 
+@@ -468,6 +471,7 @@ create_rdg_vertices (struct graph *rdg, vec 
+ else
+   RDGV_HAS_MEM_WRITE (v) = true;
+ RDGV_DATAREFS (v).safe_push (dr);
++has_nonaddressable_dataref_p |= may_be_nonaddressable_p (dr->ref);
+   }
+ }
+   return true;
+@@ -2734,6 +2738,7 @@ distribute_loop (struct loop *loop, vec stmt
+ }
+ 
+   datarefs_vec.create (20);
++  has_nonaddressable_dataref_p = false;
+   rdg = build_rdg (loop, cd);
+   if (!rdg)
+ {
+@@ -2862,8 +2867,10 @@ distribute_loop (struct loop *loop, vec stmt
+   if (partitions.length () > 1)
+ {
+   /* Don't support loop nest distribution under runtime alias check
+-   since it's not likely to enable many vectorization opportunities.  */
+-  if (loop->inner)
++ since it's not likely to enable many vectorization opportunities.
++ Also if loop has any data reference which may be not addressable
++ since alias check needs to take, compare address of the object.  */
++  if (loop->inner || has_nonaddressable_dataref_p)
+   merge_dep_scc_partitions (rdg, &partitions, false);
+   else
+   {
Index: patches/patch-gcc_tree-ssa-loop-ivopts_c
===
RCS file: patches/patch-gcc_tree-ssa-loop-ivopts_c
diff -N patches/patch-gcc_tree-ssa-loop-ivopts_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-gcc_tree-ssa-loop-ivopts_c4 Feb 2021 13:30:19 -
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Backport fix for PR tree-optimization/89487
+
+Index: gcc/tree-ssa-loop-ivopts.c
+--- gcc/tree-ssa-loop-ivopts.c.orig
 gcc/tree-ssa-loop-ivopts.c
+@@ -2247,6 +2247,10 @@ may_be_nonaddressable_p (tree expr)
+ {
+   switch (TREE_CODE (expr))
+ {
++case VAR_DECL:
++  /* Check if it's a register variable.  */
++  return DECL_HARD_REGISTER (expr);
++
+ case TARGET_MEM_REF:
+   /* TARGET_MEM_REFs are translated directly to valid MEMs on the
+target, thus they are always addressable.  */

Re: UPDATE: devel/boehm-gc 8.0.4

[Janne Johansson]

> k...@intricatesoftware.com wrote:
> > Update to 8.0.4 with the following additional changes:

> > Additional testing on mips, powerpc, etc. would be appreciated.
>
> I tested on macppc:
>
> - all 17 tests are passing
> - w3m's runtime is still fine
>
> Charlène.
>

Mips64:

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



w3m still building...

-- 
May the most significant bit of your life be positive.

[update] security/cfssl -> 1.5.0

[karlis . mikelsons]

Hello,

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.

Kind regards,
KarlisCommon subdirectories: cfssl.old/CVS and cfssl/CVS
diff -u cfssl.old/Makefile cfssl/Makefile
--- cfssl.old/Makefile	Fri Feb  7 17:57:04 2020
+++ cfssl/Makefile	Thu Feb  4 12:18:23 2021
@@ -4,7 +4,7 @@
 
 GH_ACCOUNT =		cloudflare
 GH_PROJECT =		cfssl
-VERSION =		1.4.1
+VERSION =		1.5.0
 GH_TAGNAME =		v${VERSION}
 
 CATEGORIES =		security
diff -u cfssl.old/distinfo cfssl/distinfo
--- cfssl.old/distinfo	Fri Feb  7 17:57:04 2020
+++ cfssl/distinfo	Thu Feb  4 12:18:32 2021
@@ -1,2 +1,2 @@
-SHA256 (cfssl-1.4.1.tar.gz) = yKhu8Qy7DBaPO1l9sVsx+YsXDtt5WPcVTt6ymu5BMV4=
-SIZE (cfssl-1.4.1.tar.gz) = 5736648
+SHA256 (cfssl-1.5.0.tar.gz) = UmcWSxiqmahE4Frc6vT2LRuW3NMmqRMgmNZcUVwYCpE=
+SIZE (cfssl-1.5.0.tar.gz) = 6169641
Common subdirectories: cfssl.old/pkg and cfssl/pkg

Re: PostgreSQL 13.1 Upgrade

[Stuart Henderson]

> >  @conflict postgresql-*
> > -@ask-update postgresql-server-<${V_MAJOR} Make sure your existing database 
> > is backed up
> > +@ask-update postgresql-server-<${PREV_MAJOR} Old version too old for 
> > pg_upgrade, make sure your database is backed up
> 
> 
> yes ok pea@

Here is an updated version of the pgsql 13.1 update, based on
https://marc.info/?l=openbsd-ports&m=160592088315669&w=2 with the
above and the following other changes (some of which were mentioned
in the thread but I didn't find another full diff):

- don't bump libraries unnecessarily; only pq has a minor bump
- https homepage
- sync WANTLIB/LIB_DEPENDS
- knock out backtrace_symbols/libexecinfo (found by Mark Patruck ;)
- line up some tabs

this one is OK with me


Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.266
diff -u -p -r1.266 Makefile
--- Makefile14 Nov 2020 13:03:49 -  1.266
+++ Makefile4 Feb 2021 13:28:44 -
@@ -7,8 +7,8 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
 COMMENT-plpython=Python procedural language for PostgreSQL
 COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
 
-VERSION=   12.5
-PREV_MAJOR=11
+VERSION=   13.1
+PREV_MAJOR=12
 DISTNAME=  postgresql-${VERSION}
 PKGNAME-main=  postgresql-client-${VERSION}
 PKGNAME-server=postgresql-server-${VERSION}
@@ -16,16 +16,16 @@ PKGNAME-docs=   postgresql-docs-${VERSION}
 PKGNAME-contrib=postgresql-contrib-${VERSION}
 PKGNAME-plpython=postgresql-plpython-${VERSION}
 PKGNAME-pg_upgrade=postgresql-pg_upgrade-${VERSION}
-REVISION-server= 0
 
+DPB_PROPERTIES=parallel
 
 CATEGORIES=databases
 SHARED_LIBS=   ecpg7.10 \
ecpg_compat 4.10 \
pgtypes 4.9 \
-   pq  6.11
+   pq  6.12
 
-HOMEPAGE=  http://www.postgresql.org/
+HOMEPAGE=  https://www.postgresql.org/
 
 MAINTAINER=Pierre-Emmanuel Andre 
 
@@ -51,10 +51,12 @@ MODULES=lang/python
 MODPY_RUNDEP=  No
 
 CONFIGURE_ENV= ac_cv_path_PYTHON=${MODPY_BIN} \
+   ac_cv_search_backtrace_symbols=no \
CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
 
-CONFIGURE_ARGS=--disable-rpath --with-openssl=/usr \
+CONFIGURE_ARGS=--disable-rpath \
+   --with-openssl=/usr \
--with-bsd-auth \
--with-perl \
--with-python \
@@ -76,7 +78,7 @@ CONFIGURE_ARGS=   --disable-rpath --with-o
 # (apparently) a serious performance hit doing this.
 
 .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "hppa"
-CONFIGURE_ARGS+=--disable-spinlocks
+CONFIGURE_ARGS+= --disable-spinlocks
 .endif
 
 # To avoid problems with missed floating point overflow checks.
@@ -96,30 +98,27 @@ MODGNU_CONFIG_GUESS_DIRS=   ${WRKSRC}/conf
 ALL_TARGET=world
 INSTALL_TARGET=install-world
 
-LIB_DEPENDS-main=  archivers/xz \
-   converters/libiconv \
-   textproc/libxml
-WANTLIB-main = ${WANTLIB} iconv lzma xml2
+LIB_DEPENDS-main=  textproc/libxml
+WANTLIB-main=  ${WANTLIB} xml2
 
-
-LIB_DEPENDS-server= databases/postgresql=${VERSION} \
-   ${LIB_DEPENDS-main}
-WANTLIB-server=${WANTLIB-main} perl pq
-
-RUN_DEPENDS-contrib= databases/postgresql,-server=${VERSION}
-LIB_DEPENDS-contrib= databases/postgresql=${VERSION} \
-${LIB_DEPENDS-main}
+LIB_DEPENDS-server=databases/postgresql=${VERSION} \
+   ${LIB_DEPENDS-main}
+WANTLIB-server=${WANTLIB-main} perl pq
+
+RUN_DEPENDS-contrib=   databases/postgresql,-server=${VERSION}
+LIB_DEPENDS-contrib=   databases/postgresql=${VERSION} \
+   ${LIB_DEPENDS-main}
 WANTLIB-contrib=   ${WANTLIB-main} perl pq
 
 RUN_DEPENDS-pg_upgrade=databases/postgresql,-server=${VERSION} \
databases/postgresql-previous>=${PREV_MAJOR}
 LIB_DEPENDS-pg_upgrade= databases/postgresql=${VERSION} \
-${LIB_DEPENDS-main}
+   ${LIB_DEPENDS-main}
 
-WANTLIB-pg_upgrade =   ${WANTLIB-main} pq
+WANTLIB-pg_upgrade=${WANTLIB-main} pq
 
 LIB_DEPENDS-plpython=  ${MODPY_LIB_DEPENDS}
-WANTLIB-plpython = c m pthread util \
+WANTLIB-plpython=  c intl m pthread util \
${MODPY_WANTLIB}
 RUN_DEPENDS-plpython=  databases/postgresql,-server=${VERSION}
 
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.86
diff -u -p -r1.86 distinfo
--- distinfo13 Nov 2020 19:00:10 -  1.86
+++ distinfo4 Feb 2021 13:28:44 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-12.5.tar.gz) = 2IPpfP0ss7OrqUkVQdtrMM/jO7akAxzbCOxQFNBNbpY=
-SIZE (postgresql-12.5.tar.gz) = 271370

Re: [patch] UPDATE: converters/libiconv: pledge iconv binary

[Hiltjo Posthuma]

On Tue, Jan 26, 2021 at 08:27:24PM +0100, Hiltjo Posthuma wrote:
> On Tue, Jan 26, 2021 at 03:56:11PM +, Stuart Henderson wrote:
> > On 2021/01/26 15:31, Clemens Gößnitzer wrote:
> > > January 26, 2021 3:44 PM, "Hiltjo Posthuma"  
> > > wrote:
> > > > On Sat, Jan 16, 2021 at 04:29:27PM +0100, Hiltjo Posthuma wrote:
> > > >> On Mon, Jan 11, 2021 at 07:50:55PM +0100, Hiltjo Posthuma wrote:
> > > >> 
> > > >> The below patch pledges the iconv binary in the libiconv package. The 
> > > >> tool is
> > > >> useful for converting text-encoding of text data to UTF-8 for example.
> > > >> 
> > > >> It now uses pledge("stdio", NULL) if only using stdin/stdout. It uses
> > > >> pledge("stdio rpath", NULL) when specifying files.
> > > >> 
> > > >> I've tested many command-line option combinations and haven't found 
> > > >> missing
> > > >> promises which cause an abort().
> > > >> 
> > > >> Patch:
> > ..
> > > >> +@@ -846,6 +849,9 @@
> > > >> + struct iconv_hooks hooks;
> > > >> + int i;
> > > >> + int status;
> > > >> ++
> > > >> ++ if (pledge(i == argc ? "stdio" : "stdio rpath", NULL) == -1)
> > > 
> > > Wouldn't you use i uninitialised here?
> > > 
> > > >> ++ err(1, "pledge");
> > > >> +
> > > >> + set_program_name (argv[0]);
> > > >> + #if HAVE_SETLOCALE
> > > >> --
> > 
> > Yes, it needs to be done after parsing the arguments in the loop after
> > calling textdomain().
> > 
> > Looks like it was previously done like that but moved before sending out
> > the diff? I assume it was moved so that more of the code was moved under
> > pledge. Better approach might be to unconditionally pledge stdio rpath,
> > then, after the loop, conditionally pledge again to drop rpath if
> > possible.
> > 
> > It would be nicer to use the error function used in the rest of
> > the file rather than pulling in another header for err().
> > 
> 
> Hi,
> 
> Thanks both for the review! I updated the changes in the patch below.
> It was indeed a mistake in creating the patch, I'm sorry for the sloppiness.
> 
> 
> From dbb04c280d8ca368da43c0fdf185c3e9a4a59050 Mon Sep 17 00:00:00 2001
> From: Hiltjo Posthuma 
> Date: Tue, 26 Jan 2021 20:21:32 +0100
> Subject: [PATCH] libiconv: pledge iconv(1) binary
> 
> ---
>  converters/libiconv/Makefile  |  3 +-
>  converters/libiconv/patches/patch-src_iconv_c | 29 +++
>  2 files changed, 31 insertions(+), 1 deletion(-)
>  create mode 100644 converters/libiconv/patches/patch-src_iconv_c
> 
> diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
> index 2ab58ea4519..5c8043270de 100644
> --- a/converters/libiconv/Makefile
> +++ b/converters/libiconv/Makefile
> @@ -5,7 +5,7 @@ COMMENT=  character set conversion library
>  DISTNAME=libiconv-1.16
>  CATEGORIES=  converters devel
>  MASTER_SITES=${MASTER_SITE_GNU:=libiconv/}
> -REVISION=0
> +REVISION=1
>  
>  SHARED_LIBS= charset 1.1 \
>   iconv   7.0
> @@ -17,6 +17,7 @@ MAINTAINER= Brad Smith 
>  # LGPLv2 and GPLv3
>  PERMIT_PACKAGE=  Yes
>  
> +# uses pledge()
>  WANTLIB= c
>  
>  SEPARATE_BUILD=  Yes
> diff --git a/converters/libiconv/patches/patch-src_iconv_c 
> b/converters/libiconv/patches/patch-src_iconv_c
> new file mode 100644
> index 000..9b673fbe5db
> --- /dev/null
> +++ b/converters/libiconv/patches/patch-src_iconv_c
> @@ -0,0 +1,29 @@
> +--- src/iconv.c.orig Fri Apr 26 20:50:13 2019
>  src/iconv.c  Tue Jan 26 20:07:34 2021
> +@@ -19,6 +19,8 @@
> + # define ICONV_CONST
> + #endif
> + 
> ++#include 
> ++
> + #include 
> + #include 
> + #include 
> +@@ -847,6 +849,8 @@
> +   int i;
> +   int status;
> + 
> ++  if (pledge("stdio rpath", NULL) == -1)
> ++error(EXIT_FAILURE, errno, "pledge");
> +   set_program_name (argv[0]);
> + #if HAVE_SETLOCALE
> +   /* Needed for the locale dependent encodings, "char" and "wchar_t",
> +@@ -1002,6 +1006,8 @@
> + }
> + break;
> +   }
> ++  if ((do_list || i == argc) && pledge("stdio", NULL) == -1)
> ++error(EXIT_FAILURE, errno, "pledge");
> +   if (do_list) {
> + if (i != 2 || i != argc)
> +   usage(1);
> -- 
> 2.30.0
> 

Last bump for this from me, any OKs to pledge this port?

-- 
Kind regards,
Hiltjo

Re: [update] x11/wmitime 0.3 -> 0.5 (-fno-common fix)

[Stuart Henderson]

On 2021/02/04 12:41, Charlene Wendling wrote:
> The below diff updates wmitime to 0.5. This dockapp now uses
> libdockapp, so there is no further patch for -fno-common needed.
> 
> Port-wise:
> 
> - provide .desktop file, manpage and HOMEPAGE
> - drop wmgeneral patch since it's dealt with by libdockapp
> - add build flags for iconv, it has been forgotten by upstream
> 
> Testing: 
> 
> This builds and works fine on macppc and amd64.
> 
> Comments/feedback are welcome,
> 
> Charlène.
> 

small comments;

> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/wmitime/Makefile,v
> retrieving revision 1.19
> diff -u -p -u -p -r1.19 Makefile
> --- Makefile  12 Jul 2019 20:51:24 -  1.19
> +++ Makefile  1 Feb 2021 13:36:07 -
> @@ -2,25 +2,33 @@
>  
>  COMMENT= wm-dockapp; shows the date, time, and Internet time
>  
> -DISTNAME=wmitime-0.3
> -REVISION=2
> +DISTNAME=wmitime-0.5
>  CATEGORIES=  x11 x11/windowmaker
>  
> +HOMEPAGE=https://www.dockapps.net/wmitime
> +
>  # GPL
>  PERMIT_PACKAGE=  Yes
> -WANTLIB= X11 Xext Xpm c m
>  
> -MASTER_SITES=http://dockapps.org/files/22/29/ \
> - http://web.cs.mun.ca/~gstarkes/wmaker/dockapps/files/
> +WANTLIB += X11 Xext Xpm c dockapp iconv m
> +
> +MASTER_SITES=https://www.dockapps.net/download/
>  
> -MAKE_FLAGS=  CC="${CC}"
> +RUN_DEPENDS= devel/desktop-file-utils
> +LIB_DEPENDS= converters/libiconv \
> + devel/libdockapp>=0.7.3
> +
> +MAKE_FLAGS=  CC="${CC}" PREFIX="${PREFIX}" \
> + CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
>  
>  NO_TEST= Yes
>  
> -WRKDIST= ${WRKDIR}/wmitime
> -WRKSRC=  ${WRKDIST}/wmitime
> +CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include
> +LDFLAGS+=-L${LOCALBASE}/lib -L${X11BASE}/lib
> +
> +WRKDIST= ${WRKDIR}/dockapps-26db447
>  
> -do-install:
> - ${INSTALL_PROGRAM} ${WRKBUILD}/wmitime ${PREFIX}/bin
> +#do-install:
> +#${INSTALL_PROGRAM} ${WRKBUILD}/wmitime ${PREFIX}/bin

might as well just remove those lines

> +Index: Makefile
> +--- Makefile.orig
>  Makefile
> +@@ -1,19 +1,18 @@
> +-LIBS   = -lXpm -lXext -lX11 -lm -ldockapp
> +-CFLAGS = -O2 -Wall
> ++LIBS   = -lXpm -lXext -lX11 -lm -ldockapp -liconv
> + OBJS = wmitime.o
> + INSTALL = install
> +-PREFIX = /usr/local
> ++PREFIX ?= /usr/local
> + BINDIR = $(PREFIX)/bin
> +-MANDIR = $(PREFIX)/share/man/man1
> ++MANDIR = $(PREFIX)/man/man1
> + DESKTOPDIR = $(PREFIX)/share/applications

variables set on the make command line (via MAKE_FLAGS) override
settings in the Makefile, so there's no need to patch them. with this
port, it makes sense to patch LIBS (you don't want to copy the line
from the upstream Makefile to ports) but for the variables which are
completely overridden (CFLAGS, MANDIR, PREFIX) they don't need patching.

obviously it works either way (and I'm also OK with this as-is), but the
fewer lines in a patch, the more likely it will stay applying cleanly
with future updates.

this doesn't work for ports where the upstream Makefile runs a second
copy of make e.g. in a subdirectory, but in most cases it's just fine.

OK

[update] x11/wmtz 0.7 -> 0.7.20150816 (-fno-common fix)

[Charlene Wendling]

Here is an update for wmtz. dockapps.net provides an old version, i
preferred to use what they have in their git head, which is already
provided by Gentoo, because this new version uses libdockapp, this
avoids duplicating patches in wmgeneral.

Port-wise:

- FIX_EXTRACT_PERMISSIONS is not needed anymore
- their install target is still not good, so keep our own

Testing:

It builds and runs fine on amd64 and macppc with the provided sample
configuration file.

Comments/feedback are welcome,

Charlène.


Index: Makefile
===
RCS file: /cvs/ports/x11/wmtz/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- Makefile12 Jul 2019 20:51:24 -  1.24
+++ Makefile1 Feb 2021 13:24:26 -
@@ -2,22 +2,28 @@
 
 COMMENT=   wm-dockapp; displays the time in different time zones
 
-DISTNAME=  wmtz-0.7
-REVISION=  3
+DISTNAME=  wmtz-0.7_p20150816
+PKGNAME=   ${DISTNAME:S/_p/./}
+
 CATEGORIES=x11 x11/windowmaker
-FIX_EXTRACT_PERMISSIONS=Yes
 
 HOMEPAGE=  http://www.dockapps.net/wmtz
 
 # GPL
 PERMIT_PACKAGE=Yes
-WANTLIB=   X11 Xext Xpm c m
+WANTLIB=   X11 Xext Xpm c dockapp m
+
+# dockapps.net only provides an old tarball without libdockapp support.
+MASTER_SITES=  http://distfiles.gentoo.org/distfiles/
 
-MASTER_SITES=  http://www.dockapps.net/download/
+LIB_DEPENDS=   devel/libdockapp>=0.7.3
 
-MAKE_FLAGS=CC="${CC}"
+MAKE_ENV+= CC="${CC}" LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}"
 
 NO_TEST=   Yes
+
+CFLAGS+=   -I${X11BASE}/include -I${LOCALBASE}/include
+LDFLAGS+=  -L${X11BASE}/lib -L${LOCALBASE}/lib
 
 WRKSRC=${WRKDIST}/wmtz
 
Index: distinfo
===
RCS file: /cvs/ports/x11/wmtz/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo18 Jan 2015 03:16:04 -  1.4
+++ distinfo1 Feb 2021 13:24:26 -
@@ -1,2 +1,2 @@
-SHA256 (wmtz-0.7.tar.gz) = ywnmSpgjs9px5ULXzGbmy9ATWAm+4eVl0YrNzwVlgjo=
-SIZE (wmtz-0.7.tar.gz) = 26350
+SHA256 (wmtz-0.7_p20150816.tar.gz) = 
Dvi7e3qRLm8vLOiOblv4CAzNlUv2JYikNTKzQzK6Lls=
+SIZE (wmtz-0.7_p20150816.tar.gz) = 19310
Index: patches/patch-wmgeneral_list_h
===
RCS file: patches/patch-wmgeneral_list_h
diff -N patches/patch-wmgeneral_list_h
--- patches/patch-wmgeneral_list_h  3 May 2017 19:29:45 -   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-wmgeneral_list_h,v 1.1 2017/05/03 19:29:45 jca Exp $
 wmgeneral/list.h.orig
-+++ wmgeneral/list.h
-@@ -29,9 +29,7 @@ Boston, MA 02111-1307, USA.  */
- #ifndef __LIST_H_
- #define __LIST_H_
- 
--#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
--# define INLINE inline
--#else
-+#if 1
- # define INLINE
- #endif
- 
Index: patches/patch-wmtz_Makefile
===
RCS file: /cvs/ports/x11/wmtz/patches/patch-wmtz_Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-wmtz_Makefile
--- patches/patch-wmtz_Makefile 15 Jun 2001 09:59:34 -  1.2
+++ patches/patch-wmtz_Makefile 1 Feb 2021 13:24:26 -
@@ -1,26 +1,23 @@
 $OpenBSD: patch-wmtz_Makefile,v 1.2 2001/06/15 09:59:34 wilfried Exp $
 wmtz/Makefile.orig Sun Mar 11 14:57:59 2001
-+++ wmtz/Makefile  Fri Jun 15 11:49:09 2001
-@@ -1,8 +1,5 @@
+Index: wmtz/Makefile
+--- wmtz/Makefile.orig
 wmtz/Makefile
+@@ -1,15 +1,11 @@
 -CC = gcc
 -LIBDIR = -L/usr/X11R6/lib
-+LIBDIR = -L${X11BASE}/lib
- LIBS   = -lXpm -lXext -lX11 -lm
+ LIBS   = -lXpm -lXext -lX11 -lm -ldockapp
 -FLAGS = -O2
 -DESTDIR = /usr/local
- OBJS =wmtz.o \
-   ../wmgeneral/wmgeneral.o \
-   ../wmgeneral/misc.o \
-@@ -10,10 +7,10 @@ OBJS =  wmtz.o \
- 
+-OBJS =wmtz.o
++OBJS= wmtz.o
  
  .c.o:
 -  $(CC) -I/usr/X11R6/include $(FLAGS) -c -Wall $< -o $*.o
-+  $(CC) -I${X11BASE}/include ${CFLAGS} -c $< -o $@
++  $(CC) $(CFLAGS) -c $< -o $@
  
  wmtz: $(OBJS)
 -  $(CC) $(FLAGS) -o wmtz $^ -lXext $(LIBDIR) $(LIBS)
-+  $(CC) ${CFLAGS} -o $@ ${OBJS} $(LIBDIR) $(LIBS)
++  $(CC) -o $@ $(OBJS) $(LDFLAGS) $(LIBS)
  
  all:: wmtz
  
Index: patches/patch-wmtz_wmtz_c
===
RCS file: /cvs/ports/x11/wmtz/patches/patch-wmtz_wmtz_c,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-wmtz_wmtz_c
--- patches/patch-wmtz_wmtz_c   22 May 2010 15:15:52 -  1.3
+++ patches/patch-wmtz_wmtz_c   1 Feb 2021 13:24:26 -
@@ -1,38 +1,22 @@
 $OpenBSD: patch-wmtz_wmtz_c,v 1.3 2010/05/22 15:15:52 espie Exp $
 wmtz/wmtz.c.orig   Mon Apr 16 21:26:34 2001
-+++ wmtz/wmtz.cSat May 22 17:15:07 2010
-@@ -51,8 +51,7 @@
+Index: wmtz/wmtz.c

[update] astro/wmmoonclock 1.27 -> 1.30 (-fno-common fix)

[Charlene Wendling]

The below diff updates wmmoonclock to 1.30. This fixes the `-fno-common'
issue out of the box. Note that it uses a configure script instead of a
Makefile.

Port-wise:

- drop the whole Makefile patch, flags are good out of the box, and
  the new build system uses pkg-config, so everything is in place
- provide a .desktop file
- keep the legacy binary name, upstream provides an all lower cased
  binary, but a camel cased manpage
- move HOMEPAGE and MASTER_SITES to dockapps.net

Testing:

It has been build and run tested on amd64 and macppc successfully.

Comments/feedback are welcome,

Charlène.


Index: Makefile
===
RCS file: /cvs/ports/astro/wmmoonclock/Makefile,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 Makefile
--- Makefile26 Jan 2020 11:14:29 -  1.34
+++ Makefile1 Feb 2021 14:47:55 -
@@ -2,22 +2,26 @@
 
 COMMENT=   wm-dockapp; shows the moon phase
 
-DISTNAME=  wmMoonClock-1.27
-PKGNAME=   ${DISTNAME:L}
-REVISION=  5
+DISTNAME=  wmmoonclock-1.30
 CATEGORIES=astro x11 x11/windowmaker
 
+HOMEPAGE=  https://www.dockapps.net/wmmoonclock
+
 # GPL
 PERMIT_PACKAGE=Yes
 
 WANTLIB=   X11 Xext Xpm c m
 
-MASTER_SITES=  https://distfiles.sigtrap.nl/
+MASTER_SITES=  https://www.dockapps.net/download/
+
+RUN_DEPENDS=   devel/desktop-file-utils
 
-MAKE_ENV=  CC="${CC}"
+CONFIGURE_STYLE=   gnu
 
 NO_TEST=   Yes
 
-WRKSRC=${WRKDIST}/Src
+# Keep the legacy binary name (and match with the manpage name)
+post-install:
+   cd ${PREFIX}/bin && mv wmmoonclock wmMoonClock
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/astro/wmmoonclock/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo4 Apr 2013 16:06:27 -   1.4
+++ distinfo1 Feb 2021 14:47:55 -
@@ -1,2 +1,2 @@
-SHA256 (wmMoonClock-1.27.tar.gz) = Q50zCjDuHLCE4FEuiU9eGi6YaXRaInT72aVoMsFSfHc=
-SIZE (wmMoonClock-1.27.tar.gz) = 155197
+SHA256 (wmmoonclock-1.30.tar.gz) = i6fc6xDOP3eEgDUwOd5HQEU3rzUJLJQa5O4Ifp49Q6A=
+SIZE (wmmoonclock-1.30.tar.gz) = 238171
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile  18 Dec 2007 10:39:47 -  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,41 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.2 2007/12/18 10:39:47 ajacoutot Exp $
 Src/Makefile.orig  Tue Mar 23 03:20:32 1999
-+++ Src/Makefile   Tue Dec 18 10:16:26 2007
-@@ -1,8 +1,5 @@
--CC = gcc
--CFLAGS = -O2
--INCDIR = -I/usr/X11R6/include/X11
--DESTDIR= /usr/X11R6
--LIBDIR = -L/usr/X11R6/lib
-+CFLAGS += -I${X11BASE}/include
-+LIBDIR = -L${X11BASE}/lib
- 
- # for Linux
- LIBS   = -lXpm -lX11 -lXext
-@@ -13,16 +10,11 @@ LIBS   = -lXpm -lX11 -lXext
- OBJS   = wmMoonClock.o CalcEphem.o Moon.o MoonRise.o \
-  xutils.o
- 
--
--.c.o:
--  $(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
--
--
- all:  wmMoonClock.o wmMoonClock
- 
- wmMoonClock.o: wmMoonClock_master.xpm wmMoonClock_mask.xbm CalcEphem.h
- wmMoonClock:  $(OBJS) 
--  $(CC) $(COPTS) $(SYSTEM) -lm -o wmMoonClock $^ $(INCDIR) $(LIBDIR) 
$(LIBS)
-+  $(CC) $(COPTS) $(SYSTEM) -o wmMoonClock $(OBJS) $(INCDIR) $(LIBDIR) 
$(LIBS) -lm
- 
- clean:
-   for i in $(OBJS) ; do \
-@@ -31,6 +23,6 @@ clean:
-   rm -f wmMoonClock
- 
- install:: wmMoonClock
--  install -s -m 0755 wmMoonClock $(DESTDIR)/bin
--  install-m 0644 wmMoonClock.1 $(DESTDIR)/man/man1 
-+  $(BSD_INSTALL_PROGRAM) wmMoonClock $(PREFIX)/bin
-+  $(BSD_INSTALL_MAN) wmMoonClock.1 $(PREFIX)/man/man1 
- 
Index: patches/patch-wmMoonClock_c
===
RCS file: /cvs/ports/astro/wmmoonclock/patches/patch-wmMoonClock_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-wmMoonClock_c
--- patches/patch-wmMoonClock_c 18 Dec 2007 10:39:47 -  1.2
+++ patches/patch-wmMoonClock_c 1 Feb 2021 14:47:55 -
@@ -1,16 +1,17 @@
 $OpenBSD: patch-wmMoonClock_c,v 1.2 2007/12/18 10:39:47 ajacoutot Exp $
 Src/wmMoonClock.c.orig Mon Jun  7 16:27:18 1999
-+++ Src/wmMoonClock.c  Tue Dec 18 10:16:26 2007
-@@ -162,7 +162,7 @@ int main(int argc, char *argv[]) {
- int   i, n, k, j, ImageNumber;
- int   Year, Month, DayOfWeek, DayOfMonth;
- int   Hours, Mins, Secs, OldSecs, digit, xoff, xsize;
+Index: src/wmMoonClock.c
+--- src/wmMoonClock.c.orig
 src/wmMoonClock.c
+@@ -157,7 +157,7 @@ int main(int argc, char *argv[]) {
+ struct tm *GMTTime, *LocalTime;
+ XEventevent;
+ int   i, n, j, ImageNumber, Year, Month, D

x11/wmglobe: -fno-common fix

[Charlene Wendling]

There are 20+ duplicate symbols, and no patches around. I'm proposing
to use `-fcommon'. While here move dead HOMEPAGE and MASTER_SITES to
dockapps.net.

It has been tested successfully on macppc and amd64.

OK?

Charlène.


Index: Makefile
===
RCS file: /cvs/ports/astro/wmglobe/Makefile,v
retrieving revision 1.32
diff -u -p -u -p -r1.32 Makefile
--- Makefile12 Jul 2019 20:43:31 -  1.32
+++ Makefile1 Feb 2021 14:10:29 -
@@ -3,17 +3,17 @@
 COMMENT=   wm-dockapp; displays the earth on an icon
 
 DISTNAME=  wmglobe-1.3
-REVISION=  6
+REVISION=  7
 CATEGORIES=astro x11 x11/windowmaker
 
-HOMEPAGE=  http://hamete.org/static/wmg/
+HOMEPAGE=  https://www.dockapps.net/wmglobe
 
 # GPL
 PERMIT_PACKAGE=Yes
 
 WANTLIB=   X11 Xext Xpm c m z jpeg tiff png gif wraster
 
-MASTER_SITES=  ${HOMEPAGE}
+MASTER_SITES=  https://www.dockapps.net/download/
 
 LIB_DEPENDS=   graphics/jpeg \
graphics/tiff \
@@ -23,5 +23,8 @@ LIB_DEPENDS=  graphics/jpeg \
 
 MAKE_ENV=  CC="${CC}"
 NO_TEST=   Yes
+
+# 20+ duplicate symbols
+CFLAGS+=   -fcommon
 
 .include 
 

x11/wmweather: -fno-common fix

[Charlene Wendling]

I took this fix from Debian [0]. It builds and works fine on amd64 and
macppc.

OK?

Charlène.


[0]
https://sources.debian.org/patches/wmweather/2.4.7-3/957956_gcc10.diff/


Index: Makefile
===
RCS file: /cvs/ports/x11/wmweather/Makefile,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 Makefile
--- Makefile12 Jul 2019 20:51:24 -  1.30
+++ Makefile1 Feb 2021 13:55:54 -
@@ -3,6 +3,7 @@
 COMMENT=   wm-dockapp; weather monitor
 
 DISTNAME=  wmweather-2.4.7
+REVISION=  0
 CATEGORIES=x11 x11/windowmaker
 
 HOMEPAGE=  http://people.debian.org/~godisch/wmweather/
Index: patches/patch-src_wmgeneral_c
===
RCS file: patches/patch-src_wmgeneral_c
diff -N patches/patch-src_wmgeneral_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_wmgeneral_c   1 Feb 2021 13:55:54 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Fix the build with -fno-common
+
+Index: src/wmgeneral.c
+--- src/wmgeneral.c.orig
 src/wmgeneral.c
+@@ -85,6 +85,7 @@ Window   iconwin, win;
+ GCNormalGC;
+ XpmIcon   wmgen;
+ Pixmappixmask;
++Display   *display;
+ 
+   /*/
+  /* Mouse Regions */
Index: patches/patch-src_wmgeneral_h
===
RCS file: patches/patch-src_wmgeneral_h
diff -N patches/patch-src_wmgeneral_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_wmgeneral_h   1 Feb 2021 13:55:54 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix the build with -fno-common
+
+Index: src/wmgeneral.h
+--- src/wmgeneral.h.orig
 src/wmgeneral.h
+@@ -36,7 +36,7 @@ typedef struct {
+  /* Global variable */
+ /***/
+ 
+-Display   *display;
++extern Display*display;
+ 
+   /***/
+  /* Function Prototypes */

[update] x11/wmitime 0.3 -> 0.5 (-fno-common fix)

[Charlene Wendling]

The below diff updates wmitime to 0.5. This dockapp now uses
libdockapp, so there is no further patch for -fno-common needed.

Port-wise:

- provide .desktop file, manpage and HOMEPAGE
- drop wmgeneral patch since it's dealt with by libdockapp
- add build flags for iconv, it has been forgotten by upstream

Testing: 

This builds and works fine on macppc and amd64.

Comments/feedback are welcome,

Charlène.


Index: Makefile
===
RCS file: /cvs/ports/x11/wmitime/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- Makefile12 Jul 2019 20:51:24 -  1.19
+++ Makefile1 Feb 2021 13:36:07 -
@@ -2,25 +2,33 @@
 
 COMMENT=   wm-dockapp; shows the date, time, and Internet time
 
-DISTNAME=  wmitime-0.3
-REVISION=  2
+DISTNAME=  wmitime-0.5
 CATEGORIES=x11 x11/windowmaker
 
+HOMEPAGE=  https://www.dockapps.net/wmitime
+
 # GPL
 PERMIT_PACKAGE=Yes
-WANTLIB=   X11 Xext Xpm c m
 
-MASTER_SITES=  http://dockapps.org/files/22/29/ \
-   http://web.cs.mun.ca/~gstarkes/wmaker/dockapps/files/
+WANTLIB += X11 Xext Xpm c dockapp iconv m
+
+MASTER_SITES=  https://www.dockapps.net/download/
 
-MAKE_FLAGS=CC="${CC}"
+RUN_DEPENDS=   devel/desktop-file-utils
+LIB_DEPENDS=   converters/libiconv \
+   devel/libdockapp>=0.7.3
+
+MAKE_FLAGS=CC="${CC}" PREFIX="${PREFIX}" \
+   CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 NO_TEST=   Yes
 
-WRKDIST=   ${WRKDIR}/wmitime
-WRKSRC=${WRKDIST}/wmitime
+CFLAGS+=   -I${LOCALBASE}/include -I${X11BASE}/include
+LDFLAGS+=  -L${LOCALBASE}/lib -L${X11BASE}/lib
+
+WRKDIST=   ${WRKDIR}/dockapps-26db447
 
-do-install:
-   ${INSTALL_PROGRAM} ${WRKBUILD}/wmitime ${PREFIX}/bin
+#do-install:
+#  ${INSTALL_PROGRAM} ${WRKBUILD}/wmitime ${PREFIX}/bin
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/x11/wmitime/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo18 Jan 2015 03:16:04 -  1.4
+++ distinfo1 Feb 2021 13:36:07 -
@@ -1,2 +1,2 @@
-SHA256 (wmitime-0.3.tar.gz) = /OxEG6wYOsL7u/nVd8Lqr5ueApKmBBJW5aQoanbN3GE=
-SIZE (wmitime-0.3.tar.gz) = 21442
+SHA256 (wmitime-0.5.tar.gz) = oYPiCNi6v5fopA4356WoseE3HKVH14lvMU+AhRb0Xm0=
+SIZE (wmitime-0.5.tar.gz) = 15099
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/x11/wmitime/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile  9 Mar 2001 14:29:58 -   1.2
+++ patches/patch-Makefile  1 Feb 2021 13:36:07 -
@@ -1,26 +1,27 @@
-$OpenBSD: patch-Makefile,v 1.2 2001/03/09 14:29:58 wilfried Exp $
 wmitime/Makefile.orig  Mon Mar 29 05:51:39 1999
-+++ wmitime/Makefile   Thu Mar  8 13:17:14 2001
-@@ -1,7 +1,6 @@
- #LANG = fr
--LIBDIR = -L/usr/X11R6/lib
-+LIBDIR = -L${X11BASE}/lib
- LIBS   = -lXpm -lXext -lX11 -lm
--FLAGS = -O2
- OBJS =wmitime.o \
-   ../wmgeneral/wmgeneral.o \
-   ../wmgeneral/misc.o \
-@@ -9,12 +8,12 @@ OBJS =   wmitime.o \
- 
+$OpenBSD$
+
+Index: Makefile
+--- Makefile.orig
 Makefile
+@@ -1,19 +1,18 @@
+-LIBS   = -lXpm -lXext -lX11 -lm -ldockapp
+-CFLAGS = -O2 -Wall
++LIBS   = -lXpm -lXext -lX11 -lm -ldockapp -liconv
+ OBJS = wmitime.o
+ INSTALL = install
+-PREFIX = /usr/local
++PREFIX ?= /usr/local
+ BINDIR = $(PREFIX)/bin
+-MANDIR = $(PREFIX)/share/man/man1
++MANDIR = $(PREFIX)/man/man1
+ DESKTOPDIR = $(PREFIX)/share/applications
  
  .c.o:
--  cc -I/usr/X11R6/share/include $(FLAGS) -D$(LANG) -c -Wall $< -o $*.o
-+  ${CC} -I${X11BASE}/include ${CFLAGS} -c $< -o $@
+   $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $*.o
  
--wmtime: $(OBJS)
--  cc $(FLAGS) -D$(LANG) -o wmitime $^ -lXext $(LIBDIR) $(LIBS)
-+wmitime: $(OBJS)
-+  ${CC} ${CFLAGS} -o $@ $(OBJS) $(LIBDIR) $(LIBS)
+ wmitime: $(OBJS)
+-  $(CC) $(LDFLAGS) -o wmitime $^ $(LIBS)
++  $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBDIR) $(LIBS)
  
 -all:: wmtime
 +all:: wmitime
Index: patches/patch-wmgeneral_list_h
===
RCS file: patches/patch-wmgeneral_list_h
diff -N patches/patch-wmgeneral_list_h
--- patches/patch-wmgeneral_list_h  3 May 2017 19:18:27 -   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-wmgeneral_list_h,v 1.1 2017/05/03 19:18:27 jca Exp $
 wmgeneral/list.h.orig
-+++ wmgeneral/list.h
-@@ -29,9 +29,7 @@ Boston, MA 02111-1307, USA.  */
- #ifndef __LIST_H_
- #define __LIST_H_
- 
--#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
--# define INLINE inline
--#else
-+#if 1
- # define INLINE

Re: PostgreSQL 13.1 Upgrade

[Pierre-Emmanuel Andr??]

On Thu, Feb 04, 2021 at 09:33:48AM +, Stuart Henderson wrote:
> On 2021/02/03 21:22, Pierre-Emmanuel Andr?? wrote:
> > On Mon, Feb 01, 2021 at 05:00:41PM -0800, Jeremy Evans wrote:
> > > On 02/01 07:24, Daniel Jakots wrote:
> > > > Hi Pierre-Emmanuel and Jeremy,
> > > > 
> > > > Is there anything blocking the update?
> > > 
> > > Nothing for me.  pea@ can handle the commits whenever he sees fit, or if
> > > he gives his OK, I can handle the commits.
> > >
> > 
> > I will not be able to commit before this week end. If you can do it before, 
> > go ahead.
> > ok pea@
> > 
> 
> What do you think about adding this to it?
> 
> 
> Index: pkg/PLIST-server
> ===
> RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-server,v
> retrieving revision 1.40
> diff -u -p -r1.40 PLIST-server
> --- pkg/PLIST-server  24 Sep 2020 13:11:46 -  1.40
> +++ pkg/PLIST-server  4 Feb 2021 09:31:59 -
> @@ -4,7 +4,7 @@
>  @conflict postgresql-clients-*
>  @conflict postgresql-server-*
>  @conflict postgresql-*
> -@ask-update postgresql-server-<${V_MAJOR} Make sure your existing database 
> is backed up
> +@ask-update postgresql-server-<${PREV_MAJOR} Old version too old for 
> pg_upgrade, make sure your database is backed up
>  @newgroup _postgresql:503
>  @newuser _postgresql:503:_postgresql:daemon:PostgreSQL 
> Manager:/var/postgresql:/bin/sh
>  @bin bin/initdb


yes ok pea@

Re: [UPDATE] sysutils/kubectl 1.19.2 -> 1.20.2

[Muhammad Kaisar Arkhan]

Luca De Pandis writes:


up

Feedback? Ok?

Best regards,
Luca De Pandis


On Mon, Jan 18, 2021 at 11:42:05AM +0100, Luca De Pandis wrote:

Hi,
here's the kubectl port upgraded from 1.19.2 to 1.20.2.

Best regards,
Luca De Pandis


Hi,

I tested this on my OpenBSD along with a Kubernetes Cluster from 
Google Cloud.


It works fine.

OK.

--
Muhammad Kaisar Arkhan
h...@yukiisbo.red - kai...@arkhan.io
https://yukiisbo.red - https://arkhan.io

Re: PostgreSQL 13.1 Upgrade

[Stuart Henderson]

On 2021/02/03 21:22, Pierre-Emmanuel Andr?? wrote:
> On Mon, Feb 01, 2021 at 05:00:41PM -0800, Jeremy Evans wrote:
> > On 02/01 07:24, Daniel Jakots wrote:
> > > Hi Pierre-Emmanuel and Jeremy,
> > > 
> > > Is there anything blocking the update?
> > 
> > Nothing for me.  pea@ can handle the commits whenever he sees fit, or if
> > he gives his OK, I can handle the commits.
> >
> 
> I will not be able to commit before this week end. If you can do it before, 
> go ahead.
> ok pea@
> 

What do you think about adding this to it?


Index: pkg/PLIST-server
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-server,v
retrieving revision 1.40
diff -u -p -r1.40 PLIST-server
--- pkg/PLIST-server24 Sep 2020 13:11:46 -  1.40
+++ pkg/PLIST-server4 Feb 2021 09:31:59 -
@@ -4,7 +4,7 @@
 @conflict postgresql-clients-*
 @conflict postgresql-server-*
 @conflict postgresql-*
-@ask-update postgresql-server-<${V_MAJOR} Make sure your existing database is 
backed up
+@ask-update postgresql-server-<${PREV_MAJOR} Old version too old for 
pg_upgrade, make sure your database is backed up
 @newgroup _postgresql:503
 @newuser _postgresql:503:_postgresql:daemon:PostgreSQL 
Manager:/var/postgresql:/bin/sh
 @bin bin/initdb

Re: Update lang/iverilog to 11.0 (fixes no-common)

[Thomas Dettbarn]

Hello.

So, I love OpenBSD, and I love icarus verilog. 
Here are my Two Cents:


Within the sources, the file driver/main.c, I found this:

-x-x-x-x-x-x-x-x-x-

#ifndef __MINGW32__
/* First try the location specified in the build process. */
  if (access(IVL_ROOT, F_OK) != -1) {
assert(strlen(IVL_ROOT) < sizeof ivl_root);
strcpy(ivl_root, IVL_ROOT);
return;
  }
#endif
/* If that fails, calculate the ivl_root from the path to the
   command. This is always necessary on Windows because of the
   installation process, but may also be necessary on other OSs
   if the package has been relocated.

-x-x-x-x-x-x-x-x-x-

So, apparently, you can set the directory IVL_ROOT at build time. So the 
port can be salvaged without the need of faking some syscalls() or whatever.

REGARDLESS, I think it is a bad style to set the location of vital libraries 
at build time, without the possibility to change it afterwards.

Maybe somebody should tell Stephen Williams.

Thomas


> Christian Weisgerber  hat am 02.02.2021 23:13 geschrieben:
> 
>  
> Greg Steuck:
> 
> > iverilog still starts.
> 
> But the regression tests fail:
> 
> driver/iverilog -B. -BMvpi -BPivlpp -tcheck -ocheck.vvp ./examples/hello.vl
> Cannot locate IVL modules : couldn't get command path from OS.
> gmake: *** [Makefile:141: check] Error 1
> 
> -- 
> Christian "naddy" Weisgerber  na...@mips.inka.de

Re: [UPDATE] sysutils/docker-cli 20.10.1 -> 20.10.3

[Muhammad Kaisar Arkhan]

Luca De Pandis writes:


Hi,
below the patch to upgrade the sysutils/docker-cli port to 
20.10.3.


Passed:
- port-lib-depends-check
- portcheck

OK? Feedback?


Best regards,
Luca De Pandis


Tested on my local OpenBSD machine by running a container on a 
separate

Linux box and deploying a docker stack, it works fine.

Happy to see that someone is helping to have this port always
up-to-date. :)

OK.

--
Muhammad Kaisar Arkhan
h...@yukiisbo.red - kai...@arkhan.io
https://yukiisbo.red - https://arkhan.io

PDFs preview in Chrome on Slack.com not working

[Mikolaj Kucharski]

Hi,

It started couple of weeks ago I think, and it definitely worked in the
past. When there is PDF uploaded on a Slack channel I can see preview
generated inline on the channel, but when I click to view, there is no
view of the PDF content, just broken in half grey image symbolizing that
something went wrong.

Anyone else seeing this?

>From that preview when I click three dots and then Open in new window,
Chromium's built-in PDF preview works and I can see PDF content, but I
would like to also see working preview in Slack itself and not sure is
this local or general problem.

# pkg_info -qI chromium
chromium-88.0.4324.96p0

# sysctl -n kern.version
OpenBSD 6.8-current (GENERIC.MP) #302: Sat Jan 30 21:51:53 MST 2021
dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP

-- 
Regards,
 Mikolaj