[UPDATE] devel/py-yamllint

[Remi Pointel]

Hi,

this is the diff to update yamllint to latest release.

Ok?

Cheers,

Remi.
Index: Makefile
===
RCS file: /cvs/ports/devel/py-yamllint/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile12 Dec 2017 20:49:50 -  1.1.1.1
+++ Makefile25 Feb 2018 05:35:13 -
@@ -2,7 +2,7 @@
 
 COMMENT =  linter for YAML files
 
-MODPY_EGG_VERSION = 1.10.0
+MODPY_EGG_VERSION = 1.11.0
 DISTNAME = yamllint-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
 
Index: distinfo
===
RCS file: /cvs/ports/devel/py-yamllint/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo12 Dec 2017 20:49:50 -  1.1.1.1
+++ distinfo25 Feb 2018 05:35:13 -
@@ -1,2 +1,2 @@
-SHA256 (yamllint-1.10.0.tar.gz) = BW1jS7o540yzZ6gQr2q9U01bl7C92fjxFmFr8m7zebM=
-SIZE (yamllint-1.10.0.tar.gz) = 111476
+SHA256 (yamllint-1.11.0.tar.gz) = Bc/K6jJfDwqAa2ApJub7hjhl0SXmnd4/S1knjfxfloQ=
+SIZE (yamllint-1.11.0.tar.gz) = 113636
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-yamllint/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   12 Dec 2017 20:49:50 -  1.1.1.1
+++ pkg/PLIST   25 Feb 2018 05:35:13 -
@@ -46,6 +46,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}line_length.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}new_line_at_end_of_file.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}new_lines.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}octal_values.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}trailing_spaces.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}truthy.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/yamllint/rules/braces.py
@@ -66,5 +67,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/yamllint/rules/line_length.py
 
lib/python${MODPY_VERSION}/site-packages/yamllint/rules/new_line_at_end_of_file.py
 lib/python${MODPY_VERSION}/site-packages/yamllint/rules/new_lines.py
+lib/python${MODPY_VERSION}/site-packages/yamllint/rules/octal_values.py
 lib/python${MODPY_VERSION}/site-packages/yamllint/rules/trailing_spaces.py
 lib/python${MODPY_VERSION}/site-packages/yamllint/rules/truthy.py

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2018/02/24 14:26:22

Modified files:
multimedia/streamlink: Makefile 

Log message:
www/py-requests-mock has been committed, so add it to TEST_DEPENDS and
remove comment.

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2018/02/24 14:16:53

Modified files:
www: Makefile 

Log message:
+py-requests-mock
+py-requests-mock,python3

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2018/02/24 14:16:27

Log message:
Import www/py-requests-mock, library to mock out responses from py-request.
ok phessler@

The requests library has the concept of pluggable transport adapters.
These adapters allow you to register your own handlers for different
URIs or protocols.

The requests-mock library at its core is simply a transport adapter that
can be preloaded with responses that are returned if certain URIs are
requested. This is particularly useful in unit tests where you want to
return known responses from HTTP requests without making actual calls.

As the requests library has very limited options for how to load and use
adapters requests-mock also provides a number of ways to make sure the
mock adapter is used. These are only loading mechanisms, they do not
contain any logic and can be used as a reference to load the adapter in
whatever ways works best for your project.

Status:

Vendor Tag: bcallah
Release Tags:   bcallah_20180224

N ports/www/py-requests-mock/Makefile
N ports/www/py-requests-mock/distinfo
N ports/www/py-requests-mock/pkg/PLIST
N ports/www/py-requests-mock/pkg/DESCR

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/02/24 13:49:14

Modified files:
databases/influxdb: Makefile 

Log message:
switch post-extract to pre-patch, to avoid needing lang/go to be installed
just to unpack ports distfiles.  ok landry

Re: UPDATE: textproc/ripgrep 0.7.1 -> 0.8.1

[Klemens Nanni]

On Sun, Feb 18, 2018 at 01:33:39AM +0100, Klemens Nanni wrote:
> Simple update shipping lots of (breaking) changes, see
> https://github.com/BurntSushi/ripgrep/releases/tag/0.8.0 for changelog.
https://github.com/BurntSushi/ripgrep/releases/tag/0.8.1 is out fixing
some minor regressions.

> Add asciidoc as missing BDEP as well as lang/rust in order to pin the
> minimally required version.
> 
> Replace the patch to disable debug symbols with a simpler MAKE_ENV line.
Now with proper MODCARGO_RUSTFLAGS as committed ealier.

