[Update] sysutils/p5-Rex : Update to 1.32.2

2021-02-06 Thread wen heping

Hi, ports@:

   Here is a patch for sysutils/p5-Rex :
   i)update to 1.13.2
   ii)add some missing DEPENDS
   It build well and pass all tests on amd64-current.
   No other ports depends on sysutils/p5-Rex.


Cheers !
wenIndex: Makefile
===
RCS file: /cvs/ports/sysutils/p5-Rex/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile28 Jul 2020 07:15:59 -  1.6
+++ Makefile7 Feb 2021 03:03:03 -
@@ -3,8 +3,7 @@
 COMMENT=   perl-based deployment and configuration management
 
 CPAN_AUTHOR=   FERKI
-DISTNAME=  Rex-1.12.0
-REVISION=  0
+DISTNAME=  Rex-1.13.2
 
 CATEGORIES=sysutils
 
@@ -21,6 +20,7 @@ RUN_DEPENDS=  converters/p5-JSON-XS \
devel/p5-Devel-Caller \
devel/p5-Hash-Merge \
devel/p5-IO-String \
+   devel/p5-IO-Tty \
devel/p5-List-MoreUtils \
devel/p5-Sort-Naturally \
devel/p5-Test-Pod \
@@ -36,6 +36,7 @@ RUN_DEPENDS=  converters/p5-JSON-XS \
 BUILD_DEPENDS= devel/p5-File-ShareDir
 
 TEST_DEPENDS=  devel/p5-Test-Deep \
+   devel/p5-Test-Output \
devel/p5-Test-UseAllModules
 
 post-install:
Index: distinfo
===
RCS file: /cvs/ports/sysutils/p5-Rex/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo24 Jul 2020 14:01:00 -  1.3
+++ distinfo7 Feb 2021 03:03:03 -
@@ -1,2 +1,2 @@
-SHA256 (Rex-1.12.0.tar.gz) = tZWBKCU7HJiQTtP/DWkCZYOUq0oqSJanq+3WuJFPYb0=
-SIZE (Rex-1.12.0.tar.gz) = 338275
+SHA256 (Rex-1.13.2.tar.gz) = DplKEzdClbmsCAN5WzxylrcwCfIukhDOjCRxZTW2kLs=
+SIZE (Rex-1.13.2.tar.gz) = 349355
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/p5-Rex/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   24 Jul 2020 14:01:00 -  1.3
+++ pkg/PLIST   7 Feb 2021 03:03:03 -
@@ -427,6 +427,7 @@ ${P5SITE}/auto/share/dist/Rex/rex-tab-co
 @man man/man3p/Rex::Box::KVM.3p
 @man man/man3p/Rex::Box::VBox.3p
 @man man/man3p/Rex::CMDB.3p
+@man man/man3p/Rex::CMDB::YAML.3p
 @man man/man3p/Rex::Commands.3p
 @man man/man3p/Rex::Commands::Augeas.3p
 @man man/man3p/Rex::Commands::Box.3p
@@ -479,6 +480,7 @@ ${P5SITE}/auto/share/dist/Rex/rex-tab-co
 @man man/man3p/Rex::Shared::Var.3p
 @man man/man3p/Rex::Task.3p
 @man man/man3p/Rex::Template.3p
+@man man/man3p/Rex::Template::NG.3p
 @man man/man3p/Rex::Test::Base.3p
 @man man/man3p/Rex::Transaction.3p
 @man man/man3p/Rex::Virtualization::Docker.3p


回复: [Update] databases/py-peewee: Update to 3.13.3

2021-02-06 Thread wen heping
HI, ports@:

Here is the revised patch for py-peewee:
i) Update to 3.14.0
ii) Switch to python3
iii) Add NO_SQLITE=1 to MAKE_ENV to avoid error message when build.

   It build well and run well and pass the regression tests.

   Coments?


wen

发件人: owner-po...@openbsd.org  代表 wen heping 

发送时间: 2020年8月19日 7:19
收件人: ports@openbsd.org 
主题: 回复: [Update] databases/py-peewee: Update to 3.13.3

ping ...

发件人: owner-po...@openbsd.org  代表 wen heping 

发送时间: 2020年8月4日 12:25
收件人: ports@openbsd.org 
主题: [Update] databases/py-peewee: Update to 3.13.3

Hi, ports@:

   Here is a patch for databases/py-peewee:
   i) Update to 3.13.3
   ii) Add py-psycopg2 as TEST_DEPENDS
   It build well and run well and pass the tests on amd64-current system,
both with py2 and py3.
  No other ports depends on it.


Cheers !
wen
Index: Makefile
===
RCS file: /cvs/ports/databases/py-peewee/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile10 Dec 2020 02:20:29 -  1.18
+++ Makefile7 Feb 2021 01:43:21 -
@@ -2,10 +2,9 @@
 
 COMMENT=   small expressive ORM
 
-MODPY_EGG_VERSION= 2.8.3
+MODPY_EGG_VERSION= 3.14.0
 DISTNAME=  peewee-${MODPY_EGG_VERSION}
 PKGNAME=   py-${DISTNAME}
-REVISION=  3
 
 GH_ACCOUNT=coleifer
 GH_PROJECT=peewee
@@ -20,13 +19,17 @@ PERMIT_PACKAGE= Yes
 
 BUILD_DEPENDS= textproc/py-sphinx${MODPY_FLAVOR}>=1.5
 
+TEST_DEPENDS=  databases/py-psycopg2${MODPY_FLAVOR}
+
 FLAVORS=   python3
-FLAVOR?=
+FLAVOR?=   python3
 
 MODULES=   lang/python
 MODPY_SETUPTOOLS=  Yes
 
-MAKE_ENV +=PYTHONPATH=${WRKSRC} 
SPHINXBUILD=${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX}
+MAKE_ENV +=PYTHONPATH=${WRKSRC} \
+   SPHINXBUILD=${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX}\
+   NO_SQLITE=1
 DOCSRC =   ${WRKSRC}/docs
 post-build:
cd ${DOCSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} html
@@ -41,6 +44,6 @@ post-install:
mv ${PREFIX}/bin/pwiz.py ${PREFIX}/bin/pwiz${MODPY_BIN_SUFFIX}
 
 do-test:
-   cd ${WRKSRC} && ${MODPY_BIN} tests.py
+   cd ${WRKSRC} && ${MODPY_BIN} runtests.py
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/databases/py-peewee/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo17 Sep 2016 15:33:39 -  1.7
+++ distinfo7 Feb 2021 01:43:21 -
@@ -1,2 +1,2 @@
-SHA256 (peewee-2.8.3.tar.gz) = NW3QQbn6Ztbny8T/ROyHhFq/fXRxQn13vvD4+jye2dw=
-SIZE (peewee-2.8.3.tar.gz) = 639529
+SHA256 (peewee-3.14.0.tar.gz) = dUHeOElT5L/jCF0YRRKoEP+/Gm7lVQFnGHYvKHf6iKQ=
+SIZE (peewee-3.14.0.tar.gz) = 877299
Index: patches/patch-setup_py
===
RCS file: /cvs/ports/databases/py-peewee/patches/patch-setup_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-setup_py
--- patches/patch-setup_py  17 Sep 2016 15:33:39 -  1.2
+++ patches/patch-setup_py  7 Feb 2021 01:43:21 -
@@ -1,25 +1,37 @@
-$OpenBSD: patch-setup_py,v 1.2 2016/09/17 15:33:39 danj Exp $
+$OpenBSD$
+- disable cython
 
-1. For option --single-version-externally-managed
-2. Disable cython
-
 setup.py.orig  Thu Aug 25 20:17:54 2016
