Re: Update devel/tkcvs from 6.0 to 8.2.3

[Currell Berry]

On Mon, Mar 19, 2018 at 12:31 PM, Todd T. Fries <t...@fries.net> wrote:
> Feel free to take maintainership also, I'm not using this anymore.
>
> Thanks,
>
> Penned by Stuart Henderson on 20180319  5:35.24, we have:
> | On 2018/03/18 21:25, Currell Berry wrote:
> | > Thank you for your help -- here is another revision of the patches --
> | > the first one for tkcvs and the second one for kde4/dev-scripts.
> |
> | There's not much point including a copy of tkdiff here, it's identical
> | to the standalone one. Let's remove it in favour of a dep and get rid
> | of the conflict.
> |
> | Couple of other tweaks: rewrap DESCR (no more lines but flows better),
> | put HOMEPAGE in the normal place, use https, drop the "only" from
> | license information as it's not clear in the distfile (it's not done
> | correctly anyway as there's no copyright assignment but at least the
> | intent is clear - and v6.0 that we have in tree has nothing in the
> | distfile at all except for a small piece of code reused from something
> | else so what's in-tree now is wrong for sure).
> |
> |

Ok @Todd I'll give it a go at being maintainer for this if that's ok
with others.

Below is another version of the patch incorporating the new feedback.
Note that the patch below also includes the small changes to the
tkdiff port and the kde-dev-scripts port removing their respective
@conflicts with tkcvs.

-Currell

Index: devel/tkcvs/Makefile
===
RCS file: /cvs/ports/devel/tkcvs/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- devel/tkcvs/Makefile 22 Jan 2015 18:41:16 - 1.33
+++ devel/tkcvs/Makefile 20 Mar 2018 01:53:01 -
@@ -1,28 +1,28 @@
 # $OpenBSD: Makefile,v 1.33 2015/01/22 18:41:16 naddy Exp $

-COMMENT= graphical frontend to CVS
-DISTNAME= tkcvs-6.0
-REVISION = 5
+COMMENT= graphical frontend to CVS and SVN
+DISTNAME= tkcvs-8.2.3
 CATEGORIES= devel

-MAINTAINER= Todd T. Fries <t...@openbsd.org>
+HOMEPAGE= https://www.twobarleycorns.net/tkcvs.html

+MAINTAINER= Currell Berry <currellbe...@gmail.com>
+
+# License GPLv2
 PERMIT_PACKAGE_CDROM= Yes

-MASTER_SITES= 
http://www.neosoft.com/tcl/ftparchive/sorted/packages-7.6/apps/tkcvs-6.0/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tkcvs/} \
+ https://www.twobarleycorns.net/

 MODULES= x11/tk
-RUN_DEPENDS= ${MODTK_RUN_DEPENDS}
+RUN_DEPENDS= ${MODTK_RUN_DEPENDS} devel/tkdiff
 BUILD_DEPENDS= ${RUN_DEPENDS}

 NO_BUILD= Yes
 NO_TEST= Yes

-pre-configure:
- @${MODTCL_TCLSH_ADJ} ${WRKSRC}/tkcvs/cvscheck.blank
- @${SUBST_CMD} ${WRKSRC}/tkcvs/doinstall
-
 do-install:
- cd $(WRKSRC)/tkcvs; ./doinstall
+ cd ${WRKSRC} && $(MODTCL_BIN) ./doinstall.tcl -nox ${PREFIX}
+ cd ${PREFIX}/bin && ${MODTCL_WISH_ADJ} tkcvs

 .include 
Index: devel/tkcvs/distinfo
===
RCS file: /cvs/ports/devel/tkcvs/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- devel/tkcvs/distinfo 18 Jan 2015 03:13:48 - 1.4
+++ devel/tkcvs/distinfo 20 Mar 2018 01:53:01 -
@@ -1,2 +1,2 @@
-SHA256 (tkcvs-6.0.tar.gz) = PfT5mVOrZD5/mxg6zDHNJbt5CpKdlgKePwl+XhH4KXI=
-SIZE (tkcvs-6.0.tar.gz) = 102022
+SHA256 (tkcvs-8.2.3.tar.gz) = S/sp3Z/7u8Hm5hHhx3KvdF10LTNueXvwVtv3ARa44yo=
+SIZE (tkcvs-8.2.3.tar.gz) = 570910
Index: devel/tkcvs/patches/patch-doinstall_tcl
===
RCS file: devel/tkcvs/patches/patch-doinstall_tcl
diff -N devel/tkcvs/patches/patch-doinstall_tcl
--- /dev/null 1 Jan 1970 00:00:00 -
+++ devel/tkcvs/patches/patch-doinstall_tcl 20 Mar 2018 01:53:01 -
@@ -0,0 +1,21 @@
+$OpenBSD$
+don't install integrated tkdiff -- instead we depend on the tkdiff package.
+Index: doinstall.tcl
+--- doinstall.tcl.orig
 doinstall.tcl
