Re: NEW: games/oshu - rhythm game
Hi,
ping (port reattached). Thanks for your help Brian.
On Sun, Jul 12, 2020 at 07:55:43PM +, Brian Callahan wrote:
> Hi Paul --
>
> On Friday, July 10, 2020 11:26 AM, Paul Valencia wrote:
>
> > Hi ports,
> >
> > This is a new port for oshu which is a clone of osu! rhythm game.
> > Currently it only supports playing the beatmaps of osu's Standard
> > mode and you need to download them from internet (added some
> > instructions about that in pkg README).
> >
> > Pass port-lib-depends-check and portcheck. Build on amd64 and arm64
> > and only tested on amd64 with some beatmaps.
>
> Thanks for the port. Attached is a tweaked version with the following:
> * Improved COMMENT.
> * It appears that upstream does not make any tarballs with their
> releases, so switch to the GH_* variables. Has the benefit of taking
> care of DISTNAME, PKGNAME, HOMEPAGE, and WRKDIST for you, so those
> pieces were able to be removed.
> * License marker is a little more explicit now with GPLv3 only.
> * Put a comment (C++14) explaining the COMPILER line.
> * Simplify LIB_DEPENDS.
> * Use CONFIGURE_ARGS instead of a patch to deal with needing to add
> -L${LOCALBASE}/lib in LDFLAGS.
> * Add a patch to fix a -Wformat warning from clang.
> * Fix some typos in pkg/README and hopefully make things a little bit
> clearer. I didn't really understand what you meant by Standard until I
> downloaded a beatmap that didn't work with oshu. I was able to follow
> your directions to download a beatmap, unzip it, and play.
>
> And I learned that I am very very bad at these types of games:
>
> brilliant
> // Tokoyami Towa
>
> Normal
> By Hinsvar
> _ _ _ _
>
> Score:
>54 good
> 391 miss
>
> So I think I will stick with other genres for the time being, but it
> was fun to try out oshu.
>
> ~Brian
oshu.tgz
Description: application/tar-gz
Re: [update] goaccess 1.4
On Sat, Aug 08, 2020 at 12:09:52AM +0300, Kirill Bychkov wrote:
> On Fri, August 7, 2020 09:05, Landry Breuil wrote:
> > On Fri, Aug 07, 2020 at 12:33:49AM +0300, Kirill Bychkov wrote:
> >> Missed your previous mail.
> >> I'm OK with moving config to /etc/goaccess/ as upstream have done.
> >> Probably browsers.list could be @sampled here with the tweak to
> >> config file setting its default location.
> >>
> >
> > and here's a diff @sampling both files under ${SYSCONFDIR}/goaccess/ - i
> > wouldnt modify the default config file, as it doesnt seem to add much
> > value by default, but at least browsers.list is here for users to
> > discover it.
> >
> > Landry
> >
>
> To ease updates.
> OK?
looks ok, i havent done one in a while so unsure if a @conflict is
needed (dont think so) - thanks, completely forgot !
Landry
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sema...@cvs.openbsd.org 2020/08/07 22:41:51 Modified files: productivity/tryton/5.2/sale_supply_drop_shipment: Makefile distinfo productivity/tryton/5.2/tryton: Makefile distinfo productivity/tryton/5.2/trytond: Makefile distinfo Log message: productivity/tryton/5.2: maintenance update
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sema...@cvs.openbsd.org 2020/08/07 22:40:56 Modified files: productivity/tryton/5.0/account: Makefile distinfo productivity/tryton/5.0/account_invoice: Makefile distinfo productivity/tryton/5.0/production_work: Makefile distinfo productivity/tryton/5.0/sale_supply_drop_shipment: Makefile distinfo productivity/tryton/5.0/tryton: Makefile distinfo productivity/tryton/5.0/trytond: Makefile distinfo Log message: productivity/tryton/5.0: maintenance update
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2020/08/07 16:54:09 Modified files: emulators/ppsspp: Makefile distinfo emulators/ppsspp/patches: patch-CMakeLists_txt patch-UI_NativeApp_cpp emulators/ppsspp/pkg: PLIST Log message: Update to ppsspp-1.10.3. Release notes: https://github.com/hrydgard/ppsspp#whats-new-in-1103
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/08/07 16:49:06 Modified files: devel/llvm : Makefile Log message: Bump libclang.so and friends libclang.so is used by other ports and the update to llvm 10 warranted a minor bump. I haven't checked liblldb.so and libLTO.so, I bumped their major version just in case but they aren't used in the ports tree. Thanks to kn@ who provided an old libclang.so for comparison.
Re: [update] goaccess 1.4
On Fri, August 7, 2020 09:05, Landry Breuil wrote:
> On Fri, Aug 07, 2020 at 12:33:49AM +0300, Kirill Bychkov wrote:
>> Missed your previous mail.
>> I'm OK with moving config to /etc/goaccess/ as upstream have done.
>> Probably browsers.list could be @sampled here with the tweak to
>> config file setting its default location.
>>
>
> and here's a diff @sampling both files under ${SYSCONFDIR}/goaccess/ - i
> wouldnt modify the default config file, as it doesnt seem to add much
> value by default, but at least browsers.list is here for users to
> discover it.
>
> Landry
>
To ease updates.
OK?
Index: Makefile
===
RCS file: /cvs/ports/www/goaccess/Makefile,v
retrieving revision 1.25
diff -u -p -u -r1.25 Makefile
--- Makefile7 Aug 2020 15:14:54 - 1.25
+++ Makefile7 Aug 2020 21:07:49 -
@@ -3,6 +3,7 @@
COMMENT = realtime console web log analyzer
DISTNAME = goaccess-1.4
+REVISION = 0
CATEGORIES = www
cvs server: Diffing patches
cvs server: Diffing pkg
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/goaccess/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -r1.6 PLIST
--- pkg/PLIST 7 Aug 2020 15:14:54 - 1.6
+++ pkg/PLIST 7 Aug 2020 21:07:49 -
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.6 2020/08/07 15:14:54 landry Exp $
+@pkgpath www/goaccess,tokyocabinet
@bin bin/goaccess
@man man/man1/goaccess.1
share/examples/goaccess/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2020/08/07 15:08:03 Modified files: www/puppetboard: Makefile distinfo Log message: update 2.1.2 -> 2.2.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2020/08/07 14:53:12 Modified files: databases/puppetdb5: Makefile distinfo Log message: Update 5.2.15 -> 5.2.18
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2020/08/07 14:52:17 Modified files: sysutils/ruby-r10k: Makefile distinfo Log message: Update 3.5.1 -> 3.5.2
Re: ok? [NEW] emulators/minivmac : classic mac emu (6 flavors!)
On Tue, 09 Jun 2020 at 02:18:45 +0200, Alex Free wrote: > Hello ports, attached is a Mini vMac port for the latest version with 6 > total flavors. Each flavor emulates a different Mac model, such as the M > acintosh 128k, 512Ke, SE, Classic, SEFDHD, or II. The Macintosh Plus is > emulated by default. This single port can emulate 7 different machines. > > Everything here except sound emulation works. OpenBSD has actually been > officially supported for some time now, but sound still isn't implemente > d. I made some cleanups in the Makefile and README (whitespace, wrapping) and added WANTLIB. Otherwise it looks ok to me. I've only ever used it on macOS before and it's kind of awkward to use on OpenBSD without a GUI desktop environment since you can only interact with Mini vMac by dragging and dropping disk images onto its window. I did find this dragon utility which just creates a small GUI window based on files passed from the command line, which you can then drag and drop onto minivmac: https://github.com/mwh/dragon Maybe someone can make a quick port of it. minivmac.tar.gz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2020/08/07 13:35:04 Modified files: www: Makefile Log message: Unhook goaccess,tokyocabinet. tokyocabinet support was dropped upstream.
aarch64 bulk build report
bulk build on arm64.ports.openbsd.org started on Thu Aug 6 00:32:41 MDT 2020 finished at Fri Aug 7 13:32:13 MDT 2020 lasted 1D12h59m done with kern.version=OpenBSD 6.7-current (GENERIC.MP) #753: Wed Aug 5 22:59:13 MDT 2020 built packages:7770 Aug 6:7703 Aug 7:66 critical path missing pkgs: http://build-failures.rhaalovely.net/aarch64/2020-08-06/summary.log build failures: 14 http://build-failures.rhaalovely.net/aarch64/2020-08-06/devel/py-llvmlite,python3.log http://build-failures.rhaalovely.net/aarch64/2020-08-06/devel/rttr.log http://build-failures.rhaalovely.net/aarch64/2020-08-06/devel/woboq_codebrowser.log http://build-failures.rhaalovely.net/aarch64/2020-08-06/editors/xwpe.log http://build-failures.rhaalovely.net/aarch64/2020-08-06/lang/pfe.log http://build-failures.rhaalovely.net/aarch64/2020-08-06/net/bro.log http://build-failures.rhaalovely.net/aarch64/2020-08-06/net/libtorrent-rasterbar.log http://build-failures.rhaalovely.net/aarch64/2020-08-06/net/rsync,iconv.log http://build-failures.rhaalovely.net/aarch64/2020-08-06/security/libgcrypt.log http://build-failures.rhaalovely.net/aarch64/2020-08-06/shells/nsh.log http://build-failures.rhaalovely.net/aarch64/2020-08-06/sysutils/nomad.log http://build-failures.rhaalovely.net/aarch64/2020-08-06/sysutils/rclone.log http://build-failures.rhaalovely.net/aarch64/2020-08-06/sysutils/telegraf.log http://build-failures.rhaalovely.net/aarch64/2020-08-06/sysutils/terragrunt.log recurrent failures failures/editors/xwpe.log failures/lang/pfe.log failures/sysutils/nomad.log failures/sysutils/rclone.log failures/sysutils/telegraf.log failures/sysutils/terragrunt.log new failures +++ ls-failures Fri Aug 7 13:32:24 2020 +failures/devel/py-llvmlite,python3.log +failures/devel/rttr.log +failures/devel/woboq_codebrowser.log +failures/net/bro.log +failures/net/libtorrent-rasterbar.log +failures/net/rsync,iconv.log +failures/security/libgcrypt.log +failures/shells/nsh.log resolved failures --- ../old/aarch64/last//ls-failuresTue Jul 28 02:15:49 2020 -failures/databases/sqlite3-odbc.log -failures/lang/compcert.log -failures/math/R.log -failures/productivity/aqbanking.log -failures/productivity/libalkimia.log -failures/sysutils/libvirt.log -failures/sysutils/p5-Rex.log -failures/x11/e17/elementary.log -failures/x11/qt5/qtwebengine.log -failures/x11/remmina.log
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/08/07 13:31:24 Modified files: sysutils/salt : Makefile sysutils/salt/patches: patch-salt_grains_core_py Log message: unbreak swap_total which was divided by a 1024 too many
update editors/kakoune
this updates editors/kakoune
Changelog since last version
* Introduce `User` hook support.
* The `bold` and `italic` faces are no longer built-in. Highlighters
are expected to use face attributes (`+b` and `+i`, respectively) to
decorate text.
* The `lint-enable` command no longer needs to be called to display
linting errors. The `lint-disable` command was renamed into
`lint-hide-diagnostics`.
* The `+` part of a `range-specs` highlighter consistently
refers to the length of the target range.
* clients stdin is transferred to the server, making it possible
to pipe into `kak -c `
* Faces can have an alpha channel, specified using the
`rgba:RRGGBBAA` format.
* replace-ranges highlighter now support empty and multi-lines ranges
* `%val{...}` now expands to list of strings, `$kak_quoted_...` now work
as expected with these.
* `*SetOption` hooks filter string will contain a value only for options
of int/str/bool types to avoid performance issue with generating those
on more complex option types.
Index: Makefile
===
RCS file: /home/reposync/ports/editors/kakoune/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile14 Jun 2020 13:07:04 - 1.1.1.1
+++ Makefile7 Aug 2020 08:13:24 -
@@ -2,7 +2,7 @@
COMMENT = modal code editor with a focus on interactivity
-V =2020.01.16
+V =2020.08.04
DISTNAME = kakoune-${V}
CATEGORIES = editors
Index: distinfo
===
RCS file: /home/reposync/ports/editors/kakoune/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo14 Jun 2020 13:07:04 - 1.1.1.1
+++ distinfo7 Aug 2020 08:13:31 -
@@ -1,2 +1,2 @@
-SHA256 (kakoune-2020.01.16.tar.bz2) =
oJTxaJ8CKDCPYx43GzgrDAUiOR/ItsI6bLxx/0BKDa4=
-SIZE (kakoune-2020.01.16.tar.bz2) = 478509
+SHA256 (kakoune-2020.08.04.tar.bz2) =
AkafrB/4MZEWVTb6UvAZB9tb4Kc0vJBXCSSz7buc8SE=
+SIZE (kakoune-2020.08.04.tar.bz2) = 499765
Index: pkg/PLIST
===
RCS file: /home/reposync/ports/editors/kakoune/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 14 Jun 2020 13:07:04 - 1.1.1.1
+++ pkg/PLIST 7 Aug 2020 08:40:46 -
@@ -59,9 +59,11 @@ share/kak/rc/filetype/cabal.kak
share/kak/rc/filetype/clojure.kak
share/kak/rc/filetype/cmake.kak
share/kak/rc/filetype/coffee.kak
+share/kak/rc/filetype/coq.kak
share/kak/rc/filetype/crystal.kak
share/kak/rc/filetype/css.kak
share/kak/rc/filetype/cucumber.kak
+share/kak/rc/filetype/cue.kak
share/kak/rc/filetype/d.kak
share/kak/rc/filetype/dart.kak
share/kak/rc/filetype/dhall.kak
@@ -69,6 +71,7 @@ share/kak/rc/filetype/diff.kak
share/kak/rc/filetype/dockerfile.kak
share/kak/rc/filetype/elixir.kak
share/kak/rc/filetype/elm.kak
+share/kak/rc/filetype/eruby.kak
share/kak/rc/filetype/etc.kak
share/kak/rc/filetype/exherbo.kak
share/kak/rc/filetype/fish.kak
@@ -99,6 +102,8 @@ share/kak/rc/filetype/mail.kak
share/kak/rc/filetype/makefile.kak
share/kak/rc/filetype/markdown.kak
share/kak/rc/filetype/mercurial.kak
+share/kak/rc/filetype/meson.kak
+share/kak/rc/filetype/mlb.kak
share/kak/rc/filetype/moon.kak
share/kak/rc/filetype/nim.kak
share/kak/rc/filetype/nix.kak
@@ -119,6 +124,7 @@ share/kak/rc/filetype/scala.kak
share/kak/rc/filetype/scheme.kak
share/kak/rc/filetype/scss.kak
share/kak/rc/filetype/sh.kak
+share/kak/rc/filetype/sml.kak
share/kak/rc/filetype/sql.kak
share/kak/rc/filetype/swift.kak
share/kak/rc/filetype/systemd.kak
@@ -129,6 +135,7 @@ share/kak/rc/filetype/troff.kak
share/kak/rc/filetype/tupfile.kak
share/kak/rc/filetype/void-linux.kak
share/kak/rc/filetype/yaml.kak
+share/kak/rc/filetype/zig.kak
share/kak/rc/tools/
share/kak/rc/tools/autorestore.kak
share/kak/rc/tools/autowrap.kak
@@ -150,10 +157,12 @@ share/kak/rc/tools/rust/
share/kak/rc/tools/rust/racer.kak
share/kak/rc/tools/spell.kak
share/kak/rc/windowing/
+share/kak/rc/windowing/detection.kak
share/kak/rc/windowing/iterm.kak
share/kak/rc/windowing/kitty.kak
share/kak/rc/windowing/new-client.kak
share/kak/rc/windowing/repl/
+share/kak/rc/windowing/repl/kitty.kak
share/kak/rc/windowing/repl/tmux.kak
share/kak/rc/windowing/repl/x11.kak
share/kak/rc/windowing/screen.kak
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sema...@cvs.openbsd.org 2020/08/07 11:53:40 Modified files: devel/woboq_codebrowser: Makefile distinfo Log message: update devel/woboq_codebrowser to latest head in order to have llvm10 compat
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sema...@cvs.openbsd.org 2020/08/07 11:32:46 Modified files: print/py-relatorio: Makefile distinfo Log message: update print/py-relatorio to 0.9.2
[NEW] p5-Crypt-OpenPGP + dependencies
Here's a new port for Crypt::OpenPGP plus some dependencies it needs. One fairly major change to upstream is that I changed a couple of Crypt::OpenPGP::Util functions to use arc4random_buf instead of some other ugly modules that still didn't tie into the OpenBSD random subsystem to get random bytes. If someone could glance at those and make sure my patch looks right, that would be much appreciated. I'm sure that it's *possible* to just use our arc4random backed version of perl's rand, but that seemed harder to get right, but if someone wants to try I won't stop you. In order to get arc4random_buf, this includes a new module, security/p5-Unix-OpenBSD-Random. I was happy to find this tiny wrapper on the CPAN so I didn't have to write it. It looked reasonable to me, but then I am not a would not claim expertise in this area. Comments, OK? p5-Crypt-OpenPGP-plus-depends.tar.gz Description: application/tar-gz
Re: UPDATE net/vpnc-scripts
On Wed 29/07/2020 15:37, Bjorn Ketelaars wrote: > On Wed 22/07/2020 09:33, Bjorn Ketelaars wrote: > > Update vpnc-scripts to the latest version. While here: > > - Change HOMEPAGE and MASTER_SITES. Upstream has moved to gitlab.com > > - Take MAINTAINER > > > > Tested with openconnect connecting to ocserv. > > > > Comments/OK? > > Ping! > > Diff enclosed for your convenience: Ping...anyone?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2020/08/07 10:56:13 Modified files: devel/ipython : Makefile distinfo Log message: Update to ipython-7.17.0 Changes: https://github.com/ipython/ipython/blob/7.17.0/docs/source/whatsnew/version7.rst
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2020/08/07 10:45:52 Modified files: audio/mscore : Makefile distinfo audio/mscore/patches: patch-CMakeLists_txt patch-main_CMakeLists_txt patch-mscore_CMakeLists_txt audio/mscore/pkg: PLIST Log message: Update to musescore-3.5. This is a major release. Announcement/Changelog: https://musescore.org/en/3.5
GCC 8: default to i586 on i386
Here is a diff to switch GCC 8 to defaulting to i586 on i386.
Index: Makefile
===
RCS file: /home/cvs/ports/lang/gcc/8/Makefile,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 Makefile
--- Makefile5 Apr 2020 15:44:52 - 1.31
+++ Makefile7 Aug 2020 11:27:24 -
@@ -16,7 +16,7 @@ USE_LLD = No
DPB_PROPERTIES = parallel
V = 8.3.0
-REVISION = 5
+REVISION = 6
FULL_VERSION = $V
FULL_PKGVERSION = $V
Index: patches/patch-gcc_config_gcc
===
RCS file: /home/cvs/ports/lang/gcc/8/patches/patch-gcc_config_gcc,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-gcc_config_gcc
--- patches/patch-gcc_config_gcc25 Mar 2019 20:17:47 - 1.2
+++ patches/patch-gcc_config_gcc7 Aug 2020 11:40:30 -
@@ -1,4 +1,5 @@
$OpenBSD: patch-gcc_config_gcc,v 1.2 2019/03/25 20:17:47 pascal Exp $
+
Index: gcc/config.gcc
--- gcc/config.gcc.orig
+++ gcc/config.gcc
@@ -131,7 +132,7 @@ Index: gcc/config.gcc
+arch_without_64bit=yes
+;;
+ i386-*-openbsd*)
-+arch=i486
++arch=pentium
cpu=generic
arch_without_sse2=yes
arch_without_64bit=yes
Index: patches/patch-gcc_config_i386_openbsdelf_h
===
RCS file:
/home/cvs/ports/lang/gcc/8/patches/patch-gcc_config_i386_openbsdelf_h,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-gcc_config_i386_openbsdelf_h
--- patches/patch-gcc_config_i386_openbsdelf_h 20 May 2019 14:59:05 -
1.2
+++ patches/patch-gcc_config_i386_openbsdelf_h 7 Aug 2020 11:40:40 -
@@ -1,4 +1,5 @@
$OpenBSD: patch-gcc_config_i386_openbsdelf_h,v 1.2 2019/05/20 14:59:05 pascal
Exp $
+
Index: gcc/config/i386/openbsdelf.h
--- gcc/config/i386/openbsdelf.h.orig
+++ gcc/config/i386/openbsdelf.h
@@ -17,7 +18,7 @@ Index: gcc/config/i386/openbsdelf.h
- %{!shared: %{pg:gcrt0%O%s} %{!pg:%{p:gcrt0%O%s} %{!p:crt0%O%s}} \
- crtbegin%O%s} %{shared:crtbeginS%O%s}"
-+#define SUBTARGET32_DEFAULT_CPU "i486"
++#define SUBTARGET32_DEFAULT_CPU "i586"
+#define STARTFILE_SPEC "\
+ %{!shared: %{pg:gcrt0%O%s} %{!pg:%{p:gcrt0%O%s} \
+ %{!p:%{!static:crt0%O%s} %{static:%{nopie:crt0%O%s} \
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: giova...@cvs.openbsd.org2020/08/07 09:15:37 Modified files: www/apache-httpd: Makefile distinfo Removed files: www/apache-httpd/patches: patch-modules_proxy_mod_proxy_uwsgi_c patch-modules_ssl_ssl_util_stapling_c Log message: Update 2.4.46 fixes CVE-2020-11984 and CVE-2020-11993 full changelog at https://downloads.apache.org/httpd/CHANGES_2.4.46
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2020/08/07 09:14:55 Modified files: www/goaccess : Makefile distinfo www/goaccess/patches: patch-config_goaccess_conf patch-src_browsers_c www/goaccess/pkg: PLIST Added files: www/goaccess/patches: patch-src_parser_c Removed files: www/goaccess/patches: patch-src_gholder_c patch-src_settings_c Log message: Update to goaccess 1.4 cf http://goaccess.io/release-notes#release-1.4, default config file moved to /etc/goaccess/goaccess.conf tested by paco@ ok kirby@ (maintainer)
devel/llvm: default to -march=i586 on i386
Sync with base.
Index: Makefile
===
RCS file: /home/cvs/ports/devel/llvm/Makefile,v
retrieving revision 1.256
diff -u -p -u -p -r1.256 Makefile
--- Makefile5 Aug 2020 06:49:48 - 1.256
+++ Makefile7 Aug 2020 11:05:44 -
@@ -18,6 +18,7 @@ PKGSPEC-main =llvm-=${LLVM_V}
PKGNAME-main = llvm-${LLVM_V}
PKGNAME-python = py3-llvm-${LLVM_V}
PKGNAME-lldb = lldb-${LLVM_V}
+REVISION-main =0
CATEGORIES = devel
Index: patches/patch-tools_clang_lib_Driver_ToolChains_Arch_X86_cpp
===
RCS file:
/home/cvs/ports/devel/llvm/patches/patch-tools_clang_lib_Driver_ToolChains_Arch_X86_cpp,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-tools_clang_lib_Driver_ToolChains_Arch_X86_cpp
--- patches/patch-tools_clang_lib_Driver_ToolChains_Arch_X86_cpp9 Jul
2019 13:21:37 - 1.1
+++ patches/patch-tools_clang_lib_Driver_ToolChains_Arch_X86_cpp7 Aug
2020 11:04:17 -
@@ -1,10 +1,22 @@
$OpenBSD: patch-tools_clang_lib_Driver_ToolChains_Arch_X86_cpp,v 1.1
2019/07/09 13:21:37 jca Exp $
+- default to -march=i586 on i386.
- Turn on -mretpoline by default in clang on amd64.
Index: tools/clang/lib/Driver/ToolChains/Arch/X86.cpp
--- tools/clang/lib/Driver/ToolChains/Arch/X86.cpp.orig
+++ tools/clang/lib/Driver/ToolChains/Arch/X86.cpp
+@@ -95,9 +95,9 @@ const char *x86::getX86TargetCPU(const ArgList ,
+ switch (Triple.getOS()) {
+ case llvm::Triple::FreeBSD:
+ case llvm::Triple::NetBSD:
+- case llvm::Triple::OpenBSD:
+ return "i486";
+ case llvm::Triple::Haiku:
++ case llvm::Triple::OpenBSD:
+ return "i586";
+ default:
+ // Fallback to p4.
@@ -146,6 +146,11 @@ void x86::getX86TargetFeatures(const Driver , const
// flags). This is a bit hacky but keeps existing usages working. We should
// consider deprecating this and instead warn if the user requests external
Re: [UPDATE] emulators/mednafen 1.24.3
On 08/06 04:00, Ricardo Mestre wrote: > Hi, > > Easy update to latest stable version (1.24.3). Comments? OK? OK jeremy@ > > Changelog as follows: > > v1.24.3: > > - This update implements more complete emulation of the Saturn SCSP's short > waveform mode, fixing excessive distortion in a sound effect in > "Sega Ages: OutRun", a regression introduced in Mednafen 1.24.2. > > v1.24.2: > > - Fixed broken support for systems with no OpenGL implementation available. > - Apple2: Fixed potential assert() failure after changing disks. > - SS: Implemented emulation of SCSP slot EG bypass and short waveform mode > bits. > - SS: Implemented the buggy linear interpolation that occurs when SCSP FM is > used. > - SS: Implemented SCSP register mirroring. > - SS: Fixed a few inaccuracies with the SCSP waveform loop handling. > > Index: Makefile > === > RCS file: /cvs/ports/emulators/mednafen/Makefile,v > retrieving revision 1.29 > diff -u -p -u -r1.29 Makefile > --- Makefile 31 Mar 2020 11:47:01 - 1.29 > +++ Makefile 6 Aug 2020 14:55:42 - > @@ -3,8 +3,7 @@ > BROKEN-hppa =../../include/mednafen/state.h:21:7: error: > 'exception_ptr' in namespace 'std' does not name a type > COMMENT =emulates numerous game consoles > > -DISTNAME = mednafen-1.24.1 > -REVISION = 0 > +DISTNAME = mednafen-1.24.3 > > CATEGORIES = emulators games > HOMEPAGE = https://mednafen.github.io > Index: distinfo > === > RCS file: /cvs/ports/emulators/mednafen/distinfo,v > retrieving revision 1.13 > diff -u -p -u -r1.13 distinfo > --- distinfo 29 Mar 2020 10:10:29 - 1.13 > +++ distinfo 6 Aug 2020 14:55:42 - > @@ -1,2 +1,2 @@ > -SHA256 (mednafen-1.24.1.tar.xz) = > pHrfP69NpmkgvruUNuKMv4f/ZjJNC7OSAzy7R4tnX+c= > -SIZE (mednafen-1.24.1.tar.xz) = 3293992 > +SHA256 (mednafen-1.24.3.tar.xz) = > PeqFP3hDZFV/pZ6boRoX6yZ0/A+5MgXzO9vauh2j9w8= > +SIZE (mednafen-1.24.3.tar.xz) = 3296980 >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/08/07 08:30:10 Modified files: graphics/darktable: Makefile graphics/openimageio: Makefile www/webkitgtk4 : Makefile x11/gnome/photos: Makefile x11/qt5/qtwebkit: Makefile Log message: stop using -march=i686 for 64 bit atomics on i386 the now default -march=i586 includes 64 bit atomics from Brad ok sthen@
Re: remove explicit -march=i586
On Fri, Aug 07, 2020 at 05:36:19PM +1000, Jonathan Gray wrote:
> -march=i586 is now the default for clang in base on i386
There were a few other spots with -march adjustments for atomics.
Index: net/dnsdist/Makefile
===
RCS file: /home/cvs/ports/net/dnsdist/Makefile,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 Makefile
--- net/dnsdist/Makefile30 Jul 2020 14:25:11 - 1.18
+++ net/dnsdist/Makefile7 Aug 2020 02:57:37 -
@@ -54,12 +54,6 @@ LIB_DEPENDS+=${MODLUA_LIB_DEPENDS} \
net/libfstrm \
www/h2o
-.if ${MACHINE_ARCH:Mi386}
-# needs 64-bit atomics
-CFLAGS+= -march=i586
-CXXFLAGS+= -march=i586
-.endif
-
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/{doc,examples}/dnsdist
cd ${WRKSRC}; ${INSTALL_DATA} README.md ${PREFIX}/share/doc/dnsdist/; \
Index: net/knot/Makefile
===
RCS file: /home/cvs/ports/net/knot/Makefile,v
retrieving revision 1.50
diff -u -p -u -p -r1.50 Makefile
--- net/knot/Makefile 19 Jun 2020 16:39:00 - 1.50
+++ net/knot/Makefile 7 Aug 2020 02:58:05 -
@@ -48,10 +48,6 @@ CONFIGURE_ENV = ac_cv_path_PDFLATEX="fa
CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
-.if ${MACHINE_ARCH} == "i386"
-CFLAGS += -march=i586
-.endif
-
post-install:
mv ${WRKINST}/etc/knot/ ${PREFIX}/share/examples/knot/
Index: lang/mono/Makefile
===
RCS file: /home/cvs/ports/lang/mono/Makefile,v
retrieving revision 1.139
diff -u -p -u -p -r1.139 Makefile
--- lang/mono/Makefile 29 Jul 2020 10:50:36 - 1.139
+++ lang/mono/Makefile 7 Aug 2020 02:58:24 -
@@ -61,10 +61,6 @@ AUTOMAKE_VERSION=1.15
CONFIGURE_ENV= ac_cv_header_execinfo_h=no
-.if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ENV+=CFLAGS="-march=i586"
-.endif
-
CONFIGURE_ARGS=--with-gc=included \
--with-tls=pthread \
--enable-btls \
Index: databases/kyotocabinet/Makefile
===
RCS file: /home/cvs/ports/databases/kyotocabinet/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- databases/kyotocabinet/Makefile 21 Jul 2020 14:25:36 - 1.24
+++ databases/kyotocabinet/Makefile 7 Aug 2020 03:11:58 -
@@ -40,11 +40,6 @@ FLAVOR?=
CONFIGURE_ARGS += --enable-opt
.else
CONFIGURE_ARGS += --disable-opt
-# i386 still need some optimized instructions
-# undefined reference to `__sync_bool_compare_and_swap_8' ...
-.if ${MACHINE_ARCH} == "i386"
-CXXFLAGS += -march=i586
-.endif
.endif
pre-configure:
Index: games/0ad/base/Makefile
===
RCS file: /home/cvs/ports/games/0ad/base/Makefile,v
retrieving revision 1.28
diff -u -p -u -p -r1.28 Makefile
--- games/0ad/base/Makefile 11 Mar 2019 04:11:57 - 1.28
+++ games/0ad/base/Makefile 7 Aug 2020 02:58:57 -
@@ -63,11 +63,6 @@ CONFIGURE_ARGS +=--without-nvtt \
# XXX atlas (the level editor) requires threaded libxml
CONFIGURE_ARGS += --disable-atlas
-.if ${MACHINE_ARCH} == "i386"
-CFLAGS += -march=i586
-CXXFLAGS +=-march=i586
-.endif
-
WRKSRC = ${WRKDIST}/build/workspaces/gcc
do-build:
Index: graphics/openimageio/Makefile
===
RCS file: /home/cvs/ports/graphics/openimageio/Makefile,v
retrieving revision 1.41
diff -u -p -u -p -r1.41 Makefile
--- graphics/openimageio/Makefile 14 May 2020 12:35:31 - 1.41
+++ graphics/openimageio/Makefile 7 Aug 2020 03:01:50 -
@@ -10,7 +10,7 @@ GH_PROJECT = oiio
V =1.8.6
GH_TAGNAME = Release-$V
DISTNAME = openimageio-${V}
-REVISION = 7
+REVISION = 8
SHARED_LIBS += OpenImageIO 5.0 # 1.0
SHARED_LIBS += OpenImageIO_Util2.0 # 1.5
@@ -56,9 +56,7 @@ CONFIGURE_ARGS += -DUSE_OPENCV=OFF \
-DSTOP_ON_WARNING=OFF
CXXFLAGS +=-pthread
-.if ${MACHINE_ARCH} == "i386"
-CXXFLAGS +=-march=i686
-.endif
+
WRKDIST = ${WRKDIR}/oiio-Release-$V
# Fix undefined reference to __atomic_*
Index: graphics/darktable/Makefile
===
RCS file: /home/cvs/ports/graphics/darktable/Makefile,v
retrieving revision 1.97
diff -u -p -u -p -r1.97 Makefile
--- graphics/darktable/Makefile 14 May 2020 12:35:31 - 1.97
+++ graphics/darktable/Makefile 7 Aug 2020 03:03:12 -
@@ -8,7 +8,7 @@ V= 2.6.3
DISTNAME= darktable-$V
PORTROACH= limitw:1,even
emulators/minivmac
Hello, Sorry for starting a new thread, I couldn't answer to the existing one because I didn't have suscribed yet. I was writing the minivmac port when I saw that somebody did it already. Thanks! but after executing make port-lib-depends-check on your port, it show that it's missing the WANTLIB variable in the makefile, which should be initiated with "X11 c". I look forward for this to be merged. Guy
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/08/07 06:48:20 Modified files: lang/php/7.2 : Tag: OPENBSD_6_7 Makefile distinfo lang/php/7.2/pkg: Tag: OPENBSD_6_7 PLIST-gd PLIST-main PLIST-mysqli Log message: update to php-7.2.33
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/08/07 06:48:17 Modified files: lang/php/7.3 : Tag: OPENBSD_6_7 Makefile distinfo lang/php/7.3/patches: Tag: OPENBSD_6_7 patch-sapi_cgi_cgi_main_c lang/php/7.3/pkg: Tag: OPENBSD_6_7 PLIST-gd PLIST-gmp PLIST-main PLIST-mysqli Log message: update to php-7.3.21
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/08/07 06:48:14 Modified files: lang/php/7.4 : Tag: OPENBSD_6_7 Makefile distinfo lang/php/7.4/patches: Tag: OPENBSD_6_7 patch-configure_ac patch-sapi_cgi_cgi_main_c lang/php/7.4/pkg: Tag: OPENBSD_6_7 PLIST-gd PLIST-gmp PLIST-main PLIST-mysqli Log message: update to php-7.4.9
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/08/07 06:47:27 Modified files: lang/php/7.4 : Makefile distinfo Log message: update to php-7.4.9
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/08/07 06:47:31 Modified files: lang/php/7.3 : Makefile distinfo Log message: update to php-7.3.21
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/08/07 06:47:34 Modified files: lang/php/7.2 : Makefile distinfo Log message: update to php-7.2.33
Re: GCC 8: default to i586 on i386
As we are now requiring i586 minimum, I think it makes sense.
On 2020/08/07 07:45, Brad Smith wrote:
> Here is a diff to switch GCC 8 to defaulting to i586 on i386.
>
>
>
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/lang/gcc/8/Makefile,v
> retrieving revision 1.31
> diff -u -p -u -p -r1.31 Makefile
> --- Makefile 5 Apr 2020 15:44:52 - 1.31
> +++ Makefile 7 Aug 2020 11:27:24 -
> @@ -16,7 +16,7 @@ USE_LLD = No
> DPB_PROPERTIES = parallel
>
> V = 8.3.0
> -REVISION = 5
> +REVISION = 6
> FULL_VERSION = $V
> FULL_PKGVERSION = $V
>
> Index: patches/patch-gcc_config_gcc
> ===
> RCS file: /home/cvs/ports/lang/gcc/8/patches/patch-gcc_config_gcc,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 patch-gcc_config_gcc
> --- patches/patch-gcc_config_gcc 25 Mar 2019 20:17:47 - 1.2
> +++ patches/patch-gcc_config_gcc 7 Aug 2020 11:40:30 -
> @@ -1,4 +1,5 @@
> $OpenBSD: patch-gcc_config_gcc,v 1.2 2019/03/25 20:17:47 pascal Exp $
> +
> Index: gcc/config.gcc
> --- gcc/config.gcc.orig
> +++ gcc/config.gcc
> @@ -131,7 +132,7 @@ Index: gcc/config.gcc
> +arch_without_64bit=yes
> +;;
> + i386-*-openbsd*)
> -+arch=i486
> ++arch=pentium
> cpu=generic
> arch_without_sse2=yes
> arch_without_64bit=yes
> Index: patches/patch-gcc_config_i386_openbsdelf_h
> ===
> RCS file:
> /home/cvs/ports/lang/gcc/8/patches/patch-gcc_config_i386_openbsdelf_h,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 patch-gcc_config_i386_openbsdelf_h
> --- patches/patch-gcc_config_i386_openbsdelf_h20 May 2019 14:59:05
> - 1.2
> +++ patches/patch-gcc_config_i386_openbsdelf_h7 Aug 2020 11:40:40
> -
> @@ -1,4 +1,5 @@
> $OpenBSD: patch-gcc_config_i386_openbsdelf_h,v 1.2 2019/05/20 14:59:05
> pascal Exp $
> +
> Index: gcc/config/i386/openbsdelf.h
> --- gcc/config/i386/openbsdelf.h.orig
> +++ gcc/config/i386/openbsdelf.h
> @@ -17,7 +18,7 @@ Index: gcc/config/i386/openbsdelf.h
> -%{!shared: %{pg:gcrt0%O%s} %{!pg:%{p:gcrt0%O%s} %{!p:crt0%O%s}} \
> -crtbegin%O%s} %{shared:crtbeginS%O%s}"
>
> -+#define SUBTARGET32_DEFAULT_CPU "i486"
> ++#define SUBTARGET32_DEFAULT_CPU "i586"
> +#define STARTFILE_SPEC "\
> +%{!shared: %{pg:gcrt0%O%s} %{!pg:%{p:gcrt0%O%s} \
> +%{!p:%{!static:crt0%O%s} %{static:%{nopie:crt0%O%s} \
>
Re: [update] goaccess 1.4
On Fri, August 7, 2020 09:05, Landry Breuil wrote:
> On Fri, Aug 07, 2020 at 12:33:49AM +0300, Kirill Bychkov wrote:
>> Missed your previous mail.
>> I'm OK with moving config to /etc/goaccess/ as upstream have done.
>> Probably browsers.list could be @sampled here with the tweak to
>> config file setting its default location.
>>
>
> and here's a diff @sampling both files under ${SYSCONFDIR}/goaccess/ - i
> wouldnt modify the default config file, as it doesnt seem to add much
> value by default, but at least browsers.list is here for users to
> discover it.
>
> Landry
>
Works as expected after moving /etc/goaccess.conf to /etc/goaccess/,
thanks.
OK kirby@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/08/07 05:42:02 Modified files: devel/llvm : Makefile devel/llvm/patches: patch-tools_clang_lib_Driver_ToolChains_Arch_X86_cpp devel/llvm/pkg : PLIST-lldb PLIST-main Added files: devel/llvm/patches: patch-tools_clang_lib_CodeGen_CGVTables_cpp Log message: Misc changes: x86 defaults to i586, backport a fix and tweak the PLISTs - like base-clang, change the default i386 target cpu to i586. Same diff from Brad - fix a crash exposed by net/libtorrent-rasterbar. Fix already present in 10.0.1, analyze and diff from Nam Nguyen - some lldb-related files snuck in the 10.0.0 PLIST-main changes, move them to PLIST-lldb as appropriate. Reported by daniel@
Re: remove explicit -march=i586
ok.
On 2020/08/07 19:34, Jonathan Gray wrote:
> On Fri, Aug 07, 2020 at 05:00:53AM -0400, Brad Smith wrote:
> > On Fri, Aug 07, 2020 at 05:36:19PM +1000, Jonathan Gray wrote:
> > > -march=i586 is now the default for clang in base on i386
> >
> > There were a few other spots with -march adjustments for atomics.
>
> it does seem that all of those -march=i686 cases are for atomics
>
> your diff minus the original now committed changes:
>
> Index: graphics/darktable/Makefile
> ===
> RCS file: /cvs/ports/graphics/darktable/Makefile,v
> retrieving revision 1.97
> diff -u -p -r1.97 Makefile
> --- graphics/darktable/Makefile 14 May 2020 12:35:31 - 1.97
> +++ graphics/darktable/Makefile 7 Aug 2020 09:26:26 -
> @@ -8,7 +8,7 @@ V=2.6.3
> DISTNAME=darktable-$V
> PORTROACH= limitw:1,even skipv:release-$V
> EXTRACT_SUFX=.tar.xz
> -REVISION=2
> +REVISION=3
>
> CATEGORIES= graphics x11
>
> @@ -72,8 +72,8 @@ NO_TEST=Yes
>
> .include
> .if ${ARCH:Mi386}
> -# needs 64-bit atomic ops, and all the registers it can get.
> -CFLAGS += -march=i686 -fomit-frame-pointer
> +# needs all the registers it can get.
> +CFLAGS+= -fomit-frame-pointer
> .endif
> # ...and there's a hard requirement of SSE3
> CFLAGS+= -msse3
> Index: graphics/openimageio/Makefile
> ===
> RCS file: /cvs/ports/graphics/openimageio/Makefile,v
> retrieving revision 1.41
> diff -u -p -r1.41 Makefile
> --- graphics/openimageio/Makefile 14 May 2020 12:35:31 - 1.41
> +++ graphics/openimageio/Makefile 7 Aug 2020 09:26:26 -
> @@ -10,7 +10,7 @@ GH_PROJECT =oiio
> V = 1.8.6
> GH_TAGNAME = Release-$V
> DISTNAME = openimageio-${V}
> -REVISION = 7
> +REVISION = 8
>
> SHARED_LIBS += OpenImageIO 5.0 # 1.0
> SHARED_LIBS += OpenImageIO_Util2.0 # 1.5
> @@ -56,9 +56,7 @@ CONFIGURE_ARGS += -DUSE_OPENCV=OFF \
> -DSTOP_ON_WARNING=OFF
>
> CXXFLAGS += -pthread
> -.if ${MACHINE_ARCH} == "i386"
> -CXXFLAGS += -march=i686
> -.endif
> +
> WRKDIST =${WRKDIR}/oiio-Release-$V
>
> # Fix undefined reference to __atomic_*
> Index: www/webkitgtk4/Makefile
> ===
> RCS file: /cvs/ports/www/webkitgtk4/Makefile,v
> retrieving revision 1.124
> diff -u -p -r1.124 Makefile
> --- www/webkitgtk4/Makefile 29 Jul 2020 07:06:41 - 1.124
> +++ www/webkitgtk4/Makefile 7 Aug 2020 09:26:26 -
> @@ -16,6 +16,7 @@ COMMENT = GTK+ port of the WebKit rende
> V = 2.28.4
> DISTNAME = webkitgtk-${V}
> PKGNAME =webkitgtk4-${V}
> +REVISION = 0
> EXTRACT_SUFX = .tar.xz
> API =4.0
> SUBST_VARS = API
> @@ -111,12 +112,6 @@ CXXFLAGS += -I${X11BASE}/include
> # save memory on 32bit arches
> .if !${PROPERTIES:Mlld} && ${MACHINE_ARCH} != "amd64"
> LDFLAGS += -Wl,--no-keep-memory
> -.endif
> -
> -# __sync_add_and_fetch_8
> -.if ${MACHINE_ARCH} == "i386"
> -CFLAGS +=-march=i686
> -CXXFLAGS += -march=i686
> .endif
>
> .if ${MACHINE_ARCH} == "powerpc"
> Index: x11/gnome/photos/Makefile
> ===
> RCS file: /cvs/ports/x11/gnome/photos/Makefile,v
> retrieving revision 1.81
> diff -u -p -r1.81 Makefile
> --- x11/gnome/photos/Makefile 24 Jun 2020 17:56:43 - 1.81
> +++ x11/gnome/photos/Makefile 7 Aug 2020 09:26:26 -
> @@ -4,6 +4,7 @@ COMMENT= access, organize and share you
>
> GNOME_PROJECT= gnome-photos
> GNOME_VERSION= 3.34.2
> +REVISION=0
>
> CATEGORIES= graphics
>
> @@ -43,11 +44,6 @@ RUN_DEPENDS += x11/gnome/grilo-plugins
>
> # org.freedesktop.Tracker schema
> RUN_DEPENDS += x11/gnome/tracker-miners
> -
> -.if ${MACHINE_ARCH} == i386
> -# undefined reference to `__sync_add_and_fetch_8'
> -CFLAGS +=-march=i686
> -.endif
>
> DEBUG_PACKAGES= ${BUILD_PACKAGES}
>
> Index: x11/qt5/qtwebkit/Makefile
> ===
> RCS file: /cvs/ports/x11/qt5/qtwebkit/Makefile,v
> retrieving revision 1.25
> diff -u -p -r1.25 Makefile
> --- x11/qt5/qtwebkit/Makefile 9 Jun 2020 22:43:16 - 1.25
> +++ x11/qt5/qtwebkit/Makefile 7 Aug 2020 09:26:26 -
> @@ -14,7 +14,7 @@ PKGNAME = qtwebkit-${VERSION}
> PKGSPEC =qtwebkit->=${VERSION}v0
>
> EPOCH= 0
> -REVISION = 0
> +REVISION = 1
>
>
> SHARED_LIBS += Qt5WebKit 3.1 # 5.9
> @@ -122,12 +122,6 @@ CONFIGURE_ARGS
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/08/07 03:59:58 Modified files: devel/keystone : Makefile Makefile.inc devel/keystone/main: Makefile distinfo devel/keystone/main/pkg: PLIST devel/keystone/python: Makefile distinfo devel/keystone/python/pkg: PLIST Log message: - update to update to keystone-0.9.2 - switch to python3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/08/07 03:59:10 Modified files: security : Makefile devel/quirks : Makefile devel/quirks/files: Quirks.pm security/py-ropper: Makefile Log message: switch py-ropper to python3 by default
Re: remove explicit -march=i586
On Fri, Aug 07, 2020 at 05:00:53AM -0400, Brad Smith wrote:
> On Fri, Aug 07, 2020 at 05:36:19PM +1000, Jonathan Gray wrote:
> > -march=i586 is now the default for clang in base on i386
>
> There were a few other spots with -march adjustments for atomics.
it does seem that all of those -march=i686 cases are for atomics
your diff minus the original now committed changes:
Index: graphics/darktable/Makefile
===
RCS file: /cvs/ports/graphics/darktable/Makefile,v
retrieving revision 1.97
diff -u -p -r1.97 Makefile
--- graphics/darktable/Makefile 14 May 2020 12:35:31 - 1.97
+++ graphics/darktable/Makefile 7 Aug 2020 09:26:26 -
@@ -8,7 +8,7 @@ V= 2.6.3
DISTNAME= darktable-$V
PORTROACH= limitw:1,even skipv:release-$V
EXTRACT_SUFX= .tar.xz
-REVISION= 2
+REVISION= 3
CATEGORIES=graphics x11
@@ -72,8 +72,8 @@ NO_TEST= Yes
.include
.if ${ARCH:Mi386}
-# needs 64-bit atomic ops, and all the registers it can get.
-CFLAGS += -march=i686 -fomit-frame-pointer
+# needs all the registers it can get.
+CFLAGS+= -fomit-frame-pointer
.endif
# ...and there's a hard requirement of SSE3
CFLAGS+= -msse3
Index: graphics/openimageio/Makefile
===
RCS file: /cvs/ports/graphics/openimageio/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- graphics/openimageio/Makefile 14 May 2020 12:35:31 - 1.41
+++ graphics/openimageio/Makefile 7 Aug 2020 09:26:26 -
@@ -10,7 +10,7 @@ GH_PROJECT = oiio
V =1.8.6
GH_TAGNAME = Release-$V
DISTNAME = openimageio-${V}
-REVISION = 7
+REVISION = 8
SHARED_LIBS += OpenImageIO 5.0 # 1.0
SHARED_LIBS += OpenImageIO_Util2.0 # 1.5
@@ -56,9 +56,7 @@ CONFIGURE_ARGS += -DUSE_OPENCV=OFF \
-DSTOP_ON_WARNING=OFF
CXXFLAGS +=-pthread
-.if ${MACHINE_ARCH} == "i386"
-CXXFLAGS +=-march=i686
-.endif
+
WRKDIST = ${WRKDIR}/oiio-Release-$V
# Fix undefined reference to __atomic_*
Index: www/webkitgtk4/Makefile
===
RCS file: /cvs/ports/www/webkitgtk4/Makefile,v
retrieving revision 1.124
diff -u -p -r1.124 Makefile
--- www/webkitgtk4/Makefile 29 Jul 2020 07:06:41 - 1.124
+++ www/webkitgtk4/Makefile 7 Aug 2020 09:26:26 -
@@ -16,6 +16,7 @@ COMMENT = GTK+ port of the WebKit rende
V =2.28.4
DISTNAME = webkitgtk-${V}
PKGNAME = webkitgtk4-${V}
+REVISION = 0
EXTRACT_SUFX = .tar.xz
API = 4.0
SUBST_VARS = API
@@ -111,12 +112,6 @@ CXXFLAGS +=-I${X11BASE}/include
# save memory on 32bit arches
.if !${PROPERTIES:Mlld} && ${MACHINE_ARCH} != "amd64"
LDFLAGS += -Wl,--no-keep-memory
-.endif
-
-# __sync_add_and_fetch_8
-.if ${MACHINE_ARCH} == "i386"
-CFLAGS += -march=i686
-CXXFLAGS +=-march=i686
.endif
.if ${MACHINE_ARCH} == "powerpc"
Index: x11/gnome/photos/Makefile
===
RCS file: /cvs/ports/x11/gnome/photos/Makefile,v
retrieving revision 1.81
diff -u -p -r1.81 Makefile
--- x11/gnome/photos/Makefile 24 Jun 2020 17:56:43 - 1.81
+++ x11/gnome/photos/Makefile 7 Aug 2020 09:26:26 -
@@ -4,6 +4,7 @@ COMMENT=access, organize and share you
GNOME_PROJECT= gnome-photos
GNOME_VERSION= 3.34.2
+REVISION= 0
CATEGORIES=graphics
@@ -43,11 +44,6 @@ RUN_DEPENDS += x11/gnome/grilo-plugins
# org.freedesktop.Tracker schema
RUN_DEPENDS += x11/gnome/tracker-miners
-
-.if ${MACHINE_ARCH} == i386
-# undefined reference to `__sync_add_and_fetch_8'
-CFLAGS += -march=i686
-.endif
DEBUG_PACKAGES=${BUILD_PACKAGES}
Index: x11/qt5/qtwebkit/Makefile
===
RCS file: /cvs/ports/x11/qt5/qtwebkit/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- x11/qt5/qtwebkit/Makefile 9 Jun 2020 22:43:16 - 1.25
+++ x11/qt5/qtwebkit/Makefile 7 Aug 2020 09:26:26 -
@@ -14,7 +14,7 @@ PKGNAME = qtwebkit-${VERSION}
PKGSPEC = qtwebkit->=${VERSION}v0
EPOCH= 0
-REVISION = 0
+REVISION = 1
SHARED_LIBS += Qt5WebKit 3.1 # 5.9
@@ -122,12 +122,6 @@ CONFIGURE_ARGS += -DENABLE_LLINT_C_LOOP=
# save memory on 32bit arches
.if !${PROPERTIES:Mlld} && ${MACHINE_ARCH} != "amd64"
LDFLAGS += -Wl,--no-keep-memory
-.endif
-
-# __sync_add_and_fetch_8
-.if ${MACHINE_ARCH} == "i386"
-CFLAGS += -march=i686
-CXXFLAGS +=
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/08/07 03:31:47 Modified files: devel/help2man : Makefile distinfo Log message: update to help2man-1.47.16
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/08/07 03:24:36 Modified files: editors/vim: Makefile distinfo editors/vim/patches: patch-runtime_filetype_vim patch-src_configure_ac editors/vim/pkg: PLIST-main Log message: update to vim-8.2.1382 ok sthen@ (MAINTAINER)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/08/07 03:21:15 Modified files: devel/spidermonkey68: Makefile distinfo Log message: update to spidermonkey68-68.11.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/08/07 03:21:02 Modified files: databases/kyotocabinet: Makefile games/0ad/base : Makefile lang/mono : Makefile multimedia/mpv : Makefile net/knot : Makefile net/dnsdist: Makefile x11/gnome/builder: Makefile Log message: remove explicit -march=i586 -march=i586 is now the default for clang in base on i386 ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/08/07 03:19:48 Modified files: devel/py-setproctitle: Makefile Added files: devel/py-setproctitle/patches: patch-src_spt_python_h Log message: define PY_SSIZE_T_CLEAN to remove a deprecation warning with python 3.8
Re: sysutils/rofi port bugfix
On Fri, Aug 07, 2020 at 10:28:43AM +0200, Stefan Hagen wrote:
> Solene Rapenne wrote:
> > sysutils/rofi has x11/i3 as a build dependency, it still
> > compiles fine and its make test passes 14/14
> >
> > ok?
>
> The question really is, why has rofi an i3 dependency? It is a multi
> purpose launcher that doesn't need i3. I removed the dependency and
> it compiles fine and tests are successful. So I propose this change:
>
> - remove x11/i3 dependency
> - add harfbuzz to WANTLIB (was missing according to port-lib-depends-check)
>
> Maintainer on CC.
>
> ok?
i3 was needed at some point to build rofi but that's indeed no longer
the case. I've applied your patch.
Thanks for pointing it out.
> Index: sysutils/rofi/Makefile
> ===
> RCS file: /cvs/ports/sysutils/rofi/Makefile,v
> retrieving revision 1.30
> diff -u -p -u -p -r1.30 Makefile
> --- sysutils/rofi/Makefile8 Apr 2020 12:25:36 -1.30
> +++ sysutils/rofi/Makefile7 Aug 2020 08:25:43 -
> @@ -4,7 +4,7 @@ COMMENT =window switcher, run dialog a
>
> V =1.5.4
> DISTNAME =rofi-${V}
> -REVISION =0
> +REVISION =1
>
> CATEGORIES =sysutils x11
> HOMEPAGE =https://github.com/davatorium/rofi
> @@ -17,13 +17,12 @@ PERMIT_PACKAGE =Yes
> MASTER_SITES =${HOMEPAGE}/releases/download/${V}/
>
> WANTLIB += c cairo gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
> -WANTLIB += gobject-2.0 intl m pango-1.0 pangocairo-1.0 pthread
> -WANTLIB += rsvg-2 startup-notification-1 xcb xcb-ewmh xcb-icccm
> -WANTLIB += xcb-randr xcb-render xcb-util xcb-xinerama xcb-xkb
> -WANTLIB += xcb-xrm xkbcommon xkbcommon-x11
> +WANTLIB += gobject-2.0 intl m pango-1.0 pangocairo-1.0 harfbuzz
> +WANTLIB += pthread rsvg-2 startup-notification-1 xcb xcb-ewmh
> +WANTLIB += xcb-icccm xcb-randr xcb-render xcb-util xcb-xinerama
> +WANTLIB += xcb-xkb xcb-xrm xkbcommon xkbcommon-x11
>
> -BUILD_DEPENDS +=devel/bison \
> -x11/i3
> +BUILD_DEPENDS +=devel/bison
> LIB_DEPENDS =devel/startup-notification \
> x11/gnome/librsvg \
> x11/xkbcommon
>
--
jasper
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/08/07 02:34:46 Modified files: sysutils/rofi : Makefile Log message: Remove BDEP on i3 which is no longer required. Sync WANTLIB while here. from Stefan Hagen
sysutils/rofi port bugfix
Solene Rapenne wrote:
> sysutils/rofi has x11/i3 as a build dependency, it still
> compiles fine and its make test passes 14/14
>
> ok?
The question really is, why has rofi an i3 dependency? It is a multi
purpose launcher that doesn't need i3. I removed the dependency and
it compiles fine and tests are successful. So I propose this change:
- remove x11/i3 dependency
- add harfbuzz to WANTLIB (was missing according to port-lib-depends-check)
Maintainer on CC.
ok?
Index: sysutils/rofi/Makefile
===
RCS file: /cvs/ports/sysutils/rofi/Makefile,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 Makefile
--- sysutils/rofi/Makefile8 Apr 2020 12:25:36 -1.30
+++ sysutils/rofi/Makefile7 Aug 2020 08:25:43 -
@@ -4,7 +4,7 @@ COMMENT =window switcher, run dialog a
V =1.5.4
DISTNAME =rofi-${V}
-REVISION =0
+REVISION =1
CATEGORIES =sysutils x11
HOMEPAGE =https://github.com/davatorium/rofi
@@ -17,13 +17,12 @@ PERMIT_PACKAGE =Yes
MASTER_SITES =${HOMEPAGE}/releases/download/${V}/
WANTLIB += c cairo gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
-WANTLIB += gobject-2.0 intl m pango-1.0 pangocairo-1.0 pthread
-WANTLIB += rsvg-2 startup-notification-1 xcb xcb-ewmh xcb-icccm
-WANTLIB += xcb-randr xcb-render xcb-util xcb-xinerama xcb-xkb
-WANTLIB += xcb-xrm xkbcommon xkbcommon-x11
+WANTLIB += gobject-2.0 intl m pango-1.0 pangocairo-1.0 harfbuzz
+WANTLIB += pthread rsvg-2 startup-notification-1 xcb xcb-ewmh
+WANTLIB += xcb-icccm xcb-randr xcb-render xcb-util xcb-xinerama
+WANTLIB += xcb-xkb xcb-xrm xkbcommon xkbcommon-x11
-BUILD_DEPENDS +=devel/bison \
-x11/i3
+BUILD_DEPENDS +=devel/bison
LIB_DEPENDS =devel/startup-notification \
x11/gnome/librsvg \
x11/xkbcommon
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/08/07 02:26:59 Modified files: devel/legit: Makefile Log message: fix HOMEPAGE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/08/07 02:08:18 Modified files: www/epiphany : Makefile distinfo www/epiphany/pkg: PLIST Log message: update to epiphany-3.36.4
remove explicit -march=i586
-march=i586 is now the default for clang in base on i386
Index: databases/kyotocabinet/Makefile
===
RCS file: /cvs/ports/databases/kyotocabinet/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- databases/kyotocabinet/Makefile 21 Jul 2020 14:25:36 - 1.24
+++ databases/kyotocabinet/Makefile 7 Aug 2020 07:21:23 -
@@ -40,11 +40,6 @@ FLAVOR?=
CONFIGURE_ARGS += --enable-opt
.else
CONFIGURE_ARGS += --disable-opt
-# i386 still need some optimized instructions
-# undefined reference to `__sync_bool_compare_and_swap_8' ...
-.if ${MACHINE_ARCH} == "i386"
-CXXFLAGS += -march=i586
-.endif
.endif
pre-configure:
Index: games/0ad/base/Makefile
===
RCS file: /cvs/ports/games/0ad/base/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- games/0ad/base/Makefile 11 Mar 2019 04:11:57 - 1.28
+++ games/0ad/base/Makefile 7 Aug 2020 07:21:42 -
@@ -63,11 +63,6 @@ CONFIGURE_ARGS +=--without-nvtt \
# XXX atlas (the level editor) requires threaded libxml
CONFIGURE_ARGS += --disable-atlas
-.if ${MACHINE_ARCH} == "i386"
-CFLAGS += -march=i586
-CXXFLAGS +=-march=i586
-.endif
-
WRKSRC = ${WRKDIST}/build/workspaces/gcc
do-build:
Index: lang/mono/Makefile
===
RCS file: /cvs/ports/lang/mono/Makefile,v
retrieving revision 1.139
diff -u -p -r1.139 Makefile
--- lang/mono/Makefile 29 Jul 2020 10:50:36 - 1.139
+++ lang/mono/Makefile 7 Aug 2020 07:22:07 -
@@ -61,10 +61,6 @@ AUTOMAKE_VERSION=1.15
CONFIGURE_ENV= ac_cv_header_execinfo_h=no
-.if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ENV+=CFLAGS="-march=i586"
-.endif
-
CONFIGURE_ARGS=--with-gc=included \
--with-tls=pthread \
--enable-btls \
Index: multimedia/mpv/Makefile
===
RCS file: /cvs/ports/multimedia/mpv/Makefile,v
retrieving revision 1.61
diff -u -p -r1.61 Makefile
--- multimedia/mpv/Makefile 29 Jan 2020 06:52:21 - 1.61
+++ multimedia/mpv/Makefile 7 Aug 2020 07:22:44 -
@@ -99,10 +99,6 @@ MAKE_FLAGS = -o "${WRKBUILD}" -t "${WRK
NO_TEST = Yes
-.if ${MACHINE_ARCH} == "i386"
-CFLAGS += -march=i586
-.endif
-
DO_WAF = cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MODPY_BIN} \
${WAF} ${MAKE_FLAGS}
Index: net/knot/Makefile
===
RCS file: /cvs/ports/net/knot/Makefile,v
retrieving revision 1.50
diff -u -p -r1.50 Makefile
--- net/knot/Makefile 19 Jun 2020 16:39:00 - 1.50
+++ net/knot/Makefile 7 Aug 2020 07:22:57 -
@@ -48,10 +48,6 @@ CONFIGURE_ENV = ac_cv_path_PDFLATEX="fa
CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
-.if ${MACHINE_ARCH} == "i386"
-CFLAGS += -march=i586
-.endif
-
post-install:
mv ${WRKINST}/etc/knot/ ${PREFIX}/share/examples/knot/
Index: net/dnsdist/Makefile
===
RCS file: /cvs/ports/net/dnsdist/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- net/dnsdist/Makefile30 Jul 2020 14:25:11 - 1.18
+++ net/dnsdist/Makefile7 Aug 2020 07:23:14 -
@@ -54,12 +54,6 @@ LIB_DEPENDS+=${MODLUA_LIB_DEPENDS} \
net/libfstrm \
www/h2o
-.if ${MACHINE_ARCH:Mi386}
-# needs 64-bit atomics
-CFLAGS+= -march=i586
-CXXFLAGS+= -march=i586
-.endif
-
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/{doc,examples}/dnsdist
cd ${WRKSRC}; ${INSTALL_DATA} README.md ${PREFIX}/share/doc/dnsdist/; \
Index: x11/gnome/builder/Makefile
===
RCS file: /cvs/ports/x11/gnome/builder/Makefile,v
retrieving revision 1.104
diff -u -p -r1.104 Makefile
--- x11/gnome/builder/Makefile 3 Jul 2020 21:13:22 - 1.104
+++ x11/gnome/builder/Makefile 7 Aug 2020 07:24:14 -
@@ -60,9 +60,7 @@ LIB_DEPENDS= devel/glade \
x11/gtksourceview4
.include
-.if ${ARCH:Mi386} # needs 64-bit atomic ops
-CFLAGS += -march=i586
-CXXFLAGS +=-march=i586
+.if ${ARCH:Mi386}
# Doesn't build with lld: non-ABS relocation R_386_GOTOFF against symbol
'.LC74'
USE_LLD = No
.endif
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2020/08/07 01:09:30 Modified files: editors/libreoffice: Makefile distinfo editors/libreoffice/patches: patch-RepositoryExternal_mk patch-basic_source_classes_sbxmod_cxx patch-basic_source_runtime_methods_cxx patch-configure patch-desktop_source_app_app_cxx patch-external_cppunit_ExternalProject_cppunit_mk patch-external_cppunit_UnpackedTarball_cppunit_mk patch-external_libetonyek_ExternalProject_libetonyek_mk patch-external_libfreehand_ExternalProject_libfreehand_mk patch-external_liblangtag_ExternalProject_liblangtag_mk patch-external_libmspub_ExternalProject_libmspub_mk patch-external_libmwaw_ExternalProject_libmwaw_mk patch-external_libodfgen_ExternalProject_libodfgen_mk patch-external_libpagemaker_ExternalProject_libpagemaker_mk patch-external_libstaroffice_ExternalProject_libstaroffice_mk patch-external_libvisio_ExternalProject_libvisio_mk patch-external_libwpd_ExternalProject_libwpd_mk patch-external_libwpg_ExternalProject_libwpg_mk patch-external_pdfium_UnpackedTarball_pdfium_mk patch-idl_source_objects_types_cxx patch-officecfg_registry_schema_org_openoffice_Office_Common_xcs patch-sal_osl_unx_thread_cxx patch-solenv_gbuild_platform_com_GCC_defs_mk patch-solenv_gbuild_platform_unxgcc_mk patch-vcl_Library_vclplug_gen_mk patch-vcl_qt5_Qt5Instance_cxx patch-vcl_source_app_svapp_cxx editors/libreoffice/pkg: PLIST-i18n-ru PLIST-java PLIST-main Added files: editors/libreoffice/patches: patch-libreofficekit_qa_gtktiledviewer_gtv-lok-dialog_cxx patch-libreofficekit_qa_gtktiledviewer_gtv-main-toolbar_cxx Removed files: editors/libreoffice/patches: patch-i18npool_source_collator_data_ko_charset_txt Log message: update to 7.0.0.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: mar...@cvs.openbsd.org 2020/08/07 00:40:46 Modified files: astro : Makefile devel/quirks : Makefile devel/quirks/files: Quirks.pm astro/py-astral: Makefile distinfo astro/py-astral/pkg: PLIST Log message: Update py-astral to 2.2 and move to python3. Initial version from Wen Heping. This version from kmos@. Maintainer timeout. OK kmos@
Re: i386/LLVM 10
On Thu, Aug 06, 2020 at 01:00:04PM +0100, Stuart Henderson wrote: > On 2020/08/06 03:22, Jonathan Gray wrote: > > On Tue, Aug 04, 2020 at 07:40:45PM -0400, George Koehler wrote: > > > On Tue, 4 Aug 2020 23:22:14 +0100 > > > Stuart Henderson wrote: > > > > > > > ld.lld: error: undefined symbol: __atomic_is_lock_free > > > > > > kettenis wrote an __atomic_is_lock_free for macppc when it switched to > > > base-clang: /usr/src/lib/libcompiler_rt/ppc/atomic_lock_free.c > > > > > > Do we now need to write __atomic_is_lock_free for i386? > > > > > > This commit might be the cause: > > > [X86] Correct the value of MaxAtomicInlineWidth for pre-586 cpus > > > https://github.com/llvm/llvm-project/commit/7339e61 > > > https://reviews.llvm.org/D59566 > > > > > > clang might call __atomic_is_lock_free to check whether the cpu can > > > cmpxchg8b. > > > > > > > > > > or we make the baseline i586? > > I'm OK with doing this. > > databases/mariadb still fails though: > > FAILED: unittest/strings/json-t > : && /pobj/mariadb-10.5.4/bin/c++ -O2 -pipe -I/usr/local/include > -Wl,-z,relro,-z,now -fstack-protector --param=ssp-buffer-size=4 -DNDEBUG > -D_FORTIFY_SOURCE=2 -DDBUG_OFF -L/usr/local/lib > unittest/strings/CMakeFiles/json-t.dir/json-t.c.o > -o unittest/strings/json-t -L/usr/lib -L/usr/local/lib -lpthread > unittest/mytap/libmytap.a strings/libstrings.a mysys/libmysys.a > dbug/libdbug.a strings/libstrings.a mysys/libmysys.a dbug/libdbug.a -lz > -lm -lpthread -Wl,-rpa > th-link,/usr/X11R6/lib && : > ld: error: undefined symbol: my_atomic_add32 The test used for c11 atomics at configure time fails. updating compiler_rt atomic.c to the release/10.x branch works here Index: atomic.c === RCS file: /cvs/src/lib/libcompiler_rt/atomic.c,v retrieving revision 1.2 diff -u -p -r1.2 atomic.c --- atomic.c26 Dec 2017 20:59:44 - 1.2 +++ atomic.c7 Aug 2020 06:06:17 - @@ -1,29 +1,27 @@ -/*===-- atomic.c - Implement support functions for atomic operations.--=== - * - * The LLVM Compiler Infrastructure - * - * This file is dual licensed under the MIT and the University of Illinois Open - * Source Licenses. See LICENSE.TXT for details. - * - *===--=== - * - * atomic.c defines a set of functions for performing atomic accesses on - * arbitrary-sized memory locations. This design uses locks that should - * be fast in the uncontended case, for two reasons: - * - * 1) This code must work with C programs that do not link to anything - * (including pthreads) and so it should not depend on any pthread - * functions. - * 2) Atomic operations, rather than explicit mutexes, are most commonly used - * on code where contended operations are rate. - * - * To avoid needing a per-object lock, this code allocates an array of - * locks and hashes the object pointers to find the one that it should use. - * For operations that must be atomic on two locations, the lower lock is - * always acquired first, to avoid deadlock. - * - *===--=== - */ +//===-- atomic.c - Implement support functions for atomic operations.--===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===--===// +// +// atomic.c defines a set of functions for performing atomic accesses on +// arbitrary-sized memory locations. This design uses locks that should +// be fast in the uncontended case, for two reasons: +// +// 1) This code must work with C programs that do not link to anything +// (including pthreads) and so it should not depend on any pthread +// functions. +// 2) Atomic operations, rather than explicit mutexes, are most commonly used +// on code where contended operations are rate. +// +// To avoid needing a per-object lock, this code allocates an array of +// locks and hashes the object pointers to find the one that it should use. +// For operations that must be atomic on two locations, the lower lock is +// always acquired first, to avoid deadlock. +// +//===--===// #include #include @@ -35,13 +33,14 @@ #pragma redefine_extname __atomic_load_c SYMBOL_NAME(__atomic_load) #pragma redefine_extname __atomic_store_c SYMBOL_NAME(__atomic_store) #pragma redefine_extname __atomic_exchange_c SYMBOL_NAME(__atomic_exchange) -#pragma redefine_extname __atomic_compare_exchange_c SYMBOL_NAME(__atomic_compare_exchange) +#pragma redefine_extname __atomic_compare_exchange_c SYMBOL_NAME( \ +__atomic_compare_exchange) /// Number of
Re: [update] goaccess 1.4
On Fri, Aug 07, 2020 at 12:33:49AM +0300, Kirill Bychkov wrote:
> Missed your previous mail.
> I'm OK with moving config to /etc/goaccess/ as upstream have done.
> Probably browsers.list could be @sampled here with the tweak to
> config file setting its default location.
>
and here's a diff @sampling both files under ${SYSCONFDIR}/goaccess/ - i
wouldnt modify the default config file, as it doesnt seem to add much
value by default, but at least browsers.list is here for users to
discover it.
Landry
Index: Makefile
===
RCS file: /cvs/ports/www/goaccess/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile10 Aug 2019 21:24:31 - 1.24
+++ Makefile7 Aug 2020 06:00:59 -
@@ -2,8 +2,7 @@
COMMENT = realtime console web log analyzer
-DISTNAME = goaccess-1.3
-REVISION = 2
+DISTNAME = goaccess-1.4
CATEGORIES = www
@@ -34,14 +33,5 @@
CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
FAKE_FLAGS = confdir="${PREFIX}/share/examples/goaccess"
-
-FLAVORS = tokyocabinet
-FLAVOR ?=
-
-.if ${FLAVOR:Mtokyocabinet}
-WANTLIB += bz2 tokyocabinet z
-LIB_DEPENDS += databases/tokyocabinet
-CONFIGURE_ARGS += --enable-tcb=btree
-.endif
.include
Index: distinfo
===
RCS file: /cvs/ports/www/goaccess/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- distinfo28 Nov 2018 19:40:27 - 1.13
+++ distinfo7 Aug 2020 06:00:59 -
@@ -1,2 +1,2 @@
-SHA256 (goaccess-1.3.tar.gz) = jHdcXCS/hakz/W8SSQBIRzQtZUKqUz5OwCqve+Qde5s=
-SIZE (goaccess-1.3.tar.gz) = 541374
+SHA256 (goaccess-1.4.tar.gz) = 6Pu5/4UlVtct/Z8dATS6B1zltMQSiZAqb04Nl8aTd74=
+SIZE (goaccess-1.4.tar.gz) = 595264
Index: patches/patch-config_goaccess_conf
===
RCS file: /cvs/ports/www/goaccess/patches/patch-config_goaccess_conf,v
retrieving revision 1.1
diff -u -r1.1 patch-config_goaccess_conf
--- patches/patch-config_goaccess_conf 20 Jan 2019 13:36:51 - 1.1
+++ patches/patch-config_goaccess_conf 7 Aug 2020 06:00:59 -
@@ -20,38 +20,15 @@
##
# Date Format Options (required)
##
-@@ -653,31 +663,10 @@ static-file .flv
- #std-geoip false
-
- # Specify path to GeoIP database file. i.e., GeoLiteCity.dat
--# .dat file needs to be downloaded from maxmind.com.
-+# Free GeoLite2 databases are available in the geolite2-city/country packages.
+@@ -698,7 +708,10 @@ static-file .flv
+ # Download the GeoLite2-Country.mmdb.gz
+ # gunzip GeoLite2-Country.mmdb.gz
#
--# For IPv4 City database:
--# wget -N
http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
--# gunzip GeoLiteCity.dat.gz
--#
--# For IPv6 City database:
--# wget -N
http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz
--# gunzip GeoLiteCityv6.dat.gz
--#
--# For IPv6 Country database:
--# wget -N http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz
--# gunzip GeoIPv6.dat.gz
--#
--# For GeoIP2 City database:
--# wget -N
http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz
--# gunzip GeoLite2-City.mmdb.gz
--#
--# For GeoIP2 Country database:
--# wget -N
http://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.mmdb.gz
--# gunzip GeoLite2-Country.mmdb.gz
--#
--# Note: `geoip-city-data` is an alias of `geoip-database`
--#
-#geoip-database /usr/local/share/GeoIP/GeoLiteCity.dat
++
++# Free GeoLite2 databases are available in the geolite2-city/country packages.
+#geoip-database /var/db/GeoIP/GeoLite2-City.mmdb
+geoip-database /var/db/GeoIP/GeoLite2-Country.mmdb
##
- # Tokyo Cabinet Options
+ # Persistence Options
Index: patches/patch-src_browsers_c
===
RCS file: /cvs/ports/www/goaccess/patches/patch-src_browsers_c,v
retrieving revision 1.1
diff -u -r1.1 patch-src_browsers_c
--- patches/patch-src_browsers_c20 Jan 2019 13:36:51 - 1.1
+++ patches/patch-src_browsers_c7 Aug 2020 06:00:59 -
@@ -5,7 +5,7 @@
Index: src/browsers.c
--- src/browsers.c.orig
+++ src/browsers.c
-@@ -116,6 +116,8 @@ static const char *browsers[][2] = {
+@@ -114,6 +114,8 @@ static const char *browsers[][2] = {
{"MicroMessenger", "Others"},
{"Apache", "Others"},
{"JOSM", "Others"},
@@ -14,10 +14,10 @@
/* Feed-reader-as-a-service */
{"AppleNewsBot", "Feeds"},
-@@ -183,6 +185,7 @@ static const char *browsers[][2] = {
- {"Python", "Crawlers"},
- {"LinkedIn", "Crawlers"},
+@@ -189,6 +191,7 @@ static const char *browsers[][2] = {
{"Microsoft-WebDAV", "Crawlers"},
+