-+++ setup.py   Sun Aug 28 10:12:56 2016
-@@ -1,7 +1,7 @@
- import os
- import sys
- import warnings
--from distutils.core import setup
-+from setuptools import setup
- from distutils.extension import Extension
- from distutils.version import StrictVersion
- 
-@@ -28,7 +28,7 @@ else:
-   'C extensions, install Cython >=' + cython_min_version +
-   '.')
- else:
+Index: setup.py
+--- setup.py.orig
 setup.py
+@@ -19,18 +19,18 @@ extension_support = True  # Assume we are building C e
+ # Check if Cython is available and use it to generate extension modules. If
+ # Cython is not installed, we will fall back to using the pre-generated C 
files
+ # (so long as we're running on CPython).
+-try:
+-from Cython.Build import cythonize
+-from Cython.Distutils import build_ext
+-from Cython.Distutils.extension import Extension
+-except ImportError:
+-cython_installed = False
+-else:
+-if platform.python_implementation() != 'CPython':
+-cython_installed = extension_support = False
+-warnings.warn('C extensions disabled as you are not using CPython.')
+-else:
 -cython_installed = True
-+cython_installed = False
++#try:
++#from Cython.Build import cythonize
++#from Cython.Distutils import build_ext
++#from Cython.Distutils.extension import Extension
++#except ImportError:
++#cython_installed = False
++#else:
++#if platform.python_implementation() != 'CPython':
++#cython_installe

Re: Remove multimedia/avinfo?

2021-02-06 Thread Brad Smith

On 2/6/2021 4:16 PM, Christian Weisgerber wrote:

multimedia/avinfo needs to be fixed for -fno-common, but I'm leaning
towards just removing it.

   Avinfo is an utility for displaying AVI, MPEG, OGG/OGM, MKV,
   IFO header information. It returns the length of a clip, FPS,
   resolution, codecs, sound parameters, and the number, type and
   language of the stream.

The last release was some 15 years ago.  Which means it won't even
recognize some of today's formats.  I tried to run it against a
recent A/V file, and it just dumped core from free().

Nowadays, mediainfo provides such functionality.

OK to remove?


IMO just remove it.



Re: telephony/kamailio update: if you're using this, please test!

2021-02-06 Thread Stuart Henderson
On 2021/02/04 20:40, Stuart Henderson wrote:
> This updates kamailio to a much more recent version (prompted by the old
> version failing to build with compilers that use -fno-common by default).
> 
> If you're using it, especially if you're using it with libressl, please
> test and report back. (I can provide packages for amd64 -current if that
> makes it easier..)

we have now switched to -fno-common by default in clang, I've committed
this diff so that it keeps on building. only build tested so far.



Remove multimedia/avinfo?

2021-02-06 Thread Christian Weisgerber
multimedia/avinfo needs to be fixed for -fno-common, but I'm leaning
towards just removing it.

  Avinfo is an utility for displaying AVI, MPEG, OGG/OGM, MKV, 
  IFO header information. It returns the length of a clip, FPS, 
  resolution, codecs, sound parameters, and the number, type and 
  language of the stream.

The last release was some 15 years ago.  Which means it won't even
recognize some of today's formats.  I tried to run it against a
recent A/V file, and it just dumped core from free().

Nowadays, mediainfo provides such functionality.

OK to remove?

-- 
Christian "naddy" Weisgerber  na...@mips.inka.de



Re: Question about lang/ghc module (trying to port git-annex)

2021-02-06 Thread James Cook
On Fri, Feb 05, 2021 at 09:57:48PM -0800, Greg Steuck wrote:
> James Cook  writes:
> 
> >> Would you like to try your hand in extending post-install target with
> >> some man formatting magic like we have in other ports?
> >
> > Done (commit a1c5aec8) in my "git-annex" branch:
> >
> > https://github.com/falsifian/ports/commits/git-annex
> 
> Very nice!
> 
> > It's not pretty. I replicated some logic from Build/Man.hs, which is
> > called from Setup.hs.
> 
> Some quick observations. Makefile allows line-continuation with \ and
> this is how people write long command lines. The for loop would be more
> readable if it were split like that. I also don't see a lot of places in
> ports make files with quotes around variables. I suspect we just expect
> people to not go nuts with spaces in directory names when building
> ports.

Thanks. I split up the long command and removed quotes:

https://github.com/falsifian/ports/commit/e24278e3c1d7fca1b3c4961a0e81a5bb2ca5bcf0

Two notes:

* Currently "make post-build" fails if you run it twice. Adding -p in
  "mkdir ${MAN1_STAGING_DIR}" would fix that. I don't know if it's
  better to fail or not if "make post-build" gets run more than once.

* I see you put "@" before the ln -s lines. I wasn't sure whether to
  add them to the other commands. The output is not that interesting.

> > Normally cabal v2-install would do that work for
> > us (putting the result in .cabal/store/ghc-XXX/git-annex-XXX) but I
> > don't know if it's worth getting that working.
> >
> > Caveat: I took a shortcut when testing this: instead of re-running
> > "make build" I just made the post-build target after adding this in.
> > I'll try building from scratch later if you don't beat me to it.
> 
> I believe `make rebuild` should reuse the cabal built pieces. post-build
> seems like a reasonable place for this kind of work. Alternatively
> sticking those man-formatting commands into post-install also seems
> acceptable to me.

I confirmed the port works by installing on a different machine.

One hitch: I needed to manually uninstall the current cabal-install
port because it conflicts with the new cabal port. Is there a way to
tell ports that cabal is a successor to cabal-install?

(I considered putting the man-building commands in post-install, but I
wasn't sure where to put the staging directory if I did that. I wanted
the staging directory because I assumed I should use the ${INSTALL_MAN}
macro if possible to put the files in their final place.)

> > On that branch I also removed the runtime dep on devel/git-lfs (it's
> > just one of a large number of optional backends).
> 
> Good call.
> 
> >> From what I gathered the v2-install target is largely unusable for
> >> installing packages outside of .cabal tree. At least neither I nor
> >> FreeBSD maintainer found a way to leverage that. Hence the manual
> >> install flow.
> >
> > I probably don't know all the subtleties, but when I run
> > "cabal v2-install", I get a nice set of files under
> > ~/.cabal/ghc-XXX/git-annex-XXX, including the man pages and all three
> > needed binaries. I would guess that just copying those files to the
> > destination would do the trick for most cabal executable packages, but
> > I haven't actually tried it. Maybe it's better to be cautious.
> 
> I'll dig into this a bit. I simply didn't need to worry about this up
> until now as all the other ports don't do much custom Setup.hs work.

I don't know if there will be any cases other than man pages and
git-annex's command aliases. Not sure how much effort it's worth.

> Thanks
> Greg

-- 
James



update: audio/cmus 2.8.0 --> 2.9.1

2021-02-06 Thread Paco Esteban
Hi ports@,

This is an update for audio/cmus to its latest version 2.9.1
You can see all the changes here:
https://github.com/cmus/cmus/compare/v2.8.0...v2.9.1

For the port itself the update is pretty straight forward.
There are a couple of extras on the output of port-lib-depends-check but
there's a comment on the Makefile saying that those should be there.

Works for me on amd64 with various MP3, OGG and FLAC files.

comments ? ok to commit ?

diff a7e057a3385c1587b880ac57ca9f8db1778192dd /usr/ports
blob - 6fad49ebce822336794b66b69fa6e0b6cb5e74b1
file + audio/cmus/Makefile
--- audio/cmus/Makefile
+++ audio/cmus/Makefile
@@ -3,8 +3,7 @@
 COMMENT-main=  ncurses-based music player
 COMMENT-ffmpeg=ffmpeg input plugin for cmus (.aac, .mp4...)
 
-V= 2.8.0
-REVISION=  0
+V= 2.9.1
 PKGNAME-main=  ${PKGNAME}
 PKGNAME-ffmpeg=cmus-ffmpeg-${V}
 
