date:20200219

Remove qwt and qscintilla support in KDE4

2020-02-19 Thread Rafael Sadowski

The diff below removes qwt and qscintilla support in KDE.  These are
purely optional dependencies. With this move we lose the kdeobservatory
applet from plasma-addons. You can live with that, right?

Objections?

RS

Index: p5-qt/Makefile
===
RCS file: /cvs/ports/x11/kde4/p5-qt/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- p5-qt/Makefile  27 Jul 2017 11:57:50 -  1.7
+++ p5-qt/Makefile  20 Feb 2020 05:43:40 -
@@ -3,13 +3,12 @@
 COMMENT =  Qt4 bindings for Perl
 DISTNAME = perlqt-${MODKDE4_VERSION}
 PKGNAME =  p5-qt-${MODKDE4_VERSION}
-REVISION = 1
+REVISION = 2
 
-WANTLIB =  c m perl pthread util
+WANTLIB =  c m perl pthread
 WANTLIB += ${COMPILER_LIBCXX}
 WANTLIB += lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtXml
 WANTLIB += ${KDE4LIB}/smokebase ${KDE4LIB}/smokephonon
-WANTLIB += ${KDE4LIB}/smokeqimageblitz ${KDE4LIB}/smokeqsci
 WANTLIB += ${KDE4LIB}/smokeqt3support ${KDE4LIB}/smokeqtcore
 WANTLIB += ${KDE4LIB}/smokeqtdbus ${KDE4LIB}/smokeqtdeclarative
 WANTLIB += ${KDE4LIB}/smokeqtgui ${KDE4LIB}/smokeqthelp
@@ -18,12 +17,16 @@ WANTLIB += ${KDE4LIB}/smokeqtopengl ${KD
 WANTLIB += ${KDE4LIB}/smokeqtsql ${KDE4LIB}/smokeqtsvg
 WANTLIB += ${KDE4LIB}/smokeqttest ${KDE4LIB}/smokeqtuitools
 WANTLIB += ${KDE4LIB}/smokeqtwebkit ${KDE4LIB}/smokeqtxml
-WANTLIB += ${KDE4LIB}/smokeqtxmlpatterns ${KDE4LIB}/smokeqwt
+WANTLIB += ${KDE4LIB}/smokeqtxmlpatterns
 
 MODULES =  x11/kde4 perl
 MODKDE4_USE =
 
-LIB_DEPENDS =  ${MODKDE4_DEP_DIR}/smokeqt>=${MODKDE4_DEP_VERSION}
+LIB_DEPENDS =  ${MODKDE4_DEP_DIR}/smokeqt>=${MODKDE4_DEP_VERSION}p6 \
+   graphics/qimageblitz
+
+CONFIGURE_ARGS +=  -DCMAKE_DISABLE_FIND_PACKAGE_Qwt5=ON \
+   -DCMAKE_DISABLE_FIND_PACKAGE_QScintilla=ON
 
 # Avoid clashing Perl do_open and do_close with GCC's locale_facets.h
 post-patch:
Index: p5-qt/patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/x11/kde4/p5-qt/patches/patch-CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -r1.2 patch-CMakeLists_txt
--- p5-qt/patches/patch-CMakeLists_txt  30 Oct 2017 13:55:11 -  1.2
+++ p5-qt/patches/patch-CMakeLists_txt  20 Feb 2020 05:43:40 -
@@ -4,18 +4,11 @@ KDE BUG 321877: https://bugs.kde.org/sho
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -21,7 +21,9 @@ include(MacroOptionalAddBindings)
- include(MacroLogFeature)
- include(MacroProve)
+@@ -33,14 +33,11 @@ macro_log_feature(PHONON_FOUND "Phonon" "Phonon multim
+ macro_optional_find_package(Qwt5)
+ macro_log_feature(Qwt5_Qt4_FOUND "Qwt5 for Qt4" "Qwt5 libraries for Qt4" 
"http://qwt.sourceforge.net"; FALSE "" "Needed to compile Qwt5 bindings")
  
--macro_optional_find_package(QScintilla)
-+FIND_PATH(QSCINTILLA_INCLUDE_DIR qsciglobal.h "${QT_INCLUDE_DIR}/Qsci")
-+FIND_LIBRARY(QSCINTILLA_LIBRARY NAMES qscintilla2_qt4 PATHS ${QT_LIBRARY_DIR})
-+set(QSCINTILLA_FOUND TRUE)
- macro_log_feature(QSCINTILLA_FOUND "QScintilla2" "QScintilla2 libraries" 
"http://www.riverbankcomputing.co.uk/software/qscintilla/intro"; FALSE "" 
"Needed to compile QScintilla2 bindings")
- 
- macro_optional_find_package(QImageBlitz)
-@@ -36,11 +38,7 @@ macro_log_feature(Qwt5_Qt4_FOUND "Qwt5 for Qt4" "Qwt5 
++macro_optional_find_package(QImageBlitz)
  add_definitions(-DDEBUG)
  
  include (FindPerlMore)
Index: p5-qt/patches/patch-qtcore_src_util_cpp
===
RCS file: /cvs/ports/x11/kde4/p5-qt/patches/patch-qtcore_src_util_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-qtcore_src_util_cpp
--- p5-qt/patches/patch-qtcore_src_util_cpp 24 Apr 2018 12:17:39 -  
1.1
+++ p5-qt/patches/patch-qtcore_src_util_cpp 20 Feb 2020 05:43:40 -
@@ -3,7 +3,22 @@ $OpenBSD: patch-qtcore_src_util_cpp,v 1.
 Index: qtcore/src/util.cpp
 --- qtcore/src/util.cpp.orig
 +++ qtcore/src/util.cpp
-@@ -515,7 +515,7 @@ SV* package_classId( const char *package ) {
+@@ -27,6 +27,14 @@ extern "C" {
+ #include "perl.h"
+ #include "XSUB.h"
+ #include "ppport.h"
++
++// Avoid clashing with GCC locale_facets.h
++#undef do_open
++#undef do_close
++
++// Avoid clashing with GCC locale_facets.h
++#undef do_open
++#undef do_close
+ }
+ 
+ // Now my own headers
+@@ -515,7 +523,7 @@ SV* package_classId( const char *package ) {
  }
  }
  // Found nothing, so
@@ -12,7 +27,7 @@ Index: qtcore/src/util.cpp
  }
  
  #ifdef PERLQTDEBUG
-@@ -2251,7 +2251,7 @@ XS(XS_AUTOLOAD) {
+@@ -2251,7 +2259,7 @@ XS(XS_AUTOLOAD) {
  methcache.insert(mcid, new Smoke::ModuleIndex(mi));
  }
  
Index: p5-qt/pkg/PLIST
===
RCS file: /cvs/ports/x11/kde4/p5-qt/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- p5-qt/pkg/PLIST 30 May 2013 20:01:30 -  1.2
+++ p5-qt/pkg/PLIST 20 Feb

Re: UPDATE: nextcloudclient-2.6.3

2020-02-19 Thread Kirill Bychkov

On Wed, February 19, 2020 20:22, Rafael Sadowski wrote:
> On Tue Feb 18, 2020 at 10:54:36PM -0300, Adriano Barbosa wrote:
>> Hi,
>> update for nextcloudclient to v2.6.3.
>> Changelog: https://github.com/nextcloud/desktop/releases/tag/v2.6.3
>>
>> OK?
>>
>> --
>> Adriano
>
> I ran into the following err (nextcloudclient is not installed):
>
> FAILED: test/csync/check_encoding_functions
> : && /usr/ports/pobj/nextcloudclient-2.6.3/bin/c++  -O2 -pipe
> -I/usr/local/include/inotify  -I/usr/local/include/qtkeychain
> -I/usr/local/include -pedantic -DNDEBUG  -L/usr/local/lib/inotify
> -L/usr/local/lib  -linotify  -Wl,-rpath=/usr/local/lib/inotify
> test/csync/CMakeFiles/check_encoding_functions.dir/check_encoding_functions_autogen/mocs_compilation.cpp.o
> test/csync/CMakeFiles/check_encoding_functions.dir/encoding_tests/check_encoding.cpp.o
>  -o test/csync/check_encoding_functions -L/usr/local/lib/qt5/.
> -L/usr/ports/pobj/nextcloudclient-2.6.3/build-amd64/src/csync
> -L/usr/local/lib   -L/usr/local/lib/inotify   -L/usr/lib
> -Wl,-z,origin,-rpath,/usr/local/lib/qt5/.:/usr/ports/pobj/nextcloudclient-2.6.3/build-amd64/src/csync
>  test/csync/libtorture.a  -lQt5Core  -locsync  -lcmocka  -lsqlite3
> -lQt5Concurrent  -lQt5Core  /usr/lib/libz.so.5.0
> -Wl,-rpath-link,/usr/X11R6/lib && :
> ld: error: undefined symbol: argp_parse
 referenced by cmdline.c
   cmdline.c.o:(torture_cmdline_parse) in archive
 test/csync/libtorture.a
> c++: error: linker command failed with exit code 1 (use -v to see invocation)
> ninja: build stopped: subcommand failed.
>
>

Shoul not fail with the patch below:

Index: Makefile
===
RCS file: /cvs/ports/net/nextcloudclient/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- Makefile7 Feb 2020 07:13:53 -   1.4
+++ Makefile20 Feb 2020 06:11:05 -
@@ -2,9 +2,8 @@

 COMMENT =  desktop sync client for Nextcloud

-V =2.6.2
+V =2.6.3
 DISTNAME = nextcloudclient-${V}
-REVISION = 0

 GH_ACCOUNT =   nextcloud
 GH_PROJECT =   desktop
Index: distinfo
===
RCS file: /cvs/ports/net/nextcloudclient/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo28 Dec 2019 13:48:04 -  1.2
+++ distinfo20 Feb 2020 06:11:05 -
@@ -1,2 +1,2 @@
-SHA256 (nextcloudclient-2.6.2.tar.gz) =
u8tlkxNINiJmQLEI2nrT2wYUF2geLYQ7w3Gx1pf7BVE=
-SIZE (nextcloudclient-2.6.2.tar.gz) = 18982053
+SHA256 (nextcloudclient-2.6.3.tar.gz) =
Wpi4KAJ9Zad6Qdr/P2eMrO8SUlCZsf0vMRRVHbAf8pg=
+SIZE (nextcloudclient-2.6.3.tar.gz) = 18983292
Index: patches/patch-src_csync_ConfigureChecks_cmake
===
RCS file: patches/patch-src_csync_ConfigureChecks_cmake
diff -N patches/patch-src_csync_ConfigureChecks_cmake
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_csync_ConfigureChecks_cmake   20 Feb 2020 06:11:05 
-
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/csync/ConfigureChecks.cmake
+--- src/csync/ConfigureChecks.cmake.orig
 src/csync/ConfigureChecks.cmake
+@@ -15,7 +15,7 @@ set(BINARYDIR ${CMAKE_CURRENT_BINARY_DIR})
+ set(SOURCEDIR ${CMAKE_CURRENT_SOURCE_DIR})
+
+ # HEADER FILES
+-check_include_file(argp.h HAVE_ARGP_H)
++#check_include_file(argp.h HAVE_ARGP_H)
+
+ # FUNCTIONS
+ if (NOT LINUX)
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/nextcloudclient/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- pkg/PLIST   28 Dec 2019 13:48:04 -  1.2
+++ pkg/PLIST   20 Feb 2020 06:11:05 -
@@ -35,6 +35,7 @@ share/icons/hicolor/64x64/apps/Nextcloud
 share/nextcloud/
 share/nextcloud/i18n/
 share/nextcloud/i18n/client_TW.qm
+share/nextcloud/i18n/client_af.qm
 share/nextcloud/i18n/client_bg.qm
 share/nextcloud/i18n/client_ca.qm
 share/nextcloud/i18n/client_cs.qm

UPDATE games/freeciv-2.6.2

2020-02-19 Thread Björn Ketelaars

Enclosed diff updates freeciv to 2.6.2, which mainly fixes bugs in the
client. More information can be found at
https://freeciv.fandom.com/wiki/NEWS-2.6.2.

Run tested on amd64.

OK?


diff --git Makefile Makefile
index e4a1cf3c37a..a58453b1108 100644
--- Makefile
+++ Makefile
@@ -4,7 +4,7 @@ COMMENT-main=   Civilization clone for X11; multiplayer; game 
server
 COMMENT-client=Freeciv client
 COMMENT-share= shared data files for Freeciv
 
-VERSION=   2.6.1
+VERSION=   2.6.2
 DISTNAME=  freeciv-${VERSION}
 PKGNAME-main=  freeciv-server-${VERSION}
 PKGNAME-client=freeciv-client-${VERSION}
diff --git distinfo distinfo
index d0d6b4c0e07..848a5abe056 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (freeciv-2.6.1.tar.bz2) = zOaEHaAZQTiq0mnMc1VX20OKRJCddf0D1NtnUHmGueI=
-SIZE (freeciv-2.6.1.tar.bz2) = 51915573
+SHA256 (freeciv-2.6.2.tar.bz2) = YYHvPTx2JkODqrvg6vFVDYplykJjnmwXzCk4Fl4XbI8=
+SIZE (freeciv-2.6.2.tar.bz2) = 52139007
diff --git pkg/PLIST-main pkg/PLIST-main
index 8a96f345e6a..f1087483ca5 100644
--- pkg/PLIST-main
+++ pkg/PLIST-main
@@ -36,6 +36,7 @@ share/doc/freeciv/README.effects
 share/doc/freeciv/README.fcdb
 share/doc/freeciv/README.governor
 share/doc/freeciv/README.graphics
+share/doc/freeciv/README.modpack_installer
 share/doc/freeciv/README.msys2
 share/doc/freeciv/README.nations
 share/doc/freeciv/README.packaging

Re: UPDATE: nextcloudclient-2.6.3

2020-02-19 Thread Kirill Bychkov

On Thu, February 20, 2020 00:53, Stuart Henderson wrote:
> Looking at the function involved, I suspect some of you have
> devel/argp-standalone installed and others don't.
>
Yep, with argp-standalone nextcloudclient fails to build.

UPDATE x11/tilda-1.5.0

2020-02-19 Thread Björn Ketelaars

Diff below updates x11/tilda to 1.5.0. Changelog:
https://github.com/lanoxx/tilda/blob/tilda-1.5.0/ChangeLog.

Run tested on amd64.

OK?


diff --git Makefile Makefile
index 37205ca00a4..dd98eed2fce 100644
--- Makefile
+++ Makefile
@@ -4,10 +4,8 @@ COMMENT=   drop-down terminal emulator
 
 GH_ACCOUNT=lanoxx
 GH_PROJECT=tilda
-GH_TAGNAME=tilda-1.3.3
-DISTNAME=  tilda-1.3.3
-
-REVISION=  2
+GH_TAGNAME=tilda-1.5.0
+DISTNAME=  tilda-1.5.0
 
 CATEGORIES=x11
 
diff --git distinfo distinfo
index 889a65edb16..56f62bf3fcf 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (tilda-1.3.3.tar.gz) = cbqlVyxJjls+lPW1foEYwe8P2uommlskJSCOGt7ChLE=
-SIZE (tilda-1.3.3.tar.gz) = 671222
+SHA256 (tilda-1.5.0.tar.gz) = 9mTBfayiopAPSd6etldGztA8hnsCFEFJ7yEmDLzWEDk=
+SIZE (tilda-1.5.0.tar.gz) = 484754
diff --git patches/patch-src-tilda_c patches/patch-src-tilda_c
index f386301cad3..482fb772401 100644
--- patches/patch-src-tilda_c
+++ patches/patch-src-tilda_c
@@ -1,7 +1,8 @@
 $OpenBSD: patch-src-tilda_c,v 1.3 2016/11/06 06:54:54 jca Exp $
 src/tilda.c.orig   Mon Apr 18 14:09:55 2016
-+++ src/tilda.cSun Nov  6 07:43:00 2016
-@@ -12,8 +12,6 @@
+Index: src/tilda.c
+--- src/tilda.c.orig
 src/tilda.c
+@@ -13,8 +13,6 @@
   * You should have received a copy of the GNU Library General Public
   * License along with this library. If not, see 
.
   */
@@ -10,7 +11,7 @@ $OpenBSD: patch-src-tilda_c,v 1.3 2016/11/06 06:54:54 jca Exp 
$
  
  /*
   * This message is shown in a modal dialog when tilda starts and there is a 
problem parsing the configuration file.
-@@ -230,7 +228,7 @@ nomatch:
+@@ -232,7 +230,7 @@ nomatch:
  static GSList *getPids() {
  GSList *pids = NULL;
  FILE *ps_output;
diff --git pkg/PLIST pkg/PLIST
index 6634a4414b8..def38674c15 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,7 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.7 2018/06/27 21:04:23 espie Exp $
 @bin bin/tilda
-share/appdata/
-share/appdata/tilda.appdata.xml
 share/applications/tilda.desktop
 share/doc/tilda/
 share/doc/tilda/README.md
@@ -16,6 +14,7 @@ share/locale/fr/LC_MESSAGES/tilda.mo
 share/locale/hu/LC_MESSAGES/tilda.mo
 share/locale/it/LC_MESSAGES/tilda.mo
 share/locale/lt/LC_MESSAGES/tilda.mo
+share/locale/nb/LC_MESSAGES/tilda.mo
 share/locale/pl/LC_MESSAGES/tilda.mo
 share/locale/pt/LC_MESSAGES/tilda.mo
 share/locale/pt_BR/LC_MESSAGES/tilda.mo
@@ -25,6 +24,9 @@ share/locale/sl/LC_MESSAGES/tilda.mo
 share/locale/sv/LC_MESSAGES/tilda.mo
 share/locale/tr/LC_MESSAGES/tilda.mo
 share/locale/zh_CN/LC_MESSAGES/tilda.mo
+share/locale/zh_TW/LC_MESSAGES/tilda.mo
+share/metainfo/
+share/metainfo/tilda.appdata.xml
 share/pixmaps/
 share/pixmaps/tilda.png
 @tag update-desktop-database

Re: graphics/gimp crashes when opening a file dialog

2020-02-19 Thread Erling Westenvik

On Thu, Feb 20, 2020 at 12:48:43AM +0100, Solene Rapenne wrote:
> On Wed, Feb 12, 2020 at 05:31:58PM +0100, Solene Rapenne wrote:
> > On Wed, Feb 12, 2020 at 04:16:52PM +, Stuart Henderson wrote:
> > > You'll get more information if you install 
> > > debug-gimp/debug-glib2/debug-gtk+2
> > > and do a backtrace in gdb instead. (Might still not be useful but at least
> > > there's some chance :-)
> > 
> 
> I asked someone running 6.6-stable with GIMP 2.8.22 and he has the same
> crash issue when using the Open file dialog or Save as dialog.

I can confirm same behaviour on my -current from January 15, running
Gimp 2.10.14p0.

(As a theory: It appears to happen only once during a Gimp session. That
is - only on first Open or Save As, and after that I can work normally,
but I can't say I've tested it throughly.)

Regards,
Erling

Re: UPDATE: lang/quickjs 2019.10.27 => 2020.01.19

2020-02-19 Thread Brian Callahan





On 2020-02-19 9:20 PM, George Koehler wrote:

On Tue, 18 Feb 2020 18:25:49 -0500
Brian Callahan  wrote:


Could someone on macppc please give this a test and make sure that
atomics are still needed?

Yes, atomics are needed.  The -latomic in LDFLAGS allows my macppc to
link qjsc, but the build fails later, because qjsc doesn't know to use
-latomic to link JavaScript code; see log below.  I fixed my macppc
build by adding the line
 *arg++ = "-latomic";
after -lm in qjsc.c.  Then I can build and install, but "make test"
fails, because (float)1 got packed in big-endian order 63,128,0,0,
but the test expects little-endian order 0,0,128,63:


Thanks for the testing. I'm still waiting on a new hdd (and a putty 
knife) so I can get my mac mini g4 working again. But will try to get on 
this once it is working again.


~Brian

Re: UPDATE: lang/quickjs 2019.10.27 => 2020.01.19

2020-02-19 Thread George Koehler

On Tue, 18 Feb 2020 18:25:49 -0500
Brian Callahan  wrote:

> Could someone on macppc please give this a test and make sure that 
> atomics are still needed?

Yes, atomics are needed.  The -latomic in LDFLAGS allows my macppc to
link qjsc, but the build fails later, because qjsc doesn't know to use
-latomic to link JavaScript code; see log below.  I fixed my macppc
build by adding the line
*arg++ = "-latomic";
after -lm in qjsc.c.  Then I can build and install, but "make test"
fails, because (float)1 got packed in big-endian order 63,128,0,0,
but the test expects little-endian order 0,0,128,63:

./qjs tests/test_builtin.js
Error: assertion failed: got |0,0,255,255,0,0,0,0,63,128,0,0,255,255,255,255|, 
expected |0,0,255,255,0,0,0,0,0,0,128,63,255,255,255,255|
at assert (tests/test_builtin.js:17)
at test_typed_array (tests/test_builtin.js:413)
at  (tests/test_builtin.js:640)

On amd64, "make test" seems to pass, but also writes a qjs.core in
WRKSRC.  I didn't study the core.

===>  Building for quickjs-2020.01.19
./qjsc -fno-string-normalize -fno-map -fno-promise -fno-typedarray 
-fno-typedarray -fno-regexp -fno-json -fno-eval -fno-proxy -fno-date -m -o 
examples/hello_module examples/hello_module.js
./libquickjs.a(quickjs.o): In function `js_host_resolve_imported_module':
quickjs.c:(.text+0x3a4f0): warning: strcat() is almost always misused, please 
use strlcat()
./libquickjs.a(quickjs.o): In function `js_dtoa':
quickjs.c:(.text+0x2ab48): warning: sprintf() is often misused, please use 
snprintf()
quickjs.c:(.text+0x2ac24): warning: strcpy() is almost always misused, please 
use strlcpy()
./libquickjs.a(quickjs.o): In function `js_atomics_op':
quickjs.c:(.text+0x38a40): undefined reference to `__atomic_fetch_add_8'
quickjs.c:(.text+0x38a58): undefined reference to `__atomic_fetch_and_8'
quickjs.c:(.text+0x38a70): undefined reference to `__atomic_fetch_or_8'
quickjs.c:(.text+0x38c5c): undefined reference to `__atomic_load_8'
quickjs.c:(.text+0x38d18): undefined reference to `__atomic_fetch_sub_8'
quickjs.c:(.text+0x38d30): undefined reference to `__atomic_fetch_xor_8'
quickjs.c:(.text+0x38d48): undefined reference to `__atomic_exchange_8'
quickjs.c:(.text+0x38d68): undefined reference to `__atomic_compare_exchange_8'
./libquickjs.a(quickjs.o): In function `js_atomics_store':
quickjs.c:(.text+0x39a54): undefined reference to `__atomic_store_8'
collect2: error: ld returned 1 exit status
gmake: *** [Makefile:336: examples/hello_module] Error 1
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2891 
'/usr/ports/pobj/quickjs-2020.01.19/.build_done': @cd /usr/ports/pobj/quickj...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2091 
'/usr/ports/packages/powerpc/all/quickjs-2020.01.19.tgz': @cd /usr/ports/lan...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2578 
'_internal-package': @case X${_DEPENDS_CACHE} in  X) _DEPENDS_CACHE=$(doas -...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2557 'package': @:; 
cd /usr/ports/lang/quickjs && PKGPATH=lang/quickjs make _inte...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2112 
'/var/db/pkg/quickjs-2020.01.19/+CONTENTS': @cd /usr/ports/lang/quickjs && P...)
*** Error 2 in /usr/ports/lang/quickjs 
(/usr/ports/infrastructure/mk/bsd.port.mk:2557 'install': 
@lock=quickjs-2020.01.19;  export _LOCKS_HE...)

Re: UPDATE: nextcloudclient-2.6.3

2020-02-19 Thread Adriano Barbosa

Em qua., 19 de fev. de 2020 às 16:22, Adriano Barbosa
 escreveu:
>
> Hi Rafael,
> thanks for the test, but I could not reproduce.
> Build works with nextcloudclient installed and uninstalled (and
> confirmed that all files are gone).
> I'm preparing an VM and will try to reproduce on a clean install.

Build was fine on a clean install.
Snapshot #628: Tue Feb 18 18:43:30 MST 2020 this time.

>
> Just to make sure, your test was on current? I'm running snapshot
> #645: Wed Feb 12 15:09:39 MST 2020.
>
> Best
>
> Em qua., 19 de fev. de 2020 às 14:22, Rafael Sadowski
>  escreveu:
> >
> > On Tue Feb 18, 2020 at 10:54:36PM -0300, Adriano Barbosa wrote:
> > > Hi,
> > > update for nextcloudclient to v2.6.3.
> > > Changelog: https://github.com/nextcloud/desktop/releases/tag/v2.6.3
> > >
> > > OK?
> > >
> > > --
> > > Adriano
> >
> > I ran into the following err (nextcloudclient is not installed):
> >
> > FAILED: test/csync/check_encoding_functions
> > : && /usr/ports/pobj/nextcloudclient-2.6.3/bin/c++  -O2 -pipe
> > -I/usr/local/include/inotify  -I/usr/local/include/qtkeychain  
> > -I/usr/local/include -pedantic -DNDEBUG  -L/usr/local/lib/inotify  
> > -L/usr/local/lib  -linotify  -Wl,-rpath=/usr/local/lib/inotify 
> > test/csync/CMakeFiles/check_encoding_functions.dir/check_encoding_functions_autogen/mocs_compilation.cpp.o
> >  
> > test/csync/CMakeFiles/check_encoding_functions.dir/encoding_tests/check_encoding.cpp.o
> >   -o test/csync/check_encoding_functions -L/usr/local/lib/qt5/.   
> > -L/usr/ports/pobj/nextcloudclient-2.6.3/build-amd64/src/csync   
> > -L/usr/local/lib   -L/usr/local/lib/inotify   -L/usr/lib 
> > -Wl,-z,origin,-rpath,/usr/local/lib/qt5/.:/usr/ports/pobj/nextcloudclient-2.6.3/build-amd64/src/csync
> >   test/csync/libtorture.a  -lQt5Core  -locsync  -lcmocka  -lsqlite3  
> > -lQt5Concurrent  -lQt5Core  /usr/lib/libz.so.5.0  
> > -Wl,-rpath-link,/usr/X11R6/lib && :
> > ld: error: undefined symbol: argp_parse
> > >>> referenced by cmdline.c
> > >>>   cmdline.c.o:(torture_cmdline_parse) in archive 
> > >>> test/csync/libtorture.a
> > c++: error: linker command failed with exit code 1 (use -v to see 
> > invocation)
> > ninja: build stopped: subcommand failed.
>
>
>
> --
> Adriano Barbosa



-- 
Adriano Barbosa

Re: UPDATE: nextcloudclient-2.6.3

2020-02-19 Thread Adriano Barbosa

Em qua., 19 de fev. de 2020 às 17:12, Kirill Bychkov
 escreveu:
>
> On Wed, February 19, 2020 20:22, Rafael Sadowski wrote:
> > On Tue Feb 18, 2020 at 10:54:36PM -0300, Adriano Barbosa wrote:
> >> Hi,
>
> Hi,
>
> >> update for nextcloudclient to v2.6.3.
> >> Changelog: https://github.com/nextcloud/desktop/releases/tag/v2.6.3
> >>
> >> OK?
>
> Not tested yet but it definitely needs PLIST update.

Thanks for pointing it out.
Follows the complete diff.

>
> >> --
> >> Adriano
> >
> > I ran into the following err (nextcloudclient is not installed):
> >
> > FAILED: test/csync/check_encoding_functions
> > : && /usr/ports/pobj/nextcloudclient-2.6.3/bin/c++  -O2 -pipe
> > -I/usr/local/include/inotify  -I/usr/local/include/qtkeychain
> > -I/usr/local/include -pedantic -DNDEBUG  -L/usr/local/lib/inotify
> > -L/usr/local/lib  -linotify  -Wl,-rpath=/usr/local/lib/inotify
> > test/csync/CMakeFiles/check_encoding_functions.dir/check_encoding_functions_autogen/mocs_compilation.cpp.o
> > test/csync/CMakeFiles/check_encoding_functions.dir/encoding_tests/check_encoding.cpp.o
> >  -o test/csync/check_encoding_functions -L/usr/local/lib/qt5/.
> > -L/usr/ports/pobj/nextcloudclient-2.6.3/build-amd64/src/csync
> > -L/usr/local/lib   -L/usr/local/lib/inotify   -L/usr/lib
> > -Wl,-z,origin,-rpath,/usr/local/lib/qt5/.:/usr/ports/pobj/nextcloudclient-2.6.3/build-amd64/src/csync
> >  test/csync/libtorture.a  -lQt5Core  -locsync  -lcmocka  -lsqlite3
> > -lQt5Concurrent  -lQt5Core  /usr/lib/libz.so.5.0
> > -Wl,-rpath-link,/usr/X11R6/lib && :
> > ld: error: undefined symbol: argp_parse
>  referenced by cmdline.c
>    cmdline.c.o:(torture_cmdline_parse) in archive
>  test/csync/libtorture.a
> > c++: error: linker command failed with exit code 1 (use -v to see 
> > invocation)
> > ninja: build stopped: subcommand failed.
> >
> >
>
> Builds fine for me on 6.6-current (GENERIC.MP) #648: Sun Feb 16 13:54:33 MST 
> 2020
>


-- 
Adriano Barbosa
Index: Makefile
===
RCS file: /cvs/ports/net/nextcloudclient/Makefile,v
retrieving revision 1.4
diff -u -p -u -r1.4 Makefile
--- Makefile	7 Feb 2020 07:13:53 -	1.4
+++ Makefile	19 Feb 2020 22:11:47 -
@@ -2,9 +2,8 @@
 
 COMMENT =	desktop sync client for Nextcloud
 
-V =		2.6.2
+V =		2.6.3
 DISTNAME =	nextcloudclient-${V}
-REVISION =	0
 
 GH_ACCOUNT =	nextcloud
 GH_PROJECT =	desktop
Index: distinfo
===
RCS file: /cvs/ports/net/nextcloudclient/distinfo,v
retrieving revision 1.2
diff -u -p -u -r1.2 distinfo
--- distinfo	28 Dec 2019 13:48:04 -	1.2
+++ distinfo	19 Feb 2020 22:11:47 -
@@ -1,2 +1,2 @@
-SHA256 (nextcloudclient-2.6.2.tar.gz) = u8tlkxNINiJmQLEI2nrT2wYUF2geLYQ7w3Gx1pf7BVE=
-SIZE (nextcloudclient-2.6.2.tar.gz) = 18982053
+SHA256 (nextcloudclient-2.6.3.tar.gz) = Wpi4KAJ9Zad6Qdr/P2eMrO8SUlCZsf0vMRRVHbAf8pg=
+SIZE (nextcloudclient-2.6.3.tar.gz) = 18983292
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/nextcloudclient/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -r1.2 PLIST
--- pkg/PLIST	28 Dec 2019 13:48:04 -	1.2
+++ pkg/PLIST	19 Feb 2020 22:11:47 -
@@ -35,6 +35,7 @@ share/icons/hicolor/64x64/apps/Nextcloud
 share/nextcloud/
 share/nextcloud/i18n/
 share/nextcloud/i18n/client_TW.qm
+share/nextcloud/i18n/client_af.qm
 share/nextcloud/i18n/client_bg.qm
 share/nextcloud/i18n/client_ca.qm
 share/nextcloud/i18n/client_cs.qm

Re: graphics/gimp crashes when opening a file dialog

2020-02-19 Thread Solene Rapenne

On Wed, Feb 12, 2020 at 05:31:58PM +0100, Solene Rapenne wrote:
> On Wed, Feb 12, 2020 at 04:16:52PM +, Stuart Henderson wrote:
> > You'll get more information if you install 
> > debug-gimp/debug-glib2/debug-gtk+2
> > and do a backtrace in gdb instead. (Might still not be useful but at least
> > there's some chance :-)
> > 
> > 
> 

I asked someone running 6.6-stable with GIMP 2.8.22 and he has the same
crash issue when using the Open file dialog or Save as dialog.

Re: [net/zabbix] PSK support?

2020-02-19 Thread Stuart Henderson

On 2020/02/19 16:17, William Leuschner wrote:
> Hello porters,
> 
> I'm trying to set up Zabbix with pre-shared keys so that:
> * connections are encrypted, and
> * the agent will reject connections from anyone without the key.
> The configuration that should work currently fails with a library error.
> 
> According to this note from 2017[1], PSK support was removed from LibreSSL,
> and the best choice would be building against gnutls. Has anything changed
> since then, or is gnutls still the best option? If gnutls is the best bet,
> would a gnutls flavor be welcome?
> 
> Thanks,
> William Leuschner
> 
> 
> [1]: https://marc.info/?l=openbsd-ports&m=148465399628705&w=2
> 

It will be a pain to add a FLAVOR to this port (you will have to handle
the combination with existing flavours and multipackages, it's possible but
definitely non-trivial, and means ongoing work testing more combinations
of build options for every update).

I don't use this and am not the maintainer so there might be good reasons
not to, but as far as the port is concerned it would be much simpler to
switch completely to gnutls rather than make it optional.

Re: [net/zabbix] PSK support?

2020-02-19 Thread Hiltjo Posthuma

On Wed, Feb 19, 2020 at 04:17:37PM -0500, William Leuschner wrote:
> Hello porters,
> 
> I'm trying to set up Zabbix with pre-shared keys so that:
> * connections are encrypted, and
> * the agent will reject connections from anyone without the key.
> The configuration that should work currently fails with a library error.
> 
> According to this note from 2017[1], PSK support was removed from LibreSSL,
> and the best choice would be building against gnutls. Has anything changed
> since then, or is gnutls still the best option? If gnutls is the best bet,
> would a gnutls flavor be welcome?
> 
> Thanks,
> William Leuschner
> 
> 
> [1]: https://marc.info/?l=openbsd-ports&m=148465399628705&w=2
> 

Hi,

I manually compile the gnutls version for PSK support also (need it for some
servers). It would be convenient, but it's trivial to package, so fine by me
either way :)

-- 
Kind regards,
Hiltjo

[net/zabbix] PSK support?

2020-02-19 Thread William Leuschner


Hello porters,

I'm trying to set up Zabbix with pre-shared keys so that:
* connections are encrypted, and
* the agent will reject connections from anyone without the key.
The configuration that should work currently fails with a library error.

According to this note from 2017[1], PSK support was removed from 
LibreSSL, and the best choice would be building against gnutls. Has 
anything changed since then, or is gnutls still the best option? If 
gnutls is the best bet, would a gnutls flavor be welcome?


Thanks,
William Leuschner


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

Re: UPDATE: nextcloudclient-2.6.3

2020-02-19 Thread Stuart Henderson

Looking at the function involved, I suspect some of you have
devel/argp-standalone installed and others don't.

Re: UPDATE: slant-0.0.23

2020-02-19 Thread James Turner

On Wed, Feb 19, 2020 at 10:21:10PM +0100, Kristaps Dzonsons wrote:
> This patch updates slant to 0.0.23.  The difference being that it uses
> the newest openradtool, which uses the sqlbox library instead of ksql.

Committed, thanks!

> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/slant/Makefile,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 Makefile
> --- Makefile  13 Feb 2020 20:11:46 -  1.5
> +++ Makefile  19 Feb 2020 21:13:58 -
> @@ -2,8 +2,7 @@
>  
>  COMMENT =minimal remote system monitor
>  
> -DISTNAME =   slant-0.0.21
> -REVISION =   2
> +DISTNAME =   slant-0.0.23
>  
>  CATEGORIES = sysutils
>  
> @@ -18,8 +17,8 @@ PERMIT_PACKAGE =Yes
>  WANTLIB += c curses sqlite3 tls z
>  
>  BUILD_DEPENDS =  ${RUN_DEPENDS}
> -RUN_DEPENDS =databases/ksql \
> - www/openradtool>=0.7.4
> +RUN_DEPENDS =databases/sqlbox \
> + www/openradtool>=0.8.5
>  
>  LIB_DEPENDS = databases/sqlite3
>  
> Index: patches/patch-Makefile
> ===
> RCS file: /cvs/ports/sysutils/slant/patches/patch-Makefile,v
> retrieving revision 1.1
> diff -u -p -u -p -r1.1 patch-Makefile
> --- patches/patch-Makefile24 Nov 2019 14:40:30 -  1.1
> +++ patches/patch-Makefile19 Feb 2020 21:13:58 -
> @@ -1,23 +0,0 @@
> -$OpenBSD: patch-Makefile,v 1.1 2019/11/24 14:40:30 jturner Exp $
> -
> -Make slant compile with sqlbox
> -
> -Index: Makefile
>  Makefile.orig
> -+++ Makefile
> -@@ -131,13 +131,13 @@ slant-upgrade: slant-upgrade.in.sh
> - -e "s!@SHAREDIR@!$(SHAREDIR)!g" slant-upgrade.in.sh >$@
> - 
> - slant-collectd: $(SLANT_COLLECTD_OBJS)
> --$(CC) -o $@ $(LDFLAGS) $(SLANT_COLLECTD_OBJS) -lksql -lsqlite3 
> $(LDADD_SLANT_COLLECTD)
> -+$(CC) -o $@ $(LDFLAGS) $(SLANT_COLLECTD_OBJS) -lksql -lsqlbox -lsqlite3 
> $(LDADD_SLANT_COLLECTD)
> - 
> - params.h:
> - echo "#define DBFILE \"$(DBFILE)\"" > params.h
> - 
> - slant-cgi: slant-cgi.o db.o json.o compats.o
> --$(CC) -static -o $@ $(LDFLAGS) slant-cgi.o db.o json.o compats.o -lkcgi 
> -lkcgijson -lz -lksql -lsqlite3 -lm -lpthread $(LDADD_SLANT_CGI)
> -+$(CC) -static -o $@ $(LDFLAGS) slant-cgi.o db.o json.o compats.o -lkcgi 
> -lkcgijson -lz -lksql -lsqlbox -lsqlite3 -lm -lpthread $(LDADD_SLANT_CGI)
> - 
> - slant-cgi.o: params.h
> -

UPDATE: slant-0.0.23

2020-02-19 Thread Kristaps Dzonsons

This patch updates slant to 0.0.23.  The difference being that it uses
the newest openradtool, which uses the sqlbox library instead of ksql.
Index: Makefile
===
RCS file: /cvs/ports/sysutils/slant/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile	13 Feb 2020 20:11:46 -	1.5
+++ Makefile	19 Feb 2020 21:13:58 -
@@ -2,8 +2,7 @@
 
 COMMENT =	minimal remote system monitor
 
-DISTNAME =	slant-0.0.21
-REVISION =	2
+DISTNAME =	slant-0.0.23
 
 CATEGORIES =	sysutils
 
@@ -18,8 +17,8 @@ PERMIT_PACKAGE =	Yes
 WANTLIB += c curses sqlite3 tls z
 
 BUILD_DEPENDS =	${RUN_DEPENDS}
-RUN_DEPENDS =	databases/ksql \
-		www/openradtool>=0.7.4
+RUN_DEPENDS =	databases/sqlbox \
+		www/openradtool>=0.8.5
 
 LIB_DEPENDS = databases/sqlite3
 
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/sysutils/slant/patches/patch-Makefile,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-Makefile
--- patches/patch-Makefile	24 Nov 2019 14:40:30 -	1.1
+++ patches/patch-Makefile	19 Feb 2020 21:13:58 -
@@ -1,23 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1 2019/11/24 14:40:30 jturner Exp $
-
-Make slant compile with sqlbox
-
-Index: Makefile
 Makefile.orig
-+++ Makefile
-@@ -131,13 +131,13 @@ slant-upgrade: slant-upgrade.in.sh
- 	-e "s!@SHAREDIR@!$(SHAREDIR)!g" slant-upgrade.in.sh >$@
- 
- slant-collectd: $(SLANT_COLLECTD_OBJS)
--	$(CC) -o $@ $(LDFLAGS) $(SLANT_COLLECTD_OBJS) -lksql -lsqlite3 $(LDADD_SLANT_COLLECTD)
-+	$(CC) -o $@ $(LDFLAGS) $(SLANT_COLLECTD_OBJS) -lksql -lsqlbox -lsqlite3 $(LDADD_SLANT_COLLECTD)
- 
- params.h:
- 	echo "#define DBFILE \"$(DBFILE)\"" > params.h
- 
- slant-cgi: slant-cgi.o db.o json.o compats.o
--	$(CC) -static -o $@ $(LDFLAGS) slant-cgi.o db.o json.o compats.o -lkcgi -lkcgijson -lz -lksql -lsqlite3 -lm -lpthread $(LDADD_SLANT_CGI)
-+	$(CC) -static -o $@ $(LDFLAGS) slant-cgi.o db.o json.o compats.o -lkcgi -lkcgijson -lz -lksql -lsqlbox -lsqlite3 -lm -lpthread $(LDADD_SLANT_CGI)
- 
- slant-cgi.o: params.h
-

Re: UPDATE: nextcloudclient-2.6.3

2020-02-19 Thread Kirill Bychkov

On Wed, February 19, 2020 20:22, Rafael Sadowski wrote:
> On Tue Feb 18, 2020 at 10:54:36PM -0300, Adriano Barbosa wrote:
>> Hi,

Hi,

>> update for nextcloudclient to v2.6.3.
>> Changelog: https://github.com/nextcloud/desktop/releases/tag/v2.6.3
>>
>> OK?

Not tested yet but it definitely needs PLIST update.

>> --
>> Adriano
>
> I ran into the following err (nextcloudclient is not installed):
>
> FAILED: test/csync/check_encoding_functions
> : && /usr/ports/pobj/nextcloudclient-2.6.3/bin/c++  -O2 -pipe
> -I/usr/local/include/inotify  -I/usr/local/include/qtkeychain
> -I/usr/local/include -pedantic -DNDEBUG  -L/usr/local/lib/inotify
> -L/usr/local/lib  -linotify  -Wl,-rpath=/usr/local/lib/inotify
> test/csync/CMakeFiles/check_encoding_functions.dir/check_encoding_functions_autogen/mocs_compilation.cpp.o
> test/csync/CMakeFiles/check_encoding_functions.dir/encoding_tests/check_encoding.cpp.o
>  -o test/csync/check_encoding_functions -L/usr/local/lib/qt5/.
> -L/usr/ports/pobj/nextcloudclient-2.6.3/build-amd64/src/csync
> -L/usr/local/lib   -L/usr/local/lib/inotify   -L/usr/lib
> -Wl,-z,origin,-rpath,/usr/local/lib/qt5/.:/usr/ports/pobj/nextcloudclient-2.6.3/build-amd64/src/csync
>  test/csync/libtorture.a  -lQt5Core  -locsync  -lcmocka  -lsqlite3
> -lQt5Concurrent  -lQt5Core  /usr/lib/libz.so.5.0
> -Wl,-rpath-link,/usr/X11R6/lib && :
> ld: error: undefined symbol: argp_parse
 referenced by cmdline.c
   cmdline.c.o:(torture_cmdline_parse) in archive
 test/csync/libtorture.a
> c++: error: linker command failed with exit code 1 (use -v to see invocation)
> ninja: build stopped: subcommand failed.
>
>

Builds fine for me on 6.6-current (GENERIC.MP) #648: Sun Feb 16 13:54:33 MST 
2020

Re: UPDATE: nextcloudclient-2.6.3

2020-02-19 Thread Adriano Barbosa

Hi Rafael,
thanks for the test, but I could not reproduce.
Build works with nextcloudclient installed and uninstalled (and
confirmed that all files are gone).
I'm preparing an VM and will try to reproduce on a clean install.

Just to make sure, your test was on current? I'm running snapshot
#645: Wed Feb 12 15:09:39 MST 2020.

Best

Em qua., 19 de fev. de 2020 às 14:22, Rafael Sadowski
 escreveu:
>
> On Tue Feb 18, 2020 at 10:54:36PM -0300, Adriano Barbosa wrote:
> > Hi,
> > update for nextcloudclient to v2.6.3.
> > Changelog: https://github.com/nextcloud/desktop/releases/tag/v2.6.3
> >
> > OK?
> >
> > --
> > Adriano
>
> I ran into the following err (nextcloudclient is not installed):
>
> FAILED: test/csync/check_encoding_functions
> : && /usr/ports/pobj/nextcloudclient-2.6.3/bin/c++  -O2 -pipe
> -I/usr/local/include/inotify  -I/usr/local/include/qtkeychain  
> -I/usr/local/include -pedantic -DNDEBUG  -L/usr/local/lib/inotify  
> -L/usr/local/lib  -linotify  -Wl,-rpath=/usr/local/lib/inotify 
> test/csync/CMakeFiles/check_encoding_functions.dir/check_encoding_functions_autogen/mocs_compilation.cpp.o
>  
> test/csync/CMakeFiles/check_encoding_functions.dir/encoding_tests/check_encoding.cpp.o
>   -o test/csync/check_encoding_functions -L/usr/local/lib/qt5/.   
> -L/usr/ports/pobj/nextcloudclient-2.6.3/build-amd64/src/csync   
> -L/usr/local/lib   -L/usr/local/lib/inotify   -L/usr/lib 
> -Wl,-z,origin,-rpath,/usr/local/lib/qt5/.:/usr/ports/pobj/nextcloudclient-2.6.3/build-amd64/src/csync
>   test/csync/libtorture.a  -lQt5Core  -locsync  -lcmocka  -lsqlite3  
> -lQt5Concurrent  -lQt5Core  /usr/lib/libz.so.5.0  
> -Wl,-rpath-link,/usr/X11R6/lib && :
> ld: error: undefined symbol: argp_parse
> >>> referenced by cmdline.c
> >>>   cmdline.c.o:(torture_cmdline_parse) in archive 
> >>> test/csync/libtorture.a
> c++: error: linker command failed with exit code 1 (use -v to see invocation)
> ninja: build stopped: subcommand failed.



-- 
Adriano Barbosa

Re: [update patch] smartmontools 7.0 -> 7.1

2020-02-19 Thread Stuart Henderson

On 2020/02/19 09:36, Martin Ziemer wrote:
> Fixed.
> 
> 
> Created a new patch.
> 
> Tested on two amd64 systems.

Thanks, committed.


> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/smartmontools/Makefile,v
> retrieving revision 1.42
> diff -u -p -r1.42 Makefile
> --- Makefile  12 Jul 2019 20:49:51 -  1.42
> +++ Makefile  19 Feb 2020 05:11:19 -
> @@ -3,12 +3,13 @@
>  COMMENT= control and monitor storage systems using SMART
>  
>  # XXX at update time check whether C++11 is actually needed
> -DISTNAME=smartmontools-7.0
> +DISTNAME=smartmontools-7.1
>  CATEGORIES=  sysutils
> -REVISION=0
>  
>  HOMEPAGE=https://www.smartmontools.org/
>  
> +MAINTAINER = Martin Ziemer 
> +
>  # GPLv2+
>  PERMIT_PACKAGE=  Yes
>  
> @@ -27,5 +28,9 @@ CONFIGURE_ARGS= --docdir=${PREFIX}/shar
>   --without-gnupg
>  
>  CONFIGURE_ARGS+= --without-cxx11-option
> +
> +post-install:
> + ${INSTALL_SCRIPT} ${WRKBUILD}/smartd_warning.sh \
> + ${PREFIX}/share/examples/smartmontools
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/sysutils/smartmontools/distinfo,v
> retrieving revision 1.18
> diff -u -p -r1.18 distinfo
> --- distinfo  1 Mar 2019 19:35:34 -   1.18
> +++ distinfo  19 Feb 2020 05:11:19 -
> @@ -1,2 +1,2 @@
> -SHA256 (smartmontools-7.0.tar.gz) = 
> 5eGsJ4a8h/29b5LQ7nUbeZ+7PhoJwKajefnrZLPo9hw=
> -SIZE (smartmontools-7.0.tar.gz) = 944925
> +SHA256 (smartmontools-7.1.tar.gz) = 
> P3NNLJneseSvYrJdlExiUt5wymTXZsTHKUVFouZZuEY=
> +SIZE (smartmontools-7.1.tar.gz) = 971468
> Index: patches/patch-Makefile_in
> ===
> RCS file: patches/patch-Makefile_in
> diff -N patches/patch-Makefile_in
> --- patches/patch-Makefile_in 14 Nov 2019 19:19:30 -  1.14
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,48 +0,0 @@
> -$OpenBSD: patch-Makefile_in,v 1.14 2019/11/14 19:19:30 jasper Exp $
> -
> -Index: Makefile.in
>  Makefile.in.orig
> -+++ Makefile.in
> -@@ -372,8 +372,8 @@ man5dir = $(mandir)/man5
> - man8dir = $(mandir)/man8
> - NROFF = nroff
> - MANS = $(man_MANS)
> --DATA = $(docs_DATA) $(drivedb_DATA) $(examples_DATA) $(initd_DATA) \
> --$(sysconf_DATA) $(systemdsystemunit_DATA)
> -+DATA = $(docs_DATA) $(drivedb_DATA) $(examples_DATA) \
> -+$(systemdsystemunit_DATA)
> - am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
> - $(LISP)config.h.in
> - # Read a list of newline-separated strings from the standard input,
> -@@ -628,16 +628,7 @@ nodist_EXTRA_smartd_SOURCES = os_solaris_ata.s
> - @OS_SOLARIS_FALSE@man_MANS = smartd.conf.5 smartctl.8 smartd.8 \
> - @OS_SOLARIS_FALSE@  $(am__append_24)
> - docsdir = $(docdir)
> --docs_DATA = \
> --AUTHORS \
> --ChangeLog \
> --ChangeLog-5.0-6.0 \
> --COPYING \
> --INSTALL \
> --NEWS \
> --README \
> --TODO \
> --smartd.conf
> -+docs_DATA = smartd.conf
> - 
> - examplesdir = $(exampledir)
> - examples_DATA = \
> -@@ -649,10 +640,11 @@ examples_SCRIPTS = \
> - examplescripts/Example3 \
> - examplescripts/Example4 \
> - examplescripts/Example5 \
> --examplescripts/Example6
> -+examplescripts/Example6 \
> -+smartd_warning.sh
> - 
> - sysconf_DATA = smartd.conf
> --smartdscript_SCRIPTS = smartd_warning.sh
> -+smartdscript_SCRIPTS =
> - EXTRA_DIST = \
> - .editorconfig \
> - autogen.sh \
>

Re: UPDATE: nextcloudclient-2.6.3

2020-02-19 Thread Rafael Sadowski

On Tue Feb 18, 2020 at 10:54:36PM -0300, Adriano Barbosa wrote:
> Hi,
> update for nextcloudclient to v2.6.3.
> Changelog: https://github.com/nextcloud/desktop/releases/tag/v2.6.3
> 
> OK?
> 
> -- 
> Adriano

I ran into the following err (nextcloudclient is not installed):

FAILED: test/csync/check_encoding_functions 
: && /usr/ports/pobj/nextcloudclient-2.6.3/bin/c++  -O2 -pipe
-I/usr/local/include/inotify  -I/usr/local/include/qtkeychain  
-I/usr/local/include -pedantic -DNDEBUG  -L/usr/local/lib/inotify  
-L/usr/local/lib  -linotify  -Wl,-rpath=/usr/local/lib/inotify 
test/csync/CMakeFiles/check_encoding_functions.dir/check_encoding_functions_autogen/mocs_compilation.cpp.o
 
test/csync/CMakeFiles/check_encoding_functions.dir/encoding_tests/check_encoding.cpp.o
  -o test/csync/check_encoding_functions -L/usr/local/lib/qt5/.   
-L/usr/ports/pobj/nextcloudclient-2.6.3/build-amd64/src/csync   
-L/usr/local/lib   -L/usr/local/lib/inotify   -L/usr/lib 
-Wl,-z,origin,-rpath,/usr/local/lib/qt5/.:/usr/ports/pobj/nextcloudclient-2.6.3/build-amd64/src/csync
  test/csync/libtorture.a  -lQt5Core  -locsync  -lcmocka  -lsqlite3  
-lQt5Concurrent  -lQt5Core  /usr/lib/libz.so.5.0  
-Wl,-rpath-link,/usr/X11R6/lib && :
ld: error: undefined symbol: argp_parse
>>> referenced by cmdline.c
>>>   cmdline.c.o:(torture_cmdline_parse) in archive 
>>> test/csync/libtorture.a
c++: error: linker command failed with exit code 1 (use -v to see invocation)
ninja: build stopped: subcommand failed.

incorrect use of SUBDIR

2020-02-19 Thread Marc Espie

SUBDIR and SUBDIRLIST work like FLAVOR/SUBPACKAGE, they should be passed
through the environment and NOT as variable you can't override on the command
line (see the various unset in bsd.port.subdir.mk and pkgpath.mk)


There might other consumers in the tree.  Fix will be the same...

Index: bin/portbump
===
RCS file: /cvs/ports/infrastructure/bin/portbump,v
retrieving revision 1.22
diff -u -p -r1.22 portbump
--- bin/portbump27 Jun 2018 16:20:08 -  1.22
+++ bin/portbump19 Feb 2020 15:52:58 -
@@ -98,6 +98,18 @@ my @_REV_NEIGHBORS_WEAK = qw(
 );
 my $_rev_neighbors_plain_all = join('|', @_REV_NEIGHBORS, 
@_REV_NEIGHBORS_WEAK);
 
+sub run_make
+{
+   my $dir = shift;
+   my $pid = open(my $pipe, "-|");
+   if ($pid == 0) {
+   $ENV{SUBDIR}=$dir;
+   exec {'make'} ('make', @_);
+   exit(1);
+   }
+   return $pipe;
+}
+
 sub new {
my ($class, $dir, $tweak_wantlib, $lib_depends_tgt) = @_;
die "lib depends target specified without WANTLIB tweaking"
@@ -117,8 +129,8 @@ sub new {
# Get actual information about subpackages (including their
# REVISIONs) and shared libraries.
#
-   open (my $dumpvars, '-|', "make", "SUBDIR=$dir", "dump-vars") or
-   die "cannot run make dump-vars: $!";
+
+   my $dumpvars = run_make($dir, 'dump-vars');
while (<$dumpvars>) {
chomp;
next unless /^[^,]*(?:,[^.-]*(-[^.]+)?)?\.([^=.]+)=(.*)$/;
@@ -154,8 +166,7 @@ sub new {
# Get actual value of WANTLIB (not the one of WANTLIB-foo or 
WANTLIB-),
# to be used to avoid extra WANTLIB-* lines.
#
-   open ($dumpvars, '-|', "make", "SUBDIR=$dir", "show=WANTLIB") or
-   die "cannot run make show=WANTLIB: $!";
+   $dumpvars = run_make($dir, 'show=WANTLIB');
while (<$dumpvars>) {
chomp;
next if /^===>/;
@@ -201,8 +212,7 @@ sub new {
 
$self->{wantlib_extra} = { "" => [] };
$self->{wantlib_missing} = { "" => [] };
-   open ($dumpvars, '-|', "make", "SUBDIR=$dir", $lib_depends_tgt) 
or
-   die "cannot run make $lib_depends_tgt: $!";
+   $dumpvars = run_make($dir, $lib_depends_tgt);
my $subpkg;
my %not_reachable;
while (<$dumpvars>) {
Index: bin/portcheck
===
RCS file: /cvs/ports/infrastructure/bin/portcheck,v
retrieving revision 1.130
diff -u -p -r1.130 portcheck
--- bin/portcheck   12 Nov 2019 06:01:04 -  1.130
+++ bin/portcheck   19 Feb 2020 15:52:58 -
@@ -1481,7 +1481,7 @@ check_lib_depends() {
# TODO cache print-plist-libs output?
cd -- /usr/ports# XXX "$portsdir" fails for openbsd-wip and like
unset FLAVOR SUBPACKAGE
-   make "${make_args[@]}" SUBDIR="${pure_lib_deps[*]}" \
+   SUBDIR="${pure_lib_deps[*]}" make "${make_args[@]}" 
print-plist-libs /dev/null |&
while read -pr l; do
case $l in
Index: mk/bsd.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1515
diff -u -p -r1.1515 bsd.port.mk
--- mk/bsd.port.mk  26 Jan 2020 12:51:47 -  1.1515
+++ mk/bsd.port.mk  19 Feb 2020 15:52:59 -
@@ -46,12 +46,11 @@
 #
 # tests and variable definitions come first, THEN targets
 #
-.if ${.MAKEFLAGS:MFLAVOR=*}
-ERRORS += "Fatal: Use 'env FLAVOR=${FLAVOR} ${MAKE}' instead."
-.endif
-.if ${.MAKEFLAGS:MSUBPACKAGE=*}
-ERRORS += "Fatal: Use 'env SUBPACKAGE=${SUBPACKAGE} ${MAKE}' instead."
-.endif
+.for forbidden in FLAVOR SUBPACKAGE SUBDIR SUBDIRLIST
+.  if ${.MAKEFLAGS:M${forbidden}=*}
+ERRORS += "Fatal: Use 'env ${forbidden}=${${forbidden}} ${MAKE}' instead."
+.  endif
+.endfor
 
 .for f v in bsd.port.mk _BSD_PORT_MK bsd.port.subdir.mk _BSD_PORT_SUBDIR_MK
 .  if defined($v)

Re: x11/smtube ; patch to use https in default url + crash on exit report

2020-02-19 Thread Solene Rapenne

On Wed, Feb 19, 2020 at 04:31:23PM +0100, Gonzalo L. Rodriguez wrote:
> On Wed, 19 Feb 2020 at 12:12:51 +0100, Solene Rapenne wrote:
> > On Wed, Feb 19, 2020 at 11:35:52AM +0100, Solene Rapenne wrote:
> > > Hi,
> > > 
> > > smtube uses the website tonvid.com but it uses http:// by default, this 
> > > patch
> > > will make it use https://tonvid.com instead.
> > > 
> > > (and a crash report below the patch)
> > > 
> > > 
> > 
> > better patch doing https instead of wwws
> > 
> > many thanks bin on irc who spotted it
> > 
> > Index: Makefile
> > ===
> > RCS file: /data/cvs/ports/x11/smtube/Makefile,v
> > retrieving revision 1.35
> > diff -u -p -r1.35 Makefile
> > --- Makefile15 Jul 2019 13:21:51 -  1.35
> > +++ Makefile19 Feb 2020 10:30:13 -
> > @@ -5,6 +5,7 @@ USE_WXNEEDED =  Yes
> >  COMMENT =  browse and download YouTube videos
> >  
> >  DISTNAME = smtube-19.6.0
> > +REVISION = 0
> >  
> >  CATEGORIES =   multimedia x11
> >  
> > Index: patches/patch-src_browserwindow_cpp
> > ===
> > RCS file: patches/patch-src_browserwindow_cpp
> > diff -N patches/patch-src_browserwindow_cpp
> > --- /dev/null   1 Jan 1970 00:00:00 -
> > +++ patches/patch-src_browserwindow_cpp 19 Feb 2020 11:12:01 -
> > @@ -0,0 +1,23 @@
> > +$OpenBSD$
> > +
> > +Index: src/browserwindow.cpp
> > +--- src/browserwindow.cpp.orig
> >  src/browserwindow.cpp
> > +@@ -70,7 +70,7 @@ BrowserWindow::BrowserWindow(const QString & config_pa
> > + {
> > +   setWindowTitle("SMTube");
> > +   setWindowIcon(QPixmap(":/icons/smtube.png"));
> > +-  home_page = "http://www.tonvid.com/";;
> > ++  home_page = "https://www.tonvid.com/";;
> > + 
> > +   settings = new QSettings(config_path + "/smtube2.ini", 
> > QSettings::IniFormat, this);
> > + 
> > +@@ -442,7 +442,7 @@ void BrowserWindow::openYTUrl(QString title, QString e
> > +   if (current_player == WebBrowser) {
> > +   QString u = url;
> > +   #if 1
> > +-  u = "http://www.tonvid.com/video.php?u="; + 
> > url.toUtf8().toBase64().toPercentEncoding() +
> > ++  u = "https://www.tonvid.com/video.php?u="; + 
> > url.toUtf8().toBase64().toPercentEncoding() +
> > + "&t=" + title.toUtf8().toBase64().toPercentEncoding();
> > +   #endif
> > +   QDesktopServices::openUrl(u);
> > 
> 
> How about this diff?
> 
> 
> -- 
> 
>   - gonzalo

> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/smtube/Makefile,v
> retrieving revision 1.35
> diff -u -p -r1.35 Makefile
> --- Makefile  15 Jul 2019 13:21:51 -  1.35
> +++ Makefile  19 Feb 2020 15:30:18 -
> @@ -4,7 +4,7 @@ USE_WXNEEDED =Yes
>  
>  COMMENT =browse and download YouTube videos
>  
> -DISTNAME =   smtube-19.6.0
> +DISTNAME =   smtube-20.1.0
>  
>  CATEGORIES = multimedia x11
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/x11/smtube/distinfo,v
> retrieving revision 1.24
> diff -u -p -r1.24 distinfo
> --- distinfo  15 Jul 2019 13:21:51 -  1.24
> +++ distinfo  19 Feb 2020 15:30:18 -
> @@ -1,2 +1,2 @@
> -SHA256 (smtube-19.6.0.tar.bz2) = 9UIz7MJWP9iCF/+lhDsjL8WoUUwJyZ4E/qFkZdrUcDQ=
> -SIZE (smtube-19.6.0.tar.bz2) = 748844
> +SHA256 (smtube-20.1.0.tar.bz2) = vx1BGf6L6sP6rMm7IIEU8s65nMsLMxpyhgE0A6Z/pwM=
> +SIZE (smtube-20.1.0.tar.bz2) = 749306
> Index: patches/patch-src_browserwindow_cpp
> ===
> RCS file: patches/patch-src_browserwindow_cpp
> diff -N patches/patch-src_browserwindow_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_browserwindow_cpp   19 Feb 2020 15:30:18 -
> @@ -0,0 +1,32 @@
> +$OpenBSD$
> +
> +Index: src/browserwindow.cpp
> +--- src/browserwindow.cpp.orig
>  src/browserwindow.cpp
> +@@ -70,7 +70,7 @@ BrowserWindow::BrowserWindow(const QString & config_pa
> + {
> + setWindowTitle("SMTube");
> + setWindowIcon(QPixmap(":/icons/smtube.png"));
> +-home_page = "http://www.tonvid.com/";;
> ++home_page = "https://www.tonvid.com/";;
> + 
> + settings = new QSettings(config_path + "/smtube2.ini", 
> QSettings::IniFormat, this);
> + 
> +@@ -442,7 +442,7 @@ void BrowserWindow::openYTUrl(QString title, QString e
> + if (current_player == WebBrowser) {
> + QString u = url;
> + #if 1
> +-u = "http://www.tonvid.com/video.php?u="; + 
> url.toUtf8().toBase64().toPercentEncoding() +
> ++u = "https://www.tonvid.com/video.php?u="; + 
> url.toUtf8().toBase64().toPercentEncoding() +
> + "&t=" + title.toUtf8().toBase64().toPercentEncoding();
> + #endif
> + QDesktopServices::openUrl(u)

Re: update: devel/py-babel

2020-02-19 Thread Paco Esteban

On Wed, 19 Feb 2020, Kurt Mosiejczuk wrote:
> You missed a small PLIST change. A new ga_GB.dat file. 

Oh, missed that one !

> Fix that PLIST change and ok kmos

Thanks. Commited.

-- 
Paco Esteban.
5818130B8A6DBC03

Re: x11/smtube ; patch to use https in default url + crash on exit report

2020-02-19 Thread Gonzalo L. Rodriguez

On Wed, 19 Feb 2020 at 12:12:51 +0100, Solene Rapenne wrote:
> On Wed, Feb 19, 2020 at 11:35:52AM +0100, Solene Rapenne wrote:
> > Hi,
> > 
> > smtube uses the website tonvid.com but it uses http:// by default, this 
> > patch
> > will make it use https://tonvid.com instead.
> > 
> > (and a crash report below the patch)
> > 
> > 
> 
> better patch doing https instead of wwws
> 
> many thanks bin on irc who spotted it
> 
> Index: Makefile
> ===
> RCS file: /data/cvs/ports/x11/smtube/Makefile,v
> retrieving revision 1.35
> diff -u -p -r1.35 Makefile
> --- Makefile  15 Jul 2019 13:21:51 -  1.35
> +++ Makefile  19 Feb 2020 10:30:13 -
> @@ -5,6 +5,7 @@ USE_WXNEEDED =Yes
>  COMMENT =browse and download YouTube videos
>  
>  DISTNAME =   smtube-19.6.0
> +REVISION =   0
>  
>  CATEGORIES = multimedia x11
>  
> Index: patches/patch-src_browserwindow_cpp
> ===
> RCS file: patches/patch-src_browserwindow_cpp
> diff -N patches/patch-src_browserwindow_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_browserwindow_cpp   19 Feb 2020 11:12:01 -
> @@ -0,0 +1,23 @@
> +$OpenBSD$
> +
> +Index: src/browserwindow.cpp
> +--- src/browserwindow.cpp.orig
>  src/browserwindow.cpp
> +@@ -70,7 +70,7 @@ BrowserWindow::BrowserWindow(const QString & config_pa
> + {
> + setWindowTitle("SMTube");
> + setWindowIcon(QPixmap(":/icons/smtube.png"));
> +-home_page = "http://www.tonvid.com/";;
> ++home_page = "https://www.tonvid.com/";;
> + 
> + settings = new QSettings(config_path + "/smtube2.ini", 
> QSettings::IniFormat, this);
> + 
> +@@ -442,7 +442,7 @@ void BrowserWindow::openYTUrl(QString title, QString e
> + if (current_player == WebBrowser) {
> + QString u = url;
> + #if 1
> +-u = "http://www.tonvid.com/video.php?u="; + 
> url.toUtf8().toBase64().toPercentEncoding() +
> ++u = "https://www.tonvid.com/video.php?u="; + 
> url.toUtf8().toBase64().toPercentEncoding() +
> + "&t=" + title.toUtf8().toBase64().toPercentEncoding();
> + #endif
> + QDesktopServices::openUrl(u);
> 

How about this diff?


-- 

- gonzalo
Index: Makefile
===
RCS file: /cvs/ports/x11/smtube/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- Makefile15 Jul 2019 13:21:51 -  1.35
+++ Makefile19 Feb 2020 15:30:18 -
@@ -4,7 +4,7 @@ USE_WXNEEDED =  Yes
 
 COMMENT =  browse and download YouTube videos
 
-DISTNAME = smtube-19.6.0
+DISTNAME = smtube-20.1.0
 
 CATEGORIES =   multimedia x11
 
Index: distinfo
===
RCS file: /cvs/ports/x11/smtube/distinfo,v
retrieving revision 1.24
diff -u -p -r1.24 distinfo
--- distinfo15 Jul 2019 13:21:51 -  1.24
+++ distinfo19 Feb 2020 15:30:18 -
@@ -1,2 +1,2 @@
-SHA256 (smtube-19.6.0.tar.bz2) = 9UIz7MJWP9iCF/+lhDsjL8WoUUwJyZ4E/qFkZdrUcDQ=
-SIZE (smtube-19.6.0.tar.bz2) = 748844
+SHA256 (smtube-20.1.0.tar.bz2) = vx1BGf6L6sP6rMm7IIEU8s65nMsLMxpyhgE0A6Z/pwM=
+SIZE (smtube-20.1.0.tar.bz2) = 749306
Index: patches/patch-src_browserwindow_cpp
===
RCS file: patches/patch-src_browserwindow_cpp
diff -N patches/patch-src_browserwindow_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_browserwindow_cpp 19 Feb 2020 15:30:18 -
@@ -0,0 +1,32 @@
+$OpenBSD$
+
+Index: src/browserwindow.cpp
+--- src/browserwindow.cpp.orig
 src/browserwindow.cpp
+@@ -70,7 +70,7 @@ BrowserWindow::BrowserWindow(const QString & config_pa
+ {
+   setWindowTitle("SMTube");
+   setWindowIcon(QPixmap(":/icons/smtube.png"));
+-  home_page = "http://www.tonvid.com/";;
++  home_page = "https://www.tonvid.com/";;
+ 
+   settings = new QSettings(config_path + "/smtube2.ini", 
QSettings::IniFormat, this);
+ 
+@@ -442,7 +442,7 @@ void BrowserWindow::openYTUrl(QString title, QString e
+   if (current_player == WebBrowser) {
+   QString u = url;
+   #if 1
+-  u = "http://www.tonvid.com/video.php?u="; + 
url.toUtf8().toBase64().toPercentEncoding() +
++  u = "https://www.tonvid.com/video.php?u="; + 
url.toUtf8().toBase64().toPercentEncoding() +
+ "&t=" + title.toUtf8().toBase64().toPercentEncoding();
+   #endif
+   QDesktopServices::openUrl(u);
+@@ -713,7 +713,7 @@ void BrowserWindow::loadConfig() {
+ #ifdef D_BUTTON
+   add_download_button = settings->value("add_download_button", 
false).toBool();
+ 
+-  QString default_url = "http://www.dlvyoutube.com/%YT_URL%";;
++  QString default_url = "https://www.dlvyoutube.com/%Y

Re: update: devel/py-babel

2020-02-19 Thread Kurt Mosiejczuk

On Wed, Feb 19, 2020 at 11:49:01AM +0100, Paco Esteban wrote:
> Hi ports@,

> This is an update for devel/py-babel from 2.7.0 to 2.8.0
> Changelog reads:

> Improvements
> * CLDR: Upgrade to CLDR 36.0 - Aarni Koskela (#679)
> * Messages: Don't even open files with the "ignore" extraction method
> - @sebleblanc (#678)

> Bugfixes
> * Numbers: Fix formatting very small decimals when quantization is
> disabled - Lev Lybin, @miluChen (#662)
> * Messages: Attempt to sort all messages – Mario Frasca (#651, #606)

> Docs
> * Add years to changelog - Romuald Brunet
> * Note that installation requires pytz - Steve (Gadget) Barnes

> No big changes on the port.

> All tests pass on amd64 for py2 and py3.

You missed a small PLIST change. A new ga_GB.dat file. 

Otherwise, tests also all pass on sparc64.

Fix that PLIST change and ok kmos

--Kurt

> This one has some consumers.  Their regression tests behave exactly the
> same before and after the upgrade.  Here are those results for
> reference (as they are not that good):
> 
>   * devel/bpython
>   2 tests fail for py2
>   4 tests fail for py3
>   * textproc/py-sphinx
>   docutils library (and others) cannot be found.  Maybe test_depends
>   should include run_depends ??
>   py-alabaster is missing as a dep for tests
>   2 test fail on py2
>   3 tests fail on py3
>   * textproc/py-sphinx-intl
>   NO_TEST = Yes
>   * www/odoo
>   xlwt dependency missing and PRIVSEP prevents pip install, so no
>   tests.
>   * www/trac
>   2 test fail
> 
> comments ? ok ?
> 
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/devel/py-babel/Makefile,v
> retrieving revision 1.29
> diff -u -p -r1.29 Makefile
> --- Makefile  21 Aug 2019 14:21:51 -  1.29
> +++ Makefile  19 Feb 2020 09:08:08 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT= I18N/L10N tools for Python
>  
> -MODPY_EGG_VERSION=   2.7.0
> +MODPY_EGG_VERSION=   2.8.0
>  DISTNAME=Babel-${MODPY_EGG_VERSION}
>  PKGNAME= py-${DISTNAME:L}
>  CATEGORIES=  devel
> Index: distinfo
> ===
> RCS file: /home/cvs/ports/devel/py-babel/distinfo,v
> retrieving revision 1.9
> diff -u -p -r1.9 distinfo
> --- distinfo  21 Aug 2019 14:21:51 -  1.9
> +++ distinfo  19 Feb 2020 09:08:44 -
> @@ -1,2 +1,2 @@
> -SHA256 (Babel-2.7.0.tar.gz) = 6GE1rhAeMeLI7CCk4MUiD07tEkh9XPP3i+fpjTpX/Cg=
> -SIZE (Babel-2.7.0.tar.gz) = 8244870
> +SHA256 (Babel-2.8.0.tar.gz) = Gqwq4tDY6jaPqQkGVn9cCEY9mK3hVcDEv+3WoPcWDjg=
> +SIZE (Babel-2.8.0.tar.gz) = 8444381
> 
> -- 
> Paco Esteban.
> 5818130B8A6DBC03
>

Re: WIP: print/scribus (segmentation fault)

2020-02-19 Thread Landry Breuil

On Mon, Feb 03, 2020 at 09:14:19AM +0100, Landry Breuil wrote:
> On Mon, Feb 03, 2020 at 07:05:38AM +0100, Rafael Sadowski wrote:
> > On Sun Feb 02, 2020 at 07:29:56PM -0800, Nam Nguyen wrote:
> > > >>> > Rafael Sadowski writes:

> > > 
> > > To test the port, I followed the tutorial in Help > Scribus Manual >
> > > Scribus Basics > Quick Start Guide. I was able to make this by following
> > > the tutorial: https://namtsui.com/public/rembrandt.jpg
> > > 
> > > Feedback and tests are welcome.
> > > 
> > 
> > Works like a charm. All plugins are found. Tested with the PDF plugin.
> > I'm not a scribus user but it feels stable. Thanks Nam Nguyen, great
> > work!
> 
> I concur, many thanks nam for digging into this and coming with fixes !
> At the time i tried updating it it, didnt get that far..
> 
> Very happy to see this port finally updated :)

The updated has finally been commited, thanks to all involved :)

Landry

Re: x11/smtube ; patch to use https in default url + crash on exit report

2020-02-19 Thread Gonzalo L. Rodriguez

On Wed, 19 Feb 2020 at 12:12:51 +0100, Solene Rapenne wrote:
> On Wed, Feb 19, 2020 at 11:35:52AM +0100, Solene Rapenne wrote:
> > Hi,
> > 
> > smtube uses the website tonvid.com but it uses http:// by default, this 
> > patch
> > will make it use https://tonvid.com instead.
> > 
> > (and a crash report below the patch)
> > 
> > 
> 
> better patch doing https instead of wwws
> 
> many thanks bin on irc who spotted it
> 
> Index: Makefile
> ===
> RCS file: /data/cvs/ports/x11/smtube/Makefile,v
> retrieving revision 1.35
> diff -u -p -r1.35 Makefile
> --- Makefile  15 Jul 2019 13:21:51 -  1.35
> +++ Makefile  19 Feb 2020 10:30:13 -
> @@ -5,6 +5,7 @@ USE_WXNEEDED =Yes
>  COMMENT =browse and download YouTube videos
>  
>  DISTNAME =   smtube-19.6.0
> +REVISION =   0
>  
>  CATEGORIES = multimedia x11
>  
> Index: patches/patch-src_browserwindow_cpp
> ===
> RCS file: patches/patch-src_browserwindow_cpp
> diff -N patches/patch-src_browserwindow_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_browserwindow_cpp   19 Feb 2020 11:12:01 -
> @@ -0,0 +1,23 @@
> +$OpenBSD$
> +
> +Index: src/browserwindow.cpp
> +--- src/browserwindow.cpp.orig
>  src/browserwindow.cpp
> +@@ -70,7 +70,7 @@ BrowserWindow::BrowserWindow(const QString & config_pa
> + {
> + setWindowTitle("SMTube");
> + setWindowIcon(QPixmap(":/icons/smtube.png"));
> +-home_page = "http://www.tonvid.com/";;
> ++home_page = "https://www.tonvid.com/";;
> + 
> + settings = new QSettings(config_path + "/smtube2.ini", 
> QSettings::IniFormat, this);
> + 
> +@@ -442,7 +442,7 @@ void BrowserWindow::openYTUrl(QString title, QString e
> + if (current_player == WebBrowser) {
> + QString u = url;
> + #if 1
> +-u = "http://www.tonvid.com/video.php?u="; + 
> url.toUtf8().toBase64().toPercentEncoding() +
> ++u = "https://www.tonvid.com/video.php?u="; + 
> url.toUtf8().toBase64().toPercentEncoding() +
> + "&t=" + title.toUtf8().toBase64().toPercentEncoding();
> + #endif
> + QDesktopServices::openUrl(u);
> 

There is a new version of smtube, I will check this change and send a diff with
that included if is not already in.

Thanks.

-- 

- gonzalo

Re: [UPDATE] net/gdnsd to 2.4.3 (Fixes CVE-2019-13952)

2020-02-19 Thread Joerg Jung

> On 8. Nov 2019, at 12:43, Stuart Henderson  wrote:
> On 2019/11/08 11:46, Frederic Cambus wrote:
>> 
>> Here is a diff to update gdnsd to 2.4.3. This fixes CVE-2019-13952.
>> 
>> While there, switch MASTER_SITES to HTTPS.
> 
> OK.
> 
> I looked at updating to 3.x earlier but then I read "The TL;DR here is
> that gdnsd doesn't manage its own OS security or privileges anymore. It
> just runs and assumes the environment was already secured by the init
> system or script, and assumes it can bind port 53" and put it in the
> "too-hard basket”.

Actually, I found some time to look into this and I got recent version 3.x 
compiling and working with a few patches. But the removed privileges 
are indeed an issue… 
How are we supposed to handle such ports in general?
I guess with the raise of systemd there will be more such types of 
“daemons" coming.

For the user environment, I believe rc script can already start things 
as daemon_user=“_gdnsd”.  But since we have no authbind, 
CAP_NET_BIND_SERVICE (Linux), or mac_portacl (FreeBSD)
the actual port binding will be a problem.

What are our options here?

Maybe just suggest in pkg README to add a “transparent" PF rule to 
redirect port 53 -> 5353 (with an example)? 
Use some other kind of user-space tcp proxy in front, e.g. net/balance?

Any other ideas?

Thanks,
Regards,
Joerg

ps: the author seems upset about his own choices here and even 
apologises, see (last paragraph): 
https://github.com/gdnsd/gdnsd/blob/master/VERSION3.md

NEW: devel/ruby-sys-proctable

2020-02-19 Thread Sebastian Reitenbach

Hi,

this is a port of sys-proctable Ruby gem, a new requirement for updating 
security/wpscan:

cat pkg/DESCR
The sys-proctable library provides an interface for gathering
information about processes on your system, i.e. the process table. Most
major platforms are supported and, while different platforms may return
different information, the external interface is identical across
platforms.

OK?

Sebastian


ruby-sys-proctable.tar.gz
Description: GNU Zip compressed data

NEW: devel/ruby-get_process_mem

2020-02-19 Thread Sebastian Reitenbach

Hi,

this is a port of get_process_mem Ruby gem, a new requirement for updating 
security/wpscan:

cat pkg/DESCR
Do you need to get the memory usage of a process? Great because this
library does that.

OK?

Sebastian


ruby-get_process_mem.tar.gz
Description: GNU Zip compressed data

Re: x11/smtube ; patch to use https in default url + crash on exit report

2020-02-19 Thread Solene Rapenne

On Wed, Feb 19, 2020 at 11:35:52AM +0100, Solene Rapenne wrote:
> Hi,
> 
> smtube uses the website tonvid.com but it uses http:// by default, this patch
> will make it use https://tonvid.com instead.
> 
> (and a crash report below the patch)
> 
> 

better patch doing https instead of wwws

many thanks bin on irc who spotted it

Index: Makefile
===
RCS file: /data/cvs/ports/x11/smtube/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- Makefile15 Jul 2019 13:21:51 -  1.35
+++ Makefile19 Feb 2020 10:30:13 -
@@ -5,6 +5,7 @@ USE_WXNEEDED =  Yes
 COMMENT =  browse and download YouTube videos
 
 DISTNAME = smtube-19.6.0
+REVISION = 0
 
 CATEGORIES =   multimedia x11
 
Index: patches/patch-src_browserwindow_cpp
===
RCS file: patches/patch-src_browserwindow_cpp
diff -N patches/patch-src_browserwindow_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_browserwindow_cpp 19 Feb 2020 11:12:01 -
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: src/browserwindow.cpp
+--- src/browserwindow.cpp.orig
 src/browserwindow.cpp
+@@ -70,7 +70,7 @@ BrowserWindow::BrowserWindow(const QString & config_pa
+ {
+   setWindowTitle("SMTube");
+   setWindowIcon(QPixmap(":/icons/smtube.png"));
+-  home_page = "http://www.tonvid.com/";;
++  home_page = "https://www.tonvid.com/";;
+ 
+   settings = new QSettings(config_path + "/smtube2.ini", 
QSettings::IniFormat, this);
+ 
+@@ -442,7 +442,7 @@ void BrowserWindow::openYTUrl(QString title, QString e
+   if (current_player == WebBrowser) {
+   QString u = url;
+   #if 1
+-  u = "http://www.tonvid.com/video.php?u="; + 
url.toUtf8().toBase64().toPercentEncoding() +
++  u = "https://www.tonvid.com/video.php?u="; + 
url.toUtf8().toBase64().toPercentEncoding() +
+ "&t=" + title.toUtf8().toBase64().toPercentEncoding();
+   #endif
+   QDesktopServices::openUrl(u);

update: devel/py-babel

2020-02-19 Thread Paco Esteban

Hi ports@,

This is an update for devel/py-babel from 2.7.0 to 2.8.0
Changelog reads:

Improvements
* CLDR: Upgrade to CLDR 36.0 - Aarni Koskela (#679)
* Messages: Don't even open files with the "ignore" extraction method
- @sebleblanc (#678)

Bugfixes
* Numbers: Fix formatting very small decimals when quantization is
disabled - Lev Lybin, @miluChen (#662)
* Messages: Attempt to sort all messages – Mario Frasca (#651, #606)

Docs
* Add years to changelog - Romuald Brunet
* Note that installation requires pytz - Steve (Gadget) Barnes

No big changes on the port.

All tests pass on amd64 for py2 and py3.

This one has some consumers.  Their regression tests behave exactly the
same before and after the upgrade.  Here are those results for
reference (as they are not that good):

  * devel/bpython
  2 tests fail for py2
  4 tests fail for py3
  * textproc/py-sphinx
  docutils library (and others) cannot be found.  Maybe test_depends
  should include run_depends ??
  py-alabaster is missing as a dep for tests
  2 test fail on py2
  3 tests fail on py3
  * textproc/py-sphinx-intl
  NO_TEST = Yes
  * www/odoo
  xlwt dependency missing and PRIVSEP prevents pip install, so no
  tests.
  * www/trac
  2 test fail

comments ? ok ?

Index: Makefile
===
RCS file: /home/cvs/ports/devel/py-babel/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile21 Aug 2019 14:21:51 -  1.29
+++ Makefile19 Feb 2020 09:08:08 -
@@ -2,7 +2,7 @@
 
 COMMENT=   I18N/L10N tools for Python
 
-MODPY_EGG_VERSION= 2.7.0
+MODPY_EGG_VERSION= 2.8.0
 DISTNAME=  Babel-${MODPY_EGG_VERSION}
 PKGNAME=   py-${DISTNAME:L}
 CATEGORIES=devel
Index: distinfo
===
RCS file: /home/cvs/ports/devel/py-babel/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo21 Aug 2019 14:21:51 -  1.9
+++ distinfo19 Feb 2020 09:08:44 -
@@ -1,2 +1,2 @@
-SHA256 (Babel-2.7.0.tar.gz) = 6GE1rhAeMeLI7CCk4MUiD07tEkh9XPP3i+fpjTpX/Cg=
-SIZE (Babel-2.7.0.tar.gz) = 8244870
+SHA256 (Babel-2.8.0.tar.gz) = Gqwq4tDY6jaPqQkGVn9cCEY9mK3hVcDEv+3WoPcWDjg=
+SIZE (Babel-2.8.0.tar.gz) = 8444381

-- 
Paco Esteban.
5818130B8A6DBC03

x11/smtube ; patch to use https in default url + crash on exit report

2020-02-19 Thread Solene Rapenne

Hi,

smtube uses the website tonvid.com but it uses http:// by default, this patch
will make it use https://tonvid.com instead.

(and a crash report below the patch)


Index: Makefile
===
RCS file: /data/cvs/ports/x11/smtube/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- Makefile15 Jul 2019 13:21:51 -  1.35
+++ Makefile19 Feb 2020 10:30:13 -
@@ -5,6 +5,7 @@ USE_WXNEEDED =  Yes
 COMMENT =  browse and download YouTube videos
 
 DISTNAME = smtube-19.6.0
+REVISION = 0
 
 CATEGORIES =   multimedia x11
 
Index: patches/patch-src_browserwindow_cpp
===
RCS file: patches/patch-src_browserwindow_cpp
diff -N patches/patch-src_browserwindow_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_browserwindow_cpp 19 Feb 2020 10:30:02 -
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: src/browserwindow.cpp
+--- src/browserwindow.cpp.orig
 src/browserwindow.cpp
+@@ -70,7 +70,7 @@ BrowserWindow::BrowserWindow(const QString & config_pa
+ {
+   setWindowTitle("SMTube");
+   setWindowIcon(QPixmap(":/icons/smtube.png"));
+-  home_page = "http://www.tonvid.com/";;
++  home_page = "https://www.tonvid.com/";;
+ 
+   settings = new QSettings(config_path + "/smtube2.ini", 
QSettings::IniFormat, this);
+ 
+@@ -442,7 +442,7 @@ void BrowserWindow::openYTUrl(QString title, QString e
+   if (current_player == WebBrowser) {
+   QString u = url;
+   #if 1
+-  u = "http://www.tonvid.com/video.php?u="; + 
url.toUtf8().toBase64().toPercentEncoding() +
++  u = "http://wwws.tonvid.com/video.php?u="; + 
url.toUtf8().toBase64().toPercentEncoding() +
+ "&t=" + title.toUtf8().toBase64().toPercentEncoding();
+   #endif
+   QDesktopServices::openUrl(u);




When I exit smtube, it crashes every time, here is egdb backtrace output.
This happen on -current with up to date packages.

[New process 212199]
[New process 440316]
[New process 346182]
[New process 366883]
[New process 547468]
[New process 186961]
[New process 189499]
[New process 558678]
[New process 462303]
bt
Core was generated by `smtube'.
Program terminated with signal SIGSEGV, Segmentation fault.
#0  0x06391b8994e2 in std::__1::__atomic_base::load(std::__1::memory_order) const () from 
/usr/local/lib/qt5/libQt5Core.so.2.2
[Current thread is 1 (process 212199)]
(gdb) bt
#0  0x06391b8994e2 in std::__1::__atomic_base::load(std::__1::memory_order) const () from 
/usr/local/lib/qt5/libQt5Core.so.2.2
#1  0x06391b899471 in int QAtomicOps::load(std::__1::atomic 
const&) () from /usr/local/lib/qt5/libQt5Core.so.2.2
#2  0x06391b89942f in QBasicAtomicInteger::load() const () from 
/usr/local/lib/qt5/libQt5Core.so.2.2
#3  0x06391b8992f6 in QtPrivate::RefCount::deref() () from 
/usr/local/lib/qt5/libQt5Core.so.2.2
#4  0x06391b8a6e5c in QString::~QString() () from 
/usr/local/lib/qt5/libQt5Core.so.2.2
#5  0x06391bc91ad2 in void v_clear(QVariant::Private*, QString*) 
() from /usr/local/lib/qt5/libQt5Core.so.2.2
#6  0x06391bc79d2a in QVariantDestructor<(anonymous 
namespace)::CoreTypesFilter>::FilteredDestructor::FilteredDestructor(QVariant::Private*) () from 
/usr/local/lib/qt5/libQt5Core.so.2.2
#7  0x06391bc7859d in void QVariantDestructor<(anonymous 
namespace)::CoreTypesFilter>::delegate(QString const*) () from 
/usr/local/lib/qt5/libQt5Core.so.2.2
#8  0x06391bc77a79 in void QMetaTypeSwitcher::switcher 
>(QVariantDestructor<(anonymous namespace)::CoreTypesFilter>&, int, void 
const*) ()
   from /usr/local/lib/qt5/libQt5Core.so.2.2
#9  0x06391bc6f5db in (anonymous namespace)::clear(QVariant::Private*) () 
from /usr/local/lib/qt5/libQt5Core.so.2.2
#10 0x06391bc64b54 in QVariant::~QVariant() () from 
/usr/local/lib/qt5/libQt5Core.so.2.2
#11 0x06391bb1375f in QMapNodeBase::callDestructorIfNecessary () 
from /usr/local/lib/qt5/libQt5Core.so.2.2
#12 0x06391bb13c10 in QMapNode::destroySubTree() () 
from /usr/local/lib/qt5/libQt5Core.so.2.2
#13 0x06391bb13c9d in QMapNode::doDestroySubTree(std::__1::integral_constant) () from 
/usr/local/lib/qt5/libQt5Core.so.2.2
#14 0x06391bb13c19 in QMapNode::destroySubTree() () 
from /usr/local/lib/qt5/libQt5Core.so.2.2
#15 0x06391bb13c9d in QMapNode::doDestroySubTree(std::__1::integral_constant) () from 
/usr/local/lib/qt5/libQt5Core.so.2.2
#16 0x06391bb13c19 in QMapNode::destroySubTree() () 
from /usr/local/lib/qt5/libQt5Core.so.2.2
#17 0x06391bb13c9d in QMapNode::doDestroySubTree(std::__1::integral_constant) () from 
/usr/local/lib/qt5/libQt5Core.so.2.2
#18 0x06391bb13c19 in QMapNode::destroySubTree() () 
from /usr/local/lib/qt5/libQt5Core.so.2.2
#19 0x06391bb13c9d in QMapNode::doDestroySubTree(std::__1::integral_constant) () from 
/usr/local/lib/qt5/lib

Re: portimport: show PKGNAMES

2020-02-19 Thread Marc Espie

On Tue, Feb 18, 2020 at 08:37:07PM +, Stuart Henderson wrote:
> This might help prevent some duff imports.. ok?
> 
> Index: portimport
> ===
> RCS file: /cvs/ports/infrastructure/bin/portimport,v
> retrieving revision 1.8
> diff -u -p -r1.8 portimport
> --- portimport18 Feb 2020 15:26:48 -  1.8
> +++ portimport18 Feb 2020 20:36:16 -
> @@ -59,6 +59,9 @@ portsdir=${portsdir:-${PWD%"/$pkgpath"}}
>  timestamp=$(date '+%Y%m%d')
>  cvsroot=$u...@cvs.openbsd.org:/cvs
>  
> +echo -n "Package name is: "
> +make show=PKGNAMES
> +
>  echo -n "Import would go into: "
>  cvs -n -d$cvsroot import ports/$pkgpath $user ${user}_$timestamp 2>/dev/null 
> | \
>   grep Makefile | head -1 | awk '{print $2}' | xargs dirname
> 
> 
Nit, it can be a plural
Package(s) would be named:  ?

Re: [update patch] smartmontools 7.0 -> 7.1

2020-02-19 Thread Martin Ziemer

On Tue, Feb 18, 2020 at 06:09:34PM +, Stuart Henderson wrote:
> On 2020/02/17 15:06, Martin Ziemer wrote:
> > Tested compilation on a empty vm with just gmake installed to see, if
> > we get problems by purging c++11-parameters.
> 
> An empty VM won't help testing that, it is about whether to use --std=c++11
> or not. Removing that breaks compiling with base-gcc so you either need to
> leave it in, or disable it building on base-gcc arches.
Okay, this i got totally wrong. (Thought about dependencies)

Since i dont want to break anything (even if i can not test it on the
other arches), i think, we should leave the parameter and the comment.

> > +post-install:
> > +   ${INSTALL_DATA} ${WRKBUILD}/smartd_warning.sh \
> > +   ${PREFIX}/share/examples/smartmontools
> 
> Should be ${INSTALL_SCRIPT}.
> 
Fixed.


Created a new patch.

Tested on two amd64 systems.

Index: Makefile
===
RCS file: /cvs/ports/sysutils/smartmontools/Makefile,v
retrieving revision 1.42
diff -u -p -r1.42 Makefile
--- Makefile12 Jul 2019 20:49:51 -  1.42
+++ Makefile19 Feb 2020 05:11:19 -
@@ -3,12 +3,13 @@
 COMMENT=   control and monitor storage systems using SMART
 
 # XXX at update time check whether C++11 is actually needed
-DISTNAME=  smartmontools-7.0
+DISTNAME=  smartmontools-7.1
 CATEGORIES=sysutils
-REVISION=  0
 
 HOMEPAGE=  https://www.smartmontools.org/
 
+MAINTAINER =   Martin Ziemer 
+
 # GPLv2+
 PERMIT_PACKAGE=Yes
 
@@ -27,5 +28,9 @@ CONFIGURE_ARGS=   --docdir=${PREFIX}/shar
--without-gnupg
 
 CONFIGURE_ARGS+=   --without-cxx11-option
+
+post-install:
+   ${INSTALL_SCRIPT} ${WRKBUILD}/smartd_warning.sh \
+   ${PREFIX}/share/examples/smartmontools
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/smartmontools/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo1 Mar 2019 19:35:34 -   1.18
+++ distinfo19 Feb 2020 05:11:19 -
@@ -1,2 +1,2 @@
-SHA256 (smartmontools-7.0.tar.gz) = 
5eGsJ4a8h/29b5LQ7nUbeZ+7PhoJwKajefnrZLPo9hw=
-SIZE (smartmontools-7.0.tar.gz) = 944925
+SHA256 (smartmontools-7.1.tar.gz) = 
P3NNLJneseSvYrJdlExiUt5wymTXZsTHKUVFouZZuEY=
+SIZE (smartmontools-7.1.tar.gz) = 971468
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in   14 Nov 2019 19:19:30 -  1.14
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,48 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.14 2019/11/14 19:19:30 jasper Exp $
-
-Index: Makefile.in
 Makefile.in.orig
-+++ Makefile.in
-@@ -372,8 +372,8 @@ man5dir = $(mandir)/man5
- man8dir = $(mandir)/man8
- NROFF = nroff
- MANS = $(man_MANS)
--DATA = $(docs_DATA) $(drivedb_DATA) $(examples_DATA) $(initd_DATA) \
--  $(sysconf_DATA) $(systemdsystemunit_DATA)
-+DATA = $(docs_DATA) $(drivedb_DATA) $(examples_DATA) \
-+  $(systemdsystemunit_DATA)
- am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
-   $(LISP)config.h.in
- # Read a list of newline-separated strings from the standard input,
-@@ -628,16 +628,7 @@ nodist_EXTRA_smartd_SOURCES = os_solaris_ata.s
- @OS_SOLARIS_FALSE@man_MANS = smartd.conf.5 smartctl.8 smartd.8 \
- @OS_SOLARIS_FALSE@$(am__append_24)
- docsdir = $(docdir)
--docs_DATA = \
--AUTHORS \
--ChangeLog \
--ChangeLog-5.0-6.0 \
--COPYING \
--INSTALL \
--NEWS \
--README \
--TODO \
--smartd.conf
-+docs_DATA = smartd.conf
- 
- examplesdir = $(exampledir)
- examples_DATA = \
-@@ -649,10 +640,11 @@ examples_SCRIPTS = \
- examplescripts/Example3 \
- examplescripts/Example4 \
- examplescripts/Example5 \
--examplescripts/Example6
-+examplescripts/Example6 \
-+smartd_warning.sh
- 
- sysconf_DATA = smartd.conf
--smartdscript_SCRIPTS = smartd_warning.sh
-+smartdscript_SCRIPTS =
- EXTRA_DIST = \
- .editorconfig \
- autogen.sh \

Qt4 to Qt5 switch in x11/x2goclient

2020-02-19 Thread Rafael Sadowski

Here is a simple switch diff from Qt4 to Qt5. Tested on amd64.

Objections?

RS

Index: Makefile
===
RCS file: /cvs/ports/x11/x2goclient/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- Makefile12 Jul 2019 20:51:25 -  1.11
+++ Makefile19 Feb 2020 07:43:29 -
@@ -1,9 +1,9 @@
 # $OpenBSD: Makefile,v 1.11 2019/07/12 20:51:25 sthen Exp $
 
-COMMENT =  Qt4 client for the X2Go system
+COMMENT =  Qt client for the X2Go system
 
 DISTNAME = x2goclient-4.1.2.1
-REVISION = 2
+REVISION = 3
 
 CATEGORIES =   x11
 
@@ -14,29 +14,25 @@ MAINTAINER =Rafael Sadowski https://code.x2go.org/releases/source/x2goclient/
 
-MODULES += x11/qt4
+MODULES =  x11/qt5
 
-LIB_DEPENDS += security/libssh>=0.8.4 \
-   databases/openldap \
-   print/cups,-libs
+LIB_DEPENDS =  databases/openldap \
+   print/cups,-libs \
+   security/libssh>=0.8.4 \
+   x11/qt5/qtx11extras
 
-RUN_DEPENDS += x11/nx/nxcomp \
+RUN_DEPENDS =  x11/nx/nxcomp \
x11/nx/nxproxy \
shells/bash
 
 DOCSDIR =  ${PREFIX}/share/doc/x2goclient
 EXAMPLESDIR =  ${PREFIX}/share/examples/x2goclient
 
-LRELEASE = ${LOCALBASE}/bin/lrelease4
-
 do-configure:
find ${WRKSRC} -type f -iname "*.cpp"  -exec \
perl -pi -e 's,Q_OS_LINUX,Q_OS_UNIX,g;' \
@@ -46,8 +42,8 @@ do-configure:
-e 's,#include ,,g;' {} \;
sed -i -e 's,nxproxy -S nx,${LOCALBASE}/NX/bin/nxproxy -S nx,' \
${WRKSRC}/src/onmainwindow.cpp
-   cd ${WRKSRC} && ${LRELEASE} x2goclient.pro \
-   && ${MODQT4_QMAKE} x2goclient.pro
+   cd ${WRKSRC} && ${MODQT_LRELEASE} x2goclient.pro \
+   && ${MODQT_QMAKE} x2goclient.pro
 
 do-install:
${INSTALL_PROGRAM} ${WRKSRC}/x2goclient ${PREFIX}/bin
Index: patches/patch-src_sshprocess_cpp
===
RCS file: /cvs/ports/x11/x2goclient/patches/patch-src_sshprocess_cpp,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_sshprocess_cpp
--- patches/patch-src_sshprocess_cpp8 Jun 2017 18:05:04 -   1.1.1.1
+++ patches/patch-src_sshprocess_cpp19 Feb 2020 07:43:29 -
@@ -1,6 +1,7 @@
 $OpenBSD: patch-src_sshprocess_cpp,v 1.1.1.1 2017/06/08 18:05:04 rsadowski Exp 
$
 src/sshprocess.cpp.origTue Jul 28 22:40:25 2015
-+++ src/sshprocess.cpp Tue Jul 28 22:41:01 2015
+Index: src/sshprocess.cpp
+--- src/sshprocess.cpp.orig
 src/sshprocess.cpp
 @@ -23,6 +23,8 @@
  #include 
  
@@ -10,3 +11,12 @@ $OpenBSD: patch-src_sshprocess_cpp,v 1.1
  #ifndef Q_OS_WIN
  #include 
  #include 
+@@ -140,7 +142,7 @@ void SshProcess::tunnelLoop()
+ address.sin_family=AF_INET;
+ address.sin_addr.s_addr=htonl(INADDR_LOOPBACK);
+ address.sin_port=htons(localPort);
+-if (bind(serverSocket,(struct sockaddr*) &address,sizeof(address))!=0)
++if (::bind(serverSocket,(struct sockaddr*) &address,sizeof(address))!=0)
+ {
+ QString err=tr("Error binding 
")+localHost+":"+QString::number(localPort);
+ x2goDebug<

Re: UPDATE: www/otter-browser

2020-02-19 Thread Adam Wolk

Forgot to cc ports

- Original message -
From: Adam Wolk 
To: Rafael Sadowski , Adam Wolk 
Subject: Re: UPDATE: www/otter-browser
Date: Wednesday, February 19, 2020 9:02 AM



On Wed, Feb 19, 2020, at 8:49 AM, Rafael Sadowski wrote:
> On Wed Feb 12, 2020 at 09:37:38AM +0100, Rafael Sadowski wrote:
> > Update otter-browser to the latest stable version which supports
> > qtwebkit from https://github.com/qtwebkit/qtwebkit or qtwebengin (Which
> > is not ported) but no more qtwebkit 5.9.0.
> > 
> > Tested with upcoming x11/qt5/qtwebkit update.
> > 
> > OK?
> 
> Hi Adam,
> 
> any objections? We want to go in with the qtwebkit update.

No objections. Sorry for holding up, wanted to test past weekend but something 
popped up.

ok awolk@

> RS
> 
> > 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/www/otter-browser/Makefile,v
> > retrieving revision 1.30
> > diff -u -p -u -p -r1.30 Makefile
> > --- Makefile 12 Jul 2019 20:50:49 - 1.30
> > +++ Makefile 12 Feb 2020 05:19:00 -
> > @@ -2,8 +2,7 @@
> > 
> > COMMENT = browser aiming to recreate classic Opera (12.x) UI using Qt5
> > 
> > -DISTNAME = otter-browser-0.9.94
> > -REVISION = 2
> > +DISTNAME = otter-browser-1.0.01
> > 
> > CATEGORIES = www
> > 
> > @@ -30,7 +29,7 @@ LIB_DEPENDS = textproc/hunspell \
> > x11/qt5/qtdeclarative \
> > x11/qt5/qtmultimedia \
> > x11/qt5/qtsvg \
> > - x11/qt5/qtwebkit \
> > + x11/qt5/qtwebkit>=5.212.0 \
> > x11/qt5/qtxmlpatterns
> > 
> > NO_TEST = Yes
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/www/otter-browser/distinfo,v
> > retrieving revision 1.17
> > diff -u -p -u -p -r1.17 distinfo
> > --- distinfo 4 Jan 2018 18:55:16 - 1.17
> > +++ distinfo 12 Feb 2020 05:19:00 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (otter-browser-0.9.94.tar.bz2) = 
> > 9ylzbT4pzVwPOfLqqjdUpjK+6XJF5i7KbsdaHMa2jeM=
> > -SIZE (otter-browser-0.9.94.tar.bz2) = 3029327
> > +SHA256 (otter-browser-1.0.01.tar.bz2) = 
> > CG15d7yoIcpiSmywSaSldtuFfOhV+oujWlccoevzxrA=
> > +SIZE (otter-browser-1.0.01.tar.bz2) = 3189343
> > Index: pkg/PLIST
> > ===
> > RCS file: /cvs/ports/www/otter-browser/pkg/PLIST,v
> > retrieving revision 1.10
> > diff -u -p -u -p -r1.10 PLIST
> > --- pkg/PLIST 29 Jun 2018 22:16:22 - 1.10
> > +++ pkg/PLIST 12 Feb 2020 05:19:00 -
> > @@ -24,6 +24,7 @@ share/otter-browser/locale/otter-browser
> > share/otter-browser/locale/otter-browser_et.qm
> > share/otter-browser/locale/otter-browser_fi.qm
> > share/otter-browser/locale/otter-browser_fr.qm
> > +share/otter-browser/locale/otter-browser_gl.qm
> > share/otter-browser/locale/otter-browser_he.qm
> > share/otter-browser/locale/otter-browser_hr.qm
> > share/otter-browser/locale/otter-browser_hu.qm
> > @@ -47,6 +48,7 @@ share/otter-browser/locale/otter-browser
> > share/otter-browser/locale/otter-browser...@ijekavianlatin.qm
> > share/otter-browser/locale/otter-browser...@latin.qm
> > share/otter-browser/locale/otter-browser_sv.qm
> > +share/otter-browser/locale/otter-browser_th.qm
> > share/otter-browser/locale/otter-browser_tr.qm
> > share/otter-browser/locale/otter-browser_uk.qm
> > share/otter-browser/locale/otter-browser_yue.qm
> > 
>

sparc64 bulk build report

2020-02-19 Thread kmos

Bulk build on sparc64-0.ports.openbsd.org

Started : Sun Feb 16 14:41:26 MST 2020
Finished: Wed Feb 19 01:02:06 MST 2020
Duration: 2 Days 10 hours 21 minutes

Built using OpenBSD 6.6-current (GENERIC.MP) #214: Sun Feb 16 05:44:42 MST 2020

Built 9911 packages

Number of packages built each day:
Feb 16: 6459
Feb 17: 2157
Feb 18: 1293
Feb 19: 2



Critical path missing pkgs:
http://build-failures.rhaalovely.net/sparc64/2020-02-16/summary.log

Build failures: 24
http://build-failures.rhaalovely.net/sparc64/2020-02-16/cad/qucs.log
http://build-failures.rhaalovely.net/sparc64/2020-02-16/devel/rebar,erlang21.log
http://build-failures.rhaalovely.net/sparc64/2020-02-16/emulators/BasiliskII.log
http://build-failures.rhaalovely.net/sparc64/2020-02-16/games/pokerth.log
http://build-failures.rhaalovely.net/sparc64/2020-02-16/games/xevil.log
http://build-failures.rhaalovely.net/sparc64/2020-02-16/geo/spatialite/gis.log
http://build-failures.rhaalovely.net/sparc64/2020-02-16/graphics/colord-gtk.log
http://build-failures.rhaalovely.net/sparc64/2020-02-16/mail/kopano/core.log
http://build-failures.rhaalovely.net/sparc64/2020-02-16/math/py-scikit-learn.log
http://build-failures.rhaalovely.net/sparc64/2020-02-16/misc/dtcltiny.log
http://build-failures.rhaalovely.net/sparc64/2020-02-16/net/dleyna/renderer.log
http://build-failures.rhaalovely.net/sparc64/2020-02-16/net/dleyna/server.log
http://build-failures.rhaalovely.net/sparc64/2020-02-16/net/telegram-purple.log
http://build-failures.rhaalovely.net/sparc64/2020-02-16/productivity/gnucash.log
http://build-failures.rhaalovely.net/sparc64/2020-02-16/telephony/iaxclient.log
http://build-failures.rhaalovely.net/sparc64/2020-02-16/x11/gnome/bijiben.log
http://build-failures.rhaalovely.net/sparc64/2020-02-16/x11/gnome/builder.log
http://build-failures.rhaalovely.net/sparc64/2020-02-16/x11/gnome/mutter.log
http://build-failures.rhaalovely.net/sparc64/2020-02-16/x11/gtk+4,-cloudprint.log
http://build-failures.rhaalovely.net/sparc64/2020-02-16/x11/kde4/libs,,-en_US.log
http://build-failures.rhaalovely.net/sparc64/2020-02-16/x11/kde4/smokeqt.log
http://build-failures.rhaalovely.net/sparc64/2020-02-16/x11/libdbus-c++.log
http://build-failures.rhaalovely.net/sparc64/2020-02-16/x11/libhandy.log
http://build-failures.rhaalovely.net/sparc64/2020-02-16/x11/ogre.log

Recurrent failures:
 failures/cad/qucs.log
 failures/devel/rebar,erlang21.log
 failures/emulators/BasiliskII.log
 failures/games/pokerth.log
 failures/games/xevil.log
 failures/geo/spatialite/gis.log
 failures/graphics/colord-gtk.log
 failures/mail/kopano/core.log
 failures/math/py-scikit-learn.log
 failures/misc/dtcltiny.log
 failures/net/dleyna/renderer.log
 failures/net/dleyna/server.log
 failures/net/telegram-purple.log
 failures/productivity/gnucash.log
 failures/summary.log
 failures/telephony/iaxclient.log
 failures/x11/gnome/bijiben.log
 failures/x11/gnome/builder.log
 failures/x11/gnome/mutter.log

New failures:

Resolved failures:
-failures/cad/magic.log
-failures/cad/netgen.log
-failures/chinese/libpinyin.log
-failures/devel/kdevelop.log
-failures/devel/py-unicorn,python3.log
-failures/devel/qt-creator.log
-failures/lang/erlang/16.log
-failures/math/mlpack,,-python.log
-failures/misc/open62541.log
-failures/print/hplip,-common.log
-failures/sysutils/collectd,-main.log
-failures/www/zola.log

Packages newly built:
+benchmarks/tsung
+cad/magic
+cad/netgen
+devel/kdevelop
+devel/p5-Conf-Libconfig
+devel/qt-creator
+lang/erlang/16
+lang/erlang/16,-main
+lang/erlang/16,-wx
+math/mlpack,,-python
+misc/open62541
+net/dino
+net/ejabberd
+net/srain
+print/hplip
+print/hplip,-common
+print/hplip,-gui
+print/hplip,-hpaio
+print/hplip,-hpcups
+print/hplip,-hpijs
+print/hplip,-main
+productivity/lifeograph
+sysutils/collectd
+sysutils/collectd,-main
+sysutils/collectd,-memcachec
+sysutils/collectd,-mqtt
+sysutils/collectd,-mysql
+sysutils/collectd,-nut
+sysutils/collectd,-pgsql
+sysutils/collectd,-ping
+sysutils/collectd,-prometheus
+sysutils/collectd,-python
+sysutils/collectd,-redis
+sysutils/collectd,-riemann
+sysutils/collectd,-rrdtool
+sysutils/collectd,-snmp
+sysutils/collectd,-virt
+www/py-wstools
+www/py-wstools,python3
+www/zola

Packages not built this time:
-devel/bouml
-devel/bouml,-docs
-devel/bouml,-main
-games/qgo
-lang/erlang/17
-lang/erlang/17,-main
-lang/erlang/17,-wx
-lang/erlang/18
-lang/erlang/18,-main
-lang/erlang/18,-wx
-mail/claws-mail,,-gdata
-mail/claws-mail,,-pdfviewer
-mail/claws-mail,,-spamassassin
-net/mutella
-www/nginx,-geoip
-www/py-wtools
-www/py-wtools,python3
-x11/qrfcview

39 matches

Mail list logo