> Move long path into helper variable (OUT_DIR is described here:
> https://doc.rust-lang.org/cargo/reference/environment-variables.htmlOUT_DIR)
> and adjust post-install to also install fish completions. rg's
> permissions are fixed so drop chmod.
> 
> Patch gzip's error message wording that is matched as part of the test
> suite so that all tests pass again, at least on my amd64 machine.

OK?

Index: Makefile
===
RCS file: /cvs/ports/textproc/ripgrep/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile30 Jan 2018 03:27:54 -  1.7
+++ Makefile24 Feb 2018 19:23:10 -
@@ -4,7 +4,7 @@ COMMENT =   line oriented search tool usi
 
 GH_ACCOUNT =   BurntSushi
 GH_PROJECT =   ripgrep
-GH_TAGNAME =   0.7.1
+GH_TAGNAME =   0.8.1
 
 CATEGORIES =   textproc sysutils
 
@@ -13,63 +13,77 @@ PERMIT_PACKAGE_CDROM =  Yes
 
 WANTLIB += c pthread
 
-SEPARATE_BUILD =   Yes
+# as devel/cargo MODULES adds DISTFILES, GH_* didn't
+DISTFILES +=   ${DISTNAME}${EXTRACT_SUFX}
 
 MODULES =  devel/cargo
+BUILD_DEPENDS =lang/rust>=1.20 \
+   textproc/asciidoc
 
-# as devel/cargo MODULES adds DISTFILES, GH_* didn't
-DISTFILES += ${DISTNAME}${EXTRACT_SUFX}
-
-MODCARGO_CRATES += aho-corasick-0.6.3  # Unlicense/MIT
-MODCARGO_CRATES += ansi_term-0.9.0 # MIT
-MODCARGO_CRATES += atty-0.2.3  # MIT
-MODCARGO_CRATES += bitflags-0.9.1  # MIT/Apache-2.0
-MODCARGO_CRATES += bytecount-0.1.7 # Apache-2.0/MIT
+MODCARGO_CRATES += aho-corasick-0.6.4  # Unlicense/MIT
+MODCARGO_CRATES += ansi_term-0.10.2# MIT
+MODCARGO_CRATES += atty-0.2.6  # MIT
+MODCARGO_CRATES += bitflags-1.0.1  # MIT/Apache-2.0
+MODCARGO_CRATES += bytecount-0.3.1 # Apache-2.0/MIT
 MODCARGO_CRATES += cfg-if-0.1.2# MIT/Apache-2.0
-MODCARGO_CRATES += clap-2.26.2 # MIT
-MODCARGO_CRATES += crossbeam-0.2.10# Apache-2.0/MIT
-MODCARGO_CRATES += encoding_rs-0.7.1   # MIT/Apache-2.0
-MODCARGO_CRATES += env_logger-0.4.3# MIT/Apache-2.0
-MODCARGO_CRATES += fnv-1.0.5   # Apache-2.0 / MIT
-MODCARGO_CRATES += fs2-0.4.2   # MIT/Apache-2.0
-MODCARGO_CRATES += kernel32-sys-0.2.2  # MIT
-MODCARGO_CRATES += lazy_static-0.2.9   # MIT/Apache-2.0
-MODCARGO_CRATES += libc-0.2.32 # MIT/Apache-2.0
-MODCARGO_CRATES += log-0.3.8   # MIT/Apache-2.0
-MODCARGO_CRATES += memchr-1.0.2# Unlicense/MIT
-MODCARGO_CRATES += memchr-2.0.0# Unlicense/MIT
-MODCARGO_CRATES += memmap-0.5.2# MIT/Apache-2.0
-MODCARGO_CRATES += num_cpus-1.7.0  # MIT/Apache-2.0
-MODCARGO_CRATES += redox_syscall-0.1.31# MIT
+MODCARGO_CRATES += clap-2.30.0 # MIT
+MODCARGO_CRATES += crossbeam-0.3.2 # Apache-2.0/MIT
+MODCARGO_CRATES += encoding_rs-0.7.2   # MIT/Apache-2.0
+MODCARGO_CRATES += fnv-1.0.6   # Apache-2.0 / MIT
+MODCARGO_CRATES += fuchsia-zircon-0.3.3# BSD-3-Clause
+MODCARGO_CRATES += fuchsia-zircon-sys-0.3.3# BSD-3-Clause
+MODCARGO_CRATES += glob-0.2.11 # MIT/Apache-2.0
+MODCARGO_CRATES += globset-0.3.0   # Unlicense/MIT
+MODCARGO_CRATES += grep-0.1.8  # Unlicense/MIT
+MODCARGO_CRATES += ignore-0.4.0# Unlicense/MIT
+MODCARGO_CRATES += lazy_static-1.0.0   # MIT/Apache-2.0
+MODCARGO_CRATES += libc-0.2.36 # MIT/Apache-2.0
+MODCARGO_CRATES += log-0.4.1   # MIT/Apache-2.0
+MODCARGO_CRATES += memchr-2.0.1# Unlicense/MIT
+MODCARGO_CRATES += memmap-0.6.2# MIT/Apache-2.0
+MODCARGO_CRATES += num_cpus-1.8.0  # MIT/Apache-2.0
+MODCARGO_CRATES += rand-0.3.22 # MIT/Apache-2.0
+MODCARGO_CRATES += rand-0.4.2  # MIT/Apache-2.0
+MODCARGO_CRATES += redox_syscall-0.1.37# MIT
 MODCARGO_CRATES += redox_termios-0.1.1 # MIT
-MODCARGO_CRATES += regex-0.2.2 # MIT/Apache-2.0
-MODCARGO_CRATES += regex-syntax-0.4.1  # MIT/Apache-2.0
-MODCARGO_CRATES += same-file-1.0.0 # Unlicense/MIT
-MODCARGO_CRATES += simd-0.1.1  # MIT/Apache-2.0
-MODCARGO_CRATES += simd-0.2.0  # MIT/Apache-2.0
-MODCARGO_CRATES += strsim-0.6.0# MIT
-MODCARGO_CRATES += term_size-0.3.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += regex-0.2.6 # MIT/Apache-2.0
+MODCARGO_CRATES +=

CVS: cvs.openbsd.org: ports

[Bjorn Ketelaars]

CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2018/02/24 12:02:57

Modified files:
www/urlwatch   : Makefile distinfo 

Log message:
update to urlwatch-2.8

OK sthen@, kn@

CVS: cvs.openbsd.org: ports

[Klemens Nanni]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2018/02/24 11:40:28

Modified files:
devel/cargo: cargo.port.mk 

Log message:
Use MODCARGO_RUSTFLAGS as port variable to set RUSTFLAGS in cargo
invocation.

While here, correct (a bit) the license detection (bug reported by
kpcyrd  some time ago) and tweak
modcargo-gen-crates-licenses a bit.

Diff from semarie, ok landry.

Re: UPDATE: textproc/ripgrep 0.7.1 -> 0.8.0

[Sebastien Marie]

On Sun, Feb 18, 2018 at 10:30:29PM +0100, Klemens Nanni wrote:
> On Sun, Feb 18, 2018 at 07:27:36PM +0100, Sebastien Marie wrote:
> > On Sun, Feb 18, 2018 at 12:21:43PM +0100, Klemens Nanni wrote:
> > >  MODULES =devel/cargo
> > > +BUILD_DEPENDS =  lang/rust>=1.20 \
> > > + textproc/asciidoc
> > 
> > lang/rust isn't necessary as it is automatically added in BUILD_DEPENDS
> > when you have devel/cargo in MODULES.
> I'm aware of that. >=1.20 is important here as it specifies the minimal
> version required to compile ripgrep.

I don't see the need for that.

under -current, lang/rust version is 1.24.
under 6.2, lang/rust version is 1.20.

So such explicit version requirement would be only useful for some
frankenstein port tree, and keep tracking such minimal version could be
a bit resource consuming.

but it isn't wrong per se. I would let more familiar port tree developer to
comment.

> > The following diff takes care of that:
> > - use MODCARGO_RUSTFLAGS as port variable to set RUSTFLAGS in cargo
> >   invocation
> > 
> > - while here, correct (a bit) the license detection (bug reported by
> >   kpcyrd  some time ago).
> > 
> > 
> > With it, adding
> > 
> > MODCARGO_RUSTFLAGS += -C debuginfo=0
> > 
> > to ripgrep's Makefile, makes RUSTFLAGS variable correctly setted and
> > passed to cargo.
> Sounds good to me, thanks for the work.
> 
> > Please note, I am still unsure if strip(1) is need in post-install.
> Stripping results half-sized binaries here.
> 
> As everything except the binary itself gets installed from post-install,
> we can simply turn it into do-install, as this will result in using
> INSTALL_PROGRAM which strips binaries by default.

I agree.

> Updated diffs below for cargo.port.mk and ripgrep in that order. I
> slightly reordered the Makefile according to template.

generally speaking, avoid mixing patches if there are not based on same
directory, as it requires manual processing to get only the right patch.

Thanks.
-- 
Sebastien Marie

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/02/24 11:04:08

Modified files:
lang/rust  : Makefile 

Log message:
Mark BROKEN-i386 for now, i didnt manage to build it on an otherwise
idle i386 VM. Discussed with sthen@ and semarie@, but semarie@ has ideas
on how to work around things hoping for a brighter future...

Re: UPDATE: textproc/ripgrep 0.7.1 -> 0.8.0

[Klemens Nanni]

On Sun, Feb 18, 2018 at 10:30:29PM +0100, Klemens Nanni wrote:
> On Sun, Feb 18, 2018 at 07:27:36PM +0100, Sebastien Marie wrote:
> > On Sun, Feb 18, 2018 at 12:21:43PM +0100, Klemens Nanni wrote:
> > >  MODULES =devel/cargo
> > > +BUILD_DEPENDS =  lang/rust>=1.20 \
> > > + textproc/asciidoc
> > 
> > lang/rust isn't necessary as it is automatically added in BUILD_DEPENDS
> > when you have devel/cargo in MODULES.
> I'm aware of that. >=1.20 is important here as it specifies the minimal
> version required to compile ripgrep.
> 
> > > +MAKE_ENV = RUSTFLAGS="-C debuginfo=0"
> > [...]
> > > Index: patches/patch-Cargo_toml
> > > ===
> > > RCS file: /cvs/ports/textproc/ripgrep/patches/patch-Cargo_toml,v
> > > retrieving revision 1.3
> > > diff -u -p -r1.3 patch-Cargo_toml
> > > --- patches/patch-Cargo_toml  1 Nov 2017 20:27:22 -   1.3
> > > +++ patches/patch-Cargo_toml  18 Feb 2018 11:18:35 -
> > > @@ -3,7 +3,7 @@ Don't use debug on release.
> > >  Index: Cargo.toml
> > >  --- Cargo.toml.orig
> > >  +++ Cargo.toml
> > > -@@ -60,4 +60,4 @@ simd-accel = [
> > > +@@ -75,4 +75,4 @@ simd-accel = [
> > >   ]
> > >   
> > >   [profile.release]
> > 
> > The patch hasn't been removed. And after testing, passing RUSTFLAGS in
> > MAKE_ENV is ineffective.
> My bad, will be more careful next time. Obviously this would still build
> without debug symbols giving a false positive here.
> 
> > Your RUSTFLAGS setting is overrided by cargo.port.mk. But the module was
> > designed in a way that RUSTFLAGS is a user parameter (not sure it was a
> > good thing: the purpose was to pass RUSTFLAGS from command-line to test
> > things). But as it, it shouldn't be set directly (module variable should
> > have MODxxx name). So some changes in cargo.port.mk would be necessary.
> > 
> > The following diff takes care of that:
> > - use MODCARGO_RUSTFLAGS as port variable to set RUSTFLAGS in cargo
> >   invocation
> > 
> > - while here, correct (a bit) the license detection (bug reported by
> >   kpcyrd  some time ago).
> > 
> > 
> > With it, adding
> > 
> > MODCARGO_RUSTFLAGS += -C debuginfo=0
> > 
> > to ripgrep's Makefile, makes RUSTFLAGS variable correctly setted and
> > passed to cargo.
> Sounds good to me, thanks for the work.
> 
> > Please note, I am still unsure if strip(1) is need in post-install.
> Stripping results half-sized binaries here.
> 
> As everything except the binary itself gets installed from post-install,
> we can simply turn it into do-install, as this will result in using
> INSTALL_PROGRAM which strips binaries by default.
> 
> > Index: cargo.port.mk
> > ===
> > RCS file: /cvs/ports/devel/cargo/cargo.port.mk,v
> > retrieving revision 1.6
> > diff -u -p -r1.6 cargo.port.mk
> > --- cargo.port.mk   31 Jul 2017 13:16:08 -  1.6
> > +++ cargo.port.mk   18 Feb 2018 18:03:35 -
> > @@ -13,6 +13,9 @@ MODCARGO_FEATURES ?=
> >  # Used to override a dependency with newer version.
> >  MODCARGO_CRATES_UPDATE ?=
> >  
> > +# RUSTFLAGS variable to pass to cargo.
> > +MODCARGO_RUSTFLAGS ?=
> > +
> >  # Name of the local directory for vendoring crates.
> >  MODCARGO_VENDOR_DIR ?= ${WRKSRC}/modcargo-crates
> >  
> > @@ -126,7 +129,7 @@ MODCARGO_ENV += \
> > CARGO_TARGET_DIR=${MODCARGO_TARGET_DIR} \
> > RUSTC=${LOCALBASE}/bin/rustc \
> > RUSTDOC=${LOCALBASE}/bin/rustdoc \
> > -   RUSTFLAGS="${RUSTFLAGS}"
> > +   RUSTFLAGS="${MODCARGO_RUSTFLAGS}"
> >  
> >  # Helper to shorten cargo calls.
> >  MODCARGO_CARGO_RUN = \
> > @@ -211,7 +214,7 @@ modcargo-gen-crates: extract
> >  # modcargo-gen-crates-licenses will try to grab license information from 
> > downloaded crates.
> >  modcargo-gen-crates-licenses: configure
> > @find ${WRKSRC}/modcargo-crates -name 'Cargo.toml' -maxdepth 2 \
> > -   -exec grep -H '^license' {} \; \
> > +   -exec grep -H '^[   ]*license' {} \; \
> > | sed \
> > -e 's|^${WRKSRC}/modcargo-crates/|MODCARGO_CRATES +=|' \
> > -e 's|/Cargo.toml:license.*= *"|# |' \
> We can use a proper variable here, pass multiple files to grep and
> simplify the first sed expression by cd'ing into the directory first.
> 
> Updated diffs below for cargo.port.mk and ripgrep in that order. I
> slightly reordered the Makefile according to template.
> 
> More feedback?
I completely missed the cargo.port.mk diff, so here it is.

ripgrep 0.8.1 came out four days ago, I have an updated diff for that as
well but would like to settle the RUSTFLAGS bits first.

Feedback? OK?

Index: cargo.port.mk
===
RCS file: /cvs/ports/devel/cargo/cargo.port.mk,v
retrieving revision 1.6
diff -u -p -r1.6 cargo.port.mk
--- cargo.port.mk   31 Jul 2017 13:16:08 -  1.6
+++ cargo.port.mk   24 Feb 2018 

Re: UPDATE www/urlwatch

[Björn Ketelaars]

On Sat 24/02/2018 15:33, Björn Ketelaars wrote:
> Diff below brings urlwatch to the latest version. All regression tests
> are ok. Lightly tested on my laptop.
> 
> OK?

I messed up...new diff. Sorry for the noise!

OK?


Index: Makefile
===
RCS file: /cvs/ports/www/urlwatch/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile17 Feb 2018 09:28:09 -  1.11
+++ Makefile24 Feb 2018 14:50:42 -
@@ -2,9 +2,8 @@
 
 COMMENT=   monitor webpages for updates
 
-MODPY_EGG_VERSION= 2.6
+MODPY_EGG_VERSION= 2.8
 DISTNAME=  urlwatch-${MODPY_EGG_VERSION}
-REVISION=  1
 
 CATEGORIES=www
 
@@ -22,11 +21,13 @@ MODPY_SETUPTOOLS=   Yes
 BUILD_DEPENDS= ${RUN_DEPENDS}
 RUN_DEPENDS=   converters/py-html2text${MODPY_FLAVOR} \
databases/py-minidb \
+   devel/py-appdirs${MODPY_FLAVOR} \
security/py-keyring${MODPY_FLAVOR} \
textproc/py-yaml${MODPY_FLAVOR} \
www/lynx \
www/py-requests${MODPY_FLAVOR}
-TEST_DEPENDS=  devel/py-nose${MODPY_FLAVOR}
+TEST_DEPENDS=  devel/py-codestyle${MODPY_FLAVOR} \
+   devel/py-nose${MODPY_FLAVOR}
 
 post-install:
mv ${PREFIX}/share/man/* ${PREFIX}/man/
Index: distinfo
===
RCS file: /cvs/ports/www/urlwatch/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo14 Dec 2016 10:17:21 -  1.6
+++ distinfo24 Feb 2018 14:50:42 -
@@ -1,2 +1,2 @@
-SHA256 (urlwatch-2.6.tar.gz) = V6kKCno/BWu/d8kXYhoSQzjeIOFc41aHO5q7py9X1vQ=
-SIZE (urlwatch-2.6.tar.gz) = 30412
+SHA256 (urlwatch-2.8.tar.gz) = zt9hLZ88TEfKj/0qNnU7CGhyKhCBOSCPD70rV/bjQLM=
+SIZE (urlwatch-2.8.tar.gz) = 32745

UPDATE www/urlwatch

[Björn Ketelaars]

Diff below brings urlwatch to the latest version. All regression tests
are ok. Lightly tested on my laptop.

OK?


Index: Makefile
===
RCS file: /cvs/ports/www/urlwatch/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile3 Jan 2017 19:28:49 -   1.10
+++ Makefile24 Feb 2018 14:25:23 -
@@ -27,7 +27,8 @@ RUN_DEPENDS=  converters/py-html2text${MO
textproc/py-yaml${MODPY_FLAVOR} \
www/lynx \
www/py-requests${MODPY_FLAVOR}
-TEST_DEPENDS=  devel/py-nose${MODPY_FLAVOR}
+TEST_DEPENDS=  devel/py-codestyle${MODPY_FLAVOR} \
+   devel/py-nose${MODPY_FLAVOR}
 
 post-install:
mv ${PREFIX}/share/man/* ${PREFIX}/man/
Index: distinfo
===
RCS file: /cvs/ports/www/urlwatch/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo14 Dec 2016 10:17:21 -  1.6
+++ distinfo24 Feb 2018 14:25:23 -
@@ -1,2 +1,2 @@
-SHA256 (urlwatch-2.6.tar.gz) = V6kKCno/BWu/d8kXYhoSQzjeIOFc41aHO5q7py9X1vQ=
-SIZE (urlwatch-2.6.tar.gz) = 30412
+SHA256 (urlwatch-2.8.tar.gz) = zt9hLZ88TEfKj/0qNnU7CGhyKhCBOSCPD70rV/bjQLM=
+SIZE (urlwatch-2.8.tar.gz) = 32745

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/02/24 07:20:26

Modified files:
meta/kde4  : Makefile 

Log message:
re-add REVISIONs;

Lost in r1.24 by me; Sorry to break the bulk again.

Spotted by landry@, naddy@; ok  sthen@

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/02/24 07:07:30

Modified files:
x11/kde4/kget  : Makefile 
x11/kde4/kget/pkg: PLIST 

Log message:
Unbreak kget after net/libktorrent update.

Disable torrent support in kget. Please use net/net/ktorrent.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/02/24 06:30:11

Modified files:
security/sslscan: Makefile 

Log message:
don't fail if ${WRKSRC}/openssl/.git exists, found during ports src extraction

Re: Sourceforge changes causing problems. Where the wild Tcl extensions are.

[Stuart Cassoff]

Great, thanks you two!
I'll have some fun with this today.


Stu


> -- Original Message --
> From: Stuart Henderson 
> Date: February 24, 2018 at 7:51 AM
> 
> 
> On 2018/02/24 14:32, Svyatoslav Mishyn wrote:
> > Hi,
> > 
> > (Sat, 24 Feb 10:10) Stuart Henderson:
> > > On 2018/02/24 00:05, Stuart Cassoff wrote:
> > > > Chiselapp is Fossil.
> > > > I'm just starting to look into this and so far I can get what seems to 
> > > > be a tarball from this very pretty url:
> > > > 
> > > > https://chiselapp.com/user/schelte/repository/dbus/tarball/dbus-92d71c1d63.tar.gz?uuid=92d71c1d639645ab73811e7edfd946d3e449ad695510ff6abfc1c9bff9a372c3
> > > > 
> > > > These two extensions are now on Chiselapp and I know there will be 
> > > > others.
> > > > (most?) Tcler's prefer Chiselapp over GitHub.
> > > > Maybe there's a way to fit this nicely into the ports system, like is 
> > > > currently done with GitHub?
> > > 
> > > It works ok without the uuid parameter, I would try
> > > 
> > > MASTER_SITES= 
> > > https://chiselapp.com/user/schelte/repository/dbus/tarball/
> > > DISTNAME= dbus-92d71c1d63
> > 
> > if without uuid, then default will be "trunk" branch.
> > see: https://chiselapp.com/user/schelte/repository/dbus/help?cmd=/tarball
> > 
> > So, in that case DISTNAME should be "dbus-trunk".
> > 
> > 
> > -- 
> > https://www.juef.space/
> 
> 
> Ah, in that case it probably does make sense to have some smarter handling.
> Adding to tcl.port.mk is probably good for starters, then it could be moved
> to bsd.port.mk if it becomes popular elsewhere.
> 
> Try playing with something like this ...
> 
> MASTER_SITES_CHISELAPP += \
> 
> https://chiselapp.com/user/${CHISEL_USER}/repository/${CHISEL_PROJECT}/tarball/
> 
> MASTER_SITES ?= ${MASTER_SITES_CHISELAPP}
> 
> DISTNAME ?= ${CHISEL_PROJECT}-${CHISEL_UUID:C/(..).*/\1/}
> DISTFILES ?= 
> ${DISTNAME}${EXTRACT_SUFX}{${DISTNAME}${EXTRACT_SUFX}?uuid=${CHISEL_UUID}}
>