blob - 7d364c7fd9fe1f04671b20ac1a222ffcb55051da
file + audio/cmus/distinfo
--- audio/cmus/distinfo
+++ audio/cmus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cmus-2.8.0.tar.gz) = dWzixiQbIQTcGQl0iCJd5VmsGAKhdb4CM8+2+8AvO9I=
-SIZE (cmus-2.8.0.tar.gz) = 317243
+SHA256 (cmus-2.9.1.tar.gz) = b7eZyuYNuTJPA5Iruy4yIQf9OGq0KcAnGZaYUpTi70Q=
+SIZE (cmus-2.9.1.tar.gz) = 321004
blob - c85557ccc4a44196cf1828527b9d36ab05260790
file + audio/cmus/pkg/PLIST-ffmpeg
--- audio/cmus/pkg/PLIST-ffmpeg
+++ audio/cmus/pkg/PLIST-ffmpeg
@@ -1,3 +1,3 @@
 @comment $OpenBSD: PLIST-ffmpeg,v 1.1 2016/01/17 01:16:38 juanfra Exp $
 @conflict cmus-<2.7.1
-lib/cmus/ip/ffmpeg.so
+@so lib/cmus/ip/ffmpeg.so
blob - 1e2311efe5fbb561d8b077ce9a930112d4ef2801
file + audio/cmus/pkg/PLIST-main
--- audio/cmus/pkg/PLIST-main
+++ audio/cmus/pkg/PLIST-main
@@ -6,20 +6,21 @@
 @bin bin/cmus-remote
 lib/cmus/
 lib/cmus/ip/
-lib/cmus/ip/cdio.so
-lib/cmus/ip/cue.so
-lib/cmus/ip/flac.so
-lib/cmus/ip/mad.so
-lib/cmus/ip/opus.so
-lib/cmus/ip/vorbis.so
-lib/cmus/ip/wav.so
-lib/cmus/ip/wavpack.so
+@so lib/cmus/ip/cdio.so
+@so lib/cmus/ip/cue.so
+@so lib/cmus/ip/flac.so
+@so lib/cmus/ip/mad.so
+@so lib/cmus/ip/opus.so
+@so lib/cmus/ip/vorbis.so
+@so lib/cmus/ip/wav.so
+@so lib/cmus/ip/wavpack.so
 lib/cmus/op/
-lib/cmus/op/sndio.so
+@so lib/cmus/op/sndio.so
 @man man/man1/cmus-remote.1
 @man man/man1/cmus.1
 @man man/man7/cmus-tutorial.7
 share/cmus/
+share/cmus/amazon.theme
 share/cmus/cyan.theme
 share/cmus/default.theme
 share/cmus/dracula.theme
@@ -27,6 +28,7 @@ share/cmus/gray-88.theme
 share/cmus/green-mono-88.theme
 share/cmus/green.theme
 share/cmus/gruvbox-alt.theme
+share/cmus/gruvbox-warm.theme
 share/cmus/gruvbox.theme
 share/cmus/jellybeans.theme
 share/cmus/night.theme

-- 
Paco Esteban.
0x5818130B8A6DBC03



[update] databases/web2ldap to 1.5.113

2021-02-06 Thread Lucas Raab
Hello,

Here's a quick update to web2ldap to 1.5.113. Works fine with an ldapd
instance as well as the various default server bookmarks it ships with.

Changelog: https://web2ldap.de/changes-1.5.html#r1.5.113

Lucas
diff ce56dee2526baf17307bfe8dfc38c5bb8806a30a /usr/ports
blob - ca38e48307f668892ad7c0e70896c63e42fd2de8
file + databases/web2ldap/Makefile
--- databases/web2ldap/Makefile
+++ databases/web2ldap/Makefile
@@ -2,7 +2,7 @@
 
 COMMENT =  full-featured LDAP client running as web application
 
-MODPY_EGG_VERSION =1.5.112
+MODPY_EGG_VERSION =1.5.113
 DISTNAME = web2ldap-${MODPY_EGG_VERSION}
 
 CATEGORIES =   databases www sysutils
blob - 9bef04c184b3e5b2674d0e68d95d5d52635ee9ff
file + databases/web2ldap/distinfo
--- databases/web2ldap/distinfo
+++ databases/web2ldap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (web2ldap-1.5.112.tar.gz) = qK8xKZTShLVov0pMpj0RtexWYSRbLJSq/hoiHDzXBkQ=
-SIZE (web2ldap-1.5.112.tar.gz) = 523572
+SHA256 (web2ldap-1.5.113.tar.gz) = 1M5F4ICk6wKqP/xUZAEpayWWWOAyghzRDBJPW/4x4M0=
+SIZE (web2ldap-1.5.113.tar.gz) = 524101


misc/hfsplus -fno-common

2021-02-06 Thread Thaison Nguyen
This should fix compilation of misc/hfsplus. Patch taken from Debian people.

However, I was not able to mount any hfsplus volume, I always get the following 
error:

obsd# hpmount -r /dev/rsd1i
hpmount: /dev/rsd1i: This is not a HFS+ volume (Unknown error: -1)

Anyone had this working/knows how to use this?



hfsplus.diff
Description: Binary data


[update] xapian and co

2021-02-06 Thread Lucas Raab
Hello,

Here's an update to the xapian collection to 1.4.18

* databases/xapian-core
  * https://xapian.org/docs/xapian-core-1.4.18/NEWS
* databases/xapian-bindings
  * https://xapian.org/docs/xapian-bindings-1.4.18/NEWS
* www/xapian-omega
  * https://xapian.org/docs/xapian-omega-1.4.18/NEWS

Tested so far by running some notmuch searches, using omega in the
browser, and building doxygen/recoll. Any other testers want to give it
a spin?

Lucas
diff 8c3ce0a8d256fa24f9c4a67449a2acd28b09eb72 /usr/ports
blob - f1753880faa21745b591a23fb9f9c855da7efd90
file + databases/xapian-bindings/Makefile
--- databases/xapian-bindings/Makefile
+++ databases/xapian-bindings/Makefile
@@ -4,8 +4,7 @@ COMMENT-main=   perl bindings for Xapian
 COMMENT-python=python bindings for Xapian
 COMMENT-ruby=  ruby bindings for Xapian
 
-V= 1.4.17
-REVISION=  1
+V= 1.4.18
 DISTNAME=  xapian-bindings-${V}
 
 PKGNAME-main=  xapian-bindings-perl-${V}
blob - 43f100cc9637f69e339b89c9f67b97a8d70b2486
file + databases/xapian-bindings/distinfo
--- databases/xapian-bindings/distinfo
+++ databases/xapian-bindings/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xapian-bindings-1.4.17.tar.xz) = 
SKZdkeDDpKj0ocoF3DkiWRIIisosR8AEjMk7CdM469M=
-SIZE (xapian-bindings-1.4.17.tar.xz) = 1135100
+SHA256 (xapian-bindings-1.4.18.tar.xz) = 
/lIGTpDSAveBkTCuOtATyLK5y1F62f1gfPQdARDF8Y8=
+SIZE (xapian-bindings-1.4.18.tar.xz) = 1135644
blob - 49713ebeba0d7087287ee954ce6c3b96b16c077c
file + databases/xapian-core/Makefile
--- databases/xapian-core/Makefile
+++ databases/xapian-core/Makefile
@@ -2,7 +2,7 @@
 
 COMMENT=   search engine library
 
-V= 1.4.17
+V= 1.4.18
 PORTROACH= limitw:1,even
 DISTNAME=  xapian-core-${V}
 # the other xapian ports should be kept in-sync:
blob - 001b288534aabd3248e641b9635841a4ddd33df8
file + databases/xapian-core/distinfo
--- databases/xapian-core/distinfo
+++ databases/xapian-core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xapian-core-1.4.17.tar.xz) = 
teuFVt6hsMrUFnpmIjUi5m1nDsHroWx/3IRO1rZSVy4=
-SIZE (xapian-core-1.4.17.tar.xz) = 2997700
+SHA256 (xapian-core-1.4.18.tar.xz) = 
GW3btK0QRQEA8JkaWZ5O2UTLrZLkpv6BO+bc4WAkS3c=
+SIZE (xapian-core-1.4.18.tar.xz) = 2984508
blob - 95799ba12dacc9610bde37b383e228fe6b916730
file + databases/xapian-core/pkg/PLIST
--- databases/xapian-core/pkg/PLIST
+++ databases/xapian-core/pkg/PLIST
@@ -358,7 +358,6 @@ share/doc/xapian-core/apidoc/html/dir_f63502d618711192
 share/doc/xapian-core/apidoc/html/doc.png
 share/doc/xapian-core/apidoc/html/document_8h.html
 share/doc/xapian-core/apidoc/html/doxygen.css
-share/doc/xapian-core/apidoc/html/doxygen.png
 share/doc/xapian-core/apidoc/html/dynsections.js
 share/doc/xapian-core/apidoc/html/enquire_8h.html
 share/doc/xapian-core/apidoc/html/error_8h.html
blob - ab71c7eb046b542ecaf0e3665c46b1b4be0338e7
file + www/xapian-omega/Makefile
--- www/xapian-omega/Makefile
+++ www/xapian-omega/Makefile
@@ -2,7 +2,7 @@
 
 COMMENT=   web search application
 
-V= 1.4.17
+V= 1.4.18
 PORTROACH= limitw:1,even
 DISTNAME=  xapian-omega-${V}
 
blob - 3de49cf01a85949911616915d3f00b3c95a756b3
file + www/xapian-omega/distinfo
--- www/xapian-omega/distinfo
+++ www/xapian-omega/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xapian-omega-1.4.17.tar.xz) = 
1S7qTNG78zToSvbUHqNCRGardePa3Upzbk6wyXY5LRY=
-SIZE (xapian-omega-1.4.17.tar.xz) = 547372
+SHA256 (xapian-omega-1.4.18.tar.xz) = 
FL7FMjS+pes2qkuRlAhC5ix5aPT9aMlZ2zlsFQaay68=
+SIZE (xapian-omega-1.4.18.tar.xz) = 549892


sysutils/fzf fix fish completion path in readme

2021-02-06 Thread Solene Rapenne
The fish completion file in the README contains twice /functions/
because $FISH_SITE ends with /functions/ and there is
${FISH_SITE}/functions/ in the readme.

This is a simple fix for this.

Index: Makefile
===
RCS file: /home/reposync/ports/sysutils/fzf/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile1 Nov 2020 10:59:45 -   1.9
+++ Makefile6 Feb 2021 11:26:59 -
@@ -5,6 +5,7 @@ COMMENT =   command-line fuzzy finder
 # Note: we make our own vendored distfile as upstream doesn't do semantic
 # versioning. Use 'go mod vendor'.
 DISTNAME = fzf-0.24.1
+REVISION = 0
 
 CATEGORIES =   sysutils
 
Index: pkg/README
===
RCS file: /home/reposync/ports/sysutils/fzf/pkg/README,v
retrieving revision 1.3
diff -u -p -r1.3 README
--- pkg/README  18 Jul 2020 11:32:27 -  1.3
+++ pkg/README  6 Feb 2021 11:26:25 -
@@ -41,7 +41,7 @@ the shell config, so we have to source i
 ~/.config/fish/config.fish:
 
 ```
-source ${FISH_SITE}/functions/fzf-key-bindings.fish
+source ${FISH_SITE}/fzf-key-bindings.fish
 fzf_key_bindings
 ```
 



[Update] biology/bioperl : Update to 1.7.8

2021-02-06 Thread wen heping
Hi, ports@:

Here is a patch for biology/bioperl to update to 1.7.8,
it build well and pass all tests on amd64-6.8 system.
   Five ports depends on biology/bioperl, all build well
and pass all tests on amd64-6.8 system with this patch.


wen
Index: Makefile
===
RCS file: /cvs/ports/biology/bioperl/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile25 Aug 2020 23:56:31 -  1.22
+++ Makefile6 Feb 2021 14:58:41 -
@@ -2,7 +2,7 @@
 
 COMMENT=   perl tools for bioinformatics
 
-DISTNAME=  BioPerl-1.7.7
+DISTNAME=  BioPerl-1.7.8
 PKGNAME=   ${DISTNAME:L}# No p5-prefix here.
 CATEGORIES=biology
 
Index: distinfo
===
RCS file: /cvs/ports/biology/bioperl/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo25 Aug 2020 23:56:31 -  1.6
+++ distinfo6 Feb 2021 14:58:41 -
@@ -1,2 +1,2 @@
-SHA256 (BioPerl-1.7.7.tar.gz) = cw4r04t1UL9rvVvKUNAZpwzKUUVZcCwTiddw/2nP8bs=
-SIZE (BioPerl-1.7.7.tar.gz) = 7532782
+SHA256 (BioPerl-1.7.8.tar.gz) = xJCjvncV6m5DBe/ZcQ5e2rgtq8Vf14a2UFtVCjDXFzg=
+SIZE (BioPerl-1.7.8.tar.gz) = 7527658
Index: pkg/PLIST
===
RCS file: /cvs/ports/biology/bioperl/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST   25 Aug 2020 23:56:31 -  1.6
+++ pkg/PLIST   6 Feb 2021 14:58:41 -
@@ -428,7 +428,6 @@ ${P5SITE}/Bio/SeqIO/gbdriver.pm
 ${P5SITE}/Bio/SeqIO/gbxml.pm
 ${P5SITE}/Bio/SeqIO/gcg.pm
 ${P5SITE}/Bio/SeqIO/genbank.pm
-${P5SITE}/Bio/SeqIO/interpro.pm
 ${P5SITE}/Bio/SeqIO/kegg.pm
 ${P5SITE}/Bio/SeqIO/largefasta.pm
 ${P5SITE}/Bio/SeqIO/locuslink.pm
@@ -960,7 +959,6 @@ ${P5SITE}/BioPerl.pm
 @man man/man3p/Bio::SeqIO::gbxml.3p
 @man man/man3p/Bio::SeqIO::gcg.3p
 @man man/man3p/Bio::SeqIO::genbank.3p
-@man man/man3p/Bio::SeqIO::interpro.3p
 @man man/man3p/Bio::SeqIO::kegg.3p
 @man man/man3p/Bio::SeqIO::largefasta.3p
 @man man/man3p/Bio::SeqIO::locuslink.3p


Re: NEW: x11/mlvwm

2021-02-06 Thread Morgan Aldridge
On Sat, Feb 6, 2021 at 9:55 AM Theo Buehler  wrote:
>
> On Sat, Feb 06, 2021 at 02:35:03PM +, Stuart Henderson wrote:
> > this is OK with me to import.
>
> Imported, thanks.
>
> I played with it a bit, and it's really nice. Perhaps I will switch my
> ibook to it :)

Many thanks!

Morgan



Re: NEW: x11/mlvwm

2021-02-06 Thread Theo Buehler
On Sat, Feb 06, 2021 at 02:35:03PM +, Stuart Henderson wrote:
> this is OK with me to import.

Imported, thanks.

I played with it a bit, and it's really nice. Perhaps I will switch my
ibook to it :)



Re: NEW: x11/mlvwm

2021-02-06 Thread Stuart Henderson
this is OK with me to import.