+@@ -69,12 +69,12 @@ proc doinstall { INSTALLROOT } {
+   set destfile [file join $BINDIR $TKCVS]
+   puts "Installing $TKCVS in $BINDIR"
+   file copy -force [file join tkcvs tkcvs.tcl] [file join $BINDIR $TKCVS]
+-  puts "Installing $TKDIFF in $BINDIR"
+-  file copy -force [file join tkdiff tkdiff] [file join $BINDIR $TKDIFF]
++  # puts "Installing $TKDIFF in $BINDIR"
++  # file copy -force [file join tkdiff tkdiff] [file join $BINDIR $TKDIFF]
+
+   if {$tcl_platform(platform) == "unix"} {
+ file attributes $destfile -permissions 0755
+-file attributes [file join $BINDIR $TKDIFF] -permissions 0755
++# file attributes [file join $BINDIR $TKDIFF] -permissions 0755
+ file mkdir $MANDIR
+ puts "Installing manpage tkcvs.1 in $MANDIR"
+ file copy -force [file join tkcvs tkcvs.1] $MANDIR
Index: devel/tkcvs/patches/patch-tkcvs_cvs_tcl
===
RCS file: devel/tkcvs/patches/patch-tkcvs_cvs_tcl
diff -N devel/tkcvs/patches/patch-tkcvs_cvs_tcl
--- devel/

Re: upgrade ABCDE request - 2.9.1

[Mike Burns]

On 2018-03-19 15.29.26 -0700, jungle Boogie wrote:
> On 19 March 2018 at 15:06, Stuart Henderson  wrote:
> > btw, this was updated to 2.8.1 before, but it broke things quite badly
> > so it was reverted..
> 
> Do you know if the regressions on the previous version were reported
> upstream?

This is the thread:
https://marc.info/?l=openbsd-ports=151722260128733=2

Re: upgrade ABCDE request - 2.9.1

[jungle Boogie]

On 19 March 2018 at 15:06, Stuart Henderson  wrote:
>
> btw, this was updated to 2.8.1 before, but it broke things quite badly
> so it was reverted..
>
>

Oh, wow. I didn't know about abcde before today. I found the version
in pkg quite useful for ripping a CD and noticed it was a little
outdated.

Do you know if the regressions on the previous version were reported upstream?



-- 
---
inum: 883510009027723
sip: jungleboo...@sip2sip.info

Re: upgrade ABCDE request - 2.9.1

[Stuart Henderson]

On 2018/03/19 15:01, jungle Boogie wrote:
> Hi All,
> 
> abcde was released the 9th of March:
> https://abcde.einval.com/wiki/
> 
> Currently available in ports/packages is abcde version 2.7.2v0.
> 
> Would it be possible for someone to have this updated?
> 
> Thanks for the consideration.
> 
> -- 
> ---
> inum: 883510009027723
> sip: jungleboo...@sip2sip.info
> 

btw, this was updated to 2.8.1 before, but it broke things quite badly
so it was reverted..

upgrade ABCDE request - 2.9.1

[jungle Boogie]

Hi All,

abcde was released the 9th of March:
https://abcde.einval.com/wiki/

Currently available in ports/packages is abcde version 2.7.2v0.

Would it be possible for someone to have this updated?

Thanks for the consideration.

-- 
---
inum: 883510009027723
sip: jungleboo...@sip2sip.info

Re: [NEW] converters/p5-Sereal-Encoder

[Frederic Cambus]

On Tue, Mar 06, 2018 at 02:28:12PM +0100, Alexander Bluhm wrote:
> On Sun, Feb 25, 2018 at 04:13:38PM +0100, Frederic Cambus wrote:
> > Here is a new port: converters/p5-Sereal-Encoder
> 
> I had some problems with linking -lzstd especially when this package
> was installed.  I would recommend to add archivers/zstd as lib
> dependency and always use the library from the existing package.
> 
> Also for the included Devel::CheckLib we have a package.  I prefer
> to add dependencies and remove the included stuff.  Then I am sure
> which software is used after all this build magic.

That makes sense to me, thanks for pointing this out.

> I think the following things should change:
> - There are some source files with different license, the comment
>   should include them.
> - add zstd to wantlib
> - depend on devel/p5-Devel-CheckLib and archivers/zstd
> - according to Makefile.PL p5-Sereal-Decoder version >=4.002 is
>   needed for testing.  I prefer to keep the version in sync with
>   our test dependecies.
> - remove the unused Devel/CheckLib and zstd
> - patch to search for libraries in /usr/local
> 
> I have included my proposed changes for p5-Sereal-Encoder.

Again, thanks for this. I applied the same changes to p5-Sereal-Decoder,
attaching updated tarballs.


p5-Sereal-Encoder.tar.gz
Description: application/tar-gz


p5-Sereal-Decoder.tar.gz
Description: application/tar-gz

Re: [PATCH] erlang tools

[Stuart Henderson]

On 2018/03/19 21:39, Stuart Henderson wrote:
> OK sthen@

too late with my ok I see ;-)

Re: [PATCH] erlang tools

[Stuart Henderson]

OK sthen@


On 2018/03/18 09:07, Bill Karh wrote:
> Ports,
> 
> Here's a patch to help the erlang tools find their versioned selves. Before
> the patch a simple command line compile would fail:
> 
> $ erlc16 user_default.erl
> erlc: Error 2 executing 'erl'.
> 
> With this patch:
> $ erlc16 user_default.erl
> 
> (it works)
> 
> Tested on amd64 for erlang16 through erlang19.  No problems building rebar,
> tsung, or erl-mochiweb with this patch.
> 
> Thanks,
> Bill Karh

> Index: Makefile.inc
> ===
> RCS file: /depot/cvs/openbsd/ports/lang/erlang/Makefile.inc,v
> retrieving revision 1.15
> diff -u -p -r1.15 Makefile.inc
> --- Makefile.inc  9 Dec 2017 21:28:58 -   1.15
> +++ Makefile.inc  13 Mar 2018 17:03:28 -
> @@ -78,7 +78,13 @@ gen-versions: extract
>  
>  pre-configure:
>   ${SUBST_CMD} ${WRKSRC}/make/install_bin \
> +  ${WRKSRC}/Makefile.in \
> +  ${WRKSRC}/erts/etc/common/ct_run.c \
> +  ${WRKSRC}/erts/etc/common/dialyzer.c \
> +  ${WRKSRC}/erts/etc/common/erlc.c \
>${WRKSRC}/erts/etc/common/escript.c \
> +  ${WRKSRC}/erts/etc/common/typer.c \
> +  ${WRKSRC}/lib/dialyzer/src/dialyzer_plt.erl \
>${WRKSRC}/lib/wx/configure.in
>  
>  post-install:
> Index: 16/Makefile
> ===
> RCS file: /depot/cvs/openbsd/ports/lang/erlang/16/Makefile,v
> retrieving revision 1.19
> diff -u -p -r1.19 Makefile
> --- 16/Makefile   9 Dec 2017 21:28:58 -   1.19
> +++ 16/Makefile   3 Mar 2018 19:46:00 -
> @@ -12,7 +12,7 @@ DISTNAME=   otp_src_${V}
>  PKGNAME-main=erlang-16b.03
>  PKGNAME-wx=  erlang-wx-16b.03
>  
> -REVISION-main=   13
> +REVISION-main=   14
>  REVISION-wx= 2
>  
>  VERSION_SPEC=>=16v0,<17v0
> Index: 16/patches/patch-Makefile_in
> ===
> RCS file: 16/patches/patch-Makefile_in
> diff -N 16/patches/patch-Makefile_in
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ 16/patches/patch-Makefile_in  15 Mar 2018 17:01:52 -
> @@ -0,0 +1,15 @@
> +$OpenBSD$
> +
> +Create symlink so the build can handle versioned binaries
> +
> +Index: Makefile.in
> +--- Makefile.in.orig
>  Makefile.in
> +@@ -516,6 +516,7 @@ $(BOOTSTRAP_ROOT)/bootstrap/bin/erl: $(ERL_TOP)/erts/e
> + $(ERL_TOP)/erts/etc/unix/erl.src.src > \
> + $(BOOTSTRAP_ROOT)/bootstrap/bin/erl
> + @chmod 755 $(BOOTSTRAP_ROOT)/bootstrap/bin/erl
> ++@(cd $(BOOTSTRAP_ROOT)/bootstrap/bin && $(LN_S) ./erl erl${MAJ_V})
> + 
> + $(BOOTSTRAP_ROOT)/bootstrap/bin/erlc: $(ERL_TOP)/bin/$(TARGET)/erlc 
> $(BOOTSTRAP_ROOT)/bootstrap/target
> + @rm -f $(BOOTSTRAP_ROOT)/bootstrap/bin/erlc
> Index: 16/patches/patch-erts_etc_common_ct_run_c
> ===
> RCS file: 16/patches/patch-erts_etc_common_ct_run_c
> diff -N 16/patches/patch-erts_etc_common_ct_run_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ 16/patches/patch-erts_etc_common_ct_run_c 15 Mar 2018 16:56:42 -
> @@ -0,0 +1,16 @@
> +$OpenBSD$
> +
> +Let erlang test runner handle versioned binaries.
> +
> +Index: erts/etc/common/ct_run.c
> +--- erts/etc/common/ct_run.c.orig
>  erts/etc/common/ct_run.c
> +@@ -49,7 +49,7 @@ static int eargc;  /* Number of arguments in 
> eargv. */
> + #else
> + #  define QUOTE(s) s
> + #  define IS_DIRSEP(c) ((c) == '/')
> +-#  define ERL_NAME "erl"
> ++#  define ERL_NAME "erl${MAJ_V}"
> + #endif
> + 
> + #define UNSHIFT(s) eargc++, eargv--; eargv[0] = QUOTE(s)
> Index: 16/patches/patch-erts_etc_common_dialyzer_c
> ===
> RCS file: 16/patches/patch-erts_etc_common_dialyzer_c
> diff -N 16/patches/patch-erts_etc_common_dialyzer_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ 16/patches/patch-erts_etc_common_dialyzer_c   15 Mar 2018 16:56:08 
> -
> @@ -0,0 +1,16 @@
> +$OpenBSD$
> +
> +Let static analyzer handle versioned binaries.
> +
> +Index: erts/etc/common/dialyzer.c
> +--- erts/etc/common/dialyzer.c.orig
>  erts/etc/common/dialyzer.c
> +@@ -49,7 +49,7 @@ static int eargc;  /* Number of arguments in 
> eargv. */
> + #else
> + #  define QUOTE(s) s
> + #  define IS_DIRSEP(c) ((c) == '/')
> +-#  define ERL_NAME "erl"
> ++#  define ERL_NAME "erl${MAJ_V}"
> + #endif
> + 
> + #define UNSHIFT(s) eargc++, eargv--; eargv[0] = QUOTE(s)
> Index: 16/patches/patch-erts_etc_common_erlc_c
> ===
> RCS file: 16/patches/patch-erts_etc_common_erlc_c
> diff -N 16/patches/patch-erts_etc_common_erlc_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ 16/patches/patch-erts_etc_common_erlc_c   15 Mar 2018 16:55:01 -
> @@ -0,0 +1,16 @@
> +$OpenBSD$
> +
> +Let erlang 

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/03/19 14:57:20

Modified files:
lang/erlang: Makefile.inc 
lang/erlang/16 : Makefile 
lang/erlang/17 : Makefile 
lang/erlang/17/pkg: PLIST-main 
lang/erlang/18 : Makefile 
lang/erlang/19 : Makefile 
Added files:
lang/erlang/16/patches: patch-Makefile_in 
patch-erts_etc_common_ct_run_c 
patch-erts_etc_common_dialyzer_c 
patch-erts_etc_common_erlc_c 
patch-erts_etc_common_typer_c 
patch-lib_dialyzer_src_dialyzer_plt_erl 
lang/erlang/17/patches: patch-Makefile_in 
patch-erts_etc_common_ct_run_c 
patch-erts_etc_common_dialyzer_c 
patch-erts_etc_common_erlc_c 
patch-erts_etc_common_typer_c 
patch-lib_dialyzer_src_dialyzer_plt_erl 
lang/erlang/18/patches: patch-Makefile_in 
patch-erts_etc_common_ct_run_c 
patch-erts_etc_common_dialyzer_c 
patch-erts_etc_common_erlc_c 
patch-erts_etc_common_typer_c 
patch-lib_dialyzer_src_dialyzer_plt_erl 
lang/erlang/19/patches: patch-Makefile_in 
patch-erts_etc_common_ct_run_c 
patch-erts_etc_common_dialyzer_c 
patch-erts_etc_common_erlc_c 
patch-erts_etc_common_typer_c 
patch-lib_dialyzer_src_dialyzer_plt_erl 

Log message:
Let erlang tools find their versioned self; while here prevent
collisions during static analysis when multiple versions of erlang are installed

from Bill Karh

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/03/19 13:48:05

Modified files:
devel/jenkins/devel: Makefile distinfo 
devel/jenkins/stable: Makefile distinfo 

Log message:
update to latest jenkins releases; includes fixes for
CVE-2018-167
CVE-2018-168
CVE-2018-6356

ok ian@ (MAINTAINER)

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/03/19 12:28:12

Modified files:
devel/libgit2/libgit2: Makefile distinfo 
devel/libgit2/libgit2/patches: patch-src_openssl_stream_h 

Log message:
update to libgit2-0.26.3, includes security fixes as part of 0.26.2:

"memory handling issues when reading crafted repository index files.
The issues allow for possible denial of service due to allocation of large
memory and out-of-bound reads. As the index is never transferred via the
network, exploitation requires an attacker to have access to the local 
repository."

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2018/03/19 12:17:42

Modified files:
net/knot   : Makefile distinfo 

Log message:
Update to knot-2.6.5

Release notes at:
https://www.knot-dns.cz/2018-02-12-version-265.html

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/03/19 12:15:57

Modified files:
databases/redis: Makefile distinfo 

Log message:
update to redis-4.0.8 with a number of important fixes. see
https://raw.githubusercontent.com/antirez/redis/4.0/00-RELEASENOTES
update pointed out by kn@ but with a more complex diff.

dcoppa (maintainer) doesn't seem to be around so I'm committing anyway
in order that it makes 6.3; ok jasper@

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/03/19 11:52:11

Removed files:
databases/postgresql/patches: 
  patch-src_backend_storage_lmgr_s_lock_c 

Log message:
remove empty file

Re: UPDATE security/gpgme

[Landry Breuil]

On Mon, Mar 19, 2018 at 05:32:35PM +0100, Rafael Sadowski wrote:
> On Fri Feb 23, 2018 at 01:04:24PM +, Stuart Henderson wrote:
> > On 2018/02/23 13:52, Björn Ketelaars wrote:
> > > Enclosed a diff for bringing gpgme to the latest version [0]. No issues
> > > found with 'make test', or while build testing numerous consumers.
> > 
> > rsadowski has a larger diff to update and add qgpgme, that I or someone
> > else needs to look at .. (subject "Re: NEW: security/qgpgme; Update
> > security/gpgme, mail/trojita; remove: x11/kde-applications/gpgmepp")
> > 
> 
> Maybe something for pre 6.3? This diff includes a fix spotted by landry@
> in a bulk. We need the gpg2 link at the build process.

Given the amount of ports that depend on gpgme, an update is not in
reasonable before the lock now. Fixing the target (and the comment)
only, maybe more :)

Re: UPDATE security/gpgme

[Rafael Sadowski]

On Fri Feb 23, 2018 at 01:04:24PM +, Stuart Henderson wrote:
> On 2018/02/23 13:52, Björn Ketelaars wrote:
> > Enclosed a diff for bringing gpgme to the latest version [0]. No issues
> > found with 'make test', or while build testing numerous consumers.
> 
> rsadowski has a larger diff to update and add qgpgme, that I or someone
> else needs to look at .. (subject "Re: NEW: security/qgpgme; Update
> security/gpgme, mail/trojita; remove: x11/kde-applications/gpgmepp")
> 

Maybe something for pre 6.3? This diff includes a fix spotted by landry@
in a bulk. We need the gpg2 link at the build process.


Index: Makefile
===
RCS file: /cvs/ports/security/gpgme/Makefile,v
retrieving revision 1.40
diff -u -p -u -p -r1.40 Makefile
--- Makefile30 Jan 2018 15:06:37 -  1.40
+++ Makefile19 Mar 2018 16:30:17 -
@@ -2,11 +2,10 @@
 
 COMMENT=   GnuPG Made Easy
 
-DISTNAME=  gpgme-1.9.0
-REVISION=  0
+DISTNAME=  gpgme-1.10.0
 CATEGORIES=security devel
 
-SHARED_LIBS +=  gpgme21.0 # 29.0
+SHARED_LIBS +=  gpgme22.0 # 29.0
 
 HOMEPAGE=  https://www.gnupg.org/software/gpgme/index.html
 
@@ -34,7 +33,7 @@ LIB_DEPENDS=  devel/gettext \
 # `./t-support.h:160: GPGME: Invalid crypto engine'
 # https://dev.gnupg.org/T3512
 TEST_DEPENDS +=security/gnupg2
-pre-test:
+pre-build:
ln -sf ${LOCALBASE}/bin/gpg2 ${WRKDIR}/bin/gpg
 
 # needed for the regression tests
Index: distinfo
===
RCS file: /cvs/ports/security/gpgme/distinfo,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 distinfo
--- distinfo2 Dec 2017 12:44:33 -   1.13
+++ distinfo19 Mar 2018 16:30:17 -
@@ -1,2 +1,2 @@
-SHA256 (gpgme-1.9.0.tar.bz2) = Gyn+24v613XnDq+sWwWQYhaDstmGnbmUVo5kAfQDTOs=
-SIZE (gpgme-1.9.0.tar.bz2) = 1344222
+SHA256 (gpgme-1.10.0.tar.bz2) = Go/tEZfDuZw19AMGa7NEomIk0pKvwEjP38TM1WkKBpM=
+SIZE (gpgme-1.10.0.tar.bz2) = 1370162

Re: Update devel/tkcvs from 6.0 to 8.2.3

[Todd T. Fries]

Feel free to take maintainership also, I'm not using this anymore.

Thanks,

Penned by Stuart Henderson on 20180319  5:35.24, we have:
| On 2018/03/18 21:25, Currell Berry wrote:
| > Thank you for your help -- here is another revision of the patches --
| > the first one for tkcvs and the second one for kde4/dev-scripts.
| 
| There's not much point including a copy of tkdiff here, it's identical
| to the standalone one. Let's remove it in favour of a dep and get rid
| of the conflict.
| 
| Couple of other tweaks: rewrap DESCR (no more lines but flows better),
| put HOMEPAGE in the normal place, use https, drop the "only" from
| license information as it's not clear in the distfile (it's not done
| correctly anyway as there's no copyright assignment but at least the
| intent is clear - and v6.0 that we have in tree has nothing in the
| distfile at all except for a small piece of code reused from something
| else so what's in-tree now is wrong for sure).
| 
| 
| 
| Index: devel/tkcvs/Makefile
| ===
| RCS file: /cvs/ports/devel/tkcvs/Makefile,v
| retrieving revision 1.33
| diff -u -p -r1.33 Makefile
| --- devel/tkcvs/Makefile  22 Jan 2015 18:41:16 -  1.33
| +++ devel/tkcvs/Makefile  19 Mar 2018 10:26:33 -
| @@ -1,28 +1,30 @@
|  # $OpenBSD: Makefile,v 1.33 2015/01/22 18:41:16 naddy Exp $
|  
|  COMMENT= graphical frontend to CVS
| -DISTNAME=tkcvs-6.0
| -REVISION =   5
| +DISTNAME=tkcvs-8.2.3
|  CATEGORIES=  devel
|  
| +HOMEPAGE=https://www.twobarleycorns.net/tkcvs.html
| +
|  MAINTAINER=  Todd T. Fries <t...@openbsd.org>
|  
| +# GPLv2
|  PERMIT_PACKAGE_CDROM=Yes
|  
| -MASTER_SITES=
http://www.neosoft.com/tcl/ftparchive/sorted/packages-7.6/apps/tkcvs-6.0/
| +MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=tkcvs/} \
| + https://www.twobarleycorns.net/
|  
|  MODULES= x11/tk
| -RUN_DEPENDS= ${MODTK_RUN_DEPENDS}
| -BUILD_DEPENDS=   ${RUN_DEPENDS}
| +BUILD_DEPENDS=   ${MODTK_RUN_DEPENDS}
| +RUN_DEPENDS= ${MODTK_RUN_DEPENDS} \
| + devel/tkdiff
|  
|  NO_BUILD=Yes
|  NO_TEST= Yes
|  
| -pre-configure:
| - @${MODTCL_TCLSH_ADJ} ${WRKSRC}/tkcvs/cvscheck.blank
| - @${SUBST_CMD} ${WRKSRC}/tkcvs/doinstall
| -
|  do-install:
| - cd $(WRKSRC)/tkcvs; ./doinstall
| + cd ${WRKSRC} && $(MODTCL_BIN) ./doinstall.tcl -nox ${PREFIX}
| + rm ${PREFIX}/bin/tkdiff
| + cd ${PREFIX}/bin && ${MODTCL_WISH_ADJ} tkcvs
|  
|  .include 
| Index: devel/tkcvs/distinfo
| ===
| RCS file: /cvs/ports/devel/tkcvs/distinfo,v
| retrieving revision 1.4
| diff -u -p -r1.4 distinfo
| --- devel/tkcvs/distinfo  18 Jan 2015 03:13:48 -  1.4
| +++ devel/tkcvs/distinfo  19 Mar 2018 10:26:33 -
| @@ -1,2 +1,2 @@
| -SHA256 (tkcvs-6.0.tar.gz) = PfT5mVOrZD5/mxg6zDHNJbt5CpKdlgKePwl+XhH4KXI=
| -SIZE (tkcvs-6.0.tar.gz) = 102022
| +SHA256 (tkcvs-8.2.3.tar.gz) = S/sp3Z/7u8Hm5hHhx3KvdF10LTNueXvwVtv3ARa44yo=
| +SIZE (tkcvs-8.2.3.tar.gz) = 570910
| Index: devel/tkcvs/patches/patch-tkcvs_cvs_tcl
| ===
| RCS file: devel/tkcvs/patches/patch-tkcvs_cvs_tcl
| diff -N devel/tkcvs/patches/patch-tkcvs_cvs_tcl
| --- devel/tkcvs/patches/patch-tkcvs_cvs_tcl   26 Oct 2007 20:44:35 -  
1.1
| +++ /dev/null 1 Jan 1970 00:00:00 -
| @@ -1,12 +0,0 @@
| -$OpenBSD: patch-tkcvs_cvs_tcl,v 1.1 2007/10/26 20:44:35 ajacoutot Exp $
|  tkcvs/cvs.tcl.orig   Sat May 25 04:54:58 1996
| -+++ tkcvs/cvs.tclFri Oct 26 22:41:28 2007
| -@@ -285,7 +285,7 @@ proc cvs_commit {revision comment args} {
| -   # -sj
| -   set errstr "You must select files to be committed with CVS version"
| -   set errstr "$errstr $cvscfg(cvsver)."
| --  set errstr "$errstr\n\nEither select a list of files or upgrade
| -+  set errstr "$errstr\n\nEither select a list of files or upgrade"
| -   set errstr "$errstr your CVS to version 1.3"
| -   cvserror "$errstr"
| -   return
| Index: devel/tkcvs/patches/patch-tkcvs_doinstall
| ===
| RCS file: devel/tkcvs/patches/patch-tkcvs_doinstall
| diff -N devel/tkcvs/patches/patch-tkcvs_doinstall
| --- devel/tkcvs/patches/patch-tkcvs_doinstall 13 Mar 2009 13:36:57 -  
1.2
| +++ /dev/null 1 Jan 1970 00:00:00 -
| @@ -1,131 +0,0 @@
| -$OpenBSD: patch-tkcvs_doinstall,v 1.2 2009/03/13 13:36:57 sthen Exp $
|  tkcvs/doinstall.orig Tue Jan  9 21:17:52 1996
| -+++ tkcvs/doinstall  Fri Mar 13 13:28:27 2009
| -@@ -2,39 +2,32 @@
| - #
| - # $Id: patch-tkcvs_doinstall,v 1.2 2009/03/13 13:36:57 sthen Exp $
| - #
| --
| -+PATH=/bin:/usr/bin:/sbin:/usr/sbin:${LOCALBASE}/bin
| - # Some rational and reasonable defaults.
| - 
| --INSTALLDIR=/usr/local/lib

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/03/19 09:39:41

Modified files:
x11/gnome/calendar: Makefile distinfo 

Log message:
update to gnome-calendar-3.26.4

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/03/19 09:36:13

Modified files:
mail/rspamd: Makefile distinfo 
mail/rspamd/patches: patch-CMakeLists_txt 
 patch-contrib_libottery_CMakeLists_txt 
 patch-contrib_zstd_CMakeLists_txt 
 patch-src_client_CMakeLists_txt 
 patch-src_rspamadm_CMakeLists_txt 
mail/rspamd/pkg: PLIST 
Added files:
mail/rspamd/patches: 
 patch-contrib_torch_torch7_lib_TH_THGeneral_c 

Log message:
update to rspamd-1.7.0, https://rspamd.com/announce/2018/03/12/rspamd-1.7.0.html

CVS: cvs.openbsd.org: ports

[Robert Nagy]

CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2018/03/19 09:12:20

Modified files:
lang/mono  : Makefile distinfo 
lang/mono/patches: patch-configure patch-mono_mini_main_c 
lang/mono/pkg  : PLIST 
Added files:
lang/mono/patches: patch-mono_utils_mono-context_h 
   patch-mono_utils_mono-threads-posix-signals_c 

Log message:
- update to 5.10.0.160

- apply a patch from Thomas Frohwein:
Use SIGUSR1 as the abort signal in mono instead of SIGTTIN,
because SIGTTIN gets delivered to all processes/threads and
that is not what we want here.

The port is still broken though, so leaving it as BROKEN.

Re: NEW: devel/qp

[Aaron Bieber]

On Mon, Mar 19, 2018 at 12:01:20AM -0600, Anthony J. Bentley wrote:
> On Mon, Feb 26, 2018 at 2:18 AM, Anthony J. Bentley  
> wrote:
> > On Wed, Feb 14, 2018 at 2:11 AM, Anthony J. Bentley  
> > wrote:
> >> On Sat, Jan 27, 2018 at 8:12 PM, Anthony J. Bentley  
> >> wrote:
> >>> On Fri, Jan 5, 2018 at 2:27 AM, Anthony J. Bentley  
> >>> wrote:
>  QP/C (Quantum Platform in C) is a lightweight, open source software
>  framework/RTOS for building reactive real-time embedded applications as
>  systems of cooperating, event-driven active objects (actors). The QP/C
>  framework is a member of a larger QP family consisting of QP/C, QP/C++, 
>  and
>  QP-nano frameworks, which are all strictly quality controlled, thoroughly
>  documented, and commercially licensable.
> 
> 
>  This port includes QP/C and QP/C++, but not QP-nano, as it doesn't
>  include a POSIX port like the others.
> 
>  I've seen this framework used in several embedded projects. If you
>  want to test it, there are some simple examples (which don't make
>  sense to install) under examples/posix that you can compile with
>  "gmake INCLUDES=-I/usr/local/include/qpc" (or qpcpp).
> 
>  ok?
>
> Anyone?

Builds and installs fine here. OK abieber@

--
PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A  4AF0 1F81 112D 62A9 ADCE

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/03/19 07:40:34

Modified files:
geo/qgis   : Makefile distinfo 
geo/qgis/pkg   : PLIST 

Log message:
Update to qgis 2.18.17.

Add py-jinja2 & py-pygments to RDEP for MetaSearch plugin, reported by
Loic Bartoletti (thanks!)

CVS: cvs.openbsd.org: ports

[Pascal Stumpf]

CVSROOT:/cvs
Module name:ports
Changes by: pas...@cvs.openbsd.org  2018/03/19 05:01:57

Modified files:
net/tor: Tag: OPENBSD_6_2 Makefile distinfo 
net/tor/patches: Tag: OPENBSD_6_2 
 patch-src_config_torrc_sample_in 

Log message:
Update -stable tor to 0.3.2.10, as there are no more security updates for
the 0.3.0.x series.

This update fixes TROVE-2018-001 through 004.

ok kn@

Re: Update devel/tkcvs from 6.0 to 8.2.3

[Stuart Henderson]

On 2018/03/18 21:25, Currell Berry wrote:
> Thank you for your help -- here is another revision of the patches --
> the first one for tkcvs and the second one for kde4/dev-scripts.

There's not much point including a copy of tkdiff here, it's identical
to the standalone one. Let's remove it in favour of a dep and get rid
of the conflict.

Couple of other tweaks: rewrap DESCR (no more lines but flows better),
put HOMEPAGE in the normal place, use https, drop the "only" from
license information as it's not clear in the distfile (it's not done
correctly anyway as there's no copyright assignment but at least the
intent is clear - and v6.0 that we have in tree has nothing in the
distfile at all except for a small piece of code reused from something
else so what's in-tree now is wrong for sure).



Index: devel/tkcvs/Makefile
===
RCS file: /cvs/ports/devel/tkcvs/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- devel/tkcvs/Makefile22 Jan 2015 18:41:16 -  1.33
+++ devel/tkcvs/Makefile19 Mar 2018 10:26:33 -
@@ -1,28 +1,30 @@
 # $OpenBSD: Makefile,v 1.33 2015/01/22 18:41:16 naddy Exp $
 
 COMMENT=   graphical frontend to CVS
-DISTNAME=  tkcvs-6.0
-REVISION = 5
+DISTNAME=  tkcvs-8.2.3
 CATEGORIES=devel
 
+HOMEPAGE=  https://www.twobarleycorns.net/tkcvs.html
+
 MAINTAINER=Todd T. Fries 
 
+# GPLv2
 PERMIT_PACKAGE_CDROM=  Yes
 
-MASTER_SITES=  
http://www.neosoft.com/tcl/ftparchive/sorted/packages-7.6/apps/tkcvs-6.0/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=tkcvs/} \
+   https://www.twobarleycorns.net/
 
 MODULES=   x11/tk
-RUN_DEPENDS=   ${MODTK_RUN_DEPENDS}
-BUILD_DEPENDS= ${RUN_DEPENDS}
+BUILD_DEPENDS= ${MODTK_RUN_DEPENDS}
+RUN_DEPENDS=   ${MODTK_RUN_DEPENDS} \
+   devel/tkdiff
 
 NO_BUILD=  Yes
 NO_TEST=   Yes
 
-pre-configure:
-   @${MODTCL_TCLSH_ADJ} ${WRKSRC}/tkcvs/cvscheck.blank
-   @${SUBST_CMD} ${WRKSRC}/tkcvs/doinstall
-
 do-install:
-   cd $(WRKSRC)/tkcvs; ./doinstall
+   cd ${WRKSRC} && $(MODTCL_BIN) ./doinstall.tcl -nox ${PREFIX}
+   rm ${PREFIX}/bin/tkdiff
+   cd ${PREFIX}/bin && ${MODTCL_WISH_ADJ} tkcvs
 
 .include 
Index: devel/tkcvs/distinfo
===
RCS file: /cvs/ports/devel/tkcvs/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- devel/tkcvs/distinfo18 Jan 2015 03:13:48 -  1.4
+++ devel/tkcvs/distinfo19 Mar 2018 10:26:33 -
@@ -1,2 +1,2 @@
-SHA256 (tkcvs-6.0.tar.gz) = PfT5mVOrZD5/mxg6zDHNJbt5CpKdlgKePwl+XhH4KXI=
-SIZE (tkcvs-6.0.tar.gz) = 102022
+SHA256 (tkcvs-8.2.3.tar.gz) = S/sp3Z/7u8Hm5hHhx3KvdF10LTNueXvwVtv3ARa44yo=
+SIZE (tkcvs-8.2.3.tar.gz) = 570910
Index: devel/tkcvs/patches/patch-tkcvs_cvs_tcl
===
RCS file: devel/tkcvs/patches/patch-tkcvs_cvs_tcl
diff -N devel/tkcvs/patches/patch-tkcvs_cvs_tcl
--- devel/tkcvs/patches/patch-tkcvs_cvs_tcl 26 Oct 2007 20:44:35 -  
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-tkcvs_cvs_tcl,v 1.1 2007/10/26 20:44:35 ajacoutot Exp $
 tkcvs/cvs.tcl.orig Sat May 25 04:54:58 1996
-+++ tkcvs/cvs.tcl  Fri Oct 26 22:41:28 2007
-@@ -285,7 +285,7 @@ proc cvs_commit {revision comment args} {
-   # -sj
-   set errstr "You must select files to be committed with CVS version"
-   set errstr "$errstr $cvscfg(cvsver)."
--  set errstr "$errstr\n\nEither select a list of files or upgrade
-+  set errstr "$errstr\n\nEither select a list of files or upgrade"
-   set errstr "$errstr your CVS to version 1.3"
-   cvserror "$errstr"
-   return
Index: devel/tkcvs/patches/patch-tkcvs_doinstall
===
RCS file: devel/tkcvs/patches/patch-tkcvs_doinstall
diff -N devel/tkcvs/patches/patch-tkcvs_doinstall
--- devel/tkcvs/patches/patch-tkcvs_doinstall   13 Mar 2009 13:36:57 -  
1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,131 +0,0 @@
-$OpenBSD: patch-tkcvs_doinstall,v 1.2 2009/03/13 13:36:57 sthen Exp $
 tkcvs/doinstall.orig   Tue Jan  9 21:17:52 1996
-+++ tkcvs/doinstallFri Mar 13 13:28:27 2009
-@@ -2,39 +2,32 @@
- #
- # $Id: patch-tkcvs_doinstall,v 1.2 2009/03/13 13:36:57 sthen Exp $
- #
--
-+PATH=/bin:/usr/bin:/sbin:/usr/sbin:${LOCALBASE}/bin
- # Some rational and reasonable defaults.
- 
--INSTALLDIR=/usr/local/lib
--BINDIR=/usr/local/bin
--MANDIR=/usr/local/man/mann
-+INSTALLDIR=${LOCALBASE}/libdata
-+BINDIR=${LOCALBASE}/bin
-+MANDIR=${LOCALBASE}/man/mann
- 
- INSTALL_PROG=./install-sh
- 
- # This must be an X based editor -- do NOT use vi except via an xterm
- # or shelltool.
- 
--EDITOR=nedit
-+EDITOR=xedit
- 
- # Find a Tk interpreter.
-  
--WISH=`which wish4.0`
--if [ ! -f $WISH ]; then
--  WISH=`which wish4.1`
--fi
--if [ ! -f $WISH ]; 

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/03/19 02:56:24

Modified files:
security/libhttpseverywhere: Makefile distinfo 

Log message:
Update to libhttpseverywhere-0.8.2.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/03/19 02:44:54

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

Log message:
Bump version.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/03/19 02:13:15

Modified files:
www/webkitgtk4 : Makefile distinfo 
www/webkitgtk4/patches: patch-CMakeLists_txt 

patch-Source_JavaScriptCore_assembler_ARMAssembler_h 

patch-Source_JavaScriptCore_assembler_MacroAssemblerX86Common_h 

patch-Source_JavaScriptCore_javascriptcoregtk_pc_in 

patch-Source_JavaScriptCore_runtime_MachineContext_h 
patch-Source_WTF_wtf_InlineASM_h 
patch-Source_WTF_wtf_Platform_h 
patch-Source_WTF_wtf_dtoa_utils_h 
patch-Source_WebCore_PAL_pal_CMakeLists_txt 
patch-Source_WebDriver_CMakeLists_txt 

patch-Source_WebKit_Shared_Plugins_unix_PluginSearchPath_cpp 

patch-Source_WebKit_gtk_webkit2gtk-web-extension_pc_in 
patch-Source_WebKit_gtk_webkit2gtk_pc_in 
patch-Source_cmake_WebKitCommon_cmake 
patch-Source_cmake_WebKitCompilerFlags_cmake 
www/webkitgtk4/pkg: PLIST 
Removed files:
www/webkitgtk4/patches: 
patch-Source_JavaScriptCore_CMakeLists_txt 

Log message:
Update to webkitgtk4-2.20.0.
- this will allow us to provide WebKit security updates for 6.3

tested in a bulk and I've been running with this for a few days

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/03/19 01:50:52

Modified files:
x11/xfce4/xfce4-settings: Makefile distinfo 
x11/xfce4/xfce4-settings/pkg: PLIST 

Log message:
Update to xfce4-settings 4.12.3.

Re: NEW: devel/qp

[Anthony J. Bentley]

On Mon, Feb 26, 2018 at 2:18 AM, Anthony J. Bentley  wrote:
> On Wed, Feb 14, 2018 at 2:11 AM, Anthony J. Bentley  
> wrote:
>> On Sat, Jan 27, 2018 at 8:12 PM, Anthony J. Bentley  
>> wrote:
>>> On Fri, Jan 5, 2018 at 2:27 AM, Anthony J. Bentley  
>>> wrote:
 QP/C (Quantum Platform in C) is a lightweight, open source software
 framework/RTOS for building reactive real-time embedded applications as
 systems of cooperating, event-driven active objects (actors). The QP/C
 framework is a member of a larger QP family consisting of QP/C, QP/C++, and
 QP-nano frameworks, which are all strictly quality controlled, thoroughly
 documented, and commercially licensable.


 This port includes QP/C and QP/C++, but not QP-nano, as it doesn't
 include a POSIX port like the others.

 I've seen this framework used in several embedded projects. If you
 want to test it, there are some simple examples (which don't make
 sense to install) under examples/posix that you can compile with
 "gmake INCLUDES=-I/usr/local/include/qpc" (or qpcpp).

 ok?

Anyone?


qp.tar.gz
Description: application/gzip