CVS: cvs.openbsd.org: ports

[Bjorn Ketelaars]

CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2018/02/24 06:13:40

Modified files:
editors/focuswriter: Makefile distinfo 
editors/focuswriter/patches: 
 patch-src_fileformats_rtf_writer_cpp 
editors/focuswriter/pkg: PLIST 

Log message:
update to focuswriter-1.6.10

focuswriter now requires QT5. Thanks to sthen@ for noticing that
x11/qt5/qtmultimedia should be added as LDEP.

OK sthen@

Re: Sourceforge changes causing problems. Where the wild Tcl extensions are.

[Stuart Henderson]

On 2018/02/24 14:32, Svyatoslav Mishyn wrote:
> Hi,
> 
> (Sat, 24 Feb 10:10) Stuart Henderson:
> > On 2018/02/24 00:05, Stuart Cassoff wrote:
> > > Chiselapp is Fossil.
> > > I'm just starting to look into this and so far I can get what seems to be 
> > > a tarball from this very pretty url:
> > > 
> > > https://chiselapp.com/user/schelte/repository/dbus/tarball/dbus-92d71c1d63.tar.gz?uuid=92d71c1d639645ab73811e7edfd946d3e449ad695510ff6abfc1c9bff9a372c3
> > > 
> > > These two extensions are now on Chiselapp and I know there will be others.
> > > (most?) Tcler's prefer Chiselapp over GitHub.
> > > Maybe there's a way to fit this nicely into the ports system, like is 
> > > currently done with GitHub?
> > 
> > It works ok without the uuid parameter, I would try
> > 
> > MASTER_SITES=   
> > https://chiselapp.com/user/schelte/repository/dbus/tarball/
> > DISTNAME=   dbus-92d71c1d63
> 
> if without uuid, then default will be "trunk" branch.
> see: https://chiselapp.com/user/schelte/repository/dbus/help?cmd=/tarball
> 
> So, in that case DISTNAME should be "dbus-trunk".
> 
> 
> -- 
> https://www.juef.space/


