claws-mail with litehtml plugin - build fails

2019-12-07 Thread Henry Jensen
Greetings,

I am trying to build claws-mail with litehtml plugin. This is a new
plugin for rendering HTML e-mails which exists since claws-mail 3.17.4.

The plugin depends on the gumbo parsing library, which already exist in
ports as www/gumbo.

So, what I did was simply

  pkg_add gumbo
  cd /usr/ports/mail/claws-mail
  make build

This fails with the following error:


gmake[6]: Entering directory
'/usr/ports/pobj/claws-mail-3.17.4/claws-mail-3.17.4/src/plugins/litehtml_viewer/litehtml'
/usr/bin/libtool --tag=disable-static  --tag=CXX   --mode=compile c++
-DHAVE_CONFIG_H -I. -I../../../..  -I/usr/local/include
-I/usr/X11R6/include -I/usr/local/include -I/usr/local/include
-std=c++11 -O2 -pipe -MT liblitehtml_la-background.lo -MD -MP -MF
.deps/liblitehtml_la-background.Tpo -c -o liblitehtml_la-background.lo
`test -f 'background.cpp' || echo './'`background.cpp c++
-DHAVE_CONFIG_H -I. -I../../../.. -I/usr/local/include
-I/usr/X11R6/include -I/usr/local/include -I/usr/local/include
-std=c++11 -O2 -pipe -MT liblitehtml_la-background.lo -MD -MP -MF
.deps/liblitehtml_la-background.Tpo -c background.cpp -fPIC -DPIC -o
.libs/liblitehtml_la-background.o


In file included from background.cpp:1:
In file included from ./html.h:5:
In file included from /usr/include/c++/v1/string:505:
In file included from /usr/include/c++/v1/string_view:176:
In file included from /usr/include/c++/v1/__string:57:
In file included from /usr/include/c++/v1/algorithm:640:
In file included from /usr/include/c++/v1/initializer_list:47:
In file included from /usr/include/c++/v1/cstddef:38:
../../../../version:1:1: error: unknown type name 'echo'
echo 3.17.4
^
../../../../version:1:6: error: expected unqualified-id
echo 3.17.4
 ^
In file included from background.cpp:1:
In file included from ./html.h:5:
In file included from /usr/include/c++/v1/string:505:
In file included from /usr/include/c++/v1/string_view:176:
In file included from /usr/include/c++/v1/__string:57:
In file included from /usr/include/c++/v1/algorithm:640:
In file included from /usr/include/c++/v1/initializer_list:47:
/usr/include/c++/v1/cstddef:50:9: error: no member named 'ptrdiff_t' in
the global namespace; did you mean '__ptrdiff_t'? using ::ptrdiff_t;
  ~~^
/usr/include/machine/_types.h:122:16: note: '__ptrdiff_t' declared here
typedef long__ptrdiff_t;
^
In file included from background.cpp:1:
In file included from ./html.h:5:
In file included from /usr/include/c++/v1/string:505:
In file included from /usr/include/c++/v1/string_view:176:
In file included from /usr/include/c++/v1/__string:57:
In file included from /usr/include/c++/v1/algorithm:641:
In file included from /usr/include/c++/v1/type_traits:407:
../../../../version:1:1: error: unknown type name 'echo'
echo 3.17.4
^
../../../../version:1:6: error: expected unqualified-id
echo 3.17.4
 ^
In file included from background.cpp:1:
In file included from ./html.h:5:
In file included from /usr/include/c++/v1/string:505:
In file included from /usr/include/c++/v1/string_view:176:
In file included from /usr/include/c++/v1/__string:57:
In file included from /usr/include/c++/v1/algorithm:643:
In file included from /usr/include/c++/v1/utility:206:
../../../../version:1:1: error: unknown type name 'echo'
echo 3.17.4
^
../../../../version:1:6: error: expected unqualified-id
echo 3.17.4
 ^
In file included from background.cpp:1:
In file included from ./html.h:5:
In file included from /usr/include/c++/v1/string:505:
In file included from /usr/include/c++/v1/string_view:176:
In file included from /usr/include/c++/v1/__string:57:
In file included from /usr/include/c++/v1/algorithm:644:
In file included from /usr/include/c++/v1/memory:654:
In file included from /usr/include/c++/v1/typeinfo:61:
In file included from /usr/include/c++/v1/exception:84:
../../../../version:1:1: error: unknown type name 'echo'
echo 3.17.4
^
../../../../version:1:6: error: expected unqualified-id
echo 3.17.4


similar errors follows. Anyone knows what to do?

Regards,

Henry





CVS: cvs.openbsd.org: ports

2019-12-07 Thread Pavel Korovin
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2019/12/07 12:49:17

Modified files:
sysutils/ansible: Makefile distinfo 

Log message:
Update ansible 2.9.1 -> 2.9.2
Changelog: 
https://github.com/ansible/ansible/blob/stable-2.9/changelogs/CHANGELOG-v2.9.rst#v2-9-2



[update] security/wycheproof-testvectors to HEAD

2019-12-07 Thread Theo Buehler
Trivial update to track HEAD.  Upstream cleaned up some of their
documentation and made some other small tweaks. No change in the
packaged test vectors. 

Index: Makefile
===
RCS file: /var/cvs/ports/security/wycheproof-testvectors/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile28 Nov 2019 17:02:13 -  1.5
+++ Makefile7 Dec 2019 18:53:01 -
@@ -3,12 +3,12 @@
 COMMENT =  test vectors from Project Wycheproof
 
 # No releases
-VERSION =  20191126
+VERSION =  20191207
 DISTNAME = wycheproof-testvectors-${VERSION}
 
 GH_ACCOUNT =   google
 GH_PROJECT =   wycheproof
-GH_COMMIT =06e5e105eeb9e2699143fc92912baae74c7f6dcc
+GH_COMMIT =5cf58d2985abdc173f41d293928cd3533177e9fc
 
 CATEGORIES =   security devel
 
Index: distinfo
===
RCS file: /var/cvs/ports/security/wycheproof-testvectors/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo28 Nov 2019 17:02:13 -  1.4
+++ distinfo7 Dec 2019 18:53:11 -
@@ -1,2 +1,2 @@
-SHA256 (wycheproof-testvectors-20191126-06e5e105.tar.gz) = 
9X90GPuJ4ryHk2R7xh4MPbh8WGa3XC48HNu/WCyvM2w=
-SIZE (wycheproof-testvectors-20191126-06e5e105.tar.gz) = 8717030
+SHA256 (wycheproof-testvectors-20191207-5cf58d29.tar.gz) = 
A2rAKK3uw2hYoA2TeQI8Vu51W5MyygZ6U+jnSTjTd4E=
+SIZE (wycheproof-testvectors-20191207-5cf58d29.tar.gz) = 8717877



sparc64 bulk build report

2019-12-07 Thread kmos
Bulk build on sparc64-0.ports.openbsd.org

Started : Wed Dec  4 23:30:39 MST 2019
Finished: Sat Dec  7 12:11:14 MST 2019
Duration: 2 Days 12 hours 41 minutes

Built using OpenBSD 6.6-current (GENERIC.MP) #145: Tue Dec  3 22:24:29 MST 2019

Built 9709 packages

Number of packages built each day:
Dec 4: 840
Dec 5: 6862
Dec 6: 1767
Dec 7: 240



Critical path missing pkgs: 
http://build-failures.rhaalovely.net/sparc64/2019-12-04/summary.log

Build failures: 57
http://build-failures.rhaalovely.net/sparc64/2019-12-04/cad/magic.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/cad/netgen.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/cad/qucs.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/chinese/libpinyin.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/comms/mgetty+sendfax.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/comms/xastir.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/devel/libcoap.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/devel/py-unicorn.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/devel/rebar,erlang21.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/emulators/BasiliskII.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/emulators/citra.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/emulators/fs-uae.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/emulators/ppsspp.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/games/dxx-rebirth.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/games/pokerth.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/games/postal.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/games/stone-soup.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/games/xevil.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/geo/spatialite/gis.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/graphics/asymptote.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/graphics/colord-gtk.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/graphics/gegl04.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/lang/apl.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/lang/janet.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/mail/kopano/core.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/mail/rspamd.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/math/kst.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/math/py-scikit-learn.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/multimedia/mkvtoolnix,no_x11.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/multimedia/synfig.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/net/bitcoin,no_x11.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/net/dleyna/renderer.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/net/dleyna/server.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/net/litecoin.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/net/mutella.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/net/routinator.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/net/telegram-purple.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/net/ttg.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/print/hplip,-common.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/productivity/gnucash.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/security/sslscan,openssl.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/sysutils/collectd,-main.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/telephony/iaxclient.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/telephony/pjsua,-main.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/www/newsboat.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/www/ruby-passenger,ruby26.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/x11/gnome/bijiben.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/x11/gnome/builder.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/x11/gnome/grilo.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/x11/gnome/mutter.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/x11/gtk+4,-cloudprint.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/x11/kde4/libs.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/x11/kde4/smokeqt.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/x11/libdbus-c++.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/x11/libhandy.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/x11/mate/caja.log
http://build-failures.rhaalovely.net/sparc64/2019-12-04/x11/ogre.log

Recurrent failures:
 failures/comms/mgetty+sendfax.log
 failures/comms/xastir.log
 failures/devel/libcoap.log
 failures/devel/rebar,erlang21.log
 

Re: UPDATE: devel/cmake 3.16.0

2019-12-07 Thread Christian Weisgerber
Rafael Sadowski:

> here is a relatively straightforward update to the latest stable
> version. As always, we need brave people to test this diff
> in a bulk build.

The only build error was x11/gnustep/libobjc2.
However note that this takes out x11/gnustep/* and a few other
ports.


>>> Building on amd64-1 under x11/gnustep/libobjc2
 BDEPENDS = [devel/cmake;devel/ninja]
 DIST = [x11/gnustep/libobjc2:gnustep/libobjc2-1.8.1.tar.gz]
 FULLPKGNAME = gnustep-libobjc2-1.8.1p2
Avoided depends for cmake-3.16.0v0 ninja-1.9.0
(Junk lock obtained for amd64-1 at 1575682625.65)
Still tainted: no
>>> Running junk in x11/gnustep/libobjc2 at 1575682625.72
/usr/sbin/pkg_delete -aIXq bash-5.0.11 cmake-3.16.0v0 curl-7.67.0 
cyrus-sasl-2.1.27p1 gdb-7.12.1p9 gmake-4.2.1p4 libgit2-0.28.2 libssh2-1.9.0 
libtool-2.4.2p0 llvm-8.0.1p2 mariadb-client-10.3.20v1 ninja-1.9.0 pcre-8.41p2 
python-2.7.17p1 sqlite3-3.30.1 xz-5.2.4
install-info: warning: no entries found for `/usr/local/info/gpgrt.info'; 
nothing deleted
--- -avahi-0.7p6 ---
You should also run /usr/sbin/userdel _avahi
You should also run /usr/sbin/groupdel _avahi
--- -cups-libs-2.3.0 ---
You should also run /usr/sbin/userdel _cups
You should also run /usr/sbin/groupdel _cups
--- -dbus-1.12.16p0v0 ---
You should also remove /etc/machine-id
You should also run /usr/sbin/userdel _dbus
You should also run /usr/sbin/groupdel _dbus
--- -dspam-3.10.2p10 ---
You should also run rm -rf /var/dspam/*
You should also run /usr/sbin/userdel _dspam
You should also run /usr/sbin/groupdel _dspam
--- -ghostscript-fonts-8.11p3 ---
You may wish to remove /usr/local/share/fonts/ghostscript from your font path
--- -jdk-1.8.0.232.b09.1p0v0 ---
You may wish to remove /usr/local/jdk-1.8.0/man from man.conf
--- -libxml-2.9.10 ---
You should also remove /var/db/xmlcatalog
--- -qt3-mt-3.8p19 ---
You may wish to remove /usr/local/lib/qt3/man from man.conf
Error deleting directory /usr/local/lib/gdk-pixbuf-2.0/2.10.0: Directory not 
empty
Error deleting directory /usr/local/lib/gdk-pixbuf-2.0: Directory not empty
--- -ruby-2.6.5p1 ---
If you set up the symlinks to make ruby 2.6 the system
ruby, don't forget to remove the following files:

 rm /usr/local/bin/ruby
 rm /usr/local/bin/erb
 rm /usr/local/bin/irb
 rm /usr/local/bin/rdoc
 rm /usr/local/bin/ri
 rm /usr/local/bin/gem
 rm /usr/local/bin/bundle
 rm /usr/local/bin/bundler
 rm /usr/local/bin/rake
(Junk lock released for amd64-1 at 1575682657.26)
distfiles size=173635
>>> Running build in x11/gnustep/libobjc2 at 1575682657.32
===> x11/gnustep/libobjc2
===> gnustep-libobjc2-1.8.1p2 depends on: cmake-* -> cmake-3.16.0v0
===> gnustep-libobjc2-1.8.1p2 depends on: ninja->=1.5.1 -> ninja-1.9.0
===>  Verifying specs:  m c++ c++abi pthread pthread
===>  found m.10.1 c++.3.0 c++abi.1.0 pthread.26.1
===>  Checking files for gnustep-libobjc2-1.8.1p2
`/usr/ports/distfiles/gnustep/libobjc2-1.8.1.tar.gz' is up to date.
>> (SHA256) gnustep/libobjc2-1.8.1.tar.gz: OK
===>  Extracting for gnustep-libobjc2-1.8.1p2
===>  Patching for gnustep-libobjc2-1.8.1p2
===>   Applying OpenBSD patch patch-CMakeLists_txt
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--
|$OpenBSD: patch-CMakeLists_txt,v 1.3 2017/01/01 09:30:21 jca Exp $
|--- CMakeLists.txt.origSun Jul 12 13:17:46 2015
|+++ CMakeLists.txt Wed Dec 28 08:59:20 2016
--
Patching file CMakeLists.txt using Plan A...
Hunk #1 succeeded at 5.
Hunk #2 succeeded at 284.
done
===>   Applying OpenBSD patch patch-objc_msgSend_arm_S
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--
|$OpenBSD: patch-objc_msgSend_arm_S,v 1.1 2017/01/01 09:32:12 jca Exp $
|
|No support for neon SIMD in binutils-2.17.
|
|--- objc_msgSend.arm.S.origWed Dec 28 08:58:48 2016
|+++ objc_msgSend.arm.S Wed Dec 28 08:58:53 2016
--
Patching file objc_msgSend.arm.S using Plan A...
Hunk #1 succeeded at 4.
done
===>  Compiler link: clang -> /usr/bin/clang
===>  Compiler link: clang++ -> /usr/bin/clang++
===>  Compiler link: cc -> /usr/bin/cc
===>  Compiler link: c++ -> /usr/bin/c++
===>  Generating configure for gnustep-libobjc2-1.8.1p2
===>  Configuring for gnustep-libobjc2-1.8.1p2
-- The C compiler identification is Clang 8.0.1
-- The CXX compiler identification is Clang 8.0.1
-- Check for working C compiler: /usr/obj/ports/gnustep-libobjc2-1.8.1/bin/cc
-- Check for working C compiler: /usr/obj/ports/gnustep-libobjc2-1.8.1/bin/cc 
-- works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Detecting C compile features
-- Detecting C compile features - done
-- Check for working CXX compiler: 

CVS: cvs.openbsd.org: ports

2019-12-07 Thread Brian Callahan
CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2019/12/07 07:58:08

Modified files:
lang/gravity   : Makefile distinfo 

Log message:
Update to gravity-0.7.8
Changelog: https://github.com/marcobambini/gravity/compare/0.7.0...0.7.8



Re: UPDATE devel/cppunit

2019-12-07 Thread Stuart Henderson
On 2019/12/07 15:39, Björn Ketelaars wrote:
> Enclosed diff brings cppunit to 1.14.0. Overview on changes can be found
> at https://cgit.freedesktop.org/libreoffice/cppunit/tree/NEWS.
> 
> This update is actually from giovanni@ [0], and includes some input from
> sthen@ and me.
> 
> Changes to the port:
> - Bump major of SHARED_LIBS as symbols have been removed
> - Updated HOMEPAGE and MASTER_SITES
> - Removed base-gcc from COMPILER. This update needs C++11
> 
> Tests:
> - Regression test passes
> - Build tested all consumers, including libreoffice, and ran 'make test'
>   on some of the smaller ones

OK with me.

> BTW, it seems that libreoffice is currently _not_ using cppunit from
> ports although it is listed as BDEP:
> 
> configure:24201: checking which cppunit to use
> configure:24302: result: internal
> 
> Comments/OK?

I guess the dep could probably be removed, but if libreoffice starts\
picking it up again in the future that could be annoying (it's *very*
likely that DPB junking will occur during a libreoffice build :-) so
maybe leave that alone.



CVS: cvs.openbsd.org: ports

2019-12-07 Thread Brian Callahan
CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2019/12/07 07:45:13

Modified files:
games/wtf  : Makefile distinfo 

Log message:
Update to wtf-20191201



UPDATE devel/cppunit

2019-12-07 Thread Björn Ketelaars
Enclosed diff brings cppunit to 1.14.0. Overview on changes can be found
at https://cgit.freedesktop.org/libreoffice/cppunit/tree/NEWS.

This update is actually from giovanni@ [0], and includes some input from
sthen@ and me.

Changes to the port:
- Bump major of SHARED_LIBS as symbols have been removed
- Updated HOMEPAGE and MASTER_SITES
- Removed base-gcc from COMPILER. This update needs C++11

Tests:
- Regression test passes
- Build tested all consumers, including libreoffice, and ran 'make test'
  on some of the smaller ones

BTW, it seems that libreoffice is currently _not_ using cppunit from
ports although it is listed as BDEP:

configure:24201: checking which cppunit to use
configure:24302: result: internal

Comments/OK?


[0] https://marc.info/?l=openbsd-ports=157444225202584=2


diff --git Makefile Makefile
index b9723aafdd7..0878e966577 100644
--- Makefile
+++ Makefile
@@ -2,25 +2,22 @@
 
 COMMENT=   c++ unit testing framework
 
-DISTNAME=  cppunit-1.12.1
-REVISION = 4
+DISTNAME=  cppunit-1.14.0
 
-SHARED_LIBS += cppunit  3.0  # .1.0
+SHARED_LIBS += cppunit 4.0 # 1.14.0
 
 CATEGORIES=devel
 
-# XXX dead.  Switch to newer releases at
-# https://freedesktop.org/wiki/Software/cppunit/ ?
-HOMEPAGE=  http://cppunit.sourceforge.net/
+HOMEPAGE=  https://www.freedesktop.org/wiki/Software/cppunit/
 
 # LGPLv2.1
 PERMIT_PACKAGE=Yes
 
 WANTLIB=   c m ${COMPILER_LIBCXX}
 
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=cppunit/}
+MASTER_SITES=  https://dev-www.libreoffice.org/src/
 
-COMPILER = base-clang ports-gcc base-gcc
+COMPILER = base-clang ports-gcc
 
 USE_GMAKE= Yes
 
diff --git distinfo distinfo
index a0869eaec88..b37b399fac8 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (cppunit-1.12.1.tar.gz) = rCigTI5skhfZELCucSKDLSjZkX+maLzJ4LiwmstOpEo=
-SIZE (cppunit-1.12.1.tar.gz) = 762803
+SHA256 (cppunit-1.14.0.tar.gz) = PVaYadJ7SIYCEMdYxPMTCCEDpeWCGadmm1K/0p1nR4A=
+SIZE (cppunit-1.14.0.tar.gz) = 959716
diff --git patches/patch-Makefile_in patches/patch-Makefile_in
index 58d53f248d2..02bda14216a 100644
--- patches/patch-Makefile_in
+++ patches/patch-Makefile_in
@@ -1,12 +1,13 @@
 $OpenBSD: patch-Makefile_in,v 1.1 2008/10/24 14:49:44 jasper Exp $
 Makefile.in.orig   Sun Oct 19 23:43:08 2008
-+++ Makefile.inSun Oct 19 23:43:11 2008
-@@ -231,7 +231,7 @@ top_builddir = @top_builddir@
+Index: Makefile.in
+--- Makefile.in.orig
 Makefile.in
+@@ -385,7 +385,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = 1.4
- ACLOCAL_AMFLAGS = -I config
+ ACLOCAL_AMFLAGS = -I m4
 -SUBDIRS = src include examples doc
 +SUBDIRS = src include examples
- pkgconfigdatadir = $(libdir)/pkgconfig
- pkgconfigdata_DATA = cppunit.pc
- bin_SCRIPTS = cppunit-config
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = cppunit.pc
+ doc_DATA = \
diff --git patches/patch-src_cppunit_Makefile_in 
patches/patch-src_cppunit_Makefile_in
index dd6c4cabd13..0410c349726 100644
--- patches/patch-src_cppunit_Makefile_in
+++ patches/patch-src_cppunit_Makefile_in
@@ -1,13 +1,14 @@
 $OpenBSD: patch-src_cppunit_Makefile_in,v 1.2 2008/10/24 14:49:44 jasper Exp $
 src/cppunit/Makefile.in.orig   Wed Feb 20 06:59:55 2008
-+++ src/cppunit/Makefile.inSun Oct 19 23:03:52 2008
-@@ -299,8 +299,7 @@ libcppunit_la_SOURCES = \
+Index: src/cppunit/Makefile.in
+--- src/cppunit/Makefile.in.orig
 src/cppunit/Makefile.in
+@@ -446,8 +446,7 @@ libcppunit_la_SOURCES = \
Win32DynamicLibraryManager.cpp
  
  libcppunit_la_LDFLAGS = \
 - -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-- -release $(LT_RELEASE)
+- -release $(LT_RELEASE) $(LIBADD_DL)
 + -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
+ libcppunit_la_LIBADD = $(LIBADD_DL)
  all: all-am
- 
diff --git pkg/PLIST pkg/PLIST
index 64890cb17e3..a8f51eda0af 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,6 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.3 2015/03/16 18:07:39 naddy Exp $
 @bin bin/DllPlugInTester
-bin/cppunit-config
 include/cppunit/
 include/cppunit/AdditionalMessage.h
 include/cppunit/Asserter.h
@@ -67,33 +66,27 @@ include/cppunit/plugin/PlugInParameters.h
 include/cppunit/plugin/TestPlugIn.h
 include/cppunit/plugin/TestPlugInDefaultImpl.h
 include/cppunit/portability/
-include/cppunit/portability/CppUnitDeque.h
-include/cppunit/portability/CppUnitMap.h
-include/cppunit/portability/CppUnitSet.h
-include/cppunit/portability/CppUnitStack.h
-include/cppunit/portability/CppUnitVector.h
 include/cppunit/portability/FloatingPoint.h
 include/cppunit/portability/Stream.h
 include/cppunit/tools/
 include/cppunit/tools/Algorithm.h
+include/cppunit/tools/StringHelper.h
 include/cppunit/tools/StringTools.h
 include/cppunit/tools/XmlDocument.h
 include/cppunit/tools/XmlElement.h
 include/cppunit/ui/
-include/cppunit/ui/mfc/

CVS: cvs.openbsd.org: ports

2019-12-07 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2019/12/07 07:35:12

Modified files:
mail/neomutt   : Makefile distinfo 
mail/neomutt/patches: patch-auto_def patch-nntp_newsrc_c 

Log message:
update to neomutt-20191207

>From upstream notes:

"Unfortunately, last week's release contained a few clumsy bugs.
Sorry about that.

With such complex code and only three developers, sometimes we miss things.
If you spot a problem with NeoMutt, please report it as soon as you can.

This release contains a couple of fixes for the IMAP behaviour.
They should make IMAP connections more reliable."

- for more details see https://github.com/neomutt/neomutt/releases/tag/20191207



CVS: cvs.openbsd.org: ports

2019-12-07 Thread Solene Rapenne
CVSROOT:/cvs
Module name:ports
Changes by: sol...@cvs.openbsd.org  2019/12/07 01:50:47

Removed files:
games/gzdoom/patches: patch-src_gamedata_textures_animations_cpp 
  
patch-src_sound_mididevices_music_fluidsynth_mididevice_cpp 

Log message:
Remove empty patches

I thought cvs rm did work but I had to remove them first.