graphics/prison and devel/kf5/prison
Hi All, during my efforts to delete KDE4 I noticed the following issue. $ pkg_add prison Ambiguous: choose package for prison a 0: 1: prison-1.0p4 2: prison-5.68.0 Both packages have no conflicts of content so I never noticed it. Now I want to delete prison-1.0p4. But I don't think we have a mechanism for that scenario, do we? The following diff updates prison-5.68.0 to prison-kf5-5.68.0 and does not update prison-1.0p4. So far so good. But how we delete prison-1.0p4 in the next step? OK for the diff below? Rafael Index: devel/kf5/prison/Makefile === RCS file: /cvs/ports/devel/kf5/prison/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- devel/kf5/prison/Makefile 23 Mar 2020 18:01:11 - 1.10 +++ devel/kf5/prison/Makefile 10 Jun 2020 05:09:17 - @@ -2,6 +2,7 @@ COMMENT = bar code generator DISTNAME = prison-${VERSION} +PKGNAME = prison-kf5-${VERSION} SHARED_LIBS = KF5Prison 5.0 Index: devel/kf5/prison/pkg/PLIST === RCS file: /cvs/ports/devel/kf5/prison/pkg/PLIST,v retrieving revision 1.6 diff -u -p -r1.6 PLIST --- devel/kf5/prison/pkg/PLIST 23 Mar 2020 18:01:12 - 1.6 +++ devel/kf5/prison/pkg/PLIST 10 Jun 2020 05:09:17 - @@ -1,6 +1,7 @@ @comment $OpenBSD: PLIST,v 1.6 2020/03/23 18:01:12 rsadowski Exp $ @option no-default-conflict -@conflict prison->=5 +@conflict prison-<5 +@pkgpath devel/kf5/prison include/KF5/ include/KF5/prison/ include/KF5/prison/AbstractBarcode Index: devel/quirks/Makefile === RCS file: /cvs/ports/devel/quirks/Makefile,v retrieving revision 1.960 diff -u -p -r1.960 Makefile --- devel/quirks/Makefile 9 Jun 2020 18:43:09 - 1.960 +++ devel/quirks/Makefile 10 Jun 2020 05:09:22 - @@ -5,7 +5,7 @@ CATEGORIES =devel databases DISTFILES = # API.rev -PKGNAME = quirks-3.351 +PKGNAME = quirks-3.352 PKG_ARCH = * MAINTAINER = Marc Espie Index: devel/quirks/files/Quirks.pm === RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v retrieving revision 1.978 diff -u -p -r1.978 Quirks.pm --- devel/quirks/files/Quirks.pm9 Jun 2020 18:43:09 - 1.978 +++ devel/quirks/files/Quirks.pm10 Jun 2020 05:09:22 - @@ -428,6 +428,7 @@ my $stem_extensions = { 'py-pynetbox' => 'py3-pynetbox', 'py-libvirt' => 'py3-libvirt', 'py-libxml' => 'py3-libxml', + 'prison' => 'prison-kf5', }; my $obsolete_reason = {
sparc64 bulk build report
Bulk build on sparc64-0.ports.openbsd.org Started : Sat Jun 6 20:40:54 MDT 2020 Finished: Tue Jun 9 22:35:49 MDT 2020 Duration: 3 Days 1 hours 55 minutes Built using OpenBSD 6.7-current (GENERIC.MP) #346: Sat Jun 6 04:10:12 MDT 2020 Built 9874 packages Number of packages built each day: Jun 6: 4341 Jun 7: 3454 Jun 8: 1569 Jun 9: 510 Critical path missing pkgs: http://build-failures.rhaalovely.net/sparc64/2020-06-06/summary.log Build failures: 11 http://build-failures.rhaalovely.net/sparc64/2020-06-06/benchmarks/hyperfine.log http://build-failures.rhaalovely.net/sparc64/2020-06-06/devel/snare.log http://build-failures.rhaalovely.net/sparc64/2020-06-06/games/tuxpaint.log http://build-failures.rhaalovely.net/sparc64/2020-06-06/graphics/inkscape.log http://build-failures.rhaalovely.net/sparc64/2020-06-06/graphics/krita.log http://build-failures.rhaalovely.net/sparc64/2020-06-06/lang/hashlink.log http://build-failures.rhaalovely.net/sparc64/2020-06-06/x11/gnome/builder.log http://build-failures.rhaalovely.net/sparc64/2020-06-06/x11/gnome/seahorse.log http://build-failures.rhaalovely.net/sparc64/2020-06-06/x11/gtk+4,-cups.log http://build-failures.rhaalovely.net/sparc64/2020-06-06/x11/kde4/libkexiv2.log http://build-failures.rhaalovely.net/sparc64/2020-06-06/x11/spice-gtk.log Recurrent failures: failures/benchmarks/hyperfine.log failures/devel/snare.log failures/lang/hashlink.log New failures: +failures/games/tuxpaint.log +failures/graphics/inkscape.log +failures/graphics/krita.log +failures/x11/gnome/builder.log +failures/x11/gnome/seahorse.log +failures/x11/gtk+4,-cups.log +failures/x11/kde4/libkexiv2.log +failures/x11/spice-gtk.log Resolved failures: -failures/devel/cpp-hocon.log -failures/devel/glog.log -failures/devel/libidn2.log -failures/games/wrath.log -failures/multimedia/libmatroska.log -failures/x11/p5-Tk-ProgressBar-Mac.log Packages newly built: +archivers/pecl-lzf,php72 +archivers/pecl-lzf,php73 +archivers/pecl-lzf,php74 +archivers/pecl-rar,php72 +archivers/quazip +astro/celestia +astro/kstars +astro/stellarium +audio/ario +audio/audacious/player +audio/audacious/plugins +audio/audacity +audio/calf +audio/cantata +audio/clementine +audio/curseradio +audio/deadbeef +audio/disc-cover +audio/easytag +audio/exaile +audio/gimmix +audio/gmpc +audio/gmpc-plugins +audio/gogglesmm +audio/gqmpeg +audio/gradio +audio/grip +audio/gsound +audio/gtkpod +audio/hydrogen +audio/libcanberra +audio/libcanberra,-gtk +audio/libcanberra,-gtk3 +audio/libcanberra,-main +audio/liblastfm +audio/lmms +audio/milkytracker +audio/mp3cddb +audio/mp3info +audio/mp3splt-gtk +audio/mscore +audio/mumble +audio/mumble,-main +audio/mumble,-server +audio/musique +audio/p5-gnupod +audio/parlatype +audio/pavucontrol +audio/picard +audio/pithos +audio/potamus +audio/puddletag +audio/pykaraoke +audio/pympd +audio/qsynth +audio/quodlibet +audio/rgain +audio/rhythmbox +audio/solfege +audio/sonata +audio/soundtracker +audio/tagtool +audio/timidity,gtk2 +audio/xhippo +benchmarks/netperf-wrapper +benchmarks/netperf-wrapper,-gui +benchmarks/netperf-wrapper,-main +benchmarks/tsung +biology/bioperl +biology/p5-Bio-ASN1-EntrezGene +books/tex-by-topic +cad/fritzing +cad/geda-gaf +cad/gerbv +cad/gtkwave +cad/klogic +cad/librecad +cad/opensta +cad/pcb +cad/qcad +cad/qelectrotech +cad/qucs-s +cad/xnecview +cad/yosys +chinese/libchewing +comms/amtterm +comms/amtterm,-main +comms/amtterm,-term +comms/chirp +comms/gammu +comms/gmfsk +comms/gnuradio +comms/gpsk31 +comms/hylafax +comms/hylafax,a4 +comms/jpilot +comms/mgetty+sendfax +comms/pterm +comms/py-gammu +comms/sigrok/libsigrok +comms/sigrok/pulseview +comms/sigrok/sigrok-cli +comms/tkhylafax +comms/wammu +comms/xastir +comms/xdx +comms/xlog +converters/libpst +converters/libpst,-main +converters/libpst,-python +converters/wv +databases/evolution-data-server +databases/freetds +databases/gq +databases/iodbc +databases/iodbc,-admin +databases/iodbc,-main +databases/kdb +databases/libdbi-drivers +databases/libdbi-drivers,-freetds +databases/libdbi-drivers,-main +databases/libdbi-drivers,-pgsql +databases/libdbi-drivers,-sqlite +databases/libdbi-drivers,-sqlite3 +databases/mdbtools +databases/mdbtools,-gmdb +databases/mdbtools,-main +databases/p5-DBD-Sybase +databases/p5-sybperl +databases/pecl-redis,php72 +databases/pecl-redis,php73 +databases/pecl-redis,php74 +databases/pg_stats_reporter +databases/pgadmin3 +databases/pgfouine +databases/pgmodeler +databases/postgresql-odbc +databases/postgresql-plr +databases/py-odbc +databases/py-odbc,python3 +databases/py-sybase +databases/ruby-hiera-eyaml-gpg +databases/ruby-tiny_tds,ruby26 +databases/ruby-tiny_tds,ruby27 +databases/soprano +databases/sqlite3-odbc +databases/sqlitebrowser +databases/sqsh +databases/strigi +databases/virtuoso +devel/appstream-glib +devel/automoc +devel/boris +devel/codeblocks +devel/cpp-hocon +devel/cudd +devel/dissy +devel/distcc +devel/distcc,-gtk +devel/distcc,-main +devel/distcc,-server +devel/doc++
aarch64 bulk build report
bulk build on arm64.ports.openbsd.org started on Sun Jun 7 02:38:16 MDT 2020 finished at Tue Jun 9 20:43:11 MDT 2020 lasted 2D18h04m done with kern.version=OpenBSD 6.7-current (GENERIC.MP) #650: Sat Jun 6 13:37:16 MDT 2020 built packages:10945 Jun 7:4049 Jun 8:1556 Jun 9:5339 critical path missing pkgs: http://build-failures.rhaalovely.net/aarch64/2020-06-07/summary.log build failures: 11 http://build-failures.rhaalovely.net/aarch64/2020-06-07/databases/sqlite3-odbc.log http://build-failures.rhaalovely.net/aarch64/2020-06-07/editors/xwpe.log http://build-failures.rhaalovely.net/aarch64/2020-06-07/games/tuxpaint.log http://build-failures.rhaalovely.net/aarch64/2020-06-07/graphics/vulkan-loader.log http://build-failures.rhaalovely.net/aarch64/2020-06-07/lang/pfe.log http://build-failures.rhaalovely.net/aarch64/2020-06-07/sysutils/nomad.log http://build-failures.rhaalovely.net/aarch64/2020-06-07/sysutils/rclone.log http://build-failures.rhaalovely.net/aarch64/2020-06-07/sysutils/telegraf.log http://build-failures.rhaalovely.net/aarch64/2020-06-07/sysutils/terragrunt.log http://build-failures.rhaalovely.net/aarch64/2020-06-07/x11/e17/e.log http://build-failures.rhaalovely.net/aarch64/2020-06-07/x11/qt5/qtwebengine.log recurrent failures failures/editors/xwpe.log failures/graphics/vulkan-loader.log failures/lang/pfe.log failures/sysutils/nomad.log failures/sysutils/rclone.log failures/sysutils/telegraf.log failures/sysutils/terragrunt.log failures/x11/qt5/qtwebengine.log new failures +++ ls-failures Tue Jun 9 20:43:21 2020 +failures/databases/sqlite3-odbc.log +failures/games/tuxpaint.log +failures/x11/e17/e.log resolved failures --- ../old/aarch64/last//ls-failuresSat Jun 6 08:08:10 2020 -failures/sysutils/krename.log -failures/telephony/resiprocate,.log -failures/x11/e17/elementary.log
回复: [update] devel/p5-Test-Compile 2.3.1 -> 2.4.0
The update of 2.4.0 include: - RT-132153: Be more verbose when in verbose mode - Update copyright There is no change in function. The patch works well on my system too. wen 发件人: owner-po...@openbsd.org 代表 Charlene Wendling 发送时间: 2020年6月9日 1:35 收件人: ports@openbsd.org 主题: [update] devel/p5-Test-Compile 2.3.1 -> 2.4.0 Hi, Here is an update for Test::Compile; the only change is to let the verbose mode being more verbose [0] I've tested consumers, and there are no new failures due to that update in mail/grepmail and mail/p5-Mail-Mbox-MessageParser. Comments/feedback are welcome, Charlène. [0] https://metacpan.org/diff/file?target=EGILES/Test-Compile-v2.4.0/=EGILES%2FTest-Compile-v2.3.1 Index: Makefile === RCS file: /cvs/ports/devel/p5-Test-Compile/Makefile,v retrieving revision 1.3 diff -u -p -u -p -r1.3 Makefile --- Makefile24 Nov 2019 14:24:39 - 1.3 +++ Makefile8 Jun 2020 16:59:20 - @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.3 2019/11/24 14:24:39 cwen Exp $ COMMENT = check whether Perl files compile correctly -DISTNAME = Test-Compile-v2.3.1 +DISTNAME = Test-Compile-v2.4.0 PKGNAME = p5-${DISTNAME:S/v//g} CATEGORIES =devel Index: distinfo === RCS file: /cvs/ports/devel/p5-Test-Compile/distinfo,v retrieving revision 1.2 diff -u -p -u -p -r1.2 distinfo --- distinfo24 Nov 2019 14:24:39 - 1.2 +++ distinfo8 Jun 2020 16:59:20 - @@ -1,2 +1,2 @@ -SHA256 (Test-Compile-v2.3.1.tar.gz) = EXTP8BABGuQ+ZGJ1XM2KbPA3LKUGcFxgWG97F0j/Td8= -SIZE (Test-Compile-v2.3.1.tar.gz) = 18096 +SHA256 (Test-Compile-v2.4.0.tar.gz) = 7/fjIFJ9ejPZsnRDhxwenV2+sRQI+5hDxWSW9nuZrXg= +SIZE (Test-Compile-v2.4.0.tar.gz) = 18314
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/06/09 19:36:28 Modified files: sysutils/firmware/intel: Makefile distinfo Log message: update intel microcode to 20200609 https://software.intel.com/security-software-guidance/insights/deep-dive-special-register-buffer-data-sampling https://www.vusec.net/projects/crosstalk/ ok sthen@ -- Updates upon 20200520 release -- Processor Identifier Version Products ModelStepping F-MO-S/PI Old->New new platforms updated platforms HSW C0 6-3c-3/32 0027->0028 Core Gen4 BDW-U/Y E0/F06-3d-4/c0 002e->002f Core Gen5 HSW-UC0/D06-45-1/72 0025->0026 Core Gen4 HSW-HC0 6-46-1/32 001b->001c Core Gen4 BDW-H/E3 E0/G06-47-1/22 0021->0022 Core Gen5 SKL-U/Y D0 6-4e-3/c0 00d6->00dc Core Gen6 Mobile SKL-U23e K1 6-4e-3/c0 00d6->00dc Core Gen6 Mobile SKX-SP B1 6-55-3/97 01000151->01000157 Xeon Scalable SKX-SP H0/M0/U0 6-55-4/b7 0265->02006906 Xeon Scalable SKX-DM1 6-55-4/b7 0265->02006906 Xeon D-21xx CLX-SP B0 6-55-6/bf 042c->04002f01 Xeon Scalable Gen2 CLX-SP B1 6-55-7/bf 052c->05002f01 Xeon Scalable Gen2 SKL-H/S R0/N06-5e-3/36 00d6->00dc Core Gen6; Xeon E3 v5 AML-Y22 H0 6-8e-9/10 00ca->00d6 Core Gen8 Mobile KBL-U/Y H0 6-8e-9/c0 00ca->00d6 Core Gen7 Mobile CFL-U43e D0 6-8e-a/c0 00ca->00d6 Core Gen8 Mobile WHL-UW0 6-8e-b/d0 00ca->00d6 Core Gen8 Mobile AML-Y42 V0 6-8e-c/94 00ca->00d6 Core Gen10 Mobile CML-Y42 V0 6-8e-c/94 00ca->00d6 Core Gen10 Mobile WHL-UV0 6-8e-c/94 00ca->00d6 Core Gen8 Mobile KBL-G/H/S/E3 B0 6-9e-9/2a 00ca->00d6 Core Gen7; Xeon E3 v6 CFL-H/S/E3 U0 6-9e-a/22 00ca->00d6 Core Gen8 Desktop, Mobile, Xeon E CFL-SB0 6-9e-b/02 00ca->00d6 Core Gen8 CFL-H/S P0 6-9e-c/22 00ca->00d6 Core Gen9 CFL-HR0 6-9e-d/22 00ca->00d6 Core Gen9 Mobile removed platforms
[Update] www/p5-Mojo : Update to 8.52
Hi, Here is a patch for www/p5-Mojo to update to 8.52. It build well and pass all tests but one fail. One pod_coverage tests fail, it would pass after we update p5-EV. It is a small problem. 11 ports depends on p5-Mojo, all build and pass test with this patch. Regards, wen Index: Makefile === RCS file: /cvs/ports/www/p5-Mojo/Makefile,v retrieving revision 1.36 diff -u -p -r1.36 Makefile --- Makefile25 Jul 2019 20:45:03 - 1.36 +++ Makefile10 Jun 2020 01:08:20 - @@ -4,7 +4,7 @@ COMMENT = next generation web framework MODULES = cpan PKG_ARCH = * -DISTNAME = Mojolicious-8.22 +DISTNAME = Mojolicious-8.52 CATEGORIES = www MAINTAINER = Manolis Tzanidakis Index: distinfo === RCS file: /cvs/ports/www/p5-Mojo/distinfo,v retrieving revision 1.27 diff -u -p -r1.27 distinfo --- distinfo25 Jul 2019 20:45:03 - 1.27 +++ distinfo10 Jun 2020 01:08:20 - @@ -1,2 +1,2 @@ -SHA256 (Mojolicious-8.22.tar.gz) = huNKUPfa63r0NlXXs7/kO7CRJCFr+vMBbm/ZdcPySFQ= -SIZE (Mojolicious-8.22.tar.gz) = 764431 +SHA256 (Mojolicious-8.52.tar.gz) = VrMzkFKNTwgobc5DFdPTG3X44KyWpx4q4qegioIJZlk= +SIZE (Mojolicious-8.52.tar.gz) = 772892 Index: pkg/PLIST === RCS file: /cvs/ports/www/p5-Mojo/pkg/PLIST,v retrieving revision 1.14 diff -u -p -r1.14 PLIST --- pkg/PLIST 3 Mar 2019 01:20:31 - 1.14 +++ pkg/PLIST 10 Jun 2020 01:08:20 - @@ -85,6 +85,8 @@ ${P5SITE}/Mojo/UserAgent/Server.pm ${P5SITE}/Mojo/UserAgent/Transactor.pm ${P5SITE}/Mojo/Util.pm ${P5SITE}/Mojo/WebSocket.pm +${P5SITE}/Mojo/resources/ +${P5SITE}/Mojo/resources/html_entities.txt ${P5SITE}/Mojolicious/ ${P5SITE}/Mojolicious.pm ${P5SITE}/Mojolicious/Command/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/06/09 16:43:16 Modified files: meta/qt5 : Makefile x11/qt5: Makefile.version qt5.port.mk x11/qt5/qttools: Makefile x11/qt5/qtwebkit: Makefile Log message: move from setting qtwebkit version in a variable in Makefile.version and passing it around via qt5.port.mk to setting it directly in the qtwebkit port and setting PKGSPEC so that it's passed automatically. test/ok rsadowski@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/06/09 16:41:44 Modified files: x11/qt5/docs : Makefile Log message: remove unused MASTER_SITES0 which is set based on qtwebkit version but at download.qt.io (which isn't going to work because we're using a fork)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2020/06/09 16:22:33 Modified files: databases/ruby-pg: Makefile distinfo Log message: Update to pg 1.2.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/06/09 15:50:55 Modified files: x11/gnome/libgda: Makefile x11/gnome/libgda/pkg: PLIST-ldap PLIST-main PLIST-mysql PLIST-pgsql PLIST-ui Log message: Regen WANTLIB/PLIST.
Re: CVS: cvs.openbsd.org: ports
On Tue Jun 09, 2020 at 07:28:38PM +0100, Stuart Henderson wrote: > On 2020/06/09 20:21, Marc Espie wrote: > > On Tue, Jun 09, 2020 at 07:52:53PM +0200, Rafael Sadowski wrote: > > > On Tue Jun 09, 2020 at 11:35:12AM -0600, Antoine Jacoutot wrote: > > > > CVSROOT:/cvs > > > > Module name:ports > > > > Changes by: ajacou...@cvs.openbsd.org 2020/06/09 11:35:12 > > > > > > > > Modified files: > > > > x11/qt5/qtwebkit: Makefile > > > > > > > > Log message: > > > > Unbreak PKGNAME. > > > > > > What was the problem? The EPOCH bump was intended and well tested. > > Packaging failed. > > > No, you can't do that. > > > > The only mechanism to do EPOCH bumps is through... EPOCH > > > > Rolling your own by embedding v0 in the PKGNAME is entirely unsupported > > and *will* break various things. > > > > Specifically, revision gets added in the wrong location, and pkg_create(1) > > rightfully protests, which is cool, because it would be much more annoying > > to fix later. Thanks for the input. > > > > This would probably be better, there's no need to pull in the actual > version number via variables through the tree. > > Untested but I think it's right. Thanks Stuart for the diff, looks like it works: TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all pkg_add -u qt5-5.13.2p1:qtwebkit-5.212.0alpha4v0->5.212.0alpha4p0v0: ok qt5-5.13.2p0->5.13.2p1: ok OK! > > Index: meta/qt5/Makefile > === > RCS file: /cvs/ports/meta/qt5/Makefile,v > retrieving revision 1.12 > diff -u -p -r1.12 Makefile > --- meta/qt5/Makefile 5 Apr 2020 15:43:05 - 1.12 > +++ meta/qt5/Makefile 9 Jun 2020 18:27:08 - > @@ -6,7 +6,7 @@ COMMENT-examples =examples for Qt5, met > PKGNAME =qt5-${MODQT5_VERSION} > PKGNAME-main = ${PKGNAME} > PKGNAME-examples = qt5-examples-${MODQT5_VERSION} > -REVISION-main = 0 > +REVISION-main = 1 > > MULTI_PACKAGES = -main -examples > > @@ -44,7 +44,7 @@ RUN_DEPENDS-main = \ > x11/qt5/qttranslations=${MODQT5_VERSION} \ > x11/qt5/qtvirtualkeyboard,-main=${MODQT5_VERSION} \ > x11/qt5/qtwebchannel,-main=${MODQT5_VERSION} \ > - x11/qt5/qtwebkit=${MODQT5_WEBKIT_VERSION} \ > + x11/qt5/qtwebkit \ > x11/qt5/qtwebsockets,-main=${MODQT5_VERSION} \ > x11/qt5/qtx11extras=${MODQT5_VERSION} \ > x11/qt5/qtxmlpatterns,-main=${MODQT5_VERSION} \ > Index: x11/qt5/Makefile.version > === > RCS file: /cvs/ports/x11/qt5/Makefile.version,v > retrieving revision 1.12 > diff -u -p -r1.12 Makefile.version > --- x11/qt5/Makefile.version 16 May 2020 09:53:09 - 1.12 > +++ x11/qt5/Makefile.version 9 Jun 2020 18:27:08 - > @@ -3,7 +3,6 @@ > > QT5_VERSION =5.13.2 > QT5_DIST_VERSION = 5.13.2 > -QT5_WEBKIT_VERSION = 5.212.0alpha4v0 > > # This one is used for building dependencies for examples and documentation, > # which obviously should be in sync with core packages. > Index: x11/qt5/qt5.port.mk > === > RCS file: /cvs/ports/x11/qt5/qt5.port.mk,v > retrieving revision 1.26 > diff -u -p -r1.26 qt5.port.mk > --- x11/qt5/qt5.port.mk 22 May 2020 07:33:47 - 1.26 > +++ x11/qt5/qt5.port.mk 9 Jun 2020 18:27:08 - > @@ -139,7 +139,6 @@ SUBST_VARS += MODQT5_COMMENT > .include "Makefile.version" > > MODQT5_VERSION = ${QT5_VERSION} > -MODQT5_WEBKIT_VERSION = ${QT5_WEBKIT_VERSION} > MODQT_VERSION ?= ${MODQT5_VERSION} > > _MODQT5_PKGMATCH != > Index: x11/qt5/docs/Makefile > === > RCS file: /cvs/ports/x11/qt5/docs/Makefile,v > retrieving revision 1.12 > diff -u -p -r1.12 Makefile > --- x11/qt5/docs/Makefile 16 May 2020 09:43:44 - 1.12 > +++ x11/qt5/docs/Makefile 9 Jun 2020 18:27:08 - > @@ -38,7 +38,6 @@ DOC_COMPONENTS = \ > qtx11extras \ > qtxmlpatterns > > -MASTER_SITES0 = > https://download.qt.io/community_releases/${DIST_VERSION:R}/${QT5_WEBKIT_VERSION}-final/ > DISTFILES = > ${DOC_COMPONENTS:C/$/-everywhere-src-${QT5_DIST_VERSION}${EXTRACT_SUFX}/} > > MODQT5_USE_CXX11 = No > Index: x11/qt5/qttools/Makefile > === > RCS file: /cvs/ports/x11/qt5/qttools/Makefile,v > retrieving revision 1.12 > diff -u -p -r1.12 Makefile > --- x11/qt5/qttools/Makefile 5 Apr 2020 15:43:05 - 1.12 > +++ x11/qt5/qttools/Makefile 9 Jun 2020 18:27:09 - > @@ -4,7 +4,7 @@ QT5NAME = QtTools > COMMENT-main = Qt development tools > COMMENT-webview =Webkit-based Qt Designer plugin >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2020/06/09 15:20:56 Modified files: misc/srcpd : Makefile distinfo misc/srcpd/patches: patch-Makefile_in patch-man_de_srcpd_conf_5 Log message: update 2.1.4 -> 2.1.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2020/06/09 15:21:36 Modified files: sysutils/ruby-r10k: Makefile distinfo Log message: update 3.5.0 -> 3.5.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2020/06/09 15:13:18 Modified files: x11/gnustep/gorm: Makefile distinfo x11/gnustep/gorm/pkg: PLIST Log message: update 1.2.24 -> 1.2.26
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2020/06/09 15:12:46 Modified files: x11/gnustep/back: Makefile distinfo Log message: update 0.27.0 -> 0.28.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2020/06/09 15:12:17 Modified files: x11/gnustep/gui: Makefile distinfo x11/gnustep/gui/patches: patch-Tools_speech_FliteSpeechEngine_m patch-configure_ac x11/gnustep/gui/pkg: PLIST Log message: update 0.27.0 -> 0.28.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2020/06/09 15:11:02 Modified files: x11/gnustep/base: Makefile distinfo x11/gnustep/base/pkg: PLIST Log message: update 1.26.0 -> 1.27.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2020/06/09 15:07:06 Modified files: x11/gnustep/make: Makefile distinfo Removed files: x11/gnustep/make/patches: patch-common_make Log message: update 2.7.0 -> 2.8.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2020/06/09 15:00:33 Modified files: infrastructure/bin: register-plist Log message: add option -n, as it's the simplest one to do (do all the checks, but don't write a thing. useful for bulks with test changes that should be reverted later)
Re: Update to Jinja2 2.11.2
On 2020/06/09 20:45, Klemens Nanni wrote: > Now with proper subject, sorry. > > Another port I work on requires py3-jinja2>=2.10.1. > "make test" passes and sysutils/ansible is still happy. Tests fail unless it's already installed (and if an old v is already installed they also fail). trac seems ok (so py-jinja2 still works :) I haven't looked closely at changelog but didn't notice anything concerning from a quick skim. > Switch to stable PYPI releases and update HOMEPAGE while here. > > OK? broadly OK with tests fixed, but I'd be happier if at least sphinx was tested before this goes in :) > --- > www/py-jinja2/Makefile | 10 +++--- > www/py-jinja2/distinfo | 4 ++-- > www/py-jinja2/pkg/PLIST | 1 - > 3 files changed, 5 insertions(+), 10 deletions(-) > > diff --git a/www/py-jinja2/Makefile b/www/py-jinja2/Makefile > index 7fbb984dcb0..376c18fdcb4 100644 > --- a/www/py-jinja2/Makefile > +++ b/www/py-jinja2/Makefile > @@ -2,18 +2,13 @@ > > COMMENT =fast, optionally sandboxed, Python template engine > > -MODPY_EGG_VERSION = 2.10 > +MODPY_EGG_VERSION = 2.11.2 > DISTNAME = Jinja2-${MODPY_EGG_VERSION} > PKGNAME =py-${DISTNAME:L} > -REVISION=0 > - > -GH_ACCOUNT= pallets > -GH_PROJECT= jinja > -GH_TAGNAME= ${MODPY_EGG_VERSION} > > CATEGORIES = www devel > > -HOMEPAGE = http://jinja.pocoo.org/ > +HOMEPAGE = https://jinja.palletsprojects.com > > MAINTAINER = frantisek holop > > @@ -28,5 +23,6 @@ FLAVOR ?= > > MODPY_SETUPTOOLS = Yes > MODPY_PYTEST = Yes > +MODPY_PI = Yes > > .include > diff --git a/www/py-jinja2/distinfo b/www/py-jinja2/distinfo > index f6fb2b2ba63..a85018aa47b 100644 > --- a/www/py-jinja2/distinfo > +++ b/www/py-jinja2/distinfo > @@ -1,2 +1,2 @@ > -SHA256 (Jinja2-2.10.tar.gz) = DTHTRmwxOpygFKLZBP7RjNrIc6W6H3twuP2LIGzYYNY= > -SIZE (Jinja2-2.10.tar.gz) = 267508 > +SHA256 (Jinja2-2.11.2.tar.gz) = iaqyFUJ+9Zw0rVhzUmnrWLGlgIEDBn97udWDbGUbO7A= > +SIZE (Jinja2-2.11.2.tar.gz) = 257594 > diff --git a/www/py-jinja2/pkg/PLIST b/www/py-jinja2/pkg/PLIST > index 5d8c747efe2..8f8cb60c8b3 100644 > --- a/www/py-jinja2/pkg/PLIST > +++ b/www/py-jinja2/pkg/PLIST > @@ -4,7 +4,6 @@ > lib/python${MODPY_VERSION}/site-packages/Jinja2-${MODPY_EGG_VERSION}-py${MODPY_V > > lib/python${MODPY_VERSION}/site-packages/Jinja2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt > > lib/python${MODPY_VERSION}/site-packages/Jinja2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt > > lib/python${MODPY_VERSION}/site-packages/Jinja2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt > -lib/python${MODPY_VERSION}/site-packages/Jinja2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe > > lib/python${MODPY_VERSION}/site-packages/Jinja2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt > > lib/python${MODPY_VERSION}/site-packages/Jinja2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt > lib/python${MODPY_VERSION}/site-packages/jinja2/ > -- > 2.27.0 >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/06/09 13:56:59 Modified files: math/maxima: Makefile distinfo math/maxima/pkg: PLIST Removed files: math/maxima/patches: patch-lisp-utils_defsystem_lisp patch-src_maxima_system Log message: Update to Maxima 5.44.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2020/06/09 13:39:06 Modified files: www/ruby-unicorn: Makefile distinfo Log message: Update to unicorn 5.5.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/06/09 13:12:03 Modified files: graphics/evince: Makefile distinfo Log message: update to evince-3.36.4
Update to tabulate 0.8.7
Another port I work on requires py3-tabulate>=0.8.4. "make test" passes, no PLIST change. Only consumer (Python 2) is security/floss which I did not test. OK? --- devel/py-tabulate/Makefile | 3 +-- devel/py-tabulate/distinfo | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/devel/py-tabulate/Makefile b/devel/py-tabulate/Makefile index 132cb173d4d..95959fe15d6 100644 --- a/devel/py-tabulate/Makefile +++ b/devel/py-tabulate/Makefile @@ -2,10 +2,9 @@ COMMENT = pretty-print tabular data -MODPY_EGG_VERSION =0.8.2 +MODPY_EGG_VERSION =0.8.7 DISTNAME = tabulate-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} -REVISION = 0 CATEGORIES = devel diff --git a/devel/py-tabulate/distinfo b/devel/py-tabulate/distinfo index 2315a0c725b..4b278ae53a2 100644 --- a/devel/py-tabulate/distinfo +++ b/devel/py-tabulate/distinfo @@ -1,2 +1,2 @@ -SHA256 (tabulate-0.8.2.tar.gz) = 5MoT8m0Ka+KikVQo3CHnMvHkTa1/dtcDCy7x7CUc9/I= -SIZE (tabulate-0.8.2.tar.gz) = 45758 +SHA256 (tabulate-0.8.7.tar.gz) = 2ycjog0EvNqFIhZcc+6nwwDtp04M6FLZAi4BWdeJUAc= +SIZE (tabulate-0.8.7.tar.gz) = 50913 -- 2.27.0
Update to Jinja2 2.11.2
Now with proper subject, sorry. Another port I work on requires py3-jinja2>=2.10.1. "make test" passes and sysutils/ansible is still happy. Switch to stable PYPI releases and update HOMEPAGE while here. OK? --- www/py-jinja2/Makefile | 10 +++--- www/py-jinja2/distinfo | 4 ++-- www/py-jinja2/pkg/PLIST | 1 - 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/www/py-jinja2/Makefile b/www/py-jinja2/Makefile index 7fbb984dcb0..376c18fdcb4 100644 --- a/www/py-jinja2/Makefile +++ b/www/py-jinja2/Makefile @@ -2,18 +2,13 @@ COMMENT = fast, optionally sandboxed, Python template engine -MODPY_EGG_VERSION =2.10 +MODPY_EGG_VERSION =2.11.2 DISTNAME = Jinja2-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME:L} -REVISION= 0 - -GH_ACCOUNT=pallets -GH_PROJECT=jinja -GH_TAGNAME=${MODPY_EGG_VERSION} CATEGORIES = www devel -HOMEPAGE = http://jinja.pocoo.org/ +HOMEPAGE = https://jinja.palletsprojects.com MAINTAINER = frantisek holop @@ -28,5 +23,6 @@ FLAVOR ?= MODPY_SETUPTOOLS = Yes MODPY_PYTEST = Yes +MODPY_PI = Yes .include diff --git a/www/py-jinja2/distinfo b/www/py-jinja2/distinfo index f6fb2b2ba63..a85018aa47b 100644 --- a/www/py-jinja2/distinfo +++ b/www/py-jinja2/distinfo @@ -1,2 +1,2 @@ -SHA256 (Jinja2-2.10.tar.gz) = DTHTRmwxOpygFKLZBP7RjNrIc6W6H3twuP2LIGzYYNY= -SIZE (Jinja2-2.10.tar.gz) = 267508 +SHA256 (Jinja2-2.11.2.tar.gz) = iaqyFUJ+9Zw0rVhzUmnrWLGlgIEDBn97udWDbGUbO7A= +SIZE (Jinja2-2.11.2.tar.gz) = 257594 diff --git a/www/py-jinja2/pkg/PLIST b/www/py-jinja2/pkg/PLIST index 5d8c747efe2..8f8cb60c8b3 100644 --- a/www/py-jinja2/pkg/PLIST +++ b/www/py-jinja2/pkg/PLIST @@ -4,7 +4,6 @@ lib/python${MODPY_VERSION}/site-packages/Jinja2-${MODPY_EGG_VERSION}-py${MODPY_V lib/python${MODPY_VERSION}/site-packages/Jinja2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt lib/python${MODPY_VERSION}/site-packages/Jinja2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt lib/python${MODPY_VERSION}/site-packages/Jinja2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt -lib/python${MODPY_VERSION}/site-packages/Jinja2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe lib/python${MODPY_VERSION}/site-packages/Jinja2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt lib/python${MODPY_VERSION}/site-packages/Jinja2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/jinja2/ -- 2.27.0
[no subject]
Subject: Update to Jinja2 2.11.2 Another port I work on requires py3-jinja2>=2.10.1. "make test" passes and sysutils/ansible is still happy. Switch to stable PYPI releases and update HOMEPAGE while here. OK? --- www/py-jinja2/Makefile | 10 +++--- www/py-jinja2/distinfo | 4 ++-- www/py-jinja2/pkg/PLIST | 1 - 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/www/py-jinja2/Makefile b/www/py-jinja2/Makefile index 7fbb984dcb0..376c18fdcb4 100644 --- a/www/py-jinja2/Makefile +++ b/www/py-jinja2/Makefile @@ -2,18 +2,13 @@ COMMENT = fast, optionally sandboxed, Python template engine -MODPY_EGG_VERSION =2.10 +MODPY_EGG_VERSION =2.11.2 DISTNAME = Jinja2-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME:L} -REVISION= 0 - -GH_ACCOUNT=pallets -GH_PROJECT=jinja -GH_TAGNAME=${MODPY_EGG_VERSION} CATEGORIES = www devel -HOMEPAGE = http://jinja.pocoo.org/ +HOMEPAGE = https://jinja.palletsprojects.com MAINTAINER = frantisek holop @@ -28,5 +23,6 @@ FLAVOR ?= MODPY_SETUPTOOLS = Yes MODPY_PYTEST = Yes +MODPY_PI = Yes .include diff --git a/www/py-jinja2/distinfo b/www/py-jinja2/distinfo index f6fb2b2ba63..a85018aa47b 100644 --- a/www/py-jinja2/distinfo +++ b/www/py-jinja2/distinfo @@ -1,2 +1,2 @@ -SHA256 (Jinja2-2.10.tar.gz) = DTHTRmwxOpygFKLZBP7RjNrIc6W6H3twuP2LIGzYYNY= -SIZE (Jinja2-2.10.tar.gz) = 267508 +SHA256 (Jinja2-2.11.2.tar.gz) = iaqyFUJ+9Zw0rVhzUmnrWLGlgIEDBn97udWDbGUbO7A= +SIZE (Jinja2-2.11.2.tar.gz) = 257594 diff --git a/www/py-jinja2/pkg/PLIST b/www/py-jinja2/pkg/PLIST index 5d8c747efe2..8f8cb60c8b3 100644 --- a/www/py-jinja2/pkg/PLIST +++ b/www/py-jinja2/pkg/PLIST @@ -4,7 +4,6 @@ lib/python${MODPY_VERSION}/site-packages/Jinja2-${MODPY_EGG_VERSION}-py${MODPY_V lib/python${MODPY_VERSION}/site-packages/Jinja2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt lib/python${MODPY_VERSION}/site-packages/Jinja2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt lib/python${MODPY_VERSION}/site-packages/Jinja2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt -lib/python${MODPY_VERSION}/site-packages/Jinja2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe lib/python${MODPY_VERSION}/site-packages/Jinja2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt lib/python${MODPY_VERSION}/site-packages/Jinja2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/jinja2/ -- 2.27.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/06/09 12:43:09 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: register gq removal
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/06/09 12:42:59 Modified files: databases : Makefile Removed files: databases/gq : Makefile distinfo databases/gq/patches: patch-configure patch-data_gq_desktop_in patch-src_glib-helpers_c patch-src_glib-helpers_h patch-src_gq-hash-openssl_c patch-src_gq-hash_h patch-src_gq-main-loop_h patch-src_gq-server_c patch-src_gq-stack_c patch-src_gq-stack_h patch-src_gq-tab-schema_c patch-src_gq-tab_h patch-src_state_c patch-src_syntax_h databases/gq/pkg: DESCR PLIST Log message: remove gq; it's dead upstream, unmaintained and stands in the way of removing the arcane gnome-doc-utils ok aja@
Re: CVS: cvs.openbsd.org: ports
On Tue, Jun 09, 2020 at 08:21:12PM +0200, Marc Espie wrote: > On Tue, Jun 09, 2020 at 07:52:53PM +0200, Rafael Sadowski wrote: > > On Tue Jun 09, 2020 at 11:35:12AM -0600, Antoine Jacoutot wrote: > > > CVSROOT: /cvs > > > Module name: ports > > > Changes by: ajacou...@cvs.openbsd.org 2020/06/09 11:35:12 > > > > > > Modified files: > > > x11/qt5/qtwebkit: Makefile > > > > > > Log message: > > > Unbreak PKGNAME. > > > > What was the problem? The EPOCH bump was intended and well tested. > > No, you can't do that. > > The only mechanism to do EPOCH bumps is through... EPOCH > > Rolling your own by embedding v0 in the PKGNAME is entirely unsupported > and *will* break various things. > > Specifically, revision gets added in the wrong location, and pkg_create(1) > rightfully protests, which is cool, because it would be much more annoying > to fix later. > > Note that at the moment, I don't quite remember all the reasons why rolling your own is bad, but I made a very conscious decision to architect all the PKGNAME/FULLPKGNAME/REVISION/EPOCH/MULTI_PACKAGES mess the way it is designed, and it is 100% unsustainable and not supported to try to do things the way you do. If anything, I would add more checks to prevent the things you try from accidentally working if I could. If you want an EPOCH, you use EPOCH. If that interferes with dependencies PKGSPEC was written precisely to handle that issue.
Re: CVS: cvs.openbsd.org: ports
On 2020/06/09 20:21, Marc Espie wrote: > On Tue, Jun 09, 2020 at 07:52:53PM +0200, Rafael Sadowski wrote: > > On Tue Jun 09, 2020 at 11:35:12AM -0600, Antoine Jacoutot wrote: > > > CVSROOT: /cvs > > > Module name: ports > > > Changes by: ajacou...@cvs.openbsd.org 2020/06/09 11:35:12 > > > > > > Modified files: > > > x11/qt5/qtwebkit: Makefile > > > > > > Log message: > > > Unbreak PKGNAME. > > > > What was the problem? The EPOCH bump was intended and well tested. Packaging failed. > No, you can't do that. > > The only mechanism to do EPOCH bumps is through... EPOCH > > Rolling your own by embedding v0 in the PKGNAME is entirely unsupported > and *will* break various things. > > Specifically, revision gets added in the wrong location, and pkg_create(1) > rightfully protests, which is cool, because it would be much more annoying > to fix later. > This would probably be better, there's no need to pull in the actual version number via variables through the tree. Untested but I think it's right. Index: meta/qt5/Makefile === RCS file: /cvs/ports/meta/qt5/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- meta/qt5/Makefile 5 Apr 2020 15:43:05 - 1.12 +++ meta/qt5/Makefile 9 Jun 2020 18:27:08 - @@ -6,7 +6,7 @@ COMMENT-examples = examples for Qt5, met PKGNAME = qt5-${MODQT5_VERSION} PKGNAME-main = ${PKGNAME} PKGNAME-examples = qt5-examples-${MODQT5_VERSION} -REVISION-main =0 +REVISION-main =1 MULTI_PACKAGES = -main -examples @@ -44,7 +44,7 @@ RUN_DEPENDS-main =\ x11/qt5/qttranslations=${MODQT5_VERSION} \ x11/qt5/qtvirtualkeyboard,-main=${MODQT5_VERSION} \ x11/qt5/qtwebchannel,-main=${MODQT5_VERSION} \ - x11/qt5/qtwebkit=${MODQT5_WEBKIT_VERSION} \ + x11/qt5/qtwebkit \ x11/qt5/qtwebsockets,-main=${MODQT5_VERSION} \ x11/qt5/qtx11extras=${MODQT5_VERSION} \ x11/qt5/qtxmlpatterns,-main=${MODQT5_VERSION} \ Index: x11/qt5/Makefile.version === RCS file: /cvs/ports/x11/qt5/Makefile.version,v retrieving revision 1.12 diff -u -p -r1.12 Makefile.version --- x11/qt5/Makefile.version16 May 2020 09:53:09 - 1.12 +++ x11/qt5/Makefile.version9 Jun 2020 18:27:08 - @@ -3,7 +3,6 @@ QT5_VERSION = 5.13.2 QT5_DIST_VERSION = 5.13.2 -QT5_WEBKIT_VERSION = 5.212.0alpha4v0 # This one is used for building dependencies for examples and documentation, # which obviously should be in sync with core packages. Index: x11/qt5/qt5.port.mk === RCS file: /cvs/ports/x11/qt5/qt5.port.mk,v retrieving revision 1.26 diff -u -p -r1.26 qt5.port.mk --- x11/qt5/qt5.port.mk 22 May 2020 07:33:47 - 1.26 +++ x11/qt5/qt5.port.mk 9 Jun 2020 18:27:08 - @@ -139,7 +139,6 @@ SUBST_VARS += MODQT5_COMMENT .include "Makefile.version" MODQT5_VERSION = ${QT5_VERSION} -MODQT5_WEBKIT_VERSION =${QT5_WEBKIT_VERSION} MODQT_VERSION ?= ${MODQT5_VERSION} _MODQT5_PKGMATCH != Index: x11/qt5/docs/Makefile === RCS file: /cvs/ports/x11/qt5/docs/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- x11/qt5/docs/Makefile 16 May 2020 09:43:44 - 1.12 +++ x11/qt5/docs/Makefile 9 Jun 2020 18:27:08 - @@ -38,7 +38,6 @@ DOC_COMPONENTS = \ qtx11extras \ qtxmlpatterns -MASTER_SITES0 = https://download.qt.io/community_releases/${DIST_VERSION:R}/${QT5_WEBKIT_VERSION}-final/ DISTFILES = ${DOC_COMPONENTS:C/$/-everywhere-src-${QT5_DIST_VERSION}${EXTRACT_SUFX}/} MODQT5_USE_CXX11 = No Index: x11/qt5/qttools/Makefile === RCS file: /cvs/ports/x11/qt5/qttools/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- x11/qt5/qttools/Makefile5 Apr 2020 15:43:05 - 1.12 +++ x11/qt5/qttools/Makefile9 Jun 2020 18:27:09 - @@ -4,7 +4,7 @@ QT5NAME = QtTools COMMENT-main = Qt development tools COMMENT-webview = Webkit-based Qt Designer plugin PKGNAME-webview = qwebview-${VERSION} -REVISON-webview = 0 +REVISION-webview = 0 DPB_PROPERTIES = parallel @@ -34,7 +34,7 @@ LIB_DEPENDS-main =${LIB_DEPENDS} \ LIB_DEPENDS-webview = ${LIB_DEPENDS} \ ${BUILD_PKGPATH}>=${QT5_VERSION},<${QT5_NEXT_VERSION} \ - x11/qt5/qtwebkit>=${QT5_WEBKIT_VERSION} + x11/qt5/qtwebkit FLAVORS = debug PSEUDO_FLAVORS = bootstrap no_examples no_webview
Re: CVS: cvs.openbsd.org: ports
On Tue, Jun 09, 2020 at 07:52:53PM +0200, Rafael Sadowski wrote: > On Tue Jun 09, 2020 at 11:35:12AM -0600, Antoine Jacoutot wrote: > > CVSROOT:/cvs > > Module name:ports > > Changes by: ajacou...@cvs.openbsd.org 2020/06/09 11:35:12 > > > > Modified files: > > x11/qt5/qtwebkit: Makefile > > > > Log message: > > Unbreak PKGNAME. > > What was the problem? The EPOCH bump was intended and well tested. No, you can't do that. The only mechanism to do EPOCH bumps is through... EPOCH Rolling your own by embedding v0 in the PKGNAME is entirely unsupported and *will* break various things. Specifically, revision gets added in the wrong location, and pkg_create(1) rightfully protests, which is cool, because it would be much more annoying to fix later.
Re: CVS: cvs.openbsd.org: ports
On Tue Jun 09, 2020 at 11:35:12AM -0600, Antoine Jacoutot wrote: > CVSROOT: /cvs > Module name: ports > Changes by: ajacou...@cvs.openbsd.org 2020/06/09 11:35:12 > > Modified files: > x11/qt5/qtwebkit: Makefile > > Log message: > Unbreak PKGNAME. What was the problem? The EPOCH bump was intended and well tested. We updated from 5.212.0 to 5.212.0alpha4 and for that we needed 5.212.0alpha4v0 "v0". The whole story: https://marc.info/?t=15814969101=1=2
[maintainer update] gerbil-0.16
Hi, Gerbil scheme got new release a while ago. Only tested on amd64, would be nice if someone could test if the tags building still fails on i386. timo Index: Makefile === RCS file: /cvs/ports/lang/gerbil/Makefile,v retrieving revision 1.9 diff -u -p -u -p -r1.9 Makefile --- Makefile21 Feb 2020 20:25:55 - 1.9 +++ Makefile9 Jun 2020 17:34:33 - @@ -9,7 +9,7 @@ COMMENT = dialect of Scheme designed for GH_ACCOUNT = vyzo GH_PROJECT = gerbil -GH_TAGNAME = v0.15.1 +GH_TAGNAME = v0.16 CATEGORIES = lang Index: distinfo === RCS file: /cvs/ports/lang/gerbil/distinfo,v retrieving revision 1.3 diff -u -p -u -p -r1.3 distinfo --- distinfo10 Feb 2019 18:01:30 - 1.3 +++ distinfo9 Jun 2020 17:34:33 - @@ -1,2 +1,2 @@ -SHA256 (gerbil-0.15.1.tar.gz) = PSnuzaqEWwc7+EE81U5CCz9Ix5wl5D+rWjed3gKdDN4= -SIZE (gerbil-0.15.1.tar.gz) = 1326871 +SHA256 (gerbil-0.16.tar.gz) = EVfU72DatqD3xJhtXJODkZcwRQk8RwoD/+AiZsTT4Rk= +SIZE (gerbil-0.16.tar.gz) = 1715765 Index: pkg/PLIST === RCS file: /cvs/ports/lang/gerbil/pkg/PLIST,v retrieving revision 1.3 diff -u -p -u -p -r1.3 PLIST --- pkg/PLIST 10 Feb 2019 18:01:30 - 1.3 +++ pkg/PLIST 9 Jun 2020 17:34:33 - @@ -5,6 +5,7 @@ gerbil/LICENSE-APACHE-2.0.txt gerbil/LICENSE-LGPL.txt gerbil/README.md gerbil/bin/ +gerbil/bin/.keep gerbil/bin/gxc gerbil/bin/gxi gerbil/bin/gxi-build-script @@ -15,7 +16,16 @@ gerbil/bin/gxi-script gerbil/doc/ gerbil/doc/.vuepress/ gerbil/doc/.vuepress/config.js -gerbil/doc/.vuepress/style.styl +gerbil/doc/.vuepress/public/ +gerbil/doc/.vuepress/public/img/ +gerbil/doc/.vuepress/public/img/gerbil-detailed-consio_OPT.svg +gerbil/doc/.vuepress/public/img/gerbil-detailed_INK.svg +gerbil/doc/.vuepress/public/img/gerbil-detailed_OPT.svg +gerbil/doc/.vuepress/public/img/gerbil-flat-colored-consio_OPT.svg +gerbil/doc/.vuepress/public/img/gerbil-flat-colored_INK.svg +gerbil/doc/.vuepress/public/img/gerbil-flat-colored_OPT.svg +gerbil/doc/.vuepress/styles/ +gerbil/doc/.vuepress/styles/index.styl gerbil/doc/build.sh gerbil/doc/guide/ gerbil/doc/guide/README.md @@ -32,6 +42,7 @@ gerbil/doc/guide/profiler.md gerbil/doc/guide/r7rs.md gerbil/doc/guide/shell.md gerbil/doc/guide/srfi.md +gerbil/doc/package-lock.json gerbil/doc/package.json gerbil/doc/readme.md gerbil/doc/reference/ @@ -70,6 +81,7 @@ gerbil/doc/reference/sort.md gerbil/doc/reference/srfi.md gerbil/doc/reference/stdlib.md gerbil/doc/reference/stxparam.md +gerbil/doc/reference/stxutil.md gerbil/doc/reference/sugar.md gerbil/doc/reference/test.md gerbil/doc/reference/text.md @@ -82,6 +94,7 @@ gerbil/doc/tutorials/kvstore.md gerbil/doc/tutorials/languages.md gerbil/doc/tutorials/proxy.md gerbil/lib/ +gerbil/lib/.keep gerbil/lib/gerbil/ gerbil/lib/gerbil/compiler/ gerbil/lib/gerbil/compiler.ssi @@ -113,6 +126,10 @@ gerbil/lib/gerbil/compiler/optimize-call gerbil/lib/gerbil/compiler/optimize-call.ssxi.ss @bin gerbil/lib/gerbil/compiler/optimize-call__0.o1 @bin gerbil/lib/gerbil/compiler/optimize-call__rt.o1 +gerbil/lib/gerbil/compiler/optimize-spec.ssi +gerbil/lib/gerbil/compiler/optimize-spec.ssxi.ss +@bin gerbil/lib/gerbil/compiler/optimize-spec__0.o1 +@bin gerbil/lib/gerbil/compiler/optimize-spec__rt.o1 gerbil/lib/gerbil/compiler/optimize-top.ssi gerbil/lib/gerbil/compiler/optimize-top.ssxi.ss @bin gerbil/lib/gerbil/compiler/optimize-top__0.o1 @@ -266,6 +283,11 @@ gerbil/lib/gerbil/gambit/threads.ssxi.ss @bin gerbil/lib/gerbil/gambit/threads__0.o1 @bin gerbil/lib/gerbil/gambit/threads__rt.o1 @bin gerbil/lib/gerbil/gambit__rt.o1 +@bin gerbil/lib/gerbil/polydactyl$_gambit__rt.o1 +gerbil/lib/gerbil/polydactyl.ssi +gerbil/lib/gerbil/polydactyl.ssxi.ss +@bin gerbil/lib/gerbil/polydactyl__1.o1 +@bin gerbil/lib/gerbil/polydactyl__rt.o1 gerbil/lib/gerbil/tools/ gerbil/lib/gerbil/tools/gxpkg.ssi gerbil/lib/gerbil/tools/gxpkg.ssxi.ss @@ -295,162 +317,317 @@ gerbil/lib/scheme/ gerbil/lib/scheme/base-etc.ssi gerbil/lib/scheme/base-etc.ssxi.ss @bin gerbil/lib/scheme/base-etc__0.o1 +gerbil/lib/scheme/base-etc__0.scm @bin gerbil/lib/scheme/base-etc__1.o1 +gerbil/lib/scheme/base-etc__1.scm @bin gerbil/lib/scheme/base-etc__rt.o1 +gerbil/lib/scheme/base-etc__rt.scm gerbil/lib/scheme/base-impl.ssi gerbil/lib/scheme/base-impl.ssxi.ss @bin gerbil/lib/scheme/base-impl__0.o1 +gerbil/lib/scheme/base-impl__0.scm @bin gerbil/lib/scheme/base-impl__1.o1 +gerbil/lib/scheme/base-impl__1.scm @bin gerbil/lib/scheme/base-impl__rt.o1 +gerbil/lib/scheme/base-impl__rt.scm gerbil/lib/scheme/base-ports.ssi gerbil/lib/scheme/base-ports.ssxi.ss @bin gerbil/lib/scheme/base-ports__0.o1 +gerbil/lib/scheme/base-ports__0.scm @bin gerbil/lib/scheme/base-ports__rt.o1 +gerbil/lib/scheme/base-ports__rt.scm gerbil/lib/scheme/base-vectors.ssi
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/06/09 11:35:12 Modified files: x11/qt5/qtwebkit: Makefile Log message: Unbreak PKGNAME. ok jasper@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: chr...@cvs.openbsd.org 2020/06/09 11:34:15 Modified files: devel/cil : Makefile devel/coccinelle: Makefile devel/dune : Makefile devel/frama-c : Makefile devel/ocaml-biniou: Makefile devel/ocaml-cppo: Makefile devel/ocaml-easy-format: Makefile devel/ocaml-graph: Makefile devel/ocaml-menhir: Makefile devel/ocaml-ocamlbuild: Makefile devel/ocaml-ocamlbuild/pkg: PLIST devel/ocaml-parmap: Makefile devel/ocaml-pcre: Makefile devel/ocaml-yojson: Makefile graphics/ocaml-cairo: Makefile graphics/ocaml-graphics: Makefile graphics/pdfsandwich: Makefile lang/haxe : Makefile lang/ocaml : Makefile distinfo lang/ocaml/patches: patch-configure_ac lang/ocaml/pkg : PFRAG.native PLIST lang/ocaml-camlp5: Makefile math/ocaml-num : Makefile math/ocaml-zarith: Makefile net/mldonkey : Makefile net/unison/2.4x: Makefile net/unison/2.5x: Makefile sysutils/findlib: Makefile textproc/bibtex2html: Makefile textproc/hevea : Makefile x11/kde-applications/kalzium: Makefile lang/ocaml-camlp4: Makefile distinfo lang/ocaml-camlp4/patches: patch-configure Log message: Update lang/ocaml to 4.10.0 tested on sparc64, update to lang/camlp4 and ok by jca@ ok daniel@ thanks.
update intel microcode to 20200609
https://software.intel.com/security-software-guidance/insights/deep-dive-special-register-buffer-data-sampling https://www.vusec.net/projects/crosstalk/ -- Updates upon 20200520 release -- Processor Identifier Version Products ModelStepping F-MO-S/PI Old->New new platforms updated platforms HSW C0 6-3c-3/32 0027->0028 Core Gen4 BDW-U/Y E0/F06-3d-4/c0 002e->002f Core Gen5 HSW-UC0/D06-45-1/72 0025->0026 Core Gen4 HSW-HC0 6-46-1/32 001b->001c Core Gen4 BDW-H/E3 E0/G06-47-1/22 0021->0022 Core Gen5 SKL-U/Y D0 6-4e-3/c0 00d6->00dc Core Gen6 Mobile SKL-U23e K1 6-4e-3/c0 00d6->00dc Core Gen6 Mobile SKX-SP B1 6-55-3/97 01000151->01000157 Xeon Scalable SKX-SP H0/M0/U0 6-55-4/b7 0265->02006906 Xeon Scalable SKX-DM1 6-55-4/b7 0265->02006906 Xeon D-21xx CLX-SP B0 6-55-6/bf 042c->04002f01 Xeon Scalable Gen2 CLX-SP B1 6-55-7/bf 052c->05002f01 Xeon Scalable Gen2 SKL-H/S R0/N06-5e-3/36 00d6->00dc Core Gen6; Xeon E3 v5 AML-Y22 H0 6-8e-9/10 00ca->00d6 Core Gen8 Mobile KBL-U/Y H0 6-8e-9/c0 00ca->00d6 Core Gen7 Mobile CFL-U43e D0 6-8e-a/c0 00ca->00d6 Core Gen8 Mobile WHL-UW0 6-8e-b/d0 00ca->00d6 Core Gen8 Mobile AML-Y42 V0 6-8e-c/94 00ca->00d6 Core Gen10 Mobile CML-Y42 V0 6-8e-c/94 00ca->00d6 Core Gen10 Mobile WHL-UV0 6-8e-c/94 00ca->00d6 Core Gen8 Mobile KBL-G/H/S/E3 B0 6-9e-9/2a 00ca->00d6 Core Gen7; Xeon E3 v6 CFL-H/S/E3 U0 6-9e-a/22 00ca->00d6 Core Gen8 Desktop, Mobile, Xeon E CFL-SB0 6-9e-b/02 00ca->00d6 Core Gen8 CFL-H/S P0 6-9e-c/22 00ca->00d6 Core Gen9 CFL-HR0 6-9e-d/22 00ca->00d6 Core Gen9 Mobile removed platforms Index: Makefile === RCS file: /cvs/ports/sysutils/firmware/intel/Makefile,v retrieving revision 1.22 diff -u -p -r1.22 Makefile --- Makefile25 May 2020 03:17:25 - 1.22 +++ Makefile9 Jun 2020 17:12:46 - @@ -3,7 +3,7 @@ COMMENT= microcode update binaries for Intel CPUs FW_DRIVER= intel -FW_VER=20200520 +FW_VER=20200609 EPOCH= 0 GH_ACCOUNT=intel GH_PROJECT=Intel-Linux-Processor-Microcode-Data-Files Index: distinfo === RCS file: /cvs/ports/sysutils/firmware/intel/distinfo,v retrieving revision 1.15 diff -u -p -r1.15 distinfo --- distinfo25 May 2020 03:17:25 - 1.15 +++ distinfo9 Jun 2020 17:12:52 - @@ -1,2 +1,2 @@ -SHA256 (firmware/intel-20200520.tar.gz) = AqO4TOkiTsKXsc17wrLto23T8tN03YEP4/noI2LjIf4= -SIZE (firmware/intel-20200520.tar.gz) = 3002980 +SHA256 (firmware/intel-20200609.tar.gz) = bFKVJlq9A6fNyBW4W/9PmDh/gTgmqIk1kEvCu8eD1eQ= +SIZE (firmware/intel-20200609.tar.gz) = 3043809
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2020/06/09 11:09:24 Modified files: cad/kicad : Makefile cad/kicad-share: Makefile.inc Log message: kicad-share/*: add powerpc to NOT_FOR_ARCHS Kicad being broken on powerpc, it's useless to build these ports there. Add a reminder in cad/kicad/Makefile to sync cad/kicad-share/Makefile.inc with archs where kicad is not built. input and OK sthen@, OK kirby@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/06/09 10:51:46 Modified files: games/grhino : Makefile games/grhino/pkg: PLIST Added files: games/grhino/patches: patch-Makefile_in Log message: Remove empty directories.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/06/09 10:31:35 Modified files: games/grhino : Makefile games/grhino/pkg: PLIST Log message: Regen PLIST / WANTLIB.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2020/06/09 10:14:50 Modified files: games/wrath/pkg: README games/wrath: distinfo Makefile Log message: Update to wrath-0.0.0.20200530 Required to play the latest release Diff from maintainer Paul Valencia
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/06/09 10:11:50 Modified files: audio/exaile : Makefile Log message: Missing BDEP on devel/help2man.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/06/09 10:10:13 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Register removal of amide and xmedcon.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/06/09 10:07:15 Modified files: graphics : Makefile Removed files: graphics/xmedcon: Makefile distinfo graphics/xmedcon/patches: patch-source_m-png_c graphics/xmedcon/pkg: DESCR PLIST graphics/amide : Makefile distinfo graphics/amide/patches: patch-configure_ac patch-src_Makefile_in patch-src_amitk_common_c patch-src_amitk_data_set_c patch-src_analysis_c patch-src_mpeg_encode_c patch-src_render_c patch-src_ui_common_c graphics/amide/pkg: DESCR PLIST Log message: Remove xmedcon and amide. Both use legacy stuff (gnome-doc-utils, gconf2...) and haven't seen any movement upstream for years. ok jasper@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jtur...@cvs.openbsd.org 2020/06/09 09:41:37 Modified files: devel/fossil : Makefile distinfo Log message: Update fossil to 2.11.1. Release notes here: https://fossil-scm.org/home/doc/trunk/www/changes.wiki#v2_11
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/06/09 09:38:27 ports/games/gnome-mastermind/patches Update of /cvs/ports/games/gnome-mastermind/patches In directory cvs.openbsd.org:/tmp/cvs-serv2783/patches Log Message: Directory /cvs/ports/games/gnome-mastermind/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/06/09 09:11:57 Modified files: net/ircd-hybrid: Tag: OPENBSD_6_7 Makefile distinfo Log message: ircd-hybrid: backport 8.2.31 to 6.7-stable, fixing a problem with libcrypto detection resulting in broken TLS, reported by Stefan Hagen. backport req by Brad.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/06/09 08:54:37 Modified files: multimedia/x265: Makefile distinfo Removed files: multimedia/x265/patches: patch-source_encoder_encoder_cpp Log message: Update to x265-3.4. from Brad (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/06/09 08:33:21 Modified files: x11/mplayer: Makefile Log message: Cope with new FFmpeg version. from Brad (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/06/09 08:10:56 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Register gconf-editor removal.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/06/09 08:09:58 Modified files: devel : Makefile Removed files: devel/gconf-editor: Makefile distinfo devel/gconf-editor/pkg: DESCR PLIST Log message: Remove gconf-editor; gconf2 has been deprecated for years (in favour of dconf), there's little point in having an editor and it's in the way of gnome-doc-utils & rarian removal. ok jasper@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/06/09 07:22:43 Modified files: audio/openal : Makefile distinfo audio/openal/patches: patch-CMakeLists_txt audio/openal/pkg: PLIST Added files: audio/openal/patches: patch-alc_alconfig_cpp Removed files: audio/openal/patches: patch-Alc_alconfig_c patch-OpenAL32_alBuffer_c Log message: Update to openal-1.20.1. from Brad "looks good" to maintainer David Carlier
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/06/09 07:20:40 Modified files: graphics/ffmpeg: Makefile distinfo graphics/ffmpeg/patches: patch-libavcodec_libaomenc_c Added files: graphics/ffmpeg/patches: patch-libavcodec_libdav1d_c Log message: Update to ffmpeg-4.2.3. from Brad (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/06/09 07:17:59 Modified files: multimedia/dav1d: Makefile distinfo Log message: Update to dav1d. from Brad (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sema...@cvs.openbsd.org 2020/06/09 06:42:28 Modified files: devel/cargo: cargo.port.mk Log message: unbreak cargo ports. I should not do last-minute changes without proper testing. problem reported by aja@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/06/09 06:40:17 Modified files: games/dmagnetic: Makefile distinfo Log message: update to dMagnetic 0.23, from maintainer/upstream
Re: New: zsh-syntax-highlighting
On 2020/06/09 14:33, Rafael Sadowski wrote: > ping too, second OK is wanted. not a zsh user, but port looks good, ok
Re: New: zsh-syntax-highlighting
On Sat May 23, 2020 at 08:16:52PM -0500, Matthew Martin wrote: > On Fri, May 15, 2020 at 06:57:37AM +0200, Rafael Sadowski wrote: > > On Tue Apr 21, 2020 at 06:35:38AM +0200, Rafael Sadowski wrote: > > > On Sat Apr 11, 2020 at 08:16:55AM +0200, Rafael Sadowski wrote: > > > > On Fri Apr 10, 2020 at 09:11:25AM -0500, Matthew Martin wrote: > > > > > On Fri, Apr 10, 2020 at 09:13:43AM +0200, Rafael Sadowski wrote: > > > > > > On Thu Apr 09, 2020 at 09:43:36PM -0500, Matthew Martin wrote: > > > > > > > Small port for zsh-syntax-highlighting. Currently have it in > > > > > > > shells, but > > > > > > > more than happy to move it if someone has a better suggestion. To > > > > > > > test > > > > > > > source > > > > > > > /usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh > > > > > > > after installing. > > > > > > > > > > > > > > DESCR: > > > > > > > This package provides syntax highlighting for the shell zsh. It > > > > > > > enables > > > > > > > highlighting of commands whilst they are typed at a zsh prompt > > > > > > > into an > > > > > > > interactive terminal. This helps in reviewing commands before > > > > > > > running them, > > > > > > > particularly in catching syntax errors. > > > > > > > > > > > > Looks good and works here but do we need the following files to > > > > > > install? > > > > > > share/zsh-syntax-highlighting/.revision-hash > > > > > > share/zsh-syntax-highlighting/.version > > > > > > > > > > .version is used to populate $ZSH_HIGHLIGHT_VERSION and .revision-hash > > > > > for $ZSH_HIGHLIGHT_REVISION. I'll upstream a commit to skip > > > > > .revision-hash for releases, but I'd prefer to avoid local patches. > > > > > > > > > > > > > Ok for me. OK rsadowski@ if someone wants to import it. > > > > > > > > > > Anyone else? > > > > > ... Friendly reminder > > ping; tarball reattached if that helps. ping too, second OK is wanted. RS
Re: [new] sysutils/web2ldap and co
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.
Re: Update: games/wrath 0.0.0.20200530
ping. On Sat, May 30, 2020 at 07:28:26PM -0500, Paul Valencia wrote: > Hi ports@, > > This updates wrath to the latest commit of the wrath-darkplaces engine > which is necessary to play the new update of the commercial game > Wrath: Aeon of Ruin. > Tested with the new game content on amd64. Index: Makefile === RCS file: /cvs/ports/games/wrath/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- Makefile6 Jun 2020 19:14:15 - 1.2 +++ Makefile9 Jun 2020 11:28:55 - @@ -2,11 +2,11 @@ COMMENT = client of wrath-darkplaces engine -DISTNAME = wrath-0.0.0.20200228 +DISTNAME = wrath-0.0.0.20200530 GH_ACCOUNT = KillPixelGames GH_PROJECT = wrath-darkplaces -GH_COMMIT =ae8a4c06f2b2b088a537bb75c439817f4a009d6a +GH_COMMIT =7fa67fed66335554160a7c6d8b599c69b316e027 CATEGORIES = games Index: distinfo === RCS file: /cvs/ports/games/wrath/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo25 May 2020 16:08:41 - 1.1.1.1 +++ distinfo9 Jun 2020 11:28:55 - @@ -1,2 +1,2 @@ -SHA256 (wrath-0.0.0.20200228-ae8a4c06.tar.gz) = VO36gNeK+KbhNar+7mCEQVi2Eg+3lbrYua/m2eftZ3g= -SIZE (wrath-0.0.0.20200228-ae8a4c06.tar.gz) = 2686672 +SHA256 (wrath-0.0.0.20200530-7fa67fed.tar.gz) = tLCgezvbEIeJqWMM4GBg7rA1RzVIQMrZ58svs8pnP/Y= +SIZE (wrath-0.0.0.20200530-7fa67fed.tar.gz) = 2687099 Index: pkg/README === RCS file: /cvs/ports/games/wrath/pkg/README,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 README --- pkg/README 25 May 2020 16:08:41 - 1.1.1.1 +++ pkg/README 9 Jun 2020 11:28:55 - @@ -12,7 +12,7 @@ of the game. If you have the GOG version, you need to use innoextract to extract the data: -$ innoextract setup_wrath_aeon_of_ruin_ea_1.2.1_\(36418\).exe +$ innoextract setup_wrath_aeon_of_ruin_ea_1.3.1_\(64bit\)_\(38633\).exe To start wrath, you need to run it in a directory containing the kp1 directory of the game or you can start wrath using the -basedir=
Re: [new] sysutils/web2ldap and co
On Thu, Jun 04, 2020 at 07:57:09PM -0500, Lucas Raab wrote: > On Thu, Jun 04, 2020 at 03:18:39PM +0200, Landry Breuil wrote: > > On Wed, Jun 03, 2020 at 08:12:48PM -0500, Lucas Raab wrote: > > > On Wed, Jun 03, 2020 at 07:06:28AM -0500, Lucas Raab wrote: > > > > On Wed, Jun 03, 2020 at 12:56:00PM +0100, Stuart Henderson wrote: > > > > > On 2020/06/03 06:02, Lucas Raab wrote: > > > > > > On Wed, Jun 03, 2020 at 08:19:40AM +0200, Landry Breuil wrote: > > > > > > > On Tue, Jun 02, 2020 at 05:01:06PM -0500, Lucas Raab wrote: > > > > > > > > Hello, > > > > > > > > > > > > > > > > Here are three new ports, two deps, and the one piece de > > > > > > > > resistance, > > > > > > > > web2ldap. > > > > > > * I added NO_TEST to py-ldap0. Looking at the repo, the tests look to > assume that they're running in the container in .gitlab-ci.yml > * I added MODPY_PYTEST=Yes to py-xlwt, tests fine after that > * I added MODPY_PYTEST=Yes to web2ldap, but for some reason, the tests > don't seem to be picked up. I'm not sure what to do there. Nothing > stood out to me as being obviously wrong. thanks, that part looks good for py-xlwt. for web2ldap it seems the tests/ subdir isnt shipped in the tarball, nor for py-ldap0. Maybe they're only on github ? py-ldap0 only has ldap0/test.py but that's to spawn a testing instance for the daemon. That often happens with python ports which dont ship tests in releas tarballs, maybe via 'packages=find_packages(exclude=['tests']),' in setup.py ? > > something i spotted - MODPY_BIN should be used in pkg/web2ldap.rc, dont > > hardcode python3.7. > > Updated, thanks for catching that. another nit - i know some other py-ports with daemons also use ${daemon_flags:+ ${daemon_flags}} in the pexp in case someone sets some daemon_flags via rcctl - might want to check if they are appended to the process name/commandline and if the pexp still matches. > > $doas ln -s /usr/local/share/examples/web2ldap/templates > > /etc/web2ldap/templates > > I added back the @exec-add from sthen. Yeah, that was a bad move on my > part by taking it out. Thanks! > > Adding BUILD_DEPENDS to RUN_DEPENDS is to be avoided, for example here it > > installed devel/ccache for example.. > > Updated to move them to RUN_DEPENDS since none of them were actually > required to build the package. Thanks - well at that point it looks good to import to me. Anyone wanting to have another look or import them with my ok ? Landry
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2020/06/09 05:01:08 Modified files: infrastructure/mk: bsd.port.mk Log message: add REGISTER_PLIST_OPTS to be used to allow various things
Re: [macppc] Don't build cad/kicad-share
On 2020/06/09 09:41, Charlene Wendling wrote: > Hi, > > Since kicad is marked BROKEN on powerpc, it's useless to > build kicad-share ports. > > OK ? OK, but the comment should be in cad/kicad/Makefile so that it is seen by anyone changing the archs list there. > Charlène. > > > Index: Makefile.inc > === > RCS file: /cvs/ports/cad/kicad-share/Makefile.inc,v > retrieving revision 1.4 > diff -u -p -u -p -r1.4 Makefile.inc > --- Makefile.inc 10 Dec 2019 23:09:48 - 1.4 > +++ Makefile.inc 9 Jun 2020 07:37:50 - > @@ -1,5 +1,8 @@ > # $OpenBSD: Makefile.inc,v 1.4 2019/12/10 23:09:48 sthen Exp $ > > +# XXX Sync with archs where kicad is broken > +NOT_FOR_ARCHS = powerpc > + > PKG_ARCH ?= * > > V ?= 5.1.5 >
Re: [NEW] devel/py-vulture
On Mon, Jun 08, 2020 at 09:26:16PM +0200, Martin Reindl wrote: > Hello everyone, > > attached is a port of py-vulture 1.5. From DESCR: > > Vulture finds unused code in Python programs. This is useful for cleaning up > and finding errors in large code bases. If you run Vulture on both your > library and test suite you can find untested code. > > https://github.com/jendrikseipp/vulture/ > > Comments? OKs? > > -m Quick comments to confirm it build/install/run all OK on amd64. all 231 tests passed (coverage: platform openbsd6, python 3.7.7-final-0) quick test on dead code also worked as expected. Cheers, -- clematis (0xA2C87EDB507B4C53)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2020/06/09 03:35:59 Modified files: fonts/noto/emoji: Makefile distinfo Log message: Update to noto-emoji-20200408, supporting Unicode 12.1. Google, having their priorities entirely in order, regularly tags releases of Noto Emoji, and rarely bothers creating releases of Noto's other less important Unicode ranges.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/06/09 02:51:04 Modified files: net/arouteserver: Tag: OPENBSD_6_7 Makefile distinfo net/arouteserver/pkg: Tag: OPENBSD_6_7 PLIST Log message: update arouteserver in -stable to 0.26.0, requested by Hrvoje Popovski - recognises OpenBSD/OpenBGPD 6.7 - adds --merge-from-custom-file to clients-from-euroix - rpki fix for bird (switch back from bgp_path.last_nonaggregated to bgp_path.last for rov, fixes cases with routes where AS_PATH ends with AS_SET) - tag_and_reject policy for bird
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2020/06/09 02:27:31 Modified files: www/dokuwiki : Tag: OPENBSD_6_7 Makefile distinfo Log message: MFC: update to dokuwiki 2018-04-22c Hotfix 2018-04-22b fix PHP 7.3 compatibility: https://github.com/splitbrain/dokuwiki/issues/2622 fix ACL check: https://github.com/splitbrain/dokuwiki/pull/2609 Hotfix 2018-04-22c fix an XSS Vulnerability: https://github.com/splitbrain/dokuwiki/issues/3044 ok pea@ (MAINTAINER) rsadowski@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2020/06/09 02:25:12 Modified files: www/dokuwiki : Makefile distinfo Log message: Update to dokuwiki 2018-04-22c Hotfix 2018-04-22b fix PHP 7.3 compatibility: https://github.com/splitbrain/dokuwiki/issues/2622 fix ACL check: https://github.com/splitbrain/dokuwiki/pull/2609 Hotfix 2018-04-22c fix an XSS Vulnerability: https://github.com/splitbrain/dokuwiki/issues/3044 ok pea@ (MAINTAINER) rsadowski@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/06/09 01:41:20 Modified files: net/telepathy/telepathy-glib: Makefile net/telepathy/telepathy-glib/pkg: PLIST Added files: net/telepathy/telepathy-glib/patches: patch-tests_all-errors-documented_py Log message: - switch to python3 - regen PLIST and WANTLIB while here
[macppc] Don't build cad/kicad-share
Hi, Since kicad is marked BROKEN on powerpc, it's useless to build kicad-share ports. OK ? Charlène. Index: Makefile.inc === RCS file: /cvs/ports/cad/kicad-share/Makefile.inc,v retrieving revision 1.4 diff -u -p -u -p -r1.4 Makefile.inc --- Makefile.inc10 Dec 2019 23:09:48 - 1.4 +++ Makefile.inc9 Jun 2020 07:37:50 - @@ -1,5 +1,8 @@ # $OpenBSD: Makefile.inc,v 1.4 2019/12/10 23:09:48 sthen Exp $ +# XXX Sync with archs where kicad is broken +NOT_FOR_ARCHS =powerpc + PKG_ARCH ?=* V ?= 5.1.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/06/09 01:30:55 Modified files: sysutils/virt-manager: Makefile Log message: Unbreak now that textproc/libxml,-python has been move to py3.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/06/09 01:19:47 Modified files: textproc/itstool: Makefile Log message: switch to python3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/06/09 01:19:28 Modified files: x11/gnome/doc-utils: Makefile x11/gnome/doc-utils/pkg: PLIST Added files: x11/gnome/doc-utils/patches: patch-xml2po_xml2po___init___py patch-xml2po_xml2po_modes_docbook_py patch-xml2po_xml2po_modes_gs_py patch-xml2po_xml2po_modes_mallard_py patch-xml2po_xml2po_modes_ubuntu_py patch-xml2po_xml2po_modes_xhtml_py patch-xml2po_xml2po_xml2po_py_in Log message: even with one foot in the grave, switch this over to python3. based on a patch from gentoo
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/06/09 01:17:20 Modified files: textproc/libxml: Makefile textproc/libxml/pkg: PLIST-python Log message: switch python subpackage to python3 dependant ports have either already been updated, removed or will be cut over to python3 in the next commits
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/06/09 01:17:55 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: register py-libxml switch to python3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/06/09 01:14:46 Modified files: databases/pgadmin3: Makefile devel/electron : Makefile devel/goffice : Makefile devel/kf5/kdoctools: Makefile devel/kf5/kio : Makefile editors/libreoffice: Makefile games/wesnoth : Makefile graphics/dia : Makefile graphics/inkscape: Makefile lang/php/7.2 : Makefile lang/php/7.3 : Makefile lang/php/7.4 : Makefile misc/osinfo/libosinfo: Makefile multimedia/swfmill: Makefile net/icecast: Makefile net/yaz: Makefile productivity/vym: Makefile security/cvechecker: Makefile security/fwbuilder: Makefile security/xmlsec: Makefile telephony/asterisk: Makefile textproc/TclXML: Makefile textproc/apertium: Makefile textproc/docbook-xsl: Makefile textproc/docbook2x: Makefile textproc/p5-XML-LibXSLT: Makefile textproc/py-lxml: Makefile textproc/raptor: Makefile textproc/rarian: Makefile textproc/ruby-nokogiri: Makefile textproc/xmlstarlet: Makefile www/chromium : Makefile www/hiawatha : Makefile www/iridium: Makefile www/nginx : Makefile www/webkitgtk4 : Makefile x11/compiz/bcop: Makefile x11/compiz/core: Makefile x11/gnome/doc-utils: Makefile x11/gnome/libgda: Makefile x11/gnome/yelp-tools: Makefile x11/gnustep/base: Makefile x11/kde/libs3 : Makefile x11/kde-applications/umbrello: Makefile x11/kde4/libs : Makefile x11/kde4/parley: Makefile x11/qt5/qtwebengine: Makefile x11/qt5/qtwebkit: Makefile x11/tellico: Makefile Log message: bump after libxslt dependency changed
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/06/09 01:14:19 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: register py-libxslt removal
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/06/09 01:13:56 Modified files: textproc/libxslt: Makefile Added files: textproc/libxslt/pkg: DESCR PLIST Removed files: textproc/libxslt/pkg: DESCR-main DESCR-python PLIST-main PLIST-python Log message: remove python subpackage which is unused in our tree and doesn't work with python3. upstream has had this on their radar for 7 years however little actual progress has been made so far.
Re: devel/cargo: change few default build options
Hi, I am replying to both at once. I commited a slightly different version of the diff. Only changing 'opt-level' for now. On Fri, Jun 05, 2020 at 02:48:00PM +0200, Leo Unglaub wrote: > Hey, > i have a question about that change. Is there a reason to disable LTO? I > always enable it for my Rust projects and it works very well. If you dont > mind me asking, what is the reason behind that default? > link-time-optimization isn't bad. but it is resource and time consuming option. at least, it is my impression. for now, I discarded this change from default, and I will try to measure it. rust has two differents LTO strategies: "fat" and "thin". According to the documentation, "thin" is similar to "fat", but takes substantially less time to run while still achieving performance gains similar to "fat". one possible problem I found with 'false' default value, it is the fact that it enables lto=thin or lto=off depending others parameters (codegen units and opt-level). On Sat, Jun 06, 2020 at 06:04:23PM +0100, Laurence Tratt wrote: > On Fri, Jun 05, 2020 at 09:31:42AM +0200, Sebastien Marie wrote: > > Hello Sebastien, > > A few thoughts on default Cargo options for release compilation: take them > for what they're worth, which might not be very much! I am a reluctant to playing to much with compilation options. It expects I am know what I am doing, and I am far to know the exact implications of changing defaults, specially when it implies changes in toolchain in Rust and in LLVM. >From the options you cited, only "lto" has been changed from its default (and I didn't commit this change and kept the default for now). > > > + echo "overflow-checks = false" >>${WRKDIR}/.cargo/config; \ > > Personally I wouldn't mind if we experimented with "overflow-checks = true" > since although overflow in Rust is not undefined behaviour, I've not yet > seen a use that wasn't a bug (since people should use the 'unchecked' > variants in such cases). I have heard various figures given for the > performance impact of this, none of them very recent. If it turns out to > make things horribly slow, I think we'd soon find out from users and could > turn the overflow checks off! > > > + echo "lto = 'off'" >>${WRKDIR}/.cargo/config; \ > > My experience is that LTO gives around a 5% performance increase on average, > at the cost of noticeable increases in compilation time. I believe it once > used to trigger bugs in LLVM, although I have not seen this happen in the > couple of years that I've been using this in my projects. If we can bear the > compilation time hit (and I know that Rust ports are already slow to > compile), this might be worth turning on. > > > + echo "panic = 'unwind'" >>${WRKDIR}/.cargo/config; \ > > Most Rust programs that I've seen don't make use of 'unwind' and can be > 'abort', which leads to slightly smaller binaries. I'm not sure what to do > about those programs that really do require 'unwind' though: make them turn > it on via a flag? > > > + echo "codegen-units = 4" >>${WRKDIR}/.cargo/config; \ > > This one is tricky, because you get better optimisation at codegen-units=1, > but less parallel compilation. However, that might not be a problem in the > main usecase of building with dpb, where restricting compilation to a single > core might even be thought an advantage? Thanks to both for your comments. -- Sebastien Marie
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sema...@cvs.openbsd.org 2020/06/09 00:57:58 Modified files: devel/cargo: cargo.port.mk Log message: wrong default value for lto. it should be 'false'.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sema...@cvs.openbsd.org 2020/06/09 00:51:59 Modified files: devel/cargo: cargo.port.mk Log message: moves compilations options setting from Cargo.toml (a file from the port) to .cargo/config file (a generated file) the current version of cargo will look at the profile here too (it wasn't the case when first commited), and it permits to avoid automatic modification of the source file. the compilation options used are based on release profile (https://doc.rust-lang.org/cargo/reference/profiles.html#release) with only 'opt-level' difference ('2' instead of '3')
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/06/09 00:41:01 Modified files: mail/sendmail : Makefile Removed files: mail/sendmail/patches: patch-libsm_ldap_c Log message: Remove bogus patch. noticed by Claus Assmann from Sendmail
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sema...@cvs.openbsd.org 2020/06/09 00:39:30 Modified files: lang/rust : Makefile distinfo lang/rust/patches: patch-src_bootstrap_bootstrap_py patch-src_bootstrap_builder_rs patch-src_bootstrap_test_rs patch-src_etc_rust-gdb patch-src_libstd_sys_unix_stack_overflow_rs patch-src_tools_cargo_crates_cargo-test-support_src_paths_rs patch-src_tools_cargo_src_cargo_core_compiler_context_compilation_files_rs lang/rust/pkg : PLIST-main Removed files: lang/rust/patches: patch-vendor_libgit2-sys_lib_rs Log message: update lang/rust to 1.44.0 ChangeLog: https://github.com/rust-lang/rust/blob/master/RELEASES.md#version-1440-2020-06-04 switch to embedded libgit2 version for now ok landry@