Ah, in that case it probably does make sense to have some smarter handling.
Adding to tcl.port.mk is probably good for starters, then it could be moved
to bsd.port.mk if it becomes popular elsewhere.

Try playing with something like this ...

MASTER_SITES_CHISELAPP += \

https://chiselapp.com/user/${CHISEL_USER}/repository/${CHISEL_PROJECT}/tarball/

MASTER_SITES ?= ${MASTER_SITES_CHISELAPP}

DISTNAME ?= ${CHISEL_PROJECT}-${CHISEL_UUID:C/(..).*/\1/}
DISTFILES ?= 
${DISTNAME}${EXTRACT_SUFX}{${DISTNAME}${EXTRACT_SUFX}?uuid=${CHISEL_UUID}}

Re: Sourceforge changes causing problems. Where the wild Tcl extensions are.

[Svyatoslav Mishyn]

Hi,

(Sat, 24 Feb 10:10) Stuart Henderson:
> On 2018/02/24 00:05, Stuart Cassoff wrote:
> > Chiselapp is Fossil.
> > I'm just starting to look into this and so far I can get what seems to be a 
> > tarball from this very pretty url:
> > 
> > https://chiselapp.com/user/schelte/repository/dbus/tarball/dbus-92d71c1d63.tar.gz?uuid=92d71c1d639645ab73811e7edfd946d3e449ad695510ff6abfc1c9bff9a372c3
> > 
> > These two extensions are now on Chiselapp and I know there will be others.
> > (most?) Tcler's prefer Chiselapp over GitHub.
> > Maybe there's a way to fit this nicely into the ports system, like is 
> > currently done with GitHub?
> 
> It works ok without the uuid parameter, I would try
> 
> MASTER_SITES= https://chiselapp.com/user/schelte/repository/dbus/tarball/
> DISTNAME= dbus-92d71c1d63

