Re: UPDATE: x11/xglobe

2020-07-05 Thread Rafael Sadowski
On Sun Jul 05, 2020 at 05:40:31PM +0200, Rafael Sadowski wrote:
> Please find below a diff to update xglobe to 0.6. The original xglobe is
> dead upstream. I modernized it just for fun and with the motivation to
> get rid of Qt3/KDE3 from the ports tree. This is a complete rewrite in
> C++17/Qt5.
> 
> Anyway, this is the first version after the reconstruction. For KDE and
> Linux it comes with Plasma support. For OpenBSD xwallpaper is required
> to draw the wallpaper.
> 
> I will try to continue to work on it and am happy about feedback.
> 
> Rafael
> 

Bump to 0.6.1


Index: Makefile
===
RCS file: /cvs/ports/x11/xglobe/Makefile,v
retrieving revision 1.80
diff -u -p -u -p -r1.80 Makefile
--- Makefile26 Jan 2020 11:14:34 -  1.80
+++ Makefile6 Jul 2020 06:57:11 -
@@ -2,66 +2,43 @@
 
 COMMENT=   display the Earth on X11
 
+V= 0.6.1
+DISTNAME=  xglobe-${V}
+
 CATEGORIES=x11 geo
-HOMEPAGE=  http://www.shaderwrangler.com/xglobe/
-#MASTER_SITES= ${HOMEPAGE}
-# Temporary release
-MASTER_SITES=  https://distfiles.sigtrap.nl/
-DISTNAME=  xglobe-0.5p2
-PKGNAME=   xglobe-0.5
-REVISION=  44
+
+HOMEPAGE=  https://github.com/sizeofvoid/xglobe
 
 MAINTAINER=Marc Espie 
 
-# GPL, included map is free
+# GPLv2, included map is free
 PERMIT_PACKAGE=Yes
-WANTLIB=   X11 c m pthread ${COMPILER_LIBCXX}
 
-COMPILER = base-clang ports-gcc base-gcc
+WANTLIB += ${COMPILER_LIBCXX} ICE Qt5Core Qt5DBus Qt5Gui Qt5Widgets
+WANTLIB += Qt5X11Extras SM X11 Xext c m
 
-MODULES=   x11/qt3
+MASTER_SITES=  https://github.com/sizeofvoid/xglobe/releases/download/v${V}/
 
-MAKE_FLAGS=XGLOBE_DIR=${PREFIX}
+MODULES=   devel/cmake \
+   x11/qt5
 
-RUN_DEPENDS=   geo/openbsd-developers
+LIB_DEPENDS=   x11/qt5/qtx11extras
+
+RUN_DEPENDS=   geo/openbsd-developers \
+   x11/xwallpaper
+BUILD_DEPENDS= x11/xwallpaper
 
 FLAVORS=   no_map
 FLAVOR?=
 .if ${FLAVOR:Mno_map}
-DISTFILES= ${DISTNAME}-no-map${EXTRACT_SUFX}
-
-# Kludge install for no map around
-pre-install:
-   @touch ${WRKSRC}/map.bmp
-
-post-install::
-   @rm ${PREFIX}/lib/xglobe/map.bmp
+CONFIGURE_ARGS =   -DENABLE_INSTALL_MAPS=OFF
+.else
+CONFIGURE_ARGS =   -DENABLE_INSTALL_MAPS=ON
 .endif
 
+WRKDIST=   ${WRKDIR}/xglobe
 
-MAKE_FLAGS+=   QT_INCLUDE_DIR=${MODQT_INCDIR}
-MAKE_FLAGS+=   QT_LIB_DIR=${MODQT_LIBDIR}
-
-MAKE_FLAGS+=   CPP="${CXX}" LINK="${CXX}"
-MAKE_FLAGS+=   OPTIONS="${CXXFLAGS} -pthread -fno-exceptions -funroll-loops"
-MAKE_FLAGS+=   LFLAGS='-pthread'
-MAKE_FLAGS+=   LIBS='-lX11 -lqt-mt -lm'
-
-# for linking against libpng
-MAKE_FLAGS+=   'LIB_DIRS=-L$$(QT_LIB_DIR) -L$$(X11_LIB_DIR) -L$(LOCALBASE)/lib'
-MAKE_FLAGS+=   COPTS='${COPTS}'
-
-NO_TEST=   Yes
-
-post-install::
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xglobe
-   ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xglobe
-   ${INSTALL_DATA} ${WRKSRC}/README.maps ${PREFIX}/share/doc/xglobe
+post-install:
${INSTALL_SCRIPT} ${FILESDIR}/getcloudmap ${PREFIX}/bin
-   ln -sf ${TRUEPREFIX}/share/markers/OpenBSD 
${PREFIX}/lib/xglobe/OpenBSD-markers
-
-SUPDISTFILES=  ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-no-map${EXTRACT_SUFX}
-
-FAKE_FLAGS=XGLOBE_DIR=${WRKINST}${PREFIX}
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/x11/xglobe/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo18 Jan 2015 03:16:07 -  1.4
+++ distinfo6 Jul 2020 06:57:11 -
@@ -1,4 +1,2 @@
-SHA256 (xglobe-0.5p2-no-map.tar.gz) = 
OHweWixJvGs6YMVkBxxOZAgn5vkB23O1CBVSgdnIH1g=
-SHA256 (xglobe-0.5p2.tar.gz) = nXI1HqCwV5zLv6ik+YwdBbJRYUGeyW66Rv/etowhrI0=
-SIZE (xglobe-0.5p2-no-map.tar.gz) = 125689
-SIZE (xglobe-0.5p2.tar.gz) = 1066277
+SHA256 (xglobe-0.6.1.tar.gz) = wfSdSLsBbKkGgb+1suXx/6/Af2MBn9p2MmKsiFVOz5A=
+SIZE (xglobe-0.6.1.tar.gz) = 4673981
Index: patches/patch-desktopwidget_cpp
===
RCS file: patches/patch-desktopwidget_cpp
diff -N patches/patch-desktopwidget_cpp
--- patches/patch-desktopwidget_cpp 17 Dec 2018 18:49:50 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-desktopwidget_cpp,v 1.1 2018/12/17 18:49:50 jca Exp $
-Fix for ports-gcc-4.9:
-desktopwidget.cpp:34:5: error: '::exit' has not been declared
-Index: desktopwidget.cpp
 desktopwidget.cpp.orig
-+++ desktopwidget.cpp
-@@ -31,7 +31,7 @@ DesktopWidget::DesktopWidget(QWidget *parent, const ch
-   if(!currentImage)
-   {
- fprintf(stderr, "Not enough memory!\n");
--::exit(1);
-+std::exit(1);
-   }
- //  fprintf(stderr, "Desktop size: %dx%d\n",width(), height());
- }
Index: patches/patch-desktopwidget_h
===
RCS file: patches/patch-d

Re: remove games/jag

2020-07-05 Thread Stefan Sperling
On Sun, Jul 05, 2020 at 06:48:37PM -0700, Nam Nguyen wrote:
> I propose removing games/jag for licensing concerns. Upstream has
> stopped and I found that there was a fork that continues
> development. This fork is what Debian uses and the fork is run by
> $MAINTAINER of Debian's jag. I have a diff ready to update jag once this
> is resolved. It moves to qt5.
> 
> The licenses for some assets are questionable based on my investigation
> on waybackmachine. Namely, I am concerned about the themes by Fasticon
> like the futurama theme, with a strange "freeware" license.
> 
> I opened an issue here with the details:
> https://gitlab.com/coringao/jag/-/issues/1
> 
> For now, I propose removing games/jag until the new upstream can clarify
> what can be distributed. I would guess that deleting all themes but the
> default could work. Credits in the JAG menu read, "Thanks to the authors
> of graphics, icons and sounds, which are used under free licenses in the
> game."

Considering that Debian will likely want to see this resolved as well, and
that you are planning to update the port, couldn't we set PERMIT_PACKAGE=no
until the situation is cleared up?

We have ports in much worse licensing situations that do the same (look at
sysutils/firmware/ulpt for example...)



Re: NEW: x11/fff

2020-07-05 Thread Bjorn Ketelaars
On Sun 05/07/2020 23:15, deserter...@danwin1210.me wrote:
> This is port consist of a fast fucking file manager, it is simply a
> bash script which does the job of copying, moving, deleting and
> navigating easier particularly for small task.
> 
> Any comments?

Hi,

Couple of comments:
- I think CATEGORIES=sysutils is better. nnn and ranger are also there.
- No need to set HOMEPAGE as this is done by the GH_* magic. Have a look
  at infrastructure/mk/bsd.port.mk. However, if fff has a homepage other
  than the one on GitHUb than you could use HOMEPAGE
- Please sort RUN_DEPENDS
- Instead of using do-install you could set FAKE_FLAGS and have Makefile
  handle the rest. Something like the line below works
  FAKE_FLAGS=DESTDIR= MANDIR="${DESTDIR}${PREFIX}/man
- No need to set CONFIGURE_STYLE as there is nothing to override



vulkan ports update to sdk-1.2.141.0

2020-07-05 Thread Thomas Frohwein
Hi,

Below is the update to latest vulkan sdk versions 1.2.141.0 from end of
May. Pass portcheck and make port-lib-depends-check. The 'make test'
for glslang still shows the same error as previously [1].
vkcube, vkcubepp, and vkquake run without problems on this Intel
Skylake machine. vulkaninfo does it's job, but complains about not
being able to identify the executable, probably because of the stub
needed for loader_platform_executable_path().

This is largely base on jsg@'s diff from April [2], but updated for the
latest SDK. Also some help from brynet@ with vulkan-loader as detailed
below.

I'm aware of the issue with aarch64 build failures and the workaround
that led to problems with i386 [3] and would like to tackle this
separately after this update.

A few bulletpoints to highlight about the update:

- add COMPILER to spirv-headers as it uses C++ (seen in my build log)
- NO_BUILD=Yes for vulkan-headers, as there is nothing to build
- libvulkan now uses alloca(3) (unfortunately). The define to
  __builtin_alloca doesn't get picked up from stdlib.h, therefore added
  the line to vk_loader_platform.h. Discussed this with brynet@; a
  replacement with malloc is likely non-trivial. Maybe in the future
  this can be revisited.
- loader_platform_executable_path() is meant to return the path of the
  running executable, on Linux done via procfs. Just stubbed it to
  return NULL as we don't have that functionality. If other ports
  depend on this, it will likely need to be hardcoded in the respective
  ports (none known so far).
- update MODPY_VERSION for vulkan-tools to 3.8
  (MODPY_DEFAULT_VERSION_3); builds and runs fine here.

Testing welcome, as this is a more complex update. vulkan should run on
any amdgpu or newer Intel (>= Braswell) GPU.
Other applications that can use vulkan other than the ones tested so
far are emulators/ppsspp and emulators/dolphin.

ok?

[1] https://marc.info/?l=openbsd-ports&m=156090342730876&q=mbox
[2] https://marc.info/?l=openbsd-ports&m=158816323805091&q=mbox
[3] https://marc.info/?l=openbsd-ports-cvs&m=158837314306160&q=mbox

Index: glslang/Makefile
===
RCS file: /cvs/ports/graphics/glslang/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- glslang/Makefile27 Jul 2019 15:47:35 -  1.3
+++ glslang/Makefile6 Jul 2020 03:20:53 -
@@ -2,7 +2,7 @@
 
 COMMENT =  reference front-end for GLSL and ESSL
 
-GH_TAGNAME =   7.11.3214
+GH_TAGNAME =   8.13.3743
 GH_ACCOUNT =   KhronosGroup
 GH_PROJECT =   glslang
 
Index: glslang/distinfo
===
RCS file: /cvs/ports/graphics/glslang/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- glslang/distinfo22 Jun 2019 15:19:31 -  1.1.1.1
+++ glslang/distinfo6 Jul 2020 03:20:53 -
@@ -1,2 +1,2 @@
-SHA256 (glslang-7.11.3214.tar.gz) = 
swtGaHNDKNJW4wyUA35g03dbEFV0PATY/XCfKWDzAqk=
-SIZE (glslang-7.11.3214.tar.gz) = 2841979
+SHA256 (glslang-8.13.3743.tar.gz) = 
Y56+xW8adALy+glEaaXd6h7O7Pry6e/jYTdqD3On7i8=
+SIZE (glslang-8.13.3743.tar.gz) = 3183453
Index: glslang/patches/patch-Test_runtests
===
RCS file: /cvs/ports/graphics/glslang/patches/patch-Test_runtests,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Test_runtests
--- glslang/patches/patch-Test_runtests 22 Jun 2019 15:19:31 -  1.1.1.1
+++ glslang/patches/patch-Test_runtests 6 Jul 2020 03:20:53 -
@@ -1,16 +1,16 @@
-$OpenBSD: patch-Test_runtests,v 1.1.1.1 2019/06/22 15:19:31 thfr Exp $
+$OpenBSD$
 
 Index: Test/runtests
 --- Test/runtests.orig
 +++ Test/runtests
-@@ -2,8 +2,8 @@
+@@ -7,8 +7,8 @@
  
- TARGETDIR=localResults
+ TARGETDIR=${1:-localResults}
  BASEDIR=baseResults
--EXE=../build/install/bin/glslangValidator
--REMAPEXE=../build/install/bin/spirv-remap
-+EXE=${WRKBUILD}/StandAlone/glslangValidator
-+REMAPEXE=${WRKBUILD}/StandAlone/spirv-remap
+-EXE=${2:-../build/install/bin/glslangValidator}
+-REMAPEXE=${3:-../build/install/bin/spirv-remap}
++EXE=${2:-${WRKBUILD}/StandAlone/glslangValidator}
++REMAPEXE=${3:-${WRKBUILD}/StandAlone/spirv-remap}
  HASERROR=0
- mkdir -p localResults
+ mkdir -p $TARGETDIR
  
Index: glslang/pkg/PLIST
===
RCS file: /cvs/ports/graphics/glslang/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- glslang/pkg/PLIST   22 Jun 2019 15:19:31 -  1.1.1.1
+++ glslang/pkg/PLIST   6 Jul 2020 03:20:53 -
@@ -9,6 +9,7 @@ include/SPIRV/GLSL.ext.NV.h
 include/SPIRV/GLSL.std.450.h
 include/SPIRV/GlslangToSpv.h
 include/SPIRV/Logger.h
+include/SPIRV/NonSemanticDebugPrintf.h
 include/SPIRV/SPVRemapper.h
 include/SPIRV/SpvBuilder.h
 include/SPIRV/SpvTools.h
@@ -30,6 +31,8 @@ include/glslang/Include/ResourceLimits.h
 include/glslang/Include/ShHandle.h
 include/glslang/Include/Types.h
 include/glslang/Include/arr

NEW: x11/fff

2020-07-05 Thread deserter666
This is port consist of a fast fucking file manager, it is simply a
bash script which does the job of copying, moving, deleting and
navigating easier particularly for small task.

Any comments?

fff.tar.gz
Description: application/gzip


remove games/jag

2020-07-05 Thread Nam Nguyen
I propose removing games/jag for licensing concerns. Upstream has
stopped and I found that there was a fork that continues
development. This fork is what Debian uses and the fork is run by
$MAINTAINER of Debian's jag. I have a diff ready to update jag once this
is resolved. It moves to qt5.

The licenses for some assets are questionable based on my investigation
on waybackmachine. Namely, I am concerned about the themes by Fasticon
like the futurama theme, with a strange "freeware" license.

I opened an issue here with the details:
https://gitlab.com/coringao/jag/-/issues/1

For now, I propose removing games/jag until the new upstream can clarify
what can be distributed. I would guess that deleting all themes but the
default could work. Credits in the JAG menu read, "Thanks to the authors
of graphics, icons and sounds, which are used under free licenses in the
game."



Re: [pretest] emacs-27.0.91

2020-07-05 Thread Kenneth Westerback
On Sun., Jul. 5, 2020, 8:35 p.m. Jeremie Courreges-Anglas, 
wrote:

>
> First, thank you Timo, Ken and Matthieu for the feedback so far.
>
> On Sun, Jul 05 2020, Kenneth R Westerback  wrote:
> > On Sat, Jul 04, 2020 at 03:15:05PM +0200, Jeremie Courreges-Anglas wrote:
> >> On Sat, Jul 04 2020, Timo Myyr??  wrote:
> >>
> >> [...]
> >>
> >> > Is there any particular reason why json is disabled in configure?
> >>
> >> Nope, I just forgot to mention that I had disabled it for no particular
> >> reason.  Let's blame it on Miod's gentiane.
> >>
> >> > It provides massive speed up for emacs-lsp mode so at least I'd like
> to see it
> >> > included.
> >>
> >> Oh, I had not looked at lsp-mode.  Fine with me if people find fast json
> >> support useful.
> >>
> >> And since Ken asked for it, here are some fresh (unsigned) amd64
> packages:
> >>
> >>   https://russell.wxcvbn.org/pub/OpenBSD/snapshots/emacs-pretest/
> >
> > Took a bit to remember how to configure PKG_PATH so pkg_add -u would
> > work with local emacs package and remote supporting packages. But
> > success!
>
> Hah.  Here's the magic:
>
>   env TRUSTED_PKG_PATH=
> https://russell.wxcvbn.org/pub/OpenBSD/snapshots/emacs-pretest/ pkg_add
> -d emacs
>
> -d to install the debug symbols, in case you experience a crash.
>
> > Now running the package and already noticed a BIG
> > improvement. 'emacsclient -a "" -c' now seems to actually work when I
> > try to reply to emails like this from neomutt. Previously I had to
> > manually ensure emacs --daemon was already running.
> >
> > It did claim that package 'cl' is deprecated. Now I have to go look
> > that up. :-)
>
> Hmm like Matthieu you probably have an extension which uses cl.  FWIW
> the release notes say:
>
> ** The 'cl' package is now officially deprecated in favor of 'cl-lib'.
>

Still looking for where I managed to invoke cl.
Mom


> Still, I would expect this library to still work like it did previously,
> so people should have time to handle this deprecation.  Did you see
> runtime differences?
>

