CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2020/08/20 23:57:20 Modified files: games/rocksndiamonds: Makefile distinfo games/rocksndiamonds/patches: patch-src_Makefile Log message: Update to rocksndiamonds-4.2.0.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2020/08/20 21:22:50 Modified files: x11/worker : Makefile Added files: x11/worker/patches: patch-src_aguix_aguix_cc patch-src_aguix_aguix_h patch-src_aguix_awindow_cc patch-src_worker_net_wm_icon_h Log message: Upstream mistakenly uses a signed long in a place where they should be using an unsigned long, which triggers a build failure (-Wc++11-narrowing) on 32-bit systems. I have reported this upstream. Bump REVISION. Thanks to sthen@'s i386 build failures emails, which alerted me to the issue.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2020/08/20 21:20:08 ports/x11/worker/patches Update of /cvs/ports/x11/worker/patches In directory cvs.openbsd.org:/tmp/cvs-serv90354/patches Log Message: Directory /cvs/ports/x11/worker/patches added to the repository
Re: UPDATE: inputmethods/fcitx 4.2.9.6 => 4.2.9.8 and inputmethods/fcitx-qt5 1.2.3 => 1.2.5
On Fri, Aug 14, 2020 at 03:39:04PM +0800, Kevin Lo wrote:
>
> Hi ports,
>
> The following updates fcitx to 4.2.9.8 and fcitx-qt5 to 1.2.5.
> There are no symbol changes, so no lib bumps.
> Tested on amd64.
>
> Ok?
ping
>
> diff f774fbfd3e6b7af035101ca0b84a2d18e48fa5d8 /usr/ports
> blob - 0c9bef028b69746ae5ff97994a9cb5874eaa46ed
> file + inputmethods/fcitx/Makefile
> --- inputmethods/fcitx/Makefile
> +++ inputmethods/fcitx/Makefile
> @@ -1,19 +1,16 @@
> # $OpenBSD: Makefile,v 1.14 2020/02/29 15:20:56 naddy Exp $
>
> COMMENT-main = flexible input method framework
> -COMMENT-gtk3 = fcitx for GTK+3
> +COMMENT-gtk3 = fcitx for GTK+3
>
> -V = 4.2.9.6
> -DISTNAME = fcitx-$V
> -PKGNAME-main = fcitx-$V
> +V = 4.2.9.8
> +DISTNAME = fcitx-$V
> +PKGNAME-main = ${PKGNAME}
> PKGNAME-gtk3 = fcitx-gtk3-$V
> -REVISION-main = 2
> -REVISION-gtk3 = 1
>
> SHARED_LIBS += fcitx-config0.0 # 4.1
> SHARED_LIBS += fcitx-core 0.0 # 0.3
> SHARED_LIBS += fcitx-gclient 0.0 # 0.2
> -SHARED_LIBS += fcitx-qt0.0 # 0.1
> SHARED_LIBS += fcitx-utils 0.0 # 0.1
>
> CATEGORIES = inputmethods chinese japanese
> @@ -29,26 +26,23 @@ MULTI_PACKAGES = -main -gtk3
>
> COMPILER = base-clang ports-gcc base-gcc
>
> -WANTLIB-common = execinfo iconv intl kvm xkbcommon
> +WANTLIB-main += X11 Xext Xfixes Xinerama Xrender c cairo dbus-1
> \
> + execinfo gdk-x11-2.0 gettextpo gio-2.0 glib-2.0 \
> + gobject-2.0 gtk-x11-2.0 iconv intl json-c kvm \
> + pango-1.0 pangocairo-1.0 pthread uuid xkbcommon \
> + xkbfile xml2
>
> -WANTLIB-main += ${WANTLIB-common}
> -WANTLIB-main += ICE X11 Xcomposite Xcursor Xdamage Xext Xfixes \
> - Xi Xinerama Xrandr Xrender atk-1.0 c cairo dbus-1 \
> - execinfo fontconfig freetype gdk_pixbuf-2.0 \
> - gdk-x11-2.0 gettextpo gio-2.0 glib-2.0 \
> - gobject-2.0 gtk-x11-2.0 pango-1.0 pangocairo-1.0 \
> - pangoft2-1.0 pthread uuid xkbcommon xkbfile xml2 z
> -
> BUILD_DEPENDS = devel/gettext,-tools \
> devel/gobject-introspection \
> devel/iso-codes \
> devel/kf5/extra-cmake-modules \
> shells/bash
> -RUN_DEPENDS-main = devel/desktop-file-utils \
> +RUN_DEPENDS =devel/desktop-file-utils \
> misc/shared-mime-info \
> shells/bash \
> x11/gtk+3,-guic
> -LIB_DEPENDS-main = devel/gettext,-tools \
> +LIB_DEPENDS =devel/gettext,-tools \
> + devel/json-c \
> devel/libexecinfo \
> sysutils/e2fsprogs \
> textproc/libxml \
> @@ -56,15 +50,11 @@ LIB_DEPENDS-main =devel/gettext,-tools \
> x11/gtk+2 \
> x11/xkbcommon
>
> -WANTLIB-gtk3 += ${WANTLIB-common}
> -WANTLIB-gtk3 += atk-1.0 cairo cairo-gobject dbus-1
> gdk_pixbuf-2.0 \
> - gdk-3 gio-2.0 glib-2.0 gobject-2.0 gtk-3 pango-1.0 \
> - pangocairo-1.0
> +WANTLIB-gtk3 += fcitx-gclient fcitx-utils glib-2.0 gobject-2.0
> gdk-3
> +WANTLIB-gtk3 += gtk-3 pango-1.0 xkbcommon
>
> -RUN_DEPENDS-gtk3 = inputmethods/fcitx,-main
> -LIB_DEPENDS-gtk3 = devel/libexecinfo \
> - x11/gtk+3 \
> - x11/xkbcommon
> +LIB_DEPENDS-gtk3 = ${BUILD_PKGPATH},-main \
> + x11/gtk+3
>
> MASTER_SITES = https://download.fcitx-im.org/fcitx/
> DISTFILES = ${DISTNAME}${EXTRACT_SUFX}
> @@ -80,7 +70,8 @@ DIST_SUBDIR = fcitx
>
> MODULES =devel/cmake
>
> -CONFIGURE_ARGS =-DENABLE_GTK3_IM_MODULE=ON \
> +CONFIGURE_ARGS =-Wno-dev \
> + -DENABLE_GTK3_IM_MODULE=ON \
> -DENABLE_ENCHANT=OFF \
> -DENABLE_OPENCC=OFF \
> -DENABLE_PRESAGE=OFF \
> @@ -89,8 +80,12 @@ CONFIGURE_ARGS =-DENABLE_GTK3_IM_MODULE=ON \
> -DENABLE_QT_GUI=OFF \
> -DSYSCONFDIR=${PREFIX}/share/examples/fcitx \
> -DMAN_INSTALL_DIR=${PREFIX}/man/ \
> - -DCMAKE_C_FLAGS="${CFLAGS} -I${LOCALBASE}/include
> -I${X11BASE}/include" \
> - -DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${LOCALBASE}/include
> -I${X11BASE}/include"
> + -DCMAKE_C_FLAGS="${CFLAGS} \
> + -I${LOCALBASE}/include \
> + -I${X11BASE}/include" \
> + -DCMAKE_CXX_FLAGS="${CXXFLAGS} \
> + -I${LOCALBASE}/include \
> + -I${X11BASE}/include"
>
> NO_TEST =Yes
>
> @@ -102,6 +97,6 @@ post-patch:
> @cp
回复: [NEW] www/p5-CGI-Struct
ping ... 发件人: Andrew Hewus Fresh 发送时间: 2020年8月16日 4:19 收件人: wen heping 抄送: ports@openbsd.org 主题: Re: [NEW] www/p5-CGI-Struct On Mon, Jul 27, 2020 at 01:12:01PM +, wen heping wrote: > Hi, ports@: > >Here is a patch to create new port www/p5-CGI-Struct, > which is required by the update of p5-Catalyst-Runtime. >It build well and pass all tests on amd64-current system. I said OK to both this and p5-CGI-Struct-XS that were in the same message back in May, but apparently that mail got lost somewhere along the way as I don't see it on MARC or nabble (but I don't see the original on MARC either). http://openbsd-archive.7691.n7.nabble.com/NEW-www-p5-CGI-Struct-td395846.html In any case, OK to this or on both. l8rZ, -- andrew - http://afresh1.com Hey! It compiles! Ship it!
Re: update net/libtorrent-rasterbar 1.2.8
1.2.9 was just released August 20, 2020. I'm running into some trouble with 1.2.9 where deluge works but qbitorrent has a compilation error. I'll send it once this is resolved.
Re: [update] lang/go to 1.15
On Thu, 20 Aug 2020 at 15:36:23 -0600, Aaron Bieber wrote: > Hi! > > Here is an update to bring us to 1.15. > > I have run this through a "mini bulk" - there was one failure, but the port > that failed (net/minio/server) builds fine by hand. The log is here: > https://deftly.net/server.log > > I have tested: > > | Arch | Go port build | Bulk | Apps | Tests| > |---+---+--+--+--| > | amd64 | Y | Y| Y| ALL TESTS PASSED | > | arm64 | Y | N| Y| Running... | > | armv7 | - | N| N| | > | i386 | - | N| N| | > > My armv7 machine is updating. I will report back once I run the build/test on > it. > > I don't have an i386 machine. > > edd@ has a diff for syncthing that I also tested (build and runtime). With > this > diff and edd's, syncthing is back up and running! > > OK? > > Cheers, > Aaron > And a version without PLIST.orig: https://deftly.net/patches/go-1.15.diff Also, arm64 tests finished with: ALL TESTS PASSED
Re: [NEW] cad/cura - Ultimake Cura + dependencies
Hi folks!
Thank you for the feedback! As soon as possible I will take care of each
point. :D
Best regards,
Evandro Rathke
*Mobile/WhatsApp*: +55 51 9 9921-5584
*Skype*: erathke
On Tue, Aug 18, 2020 at 8:59 AM Stuart Henderson
wrote:
> On 2020/08/18 11:29, Stuart Henderson wrote:
> > > * devel/libSavitar
> > > * net/libArcus
> > > * net/libCharon
> >
> > all lowercase for these port names please
> >
>
> other comments: (paco's are generally good too)
>
> - all the ultimaker distfiles have the same version 4.6.2 which implies
> that they probably want updating together, it might be easier to do that
> if they're grouped e.g. cad/ultimaker/{cura,cura-engine,fdm_materials,...}
>
> - SHARED_LIBS should all start with 0.0 for new ports. if the ports don't
> honour that setting in the files they produce, that needs correcting.
>
> - libCharon should use MODULES=lang/python and the python-related variables
> in PLIST etc. the python module messes about with CONFIGURE_STYLE, you can
> avoid that with CONFIGURE_STYLE=none
>
> > * devel/py-trimesh
> > * No need for that NEEDED_DEPENDS. Define BUILD_DEPENDS and
> later
> > RUN_DEPENDS = ${BUILD_DEPENDS}
>
> ah, this is wrong, BUILD_DEPENDS can have other things added to it (ccache,
> build tools, etc), RUN_DEPENDS should not be set based on it.
>
> one of them has cython as a run dep; haven't looked closer but this is
> normally something that would be a build dep
>
> there are various ones with constructs like
>
> V= 1.23
> GH_TAGNAME= ${V}
> DISTNAME= bar-${V}
>
> and some others with an additional variable; much of this is not needed,
> if you do this
>
> GH_ACCOUNT= foo
> GH_PROJECT= bar
> GH_TAGNAME= v1.23
>
> the following vars are set automatically and it's better not to explicitly
> set them:
>
> DISTNAME= bar-1.23(auto strips the 'v')
> HOMEPAGE= https://github.com/foo/bar
>
> and where you have mixed-case ones that need lower-casing you can do e.g.
>
> GH_PROJECT= libBar
> PKGNAME=${DISTNAME:L}
>
> some of the ultimaker port PKGNAMEs end up mixed-case as well, those should
> be lowered too
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2020/08/20 15:03:25 Modified files: devel/gettext : Makefile distinfo devel/gettext/patches: patch-gettext-runtime_intl_dcigettext_c patch-gettext-runtime_intl_l10nflist_c patch-gettext-runtime_intl_relocatable_c patch-gettext-tools_gnulib-lib_Makefile_in patch-gettext-tools_src_Makefile_in devel/gettext/pkg: PLIST-tools Log message: Update to 0.21. Incremental changes only. >From martijn@: GCC on alpha has an optimization bug, which cause problems with gnulib's mmalloca function. Disable alloca to work around the failing code.
Hacking cabal v2-build stuff together
Hey Matthias, Hope your summer is going well. I got devel/happy to build with cabal v2-build but the lack of datadir is a show stopper (asking Gleb for pointers). Still if you wanna take a look I pushed the current state of my ports tree to: https://github.com/blackgnezdo/ports/commit/74a8e81582027dbcaefd91f40ddbd45ce633d870 Thanks Greg -- nest.cx is Gmail hosted, use PGP: https://pgp.key-server.io/0x0B1542BD8DF5A1B0 Fingerprint: 5E2B 2D0E 1E03 2046 BEC3 4D50 0B15 42BD 8DF5 A1B0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2020/08/20 14:10:25 Modified files: x11: Makefile Log message: unhook dbusmenu-qt,qt5 here as well
Re: UPDATE: GCC 8.4.0
Daniel wrote:
Finally, I thought I saw some message in dmesg on about invalid
syscalls or something \
like that on my end.
Check your /var/log/messages for "bogus syscall" by a program called
conftest. It
is a standard program name for multiple capability tests by ./configure
script. When
I rebuild gcc 8.3 on amd64 it seems to be provoked by this program from
configure:
__thread int a; int b; int main() { return a = b; }
tested several times. See also
https://marc.info/?l=openbsd-misc=159734095825159=2
FYI I also have see no stdout with code built with libgomp (unsupported
by OpenBSD) when
output is directed to a file, but not when piped, e.g.
./bad > file but ./good | cat > file.
I haven't reproduced this in a supported config (e.g. without OpenMP).
John
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2020/08/20 13:00:12 Modified files: www/chromium : Makefile distinfo www/chromium/patches: patch-third_party_swiftshader_src_System_SharedLibrary_hpp patch-third_party_swiftshader_third_party_marl_src_memory_cpp patch-third_party_swiftshader_third_party_marl_src_thread_cpp Added files: www/chromium/patches: patch-third_party_swiftshader_third_party_llvm-10_0_configs_linux_include_llvm_Config_config_h Removed files: www/chromium/patches: patch-third_party_swiftshader_third_party_llvm-7_0_configs_linux_include_llvm_Config_config_h Log message: update to 84.0.4147.135
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/08/20 12:01:47 Modified files: security/keepassxc: Makefile distinfo Removed files: security/keepassxc/patches: patch-docs_CMakeLists_txt Log message: Update keepassxc to 2.6.1 https://github.com/keepassxreboot/keepassxc/releases
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/08/20 12:00:16 Modified files: devel/kf5/khtml: Makefile devel/kf5/knotifyconfig: Makefile devel/quirks : Makefile devel/quirks/files: Quirks.pm editors/calligra: Makefile editors/kile : Makefile multimedia : Makefile multimedia/phonon: Makefile distinfo multimedia/phonon/pkg: DESCR PLIST multimedia/phonon-backend: Makefile Makefile.inc multimedia/phonon-backend/gstreamer: Makefile distinfo multimedia/phonon-backend/gstreamer/patches: patch-CMakeLists_txt multimedia/phonon-backend/vlc: Makefile distinfo multimedia/phonon-backend/vlc/pkg: PLIST net/konversation: Makefile net/ktorrent : Makefile x11/kde-applications/audiocd-kio: Makefile x11/kde-applications/blinken: Makefile x11/kde-applications/dolphin: Makefile x11/kde-applications/dragon: Makefile x11/kde-applications/gwenview: Makefile x11/kde-applications/juk: Makefile x11/kde-applications/kalarm: Makefile x11/kde-applications/kdepim-addons: Makefile x11/kde-applications/kio-extras: Makefile x11/kde-applications/klettres: Makefile x11/kde-applications/kmix: Makefile x11/kde-applications/kmousetool: Makefile x11/kde-applications/korganizer: Makefile x11/kde-applications/ksirk: Makefile x11/kde-applications/kwordquiz: Makefile x11/kde-applications/libkcompactdisc: Makefile x11/kde-applications/mailcommon: Makefile x11/kde-applications/marble: Makefile x11/kde-applications/okular: Makefile Added files: multimedia/phonon-backend/gstreamer/pkg: DESCR PLIST Removed files: multimedia/phonon: phonon.port.mk multimedia/phonon/patches: patch-CMakeLists_txt patch-cmake_CMakeLists_txt patch-cmake_FindPhononInternal_cmake patch-phonon_CMakeLists_txt patch-phonon_experimental_CMakeLists_txt multimedia/phonon-backend/gstreamer/pkg: DESCR-icons DESCR-main PFRAG.no-qt5-main PLIST-icons PLIST-main multimedia/phonon-backend/vlc/patches: patch-src_video_videodataoutput_cpp patch-src_video_videowidget_cpp multimedia/phonon-backend/vlc/pkg: PFRAG.no-qt5 multimedia/phonon-qt5: Makefile distinfo multimedia/phonon-qt5/patches: patch-CMakeLists_txt patch-cmake_CMakeLists_txt patch-cmake_FindPhononInternal_cmake patch-phonon_CMakeLists_txt patch-phonon_experimental_CMakeLists_txt multimedia/phonon-qt5/pkg: DESCR PLIST Log message: Rework multimedia/phonon multimedia/phonon-backend - Merge multimedia/phonon-qt5 into multimedia/phonon and remove the phonon MODULE. - Update all phonon ports to the latest version. - Regen all consumer WANTLIB's and bump them.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/08/20 11:58:57 Modified files: infrastructure/bin: portcheck Log message: Rework multimedia/phonon multimedia/phonon-backend - Remove infrastructure/bin/portcheck bits.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2020/08/20 11:32:37 Modified files: games/fs2open : Makefile Added files: games/fs2open/patches: patch-code_utils_boost_syncboundedqueue_h Log message: fix clang 10 build with try_lock -> try_to_lock; tested on amd64; GitHub PR #2672
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/08/20 10:40:47 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm devel/kf5/knotifications: Makefile x11/dbusmenu-qt: Makefile x11/dbusmenu-qt/pkg: PLIST x11/lxqt/panel : Makefile x11/lxqt/qtplugin: Makefile Log message: Remove Qt4 x11/dbusmenu-qt - Remove and add quirk for dbusmenu-qt (Qt4). - Set PKGNAME to dbusmenu-qt5 - Set conflict and pkgpath - bump all consumers
Re: [update] devel/py-simplejson -> 3.17.2
On 8/20/20 11:17 AM, Renaud Allard wrote: On 8/20/20 11:14 AM, Theo Buehler wrote: On Thu, Aug 20, 2020 at 11:01:30AM +0200, Renaud Allard wrote: Hello, Here is a proposed diff for py-simplejson to update it to the latest version. The diff looks good portswise and tests pass (with 6 skipped). Did you build its consumers and run tests? audio/fookebox net/seafile/client net/seafile/seafile net/synapse security/floss textproc/py-canonicaljson,python3 textproc/py-signedjson,python3 www/py-pylons www/weboob Currently, I tested textproc/py-canonicaljson which needs py-simplejson>3.4 to pass the tests, and synapse. "make test" ran fine with both seafile. smime.p7s Description: S/MIME Cryptographic Signature
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org 2020/08/20 10:24:41
Modified files:
devel/quirks : Makefile
devel/quirks/files: Quirks.pm
Log message:
Drop uim-{kde,qt,qt4}
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org 2020/08/20 10:21:17
Modified files:
inputmethods/uim: Makefile
inputmethods/uim/pkg: PLIST-gtk PLIST-gtk3 PLIST-main
Removed files:
inputmethods/uim/patches: patch-qt4_immodule_plugin_cpp
inputmethods/uim/pkg: DESCR-kde DESCR-qt DESCR-qt4 PLIST-kde
PLIST-qt PLIST-qt4
Log message:
Remove kde,qt,qt4 support
- Remove KDE3, Qt3 and QT4 support
- Fixed missing ${COMPILER_LIBCXX}
OK kn@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2020/08/20 09:12:58 Modified files: net/synapse: Makefile distinfo net/synapse/pkg: PLIST Log message: Update to synapse-1.19 Tests are now working properly except a few which require python libraries we don't have Diff from maintainer Renaud Allard
i386 ports build report
bulk build on i386.ports.openbsd.org started at 1597789551 Tue Aug 18 16:25:51 MDT 2020 finished at 1597934922 Thu Aug 20 08:48:42 MDT 2020 report generated at 1597934949 Thu Aug 20 08:49:09 MDT 2020 total 40h22m done with kern.version=OpenBSD 6.7-current (GENERIC.MP) #0: Tue Aug 18 08:25:04 MDT 2020 built packages10596 3568 1063 5964 build failures: 7 devel/cutter devel/geany devel/py-llvmlite games/fs2open geo/pgrouting productivity/aqbanking x11/worker new failures resolved failures packages newly built packages not built this time = ==> failures/devel/cutter.log <== [118/157] /pobj/cutter-1.11.1/bin/c++ -DCUTTER_ENABLE_GRAPHVIZ -DCUTTER_ENABLE_KSYNTAXHIGHLIGHTING -DCUTTER_ENABLE_PYTHON -DCUTTER_SOURCE_BUILD -DCutter_EXPORTS -DQT_CORE_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_NO_DEBUG -DQT_SVG_LIB -DQT_WIDGETS_LIB -I. -I/pobj/cutter-1.11.1/cutter-1.11.1/src -ICutter_autogen/include -I/usr/local/include/python3.8 -I/pobj/cutter-1.11.1/cutter-1.11.1/src/core -I/pobj/cutter-1.11.1/cutter-1.11.1/src/widgets -I/pobj/cutter-1.11.1/cutter-1.11.1/src/common -I/pobj/cutter-1.11.1/cutter-1.11.1/src/plugins -I/pobj/cutter-1.11.1/cutter-1.11.1/src/menus -I/pobj/cutter-1.11.1/cutter-1.11.1/src/. -isystem /usr/local/include/graphviz -isystem /usr/local/include/X11/qt5 -isystem /usr/local/include/X11/qt5/QtCore -isystem /usr/local/lib/qt5/./mkspecs/openbsd-clang -isystem /usr/local/include/X11/qt5/QtWidgets -isystem /usr/local/include/X11/qt5/QtGui -isystem /usr/X11R6/include -isystem /usr/local/include/X11/qt5/QtSvg -isystem /usr/local/include/X11/qt5/QtNetwork -isystem /usr/local/include/libr -isystem /usr/local/include/capstone -isystem /usr/local/include/KF5/KSyntaxHighlighting -isystem /usr/local/include/KF5 -isystem /usr/local/include -O2 -pipe -DNDEBUG -Wall -Wextra -fPIC -std=gnu++11 -MD -MT CMakeFiles/Cutter.dir/common/BasicBlockHighlighter.cpp.o -MF CMakeFiles/Cutter.dir/common/BasicBlockHighlighter.cpp.o.d -o CMakeFiles/Cutter.dir/common/BasicBlockHighlighter.cpp.o -c /pobj/cutter-1.11.1/cutter-1.11.1/src/common/BasicBlockHighlighter.cpp [119/157] /pobj/cutter-1.11.1/bin/c++ -DCUTTER_ENABLE_GRAPHVIZ -DCUTTER_ENABLE_KSYNTAXHIGHLIGHTING -DCUTTER_ENABLE_PYTHON -DCUTTER_SOURCE_BUILD -DCutter_EXPORTS -DQT_CORE_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_NO_DEBUG -DQT_SVG_LIB -DQT_WIDGETS_LIB -I. -I/pobj/cutter-1.11.1/cutter-1.11.1/src -ICutter_autogen/include -I/usr/local/include/python3.8 -I/pobj/cutter-1.11.1/cutter-1.11.1/src/core -I/pobj/cutter-1.11.1/cutter-1.11.1/src/widgets -I/pobj/cutter-1.11.1/cutter-1.11.1/src/common -I/pobj/cutter-1.11.1/cutter-1.11.1/src/plugins -I/pobj/cutter-1.11.1/cutter-1.11.1/src/menus -I/pobj/cutter-1.11.1/cutter-1.11.1/src/. -isystem /usr/local/include/graphviz -isystem /usr/local/include/X11/qt5 -isystem /usr/local/include/X11/qt5/QtCore -isystem /usr/local/lib/qt5/./mkspecs/openbsd-clang -isystem /usr/local/include/X11/qt5/QtWidgets -isystem /usr/local/include/X11/qt5/QtGui -isystem /usr/X11R6/include -isystem /usr/local/include/X11/qt5/QtSvg -isystem /usr/local/include/X11/qt5/QtNetwork -isystem /usr/local/include/libr -isystem /usr/local/include/capstone -isystem /usr/local/include/KF5/KSyntaxHighlighting -isystem /usr/local/include/KF5 -isystem /usr/local/include -O2 -pipe -DNDEBUG -Wall -Wextra -fPIC -std=gnu++11 -MD -MT CMakeFiles/Cutter.dir/common/BasicInstructionHighlighter.cpp.o -MF CMakeFiles/Cutter.dir/common/BasicInstructionHighlighter.cpp.o.d -o CMakeFiles/Cutter.dir/common/BasicInstructionHighlighter.cpp.o -c /pobj/cutter-1.11.1/cutter-1.11.1/src/common/BasicInstructionHighlighter.cpp [120/157] /pobj/cutter-1.11.1/bin/c++ -DCUTTER_ENABLE_GRAPHVIZ -DCUTTER_ENABLE_KSYNTAXHIGHLIGHTING -DCUTTER_ENABLE_PYTHON -DCUTTER_SOURCE_BUILD -DCutter_EXPORTS -DQT_CORE_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_NO_DEBUG -DQT_SVG_LIB -DQT_WIDGETS_LIB -I. -I/pobj/cutter-1.11.1/cutter-1.11.1/src -ICutter_autogen/include -I/usr/local/include/python3.8 -I/pobj/cutter-1.11.1/cutter-1.11.1/src/core -I/pobj/cutter-1.11.1/cutter-1.11.1/src/widgets -I/pobj/cutter-1.11.1/cutter-1.11.1/src/common -I/pobj/cutter-1.11.1/cutter-1.11.1/src/plugins -I/pobj/cutter-1.11.1/cutter-1.11.1/src/menus -I/pobj/cutter-1.11.1/cutter-1.11.1/src/. -isystem /usr/local/include/graphviz -isystem /usr/local/include/X11/qt5 -isystem /usr/local/include/X11/qt5/QtCore -isystem /usr/local/lib/qt5/./mkspecs/openbsd-clang -isystem /usr/local/include/X11/qt5/QtWidgets -isystem /usr/local/include/X11/qt5/QtGui -isystem /usr/X11R6/include -isystem /usr/local/include/X11/qt5/QtSvg -isystem /usr/local/include/X11/qt5/QtNetwork -isystem /usr/local/include/libr -isystem /usr/local/include/capstone -isystem /usr/local/include/KF5/KSyntaxHighlighting -isystem /usr/local/include/KF5 -isystem /usr/local/include -O2 -pipe -DNDEBUG -Wall -Wextra -fPIC -std=gnu++11 -MD -MT
UPDATE: security/heimdal
Hi ports,
This is my first patch submission.
I have made a patch to enable support for openldap as a backend for heimdal KDC.
With the KDC database in openldap it can now replicate to other hosts using
syncrepl, this avoids the need to setup iprop(8).
I have tested the patch on OpenBSD 6.7 and snapshots and so far everything
works.
With the patch heimdal now requires 'libldap.so' which is provided by
openldap-client.
I think the patch needs more work to be accepted. But I don't know if a flavor
should be add to heimdal or whether openldap-client should become a dependency,
or perhaps there is another solution.
Any feedback would be welcome.
sincerely,
Tiemen Werkman
--- /usr/ports/security/heimdal/MakefileWed Aug 19 19:09:35 2020
+++ MakefileWed Aug 19 19:09:15 2020
@@ -108,7 +108,8 @@
--sbindir=${PREFIX}/heimdal/sbin \
--libexecdir=${PREFIX}/heimdal/libexec \
--libdir=${PREFIX}/heimdal/lib \
- --includedir=${PREFIX}/heimdal/include
+ --includedir=${PREFIX}/heimdal/include \
+ --with-openldap=${LOCALBASE}
MAKE_ENV= INSTALL_CATPAGES=no
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2020/08/20 08:28:24 Modified files: textproc/miller: Makefile distinfo Log message: Update miller to 5.9.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/08/20 07:57:43 Modified files: net/icinga/web2: Tag: OPENBSD_6_7 Makefile distinfo Log message: security update to icinga-web2-2.7.4, possible path traversal when serving static image files https://github.com/Icinga/icingaweb2/issues/4226
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/08/20 07:54:55 Modified files: net/icinga/web2: Makefile distinfo Log message: security update to icinga-web2-2.8.2, possible path traversal when serving static image files https://github.com/Icinga/icingaweb2/issues/4226
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2020/08/20 07:31:17 Modified files: infrastructure/db: user.list Log message: Comment _ajaxterm user after www/ajaxterm removal Pointed out by danj@
Re: UPDATE: security/heimdal
On Thu, Aug 20, 2020 at 10:15:21AM +, Tiemen Werkman wrote:
> Hi ports,
>
> This is my first patch submission.
>
> I have made a patch to enable support for openldap as a backend for heimdal
> KDC.
> With the KDC database in openldap it can now replicate to other hosts using
> syncrepl, this avoids the need to setup iprop(8).
>
> I have tested the patch on OpenBSD 6.7 and snapshots and so far everything
> works.
>
> With the patch heimdal now requires 'libldap.so' which is provided by
> openldap-client.
>
> I think the patch needs more work to be accepted. But I don't know if a flavor
> should be add to heimdal or whether openldap-client should become a
> dependency,
> or perhaps there is another solution.
>
> Any feedback would be welcome.
You can make it a FLAVOR, yes.
But beware because we also have databases/openldap,gssapi that depends on
security/heimdal so you may need to work with bootstrap FLAVORs (which I am
still confused how they work, so I can't really help).
> sincerely,
> Tiemen Werkman
>
> --- /usr/ports/security/heimdal/MakefileWed Aug 19 19:09:35 2020
> +++ MakefileWed Aug 19 19:09:15 2020
> @@ -108,7 +108,8 @@
> --sbindir=${PREFIX}/heimdal/sbin \
> --libexecdir=${PREFIX}/heimdal/libexec \
> --libdir=${PREFIX}/heimdal/lib \
> - --includedir=${PREFIX}/heimdal/include
> + --includedir=${PREFIX}/heimdal/include \
> + --with-openldap=${LOCALBASE}
>
> MAKE_ENV= INSTALL_CATPAGES=no
>
--
Antoine
Re: [update] devel/py-simplejson -> 3.17.2
On 8/20/20 11:14 AM, Theo Buehler wrote: On Thu, Aug 20, 2020 at 11:01:30AM +0200, Renaud Allard wrote: Hello, Here is a proposed diff for py-simplejson to update it to the latest version. The diff looks good portswise and tests pass (with 6 skipped). Did you build its consumers and run tests? audio/fookebox net/seafile/client net/seafile/seafile net/synapse security/floss textproc/py-canonicaljson,python3 textproc/py-signedjson,python3 www/py-pylons www/weboob Currently, I tested textproc/py-canonicaljson which needs py-simplejson>3.4 to pass the tests, and synapse. smime.p7s Description: S/MIME Cryptographic Signature
Re: [update] devel/py-simplejson -> 3.17.2
On 8/20/20 11:01 AM, Renaud Allard wrote:
Hello,
Here is a proposed diff for py-simplejson to update it to the latest
version.
Regards
It seems that the PLIST is different between no FLAVOR and
FLAVOR=python3. I have no idea how to manage that, but the diff for
python3 looks like the one attached.
Index: Makefile
===
RCS file: /cvs/ports/devel/py-simplejson/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile 3 Jul 2020 21:12:49 - 1.33
+++ Makefile 20 Aug 2020 09:16:05 -
@@ -2,10 +2,9 @@
COMMENT = JSON encoder/decoder
-MODPY_EGG_VERSION = 3.11.1
+MODPY_EGG_VERSION = 3.17.2
DISTNAME = simplejson-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 2
CATEGORIES = devel
Index: distinfo
===
RCS file: /cvs/ports/devel/py-simplejson/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo 20 Jun 2017 21:27:07 - 1.15
+++ distinfo 20 Aug 2020 09:16:05 -
@@ -1,2 +1,2 @@
-SHA256 (simplejson-3.11.1.tar.gz) = AaItSd3ZoWixNvJsrIfZozVmDOB6pcYwuONgfW9DJec=
-SIZE (simplejson-3.11.1.tar.gz) = 78145
+SHA256 (simplejson-3.17.2.tar.gz) = dezHnybZkiKghPvdHOWq06w6i9U1zZBZUoRS2ji2iEE=
+SIZE (simplejson-3.17.2.tar.gz) = 83210
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-simplejson/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- pkg/PLIST 2 Nov 2016 17:57:36 - 1.11
+++ pkg/PLIST 20 Aug 2020 09:16:05 -
@@ -11,14 +11,18 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/simplejson/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/simplejson/${MODPY_PYCACHE}decoder.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/simplejson/${MODPY_PYCACHE}encoder.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/simplejson/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/simplejson/${MODPY_PYCACHE}ordered_dict.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/simplejson/${MODPY_PYCACHE}raw_json.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/simplejson/${MODPY_PYCACHE}scanner.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/simplejson/${MODPY_PYCACHE}tool.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/simplejson/_speedups.so
+@so lib/python${MODPY_VERSION}/site-packages/simplejson/_speedups.so
lib/python${MODPY_VERSION}/site-packages/simplejson/compat.py
lib/python${MODPY_VERSION}/site-packages/simplejson/decoder.py
lib/python${MODPY_VERSION}/site-packages/simplejson/encoder.py
+lib/python${MODPY_VERSION}/site-packages/simplejson/errors.py
lib/python${MODPY_VERSION}/site-packages/simplejson/ordered_dict.py
+lib/python${MODPY_VERSION}/site-packages/simplejson/raw_json.py
lib/python${MODPY_VERSION}/site-packages/simplejson/scanner.py
lib/python${MODPY_VERSION}/site-packages/simplejson/tests/
lib/python${MODPY_VERSION}/site-packages/simplejson/tests/__init__.py
smime.p7s
Description: S/MIME Cryptographic Signature
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/08/20 07:14:10 Modified files: devel/pango: Makefile distinfo Log message: Update to pango-1.46.1.
[update] devel/py-simplejson -> 3.17.2
Hello,
Here is a proposed diff for py-simplejson to update it to the latest
version.
Regards
Index: Makefile
===
RCS file: /cvs/ports/devel/py-simplejson/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile 3 Jul 2020 21:12:49 - 1.33
+++ Makefile 20 Aug 2020 08:55:44 -
@@ -2,10 +2,9 @@
COMMENT = JSON encoder/decoder
-MODPY_EGG_VERSION = 3.11.1
+MODPY_EGG_VERSION = 3.17.2
DISTNAME = simplejson-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 2
CATEGORIES = devel
Index: distinfo
===
RCS file: /cvs/ports/devel/py-simplejson/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo 20 Jun 2017 21:27:07 - 1.15
+++ distinfo 20 Aug 2020 08:55:44 -
@@ -1,2 +1,2 @@
-SHA256 (simplejson-3.11.1.tar.gz) = AaItSd3ZoWixNvJsrIfZozVmDOB6pcYwuONgfW9DJec=
-SIZE (simplejson-3.11.1.tar.gz) = 78145
+SHA256 (simplejson-3.17.2.tar.gz) = dezHnybZkiKghPvdHOWq06w6i9U1zZBZUoRS2ji2iEE=
+SIZE (simplejson-3.17.2.tar.gz) = 83210
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-simplejson/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- pkg/PLIST 2 Nov 2016 17:57:36 - 1.11
+++ pkg/PLIST 20 Aug 2020 08:55:44 -
@@ -8,80 +8,84 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/simplejson/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/simplejson/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/simplejson/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/simplejson/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/simplejson/${MODPY_PYCACHE}decoder.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/simplejson/${MODPY_PYCACHE}encoder.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/simplejson/${MODPY_PYCACHE}ordered_dict.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/simplejson/${MODPY_PYCACHE}scanner.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/simplejson/${MODPY_PYCACHE}tool.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/simplejson/_speedups.so
+@so lib/python${MODPY_VERSION}/site-packages/simplejson/_speedups.so
lib/python${MODPY_VERSION}/site-packages/simplejson/compat.py
+lib/python${MODPY_VERSION}/site-packages/simplejson/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/simplejson/decoder.py
+lib/python${MODPY_VERSION}/site-packages/simplejson/${MODPY_PYCACHE}decoder.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/simplejson/encoder.py
+lib/python${MODPY_VERSION}/site-packages/simplejson/${MODPY_PYCACHE}encoder.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/simplejson/errors.py
+lib/python${MODPY_VERSION}/site-packages/simplejson/errors.pyc
lib/python${MODPY_VERSION}/site-packages/simplejson/ordered_dict.py
+lib/python${MODPY_VERSION}/site-packages/simplejson/${MODPY_PYCACHE}ordered_dict.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/simplejson/raw_json.py
+lib/python${MODPY_VERSION}/site-packages/simplejson/raw_json.pyc
lib/python${MODPY_VERSION}/site-packages/simplejson/scanner.py
+lib/python${MODPY_VERSION}/site-packages/simplejson/${MODPY_PYCACHE}scanner.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/simplejson/tests/
lib/python${MODPY_VERSION}/site-packages/simplejson/tests/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/simplejson/tests/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/simplejson/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/simplejson/tests/${MODPY_PYCACHE}test_bigint_as_string.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/simplejson/tests/${MODPY_PYCACHE}test_bitsize_int_as_string.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/simplejson/tests/${MODPY_PYCACHE}test_check_circular.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/simplejson/tests/${MODPY_PYCACHE}test_decimal.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/simplejson/tests/${MODPY_PYCACHE}test_decode.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/simplejson/tests/${MODPY_PYCACHE}test_default.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/simplejson/tests/${MODPY_PYCACHE}test_dump.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/simplejson/tests/${MODPY_PYCACHE}test_encode_basestring_ascii.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/simplejson/tests/${MODPY_PYCACHE}test_encode_for_html.${MODPY_PYC_MAGIC_TAG}pyc
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2020/08/20 06:57:58 Modified files: textproc/py-canonicaljson: Makefile distinfo Log message: Update to py-canonicaljson-1.3.0 Diff from maintainer Renaud Allard
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2020/08/20 06:55:13 Modified files: devel/py-simplejson: Makefile distinfo devel/py-simplejson/pkg: PLIST Log message: Update to py-simplejson-3.17.2 Consumers all tested and working ok sthen@ tb@
Re: Remove kde,qt,qt4 support in inputmethods/uim
On Thu, Aug 20, 2020 at 06:13:45AM +0200, Rafael Sadowski wrote:
> I would like remove KDE3, Qt3 and Qt4 support in uim. I do not use it,
> nor do I know what to do with it. We are on the way to end the support
> for qt3 and qt4.
>
> Cause I'm here, fixed missing ${COMPILER_LIBCXX}
>
> OK?
Looks good to me, OK kn.
What about a quirk for these?
Re: update games/minetest to 5.3.0
On Wed, Aug 19, 2020 at 10:25:54AM +0200, Sebastien Marie wrote:
> Hi,
>
> Here an update of games/minetest to 5.3.0 (released on 9 July 2020).
>
> Tested on amd64 with minetest-game (included in the port).
>
New diff.
It seems the detection of luajit doesn't work well currently (it is already the
case with current version in ports): it is lua which was used instead of
expected luajit. I spent some time to understand the problem and finally give
up (cmake is hard)... So the updated diff explicitly avoids luajit and link to
lua.
It should enable the build on more platforms, as the dependency on lang/luajit
is removed.
While here, I also link to jsoncpp version from ports instead of embedded
version.
And also added a test target which runs units tests. I disabled
TestThreading::testThreadKill test as it is abording the test run (it was
already the case with previous version): it tries to unlock an unlocked mutex.
Now, only 1 test fails (on 205):
Test assertion failed: utf8_to_wide(wrap_rows(str, 20)) != L""
at test_utilities.cpp:338
[FAIL] testWrapRows - 1ms
Built and tested on amd64, and build only on sparc64.
Comments or OK ?
--
Sebastien Marie
diff 84d72dabc0d940d2f64f068796bb6357ec970260 /home/semarie/repos/openbsd/ports
blob - 5415e8ba5ddae17e655a540b695046f754bb09b1
file + games/minetest/Makefile
--- games/minetest/Makefile
+++ games/minetest/Makefile
@@ -1,22 +1,19 @@
# $OpenBSD: Makefile,v 1.31 2020/05/26 20:01:01 rsadowski Exp $
COMMENT = infinite-world block sandbox game
-# minetest_game is still 0.4.17
-# this is engine's bug fix release
-GAME_V = 0.4.17
-V =${GAME_V}.1
+GAME_V = 5.3.0
+V =${GAME_V}
DISTNAME = minetest-${V}
CATEGORIES = games x11
-REVISION = 5
-HOMEPAGE = http://www.minetest.net/
+HOMEPAGE = https://www.minetest.net/
# source LGPLv2.1/ datas CC BY-SA 3.0
PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} GL GLU ICE Irrlicht SM X11 Xext
WANTLIB += Xxf86vm bz2 c curl curses form freetype gmp iconv intl
-WANTLIB += jpeg luajit-${MODLUA_VERSION} m ogg openal png pq
+WANTLIB += jsoncpp jpeg ${MODLUA_WANTLIB} m ogg openal png pq
WANTLIB += spatialindex sqlite3 vorbis vorbisfile z
COMPILER = base-clang ports-gcc base-gcc
@@ -31,6 +28,7 @@ MODULES = devel/cmake \
CONFIGURE_ARGS = -DENABLE_GETTEXT=ON -DCUSTOM_MANDIR=${PREFIX}/man
CONFIGURE_ARGS+= -DENABLE_REDIS=FALSE -DENABLE_LEVELDB=FALSE
+CONFIGURE_ARGS+= -DENABLE_SYSTEM_JSONCPP=TRUE -DENABLE_LUAJIT=FALSE
CONFIGURE_ARGS+= -DBUILD_SERVER=TRUE
CONFIGURE_ENV += CXXFLAGS="-I${X11BASE}/include"
@@ -39,25 +37,32 @@ BUILD_DEPENDS = devel/gettext,-tools
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+3,-guic
-LIB_DEPENDS = audio/openal \
+LIB_DEPENDS = ${MODLUA_LIB_DEPENDS} \
+ audio/openal \
+ devel/jsoncpp \
devel/gmp \
databases/sqlite3 \
databases/postgresql \
geo/spatialindex \
audio/libvorbis \
- lang/luajit \
net/curl \
x11/irrlicht
-NO_TEST = Yes
+TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH}
+TEST_ENV +=HOME=${WRKBUILD}/test
# Use system cmake modules
-pre-configure:
+post-patch:
rm ${WRKSRC}/cmake/Modules/FindLua*
post-install:
mv ${WRKDIR}/minetest_game-${GAME_V}/ \
- ${PREFIX}/share/minetest/games/minetest_game
+ ${PREFIX}/share/minetest/games/minetest_game
chown -R ${SHAREOWN}:${SHAREGRP}
${PREFIX}/share/minetest/games/minetest_game
+
+do-test:
+ mkdir -p ${WRKBUILD}/test
+ cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} ${TEST_ENV} \
+ ${LOCALBASE}/bin/minetest --run-unittests
.include
blob - cec609b94f22a71694a14c6c22fe49a4cc7c984a
file + games/minetest/distinfo
--- games/minetest/distinfo
+++ games/minetest/distinfo
@@ -1,4 +1,4 @@
-SHA256 (minetest-0.4.17.1.tar.gz) =
zSXUDFP0kjJe2r0vY5clD0CmHLn+Sh1N1usDDg0c61k=
-SHA256 (minetest-game-0.4.17.tar.gz) =
8KsHy0fBVAsgFr92o24u7Ciw6ngnv2b8VEfgxeXUSV0=
-SIZE (minetest-0.4.17.1.tar.gz) = 7758675
-SIZE (minetest-game-0.4.17.tar.gz) = 1356784
+SHA256 (minetest-5.3.0.tar.gz) = ZdwgSfJMk/pURQDzEKYeKJwbj6R79gh3t0aiwnpyONY=
+SHA256 (minetest-game-5.3.0.tar.gz) =
BsbB1Ll68hHdD6UYo+aKIF9ZTpgWpLJHfkjU0h0nji0=
+SIZE (minetest-5.3.0.tar.gz) = 10828893
+SIZE (minetest-game-5.3.0.tar.gz) = 1904865
blob - 5a57080640b59dc1a313e901c1234525ffd8aa60
file + /dev/null
--- games/minetest/patches/patch-cmake_Modules_FindGMP_cmake
+++ games/minetest/patches/patch-cmake_Modules_FindGMP_cmake
@@ -1,16 +0,0 @@
-$OpenBSD:
[update] biology/bioperl (and related ports)
Hi,
Our current bioperl related ports are old, and we had to patch
them already to deal with Perl changes. So i'm proposing an update here
to 1.7.7 to avoid dealing with emergency fixes at a large scale.
These updates and new ports will not totally replace what bioperl used
to provide, see [0] for an exhaustive list of what it implies.
There are backward incompatibilities, and a lot of inter dependencies,
so you need all these ports at once, since bioperl has been split in
many modules. This also means that conflict markers had to be sprinkled
around, as hinted by update-plist(1).
Updates are in the diff below, new ports are attached.
biology/bioperl => PASS
biology/p5-Bio-ASN1-EntrezGene => PASS
biology/p5-Bio-Cluster => NEW, PASS
biology/p5-Bio-Variation=> NEW, PASS
biology/p5-Bio-DB-NCBIHelper=> NEW, PASS, NETWORK
biology/p5-Bio-DB-EMBL => NEW, PASS, NETWORK
(NETWORK ones requires network for testing if you use PORTS_PRIVSEP)
There are no other ports depending on bioperl.
Comments/feedback are welcome,
Charlène.
[0] https://metacpan.org/changes/distribution/BioPerl#L71
Index: bioperl/Makefile
===
RCS file: /cvs/ports/biology/bioperl/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- bioperl/Makefile12 Jul 2019 20:43:43 - 1.21
+++ bioperl/Makefile20 Aug 2020 10:11:28 -
@@ -2,68 +2,51 @@
COMMENT= perl tools for bioinformatics
-DISTNAME= BioPerl-1.6.924
-REVISION= 1
+DISTNAME= BioPerl-1.7.7
PKGNAME= ${DISTNAME:L}# No p5-prefix here.
CATEGORIES=biology
HOMEPAGE= https://bioperl.org/
-# perl
+# Perl
PERMIT_PACKAGE=Yes
-CPAN_AUTHOR= CJFIELDS
-
MODULES= cpan
-PKG_ARCH= *
+
+CPAN_AUTHOR= CJFIELDS
MODCPAN_EXAMPLES= Yes
MODCPAN_EXAMPLES_DIR= ${PREFIX}/share/examples/bioperl/
-CONFIGURE_STYLE= modbuild
+RUN_DEPENDS= devel/p5-Data-Stag \
+ devel/p5-Error \
+ devel/p5-Graph \
+ devel/p5-IO-String \
+ devel/p5-IO-stringy \
+ devel/p5-IPC-Run \
+ devel/p5-List-MoreUtils \
+ devel/p5-Module-Build \
+ devel/p5-Set-Scalar \
+ devel/p5-Test-Most \
+ devel/p5-Test-RequiresInternet \
+ devel/p5-YAML \
+ textproc/p5-Libxml \
+ textproc/p5-XML-DOM \
+ textproc/p5-XML-DOM-XPath \
+ textproc/p5-XML-LibXML \
+ textproc/p5-XML-SAX \
+ textproc/p5-XML-SAX-Base \
+ textproc/p5-XML-SAX-Writer \
+ textproc/p5-XML-Twig \
+ textproc/p5-XML-Writer \
+ www/p5-HTTP-Message \
+ www/p5-URI \
+ www/p5-libwww
+TEST_DEPENDS= devel/p5-Test-Memory-Cycle \
+ devel/p5-Test-Weaken
-BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= biology/AcePerl \
- databases/p5-DBD-mysql \
- converters/p5-Convert-Binary-C \
- devel/p5-Algorithm-Munkres \
- devel/p5-Array-Compare \
- devel/p5-Class-AutoClass \
- devel/p5-Clone \
- devel/p5-Data-Stag \
- devel/p5-Graph \
- devel/p5-IO-String \
- devel/p5-IO-stringy \
- devel/p5-Set-Scalar \
- devel/p5-Test-Exception \
- devel/p5-Tree-DAG_Node \
- graphics/p5-GD \
- graphics/p5-GD-SVG \
- graphics/p5-SVG-Graph \
- math/p5-GraphViz \
- misc/p5-Spreadsheet-ParseExcel \
- misc/p5-Spreadsheet-WriteExcel \
- textproc/p5-XML-DOM \
- textproc/p5-Libxml \
- textproc/p5-XML-DOM-XPath \
- textproc/p5-XML-Parser \
- textproc/p5-XML-SAX-Writer \
- textproc/p5-XML-Simple \
- textproc/p5-XML-Twig \
- textproc/p5-XML-Writer \
- www/p5-CGI \
- www/p5-HTML-Parser \
- www/p5-SOAP-Lite \
- www/p5-URI \
- www/p5-libwww
-TEST_DEPENDS= devel/p5-Test-Most \
- www/p5-HTML-TableExtract
-
-MAKE_ENV +=TEST_POD=Yes
-
-# Optional (not ported) dependencies:
-# Postscript-TextBlock
-# Tie-Cacher
-CONFIGURE_ENV+=PERL_MM_USE_DEFAULT=Yes
+MAKE_ENV +=TEST_POD=Yes
+
+PKG_ARCH= *
.include
Index: bioperl/distinfo
===
RCS file:
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/08/20 04:17:42 Modified files: net/unifi/testing: Makefile distinfo net/unifi/testing/pkg: PLIST Log message: switch unifi/testing to 6.0.13 (public release candidate) with a new rebuilt snappy-java jar file (it includes native components which need rebuilding for OpenBSD when it's updated) this is working for me but forum feedback is rather mixed, you usually want to make sure you have a backup for unifi updates anyway, but it looks like it's more important than usual for this one. (it is of course a *testing* version).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/08/20 03:46:16 Modified files: net/unifi : Tag: OPENBSD_6_7 Makefile.inc net/unifi/lts : Tag: OPENBSD_6_7 Makefile net/unifi/stable: Tag: OPENBSD_6_7 Makefile net/unifi/testing: Tag: OPENBSD_6_7 Makefile distinfo net/unifi/testing/pkg: Tag: OPENBSD_6_7 PLIST Log message: update unifi/testing in 6.7-stable to the newest version in the 5.13 branch that it's using (now a release rather than a test version).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/08/20 03:47:04 Modified files: net/unifi/testing: Tag: OPENBSD_6_7 distinfo Log message: fix
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/08/20 03:32:38 Modified files: net/unifi/stable: Makefile distinfo net/unifi/stable/pkg: PLIST Log message: update unifi/stable to 5.14.22 (new branch)
Re: [update] devel/py-simplejson -> 3.17.2
On Thu, Aug 20, 2020 at 11:16:24AM +0200, Renaud Allard wrote: > > > On 8/20/20 11:01 AM, Renaud Allard wrote: > > Hello, > > > > Here is a proposed diff for py-simplejson to update it to the latest > > version. > > > > Regards > > It seems that the PLIST is different between no FLAVOR and FLAVOR=python3. I > have no idea how to manage that, but the diff for python3 looks like the one > attached. Bah, thanks. I made a mistake when I compared your diff with my run of make update-plist, sorry. You should always run it with FLAVOR=python3. If you don't you get this warning: *** WARNING: running update-plist without FLAVOR=python3
Re: [update] devel/py-simplejson -> 3.17.2
On 2020/08/20 11:16, Renaud Allard wrote:
>
>
> On 8/20/20 11:01 AM, Renaud Allard wrote:
> > Hello,
> >
> > Here is a proposed diff for py-simplejson to update it to the latest
> > version.
> >
> > Regards
>
> It seems that the PLIST is different between no FLAVOR and FLAVOR=python3. I
> have no idea how to manage that, but the diff for python3 looks like the one
> attached.
The python3 one works for both py2 and py3.
Very occasionally with some ports there are different sets of installed
files for 2/3 but not in the case, they're just in different directories
and with different suffixes which are handled by the MODPY_PYCACHE,
MODPY_PYC_MAGIC_TAG, MODPY_VERSION, MODPY_COMMENT variables.
If this gets a bit more testing of dependent ports then it's OK with me.
> ===
> RCS file: /cvs/ports/devel/py-simplejson/Makefile,v
> retrieving revision 1.33
> diff -u -p -r1.33 Makefile
> --- Makefile 3 Jul 2020 21:12:49 - 1.33
> +++ Makefile 20 Aug 2020 09:16:05 -
> @@ -2,10 +2,9 @@
>
> COMMENT =JSON encoder/decoder
>
> -MODPY_EGG_VERSION = 3.11.1
> +MODPY_EGG_VERSION = 3.17.2
> DISTNAME = simplejson-${MODPY_EGG_VERSION}
> PKGNAME =py-${DISTNAME}
> -REVISION = 2
>
> CATEGORIES = devel
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/py-simplejson/distinfo,v
> retrieving revision 1.15
> diff -u -p -r1.15 distinfo
> --- distinfo 20 Jun 2017 21:27:07 - 1.15
> +++ distinfo 20 Aug 2020 09:16:05 -
> @@ -1,2 +1,2 @@
> -SHA256 (simplejson-3.11.1.tar.gz) =
> AaItSd3ZoWixNvJsrIfZozVmDOB6pcYwuONgfW9DJec=
> -SIZE (simplejson-3.11.1.tar.gz) = 78145
> +SHA256 (simplejson-3.17.2.tar.gz) =
> dezHnybZkiKghPvdHOWq06w6i9U1zZBZUoRS2ji2iEE=
> +SIZE (simplejson-3.17.2.tar.gz) = 83210
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/devel/py-simplejson/pkg/PLIST,v
> retrieving revision 1.11
> diff -u -p -r1.11 PLIST
> --- pkg/PLIST 2 Nov 2016 17:57:36 - 1.11
> +++ pkg/PLIST 20 Aug 2020 09:16:05 -
> @@ -11,14 +11,18 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/simplejson/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/simplejson/${MODPY_PYCACHE}decoder.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/simplejson/${MODPY_PYCACHE}encoder.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/simplejson/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/simplejson/${MODPY_PYCACHE}ordered_dict.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/simplejson/${MODPY_PYCACHE}raw_json.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/simplejson/${MODPY_PYCACHE}scanner.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/simplejson/${MODPY_PYCACHE}tool.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/simplejson/_speedups.so
> +@so lib/python${MODPY_VERSION}/site-packages/simplejson/_speedups.so
> lib/python${MODPY_VERSION}/site-packages/simplejson/compat.py
> lib/python${MODPY_VERSION}/site-packages/simplejson/decoder.py
> lib/python${MODPY_VERSION}/site-packages/simplejson/encoder.py
> +lib/python${MODPY_VERSION}/site-packages/simplejson/errors.py
> lib/python${MODPY_VERSION}/site-packages/simplejson/ordered_dict.py
> +lib/python${MODPY_VERSION}/site-packages/simplejson/raw_json.py
> lib/python${MODPY_VERSION}/site-packages/simplejson/scanner.py
> lib/python${MODPY_VERSION}/site-packages/simplejson/tests/
> lib/python${MODPY_VERSION}/site-packages/simplejson/tests/__init__.py
Re: [update] devel/py-simplejson -> 3.17.2
On Thu, Aug 20, 2020 at 11:01:30AM +0200, Renaud Allard wrote: > Hello, > > Here is a proposed diff for py-simplejson to update it to the latest > version. The diff looks good portswise and tests pass (with 6 skipped). Did you build its consumers and run tests? audio/fookebox net/seafile/client net/seafile/seafile net/synapse security/floss textproc/py-canonicaljson,python3 textproc/py-signedjson,python3 www/py-pylons www/weboob
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/08/20 03:00:16 Modified files: textproc/mupdf : Makefile textproc/mupdf/patches: patch-source_tools_pdfextract_c Log message: mupdf: string.h needed for pledge error. from Martin Vahlensieck
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/08/20 02:19:46 Modified files: x11/mate/marco : distinfo Log message: Wrong distinfo.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/08/20 01:57:48 Modified files: net/py-botocore: Makefile distinfo net/py-botocore/pkg: PLIST Log message: Update to py3-botocore-1.17.46.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/08/20 01:58:00 Modified files: net/py-boto3 : Makefile distinfo Log message: Update to py3-boto3-1.14.46.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/08/20 01:58:12 Modified files: sysutils/awscli: Makefile distinfo Log message: Update to awscli-1.18.123.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2020/08/20 01:18:40 Modified files: games/rocksndiamonds: Makefile distinfo games/rocksndiamonds/pkg: PLIST Log message: Update to rocksndiamonds-4.2.0.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2020/08/20 01:02:29 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Register ajaxterm as old and abandoned upstream
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2020/08/20 01:01:03 Modified files: www: Makefile Removed files: www/ajaxterm : Makefile distinfo www/ajaxterm/patches: patch-ajaxterm_css patch-ajaxterm_py www/ajaxterm/pkg: DESCR MESSAGE PLIST ajaxterm.rc Log message: Removing ajaxterm Old and abandoned network software ok bket@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2020/08/20 00:50:33 Modified files: mail/claws-mail: Makefile distinfo mail/claws-mail/pkg: PLIST-main Added files: mail/claws-mail/patches: patch-src_plugins_spamassassin_spamassassin_gtk_c Log message: Update to 3.17.6 Backport a patch to increase spamassassin plugin maximum file size in the GUI parameters
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2020/08/20 00:40:19 Modified files: x11/mate/caja-extensions: Makefile distinfo x11/mate/calc : Makefile distinfo x11/mate/control-center: Makefile distinfo x11/mate/control-center/pkg: PLIST x11/mate/desktop: Makefile distinfo x11/mate/desktop/pkg: PLIST x11/mate/engrampa: Makefile distinfo x11/mate/engrampa/pkg: PLIST x11/mate/eom : Makefile distinfo x11/mate/libmatekbd: Makefile distinfo x11/mate/libmatekbd/pkg: PLIST x11/mate/libmatemixer: Makefile distinfo x11/mate/libmateweather: Makefile distinfo x11/mate/marco : Makefile x11/mate/terminal: Makefile distinfo x11/mate/terminal/pkg: PLIST Log message: update to 1.24.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2020/08/20 00:39:58 Modified files: x11/mate/power-manager: Makefile distinfo Log message: update to 1.24.2