if without uuid, then default will be "trunk" branch.
see: https://chiselapp.com/user/schelte/repository/dbus/help?cmd=/tarball

So, in that case DISTNAME should be "dbus-trunk".


-- 
https://www.juef.space/


signature.asc
Description: PGP signature

CVS: cvs.openbsd.org: ports

[Bjorn Ketelaars]

CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2018/02/24 03:55:25

Modified files:
editors/scite  : Makefile distinfo 
editors/scite/patches: patch-gtk_makefile 
   patch-src_SciTEGlobal_properties 
editors/scite/pkg: PLIST 

Log message:
update to scite-4.0.3

OK landry@

CVS: cvs.openbsd.org: ports

[Bjorn Ketelaars]

CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2018/02/24 03:54:50

Modified files:
editors/scintilla: Makefile distinfo 
editors/scintilla/patches: patch-gtk_makefile 

Log message:
update to scintilla-4.0.3

bump majors as symbols have been added, and removed.

OK landry@

UPDATE editors/focuswriter

[Björn Ketelaars]

update for focuswriter to 1.6.10. Please note that focuswriter now
requires QT5. Changed homepage to use https.

Tested ok on amd64.

OK?


Index: Makefile
===
RCS file: /cvs/ports/editors/focuswriter/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile21 Nov 2017 00:13:00 -  1.15
+++ Makefile24 Feb 2018 10:45:40 -
@@ -2,13 +2,12 @@
 
 COMMENT =  simple, distraction-free writing environment
 
