CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/06/12 23:51:43 Log message: Import akonadi-contacts-19.12.3 Comment: PIM Akonadi contacts support library Description: Akonadi Contacts is a library that effectively bridges the type-agnostic API of the Akonadi client libraries and the domain-specific KContacts library. It provides jobs, models and other helpers to make working with contacts and addressbooks through Akonadi easier. The library provides a complex dialog for editing contacts and several models to list and filter contacts. Maintainer: Rafael Sadowski Status: Vendor Tag: rsadowski Release Tags: rsadowski_20200613 N ports/x11/kde-applications/akonadi-contacts/Makefile N ports/x11/kde-applications/akonadi-contacts/distinfo N ports/x11/kde-applications/akonadi-contacts/pkg/DESCR N ports/x11/kde-applications/akonadi-contacts/pkg/PLIST No conflicts created by this import
Can't load extensions with postgresql-server
Hi,
Does the OpenBSD require some extra steps for loading postgresql server
extensions?
tmy@asteroid tmy $ psql -d jemma -U postgres
Password for user postgres:
psql (12.3)
Type "help" for help.
jemma=# create extension pgcrypto;
ERROR: could not load library "/usr/local/lib/postgresql/pgcrypto.so": Cannot
load specified object
jemma=# \du
List of roles
Role name | Attributes |
Member of
---++---
jemma || {}
postgres | Superuser, Create role, Create DB, Replication, Bypass RLS | {}
jemma=# \q
tmy@asteroid tmy $ ldd /usr/local/lib/postgresql/pgcrypto.so
/usr/local/lib/postgresql/pgcrypto.so:
StartEnd Type Open Ref GrpRef Name
168b6def7000 168b6df2e000 dlib 10 0
/usr/local/lib/postgresql/pgcrypto.so
168b2cbea000 168b2ccde000 rlib 01 0
/usr/lib/libc.so.95.1
168b9df22000 168b9e141000 rlib 01 0
/usr/lib/libcrypto.so.45.5
168b35403000 168b3541e000 rlib 01 0
/usr/lib/libz.so.5.0
tmy@asteroid tmy $ ls -l /usr/lib/libc.so.95.1 /usr/lib/libcrypto.so.45.5
/usr/lib/libz.so.5.0
-r--r--r-- 1 root bin 3564664 Oct 25 2019 /usr/lib/libc.so.95.1
-r--r--r-- 1 root bin 7188496 Oct 25 2019 /usr/lib/libcrypto.so.45.5
-r--r--r-- 1 root bin 239960 Jun 9 03:23 /usr/lib/libz.so.5.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/06/12 23:29:56 Log message: Import akonadi-19.12.3 Comment: PIM Storage Service Description: Akonadi is a PIM layer, which provides an asynchronous API to access all kind of PIM data (e.g. mails, contacts, events, todos etc.). It consists of several processes (generally called the Akonadi server) and a library (called client library) which encapsulates the communication between the client and the server. Maintainer: Rafael Sadowski WWW: https://kontact.kde.org/ Status: Vendor Tag: rsadowski Release Tags: rsadowski_20200613 N ports/x11/kde-applications/akonadi/Makefile N ports/x11/kde-applications/akonadi/PLIST N ports/x11/kde-applications/akonadi/distinfo N ports/x11/kde-applications/akonadi/pkg/DESCR N ports/x11/kde-applications/akonadi/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/06/12 23:04:13 Log message: Import konqueror-19.12.3 Comment: KDE File Manager & Web Browser Description: Konqueror is KDE's Webbrowser and swiss-army-knife for any kind of file-management and file previewing. Features: - Webbrowsing using Qt WebEngine as rendering engines - File management using most of Dolphin's features (including version-control, service menus and the basic UI) - File management on ftp and sftp servers - Full featured FTP-client (you can split views to display local and remote folders and previews in the same window) - Embedded applications to preview files (e.g. Okular and Calligra for documents, Gwenview for pictures, KTextEditor for text-files) - Different kinds of plugins: Service-menus, KParts (embedded applications), KIO (accessing files using special protocols like http or ftp) and KPart-plugins (like AdBlocker...) Maintainer: Rafael Sadowski Status: Vendor Tag: rsadowski Release Tags: rsadowski_20200613 N ports/x11/kde-applications/konqueror/Makefile N ports/x11/kde-applications/konqueror/distinfo N ports/x11/kde-applications/konqueror/pkg/DESCR N ports/x11/kde-applications/konqueror/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/06/12 22:50:31 Modified files: audio/musique : Makefile Log message: Add mpv as missing library dependency, spotted by sthen@ Thanks!
devel/llvm: Mips, PowerPC changes from base-clang
For ports/devel/llvm, I would like to bring the most recent changes
from base-clang. This affects Mips and PowerPC. Is this OK?
Mips gets, "Use a distinct trap code with retguard on mips64."
(I use PowerPC and know little about Mips.)
PowerPC gets,
- Set max atomic size for AtomicExpandPass.
- For OpenBSD/powerpc64: switch to ELFv2, use _mcount profiling, and
add our OpenBSD specific defines.
- Optimize away the frame pointer.
Upstream LLVM already optimizes away the frame pointer on PowerPC, but
doesn't have the other changes. At least one patch in tools/clang
affects both clang and liblldb, so I bump both REVISION-main and
REVISION-lldb.--George
Index: Makefile
===
RCS file: /cvs/ports/devel/llvm/Makefile,v
retrieving revision 1.252
diff -u -p -r1.252 Makefile
--- Makefile19 May 2020 10:05:47 - 1.252
+++ Makefile13 Jun 2020 03:37:24 -
@@ -18,9 +18,9 @@ PKGSPEC-main =llvm-=${LLVM_V}
PKGNAME-main = llvm-${LLVM_V}
PKGNAME-python = py3-llvm-${LLVM_V}
PKGNAME-lldb = lldb-${LLVM_V}
-REVISION-main =13
+REVISION-main =14
REVISION-python = 1
-REVISION-lldb =2
+REVISION-lldb =3
CATEGORIES = devel
Index: patches/patch-lib_Target_Mips_MipsReturnProtectorLowering_cpp
===
RCS file:
/cvs/ports/devel/llvm/patches/patch-lib_Target_Mips_MipsReturnProtectorLowering_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-lib_Target_Mips_MipsReturnProtectorLowering_cpp
--- patches/patch-lib_Target_Mips_MipsReturnProtectorLowering_cpp 7 Jan
2020 22:59:43 - 1.1
+++ patches/patch-lib_Target_Mips_MipsReturnProtectorLowering_cpp 13 Jun
2020 03:37:24 -
@@ -5,7 +5,7 @@ Add retguard for octeon/mips64.
Index: lib/Target/Mips/MipsReturnProtectorLowering.cpp
--- lib/Target/Mips/MipsReturnProtectorLowering.cpp.orig
+++ lib/Target/Mips/MipsReturnProtectorLowering.cpp
-@@ -0,0 +1,272 @@
+@@ -0,0 +1,273 @@
+//===-- MipsReturnProtectorLowering.cpp ===//
+//
+// The LLVM Compiler Infrastructure
@@ -119,6 +119,7 @@ Index: lib/Target/Mips/MipsReturnProtect
+ unsigned REG = MF.getFrameInfo().getReturnProtectorRegister();
+
+ const GlobalValue *FName = ();
++ const unsigned TRAPCODE = 0x52;
+
+ // Select some scratch registers
+ unsigned TempReg1 = Mips::T7_64;
@@ -177,7 +178,7 @@ Index: lib/Target/Mips/MipsReturnProtect
+BuildMI(MBB, MI, MBBDL, TII->get(Mips::TNE))
+ .addReg(TempReg1)
+ .addReg(REG)
-+ .addImm(0);
++ .addImm(TRAPCODE);
+// Emit the BAL target symbol from above
+BuildMI(MBB, MI, MBBDL, TII->get(Mips::RETGUARD_EMIT_SYMBOL))
+ .addSym(BALTarget);
@@ -204,7 +205,7 @@ Index: lib/Target/Mips/MipsReturnProtect
+BuildMI(MBB, MI, MBBDL, TII->get(Mips::TNE))
+ .addReg(TempReg1)
+ .addReg(REG)
-+ .addImm(0);
++ .addImm(TRAPCODE);
+ }
+}
+
Index: patches/patch-lib_Target_PowerPC_PPCISelLowering_cpp
===
RCS file:
/cvs/ports/devel/llvm/patches/patch-lib_Target_PowerPC_PPCISelLowering_cpp,v
retrieving revision 1.6
diff -u -p -r1.6 patch-lib_Target_PowerPC_PPCISelLowering_cpp
--- patches/patch-lib_Target_PowerPC_PPCISelLowering_cpp7 Jul 2019
14:04:07 - 1.6
+++ patches/patch-lib_Target_PowerPC_PPCISelLowering_cpp13 Jun 2020
03:37:24 -
@@ -1,5 +1,8 @@
$OpenBSD: patch-lib_Target_PowerPC_PPCISelLowering_cpp,v 1.6 2019/07/07
14:04:07 jca Exp $
+Set max atomic size for PowerPC, so AtomicExpandPass changes some
+8-byte atomic ops into libcalls.
+
When generating code for OpenBSD/powerpc, avoid unaligned floating-point
load and store instructions. The vast majority of PowerPC CPUs that
OpenBSD runs on don't implement those and will generate an alignment
@@ -10,10 +13,23 @@ compiler generate code that only uses al
Index: lib/Target/PowerPC/PPCISelLowering.cpp
--- lib/Target/PowerPC/PPCISelLowering.cpp.orig
+++ lib/Target/PowerPC/PPCISelLowering.cpp
-@@ -14204,6 +14204,14 @@ bool PPCTargetLowering::allowsMisalignedMemoryAccesses
+@@ -1034,7 +1034,10 @@ PPCTargetLowering::PPCTargetLowering(const PPCTargetMa
+
+ setOperationAction(ISD::READCYCLECOUNTER, MVT::i64, isPPC64 ? Legal :
Custom);
+
+- if (!isPPC64) {
++ if (isPPC64)
++setMaxAtomicSizeInBitsSupported(64);
++ else {
++setMaxAtomicSizeInBitsSupported(32);
+ setOperationAction(ISD::ATOMIC_LOAD, MVT::i64, Expand);
+ setOperationAction(ISD::ATOMIC_STORE, MVT::i64, Expand);
+ }
+@@ -14203,6 +14206,14 @@ bool PPCTargetLowering::allowsMisalignedMemoryAccesses
+
if (VT == MVT::ppcf128)
return false;
-
++
+ if (Subtarget.isTargetOpenBSD()) {
+// Traditional PowerPC does not support unaligned memory access
+// for floating-point and the OpenBSD kernel does not
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2020/06/12 20:20:29 Modified files: games/wtf : Makefile distinfo Log message: Update to wtf-20200603
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2020/06/12 20:09:32 Modified files: misc/feathernotes: Makefile distinfo Log message: Update to feathernotes-0.7.0 Changelog: https://github.com/tsujan/FeatherNotes/releases/tag/V0.7.0
Re: purritobin-0.1.2 - new package + dependencies
‐‐‐ Original Message ‐‐‐ On Friday, June 12, 2020 5:48 PM, Stuart Henderson wrote: > On 2020/06/12 21:34, Brian Callahan wrote: > > > Maybe it would be nice to upstream the usockets shared library building? > > upstream say WONTFIX, they are more interested in performance than > something which can be used in OS packaging. > > https://github.com/uNetworking/uSockets/issues/99#issuecomment-627384325 Ah, missed that thanks. In that case, we can certainly support a single patch for it. ~Brian
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2020/06/12 19:42:35 Modified files: editors/featherpad: Makefile distinfo Log message: Update to featherpad-0.14.2 Changelog: https://github.com/tsujan/FeatherPad/releases/tag/V0.14.2
Re: purritobin-0.1.2 - new package + dependencies
Hi Aisha -- ‐‐‐ Original Message ‐‐‐ On Monday, June 8, 2020 9:07 AM, Aisha Tammy wrote: > Based on your comments, I've changed it back to using the shared > library, though I am still building a static library as well. > > Thanks a lot for all your help! > > comments? > > PS: yes, uwebsockets did go from 0.17.6 to 18.1.0 > > Aisha > > On 6/3/20 11:14 AM, Stuart Henderson wrote: > > > On 2020/06/02 15:55, Aisha Tammy wrote: > > > > > > All these static libraries mean that things won't get updated > > > > automatically when a library is updated. Say you install purritobin > > > > and there is a later security fix to usockets; purritobin won't be > > > > updated unless you manually force it (e.g. by bumping REVISION). > > > > The normal way of handling this with almost everything else in ports > > > > is to use shared libraries. > > > > > > I totally agree but upstream has mandated that this library is to be used > > > static only and with -flto -O3 (which Brian has removed stating > > > unsupported archs, thanks brian!). > > > > that could just be changed in the port like you did before (but then > > actually make use of it). I don't think we honestly care about the > > difference upstream talks about in the ticket (160k req/sec with > > shared libs, to 215k req/sec with static+lto, on some unspecified OS). > > https://github.com/uNetworking/uSockets/issues/99#issuecomment-627384325 > > Packagers for at least some other OS will want this too if they're > > going to include it in their package systems. > > > > > Upstream have also rejected my patch to add shared libraries :( and is > > > adamant > > > on using both the above flags (which was a separate issue that was > > > raised, to > > > remove the flags and make them optional depending on distribution) > > > Does ports not handle such an automated revision bump for static libraries > > > that get updated? (am just asking, I don't know the intricacies and > > > details > > > of shared/static library things) > > > > If there was a shared library as well you could list it as a "fake" WANTLIB > > entry (it would show as "extra" so we add a comment to say what's going on) > > and then it would at least get updated if the shared library version number > > (.so.X.Y) changes though that doesn't force it for every update either. > > Really with static libs you need to bump all the downstream users or > > set a tight dependency on the particular version number. > > > > > I am not sure how to resolve this conflict... > > > an aside: why was -O3 removed, upstream has it present and wants it to be > > > there? > > > > Higher opt levels increase risk of hitting compiler bugs (maybe only > > on certain architectures). If the code implements anything which is > > undefined behaviour that can cause problems with optimisers too, > > especially at higher opt levels. > > Ports policy is to respect what is set by the user / ports infrastructure, > > usually -O2, but sometimes it's necessary to change that on certain arches. I made just tiny tweaks to usockets and purritobin; just WANTLIB and BDEP/LDEP fixes. Maybe it would be nice to upstream the usockets shared library building? ~Brian purritobin.tgz Description: application/compressed-tar usockets.tgz Description: application/compressed-tar
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2020/06/12 16:40:41 Modified files: editors/qscintilla: Makefile editors/qscintilla/patches: patch-Qt4Qt5_qscintilla_pro Added files: editors/qscintilla/patches: patch-src_RunStyles_cpp Log message: qscintilla: fix some consumers build on powerpc cad/openscad and databases/sqlitebrowser builds were failing with some undefined references to "Scintilla::RunStyles"; use ptrdiff_t variants on that arch. While here, regen a patch. OK rsadowski@
Re: CVS: cvs.openbsd.org: ports
On 2020/06/10 13:29, Rafael Sadowski wrote: > CVSROOT: /cvs > Module name: ports > Changes by: rsadow...@cvs.openbsd.org 2020/06/10 13:29:53 > > Modified files: > audio/musique : Makefile distinfo > audio/musique/pkg: PLIST > Removed files: > audio/musique/patches: patch-src_iconutils_cpp > patch-src_mainwindow_cpp > > Log message: > Update musique to 1.7 picks up mpv somewhere, c++ -c -O2 -pipe -O2 -pipe -std=gnu++1y -fno-exceptions -Wall -W -pthread -fPIC -DAPP_VERSION=1.7 -DAPP_NAME=Musique - DAPP_UNIX_NAME=musique -DQT_NO_DEBUG_OUTPUT -DQT_USE_QSTRINGBUILDER -DQT_STRICT_ITERATORS -DMEDIA_MPV -DMEDIA_AUDIOONL Y -DAPP_LINUX -DDATADIR=\"/usr/local/share\" -DPKGDATADIR=\"/usr/local/share/musique\" -DQT_NO_EXCEPTIONS -DQT_NO_DEBU G -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_SQL_LIB -DQT_DBUS_LIB -DQT_CORE_LIB -isystem /usr/include/c++/v 1 -I../../musique-1.7 -I. -I../lib/http/src -I../lib/idle/src -I../lib/media/src -I../lib/media/src/mpv -I../src/qtsin gleapplication -I../src/tags -I../locale -I/usr/local/include/taglib -I/usr/local/include/X11/qt5 -I/usr/local/include /X11/qt5/QtWidgets -I/usr/local/include/X11/qt5/QtGui -I/usr/local/include/X11/qt5/QtNetwork -I/usr/local/include/X11/ qt5/QtSql -I/usr/local/include/X11/qt5/QtDBus -I/usr/local/include/X11/qt5/QtCore -Ibuild/moc -I/usr/X11R6/include -I/ usr/X11R6/include/libdrm -I/usr/local/include -I/usr/local/lib/qt5/mkspecs/openbsd-clang -o build/obj/mediampv.o ../li b/media/src/mpv/mediampv.cpp In file included from ../lib/media/src/mpv/mediampv.cpp:1: ../lib/media/src/mpv/mediampv.h:7:10: fatal error: 'mpv/client.h' file not found #include ^~ 1 error generated. >
Re: powerpc bulk build report
On Fri, 12 Jun 2020 16:04:22 -0600 (MDT) c...@openbsd.org wrote: > Bulk build on macppc-0.ports.openbsd.org > > Started : Tue May 26 11:12:39 MDT 2020 > Finished: Fri Jun 12 16:04:08 MDT 2020 > Duration: 17 Days 4 hours 51 minutes ^ We swapped some monsters that failed at runtime for GNOME/MATE stuff :) > Built using OpenBSD 6.7-current (GENERIC) #722: Mon May 25 18:07:09 > MDT 2020 > > Built 9939 packages > http://build-failures.rhaalovely.net/powerpc/2020-05-26/cad/openscad.log > http://build-failures.rhaalovely.net/powerpc/2020-05-26/databases/sqlitebrowser.log I'll commit the fix just after that mail > http://build-failures.rhaalovely.net/powerpc/2020-05-26/devel/geany.log https://marc.info/?l=openbsd-ports=159188140009019=2 > http://build-failures.rhaalovely.net/powerpc/2020-05-26/mail/kopano/core.log Fixed, won't build on ld.bfd archs again > http://build-failures.rhaalovely.net/powerpc/2020-05-26/security/aircrack-ng.log https://marc.info/?l=openbsd-ports=159141021925207=2 > http://build-failures.rhaalovely.net/powerpc/2020-05-26/x11/gnome/builder.log Fixed, but it requires also that uncommitted fix for libdazzle: https://marc.info/?l=openbsd-ports=159199473212267=2 > http://build-failures.rhaalovely.net/powerpc/2020-05-26/x11/gnome/eog.log Rust only, it wasn't and won't be available, fixed. > http://build-failures.rhaalovely.net/powerpc/2020-05-26/x11/qt5/qtwebengine.log Fixed, added NOT_FOR_ARCHS
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2020/06/12 16:14:41 Modified files: games/julius : Makefile distinfo Log message: Update to julius-1.4.1 Changelog: https://github.com/bvschaik/julius/releases/tag/v1.4.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2020/06/12 16:09:09 Modified files: x11/gnome/builder: Makefile Log message: gnome-builder: fix the build with ld.bfd Don't use "-Wl,--as-needed" (the meson default) with ld.bfd, it causes undefined references errors. Allow building with ld.bfd on i386 where it's broken with ld.lld, we'll see the result in the next bulk. Tested on powerpc -- this arch needs a yet-to-be-committed x11/gnome/libdazzle fix to build it there. OK sthen@, jca@ and aja@ (maintainer)
powerpc bulk build report
Bulk build on macppc-0.ports.openbsd.org Started : Tue May 26 11:12:39 MDT 2020 Finished: Fri Jun 12 16:04:08 MDT 2020 Duration: 17 Days 4 hours 51 minutes Built using OpenBSD 6.7-current (GENERIC) #722: Mon May 25 18:07:09 MDT 2020 Built 9939 packages Number of packages built each day: May 26: 838 May 27: 65 May 28: 477 May 29: 702 May 30: 530 May 31: 99 Jun 1: 4043 Jun 2: 283 Jun 3: 242 Jun 4: 304 Jun 5: 544 Jun 6: 317 Jun 7: 563 Jun 8: 429 Jun 9: 503 Jun 10: 441 Jun 11: 554 Jun 12: 2623 Critical path missing pkgs: http://build-failures.rhaalovely.net/powerpc/2020-05-26/summary.log Build failures: 24 http://build-failures.rhaalovely.net/powerpc/2020-05-26/benchmarks/wrk.log http://build-failures.rhaalovely.net/powerpc/2020-05-26/cad/openscad.log http://build-failures.rhaalovely.net/powerpc/2020-05-26/databases/sqlitebrowser.log http://build-failures.rhaalovely.net/powerpc/2020-05-26/devel/geany.log http://build-failures.rhaalovely.net/powerpc/2020-05-26/devel/pygame,python3.log http://build-failures.rhaalovely.net/powerpc/2020-05-26/emulators/frodo.log http://build-failures.rhaalovely.net/powerpc/2020-05-26/games/hyperrogue.log http://build-failures.rhaalovely.net/powerpc/2020-05-26/games/valyriatear.log http://build-failures.rhaalovely.net/powerpc/2020-05-26/inputmethods/uim.log http://build-failures.rhaalovely.net/powerpc/2020-05-26/lang/gforth.log http://build-failures.rhaalovely.net/powerpc/2020-05-26/lang/gprolog.log http://build-failures.rhaalovely.net/powerpc/2020-05-26/lang/gravity.log http://build-failures.rhaalovely.net/powerpc/2020-05-26/lang/squeak/vm.log http://build-failures.rhaalovely.net/powerpc/2020-05-26/mail/kopano/core.log http://build-failures.rhaalovely.net/powerpc/2020-05-26/security/aircrack-ng.log http://build-failures.rhaalovely.net/powerpc/2020-05-26/shells/ksh93.log http://build-failures.rhaalovely.net/powerpc/2020-05-26/x11/agar/agar.log http://build-failures.rhaalovely.net/powerpc/2020-05-26/x11/e16keyedit.log http://build-failures.rhaalovely.net/powerpc/2020-05-26/x11/e17/elementary.log http://build-failures.rhaalovely.net/powerpc/2020-05-26/x11/gnome/builder.log http://build-failures.rhaalovely.net/powerpc/2020-05-26/x11/gnome/eog.log http://build-failures.rhaalovely.net/powerpc/2020-05-26/x11/gnustep/base.log http://build-failures.rhaalovely.net/powerpc/2020-05-26/x11/kde4/libkexiv2.log http://build-failures.rhaalovely.net/powerpc/2020-05-26/x11/qt5/qtwebengine.log Recurrent failures: failures/benchmarks/wrk.log failures/cad/openscad.log failures/databases/sqlitebrowser.log failures/devel/geany.log failures/emulators/frodo.log failures/games/hyperrogue.log failures/games/valyriatear.log failures/lang/gforth.log failures/lang/gprolog.log failures/lang/squeak/vm.log failures/mail/kopano/core.log failures/security/aircrack-ng.log failures/shells/ksh93.log failures/summary.log failures/x11/agar/agar.log failures/x11/e17/elementary.log failures/x11/gnustep/base.log New failures: +failures/devel/pygame,python3.log +failures/inputmethods/uim.log +failures/lang/gravity.log +failures/x11/e16keyedit.log +failures/x11/gnome/builder.log +failures/x11/gnome/eog.log +failures/x11/kde4/libkexiv2.log +failures/x11/qt5/qtwebengine.log Resolved failures: -failures/devel/dyncall.log -failures/devel/libpeas.log -failures/emulators/gsplus.log -failures/games/wesnoth.log -failures/geo/osrm-backend.log -failures/graphics/birdfont.log -failures/lang/parrot.log -failures/mail/hashcash.log -failures/plan9/drawterm.log -failures/productivity/gnucash.log -failures/textproc/apertium-dicts/crh.log -failures/textproc/apertium-dicts/tur.log -failures/x11/gnome/libgweather.log -failures/x11/gtk+4,-cloudprint.log -failures/x11/gtk-vnc.log -failures/x11/gtksourceview4.log Packages newly built: +audio/rhythmbox +benchmarks/nuttcp +databases/evolution-data-server +devel/dyncall +devel/kf5/kcalendarcore +devel/kf5/kcontacts +devel/libpeas +devel/p5-Cairo-GObject +devel/p5-Class-Tiny-Chained +devel/p5-MooX-Aliases +devel/p5-MooX-Traits +devel/p5-Test-Spec +devel/py-dulwich,python3 +devel/rttr +devel/ruby-puppet_forge +editors/emacs,gtk3 +emulators/gsplus +emulators/sameboy +emulators/sameboy,-libretro +emulators/sameboy,-main +fonts/cascadia-code +games/ioquake3 +games/py-minecraft-launcher-lib,python3 +games/sauerbraten +games/sauerbraten,-data +games/sauerbraten,-main +games/wesnoth +games/widelands +games/wrath +graphics/birdfont +graphics/libvips +lang/parrot +mail/evolution +mail/evolution-ews +mail/evolution-rss +mail/geary +mail/hashcash +mail/notmuch/notmuch +mail/notmuch/notmuch,-emacs +mail/notmuch/notmuch,-main +mail/notmuch/py-notmuch +mail/notmuch/py-notmuch,python3 +mail/p5-Email-Filter-Rules +mail/p5-Mail-ListDetector +meta/mate,-extras +multimedia/gnome-twitch +multimedia/webvfx +net/asdig +net/dbip/asn +net/gupnp/tools +net/p5-Twitter-API +net/py-geventhttpclient,python3 +net/py-transmissionrpc-ng,python3 +net/ruby-cbor,ruby26 +net/ruby-cbor,ruby27
Re: purritobin-0.1.2 - new package + dependencies
On 2020/06/12 21:34, Brian Callahan wrote: > Maybe it would be nice to upstream the usockets shared library building? upstream say WONTFIX, they are more interested in performance than something which can be used in OS packaging. https://github.com/uNetworking/uSockets/issues/99#issuecomment-627384325
Re: UPDATE: net/castget 2.0.1
Hi Caspar,
At first glance it looks fine, just a slight tweak in your diff, HOMEPAGE=
should be updated to https://castget.johndal.com/
I’m no longer using this port, Would you like to take over maintainership?
Thanks for the patch.
gsoares
> On 12 Jun 2020, at 16:19, Caspar Schutijser wrote:
>
> Hi,
>
> Below is a diff that updates net/castget to 2.0.1. Briefly tested on
> amd64, seems to work fine here. This version accepts RSS URLs that start
> with "https://; (the old version thinks it should look for a file unless
> the URL starts with "http://;). The shared library is gone (proof at
> [1]).
>
> Thanks,
> Caspar Schutijser
>
> [1]
> https://github.com/mlj/castget/commit/6241ea22ab4c8bad216eec1cf4d5605eb74839ad
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/castget/Makefile,v
> retrieving revision 1.25
> diff -u -p -r1.25 Makefile
> --- Makefile12 Jul 2019 20:48:23 -1.25
> +++ Makefile12 Jun 2020 19:06:44 -
> @@ -2,14 +2,14 @@
>
> COMMENT=command-line podcast downloader
>
> -DISTNAME=castget-1.0.1
> -REVISION=11
> -SHARED_LIBS +=castget 0.0 # .0.0
> +DISTNAME=castget-2.0.1
> CATEGORIES=net
>
> HOMEPAGE=http://www.nongnu.org/castget
>
> MASTER_SITES= ${MASTER_SITE_SAVANNAH:=castget/}
> +
> +EXTRACT_SUFX=.tar.bz2
>
> MAINTAINER=Gleydson Soares
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/castget/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo18 Jan 2015 03:14:37 -1.3
> +++ distinfo12 Jun 2020 19:06:44 -
> @@ -1,2 +1,2 @@
> -SHA256 (castget-1.0.1.tar.gz) = RKIB079vlaWA0qPERvNZXztdGpJ3AgbTEcroqwXmgOo=
> -SIZE (castget-1.0.1.tar.gz) = 355696
> +SHA256 (castget-2.0.1.tar.bz2) = Q4tffsfjGkXtN1ZjD+RH9CAVrNpT7AkgL0hihya16HU=
> +SIZE (castget-2.0.1.tar.bz2) = 320226
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/net/castget/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- pkg/PLIST16 Mar 2015 18:07:51 -1.3
> +++ pkg/PLIST12 Jun 2020 19:06:44 -
> @@ -1,9 +1,5 @@
> @comment $OpenBSD: PLIST,v 1.3 2015/03/16 18:07:51 naddy Exp $
> @bin bin/castget
> -include/libcastget.h
> -lib/libcastget.a
> -lib/libcastget.la
> -@lib lib/libcastget.so.${LIBcastget_VERSION}
> @man man/man1/castget.1
> @man man/man5/castgetrc.5
> share/examples/castget/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2020/06/12 14:48:02 Modified files: devel/pyflakes : Makefile Log message: bump revision for all flavors
[macppc] x11/gnome/libdazzle: don't use unsupported 64-bit __sync_* primitives
Hi,
I've proposed a fix for x11/gnome/gnome-builder for ld.bfd archs and
possibly i386 (offlist), but on macppc it still failed due to undefined
references to 64-bit __sync_* primitives.
libdazzle uses 64-bit __sync_* primitives that are not supported on
macppc. There is no __atomic_* fallback, but there is a non-atomic
one, that was unused. I've proposed to upstream to use it on
!linux ppc32 generally [0], and it has been merged.
With that, gnome-builder will build and run fine on macppc.
Comments/feedback are welcome,
Charlène.
[0] https://gitlab.gnome.org/GNOME/libdazzle/-/merge_requests/44
Index: Makefile
===
RCS file: /cvs/ports/x11/gnome/libdazzle/Makefile,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 Makefile
--- Makefile14 May 2020 14:59:03 - 1.17
+++ Makefile12 Jun 2020 16:39:14 -
@@ -4,6 +4,7 @@ COMMENT=companion library to GObject a
GNOME_PROJECT= libdazzle
GNOME_VERSION= 3.36.0
+REVISION= 0
SHARED_LIBS += dazzle-1.01.2 # 0
Index: patches/patch-src_util_dzl-counter_c
===
RCS file: patches/patch-src_util_dzl-counter_c
diff -N patches/patch-src_util_dzl-counter_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_util_dzl-counter_c12 Jun 2020 16:39:14 -
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+Don't use unsupported 64-bit __sync primitives on powerpc, from:
+https://gitlab.gnome.org/GNOME/libdazzle/-/merge_requests/44
+
+Index: src/util/dzl-counter.c
+--- src/util/dzl-counter.c.orig
src/util/dzl-counter.c
+@@ -52,7 +52,11 @@ G_DEFINE_BOXED_TYPE (DzlCounterArena, dzl_counter_aren
+ #define CELLS_PER_GROUP(ncpu) \
+ (((sizeof (CounterInfo) * COUNTERS_PER_GROUP) + \
+ (sizeof(DzlCounterValue) * (ncpu))) / DATA_CELL_SIZE)
++#ifdef DZL_COUNTER_REQUIRES_ATOMIC
+ #define DZL_MEMORY_BARRIER __sync_synchronize()
++#else
++#define DZL_MEMORY_BARRIER 0
++#endif
+
+ typedef struct
+ {
Index: patches/patch-src_util_dzl-counter_h
===
RCS file: patches/patch-src_util_dzl-counter_h
diff -N patches/patch-src_util_dzl-counter_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_util_dzl-counter_h12 Jun 2020 16:39:14 -
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Don't use unsupported 64-bit __sync primitives on powerpc, from:
+https://gitlab.gnome.org/GNOME/libdazzle/-/merge_requests/44
+
+Index: src/util/dzl-counter.h
+--- src/util/dzl-counter.h.orig
src/util/dzl-counter.h
+@@ -163,6 +163,9 @@ G_BEGIN_DECLS
+ # define dzl_get_current_cpu() dzl_get_current_cpu_rdtscp()
+ #elif defined(__linux__)
+ # define dzl_get_current_cpu() dzl_get_current_cpu_call()
++#elif defined(__powerpc__) && !defined(__powerpc64__)
++# define dzl_get_current_cpu() 0
++# undef DZL_COUNTER_REQUIRES_ATOMIC
+ #else
+ # define dzl_get_current_cpu() 0
+ # define DZL_COUNTER_REQUIRES_ATOMIC 1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/06/12 14:03:16 Modified files: devel/pycharm : Makefile distinfo Log message: Update pycharm to 2020.2 Diff from maintainer Lucas Raab, thanks
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/06/12 14:01:05 Modified files: devel/intellij : Makefile distinfo devel/intellij/pkg: PLIST Log message: Update intellij to 2020.1.2 Update diff from Lucas Raab (maintainer)
UPDATE: net/castget 2.0.1
Hi,
Below is a diff that updates net/castget to 2.0.1. Briefly tested on
amd64, seems to work fine here. This version accepts RSS URLs that start
with "https://; (the old version thinks it should look for a file unless
the URL starts with "http://;). The shared library is gone (proof at
[1]).
Thanks,
Caspar Schutijser
[1]
https://github.com/mlj/castget/commit/6241ea22ab4c8bad216eec1cf4d5605eb74839ad
Index: Makefile
===
RCS file: /cvs/ports/net/castget/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile12 Jul 2019 20:48:23 - 1.25
+++ Makefile12 Jun 2020 19:06:44 -
@@ -2,14 +2,14 @@
COMMENT= command-line podcast downloader
-DISTNAME= castget-1.0.1
-REVISION= 11
-SHARED_LIBS += castget 0.0 # .0.0
+DISTNAME= castget-2.0.1
CATEGORIES=net
HOMEPAGE= http://www.nongnu.org/castget
MASTER_SITES= ${MASTER_SITE_SAVANNAH:=castget/}
+
+EXTRACT_SUFX= .tar.bz2
MAINTAINER=Gleydson Soares
Index: distinfo
===
RCS file: /cvs/ports/net/castget/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo18 Jan 2015 03:14:37 - 1.3
+++ distinfo12 Jun 2020 19:06:44 -
@@ -1,2 +1,2 @@
-SHA256 (castget-1.0.1.tar.gz) = RKIB079vlaWA0qPERvNZXztdGpJ3AgbTEcroqwXmgOo=
-SIZE (castget-1.0.1.tar.gz) = 355696
+SHA256 (castget-2.0.1.tar.bz2) = Q4tffsfjGkXtN1ZjD+RH9CAVrNpT7AkgL0hihya16HU=
+SIZE (castget-2.0.1.tar.bz2) = 320226
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/castget/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 16 Mar 2015 18:07:51 - 1.3
+++ pkg/PLIST 12 Jun 2020 19:06:44 -
@@ -1,9 +1,5 @@
@comment $OpenBSD: PLIST,v 1.3 2015/03/16 18:07:51 naddy Exp $
@bin bin/castget
-include/libcastget.h
-lib/libcastget.a
-lib/libcastget.la
-@lib lib/libcastget.so.${LIBcastget_VERSION}
@man man/man1/castget.1
@man man/man5/castgetrc.5
share/examples/castget/
Re: graphics/feh: add version-sort support
‐‐‐ Original Message ‐‐‐ On Friday, June 12, 2020 7:08 AM, Tim van der Molen wrote: > Stuart Henderson (2020-06-12 11:47 +0100): > > > On 2020/06/12 11:41, Tim van der Molen wrote: > > > > > I'm not sure if and how the license marker in the port Makefile should > > > be updated. Right now it says "BSD", but the strverscmp() code is GPL. > > > > LGPL not GPL, but .. > > Right. :-) > > > On 2020/06/12 04:23, Anthony J. Bentley wrote: > > > > > The Musl implementation is much shorter and MIT-licensed. > > > I feel like upstream feh should be encouraged to integrate this and not > > > to rely on a nonportable function. > > > > that sounds a better idea. > > I'll do that. I wasn't aware of the musl implementation. Thanks. Everyone else beat me to it, but I'll chime in and say yes the musl implementation would be preferred. ~Brian
update: devel/py-pip
Hi ports@,
This is an update of devel/py-pip to 20.1.1
Lightly tested installing some libs with the `--user` flag and works
fine for me on amd64.
I ran regression tests on all consumers with the exact same results
before and after the upgrade:
> devel/py-setuptools_scm
1 failed, 121 passed, 5 skipped in 121.67 seconds
> sysutils/salt
tests crash
ModuleNotFoundError: No module named 'pytestsalt'
> devel/py-wbem
ran 0 tests.
> net/napalm/py-napalm
tests fail. At some point it tries to download "pynxos" and
PORTS_PRIVSEP prevents it.
I guess it does not make any sense to make this py3 only while we have
python2 in ports.
Comments ? Ok ?
Index: Makefile
===
RCS file: /home/cvs/ports/devel/py-pip/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- Makefile25 Aug 2019 07:30:37 - 1.34
+++ Makefile12 Jun 2020 16:46:18 -
@@ -2,7 +2,7 @@
COMMENT = tool for installing Python packages
-MODPY_EGG_VERSION =19.1.1
+MODPY_EGG_VERSION =20.1.1
DISTNAME = pip-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = devel
Index: distinfo
===
RCS file: /home/cvs/ports/devel/py-pip/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo25 Aug 2019 07:30:37 - 1.17
+++ distinfo12 Jun 2020 16:46:30 -
@@ -1,2 +1,2 @@
-SHA256 (pip-19.1.1.tar.gz) = RNPX09MKHrZcfl/xFzzfj3RnhQYFrHzDcHtgZL3dCVg=
-SIZE (pip-19.1.1.tar.gz) = 1334144
+SHA256 (pip-20.1.1.tar.gz) = J/jcKTh92DJJ4G5oHOCH5gYYJlghmKQlCF4L9MHPOlU=
+SIZE (pip-20.1.1.tar.gz) = 1475109
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/devel/py-pip/pkg/PLIST,v
retrieving revision 1.14
diff -u -p -r1.14 PLIST
--- pkg/PLIST 25 Aug 2019 07:30:37 - 1.14
+++ pkg/PLIST 12 Jun 2020 16:48:01 -
@@ -23,14 +23,12 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/pip/_internal/${MODPY_PYCACHE}build_env.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pip/_internal/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pip/_internal/${MODPY_PYCACHE}configuration.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pip/_internal/${MODPY_PYCACHE}download.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pip/_internal/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pip/_internal/${MODPY_PYCACHE}index.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pip/_internal/${MODPY_PYCACHE}locations.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pip/_internal/${MODPY_PYCACHE}pep425tags.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/_internal/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pip/_internal/${MODPY_PYCACHE}pyproject.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pip/_internal/${MODPY_PYCACHE}resolve.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pip/_internal/${MODPY_PYCACHE}wheel.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/_internal/${MODPY_PYCACHE}self_outdated_check.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/_internal/${MODPY_PYCACHE}wheel_builder.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pip/_internal/build_env.py
lib/python${MODPY_VERSION}/site-packages/pip/_internal/cache.py
lib/python${MODPY_VERSION}/site-packages/pip/_internal/cli/
@@ -40,22 +38,34 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/pip/_internal/cli/${MODPY_PYCACHE}autocompletion.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pip/_internal/cli/${MODPY_PYCACHE}base_command.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pip/_internal/cli/${MODPY_PYCACHE}cmdoptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/_internal/cli/${MODPY_PYCACHE}command_context.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/_internal/cli/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pip/_internal/cli/${MODPY_PYCACHE}main_parser.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pip/_internal/cli/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/_internal/cli/${MODPY_PYCACHE}progress_bars.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/_internal/cli/${MODPY_PYCACHE}req_command.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/_internal/cli/${MODPY_PYCACHE}spinners.${MODPY_PYC_MAGIC_TAG}pyc
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2020/06/12 09:59:39 Modified files: lang/mono : Makefile distinfo Log message: update to 6.8.0.123
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2020/06/12 09:54:49 Modified files: mail/kopano/core: Makefile Log message: kopano: don't build on ld.bfd archs 'USE_LLD=Yes' does not prevent building the port on ld.bfd archs, where it fails to build. Using ld.bfd causes undefined references errors. Use ONLY_FOR_ARCHS, and remove BROKEN-sparc64 accordingly. "sure" robert@ (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2020/06/12 09:29:13 Modified files: www/p5-WWW-Mechanize: Makefile distinfo Log message: update p5-WWW-Mechanize to 1.99 WWW::Mechanize 2.00 requires LWP::UserAgent 6.45, p5-libwww needs an update
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2020/06/12 08:57:07 Modified files: x11/libgdiplus : Makefile distinfo x11/libgdiplus/pkg: PLIST Log message: update to 6.0.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/06/12 08:27:47 Modified files: www/pecl-memcached: Makefile distinfo www/pecl-memcached/pkg: PLIST Log message: update to pecl-memcached-3.1.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/06/12 08:24:22 Modified files: devel/pear-Log : Makefile distinfo Log message: update to pear-Log-1.13.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/06/12 08:24:01 Modified files: net/pear-Net-SMTP: Makefile distinfo Log message: update to pear-Net_SMTP-1.9.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/06/12 08:19:11 Modified files: devel/distcc : Makefile distinfo devel/distcc/patches: patch-Makefile_in devel/distcc/pkg: PLIST-main PLIST-server README-main README-server distccd.rc Log message: update to distcc-3.3.3, sync WANTLIB, update HOMEPAGE, install the update-distcc-symlinks script which works ok as long as you have the -main subpackage installed, move --daemon from daemon_flags in the rc script to daemon.
Re: UPDATE: plan9port-20200519
Gleydson Soares writes:
> On Sun, May 24, 2020 at 12:27:25PM -0300, Gleydson Soares wrote:
>> Hi,
>>
>> here is an update [1] for plan9port, bringing it to latest github commit.
>>
>> i have removed some heavy optional run_dependencies to slim down it, since
>> it does not affect the plan9port usability itself. if one wants to read .ps
>> file or whatever you should just install pkg_add ghostscript/etc and use your
>> plumber pattern to reach them ;-)
>>
>> I have removed the following extra files what are not part of plan9port,
>> it looks like out-of-date i doubt someone will note it is out:
>>
>> - cd ${WRKSRC}/dict && tar xjf ${FULLDISTDIR}/pgw.tar.bz2
>> - cd ${WRKSRC}/dict && tar xjf ${FULLDISTDIR}/roget.tar.bz2
>> - cd ${WRKSRC}/sky && tar xzf ${FULLDISTDIR}/scat.tgz
>>
>> while here get rid of MAP_STACK patch has been merged upstream [2]
>>
>> i tidy up the port, it requires some additional cleanup i will do afterwards
>> though,
>>
>> works fine here, if you are a plan9port user please raise your hands
>>
>> [1] https://trusted.com.br/gsoares/plan9port-20200519.diff
>> [2]
>> https://github.com/9fans/plan9port/commit/8c573cab6819c69142389d36b978b3c683771afe
>
> Neither feedback nor objetions. I'll commit it tomorrow unless
> someone objects until there.
I gave it a whirl! Sorry totally forgot to message ya back!
The tiny bits I use seem to work!
OK abieber@
--
PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2020/06/12 07:57:37 Modified files: www/p5-WWW-Mechanize-Shell: Makefile distinfo Log message: update p5-WWW-Mechanize-Shell to 0.59
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/06/12 07:36:16 Modified files: devel/py-tabulate: Makefile distinfo Log message: Update to tabulate 0.8.7 Switch to new HOMEPAGE; changelog: - 0.8.7: Bug fixes. New format: `pretty`. HTML escaping. - 0.8.6: Bug fixes. Stop supporting Python 3.3, 3.4. - 0.8.5: Fix broken Windows package. Minor documentation updates. - 0.8.4: Bug fixes. - 0.8.3: New formats: `github`. Custom colum alignment. Bug fixes. Only consumer (Python 2) security/floss packages fine, but not run-tested. "make test" passes, update needed for a new port wanting 0.8.4 or higher.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/06/12 07:22:20 Modified files: www/py-beautifulsoup: Makefile distinfo www/py-beautifulsoup/pkg: DESCR PLIST Log message: update to py-beautifulsoup-3.2.2 and update the descr to make it clear that people shouldn't be using it (the only ports using it are calibre, which it might be possible to update now that we have qtwebengine, and anki which is marked BROKEN and might also be possible to update now that we have qtwebengine).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/06/12 07:02:35 Modified files: mail/fetchmail : Makefile distinfo mail/fetchmail/patches: patch-Makefile_in Log message: update to fetchmail-6.4.6
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/06/12 06:49:18 Modified files: devel/py-tz: Makefile distinfo devel/py-tz/pkg: PLIST Log message: update to pytz-2020.1, use MODPY_PYTEST
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/06/12 06:44:34 Modified files: databases/py-odbc: Makefile distinfo databases/py-odbc/patches: patch-setup_py Log message: update to py-odbc-4.0.30
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2020/06/12 06:42:09 Modified files: www/p5-HTTP-Daemon: Makefile distinfo Log message: update p5-HTTP-Daemon to 6.12
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/06/12 06:35:51 Modified files: www/tinyproxy : Makefile distinfo www/tinyproxy/pkg: PLIST tinyproxy.rc Added files: www/tinyproxy/patches: patch-configure_ac Removed files: www/tinyproxy/patches: patch-configure Log message: update to tinyproxy-1.10.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2020/06/12 06:32:41 Modified files: net/p5-Net-DNS : Makefile distinfo net/p5-Net-DNS/pkg: PLIST Log message: update p5-Net-DNS to 1.24
Re: update games/godot to 3.2.1
Hi,
I was a bit busy these days, but I've finally found the time to test (at
least) the new TLS code.
Initially I was worried that I had to create a server in Godot, setup
certificates and create a client for that game server... Fortunately
there is a HTTPRequest node.
So I tried to perform some GET requests to site like google.com,
duckduckgo.com, cloudflare.com, omarpolo.com, ... (all with HTTPS
obviously) and as far as I can tell it worked great^1. I'm linking the
project[0], even if it's less than 20 lines of gdscript, it can be
useful to ensure that I haven't made wrong assumptions, or to further
testing.
Also, I re-checked the patch and indeed path-servers_audio_server_cpp is
(now) redundant. The other patches seems useful to me. I've also done
some minor adjustments:
- patch-platform_x11_detect_py: drop entirely the -O3/-Os both in
"release" and "release_debug" targets
- patch-platform_os_x11_cpp: rename libXrandr also inside the fprintf
the other patches should be untouched.
Cheers!
[0]: https://git.omarpolo.com/ghttp
1: well, with https://google.com I get "Unicode error: invalid utf8"
printed in the debug console, but that's happening only with google.
Index: Makefile
===
RCS file: /cvs/ports/games/godot/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile12 Apr 2020 13:30:55 - 1.10
+++ Makefile12 Jun 2020 12:28:41 -
@@ -2,22 +2,21 @@
COMMENT = 2D and 3D game engine
-V =3.0.6
+V =3.2.1
DISTNAME = godot-${V}-stable
PKGNAME = godot-${V}
CATEGORIES = games
HOMEPAGE = https://godotengine.org/
MAINTAINER = Thomas Frohwein
-REVISION = 3
# MIT
PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX}
WANTLIB += GL X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr
-WANTLIB += Xrender c crypto enet execinfo freetype intl m mpcdec
-WANTLIB += ogg opus opusfile png ssl theora theoradec vorbis vorbisfile
-WANTLIB += webp xcb z pcre2-32 vpx zstd
+WANTLIB += Xrender c enet execinfo freetype intl m mbedtls mbedcrypto
+WANTLIB += mbedx509 mpcdec ogg opus opusfile png theora theoradec
+WANTLIB += vorbis vorbisfile webp xcb z pcre2-32 vpx zstd
COMPILER = base-clang ports-gcc base-gcc
@@ -32,7 +31,7 @@ MODULES = devel/scons
MODSCONS_FLAGS = CC="${CC}" \
CXX="${CXX}" \
CFLAGS="${CFLAGS}" \
- CXXFLAGS="${CXXFLAGS}" \
+ CXXFLAGS="${CXXFLAGS} -Wno-deprecated-register" \
LINKFLAGS="${LDFLAGS} -lintl -lmpcdec" \
builtin_enet=no \
builtin_freetype=no \
@@ -44,7 +43,7 @@ MODSCONS_FLAGS = CC="${CC}" \
builtin_libvorbis=no \
builtin_libvpx=no \
builtin_libwebp=no \
- builtin_openssl=no \
+ builtin_mbedtls=no \
builtin_opus=no \
builtin_pcre2=no \
builtin_zlib=no \
@@ -65,7 +64,8 @@ LIB_DEPENDS = archivers/zstd \
graphics/png \
multimedia/libtheora \
multimedia/libvpx \
- net/enet
+ net/enet \
+ security/polarssl
NO_TEST = Yes
Index: distinfo
===
RCS file: /cvs/ports/games/godot/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo25 Aug 2018 19:20:29 - 1.3
+++ distinfo12 Jun 2020 12:28:41 -
@@ -1,2 +1,2 @@
-SHA256 (godot-3.0.6-stable.tar.xz) =
LfHLNqAMaHrnShHX31vcEyyBapNOJpbswzgnAI/5xrk=
-SIZE (godot-3.0.6-stable.tar.xz) = 12517428
+SHA256 (godot-3.2.1-stable.tar.xz) =
VWtWQHn7GyGgUyDDWSaLIDLIfYs7+qT9EE6/nJCauH0=
+SIZE (godot-3.2.1-stable.tar.xz) = 14066488
Index: patches/patch-core_io_SCsub
===
RCS file: /cvs/ports/games/godot/patches/patch-core_io_SCsub,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-core_io_SCsub
--- patches/patch-core_io_SCsub 27 Apr 2018 07:32:53 - 1.1.1.1
+++ patches/patch-core_io_SCsub 12 Jun 2020 12:28:41 -
@@ -9,9 +9,9 @@ based on github issue #17374
Index: core/io/SCsub
--- core/io/SCsub.orig
+++ core/io/SCsub
-@@ -5,4 +5,4 @@ Import('env')
- env.add_source_files(env.core_sources, "*.cpp")
+@@ -3,3 +3,5 @@
+ Import('env')
- Export('env')
--
+ env.add_source_files(env.core_sources, "*.cpp")
++
+env.Append(CCFLAGS="-DZSTD_STATIC_LINKING_ONLY")
Index: patches/patch-core_io_compression_cpp
===
RCS file: /cvs/ports/games/godot/patches/patch-core_io_compression_cpp,v
retrieving revision 1.1.1.1
diff
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/06/12 06:26:18 Modified files: security/py-cryptography: Makefile distinfo security/py-cryptography/patches: patch-src__cffi_src_openssl_x509_vfy_py security/py-cryptography/pkg: PLIST security/py-cryptography_vectors: Makefile distinfo security/py-cryptography_vectors/pkg: PLIST Log message: update to py-cryptography 2.9.2
Re: UPDATE: plan9port-20200519
On Sun, May 24, 2020 at 12:27:25PM -0300, Gleydson Soares wrote:
> Hi,
>
> here is an update [1] for plan9port, bringing it to latest github commit.
>
> i have removed some heavy optional run_dependencies to slim down it, since
> it does not affect the plan9port usability itself. if one wants to read .ps
> file or whatever you should just install pkg_add ghostscript/etc and use your
> plumber pattern to reach them ;-)
>
> I have removed the following extra files what are not part of plan9port,
> it looks like out-of-date i doubt someone will note it is out:
>
> - cd ${WRKSRC}/dict && tar xjf ${FULLDISTDIR}/pgw.tar.bz2
> - cd ${WRKSRC}/dict && tar xjf ${FULLDISTDIR}/roget.tar.bz2
> - cd ${WRKSRC}/sky && tar xzf ${FULLDISTDIR}/scat.tgz
>
> while here get rid of MAP_STACK patch has been merged upstream [2]
>
> i tidy up the port, it requires some additional cleanup i will do afterwards
> though,
>
> works fine here, if you are a plan9port user please raise your hands
>
> [1] https://trusted.com.br/gsoares/plan9port-20200519.diff
> [2]
> https://github.com/9fans/plan9port/commit/8c573cab6819c69142389d36b978b3c683771afe
Neither feedback nor objetions. I'll commit it tomorrow unless
someone objects until there.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/06/12 06:00:44 Modified files: security/py-PyNaCl: Makefile Log message: Missing DEP on devel/py-wheel.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2020/06/12 05:29:08 Modified files: databases : Makefile Log message: +web2ldap
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2020/06/12 05:28:30 Log message: Import web2ldap 1.5.81, from Maintainer Lucas Raab web2ldap is a generic Web-based LDAP client which does not make any assumptions about the tree structure or LDAP schema, kind of a swiss-army knife for accessing/manipulating LDAP servers without having to configure anything. It provides a schema browser which displays references/dependencies within an LDAPv3 schema, and a customizable platform for prototyping LDAP administration use-cases. with tweaks from sthen@ and myself, ok sthen@ Status: Vendor Tag: lraab Release Tags: landry_20200612 N ports/databases/web2ldap/Makefile N ports/databases/web2ldap/distinfo N ports/databases/web2ldap/pkg/DESCR N ports/databases/web2ldap/pkg/PLIST N ports/databases/web2ldap/pkg/web2ldap.rc N ports/databases/web2ldap/patches/patch-etc_web2ldap_web2ldapcnf_hosts_py No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2020/06/12 05:27:08 Modified files: infrastructure/db: user.list Log message: add uid/gid 857 for _web2ldap user
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/06/12 05:14:45 Modified files: sysutils/bacula: Tag: OPENBSD_6_7 Makefile distinfo sysutils/bacula/patches: Tag: OPENBSD_6_7 patch-configure patch-scripts_baculabackupreport_in patch-src_stored_Makefile_in Log message: update to bacula-9.6.5, yesterday's release reissued with some fixes to copyright notices
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/06/12 05:14:19 Modified files: sysutils/bacula: Makefile distinfo Log message: update to bacula-9.6.5, yesterday's release reissued with some fixes to copyright notices
Re: [new] sysutils/web2ldap and co
On Fri, Jun 12, 2020, at 06:09, Landry Breuil wrote: > On Fri, Jun 12, 2020 at 12:23:43PM +0200, Landry Breuil wrote: > > On Tue, Jun 09, 2020 at 01:33:12PM +0100, Stuart Henderson wrote: > > > > 100% agree with all that - i've imported py-ldap0 under databases/ and > > py-xlwt under textproc, and here's a new tarball for web2ldap to put > > under databases/ taking into account your feedback. > > new version with rewritten/improved DESCR, and fixed rc script to use > MODPY_BIN/TRUEPREFIX. will import that if that's fine for you lucas? > > Landry > That is fine with me. I appreciate the feedback from you and sthen
Re: [new] sysutils/web2ldap and co
On Fri, Jun 12, 2020 at 01:09:25PM +0200, Landry Breuil wrote: > On Fri, Jun 12, 2020 at 12:23:43PM +0200, Landry Breuil wrote: > > On Tue, Jun 09, 2020 at 01:33:12PM +0100, Stuart Henderson wrote: > > > > 100% agree with all that - i've imported py-ldap0 under databases/ and > > py-xlwt under textproc, and here's a new tarball for web2ldap to put > > under databases/ taking into account your feedback. > > new version with rewritten/improved DESCR, and fixed rc script to use > MODPY_BIN/TRUEPREFIX. will import that if that's fine for you lucas? with attachment this time.. sigh. web2ldap_3.tgz Description: application/tar-gz
Re: [new] sysutils/web2ldap and co
On Fri, Jun 12, 2020 at 12:23:43PM +0200, Landry Breuil wrote: > On Tue, Jun 09, 2020 at 01:33:12PM +0100, Stuart Henderson wrote: > > 100% agree with all that - i've imported py-ldap0 under databases/ and > py-xlwt under textproc, and here's a new tarball for web2ldap to put > under databases/ taking into account your feedback. new version with rewritten/improved DESCR, and fixed rc script to use MODPY_BIN/TRUEPREFIX. will import that if that's fine for you lucas? Landry
Re: graphics/feh: add version-sort support
Stuart Henderson (2020-06-12 11:47 +0100): > On 2020/06/12 11:41, Tim van der Molen wrote: > > I'm not sure if and how the license marker in the port Makefile should > > be updated. Right now it says "BSD", but the strverscmp() code is GPL. > > LGPL not GPL, but .. Right. :-) > On 2020/06/12 04:23, Anthony J. Bentley wrote: > > The Musl implementation is much shorter and MIT-licensed. > > > > I feel like upstream feh should be encouraged to integrate this and not > > to rely on a nonportable function. > > that sounds a better idea. I'll do that. I wasn't aware of the musl implementation. Thanks.
Re: update net/dnscrypt-proxy 2.0.44
On 2020/06/11 19:49, Nam Nguyen wrote: > This is an update for net/dnscrypt-proxy 2.0.44, released June 11, 2020. > > Changelogs: > https://github.com/DNSCrypt/dnscrypt-proxy/blob/2.0.44/ChangeLog > https://github.com/DNSCrypt/dnscrypt-proxy/blob/2.0.43/ChangeLog > > A config breaking change is that the `tls_client_auth' section was > renamed to `doh_client_x509_auth', but it errors out to notify the user > if this is a problem. > > - "cache files are now downloaded as the user the daemon will be running > as. This fixes permission issues at startup time." The existing files need to have their ownership changed don't they? That could be done with @exec-update or in the rc script. > Larry Hynes reported this bug, and it was fixed by upstream (Frank Denis). > https://github.com/DNSCrypt/dnscrypt-proxy/commit/6f2dcb900af01954a424e0d38bf0d16d9c599607 > > Port-wise to support downloading cache files, PLIST is manually changed > to have @mode 775 and @owner/@group to _dnscrypt-proxy for > /var/dnscrypt-proxy. Does 775 seem fine? 775 seems ok, I would have it owned by root:_dnscrypt-proxy though, even if only to avoid blowing out the columns in ls -l /var quite so much..
Re: graphics/feh: add version-sort support
On 2020/06/12 11:41, Tim van der Molen wrote: > I'm not sure if and how the license marker in the port Makefile should > be updated. Right now it says "BSD", but the strverscmp() code is GPL. LGPL not GPL, but .. On 2020/06/12 04:23, Anthony J. Bentley wrote: > The Musl implementation is much shorter and MIT-licensed. > > I feel like upstream feh should be encouraged to integrate this and not > to rely on a nonportable function. that sounds a better idea.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2020/06/12 04:27:52 Modified files: x11/gnome/eog : Makefile Log message: eog: don't build on !rust archs It requires librsvg>=2.44.0 that is rust-only. OK semarie@, aja@ (maintainer)
Re: [new] sysutils/web2ldap and co
On Tue, Jun 09, 2020 at 01:33:12PM +0100, Stuart Henderson wrote:
>
> py-xlwt: math/ would be better than devel/, otherwise ok
>
> py-ldap0: DESCR should warn that this is only intended for running
> the author's software and not for general use (upstream says
> "Don't use it for your own project! The API may change at any
> time without further notice! You have been warned!").
> databases/ would be better than devel/. otherwise ok
>
> web2ldap:
>
> should use FIX_EXTRACT_PERMISSIONS
>
> it's an application rather than a python library, should
> use MODPY_VERSION=${MODPY_DEFAULT_VERSION_3} not FLAVOR/FLAVORS
>
> sysutils/ doesn't seem a natural location, either www or databases
> would be better (I'd prefer databases, maybe www as secondary
> category)
>
> the hand-rolled install parts are error-prone. I suggest
>
> post-install:
> cp -r ${WRKSRC}/htdocs ${PREFIX}/share/doc/web2ldap
> mv ${PREFIX}/etc/web2ldap ${PREFIX}/share/examples/web2ldap
> rmdir ${PREFIX}/etc
>
> this results in small changes to the plist; .htaccess, ssi, robots.txt
> in doc (which can just be left) and these in examples:
>
> +share/examples/web2ldap/logging.conf
> +share/examples/web2ldap/tls/ca-bundle.pem
>
> looks like maybe logging.conf was missed before?
> ca-bundle can be @comment'ed.
> this will mean that future updates don't require careful checking to make
> sure that new files haven't been missed.
>
> pkg/README should use the standard format (as in README.template and every
> other port that has a pkg-readme), but it doesn't seem necessary anyway,
> I suggest just patching hosts.py to use
>
> # File containing all the trusted root CA certs
> ldap0.OPT_X_TLS_CACERTFILE: '/etc/ssl/cert.pem',
>
> as a sane default. otherwise users will be following upstream docs
> to configure things anyway, there's nothing special for OpenBSD there
> really.
100% agree with all that - i've imported py-ldap0 under databases/ and
py-xlwt under textproc, and here's a new tarball for web2ldap to put
under databases/ taking into account your feedback.
landry
web2ldap_2.tgz
Description: application/tar-gz
Re: graphics/feh: add version-sort support
Hi Tim, Tim van der Molen writes: > Version sort is currently disabled in the feh port because it requires > strverscmp() which is a glibc extension. However, it seems safe to copy > the code from glibc and compile it as part of feh. That's what this diff > does. The Musl implementation is much shorter and MIT-licensed. I feel like upstream feh should be encouraged to integrate this and not to rely on a nonportable function. -- Anthony J. Bentley
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2020/06/12 04:04:13 Modified files: textproc : Makefile Log message: +py-xlwt,python3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2020/06/12 04:03:31 Log message: Import py-xlwt 1.3.0, from Maintainer Lucas Raab xlwt is a library for writing data and formatting information to older Excel files (ie: .xls) dependency of upcoming web2ldap port. ok sthen@ (who wanted math/, but i went with textproc/ for consistency with py-xlrd and py-odfpy) Status: Vendor Tag: lraab Release Tags: landry_20200612 N ports/textproc/py-xlwt/Makefile N ports/textproc/py-xlwt/distinfo N ports/textproc/py-xlwt/pkg/DESCR N ports/textproc/py-xlwt/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2020/06/12 03:57:32 Modified files: databases : Makefile Log message: +py-ldap0,python3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2020/06/12 03:56:18 Log message: Import py-ldap0, from MAINTAINER Lucas Raab ldap0 provides an object-oriented API to access LDAP directory servers from Python programs. Mainly it wraps the OpenLDAP 2.x libs for that purpose. Additionally the package contains some Python modules for: * parsing and producing LDIF * handling LDAP URLs * parse and handle LDAPv3 subschema * LDAPv3 extended operations and controls * automatic tests with OpenLDAP server Upstream warns that this should only be used with upstream's software, and API stability is not guaranteed. dependency of upcoming web2ldap port. tweaks by me: update to 1.0.11 (released some hours ago), set NO_TEST as tests/ subdir isnt in PyPi tarballs ok sthen@ Status: Vendor Tag: lraab Release Tags: landry_20200612 N ports/databases/py-ldap0/Makefile N ports/databases/py-ldap0/distinfo N ports/databases/py-ldap0/pkg/DESCR N ports/databases/py-ldap0/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/06/12 03:45:54 Modified files: security/py-rsa: Makefile distinfo Log message: Update to py3-rsa-4.2.
graphics/feh: add version-sort support
It would be nice to be able to use version sort in feh so that 2.jpg
is shown before 10.jpg.
Version sort is currently disabled in the feh port because it requires
strverscmp() which is a glibc extension. However, it seems safe to copy
the code from glibc and compile it as part of feh. That's what this diff
does.
Then, to use version sort, do something like:
$ feh -S filename --version-sort
I'm not sure if and how the license marker in the port Makefile should
be updated. Right now it says "BSD", but the strverscmp() code is GPL.
Tested on amd64. OK?
Index: Makefile
===
RCS file: /cvs/ports/graphics/feh/Makefile,v
retrieving revision 1.102
diff -p -u -r1.102 Makefile
--- Makefile30 May 2020 02:12:35 - 1.102
+++ Makefile12 Jun 2020 09:29:48 -
@@ -3,6 +3,7 @@
COMMENT= lightweight image viewer
DISTNAME= feh-3.4.1
+REVISION= 0
EXTRACT_SUFX= .tar.bz2
CATEGORIES=graphics
FIX_EXTRACT_PERMISSIONS=Yes
@@ -32,10 +33,13 @@ LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE
MAKE_FLAGS=LDFLAGS="${LDFLAGS}" \
man_dir="${DESTDIR}${PREFIX}/man" \
example_dir="${DESTDIR}${PREFIX}/share/examples/feh" \
- exif=1 verscmp=0
+ exif=1
FAKE_FLAGS=PREFIX="${PREFIX}"
USE_GMAKE= Yes
+
+post-patch:
+ cp ${FILESDIR}/strverscmp.c ${WRKSRC}/src
pre-configure:
${SUBST_CMD} ${WRKSRC}/examples/themes ${WRKSRC}/man/feh.pre \
Index: files/strverscmp.c
===
RCS file: files/strverscmp.c
diff -N files/strverscmp.c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ files/strverscmp.c 12 Jun 2020 09:29:48 -
@@ -0,0 +1,109 @@
+/* $OpenBSD */
+
+/* Source:
https://sourceware.org/git/?p=glibc.git;a=blob;f=string/strverscmp.c;hb=d614a7539657941a9201c236b2f15afac18e1213
*/
+
+/* Compare strings while treating digits characters numerically.
+ Copyright (C) 1997-2020 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Jean-François Bignolles , 1997.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2020/06/12 02:35:01 Modified files: geo/pgrouting : Makefile distinfo geo/pgrouting/pkg: PLIST Log message: Update to pgrouting 3.0.0. Tests (using newly-imported pgtap) fails but this is being worked on with upstream.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2020/06/12 02:13:11 Modified files: databases : Makefile Log message: +p5-TAP-Parser-SourceHandler-pgTAP & pgtap
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2020/06/12 02:12:08 Log message: Import pgtap 1.1.0. pgTAP is a unit testing framework for PostgreSQL written in PL/pgSQL and PL/SQL. It includes a comprehensive collection of TAP-emitting assertion functions, as well as the ability to integrate with other TAP-emitting test frameworks. It can also be used in the xUnit testing style. ok/hints afresh1@ Status: Vendor Tag: landry Release Tags: landry_20200612 N ports/databases/pgtap/Makefile N ports/databases/pgtap/distinfo N ports/databases/pgtap/pkg/PLIST N ports/databases/pgtap/pkg/DESCR No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2020/06/12 02:08:52 Log message: Import p5-TAP-Parser-SourceHandler-pgTAP 3.35. This module adds support for executing pgTAP PostgreSQL tests under Test::Harness and prove. This is useful for executing your Perl tests and your PostgreSQL tests together, and analyzing their results. ok afresh1@ Status: Vendor Tag: landry Release Tags: landry_20200612 N ports/databases/p5-TAP-Parser-SourceHandler-pgTAP/Makefile N ports/databases/p5-TAP-Parser-SourceHandler-pgTAP/distinfo N ports/databases/p5-TAP-Parser-SourceHandler-pgTAP/pkg/DESCR N ports/databases/p5-TAP-Parser-SourceHandler-pgTAP/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2020/06/12 02:02:13 Modified files: www/logswan: Makefile distinfo Log message: Update logswan to 2.1.5.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2020/06/12 01:23:41 Modified files: textproc/p5-Text-Table: Makefile distinfo Log message: Update to p5-Text-Table-1.134.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2020/06/12 01:06:54 Modified files: textproc/p5-String-RewritePrefix: Makefile distinfo Log message: Update to p5-String-RewritePrefix-0.008.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2020/06/12 00:56:59 Modified files: net/p5-Net-Ident: Makefile distinfo Log message: Update to p5-Net-Ident-1.25.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2020/06/12 00:42:30 Modified files: devel/p5-OLE-Storage_Lite: Makefile distinfo Log message: Update to p5-OLE-Storage_Lite-0.20.