On 2021/02/06 09:22, Morgan Aldridge wrote:
> On Wed, Jan 27, 2021 at 8:00 PM Morgan Aldridge
>  wrote:
> >
> > On Wed, Jan 27, 2021 at 5:00 PM Stuart Henderson  
> > wrote:
> > > On 2021/01/27 16:32, Morgan Aldridge wrote:
> > > > On Wed, Jan 27, 2021 at 1:47 PM Solene Rapenne  wrote:
> > > > >
> > > > > The port looks fine for me at the exception of the compilation using
> > > > > -g, this has to be patched.
> > > > >
> > > > > ===>  Building for mlvwm-0.9.2
> > > > > making all in ./mlvwm...
> > > > > cc -g -Wall -Wshadow  -I/usr/local/include -I/usr/X11R6/include 
> > > > > [...]
> > > >
> > > > Oops! Patch added to remove `-g`.
> > > >
> > > > > Using your configuration generator I've been able to try it, it
> > > > > worked fine so far. I am afraid it'd be really hard to configure
> > > > > for people wanting to try it if they don't have the link to your
> > > > > configuration.
> > > >
> > > > I'm glad it's working and I agree on the configuration point. I have
> > > > added a pkg-readme that directs users to the
> > > > https://github.com/morgant/mlvwmrc project, but maybe it's too
> > > > verbose?
> > > >
> > > > > As for the licence name, I'd prefer someone with more experience
> > > > > in this. I'm not sure Freeware is ok.
> > > >
> > > > Yes, I'm concerned about this as well and welcome all input.
> > > >
> > > > Updated tarball attached. Many thanks for testing this, Solene!
> > > >
> > > > Morgan
> > >
> > > : COMMENT =   Macintosh-like virtual window manager
> > > : DISTNAME =  mlvwm-0.9.2
> > > : CATEGORIES =x11
> > > :
> > > : HOMEPAGE =  https://github.com/morgant/mlvwm/
> > > : MAINTAINER =Morgan Aldridge 
> > > :
> > > : # Freeware
> > > : PERMIT_PACKAGE =Yes
> > > :
> > > : WANTLIB +=  X11 Xau Xdmcp Xext Xpm c
> > > : MASTER_SITES =  
> > > https://github.com/morgant/mlvwm/releases/download/0.9.2/
> > >
> > > please use a variable to avoid changing release ver in two places.
> >
> > Will do.
> >
> > > :
> > > : BUILD_DEPENDS = devel/imake
> > > : CONFIGURE_STYLE =   imake
> > >
> > > oh my...an imake-based port in 2021! setting CONFIGURE_STYLE automatically
> > > adds this to BUILD_DEPENDS so there's no need to list that here too
> >
> > I plan to migrate off of imake in a future release.
> >
> > > Here's a diff on top for the above, it also adjusts the license marker,
> > > and honours CC/CFLAGS. OK with me with this added.
> > >
> > > diff 2329fb643b7819bb6ef0fa0d7156041681d597b0 /usr/ports/mystuff
> > > blob - f5b9e61031d17413cc3764916707827cb9b474e0
> > > file + x11/mlvwm/Makefile
> > > --- x11/mlvwm/Makefile
> > > +++ x11/mlvwm/Makefile
> > > @@ -1,20 +1,23 @@
> > >  # $OpenBSD: Makefile.template,v 1.88 2020/05/15 01:32:48 abieber Exp $
> > >
> > >  COMMENT =  Macintosh-like virtual window manager
> > > -DISTNAME = mlvwm-0.9.2
> > > +
> > > +V =0.9.2
> > > +DISTNAME = mlvwm-$V
> > >  CATEGORIES =   x11
> > >
> > >  HOMEPAGE = https://github.com/morgant/mlvwm/
> > >  MAINTAINER =   Morgan Aldridge 
> > >
> > > -# Freeware
> > > +# part MIT part Freeware, see README.md
> > >  PERMIT_PACKAGE =   Yes
> > >
> > >  WANTLIB += X11 Xau Xdmcp Xext Xpm c
> > > -MASTER_SITES = 
> > > https://github.com/morgant/mlvwm/releases/download/0.9.2/
> > >
> > > -BUILD_DEPENDS =devel/imake
> > > +MASTER_SITES = 
> > > https://github.com/morgant/mlvwm/releases/download/$V/
> > > +
> > >  CONFIGURE_STYLE =  imake
> > > +MAKE_FLAGS =   CC="${CC}" COPTS="${CFLAGS}"
> > >  NO_TEST =  Yes
> > >
> > >  .include 
> >
> > Thanks for the review and the patch, Stuart! Updated tarball attached
> > with patch applied for convenience.
> 
> Ping. (I know you're all busy with -fno-common right now.)
> 
> Morgan




Re: NEW: x11/mlvwm

2021-02-06 Thread Morgan Aldridge
On Wed, Jan 27, 2021 at 8:00 PM Morgan Aldridge
 wrote:
>
> On Wed, Jan 27, 2021 at 5:00 PM Stuart Henderson  wrote:
> > On 2021/01/27 16:32, Morgan Aldridge wrote:
> > > On Wed, Jan 27, 2021 at 1:47 PM Solene Rapenne  wrote:
> > > >
> > > > The port looks fine for me at the exception of the compilation using
> > > > -g, this has to be patched.
> > > >
> > > > ===>  Building for mlvwm-0.9.2
> > > > making all in ./mlvwm...
> > > > cc -g -Wall -Wshadow  -I/usr/local/include -I/usr/X11R6/include 
> > > > [...]
> > >
> > > Oops! Patch added to remove `-g`.
> > >
> > > > Using your configuration generator I've been able to try it, it
> > > > worked fine so far. I am afraid it'd be really hard to configure
> > > > for people wanting to try it if they don't have the link to your
> > > > configuration.
> > >
> > > I'm glad it's working and I agree on the configuration point. I have
> > > added a pkg-readme that directs users to the
> > > https://github.com/morgant/mlvwmrc project, but maybe it's too
> > > verbose?
> > >
> > > > As for the licence name, I'd prefer someone with more experience
> > > > in this. I'm not sure Freeware is ok.
> > >
> > > Yes, I'm concerned about this as well and welcome all input.
> > >
> > > Updated tarball attached. Many thanks for testing this, Solene!
> > >
> > > Morgan
> >
> > : COMMENT =   Macintosh-like virtual window manager
> > : DISTNAME =  mlvwm-0.9.2
> > : CATEGORIES =x11
> > :
> > : HOMEPAGE =  https://github.com/morgant/mlvwm/
> > : MAINTAINER =Morgan Aldridge 
> > :
> > : # Freeware
> > : PERMIT_PACKAGE =Yes
> > :
> > : WANTLIB +=  X11 Xau Xdmcp Xext Xpm c
> > : MASTER_SITES =  
> > https://github.com/morgant/mlvwm/releases/download/0.9.2/
> >
> > please use a variable to avoid changing release ver in two places.
>
> Will do.
>
> > :
> > : BUILD_DEPENDS = devel/imake
> > : CONFIGURE_STYLE =   imake
> >
> > oh my...an imake-based port in 2021! setting CONFIGURE_STYLE automatically
> > adds this to BUILD_DEPENDS so there's no need to list that here too
>
> I plan to migrate off of imake in a future release.
>
> > Here's a diff on top for the above, it also adjusts the license marker,
> > and honours CC/CFLAGS. OK with me with this added.
> >
> > diff 2329fb643b7819bb6ef0fa0d7156041681d597b0 /usr/ports/mystuff
> > blob - f5b9e61031d17413cc3764916707827cb9b474e0
> > file + x11/mlvwm/Makefile
> > --- x11/mlvwm/Makefile
> > +++ x11/mlvwm/Makefile
> > @@ -1,20 +1,23 @@
> >  # $OpenBSD: Makefile.template,v 1.88 2020/05/15 01:32:48 abieber Exp $
> >
> >  COMMENT =  Macintosh-like virtual window manager
> > -DISTNAME = mlvwm-0.9.2
> > +
> > +V =0.9.2
> > +DISTNAME = mlvwm-$V
> >  CATEGORIES =   x11
> >
> >  HOMEPAGE = https://github.com/morgant/mlvwm/
> >  MAINTAINER =   Morgan Aldridge 
> >
> > -# Freeware
> > +# part MIT part Freeware, see README.md
> >  PERMIT_PACKAGE =   Yes
> >
> >  WANTLIB += X11 Xau Xdmcp Xext Xpm c
> > -MASTER_SITES = 
> > https://github.com/morgant/mlvwm/releases/download/0.9.2/
> >
> > -BUILD_DEPENDS =devel/imake
> > +MASTER_SITES = 
> > https://github.com/morgant/mlvwm/releases/download/$V/
> > +
> >  CONFIGURE_STYLE =  imake
> > +MAKE_FLAGS =   CC="${CC}" COPTS="${CFLAGS}"
> >  NO_TEST =  Yes
> >
> >  .include 
>
> Thanks for the review and the patch, Stuart! Updated tarball attached
> with patch applied for convenience.

Ping. (I know you're all busy with -fno-common right now.)

Morgan


mlvwm-0.9.2.tgz
Description: Binary data


NEW: sysutils/hfsfuse

2021-02-06 Thread Morgan Aldridge
[Unrelated to the recent update of misc/hfsplus.]

"[Read-only] FUSE driver for HFS+, based on NetBSD's kernel driver
with modifications."

"[It] also includes a standalone tool, hfsdump, to inspect the
contents of an HFS+ volume without FUSE."

I have tested on amd64 6.8-stable and -current. I'm currently using
libutf8proc from ports and not building with libublio support (that
particular licensing needs further review). The developer was already
testing on OpenBSD, so this was a straightforward port.

I know you're all busy with -fno-common right now, so comments/OKs
when you have time.

Morgan


hfsfuse-0.118.tgz
Description: Binary data


Re: powerpc bulk build report

2021-02-06 Thread Charlene Wendling
On Wed, 3 Feb 2021 23:12:13 -0700 (MST)
c...@openbsd.org wrote:

> Bulk build on macppc-0.ports.openbsd.org
> 
> Started : Mon Jan 18 10:28:09 MST 2021
> Finished: Wed Feb  3 23:11:47 MST 2021
> Duration: 16 Days 12 hours 44 minutes
> 
> Built using OpenBSD 6.8-current (GENERIC) #830: Sun Jan 17 08:10:13
> MST 2021

Some comments:

> http://build-failures.rhaalovely.net/powerpc/2021-01-18/games/valyriatear.log

It won't be built anymore on BE_ARCHS until upstream fix their code.

> http://build-failures.rhaalovely.net/powerpc/2021-01-18/x11/e17/elementary.log

It has been removed from CVS.

> http://build-failures.rhaalovely.net/powerpc/2021-01-18/net/ntopng.log
> http://build-failures.rhaalovely.net/powerpc/2021-01-18/net/pmacct,postgresql.log

It's a temporary failure due to a desync between the kernel used and the
ports tree, see https://github.com/openbsd/src/commit/ff78d6edd
They'll be back once the next bulk is finished.




UPDATE: Tor Browser 10.0.10

2021-02-06 Thread Caspar Schutijser
Hi,

The diff below updates Tor Browser to 10.0.10. Tested on amd64. More
information can be found here:
https://blog.torproject.org/new-release-tor-browser-10010

I assume Tor Browser 10.0.11 is around the corner because of the new
release of Firefox ESR. Since the problem that is fixed by that release
only affects Windows, I'm not going to submit an update to 10.0.11. FYI.

Thanks,
Caspar Schutijser


Index: meta/tor-browser/Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- meta/tor-browser/Makefile   31 Jan 2021 11:54:21 -  1.35
+++ meta/tor-browser/Makefile   6 Feb 2021 11:37:01 -
@@ -4,11 +4,11 @@ COMMENT=  Tor Browser meta package
 
 MAINTAINER=Caspar Schutijser 
 
-PKGNAME=   tor-browser-10.0.9
+PKGNAME=   tor-browser-10.0.10
 ONLY_FOR_ARCHS =   amd64 i386
 
-RUN_DEPENDS=   www/tor-browser/browser>=10.0.9 \
-   www/tor-browser/noscript>=11.1.9 \
+RUN_DEPENDS=   www/tor-browser/browser>=10.0.10 \
+   www/tor-browser/noscript>=11.2 \
net/tor>=0.4.4.6
 
 .include 
Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile.inc
--- www/tor-browser/Makefile.inc31 Jan 2021 11:54:21 -  1.35
+++ www/tor-browser/Makefile.inc6 Feb 2021 11:37:01 -
@@ -5,7 +5,7 @@ HOMEPAGE ?= https://www.torproject.org
 PERMIT_PACKAGE ?=  Yes
 CATEGORIES =   www
 BROWSER_NAME = tor-browser
-TB_VERSION =   10.0.9
+TB_VERSION =   10.0.10
 TB_PREFIX =tb
 
 SUBST_VARS +=  BROWSER_NAME TB_VERSION
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.57
diff -u -p -r1.57 Makefile
--- www/tor-browser/browser/Makefile31 Jan 2021 11:54:21 -  1.57
+++ www/tor-browser/browser/Makefile6 Feb 2021 11:37:01 -
@@ -10,8 +10,7 @@ MOZILLA_VERSION = ${TB_VERSION}
 MOZILLA_PROJECT =  ${BROWSER_NAME}
 MOZILLA_CODENAME = browser
 TL_VERSION =   0.2.26
-HE_VERSION =   2020.11.17
-REVISION = 0
+HE_VERSION =   2021.1.27
 
 EXTRACT_SUFX = .tar.xz
 PATCHORIG =.pat.orig
Index: www/tor-browser/browser/distinfo
===
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.34
diff -u -p -r1.34 distinfo
--- www/tor-browser/browser/distinfo31 Jan 2021 11:54:21 -  1.34
+++ www/tor-browser/browser/distinfo6 Feb 2021 11:37:01 -
@@ -1,8 +1,8 @@
-SHA256 (mozilla/https-everywhere-2020.11.17-eff.xpi) = 
lKAbLNrgTxWrKNuf3qvu8X3zqWxYe1L/xj3GfW8Ypv4=
+SHA256 (mozilla/https-everywhere-2021.1.27-eff.xpi) = 
g1ge5VObY9VPIICknsncfUN8hH+5wGq41TjU+AOcHOc=
 SHA256 (mozilla/src-firefox-tor-browser-78.7.0esr-10.0-2-build1.tar.xz) = 
ULIHhWWksmvRQxsSQGKLQBfB/d/m4lwZIxDbyqYzP2A=
 SHA256 (mozilla/src-tor-launcher-0.2.26.tar.xz) = 
JNovULiGxs68qC1A5c4zKaZHGGGlpj9ohKT8nQFKmNU=
-SHA256 (mozilla/tor-browser-linux64-10.0.9_en-US.tar.xz) = 
Dtlfm/memHSxir5XkUGkJICGEM+tPs//ET4PdVM1HPM=
-SIZE (mozilla/https-everywhere-2020.11.17-eff.xpi) = 1739720
+SHA256 (mozilla/tor-browser-linux64-10.0.10_en-US.tar.xz) = 
vYWZ+NsGN8YH5O61+zrUjlFv3rieaBqjBQ+a18sQcZg=
+SIZE (mozilla/https-everywhere-2021.1.27-eff.xpi) = 1742613
 SIZE (mozilla/src-firefox-tor-browser-78.7.0esr-10.0-2-build1.tar.xz) = 
364550288
 SIZE (mozilla/src-tor-launcher-0.2.26.tar.xz) = 217792
-SIZE (mozilla/tor-browser-linux64-10.0.9_en-US.tar.xz) = 85339540
+SIZE (mozilla/tor-browser-linux64-10.0.10_en-US.tar.xz) = 85351772
Index: www/tor-browser/noscript/Makefile
===
RCS file: /cvs/ports/www/tor-browser/noscript/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- www/tor-browser/noscript/Makefile   31 Jan 2021 11:54:21 -  1.30
+++ www/tor-browser/noscript/Makefile   6 Feb 2021 11:37:01 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.30 2021/01/31 11:54:21 sthen Exp $
 
 ADDON_NAME =   noscript
-V =11.1.9
+V =11.2
 COMMENT =  Tor Browser add-on: flexible JS blocker
 HOMEPAGE = https://noscript.net
 MASTER_SITES = https://secure.informaction.com/download/releases/
Index: www/tor-browser/noscript/distinfo
===
RCS file: /cvs/ports/www/tor-browser/noscript/distinfo,v
retrieving revision 1.27
diff -u -p -r1.27 distinfo
--- www/tor-browser/noscript/distinfo   31 Jan 2021 11:54:21 -  1.27
+++ www/tor-browser/noscript/distinfo   6 Feb 2021 11:37:01 

update graphics/ocaml-cairo to 0.6.2 (Re: -fno-common update: broken ports)

2021-02-06 Thread Yozo TODA
> graphics/ocaml-cairo -> x11/lablgtk3, math/coq, lang/compcert

ocaml-cairo in the ports tree is 0.6.1, but already 0.6.2 is released.

(from CHANGES.md)
> 0.6.2 2020-11-23
> 
> 
> - Fix a memory leak (#19).
> - Fix GCC warnings, in particular the "multiple definition of ..." (#23).
> - Clarify the license.
> - Use `dune-configurator`.

though I don't yet try compiling with "-fno-common", I believe
this version fixes "-fno-common".
see

Issue #23
Variables declared without extern in cairo_ocaml.h cause FTBFS
(https://github.com/chris00/ocaml-cairo/issues/23)

here is a diff to update to 0.6.2.
I confimed just packaging on amd64.

 -- yozo.
Index: Makefile
===
RCS file: /cvs/ports/graphics/ocaml-cairo/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile9 Jun 2020 17:34:14 -   1.6
+++ Makefile6 Feb 2021 08:46:43 -
@@ -5,8 +5,8 @@ CATEGORIES =graphics
 

 GH_ACCOUNT =   Chris00
 GH_PROJECT =   ocaml-cairo
-GH_TAGNAME =   0.6.1
-REVISION = 2
+GH_TAGNAME =   0.6.2
+## REVISION =  2
 

 # LGPL 3.0
 PERMIT_PACKAGE = Yes
@@ -14,7 +14,7 @@ PERMIT_PACKAGE = Yes
 WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
 WANTLIB += Xrandr Xrender atk-1.0 cairo fontconfig freetype gdk-x11-2.0
 WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0
-WANTLIB += intl pango-1.0 pangocairo-1.0 pangoft2-1.0 c m z
+WANTLIB += harfbuzz intl pango-1.0 pangocairo-1.0 pangoft2-1.0 z
 

 MODULES =  lang/ocaml
 

Index: distinfo
===
RCS file: /cvs/ports/graphics/ocaml-cairo/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo4 Aug 2019 19:09:17 -   1.1.1.1
+++ distinfo6 Feb 2021 08:46:43 -
@@ -1,2 +1,2 @@
-SHA256 (ocaml-cairo-0.6.1.tar.gz) = 
LUSStisx5xSnqY/PVLmKRq5fZDDrx/FiBWipooSYrRE=
-SIZE (ocaml-cairo-0.6.1.tar.gz) = 109786
+SHA256 (ocaml-cairo-0.6.2.tar.gz) = 
LASXjuL2RRFj9AsLxOM0zadWXIU36fUo+DUYS0L7QS4=
+SIZE (ocaml-cairo-0.6.2.tar.gz) = 109948
Index: patches/patch-cairo2_opam
===
RCS file: patches/patch-cairo2_opam
diff -N patches/patch-cairo2_opam
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-cairo2_opam   6 Feb 2021 08:46:43 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+use the old name for our dune-1.11.3p1
+
+Index: cairo2.opam
+--- cairo2.opam.orig
 cairo2.opam
+@@ -18,7 +18,7 @@ depends: [
+   "ocaml" {>= "4.02"}
+   "base-bigarray"
+   "dune"
+-  "dune-configurator"
++  "dune.configurator"
+   "conf-cairo"
+ ]
+ depopts: [
Index: patches/patch-config_dune
===
RCS file: patches/patch-config_dune
diff -N patches/patch-config_dune
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-config_dune   6 Feb 2021 08:46:43 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+use the old name for our dune-1.11.3p1
+
+Index: config/dune
+--- config/dune.orig
 config/dune
+@@ -2,4 +2,4 @@
+ (executable
+  (name  discover)
+  (modules   discover)
+- (libraries dune-configurator str))
++ (libraries dune.configurator str))
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/ocaml-cairo/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   4 Aug 2019 19:09:17 -   1.1.1.1
+++ pkg/PLIST   6 Feb 2021 08:46:43 -
@@ -10,7 +10,7 @@ lib/ocaml/cairo2-gtk/cairo_gtk.cmti
 lib/ocaml/cairo2-gtk/cairo_gtk.ml
 lib/ocaml/cairo2-gtk/cairo_gtk.mli
 lib/ocaml/cairo2-gtk/dune-package
-lib/ocaml/cairo2-gtk/libcairo_gtk_stubs.a
+@static-lib lib/ocaml/cairo2-gtk/libcairo_gtk_stubs.a
 lib/ocaml/cairo2-gtk/opam
 lib/ocaml/cairo2-pango/
 lib/ocaml/cairo2-pango/META
@@ -21,7 +21,7 @@ lib/ocaml/cairo2-pango/cairo_pango.cmti
 lib/ocaml/cairo2-pango/cairo_pango.ml
 lib/ocaml/cairo2-pango/cairo_pango.mli
 lib/ocaml/cairo2-pango/dune-package
-lib/ocaml/cairo2-pango/libcairo_pango_stubs.a
+@static-lib lib/ocaml/cairo2-pango/libcairo_pango_stubs.a
 lib/ocaml/cairo2-pango/opam
 lib/ocaml/cairo2/META
 lib/ocaml/cairo2/cairo.cma
@@ -32,11 +32,11 @@ lib/ocaml/cairo2/cairo.ml
 lib/ocaml/cairo2/cairo.mli
 lib/ocaml/cairo2/cairo_ocaml.h
 lib/ocaml/cairo2/dune-package
-lib/ocaml/cairo2/libcairo_stubs.a
+@static-lib lib/ocaml/cairo2/libcairo_stubs.a
 lib/ocaml/cairo2/opam
-lib/ocaml/stublibs/dllcairo_gtk_stubs.so
-lib/ocaml/stublibs/dllcairo_pango_stubs.so
-lib/ocaml/stublibs/dllcairo_stubs.so
+@so lib/ocaml/stublibs/dllcairo_gtk_stubs.so
+@so lib/ocaml/stublibs/dllcairo_pango_stubs.so
+@so lib/ocaml/stublibs/dllcairo_stubs.so
 share/doc/ocaml-ocaml-cairo/
 share/doc/ocaml-ocaml-cairo/cairo2/
 share/doc/ocaml-ocaml-cairo/cairo2-gtk/


UPDATE: sysutils/monit 5.27.2

2021-02-06 Thread Caspar Schutijser
Hi ports@,

Below is a diff that updates sysutils/monit to 5.27.2. Tested for a
while on amd64.

Thanks,
Caspar Schutijser


Index: Makefile
===
RCS file: /cvs/ports/sysutils/monit/Makefile,v
retrieving revision 1.65
diff -u -p -r1.65 Makefile
--- Makefile13 Nov 2020 21:34:26 -  1.65
+++ Makefile6 Feb 2021 11:51:26 -
@@ -2,7 +2,7 @@
 
 COMMENT=   monitoring and managing daemons utility
 
-DISTNAME=  monit-5.27.1
+DISTNAME=  monit-5.27.2
 
 CATEGORIES=sysutils
 
@@ -28,7 +28,7 @@ pre-configure:
${SUBST_CMD} ${WRKSRC}/monitrc
 
 post-install:
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/{doc,examples}/monit
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/monit
${INSTALL_DATA} ${WRKSRC}/monitrc ${PREFIX}/share/examples/monit
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/monit/distinfo,v
retrieving revision 1.43
diff -u -p -r1.43 distinfo
--- distinfo13 Nov 2020 21:34:26 -  1.43
+++ distinfo6 Feb 2021 11:51:26 -
@@ -1,2 +1,2 @@
-SHA256 (monit-5.27.1.tar.gz) = 9XQI0WGFaHUTo8TrPyu3Lu92MxrBYhDpZS6EblyE7VE=
-SIZE (monit-5.27.1.tar.gz) = 1459360
+SHA256 (monit-5.27.2.tar.gz) = 2ICceNXcHtenujKlpVxRFIVRMsxNpIBfjTqvjPRuqkw=
+SIZE (monit-5.27.2.tar.gz) = 1463790



x11/skippy: fix with -fno-common

2021-02-06 Thread Charlene Wendling
Hi,

The below diff allows building skippy with -fno-common. While here:

- MASTER_SITES and HOMEPAGE are 404'd, drop them
- refresh WANTLIB
- don't hardcode PREFIX, don't build with -g
- add -fno-common fix, from Gentoo [0] (and add a missing RCS tag)

This has been built and tested on amd64 and macppc.

OK? 

Charlène.


[0]
https://gitweb.gentoo.org/repo/gentoo.git/tree/x11-misc/skippy/files/skippy-0.5.0-fno-common.patch


Index: Makefile
===
RCS file: /cvs/ports/x11/skippy/Makefile,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 Makefile
--- Makefile12 Jul 2019 20:51:21 -  1.21
+++ Makefile6 Feb 2021 10:46:16 -
@@ -3,24 +3,21 @@
 COMMENT=   full-screen X11 task-switcher like Apple's Expose
 
 DISTNAME=  skippy-0.5.0
-REVISION=  8
+REVISION=  9
 CATEGORIES=x11
 
-MASTER_SITES=  http://thegraveyard.org/files/
 EXTRACT_SUFX=  .tar.bz2
 
-HOMEPAGE=  http://thegraveyard.org/skippy.php
-
 # X11
-PERMIT_PACKAGE=Yes
+PERMIT_PACKAGE=Yes
 
-WANTLIB=   X11 Xau Xdmcp Xext Xft Xinerama Xrender c expat fontconfig \
-   freetype m z xcb Imlib2
+WANTLIB+= Imlib2 X11 Xext Xft Xinerama c m
 
+LIB_DEPENDS=   graphics/imlib2
 
-NO_TEST=   Yes
+FAKE_FLAGS+=   PREFIX="${PREFIX}"
 
-LIB_DEPENDS=   graphics/imlib2
+NO_TEST=   Yes
 
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/skippy
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/x11/skippy/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile  22 Jul 2005 19:32:17 -  1.2
+++ patches/patch-Makefile  6 Feb 2021 10:46:16 -
@@ -1,15 +1,19 @@
 $OpenBSD: patch-Makefile,v 1.2 2005/07/22 19:32:17 fgsch Exp $
 Makefile.orig  Wed May 19 18:23:50 2004
-+++ Makefile   Wed Jul 13 16:34:00 2005
-@@ -1,7 +1,7 @@
+Index: Makefile
+--- Makefile.orig
 Makefile
+@@ -1,9 +1,9 @@
  PREFIX = /usr/local
  BINDIR = ${PREFIX}/bin
  
 -X11PREFIX = /usr/X11R6
 +X11PREFIX = ${X11BASE}
  
- CFLAGS += -I${X11PREFIX}/include `imlib2-config --cflags` `pkg-config xft 
--cflags` -g -pedantic -Wall
+-CFLAGS += -I${X11PREFIX}/include `imlib2-config --cflags` `pkg-config xft 
--cflags` -g -pedantic -Wall
++CFLAGS += -I${X11PREFIX}/include `imlib2-config --cflags` `pkg-config xft 
--cflags` -pedantic -Wall
  LDFLAGS += -L${X11PREFIX}/lib -lX11 -lm `imlib2-config --libs` `pkg-config 
xft --libs`
+ 
+ # Comment these out to disable Xinerama support
 @@ -17,11 +17,15 @@ EXESUFFIX =
  
  SOURCES = skippy.c wm.c dlist.c mainwin.c clientwin.c layout.c focus.c 
config.c tooltip.c
Index: patches/patch-wm_c
===
RCS file: /cvs/ports/x11/skippy/patches/patch-wm_c,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-wm_c
--- patches/patch-wm_c  3 Jan 2009 23:02:57 -   1.3
+++ patches/patch-wm_c  6 Feb 2021 10:46:16 -
@@ -1,6 +1,59 @@
 wm.c.orig  Wed May 19 23:23:49 2004
-+++ wm.c   Sat Jan  3 23:56:53 2009
-@@ -258,7 +258,7 @@ wm_get_stack(Display *dpy)
+$OpenBSD$
+
+Hunk #1: fix the build with -fno-common
+
+Index: wm.c
+--- wm.c.orig
 wm.c
+@@ -43,7 +43,47 @@
+ #define WIN_STATE_FIXED_POSITION  (1<<8) /*window is fixed in position even*/
+ #define WIN_STATE_ARRANGE_IGNORE  (1<<9) /*ignore for auto arranging*/
+ 
++Atom
++  /* Generic atoms */
++  XA_WM_STATE,
++  WM_CLIENT_LEADER,
++  XA_UTF8_STRING,
+ 
++  /* Root pixmap / wallpaper atoms */
++  _XROOTPMAP_ID,
++  ESETROOT_PMAP_ID,
++
++  /* NetWM atoms */
++  _NET_SUPPORTING_WM_CHECK,
++  _NET_SUPPORTED,
++  _NET_NUMBER_OF_DESKTOPS,
++  _NET_CLIENT_LIST,
++  _NET_CLIENT_LIST_STACKING,
++  _NET_CURRENT_DESKTOP,
++  _NET_WM_DESKTOP,
++  _NET_WM_STATE,
++  _NET_WM_STATE_HIDDEN,
++  _NET_WM_STATE_SKIP_TASKBAR,
++  _NET_WM_STATE_SKIP_PAGER,
++  _NET_WM_STATE_FULLSCREEN,
++  _NET_WM_STATE_SHADED,
++  _NET_WM_STATE_ABOVE,
++  _NET_WM_STATE_STICKY,
++  _NET_WM_WINDOW_TYPE,
++  _NET_WM_WINDOW_TYPE_DESKTOP,
++  _NET_WM_WINDOW_TYPE_DOCK,
++  _NET_WM_VISIBLE_NAME,
++  _NET_WM_NAME,
++
++  /* Old gnome atoms */
++  _WIN_SUPPORTING_WM_CHECK,
++  _WIN_WORKSPACE,
++  _WIN_WORKSPACE_COUNT,
++  _WIN_PROTOCOLS,
++  _WIN_CLIENT_LIST,
++  _WIN_STATE,
++  _WIN_HINTS;
++
+ static int WM_PERSONALITY = WM_PERSONALITY_NETWM,
+NETWM_HAS_FULLSCREEN = 0,
+IGNORE_SKIP_TASKBAR = 0;
+@@ -258,7 +298,7 @@ wm_get_stack(Display *dpy)
return 0;

for(i = 0; i < items_read; i++)
@@ -9,7 +62,7 @@

XFree(data);

-@@ -293,10 +293,10 @@ wm_get_root_pmap(Display *d