Re: sysutils/opam: use -full source tree including all dependencies.
And ok avsm@.
> On 11 Mar 2019, at 22:01, kwesterb...@gmail.com wrote:
>
> This is ok krw@.
>
> Ken
>
>> On Mar 11, 2019, at 5:29 PM, Christopher Zimmermann
>> wrote:
>>
>> On Mon, 11 Mar 2019 17:08:45 -0400
>> Kenneth R Westerback wrote:
>>
>>> I like this, but I am slightly confused -- did I miss the commit to
>>> switch opam to -full? I would assume we'd want to do that first, no?
>>
>> oops, I somehow asserted this was already committed. So of course I'd
>> like to commit this first. OKs for change?
>>
>> Christopher
>>
>>
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/sysutils/opam/Makefile,v
>> retrieving revision 1.10
>> diff -u -p -r1.10 Makefile
>> --- Makefile4 Mar 2019 12:51:16 -1.10
>> +++ Makefile11 Mar 2019 21:26:24 -
>> @@ -4,24 +4,12 @@ COMMENT =OCaml source-based package ma
>>
>> CATEGORIES =sysutils devel
>>
>> -# opam version
>> V =2.0.3
>> -# opam file format version
>> -OFFV =2.0.0
>> -MCSS =1.1+9
>> -#GH_ACCOUNT =ocaml
>> -GH_PROJECT =opam
>> -#GH_TAGNAME =${V}
>> -DISTNAME =${GH_PROJECT}-${V}
>> -
>> -DISTFILES +=opam-${V}.tar.gz:0
>> -MASTER_SITES0 =https://github.com/ocaml/opam/archive/${V}/
>> -DISTFILES +=opam-file-format-${OFFV}.tar.gz:1
>> -MASTER_SITES1 =
>> https://github.com/ocaml/opam-file-format/archive/${OFFV}/
>> -DISTFILES +=ocaml-mccs-${MCSS}.tar.gz:2
>> -MASTER_SITES2 =https://github.com/AltGr/ocaml-mccs/archive/${MCSS}/
>> -
>> +REVISION =0
>> PKGNAME =opam-${V}
>> +DISTNAME =opam-full-${V}
>> +
>> +MASTER_SITES =https://github.com/ocaml/opam/releases/download/${V}/
>>
>> HOMEPAGE =https://opam.ocaml.org/
>>
>> @@ -34,16 +22,7 @@ WANTLIB =${COMPILER_LIBCXX} c m
>>
>> #MODULES =lang/ocaml
>>
>> -BUILD_DEPENDS =lang/ocaml \
>> -devel/dune \
>> -sysutils/findlib \
>> -devel/ocaml-cppo \
>> -devel/cudf,-ocaml>=0.7 \
>> -devel/ocaml-cmdliner>=0.9.8 \
>> -devel/ocaml-dose>=5 \
>> -devel/ocaml-graph \
>> -devel/ocaml-re>=1.5.0 \
>> -net/curl # TODO: remove this dep and patch build system
>> +BUILD_DEPENDS =lang/ocaml
>>
>> RUN_DEPENDS =archivers/unzip \
>> archivers/bzip2 \
>> @@ -54,7 +33,11 @@ RUN_DEPENDS =archivers/unzip \
>>
>> USE_GMAKE =Yes
>>
>> -CONFIGURE_STYLE =gnu
>> +CONFIGURE_ENV +=CFLAGS="${CFLAGS}" \
>> +LDFLAGS="${LDFLAGS}" \
>> +CC=cc
>> +CONFIGURE_STYLE =gnu autoconf no-autoheader
>> +AUTOCONF_VERSION =2.69
>>
>> ALL_TARGET =lib-ext all man #doc requires odoc
>> INSTALL_TARGET =install
>> @@ -62,13 +45,8 @@ TEST_TARGET =tests
>>
>> docdir =${PREFIX}/share/doc/opam
>>
>> -
>> -pre-patch:
>> -ln -s${FULLDISTDIR}/opam-file-format-${OFFV}.tar.gz \
>> -${WRKSRC}/src_ext/opam-file-format.tar.gz
>> -ln -s${FULLDISTDIR}/ocaml-mccs-${MCSS}.tar.gz \
>> -${WRKSRC}/src_ext/mccs.tar.gz
>> -touch
>> ${WRKSRC}/src_ext/{mccs,opam-file-format}.{download,pkgdownload}
>> +#pre-configure:
>> +#cd ${WRKSRC} && env ${CONFIGURE_ENV} ${GMAKE} compiler
>>
>> post-install:
>> mv${PREFIX}/doc/opam-installer \
>> Index: distinfo
>> ===
>> RCS file: /cvs/ports/sysutils/opam/distinfo,v
>> retrieving revision 1.3
>> diff -u -p -r1.3 distinfo
>> --- distinfo4 Mar 2019 12:51:16 -1.3
>> +++ distinfo11 Mar 2019 21:26:24 -
>> @@ -1,6 +1,2 @@
>> -SHA256 (ocaml-mccs-1.1+9.tar.gz) =
>> G3rkvRs0n8JMU2k9cApg39qaO86VTZMaZ703WQwzyD0=
>> -SHA256 (opam-2.0.3.tar.gz) = zMbAl7vPMZDZGW4T1l9pwZuKHdZJ/V1wsbrhsSDuhzk=
>> -SHA256 (opam-file-format-2.0.0.tar.gz) =
>> FSUt8u24K//CCplXyzdkV0srp0g5K7NObJHGeHIyXDI=
>> -SIZE (ocaml-mccs-1.1+9.tar.gz) = 1008737
>> -SIZE (opam-2.0.3.tar.gz) = 626720
>> -SIZE (opam-file-format-2.0.0.tar.gz) = 31419
>> +SHA256 (opam-full-2.0.3.tar.gz) =
>> BYnaTaGEWEpURdWThQCVNlNPYLwOJ3ciRbL0nl+o8OI=
>> +SIZE (opam-full-2.0.3.tar.gz) = 7870020
>> Index: patches/patch-m4_ocaml_m4
>> ===
>> RCS file: patches/patch-m4_ocaml_m4
>> diff -N patches/patch-m4_ocaml_m4
>> --- /dev/null1 Jan 1970 00:00:00 -
>> +++ patches/patch-m4_ocaml_m411 Mar 2019 21:26:24 -
>> @@ -0,0 +1,16 @@
>> +$OpenBSD$
>> +
>> +do not detect any installed findlib library.
>> +
>> +Index: m4/ocaml.m4
>> +--- m4/ocaml.m4.orig
>> m4/ocaml.m4
>> +@@ -209,7 +209,7 @@ AC_DEFUN([AC_CHECK_OCAML_PKG],
>> + unset pkg
>> + found=no
>> + for pkg in $1 $2 ; do
>> +-if $OCAMLFIND query $pkg >/dev/null 2>/dev/null; then
>> ++if false; then
>> + AC_MSG_RESULT([found])
>> +
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: chr...@cvs.openbsd.org 2019/03/11 23:36:06 Modified files: sysutils/opam : Makefile distinfo Added files: sysutils/opam/patches: patch-m4_ocaml_m4 patch-shell_bootstrap-ocaml_sh Removed files: sysutils/opam/patches: patch-src_ext_Makefile Log message: Use the -full source distribution, which includes the (partly patched) dependencies of opam. This will make maintenance easier. OK krw@, avsm@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2019/03/11 22:21:56 Modified files: security/libb2 : Makefile distinfo security/libb2/patches: patch-configure_ac security/libb2/pkg: PLIST Log message: Update to libb2-0.98.1. Various minor fixes, and addition of a pkg-config file.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2019/03/11 21:55:25 Modified files: net/wireshark : Makefile Log message: https homepage/master_sites.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: afre...@cvs.openbsd.org 2019/03/11 21:21:53 Modified files: devel/p5-Class-Unload: Makefile distinfo Log message: Update devel/p5-Class-Unload to 0.11
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2019/03/11 20:57:24 Modified files: textproc/apertium-dicts/nno: Makefile distinfo textproc/apertium-dicts/nno/pkg: PLIST textproc/apertium-dicts/nob: Makefile distinfo textproc/apertium-dicts/nob/pkg: PLIST textproc/apertium-dicts/dan: Makefile distinfo textproc/apertium-dicts/dan/pkg: PLIST textproc/apertium-dicts/nno-nob: Makefile distinfo textproc/apertium-dicts/nno-nob/pkg: PLIST textproc/apertium-dicts/dan-nor: Makefile distinfo textproc/apertium-dicts/dan-nor/pkg: PLIST Removed files: textproc/apertium-dicts/nno/patches: patch-apertium-nno_nno_rlx Log message: Update the Scandinavian apertium pairs to the latest versions. (Except Swedish, which I apparently neglected to port previously.)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: afre...@cvs.openbsd.org 2019/03/11 20:29:40 Modified files: devel/p5-Class-Inspector: Makefile distinfo Log message: Update devel/p5-Class-Inspector to 1.32
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2019/03/11 20:28:31 Modified files: textproc/apertium-dicts/cat-srd: Makefile textproc/apertium-dicts/arg-cat: Makefile Log message: Bump after apertium-cat update.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2019/03/11 20:28:06 Modified files: textproc/apertium-dicts/fra-cat: Makefile distinfo textproc/apertium-dicts/fra-cat/pkg: PLIST textproc/apertium-dicts/fra: Makefile distinfo textproc/apertium-dicts/cat: Makefile distinfo textproc/apertium-dicts/cat/pkg: PLIST Log message: Update to apertium-fra-cat-1.5.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: afre...@cvs.openbsd.org 2019/03/11 20:26:50 Modified files: devel/p5-Params-Validate: Makefile distinfo Log message: Update devel/p5-Params-Validate to 1.29
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: afre...@cvs.openbsd.org 2019/03/11 20:24:01 Modified files: devel/p5-Role-Tiny: Makefile distinfo Log message: Update devel/p5-Role-Tiny to 2.06 OK MAINTAINER Sergey Bronnikov
Delete print/ghostview
Hi,
ghostview hasn't been updated since its import 21 years ago.
There's no homepage and the distfile is no longer available on the
GNU mirrors.
DESCR proclaims its ability to parse Adobe documents, etc. Given the
generally poor quality of C code 20 years ago, and the number of
high-profile GhostScript vulnerabilities in the meantime, and the many
alternative PostScript viewers like gv, and evince, I'd like to remove
this "full function user interface for ghostscript 2.4 and later."
ok?
Index: Makefile
===
RCS file: /cvs/ports/print/Makefile,v
retrieving revision 1.127
diff -u -p -r1.127 Makefile
--- Makefile26 Dec 2018 10:05:37 - 1.127
+++ Makefile12 Mar 2019 01:58:51 -
@@ -25,7 +25,6 @@
SUBDIR += foomatic-db-engine
SUBDIR += freetype
SUBDIR += ghostscript
-SUBDIR += ghostview
SUBDIR += gl2ps
SUBDIR += gtklp
SUBDIR += gutenprint
Index: ghostview/Makefile
===
RCS file: ghostview/Makefile
diff -N ghostview/Makefile
--- ghostview/Makefile 23 Oct 2017 17:11:02 - 1.30
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,21 +0,0 @@
-# $OpenBSD: Makefile,v 1.30 2017/10/23 17:11:02 sthen Exp $
-
-COMMENT= X11 front-end for ghostscript
-
-DISTNAME= ghostview-1.5
-REVISION= 6
-CATEGORIES=print
-
-MASTER_SITES= ${MASTER_SITE_GNU:=ghostview/}
-
-# GPLv2+
-PERMIT_PACKAGE_CDROM= Yes
-
-WANTLIB += ICE SM X11 Xau Xaw Xdmcp Xext Xmu Xpm Xt c m xcb
-
-RUN_DEPENDS=print/ghostscript/gnu
-
-CONFIGURE_STYLE=imake
-NO_TEST= Yes
-
-.include
Index: ghostview/distinfo
===
RCS file: ghostview/distinfo
diff -N ghostview/distinfo
--- ghostview/distinfo 18 Jan 2015 03:14:57 - 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,2 +0,0 @@
-SHA256 (ghostview-1.5.tar.gz) = VseWgIXsGWwM1SAmOC3vKgc8hGJiBV0PIaFqdQotOUU=
-SIZE (ghostview-1.5.tar.gz) = 139742
Index: ghostview/patches/patch-Dir_c
===
RCS file: ghostview/patches/patch-Dir_c
diff -N ghostview/patches/patch-Dir_c
--- ghostview/patches/patch-Dir_c 26 Apr 2002 01:44:08 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-$OpenBSD: patch-Dir_c,v 1.1 2002/04/26 01:44:08 espie Exp $
Dir.c.orig Fri Apr 26 02:40:50 2002
-+++ Dir.c Fri Apr 26 02:41:05 2002
-@@ -25,6 +25,7 @@
- */
-
- #include
-+#include
-
- #ifdef SEL_FILE_IGNORE_CASE
- #include
Index: ghostview/patches/patch-Draw_c
===
RCS file: ghostview/patches/patch-Draw_c
diff -N ghostview/patches/patch-Draw_c
--- ghostview/patches/patch-Draw_c 26 Apr 2002 01:44:08 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,298 +0,0 @@
-$OpenBSD: patch-Draw_c,v 1.1 2002/04/26 01:44:08 espie Exp $
Draw.c.origSat Jul 24 04:29:12 1993
-+++ Draw.c Fri Apr 26 03:39:01 2002
-@@ -30,6 +30,7 @@
- #include
- #include
- #include
-+#include "gv.h"
-
- #define SF_DEFAULT_FONT "9x15"
-
-@@ -59,6 +60,8 @@ static int SFcurrentListY;
-
- static XtIntervalId SFscrollTimerId;
-
-+
-+void
- SFinitFont()
- {
- TextData*data;
-@@ -86,6 +89,7 @@ SFinitFont()
- SFcharHeight = SFcharAscent + SFfont->max_bounds.descent;
- }
-
-+void
- SFcreateGC()
- {
- XGCValues gcValues;
-@@ -151,6 +155,7 @@ SFcreateGC()
- );
- }
-
-+void
- SFclearList(n, doScroll)
- int n;
- int doScroll;
-@@ -193,7 +198,7 @@ SFclearList(n, doScroll)
- }
- }
-
--static
-+static void
- SFdeleteEntry(dir, entry)
- SFDir *dir;
- SFEntry *entry;
-@@ -244,7 +249,7 @@ SFdeleteEntry(dir, entry)
- );
- }
-
--static
-+static void
- SFwriteStatChar(name, last, statBuf)
- char*name;
- int last;
-@@ -320,7 +325,7 @@ SFstatAndCheck(dir, entry)
- return 0;
- }
-
--static
-+static void
- SFdrawStrings(w, dir, from, to)
- register Window w;
- register SFDir *dir;
-@@ -397,6 +402,7 @@ SFdrawStrings(w, dir, from, to)
- }
- }
-
-+void
- SFdrawList(n, doScroll)
- int n;
- int doScroll;
-@@ -422,6 +428,7 @@ SFdrawList(n, doScroll)
- }
- }
-
-+void
- SFdrawLists(doScroll)
- int doScroll;
- {
-@@ -432,7 +439,7 @@ SFdrawLists(doScroll)
- }
- }
-
--static
-+static void
- SFinvertEntry(n)
- register intn;
- {
-@@ -486,19 +493,19 @@ SFscrollTimer(p, id)
- int save;
- int n;
-
--n = (int) p;
-+n = * ((int *) p);
-
- dir = &(SFdirs[SFdirPtr + n]);
- save = dir->vOrigin;
-
- if (SFcurrentListY < SFlowerY) {
- if (dir->vOrigin > 0) {
-- SFvSliderMovedCallback(selFileVScrolls[n], n,
-+
Delete sysutils/upsd
Hi,
upsd hasn't had any updates since it was imported nearly 20 years ago.
No homepage or master_sites either, and packages aren't built due to
restrictive PERMIT_*.
It doesn't seem sensible to keep this around, if apcupsd (for example)
serves the same purpose without the issues.
ok to remove this?
Index: Makefile
===
RCS file: /cvs/ports/sysutils/Makefile,v
retrieving revision 1.517
diff -u -p -r1.517 Makefile
--- Makefile22 Feb 2019 16:43:27 - 1.517
+++ Makefile12 Mar 2019 01:30:39 -
@@ -363,7 +363,6 @@
SUBDIR += udfclient
SUBDIR += upower
SUBDIR += upobsd
- SUBDIR += upsd
SUBDIR += upt
SUBDIR += uptimed
SUBDIR += usbutil
Index: upsd/Makefile
===
RCS file: upsd/Makefile
diff -N upsd/Makefile
--- upsd/Makefile 21 Jan 2015 06:23:35 - 1.20
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,27 +0,0 @@
-# $OpenBSD: Makefile,v 1.20 2015/01/21 06:23:35 bentley Exp $
-
-COMMENT= APC Smart UPS Monitoring Daemon
-
-DISTNAME= upsd-2.0.1.6
-CATEGORIES=sysutils
-REVISION = 0
-
-PERMIT_PACKAGE_CDROM= missing license
-PERMIT_PACKAGE_FTP=missing license
-PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c
-
-WRKDIST= ${WRKDIR}/${DISTNAME:C,\.[0-9]+\.[0-9]+$,,}
-
-pre-build:
- @perl -pi -e 's:%%SYSCONFDIR%%:${SYSCONFDIR}:' \
- ${WRKSRC}/config.h
- @mv ${WRKSRC}/config.h ${WRKSRC}/conf.h.orig
- @sed -e "s!@prefix@!${PREFIX}!g" ${WRKSRC}/conf.h.orig >
${WRKSRC}/conf.h
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKBUILD}/upsd ${PREFIX}/sbin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/upsd
- ${INSTALL_DATA} ${WRKSRC}/sample/upsd.conf
${PREFIX}/share/examples/upsd/upsd.conf-sample
-
-.include
Index: upsd/distinfo
===
RCS file: upsd/distinfo
diff -N upsd/distinfo
--- upsd/distinfo 18 Jan 2015 03:15:16 - 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,2 +0,0 @@
-SHA256 (upsd-2.0.1.6.tar.gz) = 4xEDuaiV+VsbGw9Q0+JaQxV4N0yCGrT4Cm6atF+OOrM=
-SIZE (upsd-2.0.1.6.tar.gz) = 23757
Index: upsd/patches/patch-Makefile
===
RCS file: upsd/patches/patch-Makefile
diff -N upsd/patches/patch-Makefile
--- upsd/patches/patch-Makefile 5 Aug 2002 02:25:30 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1 2002/08/05 02:25:30 kevlo Exp $
Makefile.orig Fri Aug 2 21:44:24 1996
-+++ Makefile Mon Aug 5 10:01:35 2002
-@@ -8,8 +8,7 @@
-
- PROG= upsd
-
--BINDIR= /usr/local/sbin
--MANDIR= /usr/local/share/man
-+BINDIR= ${PREFIX}/sbin
- NOMAN=noway
-
- #DEBUG= -g -DDEBUG
Index: upsd/patches/patch-apc_c
===
RCS file: upsd/patches/patch-apc_c
diff -N upsd/patches/patch-apc_c
--- upsd/patches/patch-apc_c5 Aug 2002 02:25:30 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,18 +0,0 @@
-$OpenBSD: patch-apc_c,v 1.1 2002/08/05 02:25:30 kevlo Exp $
apc.c.orig Fri Aug 2 21:44:22 1996
-+++ apc.c Mon Aug 5 10:01:35 2002
-@@ -164,12 +164,12 @@ apc_tune(val)
- }
- if((r->type & T_TYPE) == T_BINARY) {
- if(!bcmp(v1.val.binary, v0.val.binary,
r->size)) {
-- syslog(LOG_WARNING, "apc_tune: toggle
wraparound");
-+ syslog(LOG_WARNING, "apc_tune: toggle
wraparound register %s", r->name);
- return 1;
- }
- } else {
- if(v1.val.number == v0.val.number) {
-- syslog(LOG_WARNING, "apc_tune: toggle
wraparound");
-+ syslog(LOG_WARNING, "apc_tune: toggle
wraparound register %s", r->name);
- return 1;
- }
- }
Index: upsd/patches/patch-apc_static_c
===
RCS file: upsd/patches/patch-apc_static_c
diff -N upsd/patches/patch-apc_static_c
--- upsd/patches/patch-apc_static_c 24 May 2010 22:08:11 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-apc_static_c,v 1.2 2010/05/24 22:08:11 espie Exp $
apc_static.c.orig Fri Aug 2 23:44:23 1996
-+++ apc_static.c Sat May 22 17:23:37 2010
-@@ -91,9 +91,12 @@ static struct ups_val apc_SmartUPS_230_values[] = {
- {SMART_LOWBATDUR, {number: 7}},
- {SMART_LOWBATDUR, {number: 10}},
-
-+ /* several models accept different values here */
- {SMART_WAKEUPBCAP, {number:
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2019/03/11 19:27:15 Modified files: net/prosody: Makefile Log message: Switch homepage/master_sites to https.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/03/11 17:21:24 Modified files: sysutils/freeipmi: Makefile sysutils/freeipmi/pkg: PLIST Log message: fix ordering of @sample lines, problem reported by benno@, thanks
Re: NEW devel/cxxtest
On Mon Mar 11, 2019 at 04:24:03PM -0500, mitchell wodach wrote: > Ping? > Port needed for freedink upgrade > my main notes: - remove spaces after tabs - remove tab and space after "devel" -- remove all trailing whitespaces - please install examples (sample/*.cpp sample/*.h sample/*.tpl sample/Construct sample/Makefile.unix sample/gui/GreenYellowRed.h) RS > > On Sat, Mar 2, 2019, 21:47 mitchell wodach wrote: > > > here is an updated tarball > > . > > > > > > On Sat, Mar 2, 2019 at 12:49 PM Stuart Henderson > > wrote: > > > > > > On 2019/03/02 10:49, mitchell wodach wrote: > > > > Ping? > > > > > > > > On Wed, Feb 27, 2019 at 5:26 PM mitchell wodach > > wrote: > > > > > > > > > > Attached is cxxtest port > > > > > > > > > > From the projects homepage > > > > > http://cxxtest.com/ > > > > > > > > > > "CxxTest is a unit testing framework for C++ that is similar in > > spirit > > > > > to JUnit, CppUnit, and xUnit. CxxTest is easy to use because it does > > > > > not require precompiling a CxxTest testing library, it employs no > > > > > advanced features of C++ (e.g. RTTI) and it supports a very flexible > > > > > form of test discovery." > > > > > > > > > > Thanks, > > > > > Mitch > > > > > > > > > > Take a look at the files in your port and compare with other ports > > > in the tree, try and make it look more similar. Use some tabs to line > > > up the variables a bit. Add an initial line "# $OpenBSD$" (no need > > > to fill in the username/date bits etc, just $OpenBSD$ is enough) > > > with a blank line after it. DESCR should be word wrapped. > > > > >
Re: sysutils/opam: use -full source tree including all dependencies.
This is ok krw@.
Ken
> On Mar 11, 2019, at 5:29 PM, Christopher Zimmermann
> wrote:
>
> On Mon, 11 Mar 2019 17:08:45 -0400
> Kenneth R Westerback wrote:
>
>> I like this, but I am slightly confused -- did I miss the commit to
>> switch opam to -full? I would assume we'd want to do that first, no?
>
> oops, I somehow asserted this was already committed. So of course I'd
> like to commit this first. OKs for change?
>
> Christopher
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/opam/Makefile,v
> retrieving revision 1.10
> diff -u -p -r1.10 Makefile
> --- Makefile4 Mar 2019 12:51:16 -1.10
> +++ Makefile11 Mar 2019 21:26:24 -
> @@ -4,24 +4,12 @@ COMMENT =OCaml source-based package ma
>
> CATEGORIES =sysutils devel
>
> -# opam version
> V =2.0.3
> -# opam file format version
> -OFFV =2.0.0
> -MCSS =1.1+9
> -#GH_ACCOUNT =ocaml
> -GH_PROJECT =opam
> -#GH_TAGNAME =${V}
> -DISTNAME =${GH_PROJECT}-${V}
> -
> -DISTFILES +=opam-${V}.tar.gz:0
> -MASTER_SITES0 =https://github.com/ocaml/opam/archive/${V}/
> -DISTFILES +=opam-file-format-${OFFV}.tar.gz:1
> -MASTER_SITES1 =
> https://github.com/ocaml/opam-file-format/archive/${OFFV}/
> -DISTFILES +=ocaml-mccs-${MCSS}.tar.gz:2
> -MASTER_SITES2 =https://github.com/AltGr/ocaml-mccs/archive/${MCSS}/
> -
> +REVISION =0
> PKGNAME =opam-${V}
> +DISTNAME =opam-full-${V}
> +
> +MASTER_SITES =https://github.com/ocaml/opam/releases/download/${V}/
>
> HOMEPAGE =https://opam.ocaml.org/
>
> @@ -34,16 +22,7 @@ WANTLIB =${COMPILER_LIBCXX} c m
>
> #MODULES =lang/ocaml
>
> -BUILD_DEPENDS =lang/ocaml \
> -devel/dune \
> -sysutils/findlib \
> -devel/ocaml-cppo \
> -devel/cudf,-ocaml>=0.7 \
> -devel/ocaml-cmdliner>=0.9.8 \
> -devel/ocaml-dose>=5 \
> -devel/ocaml-graph \
> -devel/ocaml-re>=1.5.0 \
> -net/curl # TODO: remove this dep and patch build system
> +BUILD_DEPENDS =lang/ocaml
>
> RUN_DEPENDS =archivers/unzip \
>archivers/bzip2 \
> @@ -54,7 +33,11 @@ RUN_DEPENDS =archivers/unzip \
>
> USE_GMAKE =Yes
>
> -CONFIGURE_STYLE =gnu
> +CONFIGURE_ENV +=CFLAGS="${CFLAGS}" \
> +LDFLAGS="${LDFLAGS}" \
> +CC=cc
> +CONFIGURE_STYLE =gnu autoconf no-autoheader
> +AUTOCONF_VERSION =2.69
>
> ALL_TARGET =lib-ext all man #doc requires odoc
> INSTALL_TARGET =install
> @@ -62,13 +45,8 @@ TEST_TARGET =tests
>
> docdir =${PREFIX}/share/doc/opam
>
> -
> -pre-patch:
> -ln -s${FULLDISTDIR}/opam-file-format-${OFFV}.tar.gz \
> -${WRKSRC}/src_ext/opam-file-format.tar.gz
> -ln -s${FULLDISTDIR}/ocaml-mccs-${MCSS}.tar.gz \
> -${WRKSRC}/src_ext/mccs.tar.gz
> -touch${WRKSRC}/src_ext/{mccs,opam-file-format}.{download,pkgdownload}
> +#pre-configure:
> +#cd ${WRKSRC} && env ${CONFIGURE_ENV} ${GMAKE} compiler
>
> post-install:
>mv${PREFIX}/doc/opam-installer \
> Index: distinfo
> ===
> RCS file: /cvs/ports/sysutils/opam/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo4 Mar 2019 12:51:16 -1.3
> +++ distinfo11 Mar 2019 21:26:24 -
> @@ -1,6 +1,2 @@
> -SHA256 (ocaml-mccs-1.1+9.tar.gz) =
> G3rkvRs0n8JMU2k9cApg39qaO86VTZMaZ703WQwzyD0=
> -SHA256 (opam-2.0.3.tar.gz) = zMbAl7vPMZDZGW4T1l9pwZuKHdZJ/V1wsbrhsSDuhzk=
> -SHA256 (opam-file-format-2.0.0.tar.gz) =
> FSUt8u24K//CCplXyzdkV0srp0g5K7NObJHGeHIyXDI=
> -SIZE (ocaml-mccs-1.1+9.tar.gz) = 1008737
> -SIZE (opam-2.0.3.tar.gz) = 626720
> -SIZE (opam-file-format-2.0.0.tar.gz) = 31419
> +SHA256 (opam-full-2.0.3.tar.gz) =
> BYnaTaGEWEpURdWThQCVNlNPYLwOJ3ciRbL0nl+o8OI=
> +SIZE (opam-full-2.0.3.tar.gz) = 7870020
> Index: patches/patch-m4_ocaml_m4
> ===
> RCS file: patches/patch-m4_ocaml_m4
> diff -N patches/patch-m4_ocaml_m4
> --- /dev/null1 Jan 1970 00:00:00 -
> +++ patches/patch-m4_ocaml_m411 Mar 2019 21:26:24 -
> @@ -0,0 +1,16 @@
> +$OpenBSD$
> +
> +do not detect any installed findlib library.
> +
> +Index: m4/ocaml.m4
> +--- m4/ocaml.m4.orig
> m4/ocaml.m4
> +@@ -209,7 +209,7 @@ AC_DEFUN([AC_CHECK_OCAML_PKG],
> + unset pkg
> + found=no
> + for pkg in $1 $2 ; do
> +-if $OCAMLFIND query $pkg >/dev/null 2>/dev/null; then
> ++if false; then
> + AC_MSG_RESULT([found])
> + AS_TR_SH([OCAML_PKG_$1])=$pkg
> + found=yes
> Index: patches/patch-shell_bootstrap-ocaml_sh
> ===
> RCS file: patches/patch-shell_bootstrap-ocaml_sh
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2019/03/11 15:57:09 Modified files: meta/kde4 : Makefile x11/kde4 : Makefile x11/kde-applications: Makefile Log message: Unhook KDE4 gwenview, hook gwenview
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2019/03/11 15:52:35 Modified files: x11/kde-applications/gwenview: Makefile x11/kde-applications/gwenview/pkg: PLIST Log message: Add pkgpath and bump share-lib higher then kde4 version
Re: Godot engine very slow, crashes
> > In 2D or only in 3D mode? > > I didn't get to run a game. I opened the editor and tried to load the 2D > Kinematic Collision demo. > > Observing the shell, I see the following when I start the editor: > > libGL error: MESA-LOADER: failed to retrieve device information > libGL error: Version 4 or later of flush extension not found > libGL error: failed to load driver: i915 > libGL error: failed to open drm device: Permission denied > libGL error: failed to load driver: i965 Turns out, the problem is wholly unrelated to Godot: I wasn't starting X from ttyC0 like my /etc/fbtab expects me to. Thomas, sorry to waste your time and thanks for setting me on the right track to figure it out.
Re: Godot engine very slow, crashes
> This may be hardware-related or not. dmesg output for my graphics card: inteldrm0 at pci0 dev 2 function 0 "Intel HD Graphics 4000" rev 0x09 > - OpenBSD 6.4 as in -release/-stable, or a snapshot? I'm on the 6.4 release, running the GENERIC.MP kernel. > how much ram? real mem = 8382627840 (7994MB) avail mem = 8119304192 (7743MB) > does it swap? I have the default layout's swap partition: b: 7883.0M 71507968 swap # none > - Is the slowness there from the start, or only after a while? >From the very moment I hit Enter after typing "godot" in the shell. > In 2D or only in 3D mode? I didn't get to run a game. I opened the editor and tried to load the 2D Kinematic Collision demo. Observing the shell, I see the following when I start the editor: libGL error: MESA-LOADER: failed to retrieve device information libGL error: Version 4 or later of flush extension not found libGL error: failed to load driver: i915 libGL error: failed to open drm device: Permission denied libGL error: failed to load driver: i965 OpenGL ES 3.0 Renderer: Gallium 0.4 on softpipe err status: 8cdd ERROR: _render_target_allocate: Condition ' status != 0x8CD5 ' is true. At: drivers/gles3/rasterizer_storage_gles3.cpp:6282. err status: 8cdd ERROR: _render_target_allocate: Condition ' status != 0x8CD5 ' is true. At: drivers/gles3/rasterizer_storage_gles3.cpp:6282. err status: 8cdd ERROR: _render_target_allocate: Condition ' status != 0x8CD5 ' is true. At: drivers/gles3/rasterizer_storage_gles3.cpp:6282. err status: 8cdd ERROR: _render_target_allocate: Condition ' status != 0x8CD5 ' is true. At: drivers/gles3/rasterizer_storage_gles3.cpp:6282. And the following after I load the project: OPENING: /home/agis/xyz (::home::agis::xyz) Failed to attach audio driver. Falling back to dummy driver. libGL error: MESA-LOADER: failed to retrieve device information libGL error: Version 4 or later of flush extension not found libGL error: failed to load driver: i915 libGL error: failed to open drm device: Permission denied libGL error: failed to load driver: i965 OpenGL ES 3.0 Renderer: Gallium 0.4 on softpipe err status: 8cdd ERROR: _render_target_allocate: Condition ' status != 0x8CD5 ' is true. At: drivers/gles3/rasterizer_storage_gles3.cpp:6282. tankard$ err status: 8cdd ERROR: _render_target_allocate: Condition ' status != 0x8CD5 ' is true. At: drivers/gles3/rasterizer_storage_gles3.cpp:6282. err status: 8cdd ERROR: _render_target_allocate: Condition ' status != 0x8CD5 ' is true. At: drivers/gles3/rasterizer_storage_gles3.cpp:6282. err status: 8cdd ERROR: _render_target_allocate: Condition ' status != 0x8CD5 ' is true. At: drivers/gles3/rasterizer_storage_gles3.cpp:6282. ERROR: operator[]: FATAL: Index p_index=0 out of size (size()=0) At: core/vector.h:138. handle_crash: Program crashed with signal 4 Dumping the backtrace. Please include this when reporting the bug on https://github.com/godotengine/godot/issues [1] 0xd005cf15005 (??:0) [2] Physics2DServerSW::_shape_col_cbk(Vector2 const&, Vector2 const&, void*) (??:0) [3] Physics2DServerSW::_shape_col_cbk(Vector2 const&, Vector2 const&, void*) (??:0) [4] Physics2DServerSW::_shape_col_cbk(Vector2 const&, Vector2 const&, void*) (??:0) [5] Physics2DServerSW::_shape_col_cbk(Vector2 const&, Vector2 const&, void*) (??:0) [6] Physics2DServerSW::_shape_col_cbk(Vector2 const&, Vector2 const&, void*) (??:0) [7] 0xcfe54036104 <__register_frame_info+211924> at /usr/local/bin/godot (??:0) [8] b2d_decompose(Vector const&) (??:0) [9] b2d_decompose(Vector const&) (??:0) [10] b2d_decompose(Vector const&) (??:0) [11] b2d_decompose(Vector const&) (??:0) [12] b2d_decompose(Vector const&) (??:0) [13] BroadPhase2DHashGrid::_create() (??:0) [14] Node::_notification(int) (??:0) [15] Node::_notification(int) (??:0) [16] 0xcfe5403607b <__register_frame_info+211787> at /usr/local/bin/godot (??:0) [17] 0xcfe5400d777 <__register_frame_info+45639> at /usr/local/bin/godot (??:0) [18] 0xcfe5400275a <__register_frame_info+554> at /usr/local/bin/godot (??:0) [19] 0xcfe54002526 <+86> at /usr/local/bin/godot (??:0) -- END OF BACKTRACE --
sysutils/opam: use -full source tree including all dependencies.
On Mon, 11 Mar 2019 17:08:45 -0400
Kenneth R Westerback wrote:
> I like this, but I am slightly confused -- did I miss the commit to
> switch opam to -full? I would assume we'd want to do that first, no?
oops, I somehow asserted this was already committed. So of course I'd
like to commit this first. OKs for change?
Christopher
Index: Makefile
===
RCS file: /cvs/ports/sysutils/opam/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile4 Mar 2019 12:51:16 - 1.10
+++ Makefile11 Mar 2019 21:26:24 -
@@ -4,24 +4,12 @@ COMMENT = OCaml source-based package ma
CATEGORIES = sysutils devel
-# opam version
V =2.0.3
-# opam file format version
-OFFV = 2.0.0
-MCSS = 1.1+9
-#GH_ACCOUNT = ocaml
-GH_PROJECT = opam
-#GH_TAGNAME = ${V}
-DISTNAME = ${GH_PROJECT}-${V}
-
-DISTFILES += opam-${V}.tar.gz:0
-MASTER_SITES0 =https://github.com/ocaml/opam/archive/${V}/
-DISTFILES += opam-file-format-${OFFV}.tar.gz:1
-MASTER_SITES1 =
https://github.com/ocaml/opam-file-format/archive/${OFFV}/
-DISTFILES += ocaml-mccs-${MCSS}.tar.gz:2
-MASTER_SITES2 =
https://github.com/AltGr/ocaml-mccs/archive/${MCSS}/
-
+REVISION = 0
PKGNAME = opam-${V}
+DISTNAME = opam-full-${V}
+
+MASTER_SITES = https://github.com/ocaml/opam/releases/download/${V}/
HOMEPAGE = https://opam.ocaml.org/
@@ -34,16 +22,7 @@ WANTLIB =${COMPILER_LIBCXX} c m
#MODULES = lang/ocaml
-BUILD_DEPENDS =lang/ocaml \
- devel/dune \
- sysutils/findlib \
- devel/ocaml-cppo \
- devel/cudf,-ocaml>=0.7 \
- devel/ocaml-cmdliner>=0.9.8 \
- devel/ocaml-dose>=5 \
- devel/ocaml-graph \
- devel/ocaml-re>=1.5.0 \
- net/curl # TODO: remove this dep and patch build system
+BUILD_DEPENDS =lang/ocaml
RUN_DEPENDS = archivers/unzip \
archivers/bzip2 \
@@ -54,7 +33,11 @@ RUN_DEPENDS =archivers/unzip \
USE_GMAKE =Yes
-CONFIGURE_STYLE = gnu
+CONFIGURE_ENV += CFLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
+ CC=cc
+CONFIGURE_STYLE = gnu autoconf no-autoheader
+AUTOCONF_VERSION = 2.69
ALL_TARGET = lib-ext all man #doc requires odoc
INSTALL_TARGET = install
@@ -62,13 +45,8 @@ TEST_TARGET =tests
docdir = ${PREFIX}/share/doc/opam
-
-pre-patch:
- ln -s ${FULLDISTDIR}/opam-file-format-${OFFV}.tar.gz \
- ${WRKSRC}/src_ext/opam-file-format.tar.gz
- ln -s ${FULLDISTDIR}/ocaml-mccs-${MCSS}.tar.gz \
- ${WRKSRC}/src_ext/mccs.tar.gz
- touch ${WRKSRC}/src_ext/{mccs,opam-file-format}.{download,pkgdownload}
+#pre-configure:
+# cd ${WRKSRC} && env ${CONFIGURE_ENV} ${GMAKE} compiler
post-install:
mv ${PREFIX}/doc/opam-installer \
Index: distinfo
===
RCS file: /cvs/ports/sysutils/opam/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo4 Mar 2019 12:51:16 - 1.3
+++ distinfo11 Mar 2019 21:26:24 -
@@ -1,6 +1,2 @@
-SHA256 (ocaml-mccs-1.1+9.tar.gz) = G3rkvRs0n8JMU2k9cApg39qaO86VTZMaZ703WQwzyD0=
-SHA256 (opam-2.0.3.tar.gz) = zMbAl7vPMZDZGW4T1l9pwZuKHdZJ/V1wsbrhsSDuhzk=
-SHA256 (opam-file-format-2.0.0.tar.gz) =
FSUt8u24K//CCplXyzdkV0srp0g5K7NObJHGeHIyXDI=
-SIZE (ocaml-mccs-1.1+9.tar.gz) = 1008737
-SIZE (opam-2.0.3.tar.gz) = 626720
-SIZE (opam-file-format-2.0.0.tar.gz) = 31419
+SHA256 (opam-full-2.0.3.tar.gz) = BYnaTaGEWEpURdWThQCVNlNPYLwOJ3ciRbL0nl+o8OI=
+SIZE (opam-full-2.0.3.tar.gz) = 7870020
Index: patches/patch-m4_ocaml_m4
===
RCS file: patches/patch-m4_ocaml_m4
diff -N patches/patch-m4_ocaml_m4
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-m4_ocaml_m4 11 Mar 2019 21:26:24 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+do not detect any installed findlib library.
+
+Index: m4/ocaml.m4
+--- m4/ocaml.m4.orig
m4/ocaml.m4
+@@ -209,7 +209,7 @@ AC_DEFUN([AC_CHECK_OCAML_PKG],
+ unset pkg
+ found=no
+ for pkg in $1 $2 ; do
+-if $OCAMLFIND query $pkg >/dev/null 2>/dev/null; then
++if false; then
+ AC_MSG_RESULT([found])
+ AS_TR_SH([OCAML_PKG_$1])=$pkg
+ found=yes
Index: patches/patch-shell_bootstrap-ocaml_sh
===
RCS file: patches/patch-shell_bootstrap-ocaml_sh
diff -N
Re: NEW devel/cxxtest
Ping? Port needed for freedink upgrade On Sat, Mar 2, 2019, 21:47 mitchell wodach wrote: > here is an updated tarball > . > > > On Sat, Mar 2, 2019 at 12:49 PM Stuart Henderson > wrote: > > > > On 2019/03/02 10:49, mitchell wodach wrote: > > > Ping? > > > > > > On Wed, Feb 27, 2019 at 5:26 PM mitchell wodach > wrote: > > > > > > > > Attached is cxxtest port > > > > > > > > From the projects homepage > > > > http://cxxtest.com/ > > > > > > > > "CxxTest is a unit testing framework for C++ that is similar in > spirit > > > > to JUnit, CppUnit, and xUnit. CxxTest is easy to use because it does > > > > not require precompiling a CxxTest testing library, it employs no > > > > advanced features of C++ (e.g. RTTI) and it supports a very flexible > > > > form of test discovery." > > > > > > > > Thanks, > > > > Mitch > > > > > > > Take a look at the files in your port and compare with other ports > > in the tree, try and make it look more similar. Use some tabs to line > > up the variables a bit. Add an initial line "# $OpenBSD$" (no need > > to fill in the username/date bits etc, just $OpenBSD$ is enough) > > with a blank line after it. DESCR should be word wrapped. > > >
remove devel/{cudf,omake,ounit,ocaml-{cmdliner,cppo,dose,extlib,jsonm,re}} ?
Hi, switching sysutils/opam to a source distribution including all (partly patched) dependencies, the following OCaml libraries are no longer used by other ports. Since active OCaml users will use opam instead of OpenBSD ports I would suggest to remove them from the ports tree. The following diff obviously just disables them as a first step. objections, oks ? Christopher Index: devel/Makefile === RCS file: /cvs/ports/devel/Makefile,v retrieving revision 1.1828 diff -u -p -r1.1828 Makefile --- devel/Makefile 22 Feb 2019 21:41:18 - 1.1828 +++ devel/Makefile 11 Mar 2019 20:39:33 - @@ -88,7 +88,6 @@ SUBDIR += cscope SUBDIR += csmith SUBDIR += ctftools - SUBDIR += cudf SUBDIR += cunit SUBDIR += cutils SUBDIR += cvs-fast-export @@ -475,27 +474,19 @@ SUBDIR += ninja SUBDIR += npth SUBDIR += nspr - SUBDIR += ocaml-cmdliner - SUBDIR += ocaml-cppo - SUBDIR += ocaml-dose - SUBDIR += ocaml-extlib SUBDIR += ocaml-graph - SUBDIR += ocaml-jsonm SUBDIR += ocaml-menhir SUBDIR += ocaml-ocamlbuild SUBDIR += ocaml-parmap SUBDIR += ocaml-pcre - SUBDIR += ocaml-re SUBDIR += ocaml-uutf SUBDIR += ode SUBDIR += ois - SUBDIR += omake SUBDIR += open-ath9k-htc-firmware SUBDIR += openmpi SUBDIR += openocd SUBDIR += ophis SUBDIR += orc - SUBDIR += ounit SUBDIR += p5-Acme-Damn SUBDIR += p5-Algorithm-Annotate SUBDIR += p5-Algorithm-C3 -- http://gmerlin.de OpenPGP: http://gmerlin.de/christopher.pub CB07 DA40 B0B6 571D 35E2 0DEF 87E2 92A7 13E5 DEE1 pgpDb5jH4ipYc.pgp Description: OpenPGP digital signature
Re: remove devel/{cudf,omake,ounit,ocaml-{cmdliner,cppo,dose,extlib,jsonm,re}} ?
On Mon, Mar 11, 2019 at 09:55:53PM +0100, Christopher Zimmermann wrote: > Hi, > > switching sysutils/opam to a source distribution including all > (partly patched) dependencies, the following OCaml libraries are no > longer used by other ports. Since active OCaml users will use opam > instead of OpenBSD ports I would suggest to remove them from the ports > tree. > The following diff obviously just disables them as a first step. > > objections, oks ? > > Christopher > I like this, but I am slightly confused -- did I miss the commit to switch opam to -full? I would assume we'd want to do that first, no? Ken > > Index: devel/Makefile > === > RCS file: /cvs/ports/devel/Makefile,v > retrieving revision 1.1828 > diff -u -p -r1.1828 Makefile > --- devel/Makefile22 Feb 2019 21:41:18 - 1.1828 > +++ devel/Makefile11 Mar 2019 20:39:33 - > @@ -88,7 +88,6 @@ > SUBDIR += cscope > SUBDIR += csmith > SUBDIR += ctftools > - SUBDIR += cudf > SUBDIR += cunit > SUBDIR += cutils > SUBDIR += cvs-fast-export > @@ -475,27 +474,19 @@ > SUBDIR += ninja > SUBDIR += npth > SUBDIR += nspr > - SUBDIR += ocaml-cmdliner > - SUBDIR += ocaml-cppo > - SUBDIR += ocaml-dose > - SUBDIR += ocaml-extlib > SUBDIR += ocaml-graph > - SUBDIR += ocaml-jsonm > SUBDIR += ocaml-menhir > SUBDIR += ocaml-ocamlbuild > SUBDIR += ocaml-parmap > SUBDIR += ocaml-pcre > - SUBDIR += ocaml-re > SUBDIR += ocaml-uutf > SUBDIR += ode > SUBDIR += ois > - SUBDIR += omake > SUBDIR += open-ath9k-htc-firmware > SUBDIR += openmpi > SUBDIR += openocd > SUBDIR += ophis > SUBDIR += orc > - SUBDIR += ounit > SUBDIR += p5-Acme-Damn > SUBDIR += p5-Algorithm-Annotate > SUBDIR += p5-Algorithm-C3 > > -- > http://gmerlin.de > OpenPGP: http://gmerlin.de/christopher.pub > CB07 DA40 B0B6 571D 35E2 0DEF 87E2 92A7 13E5 DEE1
Re: NEW: graphics/digikam (and opencv update)
On Tue Oct 16, 2018 at 09:43:36PM +0200, Rafael Sadowski wrote: > Hi All! > > Digikam 5.x depends on opencv 3.x. The diff below updates opencv to the > latest stable version. Please keep in mind graphics/digikam-kde4 will > not build with opencv 3.x. The second consumer nomacs is fine with this > version. > > A few months ago, Elias M. Mariani successfully tested it and I run > Digikam very often. > > I need an OK to import the new KDE5 digikam. > > Rafael Sadowski > ping and re-attached... digikam.5.9.0.tar.gz Description: Binary data
opencv3: graphics/nomacs
Update nomacs to the latest stable version. Works very well with the
upcoming opencv3 update and also the black theme works.
Manual patch committed upstream.
RS
Index: Makefile
===
RCS file: /cvs/ports/graphics/nomacs/Makefile,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 Makefile
--- Makefile8 Mar 2019 20:00:47 - 1.21
+++ Makefile10 Mar 2019 14:20:54 -
@@ -4,8 +4,7 @@ COMMENT = small and fast Qt image viewer
GH_ACCOUNT = nomacs
GH_PROJECT = nomacs
-GH_TAGNAME = 3.10.2
-REVISION = 2
+GH_TAGNAME = 3.12
CATEGORIES = graphics
@@ -13,7 +12,7 @@ HOMEPAGE =https://nomacs.org
MAINTAINER = Rafael Sadowski
-SHARED_LIBS += nomacsCore3.0 # 3.3
+SHARED_LIBS += nomacsCore4.0 # 3.3
# GPLv3
PERMIT_PACKAGE_CDROM = Yes
Index: distinfo
===
RCS file: /cvs/ports/graphics/nomacs/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo15 Jul 2018 21:24:56 - 1.9
+++ distinfo10 Mar 2019 14:20:54 -
@@ -1,2 +1,2 @@
-SHA256 (nomacs-3.10.2.tar.gz) = ztkAoVSL5v7O9dGObtW9vJs+t0nt9iPFIzJ3mKdKTsA=
-SIZE (nomacs-3.10.2.tar.gz) = 32302506
+SHA256 (nomacs-3.12.tar.gz) = 9KMhaebAy5OZcdonMuTWfG4uZJUG2htVv8lJY6JigP8=
+SIZE (nomacs-3.12.tar.gz) = 1736648
Index: patches/patch-3rdparty_drif_drif_image_h
===
RCS file: patches/patch-3rdparty_drif_drif_image_h
diff -N patches/patch-3rdparty_drif_drif_image_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-3rdparty_drif_drif_image_h10 Mar 2019 14:20:54 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: 3rdparty/drif/drif_image.h
+--- 3rdparty/drif/drif_image.h.orig
3rdparty/drif/drif_image.h
+@@ -26,7 +26,7 @@
+ #include
+ #include
+
+-#ifdef Q_OS_MAC
++#if defined(Q_OS_MAC) || defined(Q_OS_OPENBSD)
+ #include
+ #else
+ #include
Index: patches/patch-cmake_UnixBuildTarget_cmake
===
RCS file: patches/patch-cmake_UnixBuildTarget_cmake
diff -N patches/patch-cmake_UnixBuildTarget_cmake
--- patches/patch-cmake_UnixBuildTarget_cmake 29 Jan 2018 22:33:07 -
1.5
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,17 +0,0 @@
-$OpenBSD: patch-cmake_UnixBuildTarget_cmake,v 1.5 2018/01/29 22:33:07
rsadowski Exp $
-Index: cmake/UnixBuildTarget.cmake
cmake/UnixBuildTarget.cmake.orig
-+++ cmake/UnixBuildTarget.cmake
-@@ -79,7 +79,11 @@ install(FILES src/img/nomacs.svg DESTINATION share/pix
- # translations
- install(FILES ${NOMACS_QM} DESTINATION share/nomacs/translations)
- # manpage
--install(FILES Readme/nomacs.1 DESTINATION share/man/man1)
-+if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
-+install(FILES Readme/nomacs.1 DESTINATION man/man1)
-+else()
-+install(FILES Readme/nomacs.1 DESTINATION share/man/man1)
-+endif()
- # appdata
- install(FILES nomacs.appdata.xml DESTINATION share/metainfo/)
-
Index: patches/patch-cmake_Unix_cmake
===
RCS file: /cvs/ports/graphics/nomacs/patches/patch-cmake_Unix_cmake,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-cmake_Unix_cmake
--- patches/patch-cmake_Unix_cmake 6 Sep 2018 16:20:52 - 1.6
+++ patches/patch-cmake_Unix_cmake 10 Mar 2019 14:20:54 -
@@ -1,13 +1,11 @@
$OpenBSD: patch-cmake_Unix_cmake,v 1.6 2018/09/06 16:20:52 rsadowski Exp $
- Avoid forced linkage with libstdc++.
-- drop CMake calls to QT5_WRAP_CPP()
--- https://github.com/nomacs/nomacs/pull/187
Index: cmake/Unix.cmake
--- cmake/Unix.cmake.orig
+++ cmake/Unix.cmake
-@@ -66,6 +66,7 @@ if(ENABLE_RAW)
+@@ -67,6 +67,7 @@ if(ENABLE_RAW)
if(NOT LIBRAW_FOUND)
message(FATAL_ERROR "libraw not found. It's mandatory when used
with ENABLE_RAW enabled")
else()
@@ -15,12 +13,3 @@ Index: cmake/Unix.cmake
add_definitions(-DWITH_LIBRAW)
endif()
endif(ENABLE_RAW)
-@@ -103,7 +104,7 @@ if(ENABLE_QUAZIP)
- if(USE_SYSTEM_QUAZIP)
- SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-
--find_package(QuaZIP REQUIRED)
-+find_package(QuaZip5 REQUIRED)
- if(NOT QUAZIP_FOUND)
- message(FATAL_ERROR "QUAZIP not found. It's mandatory when used
with ENABLE_QUAZIP enabled, you can also disable USE_SYSTEM_QUAZIP")
- else()
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/nomacs/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 PLIST
--- pkg/PLIST 3 Jul 2018 05:06:54 - 1.7
+++ pkg/PLIST 10 Mar 2019 14:20:54 -
@@ -6,35 +6,38 @@ share/applications/nomacs.desktop
share/metainfo/
share/metainfo/nomacs.appdata.xml
share/nomacs/
-share/nomacs/translations/
-share/nomacs/translations/nomacs_als.qm
opencv2: x11/kde-applications/libkface
Diff to use opencv2.
RS
Index: Makefile
===
RCS file: /cvs/ports/x11/kde-applications/libkface/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile18 Dec 2018 09:39:21 - 1.5
+++ Makefile10 Mar 2019 18:06:00 -
@@ -2,7 +2,7 @@
COMMENT = face detection library for KDE
DISTNAME = libkface-${VERSION}
-REVISION = 2
+REVISION = 3
SHARED_LIBS = kface 0.1
@@ -12,18 +12,28 @@ WANTLIB = m pthread
WANTLIB += ${COMPILER_LIBCXX}
WANTLIB += QtDBus QtGui QtSql QtSvg QtXml
WANTLIB += ${KDE4LIB}/kdeui
-WANTLIB += opencv_calib3d opencv_contrib opencv_core opencv_features2d
-WANTLIB += opencv_flann opencv_gpu opencv_highgui opencv_imgproc
-WANTLIB += opencv_legacy opencv_ml opencv_nonfree opencv_objdetect
-WANTLIB += opencv_ocl opencv_photo opencv_video
+WANTLIB += lib/opencv2/opencv_calib3d lib/opencv2/opencv_contrib
+WANTLIB += lib/opencv2/opencv_core lib/opencv2/opencv_features2d
+WANTLIB += lib/opencv2/opencv_flann lib/opencv2/opencv_gpu
+WANTLIB += lib/opencv2/opencv_highgui lib/opencv2/opencv_imgproc
+WANTLIB += lib/opencv2/opencv_legacy lib/opencv2/opencv_ml
+WANTLIB += lib/opencv2/opencv_nonfree lib/opencv2/opencv_objdetect
+WANTLIB += lib/opencv2/opencv_ocl lib/opencv2/opencv_photo
+WANTLIB += lib/opencv2/opencv_video
MODULES += x11/kde-applications
-LIB_DEPENDS = graphics/opencv
+LIB_DEPENDS = graphics/opencv2
+
+OPENCV_LIBRARY_DIR = "${LOCALBASE}/lib/opencv2"
MODKDE4_USE = libs
KFACE_V = 3.5.0
-SUBST_VARS += KFACE_V
+SUBST_VARS += KFACE_V OPENCV_LIBRARY_DIR
+
+pre-configure:
+ ${SUBST_CMD} ${WRKSRC}/libkface/CMakeLists.txt \
+ ${WRKSRC}/tests/CMakeLists.txt
.include
Index: patches/patch-libkface_CMakeLists_txt
===
RCS file: patches/patch-libkface_CMakeLists_txt
diff -N patches/patch-libkface_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-libkface_CMakeLists_txt 10 Mar 2019 18:06:00 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: libkface/CMakeLists.txt
+--- libkface/CMakeLists.txt.orig
libkface/CMakeLists.txt
+@@ -42,7 +42,7 @@ set(kface_database_LIB_SRCS database/databaseaccess.cp
+ database/sqlquery.cpp
+ database/dbcontainers.cpp
+)
+-
++link_directories("${OPENCV_LIBRARY_DIR}")
+ KDE4_ADD_LIBRARY(kface SHARED ${kface_LIB_SRCS} ${kface_database_LIB_SRCS})
+
+ target_link_libraries(kface ${KDE4_KDECORE_LIBS}
Index: patches/patch-tests_CMakeLists_txt
===
RCS file: patches/patch-tests_CMakeLists_txt
diff -N patches/patch-tests_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-tests_CMakeLists_txt 10 Mar 2019 18:06:00 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: tests/CMakeLists.txt
+--- tests/CMakeLists.txt.orig
tests/CMakeLists.txt
+@@ -8,6 +8,8 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}/../lib
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../libkface)
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
+
++link_directories("${OPENCV_LIBRARY_DIR}")
++
+ set(detect_SRCS detect.cpp)
+ KDE4_ADD_EXECUTABLE(detect ${detect_SRCS})
+ target_link_libraries(detect kface ${KDE4_KDECORE_LIBS} ${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY} ${OpenCV_LIBRARIES})
opencv2: graphics/digikam-kde4
Diff to use opencv2 and some tweaks:
- fix MASTER_SITE
- s/https/https/
- dependencies
- regen PLIST
RS
Index: Makefile
===
RCS file: /cvs/ports/graphics/digikam-kde4/Makefile,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 Makefile
--- Makefile29 Jun 2018 22:16:16 - 1.30
+++ Makefile10 Mar 2019 20:22:58 -
@@ -5,7 +5,7 @@ COMMENT-main = KDE photo management uti
COMMENT-mediawiki =KIPI interface for MediaWiki
CATEGORIES = graphics
-HOMEPAGE = http://www.digikam.org/
+HOMEPAGE = https://www.digikam.org/
VERSION = 4.13.0
DISTNAME = digikam-${VERSION}
@@ -16,8 +16,8 @@ PKGNAME-kipi =kipi-plugins-${VERSION}
PKGNAME-main = ${PKGNAME}
PKGNAME-mediawiki =libmediawiki-1.0.0
-REVISION-main =5
-REVISION-kipi =6
+REVISION-main =6
+REVISION-kipi =7
REVISION-mediawiki = 6
EXTRACT_SUFX = .tar.bz2
@@ -30,8 +30,7 @@ SHARED_LIBS += digikamcore 0.1
SHARED_LIBS += digikamdatabase0.1
SHARED_LIBS += mediawiki 0.1
-MASTER_SITES = ${MASTER_SITE_KDE:=stable/digikam/} \
- ${MASTER_SITE_KDE:=Attic/digikam/}
+MASTER_SITES = ${MASTER_SITE_KDE:=Attic/digikam/}
MULTI_PACKAGES = -main -kipi -mediawiki
@@ -55,10 +54,11 @@ WANTLIB-kipi += ${KDE4LIB}/kio ${KDE4LIB
WANTLIB-kipi += ${KDE4LIB}/ksane
WANTLIB-kipi += ${KDE4LIB}/nepomuk ${KDE4LIB}/nepomukutils ${KDE4LIB}/solid
WANTLIB-kipi += ${KDE4LIB}/threadweaver
-WANTLIB-kipi += opencv_core opencv_highgui opencv_imgproc opencv_objdetect
+WANTLIB-kipi += lib/opencv2/opencv_core lib/opencv2/opencv_highgui
+WANTLIB-kipi += lib/opencv2/opencv_imgproc lib/opencv2/opencv_objdetect
WANTLIB-kipi += exslt gdk_pixbuf-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gpod
WANTLIB-kipi += gthread-2.0 intl jpeg
-WANTLIB-kipi += qjson kgeomap kqoauth kvkontakte mediawiki png qca soprano
+WANTLIB-kipi += qjson kgeomap kqoauth kvkontakte png16 qca soprano
WANTLIB-kipi += tiff xml2 xslt MagickCore-6.Q16
WANTLIB-kipi += QtGLib-2.0 QtGStreamer-1.0 QtGStreamerUtils-1.0
@@ -76,14 +76,18 @@ WANTLIB-main += ${KDE4LIB}/kpimutils ${K
WANTLIB-main += ${KDE4LIB}/kresources ${KDE4LIB}/kutils
WANTLIB-main += ${KDE4LIB}/nepomuk ${KDE4LIB}/nepomukutils
WANTLIB-main += ${KDE4LIB}/solid ${KDE4LIB}/threadweaver
-WANTLIB-main += opencv_calib3d opencv_contrib opencv_core opencv_features2d
-WANTLIB-main += opencv_flann opencv_gpu opencv_highgui opencv_imgproc
-WANTLIB-main += opencv_legacy opencv_ml opencv_nonfree opencv_objdetect
-WANTLIB-main += opencv_ocl opencv_photo opencv_video
WANTLIB-main += akonadi-contact akonadi-kde baloocore baloofiles baloopim
-WANTLIB-main += balooqueryparser exif gphoto2 gphoto2_port jasper jpeg
-WANTLIB-main += kface kgeomap lcms2 lensfun lqr-1 pgf png qca soprano
+WANTLIB-main += balooqueryparser gphoto2 gphoto2_port jasper jpeg
+WANTLIB-main += kface kgeomap lcms2 lensfun lqr-1 pgf png16 soprano
WANTLIB-main += sqlite tiff usb
+WANTLIB-main += lib/opencv2/opencv_calib3d lib/opencv2/opencv_contrib
+WANTLIB-main += lib/opencv2/opencv_core lib/opencv2/opencv_features2d
+WANTLIB-main += lib/opencv2/opencv_flann lib/opencv2/opencv_gpu
+WANTLIB-main += lib/opencv2/opencv_highgui lib/opencv2/opencv_imgproc
+WANTLIB-main += lib/opencv2/opencv_legacy lib/opencv2/opencv_ml
+WANTLIB-main += lib/opencv2/opencv_nonfree lib/opencv2/opencv_objdetect
+WANTLIB-main += lib/opencv2/opencv_ocl lib/opencv2/opencv_photo
+WANTLIB-main += lib/opencv2/opencv_video
WANTLIB-mediawiki = ${WANTLIB-common}
WANTLIB-mediawiki += lib/qt4/QtNetwork lib/qt4/QtXml
@@ -121,7 +125,7 @@ LIB_DEPENDS-kipi = ${LIB_DEPENDS-common}
devel/qjson>=0.7 \
graphics/gdk-pixbuf2 \
graphics/ImageMagick \
- graphics/opencv>=2.4.9 \
+ graphics/opencv2 \
graphics/png \
graphics/tiff \
multimedia/qt-gstreamer \
@@ -138,7 +142,6 @@ LIB_DEPENDS-kipi = ${LIB_DEPENDS-common}
LIB_DEPENDS-main = ${LIB_DEPENDS-common} \
${MODPHONON_LIB_DEPENDS} \
databases/sqlite \
- devel/glib2 \
devel/libusb-compat \
graphics/jasper \
graphics/lcms2 \
@@ -146,7 +149,7 @@ LIB_DEPENDS-main = ${LIB_DEPENDS-common}
graphics/libgphoto2 \
graphics/liblqr \
graphics/libpgf \
- graphics/opencv>=2.4.9 \
+ graphics/opencv2 \
graphics/png \
graphics/tiff \
x11/kde-applications/libkface>=15.04.3 \
@@ -159,12 +162,12
NEW/UPDATE: graphics/opencv2
Please find attached graphics/opencv2. It's completely based on
graphics/opencv with following changes:
- PKGNAME to opencv2 to enable coexistence between opencv2 and
opencv3/4.
- Dropped -java, -docs (Is not required for the last consumers)
- Drop examples
- Cleanup Makefile
- Changed install paths to avoid conflicts with (main) opencv.
- bin to ${LOCALBASE}\bin\opencv2
- libs to ${LOCALBASE}\libs\opencv2
- include/opencv to ${LOCALBASE}\include\opencv2
- ... and so one.
There an no conflicts with upcoming opencv3 update and both can
coexist.
You might be wondering why I did this. The goal is to import
graphics/digikam (KDE5) without removing graphics/digikam-kde4. Long
story short: Update from digikam4 to digikam5 may destroy your database.
digikam4+libkface>=15.04.3 tested at runtime and opencv face detection.
Same results as with the old (None - Because I didn't train it.) but
also NO crashes.
Please follow the ports@ for the other patches.
RS
opencv2-2.4.13.4.tar.gz
Description: Binary data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/03/11 14:29:03 Added files: x11/gnome/at-spi2-core/patches: patch-atspi_meson_build Log message: Fix for meson >=0.50.0. breakage reported by naddy@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2019/03/11 14:19:42 Modified files: www/chromium : Makefile Added files: www/chromium/patches: patch-base_files_file_util_posix_cc Log message: ignore ENOENT up until the last element of the path when doing mkdir(2) on unveil(2)'d directory trees ... essentially the same modification that went into gtk+3 this allows us to remove some hacks from unveil(2)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2019/03/11 14:19:37 Log message: Import gwenview-18.12.0; OK kn@ Gwenview is a simple image viewer for KDE which offers a folder tree window and a file list window for navigating easily through your image file hierarchy. Features: - correct rendering of alpha-channel in images - docked windows for a configurable layout - full screen mode - a thumbnail view - background thumbnail generation - center images in view - zooming (including fit-to-window) - support for IO slaves - multi-selection support - bookmarks - image rotation and mirroring - advanced keyboard navigation, Opera-like next / previous mouse navigation and customizable mouse-wheel navigation Status: Vendor Tag: rsadowski Release Tags: rsadowski_20190311 N ports/x11/kde-applications/gwenview/Makefile N ports/x11/kde-applications/gwenview/distinfo N ports/x11/kde-applications/gwenview/pkg/DESCR N ports/x11/kde-applications/gwenview/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2019/03/11 14:05:23 Modified files: net/miniupnp/miniupnpd: Makefile net/miniupnp/miniupnpd/patches: patch-upnpevents_c Log message: Cherrypick patch from upstream miniupnpd: Check the return value of snprintf(). jasper@ found a POC (https://github.com/b1ack0wl/miniupnpd_poc) for a read out-of-bounds vulnerability in miniupnpd. Fix has been provided by upstream. POC seems to work, so does the fix.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2019/03/11 13:51:35 Modified files: devel/jdk/1.8 : Makefile distinfo Removed files: devel/jdk/1.8/patches: patch-jdk_make_lib_Awt2dLibraries_gmk Log message: Update to u202 which includes upstream fix for jdb issue. Also contains many upstream bug fixes and security fixes which can be mined from u192-u202 release notes here: https://www.oracle.com/technetwork/java/javase/8u-relnotes-2225394.html okay sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sema...@cvs.openbsd.org 2019/03/11 13:13:40 Modified files: lang/rust : Makefile distinfo lang/rust/patches: patch-src_bootstrap_bin_rustc_rs patch-src_bootstrap_lib_rs patch-src_etc_rust-gdb patch-src_librustc_session_filesearch_rs patch-src_librustc_target_spec_i686_unknown_openbsd_rs patch-src_libstd_sys_unix_ext_net_rs patch-src_libstd_sys_unix_os_rs patch-src_libstd_sys_unix_stack_overflow_rs patch-src_test_run-pass-fulldeps_myriad-closures_rs patch-src_test_run-pass_out-of-stack_rs patch-src_test_run-pass_sse2_rs patch-src_test_run-pass_stack-probes-lto_rs patch-src_test_run-pass_stack-probes_rs patch-src_tools_cargo_src_cargo_core_compiler_context_compilation_files_rs patch-vendor_openssl-sys_build_main_rs lang/rust/pkg : PFRAG.aarch64-main PFRAG.amd64-main PFRAG.i386-main PLIST-doc PLIST-main Added files: lang/rust/patches: patch-src_tools_linkchecker_main_rs patch-src_tools_tidy_src_features_rs Removed files: lang/rust/patches: patch-src_tools_cargo_src_cargo_core_package_id_rs patch-src_tools_compiletest_src_main_rs Log message: update lang/rust to 1.33.0 Announce: https://blog.rust-lang.org/2019/02/28/Rust-1.33.0.html ChangeLog: https://github.com/rust-lang/rust/blob/stable/RELEASES.md#version-1330-2019-02-28 ok landry@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sema...@cvs.openbsd.org 2019/03/11 13:04:38 Modified files: www/firefox-esr: Makefile www/firefox-esr/patches: patch-netwerk_cache_nsDiskCacheDeviceSQL_cpp patch-storage_mozStorageConnection_cpp www/mozilla-firefox: Makefile www/tor-browser/browser: Makefile Added files: www/firefox-esr/patches: patch-servo_components_style_lib_rs patch-servo_components_style_traits_lib_rs www/mozilla-firefox/patches: patch-config_rules_mk patch-servo_components_style_lib_rs patch-servo_components_style_traits_lib_rs www/tor-browser/browser/patches: patch-servo_components_style_lib_rs patch-servo_components_style_traits_lib_rs Log message: prepare firefox (all versions) to be compiled using rust-1.33 ok landry@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2019/03/11 12:57:25 Modified files: devel/cbindgen : Makefile distinfo Log message: Update to cbindgen 0.8.2. Needed for mozilla-central since #1533142 5 days ago
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/03/11 10:34:14 Modified files: x11/gnome/gvfs : Makefile distinfo x11/gnome/gvfs/pkg: PLIST-goa PLIST-main Log message: Update to gvfs-1.38.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/03/11 10:27:49 Modified files: multimedia/py-chromecast: Makefile distinfo Log message: Update to py3-chromecast-3.0.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/03/11 10:08:26 Modified files: devel/meson: Makefile distinfo meson.port.mk devel/meson/patches: patch-mesonbuild_build_py patch-mesonbuild_compilers_c_py patch-mesonbuild_compilers_compilers_py patch-mesonbuild_environment_py patch-run_unittests_py patch-test_cases_common_137_get_define_meson_build devel/meson/pkg: PLIST Log message: Update to meson-0.50.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gonz...@cvs.openbsd.org 2019/03/11 09:45:08 Modified files: www/nextcloud : Tag: OPENBSD_6_4 Makefile www/nextcloud/pkg: Tag: OPENBSD_6_4 README Log message: Fix typo on my previous commit spotted by aja@ Also we want unify the variables
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gonz...@cvs.openbsd.org 2019/03/11 09:43:46 Modified files: www/nextcloud : Makefile www/nextcloud/pkg: README Log message: Fix typo on my previous commit spotted by aja@ Also we want unify the variables
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2019/03/11 09:25:02 Modified files: mail/geary : Makefile distinfo Log message: Update to geary 0.13.3
[UPDATE] devel/jdk/1.8 to u202
- Update to u202
- Includes upstream fix for jdb
Index: Makefile
===
RCS file: /cvs/ports/devel/jdk/1.8/Makefile,v
retrieving revision 1.40
diff -u -p -u -r1.40 Makefile
--- Makefile8 Feb 2019 20:36:44 - 1.40
+++ Makefile11 Mar 2019 13:34:15 -
@@ -6,17 +6,16 @@ DPB_PROPERTIES= parallel
COMMENT-main= OpenJDK Software Development Kit v${V}
COMMENT-jre= OpenJDK Runtime Environment v${V}
-U= 192
+U= 202
V= 1.8.0.${U}
-B= b26
+B= b08
PKGNAME= jdk-${V}
PKGNAME-main= jdk-${V}
PKGNAME-jre= jre-${V}
EPOCH= 0
-REVISION= 0
DIST_SUBDIR= jdk
-DISTNAME= openjdk-8u192b26-bsd-port-20190122
+DISTNAME= openjdk-8u202b08-bsd-port-20190310
BOOTJDK_DATE= 20190111
EXTRACT_SUFX= .tar.xz
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
Index: distinfo
===
RCS file: /cvs/ports/devel/jdk/1.8/distinfo,v
retrieving revision 1.14
diff -u -p -u -r1.14 distinfo
--- distinfo24 Jan 2019 17:20:14 - 1.14
+++ distinfo11 Mar 2019 13:34:15 -
@@ -1,8 +1,8 @@
SHA256 (jdk/apache-ant-1.9.7-bin.tar.gz) =
HQuAj+gszpvMFn+Nu3x+icHX91NMDZxkv2Fex8Pmv+U=
-SHA256 (jdk/openjdk-8u192b26-bsd-port-20190122.tar.xz) =
mpvNCh9VEVEDESzPHKJl8nUF9X2NrsdUcv4dpLOIqTw=
+SHA256 (jdk/openjdk-8u202b08-bsd-port-20190310.tar.xz) =
JmdIagNtKtC6/S5Q1LLrK95Nh9CXCBmvsX83oPtRUR0=
SHA256 (jdk/openjdk8-bootjdk-amd64-20190111.tar.gz) =
38Gn7muNOI6C3COaFCJb4JMo8qwYUHDS8WczJUZWXUU=
SHA256 (jdk/openjdk8-bootjdk-i386-20190111.tar.gz) =
TpxOjy2Ko4hZqA8pckqj2lwqOdFn49uLmlYK5QpORss=
SIZE (jdk/apache-ant-1.9.7-bin.tar.gz) = 5601575
-SIZE (jdk/openjdk-8u192b26-bsd-port-20190122.tar.xz) = 55649948
+SIZE (jdk/openjdk-8u202b08-bsd-port-20190310.tar.xz) = 55680852
SIZE (jdk/openjdk8-bootjdk-amd64-20190111.tar.gz) = 78174211
SIZE (jdk/openjdk8-bootjdk-i386-20190111.tar.gz) = 76219419
Index: patches/patch-jdk_make_lib_Awt2dLibraries_gmk
===
RCS file: patches/patch-jdk_make_lib_Awt2dLibraries_gmk
diff -N patches/patch-jdk_make_lib_Awt2dLibraries_gmk
--- patches/patch-jdk_make_lib_Awt2dLibraries_gmk 8 Feb 2019 20:36:44
- 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,26 +0,0 @@
-$OpenBSD: patch-jdk_make_lib_Awt2dLibraries_gmk,v 1.1 2019/02/08 20:36:44 kurt
Exp $
-
-Index: jdk/make/lib/Awt2dLibraries.gmk
jdk/make/lib/Awt2dLibraries.gmk.orig
-+++ jdk/make/lib/Awt2dLibraries.gmk
-@@ -1236,6 +1236,11 @@ ifndef BUILD_HEADLESS_ONLY
- LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0
- LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0
-
-+ else ifeq ($(OPENJDK_TARGET_OS), bsd)
-+LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) -I$(PACKAGE_PATH)/include
-+ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd)
-+ LIBSPLASHSCREEN_CFLAGS += -DLIBICONV_PLUG
-+endif
- else ifeq ($(OPENJDK_TARGET_OS), windows)
- LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32
- else
-@@ -1255,6 +1260,8 @@ ifndef BUILD_HEADLESS_ONLY
- -framework Foundation \
- -framework Cocoa \
- -framework JavaNativeFoundation
-+ else ifeq ($(OPENJDK_TARGET_OS), bsd)
-+LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM)
-L$(PACKAGE_PATH)/lib -liconv -pthread
- else ifeq ($(OPENJDK_TARGET_OS), windows)
- LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib
delayimp.lib -DELAYLOAD:user32.dll
- else# .. all other Unixes can use X_LIBS
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/03/11 09:23:58 Modified files: devel/meson: Makefile devel/meson/patches: patch-mesonbuild_compilers_compilers_py patch-mesonbuild_environment_py patch-run_unittests_py Log message: Most patches merged upstream. Allow regress suite to go further. Add TEST_DEPENDS.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2019/03/11 07:29:21 Modified files: databases/sqlports: Makefile databases/sqlports/files: Var.pm Log message: slightly more correct subrequest (fullpkgpath is ordered "by accident") I suspected this, confirmed after a discussion with Reda Dehak, from my lab at work.
Re: UPDATE: Nextcloud-15.0.5
> > Index: pkg/README
> > ===
> > RCS file: /cvs/ports/www/nextcloud/pkg/README,v
> > retrieving revision 1.10
> > diff -u -p -r1.10 README
> > --- pkg/README 9 Dec 2018 14:06:26 - 1.10
> > +++ pkg/README 10 Mar 2019 10:33:45 -
> > @@ -28,7 +28,7 @@ The HTTP server must be able to resolve
> > The configuration of an SQLite database path is set relatively to the
> > chroot in
> > Nextcloud which will break background jobs run by cron(8) (see below).
> > A symlink can be created to workaround this issue:
> > -# ln -f ${TINSTDIR) /nextcloud
> > +# ln -f ${INSTDIR) /nextcloud
That part is bogus, you have a typo.
Also I don't see the benefit of TINSTDIR -> INSTDIR.
--
Antoine
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gonz...@cvs.openbsd.org 2019/03/11 07:03:36 Modified files: www/nextcloud : Tag: OPENBSD_6_4 Makefile www/nextcloud/pkg: Tag: OPENBSD_6_4 README Log message: List alphabetically and removes the duplicates lines from Bruno Flueckiger Thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gonz...@cvs.openbsd.org 2019/03/11 06:59:57 Modified files: www/nextcloud : Makefile www/nextcloud/pkg: README Log message: List alphabetically and removes the duplicates lines from Bruno Flueckiger Thanks!
Re: UPDATE: Nextcloud-15.0.5
On Sun, 10 Mar 2019 at 11:35:25 +0100, Bruno Flueckiger wrote:
> On 05.03.19 08:32, Gonzalo L. Rodriguez wrote:
> > The fart cloud needs you.
> >
> > On Fri, 01 Mar 2019 at 09:34:44 +0100, Gonzalo L. Rodriguez wrote:
> > > Hello,
> > >
> > > Update for Nextcloud to 15.0.5:
> > >
> > > https://nextcloud.com/changelog/
> > >
> > > OK? Comments?
> > >
> > > Cheers.-
> > >
> > > --
> > > Sending from my toaster.
> >
>
> Hi Gonzalo,
>
> I've done a fresh install of Nextcloud, everything works. While I worked
> through the points of the port's readme I found that the example config
> for httpd(8) contains duplicate entries. The following diff sorts the
> list alphabetically and removes the duplicates.
>
> Cheers,
> Bruno
>
>
> Index: pkg/README
> ===
> RCS file: /cvs/ports/www/nextcloud/pkg/README,v
> retrieving revision 1.10
> diff -u -p -r1.10 README
> --- pkg/README9 Dec 2018 14:06:26 - 1.10
> +++ pkg/README10 Mar 2019 10:33:45 -
> @@ -28,7 +28,7 @@ The HTTP server must be able to resolve
> The configuration of an SQLite database path is set relatively to the chroot
> in
> Nextcloud which will break background jobs run by cron(8) (see below).
> A symlink can be created to workaround this issue:
> -# ln -f ${TINSTDIR) /nextcloud
> +# ln -f ${INSTDIR) /nextcloud
>
> OpenBSD HTTP daemon
> ---
> @@ -49,26 +49,22 @@ server "domain.tld" {
> }
>
> # First deny access to the specified files
> - location "/db_structure.xml"{ block }
> location "/.ht*"{ block }
> + location "/.user*" { block }
> + location "/3rdparty*" { block }
> location "/README" { block }
> - location "/data*" { block }
> - location "/config*" { block }
> + location "/autotest*" { block }
> location "/build*" { block }
> - location "/tests*" { block }
> location "/config*" { block }
> - location "/lib*"{ block }
> - location "/3rdparty*" { block }
> - location "/templates*" { block }
> + location "/console*"{ block }
> location "/data*" { block }
> - location "/.ht*"{ block }
> - location "/.user*" { block }
> - location "/autotest*" { block }
> - location "/occ*"{ block }
> - location "/issue*" { block }
> - location "/indie*" { block }
> location "/db_*"{ block }
> - location "/console*"{ block }
> + location "/indie*" { block }
> + location "/issue*" { block }
> + location "/lib*"{ block }
> + location "/occ*"{ block }
> + location "/templates*" { block }
> + location "/tests*" { block }
>
> location "/*.php*" {
> root "/nextcloud"
>
Hello Bruno,
Thanks for this, I will commit it soon.
Cheers.-
--
Sending from my toaster.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/03/11 05:35:09 Modified files: devel/meson: Makefile Added files: devel/meson/patches: patch-test_cases_common_137_get_define_meson_build Log message: Fix a couple more tests.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2019/03/11 05:18:02 Modified files: emulators/snes9x: Makefile distinfo emulators/snes9x/pkg: PLIST Added files: emulators/snes9x/patches: patch-gtk_meson_build Removed files: emulators/snes9x/patches: patch-gtk_configure_ac Log message: Update snes9x to 1.59.2. Notable changes: - Switch to GH_ variables, tarballs are not uploaded as assets anymore - Build system switched from autotools to Meson
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2019/03/11 05:15:39 Modified files: sysutils/psftools: Makefile sysutils/psftools/patches: patch-tools_psf2bsd_c Log message: Patch psf2bsd further to use '*' and '.' for representing bit values in the comments, as we do in our wsfont header files.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2019/03/11 05:16:05 Modified files: inputmethods/uim: Makefile distinfo inputmethods/uim/patches: patch-configure_ac patch-qt3_toolbar_Makefile_in patch-qt4_immodule_plugin_cpp inputmethods/uim/pkg: PLIST-main Log message: Update to uim-1.8.8. Release notes since 1.8.6: https://github.com/uim/uim/releases/tag/1.8.8 https://github.com/uim/uim/releases/tag/1.8.7 ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2019/03/11 05:14:28 Modified files: devel : Makefile Log message: +libgcroots
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2019/03/11 05:13:53 Log message: Import libgcroots-0.3.1. The libgcroots library abstracts the architecture-dependent part of garbage collector roots acquisition such as register windows of SPARC and register stack backing store of IA-64. The main code is based on Boehm GC 7.0. With this library, one can easily write a garbage collector with goals such as a small footprint, some application-specific optimizations, learning, or to test experimental ideas. ok sthen@ Status: Vendor Tag: bentley Release Tags: bentley_20190310 N ports/devel/libgcroots/Makefile N ports/devel/libgcroots/distinfo N ports/devel/libgcroots/pkg/DESCR N ports/devel/libgcroots/pkg/PLIST N ports/devel/libgcroots/patches/patch-include_private_gcconfig_h No conflicts created by this import
NEW: math/gretl
Hi, Gretl (GNU regression, econometrics and time-series library) comprises libgretl, a shared library which provides various functions relating to econometric estimation, a command-line client program and a gui client, using GTK+. Libgretl is based on the stand-alone command-line econometrics program ESL, originally written by Ramu Ramanathan of the Department of Economics at UC-San Diego. ok? -- Anthony J. Bentley gretl.tar.gz Description: gretl.tar.gz
Re: UPDATE: inputmethods/uim
On Thu, Mar 7, 2019 at 1:38 AM Anthony J. Bentley wrote:
> On Wed, Dec 19, 2018 at 1:02 AM Anthony J. Bentley wrote:
> > On Mon, Dec 10, 2018 at 1:21 AM Anthony J. Bentley
> > wrote:
> > > Here is an update to uim-1.8.8.
> > >
> > > Release notes: https://github.com/uim/uim/releases
> >
> > So, ok for the attached libgcroots port and uim update?
>
> Ping.
Updated libgcroots tarball with an updated arm64 patch (thanks sthen).
--
Anthony J. Bentley
libgcroots.tar.gz
Description: application/gzip
Index: Makefile
===
RCS file: /cvs/ports/inputmethods/uim/Makefile,v
retrieving revision 1.62
diff -u -p -r1.62 Makefile
--- Makefile 24 Oct 2018 14:28:06 - 1.62
+++ Makefile 16 Dec 2018 23:58:19 -
@@ -11,7 +11,7 @@ COMMENT-qt4= uim for QT4
CATEGORIES= inputmethods japanese chinese
-V= 1.8.6
+V= 1.8.8
DISTNAME= uim-$V
PKGNAME-main= uim-$V
PKGNAME-gtk= uim-gtk-$V
@@ -19,14 +19,12 @@ PKGNAME-gtk3= uim-gtk3-$V
PKGNAME-kde= uim-kde-$V
PKGNAME-qt= uim-qt-$V
PKGNAME-qt4= uim-qt4-$V
-REVISION= 8
-MASTER_SITES= https://github.com/uim/uim/releases/download/uim-$V/
+MASTER_SITES= https://github.com/uim/uim/releases/download/$V/
HOMEPAGE= https://github.com/uim/uim
-SHARED_LIBS += gcroots 0.0 # .1.0
SHARED_LIBS += uim-scm 0.0 # .0.0
-SHARED_LIBS += uim 1.0 # .6.0
+SHARED_LIBS += uim 1.1 # .6.0
SHARED_LIBS += uim-custom 0.0 # .2.0
# BSD
@@ -46,11 +44,12 @@ USE_GMAKE= Yes
RUN_DEPENDS-main= devel/desktop-file-utils
-WANTLIB-main += ${cWANTLIB}
-WANTLIB-main += Xft anthy anthydic c curses expat ${COMPILER_LIBCXX}
-WANTLIB-main += util xcb z
+WANTLIB-main += ${cWANTLIB} ${COMPILER_LIBCXX}
+WANTLIB-main += Xft anthy anthydic c curses edit expat gcroots
+WANTLIB-main += sqlite3 util xcb z
-LIB_DEPENDS-main= inputmethods/anthy
+LIB_DEPENDS-main= inputmethods/anthy \
+ devel/libgcroots
WANTLIB-gtk += ${cWANTLIB}
@@ -58,7 +57,7 @@ WANTLIB-gtk += Xcomposite Xcursor Xdamag
WANTLIB-gtk += atk-1.0 c cairo expat ffi gcroots gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB-gtk += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2
WANTLIB-gtk += gthread-2.0 gtk-x11-2.0 harfbuzz pango-1.0 pangocairo-1.0
-WANTLIB-gtk += pangoft2-1.0 pcre pixman-1 png pthread
+WANTLIB-gtk += pangoft2-1.0 pcre pixman-1 png pthread fribidi
WANTLIB-gtk += uim uim-custom uim-scm xcb xcb-render xcb-shm z
LIB_DEPENDS-gtk= inputmethods/uim \
@@ -66,11 +65,11 @@ LIB_DEPENDS-gtk= inputmethods/uim \
WANTLIB-gtk3 += ${cWANTLIB}
WANTLIB-gtk3 += Xcomposite Xcursor Xdamage Xfixes Xi Xinerama
-WANTLIB-gtk3 += Xrandr Xtst atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject
+WANTLIB-gtk3 += Xrandr atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject
WANTLIB-gtk3 += dbus-1 expat ffi gcroots gdk-3 gdk_pixbuf-2.0 gio-2.0
WANTLIB-gtk3 += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0
WANTLIB-gtk3 += gtk-3 harfbuzz pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB-gtk3 += pcre pixman-1 png pthread uim uim-custom
+WANTLIB-gtk3 += pcre pixman-1 png pthread uim uim-custom fribidi
WANTLIB-gtk3 += uim-scm xcb xcb-render xcb-shm z epoxy
LIB_DEPENDS-gtk3= inputmethods/uim \
@@ -81,6 +80,7 @@ WANTLIB-kde += DCOP GL ICE SM X11-xcb Xc
WANTLIB-kde += Xft Xi Xinerama Xmu Xrandr Xt Xxf86vm art_lgpl_2 drm
WANTLIB-kde += expat gcroots glapi idn jpeg kdefx lcms mng png pthread
WANTLIB-kde += qt-mt ${COMPILER_LIBCXX} uim uim-scm util xcb xcb-dri2
+WANTLIB-kde += xcb-dri3 xcb-present xcb-sync xcb-xfixes xshmfence
WANTLIB-kde += xcb-glx z
LIB_DEPENDS-kde= inputmethods/uim \
@@ -91,6 +91,7 @@ WANTLIB-qt += GL ICE SM X11-xcb Xcursor
WANTLIB-qt += Xft Xi Xinerama Xmu Xrandr Xt Xxf86vm c drm expat gcroots
WANTLIB-qt += glapi jpeg lcms mng png pthread ${COMPILER_LIBCXX}
WANTLIB-qt += uim uim-custom uim-scm xcb xcb-dri2 xcb-glx z
+WANTLIB-qt += xcb-dri3 xcb-present xcb-sync xcb-xfixes xshmfence
LIB_DEPENDS-qt= ${MODQT3_LIB_DEPENDS} \
inputmethods/uim
@@ -102,7 +103,7 @@ WANTLIB-qt4 += uim-custom uim-scm
LIB_DEPENDS-qt4= ${MODQT4_LIB_DEPENDS} \
inputmethods/uim
-AUTOCONF_VERSION= 2.68
+AUTOCONF_VERSION= 2.69
CONFIGURE_STYLE= autoconf
CONFIGURE_ENV= CPPFLAGS='-I${MODQT3_INCDIR} -I${LOCALBASE}/include -I${X11BASE}/include' \
@@ -114,7 +115,8 @@ CONFIGURE_ARGS= --with-qt \
--with-qt-immodule \
--with-qt4 \
--with-qt4-immodule \
- --with-anthy-utf8
+ --with-anthy-utf8 \
+ --with-libgcroots
post-install:
rm ${PREFIX}/lib/uim/plugin/*.{a,la}
Index: distinfo
===
RCS file: /cvs/ports/inputmethods/uim/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 9 Jan 2015 16:45:37 - 1.5
+++ distinfo 16 Dec 2018 23:58:19 -
@@ -1,2 +1,2 @@
-SHA256 (uim-1.8.6.tar.gz) = DuvPWyGS0M0RAYrb1p41i/oGLTtdY8HdC3PV9j63r+c=
-SIZE (uim-1.8.6.tar.gz) = 8195769
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/03/11 03:29:23 Modified files: devel/meson: Makefile meson.port.mk Added files: devel/meson/patches: patch-mesonbuild_environment_py Log message: environment: support OpenBSD in detect_*_compiler
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2019/03/11 03:15:54 Modified files: shells/zsh : Makefile distinfo shells/zsh/pkg : PLIST Log message: Update to 5.7.1. Diff from Matthew Martin, thanks ! ok rsadowski@
Re: UPDATE: shells/zsh
On Sat, Mar 09, 2019 at 11:24:13PM +, Stuart Henderson wrote: > On 2019/03/10 00:13, Rafael Sadowski wrote: > > Simple update to the latest stable version. > > > > Release Notes: > > > > http://zsh.sourceforge.net/releases.html > > > > OK? > > Matthew Martin sent an update for this already, his most recent mail > about it was 2 days ago .. > > 190204 2359 [ L] 6534 update: shells/zsh 5.7.1 Matthew Martin > 190214 1623 [ L] 9728 Re: update: shells/zsh 5.7.1 > Pierre-Emmanuel Andre > 190215 0143 [ L] 9850 Re: update: shells/zsh 5.7.1 Matthew Martin > 190307 0422 [ L] 16624 Re: update: shells/zsh 5.7.1 Matthew > Martin > 190309 2313 [ L] 17518 UPDATE: shells/zsh Rafael > Sadowski > It's committed :) Regards,
Re: [UPDATE] devel/p5-Role-Tiny to 2.000006
Ok for me. вс, 10 мар. 2019 г. в 02:30, Andrew Hewus Fresh : > This fixes some a problem with a change in perl 5.28, didn't find the > bug report or anything, but seems good to have. > > https://metacpan.org/changes/distribution/Role-Tiny > > account for code references stored directly in stash (for perl 5.28) > > Comments, OK? > > Index: Makefile > === > RCS file: /cvs/ports/devel/p5-Role-Tiny/Makefile,v > retrieving revision 1.5 > diff -u -p -r1.5 Makefile > --- Makefile23 Nov 2016 21:36:23 - 1.5 > +++ Makefile9 Mar 2019 23:24:43 - > @@ -4,7 +4,7 @@ COMMENT = minimalist role composition to > > MODULES = cpan > PKG_ARCH = * > -DISTNAME = Role-Tiny-2.05 > +DISTNAME = Role-Tiny-2.06 > CATEGORIES = devel > > MAINTAINER = Sergey Bronnikov > @@ -13,7 +13,6 @@ CPAN_AUTHOR = HAARG > # Perl > PERMIT_PACKAGE_CDROM = Yes > > -TEST_DEPENDS = devel/p5-Class-Method-Modifiers>=1.05 \ > - devel/p5-Test-Fatal>=0.003 > +TEST_DEPENDS = devel/p5-Class-Method-Modifiers>=1.05 > > .include > Index: distinfo > === > RCS file: /cvs/ports/devel/p5-Role-Tiny/distinfo,v > retrieving revision 1.4 > diff -u -p -r1.4 distinfo > --- distinfo23 Nov 2016 21:36:23 - 1.4 > +++ distinfo9 Mar 2019 23:24:43 - > @@ -1,2 +1,2 @@ > -SHA256 (Role-Tiny-2.05.tar.gz) = > WToptiHgKb8CGNAVTV399uxQKvxJre6trmr9DHAGMRU= > -SIZE (Role-Tiny-2.05.tar.gz) = 23119 > +SHA256 (Role-Tiny-2.06.tar.gz) = > zHNBjJBKAobs2JFerBH1viqNHhfqnLVMkRawNAzT44I= > +SIZE (Role-Tiny-2.06.tar.gz) = 21556 >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2019/03/11 02:15:31 Modified files: misc/portroach : Makefile Added files: misc/portroach/patches: patch-Portroach_SQL_pm Log message: replace slow query with an better one, as this is used in a tight loop insane code okay aja@, jasper@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/03/11 01:56:19 Modified files: textproc/p5-Text-Autoformat: Makefile Log message: Needs EPOCH, while it got an update, package version was downgraded (see packages-specs(7)).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2019/03/11 01:05:52 Log message: Import kleopatra-18.12.0; OK kn@ Comment: certificate manager and a universal crypto GUI Description: Kleopatra is a certificate manager and a universal crypto GUI. It supports managing X.509 and OpenPGP certificates in the GpgSM keybox and retrieving certificates from LDAP servers. Maintainer: Rafael Sadowski Status: Vendor Tag: rsadowski Release Tags: rsadowski_20190311 N ports/x11/kde-applications/kleopatra/Makefile N ports/x11/kde-applications/kleopatra/distinfo N ports/x11/kde-applications/kleopatra/patches/patch-src_CMakeLists_txt N ports/x11/kde-applications/kleopatra/patches/patch-tests_CMakeLists_txt N ports/x11/kde-applications/kleopatra/pkg/DESCR N ports/x11/kde-applications/kleopatra/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2019/03/11 01:04:21 Log message: Import kcalutils-18.12.0; OK kn@ Comment: library for the handling of calendar data. Description: This library provides a set of utility functions that help applications access and use calendar data via the KCalCore library. Maintainer: Rafael Sadowski Status: Vendor Tag: rsadowski Release Tags: rsadowski_20190311 N ports/x11/kde-applications/kcalutils/Makefile N ports/x11/kde-applications/kcalutils/distinfo N ports/x11/kde-applications/kcalutils/pkg/DESCR N ports/x11/kde-applications/kcalutils/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2019/03/11 01:02:14 Log message: Import libkleo-18.12.0; Tweak and OK kn@ Comment: certificate manager for KDE Required by: kleopatra-18.12.0 Description: Kleopatra is a certificate manager and a universal crypto GUI. It supports managing X.509 and OpenPGP certificates in the GpgSM keybox and retrieving certificates from LDAP servers. Maintainer: Rafael Sadowski Status: Vendor Tag: rsadowski Release Tags: rsadowski_20190311 N ports/x11/kde-applications/libkleo/Makefile N ports/x11/kde-applications/libkleo/distinfo N ports/x11/kde-applications/libkleo/patches/patch-src_CMakeLists_txt N ports/x11/kde-applications/libkleo/pkg/DESCR N ports/x11/kde-applications/libkleo/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2019/03/11 01:00:27 Log message: Import kidentitymanagement-18.12.0; Tweak and OK kn@ Comment: KDE pim identities Description: KDE Personal Information Management suite. Maintainer: Rafael Sadowski Status: Vendor Tag: rsadowski Release Tags: rsadowski_20190311 N ports/x11/kde-applications/kidentitymanagement/Makefile N ports/x11/kde-applications/kidentitymanagement/distinfo N ports/x11/kde-applications/kidentitymanagement/pkg/DESCR N ports/x11/kde-applications/kidentitymanagement/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/03/11 00:54:52 Modified files: devel/meson/patches: patch-mesonbuild_compilers_c_py patch-run_unittests_py Log message: Merged upstream.