Not yet


> >> And since someone else asked, *this is a preview only*, I'm not going
> >> to commit an update to a pretest release unless you folks significantly
> >> bribe me. ;)
> >
> > Following request for information does not in any way
> > represent the OpenBSD Foundation or imply access to that organization's
> > vast resources!
> >
> > Define "significant". :-)
>
> Maybe just a pint of beer or cider at the next hackathon? :)
>

Given the current state of the world and consequent delays in holding
hackathons I am willing to commit to this level of bribe, confident we will
all have forgotten about it when the time comes. :-)


> More seriously, if the emacsclient changes help you, and if people from
> base would like to get rid of some hacks we keep for emacs unexec,
>

The improvement in my workflow is not significant enough for me to worry
about waiting for more tests. So I'm easy either way.

I could consider an update to this pretest release reasonable.  But there's
> really some mess going on with how diffs are hilighted in my setup, though.
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE
>

I have noticed occasional odd colouring of diffs too. I think it has
something to do with recent search targets.

 Ken

>


Re: [pretest] emacs-27.0.91

2020-07-05 Thread Jeremie Courreges-Anglas


First, thank you Timo, Ken and Matthieu for the feedback so far.

On Sun, Jul 05 2020, Kenneth R Westerback  wrote:
> On Sat, Jul 04, 2020 at 03:15:05PM +0200, Jeremie Courreges-Anglas wrote:
>> On Sat, Jul 04 2020, Timo Myyr??  wrote:
>> 
>> [...]
>> 
>> > Is there any particular reason why json is disabled in configure?
>> 
>> Nope, I just forgot to mention that I had disabled it for no particular
>> reason.  Let's blame it on Miod's gentiane.
>> 
>> > It provides massive speed up for emacs-lsp mode so at least I'd like to 
>> > see it
>> > included.
>> 
>> Oh, I had not looked at lsp-mode.  Fine with me if people find fast json
>> support useful.
>> 
>> And since Ken asked for it, here are some fresh (unsigned) amd64 packages:
>> 
>>   https://russell.wxcvbn.org/pub/OpenBSD/snapshots/emacs-pretest/
>
> Took a bit to remember how to configure PKG_PATH so pkg_add -u would
> work with local emacs package and remote supporting packages. But
> success!

Hah.  Here's the magic:

  env 
TRUSTED_PKG_PATH=https://russell.wxcvbn.org/pub/OpenBSD/snapshots/emacs-pretest/
 pkg_add -d emacs

-d to install the debug symbols, in case you experience a crash.

> Now running the package and already noticed a BIG
> improvement. 'emacsclient -a "" -c' now seems to actually work when I
> try to reply to emails like this from neomutt. Previously I had to
> manually ensure emacs --daemon was already running.
>
> It did claim that package 'cl' is deprecated. Now I have to go look
> that up. :-)

Hmm like Matthieu you probably have an extension which uses cl.  FWIW
the release notes say:

** The 'cl' package is now officially deprecated in favor of 'cl-lib'.

Still, I would expect this library to still work like it did previously,
so people should have time to handle this deprecation.  Did you see
runtime differences?

>> And since someone else asked, *this is a preview only*, I'm not going
>> to commit an update to a pretest release unless you folks significantly
>> bribe me. ;)
>
> Following request for information does not in any way
> represent the OpenBSD Foundation or imply access to that organization's
> vast resources!
>
> Define "significant". :-)

Maybe just a pint of beer or cider at the next hackathon? :)

More seriously, if the emacsclient changes help you, and if people from
base would like to get rid of some hacks we keep for emacs unexec,
I could consider an update to this pretest release reasonable.  But there's
really some mess going on with how diffs are hilighted in my setup, though.

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE



Re: update devel/coccinelle

2020-07-05 Thread Christopher Zimmermann

On Sat, Jul 04, 2020 at 12:25:41AM +0200, Christopher Zimmermann wrote:

Hi,

here's an update to coccinelle.
Given that the projets install target is not playing nice with 
bytecode-only vs nativecode and bytecode installs I'm wondering 
whether I need to include the ocaml object / development files at all 
in our port.

Anyway I'd like to commit the update as in the diff below. OKs?

Christopher


another try of sending an unmangled patch.

--
http://gmerlin.de
OpenPGP: http://gmerlin.de/christopher.pub
CB07 DA40 B0B6 571D 35E2  0DEF 87E2 92A7 13E5 DEE1
Index: Makefile
===
RCS file: /cvs/ports/devel/coccinelle/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- Makefile	9 Jun 2020 17:34:13 -	1.41
+++ Makefile	4 Jul 2020 05:22:25 -
@@ -7,23 +7,23 @@ COMMENT =	program matching and transform
 
 # if updating, check for any additional use of diff/grep which
 # may need to be switched to gdiff/ggrep
-DISTNAME =	coccinelle-1.0.6
-REVISION =	2
-EXTRACT_SUFX =	.tgz
 
 CATEGORIES =	devel
 
+GH_ACCOUNT =	coccinelle
+GH_PROJECT =	coccinelle
+GH_TAGNAME =	1.0.8
+
 HOMEPAGE =	http://coccinelle.lip6.fr/
 
 # GPLv2 only
 PERMIT_PACKAGE =	Yes
 
-WANTLIB += c curses m pthread pcre ${MODPY_WANTLIB}
-
-MASTER_SITES = ${HOMEPAGE}distrib/
+WANTLIB += c m pcre ${MODPY_WANTLIB}
 
 MODULES =		lang/ocaml \
 			lang/python
+MODPY_RUNDEP =		yes
 
 BUILD_DEPENDS =		${RUN_DEPENDS} \
 			print/texlive/base \
@@ -40,7 +40,9 @@ RUN_DEPENDS =		devel/ocaml-parmap \
 # asks questions at the end if it does better than expected
 TEST_IS_INTERACTIVE = Yes
 
-CONFIGURE_STYLE =	gnu
+CONFIGURE_STYLE =	gnu autoreconf
+AUTOCONF_VERSION =	2.69
+AUTOMAKE_VERSION =	1.16
 CONFIGURE_ENV =		MAKE_PROGRAM=${MAKE_PROGRAM}
 # The PKG_CHECK_MODULES autoconf macro doesn't have a way to use .private
 CONFIGURE_ENV +=	PYTHON_LIBS="`pkg-config --static --libs python`" \
@@ -57,7 +59,7 @@ CONFIGURE_ARGS +=	--disable-opt
 USE_GMAKE =	Yes
 PORTHOME =	${WRKDIR}
 
-ALL_TARGET =		all-release
+ALL_TARGET =	all ocaml/coccilib.cmo docs
 
 TEST_TARGET =	test
 TEST_DEPENDS =	${FULLPKGPATH}
@@ -71,13 +73,16 @@ post-build:
 		${MAKE_PROGRAM} WEBDOCS=${PREFIX}/share/doc/coccinelle html
 
 post-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/pycocci ${PREFIX}/bin/pycocci
+	sed -i -e "1s|.*|#!${MODPY_BIN}|" ${PREFIX}/bin/pycocci
+	mv ${PREFIX}/man/man3/Coccilib.3cocci ${PREFIX}/man/man3/Coccilib.3
 	${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
 	${PREFIX}/share/coccinelle/python/coccilib
 	mv ${PREFIX}/lib/coccinelle/*.so \
 		${PREFIX}/lib/ocaml/stublibs/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/coccinelle
 	${INSTALL_DATA} \
-		${WRKSRC}/docs/manual/*.{html,css,gif} \
+		${WRKSRC}/docs/manual/*.{html,css,svg} \
 		${PREFIX}/share/doc/coccinelle/
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/devel/coccinelle/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo	4 Mar 2019 12:51:12 -	1.13
+++ distinfo	4 Jul 2020 05:22:25 -
@@ -1,2 +1,2 @@
-SHA256 (coccinelle-1.0.6.tgz) = hFLtJlwgna6Zy7M7Z7x5Eucvi8oeJPM/Goi6PXmF6Qk=
-SIZE (coccinelle-1.0.6.tgz) = 6684278
+SHA256 (coccinelle-1.0.8.tar.gz) = n5lL+YvIjDM6x6VKA9T6GCYSLuxwFqHyLGsu8qakNH8=
+SIZE (coccinelle-1.0.8.tar.gz) = 2670961
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/devel/coccinelle/patches/patch-Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 patch-Makefile
--- patches/patch-Makefile	4 Mar 2019 12:51:12 -	1.11
+++ patches/patch-Makefile	4 Jul 2020 05:22:25 -
@@ -1,38 +1,18 @@
-$OpenBSD: patch-Makefile,v 1.11 2019/03/04 12:51:12 chrisz Exp $
-
-Some future version of coccinelle will hopefully configure for unbundled num
-or use Zarith instead.
+$OpenBSD$
 
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
-@@ -71,7 +71,7 @@ INCLUDEDIRSDEP=commons commons/ocamlextra \
-  parsing_cocci parsing_c ocaml python engine popl09 extra \
-  $(MAKELIBS)
- 
--INCLUDEDIRS=$(INCLUDEDIRSDEP) $(PCREDIR) $(PARMAPDIR) $(INCLIBS)
-+INCLUDEDIRS=$(INCLUDEDIRSDEP) $(PCREDIR) $(PARMAPDIR) $(INCLIBS) +num
- 
- ##
- # Generic variables
-@@ -347,7 +347,7 @@ install-man:
- 	$(INSTALL_DATA) docs/spatch.1 $(DESTDIR)$(MANDIR)/man1/
- 	$(INSTALL_DATA) docs/pycocci.1 $(DESTDIR)$(MANDIR)/man1/
- 	$(INSTALL_DATA) docs/spgen.1 $(DESTDIR)$(MANDIR)/man1/
--	$(INSTALL_DATA) docs/Coccilib.3cocci $(DESTDIR)$(MANDIR)/man3/
-+	$(INSTALL_DATA) docs/Coccilib.3cocci $(DESTDIR)$(MANDIR)/man3/Coccilib.3
- 
- install-bash:
- 	@$(ECHO) "Installing bash completion in: ${DESTDIR}${BASH_COMPLETION_DIR}"
-@@ -378,9 +378,9 @@ install-python:
- install-stubs:
- 	$(MKDIR_P) $(DESTDIR)$(LIBDIR)
- 	@if test -f ./bundles/pyml/dllpyml_stubs.so; then \
--		cp -fv ./bundles/pyml/dllpyml_stubs.so $(DESTDIR)$(LIBDIR); fi
-+		cp -f ./bundl

NEW: x11/elementary/screenshot

2020-07-05 Thread Brian Callahan
Hi ports --

Now that I have a decently well working elementary OS desktop running (a 
picture is here [0] for the curious), I need to start pushing all these ports. 
I won't flood the lists, but it is 40+ new ports and the revival of some 
deleted ports.

First up is elementary-screenshot, a screenshot tool.

---
pkg/DESCR:
Screenshot tool designed for elementary OS.
---

Works well on amd64.

OK?

~Brian

[0] https://bsd.network/web/statuses/104462236599534937


screenshot.tgz
Description: application/compressed-tar


Re: NEW: x11/ntk

2020-07-05 Thread deserter666
On Sat, July 4, 2020 2:47 pm, Stuart Henderson wrote:
>
> so that is a better description than "custom LGPLv2" :)
>
Hey,

Now the shared library version control is more seamless and occurs in the
Makefile alone, so no need to update the patch file. Portcheck passes too,
and the audio/luppp port that I've sent can be used as a test.

Any comments/OK?


ntk.tar.gz
Description: application/gzip


Re: [pretest] emacs-27.0.91

2020-07-05 Thread Matthieu Herrb
On Sun, Jul 05, 2020 at 12:58:55PM -0400, Kenneth R Westerback wrote:
> On Sat, Jul 04, 2020 at 03:15:05PM +0200, Jeremie Courreges-Anglas wrote:
> > On Sat, Jul 04 2020, Timo Myyr??  wrote:
> > 
> > [...]
> > 
> > > Is there any particular reason why json is disabled in configure?
> > 
> > Nope, I just forgot to mention that I had disabled it for no particular
> > reason.  Let's blame it on Miod's gentiane.
> > 
> > > It provides massive speed up for emacs-lsp mode so at least I'd like to 
> > > see it
> > > included.
> > 
> > Oh, I had not looked at lsp-mode.  Fine with me if people find fast json
> > support useful.
> > 
> > And since Ken asked for it, here are some fresh (unsigned) amd64 packages:
> > 
> >   https://russell.wxcvbn.org/pub/OpenBSD/snapshots/emacs-pretest/
> 
> Took a bit to remember how to configure PKG_PATH so pkg_add -u would
> work with local emacs package and remote supporting packages. But
> success!
> 
> Now running the package and already noticed a BIG
> improvement. 'emacsclient -a "" -c' now seems to actually work when I
> try to reply to emails like this from neomutt. Previously I had to
> manually ensure emacs --daemon was already running.
> 
> It did claim that package 'cl' is deprecated. Now I have to go look
> that up. :-)

Here cl was loaded by twittering-mode which is dead afaik since
Twitter killed the external APIs. I've killed it from my emacs config.

Works for me (and this message is composed in emacs 27 :)
-- 
Matthieu Herrb



Re: [pretest] emacs-27.0.91

2020-07-05 Thread Kenneth R Westerback
On Sat, Jul 04, 2020 at 03:15:05PM +0200, Jeremie Courreges-Anglas wrote:
> On Sat, Jul 04 2020, Timo Myyr??  wrote:
> 
> [...]
> 
> > Is there any particular reason why json is disabled in configure?
> 
> Nope, I just forgot to mention that I had disabled it for no particular
> reason.  Let's blame it on Miod's gentiane.
> 
> > It provides massive speed up for emacs-lsp mode so at least I'd like to see 
> > it
> > included.
> 
> Oh, I had not looked at lsp-mode.  Fine with me if people find fast json
> support useful.
> 
> And since Ken asked for it, here are some fresh (unsigned) amd64 packages:
> 
>   https://russell.wxcvbn.org/pub/OpenBSD/snapshots/emacs-pretest/

Took a bit to remember how to configure PKG_PATH so pkg_add -u would
work with local emacs package and remote supporting packages. But
success!

Now running the package and already noticed a BIG
improvement. 'emacsclient -a "" -c' now seems to actually work when I
try to reply to emails like this from neomutt. Previously I had to
manually ensure emacs --daemon was already running.

It did claim that package 'cl' is deprecated. Now I have to go look
that up. :-)

> 
> And since someone else asked, *this is a preview only*, I'm not going
> to commit an update to a pretest release unless you folks significantly
> bribe me. ;)

Following request for information does not in any way
represent the OpenBSD Foundation or imply access to that organization's
vast resources!

Define "significant". :-)

 Ken

> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/editors/emacs/Makefile,v
> retrieving revision 1.95
> diff -u -p -r1.95 Makefile
> --- Makefile  3 Jul 2020 17:05:14 -   1.95
> +++ Makefile  4 Jul 2020 12:59:22 -
> @@ -2,8 +2,7 @@
>  
>  COMMENT= GNU editor: extensible, customizable, self-documenting
>  
> -VERSION= 26.3
> -REVISION=2
> +VERSION= 27.0.91
>  DISTNAME=emacs-${VERSION}
>  
>  CATEGORIES=  editors
> @@ -13,11 +12,11 @@ HOMEPAGE= https://www.gnu.org/software/
>  MAINTAINER=  Jeremie Courreges-Anglas 
>  
>  # GPLv3+
> -PERMIT_PACKAGE=  Yes
> +PERMIT_PACKAGE=  Yes
>  
> -WANTLIB= c m curses pthread gnutls xml2 z
> +WANTLIB =c curses jansson gmp gnutls m pthread xml2 z
>  
> -MASTER_SITES=${MASTER_SITE_GNU:=emacs/}
> +MASTER_SITES=https://alpha.gnu.org/gnu/emacs/pretest/
>  EXTRACT_SUFX=.tar.xz
>  
>  DEBUG_PACKAGES = ${BUILD_PACKAGES}
> @@ -33,18 +32,8 @@ CONFIGURE_ARGS=--build="${GCCARCH}" \
>   --without-sound
>  
>  CONFIGURE_ENV=   CPPFLAGS="-I${LOCALBASE}/include" \
> - LDFLAGS="-L${LOCALBASE}/lib -nopie ${LDFLAGS}" \
> + LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}" \
>   ac_cv_header_execinfo_h=no
> -CFLAGS+= -fno-pie
> -
> -.include 
> -.if ${PROPERTIES:Mlld}
> -# ld -Z not supported
> -.elif ${MACHINE_ARCH} == "sparc64"
> -# No need for ld -Z
> -.else
> -CONFIGURE_ENV+=  EMACS_LD_SWITCH_SYSTEM="-Z"
> -.endif
>  
>  MAKE_ENV=INSTALL_EMACS="${INSTALL_SCRIPT}" \
>   LOGNAME="${SHAREOWN}"
> @@ -52,24 +41,27 @@ MAKE_ENV= INSTALL_EMACS="${INSTALL_SCRI
>  SUBST_VARS=  GCCARCH VERSION
>  
>  USE_GMAKE=   Yes
> -LIB_DEPENDS= security/gnutls \
> +LIB_DEPENDS= devel/jansson \
> + devel/gmp \
> + security/gnutls \
>   textproc/libxml
>  
>  .if ${FLAVOR} == "no_x11"
>  CONFIGURE_ARGS+= --without-x \
>   --without-dbus \
>   --without-gsettings \
> + --without-harfbuzz \
>   --without-jpeg \
>   --without-lcms2 \
>   --without-libotf \
>   --without-m17n-flt
>  .else
> -LIB_DEPENDS+=devel/libotf \
> +LIB_DEPENDS+=devel/harfbuzz \
> + devel/libotf \
>   graphics/jpeg \
>   graphics/png \
>   graphics/tiff \
>   graphics/giflib \
> - graphics/ImageMagick \
>   graphics/lcms2 \
>   misc/m17n/lib \
>   x11/dbus \
> @@ -80,30 +72,29 @@ RUN_DEPENDS+= devel/desktop-file-utils 
>  . if ${FLAVOR} == "athena"
>  CONFIGURE_ARGS+= --with-x-toolkit=athena
>  LIB_DEPENDS+=x11/Xaw3d
> -WANTLIB += ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 X11-xcb
> -WANTLIB += Xaw3d Xext Xfixes Xft Xinerama Xmu Xpm Xrandr Xrender
> -WANTLIB += Xt cairo dbus-1 fontconfig freetype gdk_pixbuf-2.0
> -WANTLIB += gif gio-2.0 glib-2.0 gobject-2.0 intl jpeg lcms2 m17n-core
> -WANTLIB += m17n-flt 

UPDATE: x11/xglobe

2020-07-05 Thread Rafael Sadowski
Please find below a diff to update xglobe to 0.6. The original xglobe is
dead upstream. I modernized it just for fun and with the motivation to
get rid of Qt3/KDE3 from the ports tree. This is a complete rewrite in
C++17/Qt5.

Anyway, this is the first version after the reconstruction. For KDE and
Linux it comes with Plasma support. For OpenBSD xwallpaper is required
to draw the wallpaper.

I will try to continue to work on it and am happy about feedback.

Rafael

Index: Makefile
===
RCS file: /cvs/ports/x11/xglobe/Makefile,v
retrieving revision 1.80
diff -u -p -u -p -r1.80 Makefile
--- Makefile26 Jan 2020 11:14:34 -  1.80
+++ Makefile5 Jul 2020 15:40:04 -
@@ -2,66 +2,43 @@
 
 COMMENT=   display the Earth on X11
 
+V= 0.6
+DISTNAME=  xglobe-${V}
+
 CATEGORIES=x11 geo
-HOMEPAGE=  http://www.shaderwrangler.com/xglobe/
-#MASTER_SITES= ${HOMEPAGE}
-# Temporary release
-MASTER_SITES=  https://distfiles.sigtrap.nl/
-DISTNAME=  xglobe-0.5p2
-PKGNAME=   xglobe-0.5
-REVISION=  44
+
+HOMEPAGE=  https://github.com/sizeofvoid/xglobe
 
 MAINTAINER=Marc Espie 
 
-# GPL, included map is free
+# GPLv2, included map is free
 PERMIT_PACKAGE=Yes
-WANTLIB=   X11 c m pthread ${COMPILER_LIBCXX}
 
-COMPILER = base-clang ports-gcc base-gcc
+WANTLIB += ${COMPILER_LIBCXX} ICE Qt5Core Qt5DBus Qt5Gui Qt5Widgets
+WANTLIB += Qt5X11Extras SM X11 Xext c m
 
-MODULES=   x11/qt3
+MASTER_SITES=  https://github.com/sizeofvoid/xglobe/releases/download/v${V}/
 
-MAKE_FLAGS=XGLOBE_DIR=${PREFIX}
+MODULES=   devel/cmake \
+   x11/qt5
 
-RUN_DEPENDS=   geo/openbsd-developers
+LIB_DEPENDS=   x11/qt5/qtx11extras
+
+RUN_DEPENDS=   geo/openbsd-developers \
+   x11/xwallpaper
+BUILD_DEPENDS= x11/xwallpaper
 
 FLAVORS=   no_map
 FLAVOR?=
 .if ${FLAVOR:Mno_map}
-DISTFILES= ${DISTNAME}-no-map${EXTRACT_SUFX}
-
-# Kludge install for no map around
-pre-install:
-   @touch ${WRKSRC}/map.bmp
-
-post-install::
-   @rm ${PREFIX}/lib/xglobe/map.bmp
+CONFIGURE_ARGS =   -DENABLE_INSTALL_MAPS=OFF
+.else
+CONFIGURE_ARGS =   -DENABLE_INSTALL_MAPS=ON
 .endif
 
+WRKDIST=   ${WRKDIR}/xglobe
 
-MAKE_FLAGS+=   QT_INCLUDE_DIR=${MODQT_INCDIR}
-MAKE_FLAGS+=   QT_LIB_DIR=${MODQT_LIBDIR}
-
-MAKE_FLAGS+=   CPP="${CXX}" LINK="${CXX}"
-MAKE_FLAGS+=   OPTIONS="${CXXFLAGS} -pthread -fno-exceptions -funroll-loops"
-MAKE_FLAGS+=   LFLAGS='-pthread'
-MAKE_FLAGS+=   LIBS='-lX11 -lqt-mt -lm'
-
-# for linking against libpng
-MAKE_FLAGS+=   'LIB_DIRS=-L$$(QT_LIB_DIR) -L$$(X11_LIB_DIR) -L$(LOCALBASE)/lib'
-MAKE_FLAGS+=   COPTS='${COPTS}'
-
-NO_TEST=   Yes
-
-post-install::
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xglobe
-   ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xglobe
-   ${INSTALL_DATA} ${WRKSRC}/README.maps ${PREFIX}/share/doc/xglobe
+post-install:
${INSTALL_SCRIPT} ${FILESDIR}/getcloudmap ${PREFIX}/bin
-   ln -sf ${TRUEPREFIX}/share/markers/OpenBSD 
${PREFIX}/lib/xglobe/OpenBSD-markers
-
-SUPDISTFILES=  ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-no-map${EXTRACT_SUFX}
-
-FAKE_FLAGS=XGLOBE_DIR=${WRKINST}${PREFIX}
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/x11/xglobe/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo18 Jan 2015 03:16:07 -  1.4
+++ distinfo5 Jul 2020 15:40:04 -
@@ -1,4 +1,2 @@
-SHA256 (xglobe-0.5p2-no-map.tar.gz) = 
OHweWixJvGs6YMVkBxxOZAgn5vkB23O1CBVSgdnIH1g=
-SHA256 (xglobe-0.5p2.tar.gz) = nXI1HqCwV5zLv6ik+YwdBbJRYUGeyW66Rv/etowhrI0=
-SIZE (xglobe-0.5p2-no-map.tar.gz) = 125689
-SIZE (xglobe-0.5p2.tar.gz) = 1066277
+SHA256 (xglobe-0.6.tar.gz) = dIWWL1nYHaZYxTt64ZjaPJ0XV7ir2jEgSBeY8Oi0oD0=
+SIZE (xglobe-0.6.tar.gz) = 4673936
Index: patches/patch-desktopwidget_cpp
===
RCS file: patches/patch-desktopwidget_cpp
diff -N patches/patch-desktopwidget_cpp
--- patches/patch-desktopwidget_cpp 17 Dec 2018 18:49:50 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-desktopwidget_cpp,v 1.1 2018/12/17 18:49:50 jca Exp $
-Fix for ports-gcc-4.9:
-desktopwidget.cpp:34:5: error: '::exit' has not been declared
-Index: desktopwidget.cpp
 desktopwidget.cpp.orig
-+++ desktopwidget.cpp
-@@ -31,7 +31,7 @@ DesktopWidget::DesktopWidget(QWidget *parent, const ch
-   if(!currentImage)
-   {
- fprintf(stderr, "Not enough memory!\n");
--::exit(1);
-+std::exit(1);
-   }
- //  fprintf(stderr, "Desktop size: %dx%d\n",width(), height());
- }
Index: patches/patch-desktopwidget_h
===
RCS file: patches/patch-desktopwidget_h
diff -N patches/patch-desktopwidget_h
--- patches/patch-desktopwidget_h   17 Dec 2018 18:49:50

[NEW] node.js http2 hello world malformed request pseudo-headers

2020-07-05 Thread Martin Ziebiker
Hello, can anyone reproduce this please? 

 

OpenBSD 6.7 + syspatch

pkg_add node (v12.16.1)

run helloworld http2 code in source.txt on public IP. 

open https://yourtestdomain:8080 in Chrome, new Edge

Check logged request headers created by node.js.

Second request for favicon.ico is always problematic.

FireFox seem to be working OK.

Under Windows on localhost, every browser seems to be OK.

 

Any ideas? Thank You very much.

 

Best regards,

Martin Ziebiker

 

 




__ Information from ESET Mail Security, version of virus signature 
database 20431 (20191129) __

The message was checked by ESET Mail Security.
http://www.eset.com

const http2 = require('http2');
const fs = require('fs');

const IP = 'public ip';
const PORT = 8080;
const PATH_TO_CERT = '/etc/ssl/cert.pem';
const PATH_TO_KEY = '/etc/ssl/private/key.key';

const server = http2.createSecureServer({
key: fs.readFileSync( PATH_TO_KEY ),
cert: fs.readFileSync( PATH_TO_CERT ),
});

server.listen( PORT, IP, () => console.log('Server running at ' + IP + ' port ' 
+ PORT));
server.on('error', error => console.log(error));

server.on('stream', ( stream, headers ) => {

stream.on('error', error => console.log(error));
console.log(headers);

stream.respond({':status': 200});
stream.end('hello world');
});


Re: update: education/anki-2.1.16

2020-07-05 Thread Stuart Henderson
On 2020/07/05 10:03, Andrea Fleckenstein wrote:
> marfabastewart  writes:
> 
> > Thank you for the continuing work on anki. However, I
> > am getting an error on -current now. After installing
> > with pkg_add -D snap,
> > I get
> >
> > marfaba$ anki
> > Traceback (most recent call last):
> >   File "/usr/local/bin/anki", line 3, in 
> > import aqt
> >   File "/usr/local/lib/python3.7/site-packages/aqt/__init__.py", line 57, 
> > in 
> > from aqt import addcards, browser, editcurrent, stats, about, \
> >   File "/usr/local/lib/python3.7/site-packages/aqt/addcards.py", line 13, 
> > in 
> > import aqt.editor, aqt.modelchooser, aqt.deckchooser
> >   File "/usr/local/lib/python3.7/site-packages/aqt/editor.py", line 25, in 
> > 
> > import requests
> > ModuleNotFoundError: No module named 'requests'
> >
> 
> Thanks, Makefile diff below
> 
> 
> --- Makefile.orig Sun Jul  5 08:42:34 2020
> +++ Makefile  Sun Jul  5 08:43:13 2020
> @@ -33,6 +33,7 @@
>   sysutils/py-distro${MODPY_FLAVOR} \
>   textproc/py-markdown${MODPY_FLAVOR} \
>   www/py-beautifulsoup4${MODPY_FLAVOR} \
> + www/py-requests${MODPY_FLAVOR} \
>   www/py-qtwebengine${MODPY_FLAVOR}
>  
>  do-build:
> 

I already committed a fix (and then Antoine fixed my fix :-)

For the record, adding/bumping REVISION is necessary for any change to
the port which results in a change to the package (so that includes
HOMEPAGE, patches which affect the built files, dependency changes, etc)



Re: update: education/anki-2.1.16

2020-07-05 Thread Andrea Fleckenstein
marfabastewart  writes:

> Thank you for the continuing work on anki. However, I
> am getting an error on -current now. After installing
> with pkg_add -D snap,
> I get
>
> marfaba$ anki
> Traceback (most recent call last):
>   File "/usr/local/bin/anki", line 3, in 
> import aqt
>   File "/usr/local/lib/python3.7/site-packages/aqt/__init__.py", line 57, in 
> 
> from aqt import addcards, browser, editcurrent, stats, about, \
>   File "/usr/local/lib/python3.7/site-packages/aqt/addcards.py", line 13, in 
> 
> import aqt.editor, aqt.modelchooser, aqt.deckchooser
>   File "/usr/local/lib/python3.7/site-packages/aqt/editor.py", line 25, in 
> 
> import requests
> ModuleNotFoundError: No module named 'requests'
>

Thanks, Makefile diff below


--- Makefile.orig   Sun Jul  5 08:42:34 2020
+++ MakefileSun Jul  5 08:43:13 2020
@@ -33,6 +33,7 @@
sysutils/py-distro${MODPY_FLAVOR} \
textproc/py-markdown${MODPY_FLAVOR} \
www/py-beautifulsoup4${MODPY_FLAVOR} \
+   www/py-requests${MODPY_FLAVOR} \
www/py-qtwebengine${MODPY_FLAVOR}
 
 do-build:



Re: purritobin-0.1.2 - new package + dependencies

2020-07-05 Thread Aisha Tammy
Bump,

> On 2020/06/23 23:33, Aisha Tammy wrote:
>> On 6/22/20 6:56 AM, Stuart Henderson wrote:
>>> On 2020/06/21 21:32, Aisha Tammy wrote:
> I've added them again with the two from Brian and the uwebsockets
> updated to 18.3.0

 Another bump.
 Also updated uwebsockets to 18.4.0
>>>
>>> OK sthen@ if someone wants to import uwebsockets/usockets with usockets
>>> moved from devel to net, tgz attached.
>>>
>>> For purritobin, could you install the README under share/doc and maybe
>>> also paste.html and POSIX_shell_client.sh (either in share/examples or
>>> somewhere else). Might be a good idea to add an rc script and a userid
>>> to run it under (@newuser in plist) too?
>>>
>>>
>>
>> I've attached purritobin with the README and an rc file.
>> Changes
>>  - new user and group
>>
>>  - rc file running as new user
>>  - added paste.html and shell clients to /usr/local/share/purritobin/
>>  - added pkg-readme with examples for httpd, cron cleanup and pf rate 
>> limiting
>>
>> Also needs that uwebsockets and usockets be updated to latest version as the
>> current ones in the tree are broken (upstream messed up some SSL 
>> declarations).
>> I've added the diff for that as well.
> 
> I've committed those, diff didn't work as it had extra blank lines
> so I did them by hand, SHARED_LIBS needed a bump too due to additional
> functions.
> 
> purritobin looks good now, ok if someone would like to import (wonder if
> it might be better in www rather than net though)
> 



purritobin.tgz
Description: application/compressed-tar


Re: [new package] mutt-wizard - automated configuration manager for neomutt

2020-07-05 Thread Aisha Tammy
bump

On 6/24/20 3:18 PM, Aisha Tammy wrote:
> Another bump.
> 
> Aisha
> 
> On 6/17/20 11:36 AM, Aisha Tammy wrote:
>> Another bump!
>> I'm hoping this can be added.
>>
>> Aisha
>>
>> On 6/8/20 1:36 PM, Aisha Tammy wrote:
>>> Bumping.
>>> Also it makes it easy to connect to proton using the bridge so thats
>>> a positive as well.
>>>
>>> Aisha
>>>
>>> On 6/1/20 12:46 AM, Aisha Tammy wrote:
 Hi,
 This is quite a handy package for autoconfiguration of neomutt
 and other utilities. I'm hoping we can get it so that a lot of the
 newcomers who want to use neomutt won't be that daunted by the dotfiles.

 I've attached the port but upstream doesn't make any tagged releases, so 
 I've made it using a dated format. I'm not sure what the proper method is
 when adding versions to such packages.

 PS: upstream calls it mutt-wizard but it needs neomutt as told by upstream.

 Aisha

>>>
>>
> 



Re: update gnupg2 to 2.2.20

2020-07-05 Thread Aisha Tammy
bump!

On 6/25/20 12:27 PM, Aisha Tammy wrote:
> Fixes WKD directive for fetching keys.
> Also makes it easier to upgrade to 2.2.21 
> (which should be released soonish saying that for 3 months now!)
> 
> Aisha
> 
> index 291064fc5e7..06f30e61dce 100644
> --- security/gnupg2/Makefile
> +++ security/gnupg2/Makefile
> @@ -2,9 +2,8 @@
> 
>  COMMENT =  GNU privacy guard - a free PGP replacement
> 
> -DISTNAME = gnupg-2.2.12
> +DISTNAME = gnupg-2.2.20
>  CATEGORIES =   security
> -REVISION = 1
> 
>  # don't mix up dependencies with gnupg1
>  PKGSPEC =  gnupg->=2
> diff --git security/gnupg2/distinfo security/gnupg2/distinfo
> index 2b95930040f..07005577fd6 100644
> --- security/gnupg2/distinfo
> +++ security/gnupg2/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (gnupg-2.2.12.tar.bz2) = 2wMPi0yYZA6RMA021Rbx9Pj+CVFKlOqfx0Ee4aNAgss=
> -SIZE (gnupg-2.2.12.tar.bz2) = 6682303
> +SHA256 (gnupg-2.2.20.tar.bz2) = BKfJ1It0w5kWjugnDlSFiN2+UiGMM3cD1/Bjc9MmyjA=
> +SIZE (gnupg-2.2.20.tar.bz2) = 6786913
> 



Re: [security update] net/synapse -> 1.15.2

2020-07-05 Thread Renaud Allard
Ah, yes, indeed, I made the patch on the 6.7 ports machine instead of 
-currrent

Here is the one from -current machine.

Sorry :)


On 05/07/2020 11:14, Landry Breuil wrote:

On Sun, Jul 05, 2020 at 10:25:39AM +0200, Renaud Allard wrote:

Hi,

Here is patch for synapse to 1.15.2


i suppose this is for 6.7 ? diff wont apply to current, where
development is...

Landry

Index: Makefile
===
RCS file: /cvs/ports/net/synapse/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile16 Jun 2020 11:16:22 -  1.8
+++ Makefile5 Jul 2020 09:25:25 -
@@ -2,7 +2,7 @@
 
 COMMENT =  open network for secure, decentralized communication
 
-MODPY_EGG_VERSION =1.15.1
+MODPY_EGG_VERSION =1.15.2
 
 GH_ACCOUNT =   matrix-org
 GH_PROJECT =   synapse
Index: distinfo
===
RCS file: /cvs/ports/net/synapse/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo16 Jun 2020 11:16:22 -  1.7
+++ distinfo5 Jul 2020 09:25:25 -
@@ -1,2 +1,2 @@
-SHA256 (synapse-1.15.1.tar.gz) = XtH9n1yl5bsIesz2hYNbw/5eSxPkOxbDgjPEIK4bZfw=
-SIZE (synapse-1.15.1.tar.gz) = 6717084
+SHA256 (synapse-1.15.2.tar.gz) = FcGYwpYVlzD55bwud3zpSJKxrZPaDRAWE+lXeSp26hc=
+SIZE (synapse-1.15.2.tar.gz) = 6717409


smime.p7s
Description: S/MIME Cryptographic Signature


[security update] net/synapse -> 1.15.2

2020-07-05 Thread Renaud Allard

Hi,

Here is patch for synapse to 1.15.2
This is a security update:

Security advisory

A malicious homeserver could force Synapse to reset the state in a 
room to a small subset of the correct state. This affects all Synapse 
deployments which federate with untrusted servers. (96e9afe6)


HTML pages served via Synapse were vulnerable to clickjacking 
attacks. This predominantly affects homeservers with single-sign-on 
enabled, but all server administrators are encouraged to upgrade. (ea26e9a9)
Index: Makefile
===
RCS file: /cvs/ports/net/synapse/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile21 Apr 2020 19:14:12 -  1.4
+++ Makefile5 Jul 2020 08:22:56 -
@@ -2,8 +2,7 @@
 
 COMMENT =  open network for secure, decentralized communication
 
-MODPY_EGG_VERSION =1.12.2
-REVISION = 0
+MODPY_EGG_VERSION =1.15.2
 
 GH_ACCOUNT =   matrix-org
 GH_PROJECT =   synapse
Index: distinfo
===
RCS file: /cvs/ports/net/synapse/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo3 Apr 2020 07:19:47 -   1.3
+++ distinfo5 Jul 2020 08:22:56 -
@@ -1,2 +1,2 @@
-SHA256 (synapse-1.12.2.tar.gz) = F31opgtlPWpLTZB/Vuf7qwdYZg+3fzO4yvx24X5+Jeg=
-SIZE (synapse-1.12.2.tar.gz) = 6381687
+SHA256 (synapse-1.15.2.tar.gz) = FcGYwpYVlzD55bwud3zpSJKxrZPaDRAWE+lXeSp26hc=
+SIZE (synapse-1.15.2.tar.gz) = 6717409
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/synapse/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST   3 Apr 2020 07:19:47 -   1.4
+++ pkg/PLIST   5 Jul 2020 08:22:57 -
@@ -33,6 +33,7 @@ lib/python${MODPY_VERSION}/site-packages
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/synapse/api/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/synapse/api/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/synapse/api/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/api/${MODPY_PYCACHE}auth_blocking.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/synapse/api/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/synapse/api/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/synapse/api/${MODPY_PYCACHE}filtering.${MODPY_PYC_MAGIC_TAG}pyc
@@ -40,6 +41,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/synapse/api/${MODPY_PYCACHE}room_versions.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/synapse/api/${MODPY_PYCACHE}urls.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/synapse/api/auth.py
+lib/python${MODPY_VERSION}/site-packages/synapse/api/auth_blocking.py
 lib/python${MODPY_VERSION}/site-packages/synapse/api/constants.py
 lib/python${MODPY_VERSION}/site-packages/synapse/api/errors.py
 lib/python${MODPY_VERSION}/site-packages/synapse/api/filtering.py
@@ -95,6 +97,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}_base.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}appservice.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}captcha.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}cas.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}consent_config.${MODPY_PYC_MAGIC_TAG}pyc
@@ -106,10 +109,12 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}key.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}metrics.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}oidc_config.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}password.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}password_auth_providers.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}push.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}ratelimiting.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/config

Re: update telephony/py-phonenumbers to 8.12.6

2020-07-05 Thread Renaud Allard

OK

On 05/07/2020 07:12, Sebastien Marie wrote:

Hi,

Here an update for telephony/py-phonenumbers.

Tested on amd64, py2 + py3(3.8).

I also tested tryton with it (party module), but I have *not* tested odoo or
synapse (which depends on it too).

Comments or OK ?





smime.p7s
Description: S/MIME Cryptographic Signature


aarch64 bulk build report

2020-07-05 Thread phessler
bulk build on arm64.ports.openbsd.org
started on  Thu Jul 2 12:31:16 MDT 2020
finished at Sun Jul 5 05:21:08 MDT 2020
lasted 2D16h49m
done with kern.version=OpenBSD 6.7-current (GENERIC.MP) #697: Wed Jul  1 
22:58:48 MDT 2020

built packages:10826
Jul 2:3674
Jul 3:903
Jul 4:3061
Jul 5:3187


critical path missing pkgs:  
http://build-failures.rhaalovely.net/aarch64/2020-07-02/summary.log

build failures: 12
http://build-failures.rhaalovely.net/aarch64/2020-07-02/databases/sqlite3-odbc.log
http://build-failures.rhaalovely.net/aarch64/2020-07-02/devel/py-gevent.log
http://build-failures.rhaalovely.net/aarch64/2020-07-02/editors/xwpe.log
http://build-failures.rhaalovely.net/aarch64/2020-07-02/graphics/vulkan-loader.log
http://build-failures.rhaalovely.net/aarch64/2020-07-02/lang/pfe.log
http://build-failures.rhaalovely.net/aarch64/2020-07-02/sysutils/libvirt.log
http://build-failures.rhaalovely.net/aarch64/2020-07-02/sysutils/nomad.log
http://build-failures.rhaalovely.net/aarch64/2020-07-02/sysutils/rclone.log
http://build-failures.rhaalovely.net/aarch64/2020-07-02/sysutils/telegraf.log
http://build-failures.rhaalovely.net/aarch64/2020-07-02/sysutils/terragrunt.log
http://build-failures.rhaalovely.net/aarch64/2020-07-02/x11/e17/elementary.log
http://build-failures.rhaalovely.net/aarch64/2020-07-02/x11/qt5/qtwebengine.log

recurrent failures
 failures/editors/xwpe.log
 failures/graphics/vulkan-loader.log
 failures/lang/pfe.log
 failures/sysutils/libvirt.log
 failures/sysutils/nomad.log
 failures/sysutils/rclone.log
new failures
+++ ls-failures Sun Jul  5 05:21:19 2020
+failures/databases/sqlite3-odbc.log
+failures/devel/py-gevent.log
resolved failures
--- ../old/aarch64/last//ls-failuresWed Jul  1 09:08:40 2020
-failures/math/py-osqp.log
-failures/math/py-scs,python3.log
-failures/misc/osinfo/libosinfo.log



Re: [New] audio/ffmpeg-normalize (and devel/py-tqdm)

2020-07-05 Thread Klemens Nanni
On Sun, Jul 05, 2020 at 10:08:33AM +0100, Laurence Tratt wrote:
> On Sun, Jul 05, 2020 at 03:32:07AM -0400, Kurt Mosiejczuk wrote:
> 
> Hello Kurt,
> 
> > Is there a reason we're not just using MODPY_PI=YES and avoiding this whole
> > github dance?
> 
> I've switched to MODPY_PI=Yes, and updated to 1.20.0, in the attached.
I just slipped my mind, sure enough OK kn - anyone else?



Re: update gnupg2 to 2.2.20

2020-07-05 Thread Antoine Jacoutot
On Sun, Jul 05, 2020 at 05:55:49AM -0400, Aisha Tammy wrote:
> bump!

Thanks, I will commit it.

> 
> On 6/25/20 12:27 PM, Aisha Tammy wrote:
> > Fixes WKD directive for fetching keys.
> > Also makes it easier to upgrade to 2.2.21 
> > (which should be released soonish saying that for 3 months now!)
> > 
> > Aisha
> > 
> > index 291064fc5e7..06f30e61dce 100644
> > --- security/gnupg2/Makefile
> > +++ security/gnupg2/Makefile
> > @@ -2,9 +2,8 @@
> > 
> >  COMMENT =  GNU privacy guard - a free PGP replacement
> > 
> > -DISTNAME = gnupg-2.2.12
> > +DISTNAME = gnupg-2.2.20
> >  CATEGORIES =   security
> > -REVISION = 1
> > 
> >  # don't mix up dependencies with gnupg1
> >  PKGSPEC =  gnupg->=2
> > diff --git security/gnupg2/distinfo security/gnupg2/distinfo
> > index 2b95930040f..07005577fd6 100644
> > --- security/gnupg2/distinfo
> > +++ security/gnupg2/distinfo
> > @@ -1,2 +1,2 @@
> > -SHA256 (gnupg-2.2.12.tar.bz2) = 
> > 2wMPi0yYZA6RMA021Rbx9Pj+CVFKlOqfx0Ee4aNAgss=
> > -SIZE (gnupg-2.2.12.tar.bz2) = 6682303
> > +SHA256 (gnupg-2.2.20.tar.bz2) = 
> > BKfJ1It0w5kWjugnDlSFiN2+UiGMM3cD1/Bjc9MmyjA=
> > +SIZE (gnupg-2.2.20.tar.bz2) = 6786913
> > 
> 

-- 
Antoine



Re: update devel/poedit 1.3.7 -> 2.3.1

2020-07-05 Thread Landry Breuil
On Thu, Jun 25, 2020 at 06:11:57PM +0200, Omar Polo wrote:
> 
> Hello ports,
> 
> Below the diff to update poedit from 1.3.7 to the latest 2.3.1.  While
> there I've also updated the homepage to https and formatted the
> pkg/DESCR so it fits in 80 columns :)
> 
> The MASTER_SITES also changed, as they've migrated to github, and the
> patch is no longer needed.
> 
> Tested on amd64, I've used it to create a translation file using a
> (small) POT.  It seems to work just fine.

Thanks for this and luceneplusplus, i've commited both. spellchecking
seems to work once the corresponding aspell- pkg is installed.

> P.S. I'm not sure exactly how to manage this, but this port shouldn't be
> in textproc rather than devel?

yeah cvs isnt really helpful wrt that, so we tend to avoid moves..

Landry



Re: [security update] net/synapse -> 1.15.2

2020-07-05 Thread Landry Breuil
On Sun, Jul 05, 2020 at 10:25:39AM +0200, Renaud Allard wrote:
> Hi,
> 
> Here is patch for synapse to 1.15.2

i suppose this is for 6.7 ? diff wont apply to current, where
development is...

Landry



Re: [New] audio/ffmpeg-normalize (and devel/py-tqdm)

2020-07-05 Thread Laurence Tratt
On Sun, Jul 05, 2020 at 03:32:07AM -0400, Kurt Mosiejczuk wrote:

Hello Kurt,

> Is there a reason we're not just using MODPY_PI=YES and avoiding this whole
> github dance?

I've switched to MODPY_PI=Yes, and updated to 1.20.0, in the attached.


Laurie


ffmpeg-normalize.tgz
Description: application/tar-gz


Re: update telephony/py-phonenumbers to 8.12.6

2020-07-05 Thread Robert Nagy
ok

> On 2020. Jul 5., at 7:12, Sebastien Marie  wrote:
> 
> Hi,
> 
> Here an update for telephony/py-phonenumbers.
> 
> Tested on amd64, py2 + py3(3.8).
> 
> I also tested tryton with it (party module), but I have *not* tested odoo or
> synapse (which depends on it too).
> 
> Comments or OK ?
> -- 
> Sebastien Marie
> 
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/telephony/py-phonenumbers/Makefile,v
> retrieving revision 1.9
> diff -u -p -r1.9 Makefile
> --- Makefile3 Jul 2020 21:13:12 -1.9
> +++ Makefile5 Jul 2020 05:06:41 -
> @@ -3,10 +3,9 @@
> COMMENT =port of Google's libphonenumber library
> #'
> 
> -MODPY_EGG_VERSION = 8.11.0
> +MODPY_EGG_VERSION = 8.12.6
> DISTNAME =phonenumbers-${MODPY_EGG_VERSION}
> PKGNAME =py-${DISTNAME}
> -REVISION =0
> 
> CATEGORIES =telephony devel
> 
> Index: distinfo
> ===
> RCS file: /cvs/ports/telephony/py-phonenumbers/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo10 Dec 2019 18:40:49 -1.5
> +++ distinfo5 Jul 2020 05:06:41 -
> @@ -1,2 +1,2 @@
> -SHA256 (phonenumbers-8.11.0.tar.gz) = 
> lk7PzyYbmPp6dJ3avSiaSEvvnti+QtLtRsNcaMRGg70=
> -SIZE (phonenumbers-8.11.0.tar.gz) = 2331606
> +SHA256 (phonenumbers-8.12.6.tar.gz) = 
> 0zIHj+ccYVO1omOshyg2GLKv5RSiSKFPBqDTnOH1zgs=
> +SIZE (phonenumbers-8.12.6.tar.gz) = 2249614
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/telephony/py-phonenumbers/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST
> --- pkg/PLIST10 Dec 2019 18:40:50 -1.4
> +++ pkg/PLIST5 Jul 2020 05:06:43 -
> @@ -663,6 +663,9 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/phonenumbers/geodata/${MODPY_PYCACHE}data23.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/phonenumbers/geodata/${MODPY_PYCACHE}data24.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/phonenumbers/geodata/${MODPY_PYCACHE}data25.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/phonenumbers/geodata/${MODPY_PYCACHE}data26.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/phonenumbers/geodata/${MODPY_PYCACHE}data27.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/phonenumbers/geodata/${MODPY_PYCACHE}data28.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/phonenumbers/geodata/${MODPY_PYCACHE}data3.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/phonenumbers/geodata/${MODPY_PYCACHE}data4.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/phonenumbers/geodata/${MODPY_PYCACHE}data5.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -690,6 +693,9 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/phonenumbers/geodata/data23.py
> lib/python${MODPY_VERSION}/site-packages/phonenumbers/geodata/data24.py
> lib/python${MODPY_VERSION}/site-packages/phonenumbers/geodata/data25.py
> +lib/python${MODPY_VERSION}/site-packages/phonenumbers/geodata/data26.py
> +lib/python${MODPY_VERSION}/site-packages/phonenumbers/geodata/data27.py
> +lib/python${MODPY_VERSION}/site-packages/phonenumbers/geodata/data28.py
> lib/python${MODPY_VERSION}/site-packages/phonenumbers/geodata/data3.py
> lib/python${MODPY_VERSION}/site-packages/phonenumbers/geodata/data4.py
> lib/python${MODPY_VERSION}/site-packages/phonenumbers/geodata/data5.py
> @@ -909,6 +915,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/phonenumbers/shortdata/${MODPY_PYCACHE}region_SN.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/phonenumbers/shortdata/${MODPY_PYCACHE}region_SO.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/phonenumbers/shortdata/${MODPY_PYCACHE}region_SR.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/phonenumbers/shortdata/${MODPY_PYCACHE}region_SS.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/phonenumbers/shortdata/${MODPY_PYCACHE}region_ST.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/phonenumbers/shortdata/${MODPY_PYCACHE}region_SV.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/phonenumbers/shortdata/${MODPY_PYCACHE}region_SX.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -1149,6 +1156,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/phonenumbers/shortdata/region_SN.py
> lib/python${MODPY_VERSION}/site-packages/phonenumbers/shortdata/region_SO.py
> lib/python${MODPY_VERSION}/site-packages/phonenumbers/shortdata/region_SR.py
> +lib/python${MODPY_VERSION}/site-packages/phonenumbers/shortdata/region_SS.py
> lib/python${MODPY_VERSION}/site-packages/phonenumbers/shortdata/region_ST.py
> lib/python${MODPY_VERSION}/site-packages/ph

[sparc64/base-gcc] Fix build of x11/gtk+3

2020-07-05 Thread Kurt Mosiejczuk
x11/gtk+3 uses C99 constructs, so we need to less base-gcc know that.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/x11/gtk+3/Makefile,v
retrieving revision 1.232
diff -u -r1.232 Makefile
--- Makefile30 Jun 2020 10:20:47 -  1.232
+++ Makefile3 Jul 2020 06:35:02 -
@@ -116,6 +116,11 @@
 CONFIGURE_ARGS +=  --disable-colord
 .endif
 
+.include 
+.if !${PROPERTIES:Mclang}
+CFLAGS +=  -std=gnu99
+.endif
+
 FAKE_FLAGS=sysconfdir=${PREFIX}/share/examples/gtk+3
 
 # configure will disable lpr in default gtk-print-backends if cups is found



Re: [New] audio/ffmpeg-normalize (and devel/py-tqdm)

2020-07-05 Thread Kurt Mosiejczuk
On Sat, Jul 04, 2020 at 07:57:58AM +0200, Klemens Nanni wrote:
>   Test concurrent.futures.ThreadPoolExecutor ...

> I had to kill the python3.7 process, ^C wouldn't stop it.

Yeah. concurrency tests are usually the ones that hang for the python
regression tests, so I'm not surprised.

> > I've removed MODPY_EGG_VERSION but I thought it was preferred to use
> > MASTER_SITES over GH_*? I might be very wrong on that.
> That's the case for tarballs under *stable* /release/ URLs, but with
> auto-generated tarballs from /archive/ we use GH_*.

> Another benefit of using GH_* (and no explicit MASTER_SITES, DISTNAME,
> PKGNAME or WRKDIST) is having a proper distinfo, yours currently just
> records the version but not the project name in the file name.

Is there a reason we're not just using MODPY_PI=YES and avoiding
this whole github dance?

--Kurt



Re: [sparc64/base-gcc] Fix build of x11/gtk+3

2020-07-05 Thread Antoine Jacoutot
On Sun, Jul 05, 2020 at 03:21:24AM -0400, Kurt Mosiejczuk wrote:
> x11/gtk+3 uses C99 constructs, so we need to less base-gcc know that.
> 
> ok?

Ok


> 
> --Kurt
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/gtk+3/Makefile,v
> retrieving revision 1.232
> diff -u -r1.232 Makefile
> --- Makefile  30 Jun 2020 10:20:47 -  1.232
> +++ Makefile  3 Jul 2020 06:35:02 -
> @@ -116,6 +116,11 @@
>  CONFIGURE_ARGS +=--disable-colord
>  .endif
>  
> +.include 
> +.if !${PROPERTIES:Mclang}
> +CFLAGS +=-std=gnu99
> +.endif
> +
>  FAKE_FLAGS=  sysconfdir=${PREFIX}/share/examples/gtk+3
>  
>  # configure will disable lpr in default gtk-print-backends if cups is found

-- 
Antoine