-DISTNAME = focuswriter-1.5.5-src
+DISTNAME = focuswriter-1.6.10-src
 PKGNAME =  ${DISTNAME:S/-src//}
 CATEGORIES =   editors
 EXTRACT_SUFX = .tar.bz2
 WRKDIST =  ${WRKDIR}/${DISTNAME:S/-src//}
-REVISION = 2
-HOMEPAGE = http://gottcode.org/focuswriter/
+HOMEPAGE = https://gottcode.org/focuswriter/
 
 MASTER_SITES = ${HOMEPAGE}
 
@@ -16,13 +15,14 @@ MASTER_SITES =  ${HOMEPAGE}
 PERMIT_PACKAGE_CDROM = Yes
 
 MODULES += devel/qmake \
-   x11/qt4
+   x11/qt5
 RUN_DEPENDS += devel/desktop-file-utils \
x11/gtk+3,-guic
 LIB_DEPENDS += textproc/hunspell
-WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype
-WANTLIB += QtNetwork z QtGui c m pthread ${COMPILER_LIBCXX} hunspell-1.6
-WANTLIB += iconv intl
+
+WANTLIB += ${COMPILER_LIBCXX} GL Qt5Concurrent Qt5Core Qt5Gui
+WANTLIB += Qt5Network Qt5PrintSupport Qt5Widgets c hunspell-1.6
+WANTLIB += m z
 
 NO_TEST =  Yes
 
Index: distinfo
===
RCS file: /cvs/ports/editors/focuswriter/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo19 Sep 2015 10:56:11 -  1.5
+++ distinfo24 Feb 2018 10:45:40 -
@@ -1,2 +1,2 @@
-SHA256 (focuswriter-1.5.5-src.tar.bz2) = 
tqIIVYeGSyaFUW0ghw2TdYA8zfNHLma/RXOC0CjB2g4=
-SIZE (focuswriter-1.5.5-src.tar.bz2) = 5249014
+SHA256 (focuswriter-1.6.10-src.tar.bz2) = 
ui+la7K03d5nID7zNKltOOqnC5Eg1S6Umu0qWjzzK0M=
+SIZE (focuswriter-1.6.10-src.tar.bz2) = 10202594
Index: patches/patch-src_fileformats_rtf_writer_cpp
===
RCS file: 
/cvs/ports/editors/focuswriter/patches/patch-src_fileformats_rtf_writer_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_fileformats_rtf_writer_cpp
--- patches/patch-src_fileformats_rtf_writer_cpp2 May 2017 18:04:58 
-   1.1
+++ patches/patch-src_fileformats_rtf_writer_cpp24 Feb 2018 10:45:40 
-
@@ -3,8 +3,8 @@ $OpenBSD: patch-src_fileformats_rtf_writ
 Index: src/fileformats/rtf_writer.cpp
 --- src/fileformats/rtf_writer.cpp.orig
 +++ src/fileformats/rtf_writer.cpp
-@@ -30,6 +30,7 @@
- #include 
+@@ -32,6 +32,7 @@
+ #include 
  #endif
  
 +#include 
Index: pkg/PLIST
===
RCS file: /cvs/ports/editors/focuswriter/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST   27 Jun 2015 13:37:27 -  1.4
+++ pkg/PLIST   24 Feb 2018 10:45:40 -
@@ -1,8 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.4 2015/06/27 13:37:27 jasper Exp $
 @bin bin/focuswriter
 @man man/man1/focuswriter.1
-share/appdata/
-share/appdata/focuswriter.appdata.xml
 share/applications/focuswriter.desktop
 share/focuswriter/
 share/focuswriter/icons/
@@ -16,6 +14,7 @@ share/focuswriter/icons/hicolor/16/arrow
 share/focuswriter/icons/hicolor/16/arrow-up.png
 share/focuswriter/icons/hicolor/16/character-set.png
 share/focuswriter/icons/hicolor/16/chronometer.png
+share/focuswriter/icons/hicolor/16/dialog-close.png
 share/focuswriter/icons/hicolor/16/document-new.png
 share/focuswriter/icons/hicolor/16/document-open.png
 share/focuswriter/icons/hicolor/16/document-print.png
@@ -51,6 +50,7 @@ share/focuswriter/icons/hicolor/16/go-do
 share/focuswriter/icons/hicolor/16/go-up.png
 share/focuswriter/icons/hicolor/16/help-about.png
 share/focuswriter/icons/hicolor/16/preferences-desktop-locale.png
+share/focuswriter/icons/hicolor/16/preferences-desktop-printer.png
 share/focuswriter/icons/hicolor/16/preferences-system.png
 share/focuswriter/icons/hicolor/16/tools-check-spelling.png
 share/focuswriter/icons/hicolor/16/view-calendar.png
@@ -64,8 +64,11 @@ share/focuswriter/icons/hicolor/22/acces
 share/focuswriter/icons/hicolor/22/application-exit.png
 share/focuswriter/icons/hicolor/22/applications-graphics.png
 share/focuswriter/icons/hicolor/22/arrow-down.png
+share/focuswriter/icons/hicolor/22/arrow-right.png
+share/focuswriter/icons/hicolor/22/arrow-up.png
 share/focuswriter/icons/hicolor/22/character-set.png
 share/focuswriter/icons/hicolor/22/chronometer.png
+share/focuswriter/icons/hicolor/22/dialog-close.png
 share/focuswriter/icons/hicolor/22/document-new.png
 share/focuswriter/icons/hicolor/22/document-open.png
 share/focuswriter/icons/hicolor/22/document-print.png
@@ -81,6 +84,8 @@ share/focuswriter/icons/hicolor/22/edit-
 share/focuswriter/icons/hicolor/22/edit-rename.png
 

CVS: cvs.openbsd.org: ports

[Bjorn Ketelaars]

CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2018/02/24 03:14:55

Modified files:
net/qsyncthingtray: Makefile distinfo 

Log message:
update to qsyncthingtray-0.5.8

OK edd@ (maintainer), awolk@, landry@

CVS: cvs.openbsd.org: ports

[Bjorn Ketelaars]

CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2018/02/24 03:14:24

Modified files:
net/syncthing  : Makefile distinfo 
net/syncthing/patches: patch-build_go 

Log message:
update to syncthing-0.14.44

OK edd@ (maintainer), awolk@, landry@

Re: Sourceforge changes causing problems. Where the wild Tcl extensions are.

[Stuart Henderson]

On 2018/02/24 00:05, Stuart Cassoff wrote:
> x11/dbus-tcl and x11/dbus-intf have moved from SourceForge to Chiselapp.
> 
> Ports system's looking for dbus-2.1.tar.gz whereas the distfile is on the 
> obsd servers as dbus-tcl-2.1.tar.gz.
> DISTFILES = dbus-tcl{dbus}-${V}.tar.gz
> 
> ===>  Checking files for dbus-tcl-2.1p0
> >> Fetch 
> >> https://downloads.sourceforge.net/sourceforge/dbus-tcl/dbus-2.1.tar.gz
> ftp: Error retrieving file: 404 Not Found
> >> Fetch https://ftp.openbsd.org/pub/OpenBSD/distfiles//dbus-2.1.tar.gz
> ftp: Error retrieving file: 404 Not Found
> ...

This is missing support in bsd.port.mk, really it needs to change the
filename used when fetching from MASTER_SITE_BACKUP in the case of
DISTFILES using "foo{bar}.ext" format.

> Chiselapp is Fossil.
> I'm just starting to look into this and so far I can get what seems to be a 
> tarball from this very pretty url:
> 
> https://chiselapp.com/user/schelte/repository/dbus/tarball/dbus-92d71c1d63.tar.gz?uuid=92d71c1d639645ab73811e7edfd946d3e449ad695510ff6abfc1c9bff9a372c3
> 
> These two extensions are now on Chiselapp and I know there will be others.
> (most?) Tcler's prefer Chiselapp over GitHub.
> Maybe there's a way to fit this nicely into the ports system, like is 
> currently done with GitHub?

It works ok without the uuid parameter, I would try

MASTER_SITES=   https://chiselapp.com/user/schelte/repository/dbus/tarball/
DISTNAME=   dbus-92d71c1d63

and cross fingers that these on-demand generated files don't change too
often if chiselapp updates their infrastructure.

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/02/24 02:56:09

Modified files:
sysutils/libevt: Makefile 

Log message:
Missing BDEP on gettext-tools, somewhere in the build this tries to use
xgettext.

UPDATE editors/scite

[Björn Ketelaars]

Diff below brings scite to the latest version. Tested ok on amd64 using
the latest scintilla for which a diff has been sent to this list.

Comments/OK?


Index: Makefile
===
RCS file: /cvs/ports/editors/scite/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile19 Jan 2018 17:11:35 -  1.29
+++ Makefile24 Feb 2018 09:44:51 -
@@ -2,7 +2,7 @@
 
 COMMENT=   flexible and small GTK+ editor
 
-VERSION=   4.0.2
+VERSION=   4.0.3
 DISTNAME=  scite${VERSION:S/.//g}
 PKGNAME=   scite-${VERSION}
 CATEGORIES=editors x11
@@ -13,13 +13,14 @@ HOMEPAGE=   http://www.scintilla.org/SciT
 PERMIT_PACKAGE_CDROM=  may not sell
 PERMIT_PACKAGE_FTP=Yes
 
-WANTLIB += c cairo gdk-3 gdk_pixbuf-2.0 glib-2.0 gobject-2.0 gtk-3
-WANTLIB += pango-1.0 pangocairo-1.0 pthread scintilla scintilla_lexers 
${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} c cairo gdk-3 gdk_pixbuf-2.0 glib-2.0
+WANTLIB += gobject-2.0 gtk-3 pango-1.0 pangocairo-1.0 scintilla
+WANTLIB += scintilla_lexers
 
 MASTER_SITES=  http://www.scintilla.org/
 EXTRACT_SUFX=  .tgz
 
-# c++11
+# c++17
 COMPILER=  base-clang ports-clang ports-gcc
 
 LIB_DEPENDS=   x11/gtk+3 \
Index: distinfo
===
RCS file: /cvs/ports/editors/scite/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo1 Nov 2017 17:01:23 -   1.11
+++ distinfo24 Feb 2018 09:44:51 -
@@ -1,2 +1,2 @@
-SHA256 (scite402.tgz) = H5u47Muu13wRDDDA5tuqwEs/YrdRqTAZKxM6e28PKfs=
-SIZE (scite402.tgz) = 2424648
+SHA256 (scite403.tgz) = crVJIMqL4cbsXg9Cnc/bCSgtkhl51keXMyff165Uq94=
+SIZE (scite403.tgz) = 2433537
Index: patches/patch-gtk_makefile
===
RCS file: /cvs/ports/editors/scite/patches/patch-gtk_makefile,v
retrieving revision 1.10
diff -u -p -r1.10 patch-gtk_makefile
--- patches/patch-gtk_makefile  1 Nov 2017 17:01:23 -   1.10
+++ patches/patch-gtk_makefile  24 Feb 2018 09:44:51 -
@@ -1,7 +1,4 @@
-$OpenBSD
-
-Drop `-pedantic'
-/usr/local/include/gtk-3.0/gdk/gdktypes.h:318: error: comma at end of 
enumerator list
+$OpenBSD$
 
 Index: gtk/makefile
 --- gtk/makefile.orig
@@ -57,8 +54,7 @@ Index: gtk/makefile
  ifdef CHECK_DEPRECATED
  DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED 
-DGTK_DISABLE_DEPRECATED
  endif
--CXXBASEFLAGS=-W -Wall -pedantic -DGTK -DSCI_LEXER 
-DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" 
$(INCLUDEDIRS) $(DEPRECATED)
-+CXXBASEFLAGS=-W -Wall -Dunix -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" 
-DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS) $(DEPRECATED)
+ CXXBASEFLAGS=-W -Wall -pedantic -DGTK -DSCI_LEXER 
-DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" 
$(INCLUDEDIRS) $(DEPRECATED)
  
  ifdef DEBUG
 -CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
@@ -84,7 +80,7 @@ Index: gtk/makefile
  
  .c.o:
$(CC) $(INCLUDEDIRS) $(MISLEADING) -DLUA_USE_POSIX $(CXXTFLAGS) 
$(CFLAGS) -c $< -o $@
-@@ -111,19 +104,16 @@ deps: deps.mak
+@@ -111,9 +104,6 @@ deps: deps.mak
  deps.mak:
$(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) $(srcdir)/*.cxx 
$(srcdir)/../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >$@
  
@@ -94,18 +90,12 @@ Index: gtk/makefile
  # To almost make lua.vers (needs header and footer added) which is only 
needed after updating Lua:
  # nm -g ../bin/SciTE | grep lua | awk '{print "\t\t" $3 ";"}' >lua2.vers
  
- $(PROG): SciTEGTK.o GUIGTK.o Widget.o \
--FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o 
SciTEIO.o StringList.o \
--ExportHTML.o ExportPDF.o ExportRTF.o ExportTEX.o ExportXML.o \
--MatchMarker.o StringHelpers.o \
--PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o 
StyleDefinition.o StyleWriter.o Utf8_16.o \
-+ FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o 
SciTEIO.o StringList.o \
-+ ExportHTML.o ExportPDF.o ExportRTF.o ExportTEX.o ExportXML.o \
-+ MatchMarker.o StringHelpers.o \
-+ PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o 
StyleDefinition.o StyleWriter.o Utf8_16.o \
+@@ -123,7 +113,7 @@ ExportHTML.o ExportPDF.o ExportRTF.o ExportTEX.o Expor
+ MatchMarker.o StringHelpers.o \
+ PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o 
StyleDefinition.o StyleWriter.o Utf8_16.o \
JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
--  $(CXX) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed 
-Wl,--version-script $(srcdir)/lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) 
-lm -lstdc++
-+  $(CXX) `$(CONFIGTHREADS)` $(LIBS) -rdynamic -Wl,--as-needed 
-Wl,--version-script $(srcdir)/lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) 
-lm -lstdc++
+-  $(CXX) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed 

UPDATE editors/scintilla

[Björn Ketelaars]

Enclosed a diff for bringing scintilla to the latest version. Tested ok
on amd64 using scite.

Comments/OK?


Index: Makefile
===
RCS file: /cvs/ports/editors/scintilla/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile14 Dec 2017 06:44:23 -  1.27
+++ Makefile24 Feb 2018 09:44:16 -
@@ -2,13 +2,13 @@
 
 COMMENT=   source code editing component for GTK+
 
-VERSION=   4.0.2
+VERSION=   4.0.3
 DISTNAME=  scintilla${VERSION:S/.//g}
 PKGNAME=   scintilla-${VERSION}
 CATEGORIES=editors x11
 
-SHARED_LIBS=   scintilla   10.0 \
-   scintilla_lexers10.0
+SHARED_LIBS=   scintilla   11.0 \
+   scintilla_lexers11.0
 
 HOMEPAGE=  http://www.scintilla.org/
 
@@ -30,7 +30,7 @@ MAKE_ENV= CXX='${CXX}' CXXFLAGS='${CXXFL
 
 WANTLIB=   m ${COMPILER_LIBCXX}
 
-# -std=gnu++14
+# -std=gnu++17
 COMPILER=  base-clang ports-clang ports-gcc
 
 # Not LIB_DEPENDS as it's only shared libraries that don't link directly
Index: distinfo
===
RCS file: /cvs/ports/editors/scintilla/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo1 Nov 2017 17:01:23 -   1.11
+++ distinfo24 Feb 2018 09:44:16 -
@@ -1,2 +1,2 @@
-SHA256 (scintilla402.tgz) = h9lhB0zWRvp/kuPUiMsStqLQg4oZRLVsuVeNhXG7vU4=
-SIZE (scintilla402.tgz) = 1401547
+SHA256 (scintilla403.tgz) = nmfi9NjJy6Pi6D7qiDhSrZrfqNwXdfJR+GjMbNBYya4=
+SIZE (scintilla403.tgz) = 1404814
Index: patches/patch-gtk_makefile
===
RCS file: /cvs/ports/editors/scintilla/patches/patch-gtk_makefile,v
retrieving revision 1.13
diff -u -p -r1.13 patch-gtk_makefile
--- patches/patch-gtk_makefile  1 Nov 2017 17:01:23 -   1.13
+++ patches/patch-gtk_makefile  24 Feb 2018 09:44:16 -
@@ -58,7 +58,7 @@ Index: gtk/makefile
 +CTFLAGS+=-DNDEBUG $(CXXBASEFLAGS) $(THREADFLAGS)
  endif
  
- CXXTFLAGS:=--std=gnu++14 $(CTFLAGS) $(REFLAGS)
+ CXXTFLAGS:=--std=gnu++17 $(CTFLAGS) $(REFLAGS)
 @@ -88,8 +81,12 @@ MARSHALLER=scintilla-marshal.o
  
  .cxx.o: