CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/04/16 23:58:30

Modified files:
graphics/opencv: Makefile 
graphics/opencv/patches: patch-CMakeLists_txt 
 patch-cmake_OpenCVFindLibsVideo_cmake 
 patch-cmake_OpenCVUtils_cmake 
 patch-modules_core_src_system_cpp 
Added files:
graphics/opencv/patches: patch-modules_python_src2_cv2_cv_hpp 

Log message:
Fix clang6 build

x11/kde/libs3 clang6 fixes

[Ingo Schwarze]

Hi,

it may seem presumptuous that i'm fanning out candidate fixes for
kde/libs3, given that i never used KDE or GNOME or anything similar
in my life.

Not sure whether i should ask for OKs for this...
I have mostly done code inspection, no testing,
and the package now builds.

My hope is mainly that this gets us started.

Then again, what can be worse than having it not build at all?
KDE3 is probably not the most bug-free and secure software
in the first place, right?

Once people start fixing the applications on top, testing will
happen anyway, maybe?

Yours,
  Ingo


Index: patches/patch-kate_part_katebuffer_cpp
===
RCS file: /cvs/ports/x11/kde/libs3/patches/patch-kate_part_katebuffer_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-kate_part_katebuffer_cpp
--- patches/patch-kate_part_katebuffer_cpp  19 Apr 2017 13:21:23 -  
1.1
+++ patches/patch-kate_part_katebuffer_cpp  17 Apr 2018 04:43:42 -
@@ -1,6 +1,16 @@
 $OpenBSD: patch-kate_part_katebuffer_cpp,v 1.1 2017/04/19 13:21:23 espie Exp $
 kate/part/katebuffer.cpp.orig  Tue Apr 18 16:35:12 2017
-+++ kate/part/katebuffer.cpp   Tue Apr 18 16:38:02 2017
+Index: kate/part/katebuffer.cpp
+--- kate/part/katebuffer.cpp.orig
 kate/part/katebuffer.cpp
+@@ -122,7 +122,7 @@ class KateFileLoader
+   if ((c >= 2) && (m_codec->mibEnum() == 1000) && (m_buffer[1] == 
0x00))
+   {
+ // utf16LE, we need to put the decoder in LE mode
+-char reverseUtf16[3] = {0xFF, 0xFE, 0x00};
++char reverseUtf16[3] = {'\377', '\376', '\0'};
+ m_decoder->toUnicode(reverseUtf16, 2);
+   }
+ 
 @@ -917,7 +917,7 @@ void KateBuffer::updatePreviousNotEmptyLine(KateBufBlo
} while (textLine->firstChar()==-1);
kdDebug(13020)<<"updatePreviousNotEmptyLine: updating 
line:"<<(blk->startLine()+current_line)<

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2018/04/16 21:44:52

Modified files:
games/xminehunter: Makefile 

Log message:
Use -std=gnu++98 for building to make clang6 happy.
ok schwarze@

Re: clang6: FIX for games/xminehunter

[Ingo Schwarze]

Hi Brian,

Brian Callahan wrote on Mon, Apr 16, 2018 at 05:54:00PM -0400:

> games/xminehunter is extremely old, the tarball and code is from 1997.
> I'm not sure it warrants more than this minimal fix.

You could probably fix it in the same way that i just used for net/nam,
but it would be even more ugly because the use of the _bits arrays
is scattered across more code.

So i think forcing the old standard is good enough.

> Runs fine.

Confirmed.

OK schwarze@
  Ingo

> Index: Makefile
> ===
> RCS file: /cvs/ports/games/xminehunter/Makefile,v
> retrieving revision 1.31
> diff -u -p -r1.31 Makefile
> --- Makefile  23 Oct 2017 17:10:50 -  1.31
> +++ Makefile  16 Apr 2018 21:53:36 -
> @@ -19,6 +19,8 @@ ALL_TARGET= xminehunter
>  FAKE_FLAGS=  INSTALL_BIN_PATH=${WRKINST}${PREFIX}/bin \
>   INSTALL_SCORE_PATH=${WRKINST}${PREFIX}/lib/X11/xminehunter
>  MAKE_ENV+=MOTIFLIB='-L${LOCALBASE}/lib -lXm'
> +MAKE_FLAGS=  CFLAGS="${CXXFLAGS} -std=gnu++98 \
> + -DMINE_SCORE_PATH=\\\"${LOCALBASE}/lib/X11/xminehunter\\\""
>  
>  NO_TEST= Yes

powerpc bulk build report

[landry]

bulk build on macppc-1.ports.openbsd.org
started on  Tue Mar 27 13:14:40 MDT 2018
finished at Mon Apr 16 17:22:45 MDT 2018
lasted 20D21h08m
done with kern.version=OpenBSD 6.3 (GENERIC.MP) #16: Sat Mar 24 16:32:29 MDT 
2018

built packages:8906
Mar 27:409
Mar 28:461
Mar 29:456
Mar 30:272
Mar 31:426
Apr 1:4548
Apr 2:412
Apr 3:195
Apr 4:172
Apr 5:230
Apr 6:257
Apr 7:295
Apr 8:421
Apr 9:351
Apr 10:332
Apr 11:287
Apr 12:250
Apr 13:352
Apr 14:349
Apr 15:381
Apr 16:2338


build failures: 32
http://build-failures.rhaalovely.net//powerpc/2018-03-27/audio/audacious-plugins.log
http://build-failures.rhaalovely.net//powerpc/2018-03-27/devel/catch2.log
http://build-failures.rhaalovely.net//powerpc/2018-03-27/devel/kf5/kio.log
http://build-failures.rhaalovely.net//powerpc/2018-03-27/devel/sdcc.log
http://build-failures.rhaalovely.net//powerpc/2018-03-27/devel/xtensa-elf/gcc.log
http://build-failures.rhaalovely.net//powerpc/2018-03-27/editors/scintilla.log
http://build-failures.rhaalovely.net//powerpc/2018-03-27/emulators/higan.log
http://build-failures.rhaalovely.net//powerpc/2018-03-27/emulators/ppsspp.log
http://build-failures.rhaalovely.net//powerpc/2018-03-27/emulators/retroarch.log
http://build-failures.rhaalovely.net//powerpc/2018-03-27/emulators/stella.log
http://build-failures.rhaalovely.net//powerpc/2018-03-27/games/easyrpg.log
http://build-failures.rhaalovely.net//powerpc/2018-03-27/games/fs2open.log
http://build-failures.rhaalovely.net//powerpc/2018-03-27/games/hyperrogue.log
http://build-failures.rhaalovely.net//powerpc/2018-03-27/games/pokerth.log
http://build-failures.rhaalovely.net//powerpc/2018-03-27/games/stockfish.log
http://build-failures.rhaalovely.net//powerpc/2018-03-27/graphics/orthanc/webviewer-plugin.log
http://build-failures.rhaalovely.net//powerpc/2018-03-27/graphics/piglit.log
http://build-failures.rhaalovely.net//powerpc/2018-03-27/graphics/simgear.log
http://build-failures.rhaalovely.net//powerpc/2018-03-27/inputmethods/fcitx,-gtk3.log
http://build-failures.rhaalovely.net//powerpc/2018-03-27/mail/rspamd.log
http://build-failures.rhaalovely.net//powerpc/2018-03-27/math/kst.log
http://build-failures.rhaalovely.net//powerpc/2018-03-27/net/libtorrent-rasterbar.log
http://build-failures.rhaalovely.net//powerpc/2018-03-27/productivity/kmymoney.log
http://build-failures.rhaalovely.net//powerpc/2018-03-27/www/drupal7/locale-fr.log
http://build-failures.rhaalovely.net//powerpc/2018-03-27/www/drupal7/locale-nl.log
http://build-failures.rhaalovely.net//powerpc/2018-03-27/www/ruby-capybara-webkit,ruby25.log
http://build-failures.rhaalovely.net//powerpc/2018-03-27/www/webkitgtk4.log
http://build-failures.rhaalovely.net//powerpc/2018-03-27/x11/gnome/usage.log
http://build-failures.rhaalovely.net//powerpc/2018-03-27/x11/kde4/pim-runtime.log
http://build-failures.rhaalovely.net//powerpc/2018-03-27/x11/qt5/qtgraphicaleffects.log
http://build-failures.rhaalovely.net//powerpc/2018-03-27/x11/qt5/qtquickcontrols.log
http://build-failures.rhaalovely.net//powerpc/2018-03-27/x11/qt5/qtquickcontrols2.log
Base libs:
c.92.3 crypto.43.1

X libs:

Re: Remove net/nepenthes

[Jeremie Courreges-Anglas]

On Tue, Apr 17 2018, Jeremie Courreges-Anglas  wrote:

[...]

> It builds with lots of warnings

I was looking at another port, nepenthes doesn't exhibit *that* many
warnings, but my proposal stands.

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Remove net/nepenthes

[Jeremie Courreges-Anglas]

net/nepenthes: honeypot software that hasn't seen a new release since
2008.  It links with touchy libs like libmagic and libpcre as noted
by sthen@.  It builds with lots of warnings and has been broken with
clang 4.0.0 and 6.0.1. I think keeping it on life support is doing more
harm than good.

Ok to remove it?

PS: people seem to point at https://github.com/DinoTools/dionaea as
a replacement.

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2018/04/16 17:40:48

Modified files:
graphics/aqsis : Makefile 

Log message:
Pass -std=gnu++03 to fix build with clang6

CVS: cvs.openbsd.org: ports

[Ingo Schwarze]

CVSROOT:/cvs
Module name:ports
Changes by: schwa...@cvs.openbsd.org2018/04/16 17:23:18

Modified files:
graphics/rawstudio: Makefile 
graphics/rawstudio/patches: patch-src_dcraw_cc 

Log message:
better clang6 fix: use adequate data types rather than forcing an
old version of the language standard; "please commit" sthen@

Re: [clang6] fix: net/nam

[Ingo Schwarze]

Hi,

i already committed a fix that doesn't require
forcing an old language standard.

Yours,
  Ingo


Giovanni Bechis wrote on Tue, Apr 17, 2018 at 12:36:12AM +0200:

> clang6 fix for net/nam, still a lot of warnings but at least it builds.

> Index: Makefile
> ===
> RCS file: /var/cvs/ports/net/nam/Makefile,v
> retrieving revision 1.40
> diff -u -p -r1.40 Makefile
> --- Makefile  26 Jul 2017 22:45:28 -  1.40
> +++ Makefile  16 Apr 2018 22:30:01 -
> @@ -35,6 +35,16 @@ CONFIGURE_ARGS=--with-tcl-ver=${MODTCL_
>   --x-includes=${X11BASE}/include \
>   --x-libraries=${X11BASE}/lib
>  
> +MAKE_ENV=CC="${CC}" \
> + CFLAGS="${CFLAGS}" \
> + CPPFLAGS="${CPPFLAGS}" \
> + CXXFLAGS="${CXXFLAGS}"
> +
> +.include 
> +.if ${PROPERTIES:Mclang}
> +CXXFLAGS +=  -std=c++03
> +.endif
> +
>  ALL_TARGET=
>  
>  NO_TEST= Yes
> Index: patches/patch-Makefile_in
> ===
> RCS file: patches/patch-Makefile_in
> diff -N patches/patch-Makefile_in
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-Makefile_in 16 Apr 2018 22:30:01 -
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: Makefile.in
> +--- Makefile.in.orig
>  Makefile.in
> +@@ -83,7 +83,7 @@ RM = rm -f
> + .SUFFIXES: .cc $(.SUFFIXES)
> + 
> + .cc.o:
> +-rm -f $@; $(CPP) -o $@ -c $(CFLAGS) $*.cc
> ++rm -f $@; $(CPP) -o $@ -c $(CXXFLAGS) $(CFLAGS) $*.cc
> + 
> + .c.o:
> + rm -f $@; $(CC) -o $@ -c $(CFLAGS) $*.c

CVS: cvs.openbsd.org: ports

[Ingo Schwarze]

CVSROOT:/cvs
Module name:ports
Changes by: schwa...@cvs.openbsd.org2018/04/16 17:16:52

Modified files:
net/nam: Makefile 
Added files:
net/nam/patches: patch-main_cc 

Log message:
clang6 fix; OK naddy@

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2018/04/16 17:05:32

Modified files:
net/nepenthes  : Makefile 
Added files:
net/nepenthes/patches: 
   patch-modules_module-honeytrap_TrapSocket_cpp 
   patch-modules_vuln-asn1_asn1-shellcodes_h 
   patch-modules_vuln-dcom_DCOMDialogue_cpp 
   patch-modules_vuln-dcom_dcom-shellcodes_h 
   patch-modules_vuln-iis_iis-shellcodes_h 
   patch-modules_vuln-mssql_mssql-shellcodes_h 
   
patch-modules_vuln-netbiosname_SMBNameDialogue_cpp 
   patch-modules_vuln-realvnc_vuln-realvnc_cpp 
   patch-modules_vuln-realvnc_vuln-realvnc_hpp 

Log message:
char -> unsigned char shellcodes[] fixes for clang6

Disclaimer: 10 years old, unmaintained honeypot software, soon to be
candidate for deletion.

[clang6] fix: net/nam

[Giovanni Bechis]

Hi,
clang6 fix for net/nam, still a lot of warnings but at least it builds.
 ok ? Comments ?
  Cheers
   Giovanni
Index: Makefile
===
RCS file: /var/cvs/ports/net/nam/Makefile,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile
--- Makefile26 Jul 2017 22:45:28 -  1.40
+++ Makefile16 Apr 2018 22:30:01 -
@@ -35,6 +35,16 @@ CONFIGURE_ARGS=  --with-tcl-ver=${MODTCL_
--x-includes=${X11BASE}/include \
--x-libraries=${X11BASE}/lib
 
+MAKE_ENV=  CC="${CC}" \
+   CFLAGS="${CFLAGS}" \
+   CPPFLAGS="${CPPFLAGS}" \
+   CXXFLAGS="${CXXFLAGS}"
+
+.include 
+.if ${PROPERTIES:Mclang}
+CXXFLAGS +=-std=c++03
+.endif
+
 ALL_TARGET=
 
 NO_TEST=   Yes
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile_in   16 Apr 2018 22:30:01 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: Makefile.in
+--- Makefile.in.orig
 Makefile.in
+@@ -83,7 +83,7 @@ RM   = rm -f
+ .SUFFIXES: .cc $(.SUFFIXES)
+ 
+ .cc.o:
+-  rm -f $@; $(CPP) -o $@ -c $(CFLAGS) $*.cc
++  rm -f $@; $(CPP) -o $@ -c $(CXXFLAGS) $(CFLAGS) $*.cc
+ 
+ .c.o:
+   rm -f $@; $(CC) -o $@ -c $(CFLAGS) $*.c


signature.asc
Description: PGP signature

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/16 16:21:40

Modified files:
textproc/wkhtmltopdf/patches: 
  patch-qt_mkspecs_openbsd-g++_qmake_conf 

Log message:
use --std=gnu++98 to unbreak with clang6 (avoiding c++03 to avoid extra mess
passing it through to qmake)

clang6: FIX for games/xminehunter

[Brian Callahan]

Hi ports --

games/xminehunter is extremely old, the tarball and code is from 1997.
I'm not sure it warrants more than this minimal fix.

Runs fine.

OK?

~Brian

Index: Makefile
===
RCS file: /cvs/ports/games/xminehunter/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile	23 Oct 2017 17:10:50 -	1.31
+++ Makefile	16 Apr 2018 21:53:36 -
@@ -19,6 +19,8 @@ ALL_TARGET=	xminehunter
 FAKE_FLAGS=	INSTALL_BIN_PATH=${WRKINST}${PREFIX}/bin \
 	INSTALL_SCORE_PATH=${WRKINST}${PREFIX}/lib/X11/xminehunter
 MAKE_ENV+=MOTIFLIB='-L${LOCALBASE}/lib -lXm'
+MAKE_FLAGS=	CFLAGS="${CXXFLAGS} -std=gnu++98 \
+		-DMINE_SCORE_PATH=\\\"${LOCALBASE}/lib/X11/xminehunter\\\""
 
 NO_TEST=	Yes
 

Re: clang6: FIX for devel/sdcc

[Christian Weisgerber]

On 2018-04-15, Brian Callahan  wrote:

> For some reason I'm not quite sure about, with clang6 sdcc decides it 
> needs to regen all its configure scripts.

There must be some kind of race condition.  It built in _some_ bulk
runs since the clang6 switch.

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

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/16 15:25:42

Modified files:
databases/strigi: Makefile 

Log message:
use --std=c++03 on clang arches

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2018/04/16 15:23:41

Modified files:
games/ja2-stracciatella: Makefile 

Log message:
Fix clang6 build -- MAKE_ENV line from David Carlier; un-hardcode a c++
while here from me.
ok bentley@

Re: [armv7 fix] Fix build lang/gcc/4.9

[Jeremie Courreges-Anglas]

On Mon, Apr 16 2018,  wrote:
> I tried to continue the build of php with the ports snapshot of today and ran 
> into another gcc problem:

[...]

> /usr/ports/pobj/gcc-4.9.4/gcc-4.9.4/gcc/config/arm/arm.md:97:16: warning: 
> equality comparison with
>   extraneous parentheses [-Wparentheses-equality]
> (thumb1_code)) == (
> ~~~^~~~
> /usr/ports/pobj/gcc-4.9.4/gcc-4.9.4/gcc/config/arm/arm.md:97:16: note: remove 
> extraneous parentheses
>   around the comparison to silence this warning
> (thumb1_code)) == (
>^
> /usr/ports/pobj/gcc-4.9.4/gcc-4.9.4/gcc/config/arm/arm.md:97:16: note: use 
> '=' to turn this equality
>   comparison into an assignment
> (thumb1_code)) == (
>^~
>=
> /usr/ports/pobj/gcc-4.9.4/gcc-4.9.4/gcc/config/arm/neon.md:3486:10917: fatal 
> error: bracket nesting
>   level exceeded maximum of 256
> /usr/ports/pobj/gcc-4.9.4/gcc-4.9.4/gcc/config/arm/neon.md:3486:10917: note: 
> use -fbracket-depth=N to
>   increase maximum nesting level
> 33 warnings and 1 error generated.
> gmake[3]: *** [Makefile:1058: insn-attrtab.o] Error 1

Well this seems to be handled by the diff in my previous mail, attached
again for convenience.  gcc (FLAVOR='no_java no_ada') packages, install,
and seems to run.  dpb ongoing.

Technically a clang-specific fix but it already happened with clang-5.0.


Index: patches/patch-gcc_configure
===
RCS file: /cvs/ports/lang/gcc/4.9/patches/patch-gcc_configure,v
retrieving revision 1.5
diff -u -p -r1.5 patch-gcc_configure
--- patches/patch-gcc_configure 1 Sep 2016 17:30:33 -   1.5
+++ patches/patch-gcc_configure 15 Apr 2018 23:47:01 -
@@ -1,7 +1,20 @@
 $OpenBSD: patch-gcc_configure,v 1.5 2016/09/01 17:30:33 pascal Exp $
 gcc/configure.orig Sun May 22 10:53:32 2016
-+++ gcc/configure  Sat Aug  6 19:19:05 2016
-@@ -17367,7 +17367,7 @@ openbsd*)
+Index: gcc/configure
+--- gcc/configure.orig
 gcc/configure
+@@ -6597,6 +6597,11 @@ $as_echo "$ac_res" >&6; }
+ fi
+   done
+ CFLAGS="$save_CFLAGS"
++if [[ `uname -m` == armv7 ]] ; then
++  if $CC --version 2>&1 | grep clang; then
++noexception_flags="$noexception_flags -fbracket-depth=512"
++  fi
++fi
+ 
+ 
+ # Enable expensive internal checks
+@@ -17367,7 +17372,7 @@ openbsd*)
  *)need_version=no  ;;
esac
library_names_spec='${libname}${release}${shared_ext}$versuffix 
${libname}${shared_ext}$versuffix'
@@ -10,7 +23,7 @@ $OpenBSD: patch-gcc_configure,v 1.5 2016
shlibpath_var=LD_LIBRARY_PATH
if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test 
"$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
  case $host_os in
-@@ -21027,7 +21027,7 @@ openbsd*)
+@@ -21027,7 +21032,7 @@ openbsd*)
  *)need_version=no  ;;
esac
library_names_spec='${libname}${release}${shared_ext}$versuffix 
${libname}${shared_ext}$versuffix'
@@ -19,7 +32,7 @@ $OpenBSD: patch-gcc_configure,v 1.5 2016
shlibpath_var=LD_LIBRARY_PATH
if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test 
"$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
  case $host_os in
-@@ -27522,6 +27522,7 @@ else
+@@ -27522,6 +27527,7 @@ else
  fi
  
  ;;


-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2018/04/16 15:12:47

Modified files:
games/meandmyshadow: Makefile 

Log message:
Fix clang6 build
ok bentley@

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2018/04/16 15:09:25

Modified files:
devel/sdcc : Makefile 
devel/sdcc/pkg : PLIST 

Log message:
Fix clang6 build. It is because sdcc regenerates its configure scripts at
build time with clang6. We don't know why but I put a comment in the port
Makefile saying such so that we don't accidentally remove those BDEPS.
ok jca@

CVS: cvs.openbsd.org: ports

[Frederic Cambus]

CVSROOT:/cvs
Module name:ports
Changes by: fcam...@cvs.openbsd.org 2018/04/16 15:01:30

Modified files:
emulators/BasiliskII: Makefile 
Added files:
emulators/BasiliskII/patches: patch-src_Unix_clip_unix_cpp 

Log message:
Fix build with Clang 6, from upstream.

OK schwarze@

Re: [UPDATE] www/links+ to 1.15

[Stuart Henderson]

On 2018/04/16 16:34, trondd wrote:
> On Mon, April 16, 2018 7:01 am, Stuart Henderson wrote:
> > On 2018/04/15 16:48, trondd wrote:
> >> What is the policy around setting SEPARATE_BUILD?  Any GNU build?  Not
> >> just builds that require it?
> >
> > It's useful for large ports where you might want to "make clean=build"
> > and they take a long time to extract/patch.
> >
> > Otherwise it's pointless and can make extra work for updates because
> > upstreams often don't test out-of-tree builds (and especially "make
> > test" in that case) regularly.
> >
> 
> I don't consider links+ to be a large port.  It builds either way, so I
> don't have a strong opinion about it.
> 
> Whatever it takes to get it commited.
> 

At the moment what it'll take is getting the clang 6 fallout under
control before we start committing other things again, other things
are pretty much all on hold at present.

Re: [UPDATE] www/links+ to 1.15

[trondd]

On Mon, April 16, 2018 7:01 am, Stuart Henderson wrote:
> On 2018/04/15 16:48, trondd wrote:
>> What is the policy around setting SEPARATE_BUILD?  Any GNU build?  Not
>> just builds that require it?
>
> It's useful for large ports where you might want to "make clean=build"
> and they take a long time to extract/patch.
>
> Otherwise it's pointless and can make extra work for updates because
> upstreams often don't test out-of-tree builds (and especially "make
> test" in that case) regularly.
>

I don't consider links+ to be a large port.  It builds either way, so I
don't have a strong opinion about it.

Whatever it takes to get it commited.

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2018/04/16 14:19:15

Modified files:
audio/hydrogen : Makefile 
Added files:
audio/hydrogen/patches: 
patch-libs_hydrogen_src_local_file_mgr_cpp 
patch-libs_hydrogen_src_xml_tinyxmlparser_cpp 

Log message:
fix build with clang6 and fix some error path return values; informed
by changes in upstream git

Re: [armv7 fix] Fix build lang/gcc/4.9

[s_graf]

I tried to continue the build of php with the ports snapshot of today and ran 
into another gcc problem:

/usr/ports/pobj/gcc-4.9.4/gcc-4.9.4/gcc/config/arm/arm.md:97:16: note: remove 
extraneous parentheses
  around the comparison to silence this warning
(thumb1_code)) == (
   ^
/usr/ports/pobj/gcc-4.9.4/gcc-4.9.4/gcc/config/arm/arm.md:97:16: note: use '=' 
to turn this equality
  comparison into an assignment
(thumb1_code)) == (
   ^~
   =
/usr/ports/pobj/gcc-4.9.4/gcc-4.9.4/gcc/config/arm/arm.md:97:16: warning: 
equality comparison with
  extraneous parentheses [-Wparentheses-equality]
(thumb1_code)) == (
~~~^~~~
/usr/ports/pobj/gcc-4.9.4/gcc-4.9.4/gcc/config/arm/arm.md:97:16: note: remove 
extraneous parentheses
  around the comparison to silence this warning
(thumb1_code)) == (
   ^
/usr/ports/pobj/gcc-4.9.4/gcc-4.9.4/gcc/config/arm/arm.md:97:16: note: use '=' 
to turn this equality
  comparison into an assignment
(thumb1_code)) == (
   ^~
   =
/usr/ports/pobj/gcc-4.9.4/gcc-4.9.4/gcc/config/arm/arm.md:97:16: warning: 
equality comparison with
  extraneous parentheses [-Wparentheses-equality]
(thumb1_code)) == (
~~~^~~~
/usr/ports/pobj/gcc-4.9.4/gcc-4.9.4/gcc/config/arm/arm.md:97:16: note: remove 
extraneous parentheses
  around the comparison to silence this warning
(thumb1_code)) == (
   ^
/usr/ports/pobj/gcc-4.9.4/gcc-4.9.4/gcc/config/arm/arm.md:97:16: note: use '=' 
to turn this equality
  comparison into an assignment
(thumb1_code)) == (
   ^~
   =
/usr/ports/pobj/gcc-4.9.4/gcc-4.9.4/gcc/config/arm/arm.md:97:16: warning: 
equality comparison with
  extraneous parentheses [-Wparentheses-equality]
(thumb1_code)) == (
~~~^~~~
/usr/ports/pobj/gcc-4.9.4/gcc-4.9.4/gcc/config/arm/arm.md:97:16: note: remove 
extraneous parentheses
  around the comparison to silence this warning
(thumb1_code)) == (
   ^
/usr/ports/pobj/gcc-4.9.4/gcc-4.9.4/gcc/config/arm/arm.md:97:16: note: use '=' 
to turn this equality
  comparison into an assignment
(thumb1_code)) == (
   ^~
   =
/usr/ports/pobj/gcc-4.9.4/gcc-4.9.4/gcc/config/arm/neon.md:3486:10917: fatal 
error: bracket nesting
  level exceeded maximum of 256
/usr/ports/pobj/gcc-4.9.4/gcc-4.9.4/gcc/config/arm/neon.md:3486:10917: note: 
use -fbracket-depth=N to
  increase maximum nesting level
33 warnings and 1 error generated.
gmake[3]: *** [Makefile:1058: insn-attrtab.o] Error 1
gmake[3]: Leaving directory '/usr/ports/pobj/gcc-4.9.4/build-arm/gcc'
gmake[2]: *** [Makefile:4217: all-stage1-gcc] Error 2
gmake[2]: Leaving directory '/usr/ports/pobj/gcc-4.9.4/build-arm'
gmake[1]: *** [Makefile:17735: stage1-bubble] Error 2
gmake[1]: Leaving directory '/usr/ports/pobj/gcc-4.9.4/build-arm'
gmake: *** [Makefile:17872: bootstrap2] Error 2
*** Error 2 in /usr/ports/lang/gcc/4.9 
(/usr/ports/infrastructure/mk/bsd.port.mk:2740 
'/usr/ports/pobj/gcc-4.9.4/build-arm/.build_done')
*** Error 1 in /usr/ports/lang/gcc/4.9 
(/usr/ports/infrastructure/mk/bsd.port.mk:1938 
'/usr/ports/packages/arm/all/gcc-4.9.4p8.tgz')
*** Error 1 in /usr/ports/lang/gcc/4.9 
(/usr/ports/infrastructure/mk/bsd.port.mk:2438 '_internal-package')
*** Error 1 in /usr/ports/lang/gcc/4.9 
(/usr/ports/infrastructure/mk/bsd.port.mk:2417 'package')
*** Error 1 in /usr/ports/lang/gcc/4.9 
(/usr/ports/infrastructure/mk/bsd.port.mk:1956 
'/var/db/pkg/gcc-4.9.4p8/+CONTENTS')
*** Error 1 in /usr/ports/lang/gcc/4.9 
(/usr/ports/infrastructure/mk/bsd.port.mk:2417 'install')
*** Error 1 in /usr/ports/devel/libuv 
(/usr/ports/infrastructure/mk/bsd.port.mk:2073 
'/usr/ports/pobj/libuv-1.19.1/.dep-STEM-ge-4.9,lt-4.10-lang-gcc-4.9')
*** Error 1 in /usr/ports/devel/libuv 
(/usr/ports/infrastructure/mk/bsd.port.mk:2506 
'/usr/ports/pobj/libuv-1.19.1/.extract_done')
*** Error 1 in /usr/ports/devel/libuv 
(/usr/ports/infrastructure/mk/bsd.port.mk:1938 
'/usr/ports/packages/arm/all/libuv-1.19.1.tgz')
*** Error 1 in /usr/ports/devel/libuv 
(/usr/ports/infrastructure/mk/bsd.port.mk:2438 '_internal-package')
*** Error 1 in /usr/ports/devel/libuv 
(/usr/ports/infrastructure/mk/bsd.port.mk:2417 'package')
*** Error 1 in /usr/ports/devel/libuv 
(/usr/ports/infrastructure/mk/bsd.port.mk:1956 
'/var/db/pkg/libuv-1.19.1/+CONTENTS')
*** Error 1 in /usr/ports/devel/libuv 
(/usr/ports/infrastructure/mk/bsd.port.mk:2417 'install')
*** Error 1 in /usr/ports/devel/cmake 
(/usr/ports/infrastructure/mk/bsd.port.mk:2073 
'/usr/ports/pobj/cmake-3.10.2/.dep-devel-libuv')
*** Error 1 in /usr/ports/devel/cmake 
(/usr/ports/infrastructure/mk/bsd.port.mk:2506 
'/usr/ports/pobj/cmake-3.10.2/.extract_done')
*** Error 1 in /usr/ports/devel/cmake 
(/usr/ports/infrastructure/mk/bsd.port.mk:1938 
'/usr/ports/packages/arm/all/cmake-3.10.2.tgz')
*** Error 1 in /usr/ports/devel/cmake 
(/usr/ports/infrastructure/mk/bsd.port.mk:2438 

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/04/16 14:01:22

Modified files:
devel/qt-creator: Makefile 

Log message:
bump after plist changes

Spotted by kili@ Thanks!

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/16 12:50:53

Modified files:
net/nepenthes/patches: patch-nepenthes-core_src_Utilities_cpp 

Log message:
de-register, first part needed for clang6 support (also needs fixes for
-Wc++11-narrowing in asn1-shellcodes.h)

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/04/16 12:27:53

Modified files:
devel/qt-creator: Makefile 
devel/qt-creator/pkg: PLIST 

Log message:
Unbreak with clang6

Add LLVM_INSTALL_DIR to help QMake. After the update some plugins are no longer
necessary. Update PLIST and regen WANTLIB

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/04/16 12:16:45

Added files:
geo/qlandkartegt/patches: patch-3rdparty_cache2gtiff_main_cpp 
  patch-3rdparty_map2gcm_main_cpp 
  patch-3rdparty_map2jnx_main_cpp 
  patch-3rdparty_map2rmap_main_cpp 
  patch-3rdparty_map2rmp_CFileGenerator_cpp 
  patch-3rdparty_map2rmp_main_cpp 
  patch-src_CRouteToolWidget_cpp 
  patch-src_version_h 

Log message:
clang6 fixes, thx naddy for the cluestick

emulators/qemu: use MAP_STACK in qemu_alloc_stack()

[Sebastien Marie]

Hi,

The following diff adds MAP_STACK on allocated memory used for stack.

(Please note a diff on the kernel is pending for completely let qemu to
run - see https://marc.info/?l=openbsd-tech=152389221205108=2)


While compiling the port, I also see the following notice at end of
configure:

WARNING: SUPPORT FOR THIS HOST OS WILL GO AWAY IN FUTURE RELEASES!

Host OS OpenBSD support is not currently maintained.
The QEMU project intends to remove support for this host OS in
a future release if nobody volunteers to maintain it and to
provide a build host for our continuous integration setup.
configure has succeeded and you can continue to build, but
if you care about QEMU on this platform you should contact
us upstream at qemu-de...@nongnu.org.

Should we be worried ?
-- 
Sebastien Marie


Index: Makefile
===
RCS file: /cvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.176
diff -u -p -r1.176 Makefile
--- Makefile16 Feb 2018 14:48:14 -  1.176
+++ Makefile16 Apr 2018 17:56:36 -
@@ -7,6 +7,7 @@ ONLY_FOR_ARCHS= aarch64 amd64 arm i386 p
 COMMENT=   multi system emulator
 
 DISTNAME=  qemu-2.11.1
+REVISION=  0
 CATEGORIES=emulators
 MASTER_SITES=  http://wiki.qemu.org/download/
 EXTRACT_SUFX=  .tar.xz
Index: patches/patch-util_oslib-posix_c
===
RCS file: patches/patch-util_oslib-posix_c
diff -N patches/patch-util_oslib-posix_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-util_oslib-posix_c16 Apr 2018 17:56:36 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+Pass MAP_STACK flag when allocating memory for stack usage.
+Index: util/oslib-posix.c
+--- util/oslib-posix.c.orig
 util/oslib-posix.c
+@@ -538,7 +538,7 @@ void *qemu_alloc_stack(size_t *sz)
+ *sz += pagesz;
+ 
+ ptr = mmap(NULL, *sz, PROT_READ | PROT_WRITE,
+-   MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
++   MAP_PRIVATE | MAP_ANONYMOUS | MAP_STACK, -1, 0);
+ if (ptr == MAP_FAILED) {
+ perror("failed to allocate memory for stack");
+ abort();

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2018/04/16 11:51:41

Added files:
audio/lmms/patches: patch-src_gui_about_dialog_cpp 

Log message:
whitespace fix for clang6

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2018/04/16 11:28:54

Added files:
productivity/aqbanking/patches: 

patch-src_plugins_backends_aqhbci_tools_hbcixml_hbcixml_cpp 

Log message:
whitespace fix for clang6

Re: clang6 fallout

[Stuart Henderson]

On 2018/04/16 17:00, Christian Weisgerber wrote:
> We still can't build libreoffice.

libreoffice at least needs this fixed:

http://build-failures.rhaalovely.net/amd64/2018-04-15/databases/strigi.log

/usr/obj/ports/strigi-0.7.7pl1/strigi-0.7.7pl1/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp:324:31:
 error: no matching function for call to 'make_pair'
doc.properties.insert(make_pair(
  ^~~
/usr/include/c++/v1/utility:522:1: note: candidate function not viable: no 
known conversion from 'std::__1::string' (aka 'basic_string') to 'std::__1::basic_string &&' for 
2nd argument
make_pair(_T1&& __t1, _T2&& __t2)
^
1 error generated.
ninja: build stopped: subcommand failed.

Re: clang6 fallout

[Christian Weisgerber]

We still can't build libreoffice.

Updated list as of Apr 16, 17:00 UTC.  Logs at
http://build-failures.rhaalovely.net/amd64/2018-04-15/

audio/clementine
audio/hydrogen
audio/lmms
cad/kicad
databases/strigi
devel/qt-creator
emulators/BasiliskII
games/alephone/alephone
games/ja2-stracciatella
games/meandmyshadow
games/stepmania
games/xminehunter
geo/qlandkartegt
graphics/aqsis
graphics/opencv
net/nam
net/nepenthes
net/retroshare
productivity/aqbanking
textproc/wkhtmltopdf
x11/kde/libs3
x11/kde4/smokeqt

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

net/nam clang6 fix

[Ingo Schwarze]

Hi,

not sure about the following one, there must be a less ugly way?

The problem is that there are *many* files containing lozts of
instances of

  const char foo[] = { ..., 0xff, ..., 0xc0, ... }

which is not good on signed char archs.  Patching all these files
would be even more noisy than s/char/unsigned char/ at the one
central place.  But then, the Tk_DefineBitmap(3tk) API wants
const char *, so we have to cast...

Hum...
  Ingo


Index: Makefile
===
RCS file: /cvs/ports/net/nam/Makefile,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile
--- Makefile26 Jul 2017 22:45:28 -  1.40
+++ Makefile16 Apr 2018 16:24:54 -
@@ -5,7 +5,7 @@ COMMENT=UCB/LBNL Network Animator
 V= 1.15
 DISTNAME=  nam-src-$V
 PKGNAME=   nam-$V
-REVISION = 1
+REVISION = 2
 CATEGORIES=net
 MAINTAINER =   Stuart Cassoff 
 
Index: patches/patch-main_cc
===
RCS file: patches/patch-main_cc
diff -N patches/patch-main_cc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-main_cc   16 Apr 2018 16:24:54 -
@@ -0,0 +1,124 @@
+$OpenBSD$
+
+clang6 fix: cannot store 0xff etc. in a char
+
+Index: main.cc
+--- main.cc.orig
 main.cc
+@@ -106,6 +106,7 @@ const char* namearg(int argc, const char*const* argv, 
+   return (appname);
+ }
+ 
++#define char unsigned char
+ #include "bitmap/play.xbm"
+ #include "bitmap/back.xbm"
+ #include "bitmap/stop.xbm"
+@@ -136,75 +137,79 @@ const char* namearg(int argc, const char*const* argv, 
+ #include "bitmap/delete.xbm"
+ #include "bitmap/netedit.xbm"
+ #include "bitmap/netview.xbm"
++#undef char
+ 
++#define CHARCAST(bits) reinterpret_cast(bits)
++
+ void loadbitmaps(Tcl_Interp* tcl)
+ {
+ //Tk_DefineBitmap(tcl, Tk_GetUid("edit"),
+ //edit_bits, edit_width, edit_height);
+   Tk_DefineBitmap(tcl, Tk_GetUid("netedit"),
+-  netedit_bits, netedit_width, netedit_height);
++  CHARCAST(netedit_bits), netedit_width, netedit_height);
+   Tk_DefineBitmap(tcl, Tk_GetUid("netview"),
+-  netview_bits, netview_width, netview_height);
++  CHARCAST(netview_bits), netview_width, netview_height);
+   Tk_DefineBitmap(tcl, Tk_GetUid("nodeup"),
+-  nodeup_bits, nodeup_width, nodeup_height);
++  CHARCAST(nodeup_bits), nodeup_width, nodeup_height);
+   Tk_DefineBitmap(tcl, Tk_GetUid("nodedown"),
+-  nodedown_bits, nodedown_width, nodedown_height);
++  CHARCAST(nodedown_bits), nodedown_width, nodedown_height);
+ 
+   Tk_DefineBitmap(tcl, Tk_GetUid("play"),
+-  play_bits, play_width, play_height);
++  CHARCAST(play_bits), play_width, play_height);
+   Tk_DefineBitmap(tcl, Tk_GetUid("back"),
+-  back_bits, back_width, back_height);
++  CHARCAST(back_bits), back_width, back_height);
+   Tk_DefineBitmap(tcl, Tk_GetUid("stop"),
+-  stop_bits, stop_width, stop_height);
++  CHARCAST(stop_bits), stop_width, stop_height);
+   Tk_DefineBitmap(tcl, Tk_GetUid("eject"),
+-  eject_bits, eject_width, eject_height);
++  CHARCAST(eject_bits), eject_width, eject_height);
+ 
+   Tk_DefineBitmap(tcl, Tk_GetUid("rew"),
+-  rew_bits, rew_width, rew_height);
++  CHARCAST(rew_bits), rew_width, rew_height);
+   Tk_DefineBitmap(tcl, Tk_GetUid("ff"),
+-  ff_bits, ff_width, ff_height);
++  CHARCAST(ff_bits), ff_width, ff_height);
+   Tk_DefineBitmap(tcl, Tk_GetUid("monitors"),
+-  monitors_bits, monitors_width, monitors_height);
++  CHARCAST(monitors_bits), monitors_width, monitors_height);
+   Tk_DefineBitmap(tcl, Tk_GetUid("time"),
+-  time_bits, time_width, time_height);
++  CHARCAST(time_bits), time_width, time_height);
+   Tk_DefineBitmap(tcl, Tk_GetUid("zoomin"),
+-  zoomin_bits, zoomin_width, zoomin_height);
++  CHARCAST(zoomin_bits), zoomin_width, zoomin_height);
+   Tk_DefineBitmap(tcl, Tk_GetUid("zoomout"),
+-  zoomout_bits, zoomout_width, zoomout_height);
++  CHARCAST(zoomout_bits), zoomout_width, zoomout_height);
+   Tk_DefineBitmap(tcl, Tk_GetUid("pullright"),
+-  pullright_bits, pullright_width, pullright_height);
++  CHARCAST(pullright_bits), pullright_width, pullright_height);
+ 
+   // Used in nam editor toolbar
+   Tk_DefineBitmap(tcl, Tk_GetUid("select"),
+-  select_bits, select_width, select_height);
++  CHARCAST(select_bits), select_width, select_height);
+   Tk_DefineBitmap(tcl, Tk_GetUid("addnode"),
+-  

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2018/04/16 09:54:14

Added files:
graphics/qimageblitz/patches: patch-blitz_convolve_cpp 

Log message:
fix build with clang6: false is not a pointer

Re: graphics/rawstudio clang6 fix

[Stuart Henderson]

On 2018/04/16 17:13, Ingo Schwarze wrote:
> Hi,
> 
> not sure how to really test, but the following seems correct
> from code inspection, fixes the build, and the program still
> starts.
> 
> Note that upstream is now at 2.0 and has rewritten everything
> in C, no more C++, so no need to report upstream.

Ah, I didn't see your mail while I was working on this, I've already
committed a dumber diff for this, though I can pull that out and add yours
if you prefer.

If anyone is interested in updating to 2.0 here's a starting point which
builds and runs, but it's doing strange things with colours in my testing,
and it's easy to make it segfault.

Index: Makefile
===
RCS file: /cvs/ports/graphics/rawstudio/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile16 Apr 2018 15:40:01 -  1.28
+++ Makefile16 Apr 2018 15:48:30 -
@@ -1,9 +1,10 @@
 # $OpenBSD: Makefile,v 1.28 2018/04/16 15:40:01 sthen Exp $
 
+SHARED_LIBS += rawstudio-2.0 0.0 # 0.0
+
 COMMENT =  tool for working with RAW images
 
-DISTNAME = rawstudio-1.2
-REVISION = 16
+DISTNAME = rawstudio-2.0
 
 CATEGORIES =   graphics
 
@@ -14,21 +15,29 @@ MASTER_SITES =  ${HOMEPAGE}files/release/
 PERMIT_PACKAGE_CDROM = Yes
 
 WANTLIB += ${COMPILER_LIBCXX} X11 Xcomposite Xcursor Xdamage Xext
-WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo dbus-1
-WANTLIB += exiv2 fontconfig freetype gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0
-WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0
-WANTLIB += intl jpeg lcms m pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += tiff xml2 z
+WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo crypto
+WANTLIB += curl dbus-1 dbus-glib-1 exif exiv2 expat ffi fftw3f
+WANTLIB += flickcurl fontconfig freetype gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0
+WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gphoto2 gphoto2_port
+WANTLIB += graphite2 gthread-2.0 gtk-x11-2.0 harfbuzz iconv intl
+WANTLIB += jpeg lcms lensfun ltdl lzma m nghttp2 pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 pcre pixman-1 png raptor2 sqlite3 ssl
+WANTLIB += tiff xcb xcb-render xcb-shm xml2 xslt yajl z
 
 CONFIGURE_STYLE =  gnu
-CXXFLAGS +=--std=gnu++98
 CONFIGURE_ENV +=   CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib
 
+LIBTOOL_FLAGS += --tag=disable-static
+
 LIB_DEPENDS += graphics/exiv2 \
graphics/lcms \
+   graphics/lensfun \
+   graphics/libgphoto2 \
devel/gconf2 \
devel/gettext \
+   math/fftw3,float \
+   net/flickcurl \
x11/dbus \
x11/gtk+2
 
Index: distinfo
===
RCS file: /cvs/ports/graphics/rawstudio/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo2 Jan 2014 12:21:49 -   1.4
+++ distinfo16 Apr 2018 15:48:30 -
@@ -1,2 +1,2 @@
-SHA256 (rawstudio-1.2.tar.gz) = vOhSW70NWakJekQE4NcIVvqlxnH3fNMsoNKMe8KObYU=
-SIZE (rawstudio-1.2.tar.gz) = 516171
+SHA256 (rawstudio-2.0.tar.gz) = FM1a/zFcqaKOw1ntLaDZk/ACK1SKF1HyCEY+qCOyp/w=
+SIZE (rawstudio-2.0.tar.gz) = 1537703
Index: patches/patch-librawstudio_rs-macros_h
===
RCS file: patches/patch-librawstudio_rs-macros_h
diff -N patches/patch-librawstudio_rs-macros_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-librawstudio_rs-macros_h  16 Apr 2018 15:48:30 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Index: librawstudio/rs-macros.h
+--- librawstudio/rs-macros.h.orig
 librawstudio/rs-macros.h
+@@ -51,8 +51,8 @@
+ #if __GNUC__ >= 3
+ #define likely(x) __builtin_expect (!!(x), 1)
+ #define unlikely(x) __builtin_expect (!!(x), 0)
+-#define align(x) __attribute__ ((aligned (x)))
+-#define __deprecated __attribute__ ((deprecated))
++// #define align(x) __attribute__ ((aligned (x)))
++// #define __deprecated __attribute__ ((deprecated))
+ #else
+ #define likely(x) (x)
+ #define unlikely(x) (x)
Index: patches/patch-plugins_denoise_fftwindow_cpp
===
RCS file: patches/patch-plugins_denoise_fftwindow_cpp
diff -N patches/patch-plugins_denoise_fftwindow_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-plugins_denoise_fftwindow_cpp 16 Apr 2018 15:48:30 -
@@ -0,0 +1,46 @@
+$OpenBSD$
+
+from freebsd bug 216771
+
+"Fix build of graphics/rawstudio with clang (or any recent optimizing
+compiler), by using anonymous labels in asm fragments."
+
+Index: plugins/denoise/fftwindow.cpp
+--- plugins/denoise/fftwindow.cpp.orig
 plugins/denoise/fftwindow.cpp
+@@ -174,7 +174,7 @@ void FFTWindow::applyAnalysisWindowSSE( FloatImagePlan
+ if ((uintptr_t)src1 & 15) {
+   asm volatile 
+   ( 
+-  "loop_analysis_sse_ua:\n"
++  "1:\n"
+ 

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2018/04/16 09:49:30

Added files:
graphics/discwrapper/patches: patch-src_MouseHandling_cpp 
  patch-src_PreviewOutput_cpp 

Log message:
fix build with clang6: NULL is not an int

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/16 09:40:01

Modified files:
graphics/rawstudio: Makefile 
graphics/rawstudio/pkg: PLIST 

Log message:
unbreak rawstudio build with std=gnu++98 which works better with the
c-renamed-as-c++ file.  regen plist while there.

graphics/discwrapper clang6 fix

[Ingo Schwarze]

Hi,

initialize to the correct data type.
Makes it build, and the program still
saves and opens project files for me.

Yours,
  Ingo


Index: Makefile
===
RCS file: /cvs/ports/graphics/discwrapper/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile26 Jul 2017 22:45:23 -  1.9
+++ Makefile16 Apr 2018 15:36:39 -
@@ -3,7 +3,7 @@
 COMMENT=   disc cover designer
 
 DISTNAME=  discwrapper-1.2.2
-REVISION = 1
+REVISION = 2
 CATEGORIES=graphics
 
 HOMEPAGE=  http://discwrapper.sourceforge.net/
Index: patches/patch-src_MouseHandling_cpp
===
RCS file: patches/patch-src_MouseHandling_cpp
diff -N patches/patch-src_MouseHandling_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_MouseHandling_cpp 16 Apr 2018 15:36:39 -
@@ -0,0 +1,43 @@
+$OpenBSD$
+
+clang6 fix:  says typedef int wxCoord;
+
+Index: src/MouseHandling.cpp
+--- src/MouseHandling.cpp.orig
 src/MouseHandling.cpp
+@@ -88,7 +88,7 @@ void DiscWrapperFrame::OnLeftDown(wxMouseEvent& event)
+ 
dc.SetFont(Database->Page[Cpage].labels[SelectedItem].Font.GetChosenFont());
   // Apply Font and Color then draw text with the chosen coordinates and 
angle
+ 
dc.SetTextForeground(Database->Page[Cpage].labels[SelectedItem].Colour.GetColour());
+ wxFont Xfont = 
Database->Page[Cpage].labels[SelectedItem].Font.GetChosenFont();
+-wxCoord wi, he, xc = NULL;
++wxCoord wi, he, xc = 0;
+ 
dc.GetMultiLineTextExtent(Database->Page[Cpage].labels[SelectedItem].L, & wi, & 
he, , );
+ if ( wi == 0 )
+ wi = he = 100;
+@@ -423,7 +423,7 @@ void DiscWrapperFrame::OnLeftDown(wxMouseEvent& event)
+ dc.SetFont(Database->Page[Cpage].labels[i].Font.GetChosenFont()); 
  // Apply Font and Color then draw text with the chosen coordinates 
and angle
+ 
dc.SetTextForeground(Database->Page[Cpage].labels[i].Colour.GetColour());
+ wxFont Xfont = 
Database->Page[Cpage].labels[i].Font.GetChosenFont();
+-wxCoord w, h, xc = NULL;
++wxCoord w, h, xc = 0;
+ dc.GetMultiLineTextExtent(Database->Page[Cpage].labels[i].L, & w, 
& h, , );
+ if ( w == 0 )
+ w = h = 100 ;
+@@ -652,7 +652,7 @@ void DiscWrapperFrame::OnDragging(wxMouseEvent& event)
+ 
dc.SetFont(Database->Page[Cpage].labels[SelectedItem].Font.GetChosenFont());
   // Apply Font and Color then draw text with the chosen coordinates and 
angle
+ 
dc.SetTextForeground(Database->Page[Cpage].labels[SelectedItem].Colour.GetColour());
+ wxFont Xfont = 
Database->Page[Cpage].labels[SelectedItem].Font.GetChosenFont();
+-wxCoord wi, he, xc = NULL;
++wxCoord wi, he, xc = 0;
+ 
dc.GetMultiLineTextExtent(Database->Page[Cpage].labels[SelectedItem].L, & wi, & 
he, , );
+ if ( wi == 0 )
+ wi = he = 100;
+@@ -1664,7 +1664,7 @@ void DiscWrapperFrame::OnLeftDouble(wxMouseEvent& even
+ 
dc.SetFont(Database->Page[Cpage].labels[SelectedItem].Font.GetChosenFont());
   // Apply Font and Color then draw text with the chosen coordinates and 
angle
+ 
dc.SetTextForeground(Database->Page[Cpage].labels[SelectedItem].Colour.GetColour());
+ wxFont Xfont = 
Database->Page[Cpage].labels[SelectedItem].Font.GetChosenFont();
+-wxCoord wi, he, xc = NULL;
++wxCoord wi, he, xc = 0;
+ 
dc.GetMultiLineTextExtent(Database->Page[Cpage].labels[SelectedItem].L, & wi, & 
he, , );
+ if ( wi == 0 )
+ wi = he = 100;
Index: patches/patch-src_PreviewOutput_cpp
===
RCS file: patches/patch-src_PreviewOutput_cpp
diff -N patches/patch-src_PreviewOutput_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_PreviewOutput_cpp 16 Apr 2018 15:36:39 -
@@ -0,0 +1,70 @@
+$OpenBSD$
+
+clang6 fix:  says typedef int wxCoord;
+
+Index: src/PreviewOutput.cpp
+--- src/PreviewOutput.cpp.orig
 src/PreviewOutput.cpp
+@@ -324,7 +324,7 @@ void DiscWrapperFrame::DrawDC()// The Drawing stuf
+ 
pdc.SetFont(Database->Page[Cpage].labels[SelectedItem].Font.GetChosenFont());   
// Apply Font && Color then draw text with the chosen coordinates && 
angle
+ 
pdc.SetTextForeground(Database->Page[Cpage].labels[SelectedItem].Colour.GetColour());
+ wxFont Xfont = 
Database->Page[Cpage].labels[SelectedItem].Font.GetChosenFont();
+-wxCoord wi, he, xc = NULL;
++wxCoord wi, he, xc = 0;
+ 
pdc.GetMultiLineTextExtent(Database->Page[Cpage].labels[SelectedItem].L, & wi, 
& he, , );
+ if ( wi == 0 )
+ wi = he = 100 ;
+@@ -894,7 +894,7 @@ void DiscWrapperFrame::DrawLabels(wxDC , 

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2018/04/16 09:31:00

Modified files:
multimedia/qt-gstreamer/patches: patch-src_QGlib_global_h 
Added files:
multimedia/qt-gstreamer/patches: 
 
patch-elements_gstqtvideosink_delegates_basedelegate_cpp 
 
patch-elements_gstqtvideosink_delegates_qwidgetvideosinkdelegate_cpp 
 
patch-elements_gstqtvideosink_gstqtvideosinkbase_cpp 

Log message:
whitespace fixes for clang6

graphics/rawstudio clang6 fix

[Ingo Schwarze]

Hi,

not sure how to really test, but the following seems correct
from code inspection, fixes the build, and the program still
starts.

Note that upstream is now at 2.0 and has rewritten everything
in C, no more C++, so no need to report upstream.

Yours,
  Ingo


Index: Makefile
===
RCS file: /cvs/ports/graphics/rawstudio/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile15 Nov 2017 15:51:05 -  1.27
+++ Makefile16 Apr 2018 15:09:59 -
@@ -3,7 +3,7 @@
 COMMENT =  tool for working with RAW images
 
 DISTNAME = rawstudio-1.2
-REVISION = 15
+REVISION = 16
 
 CATEGORIES =   graphics
 
Index: patches/patch-src_dcraw_cc
===
RCS file: /cvs/ports/graphics/rawstudio/patches/patch-src_dcraw_cc,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_dcraw_cc
--- patches/patch-src_dcraw_cc  2 May 2017 15:48:41 -   1.2
+++ patches/patch-src_dcraw_cc  16 Apr 2018 15:09:59 -
@@ -4,6 +4,9 @@ fix CVE-2015-3885
 const correct.
 fix evaluation order.
 
+clang6 fixes:
+sufficient width for integers in static tables, and whitespace.
+
 Index: src/dcraw.cc
 --- src/dcraw.cc.orig
 +++ src/dcraw.cc
@@ -27,7 +30,46 @@ Index: src/dcraw.cc
  }
  
  void CLASS sony_load_raw()
-@@ -8445,7 +8447,8 @@ int CLASS main (int argc, const char **argv)
+@@ -4061,7 +4063,7 @@ void CLASS lin_interpolate()
+  */
+ void CLASS vng_interpolate()
+ {
+-  static const signed char *cp, terms[] = {
++  static const signed short *cp, terms[] = {
+ -2,-2,+0,-1,0,0x01, -2,-2,+0,+0,1,0x01, -2,-1,-1,+0,0,0x01,
+ -2,-1,+0,-1,0,0x02, -2,-1,+0,+0,0,0x03, -2,-1,+0,+1,1,0x01,
+ -2,+0,+0,-1,0,0x06, -2,+0,+0,+0,1,0x02, -2,+0,+0,+1,0,0x03,
+@@ -6174,7 +6176,8 @@ void CLASS adobe_coeff (const char *make, const char *
+ {
+   static const struct {
+ const char *prefix;
+-short black, maximum, trans[12];
++ushort black, maximum;
++short trans[12];
+   } table[] = {
+ { "Apple QuickTake", 0, 0,/* DJC */
+   { 17576,-3191,-3318,5210,6733,-1942,9031,1280,-124 } },
+@@ -6606,8 +6609,8 @@ void CLASS adobe_coeff (const char *make, const char *
+   sprintf (name, "%s %s", make, model);
+   for (i=0; i < (int) sizeof table / (int) sizeof *table; i++)
+ if (!strncmp (name, table[i].prefix, strlen(table[i].prefix))) {
+-  if (table[i].black)   black   = (ushort) table[i].black;
+-  if (table[i].maximum) maximum = (ushort) table[i].maximum;
++  if (table[i].black)   black   = table[i].black;
++  if (table[i].maximum) maximum = table[i].maximum;
+   for (j=0; j < 4; j++)
+   for (k=0; k < 3; k++)
+ cam_xyz[j][k] = table[i].trans[3*j+k] / 1.0;
+@@ -8366,7 +8369,7 @@ void CLASS tiff_head (struct tiff_hdr *th, int full)
+   strncpy (th->desc, desc, 512);
+   strncpy (th->make, make, 64);
+   strncpy (th->model, model, 64);
+-  strcpy (th->soft, "dcraw v"DCRAW_VERSION);
++  strcpy (th->soft, "dcraw v" DCRAW_VERSION);
+   t = gmtime ();
+   sprintf (th->date, "%04d:%02d:%02d %02d:%02d:%02d",
+   t->tm_year+1900,t->tm_mon+1,t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec);
+@@ -8445,7 +8448,8 @@ int CLASS main (int argc, const char **argv)
static int timestamp_only=0, thumbnail_only=0, identify_only=0;
static int user_qual=-1, user_black=-1, user_sat=-1, user_flip=-1;
static int use_fuji_rotate=1, write_to_stdout=0, quality, i, c;
@@ -37,7 +79,7 @@ Index: src/dcraw.cc
static const char *sp, *dark_frame=0, *write_ext;
static struct utimbuf ut;
static FILE *ofp;
-@@ -8781,7 +8784,7 @@ thumbnail:
+@@ -8781,7 +8785,7 @@ thumbnail:
strcpy (ofname,_("standard output"));
  else {
strcpy (ofname, ifname);

CVS: cvs.openbsd.org: ports

[Theo Buehler]

CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2018/04/16 09:07:09

Modified files:
databases/pgadmin3: Makefile 
Added files:
databases/pgadmin3/patches: patch-pgadmin_frm_frmEditGrid_cpp 

Log message:
Unbreak for clang6.  Upstream changed their server layout, so adjust
MASTER_SITES.

ok schwarze

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2018/04/16 08:10:02

Modified files:
games/enigma   : Makefile 
Added files:
games/enigma/patches: patch-src_Value_cc patch-src_lev_Proxy_cc 

Log message:
fix build with clang6; from FreeBSD; ok schwarze@

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/16 08:02:38

Added files:
games/instead-launcher/patches: patch-mainwindow_cpp 

Log message:
more whitespace for clang6

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/16 08:00:13

Added files:
net/cagibi/patches: patch-daemon_ssdpwatcher_cpp 

Log message:
clang6 <3 whitespace
from upstream

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/16 07:59:51

ports/net/cagibi/patches

Update of /cvs/ports/net/cagibi/patches
In directory cvs.openbsd.org:/tmp/cvs-serv82923/patches

Log Message:
Directory /cvs/ports/net/cagibi/patches added to the repository

Re: Clang 6 fix for emulators/BasiliskII

[Ingo Schwarze]

Hi Frederic,

Frederic Cambus wrote on Mon, Apr 16, 2018 at 03:05:23PM +0200:

> Here is a diff to fix BasiliskII build with Clang 6 (from upstream).

Uh oh.  The upstream fix was committed on Feb 21, 2010.

That said, your patch does agree with upstream, looks reasonable,
and builds for me.

OK schwarze@
  Ingo


> Index: Makefile
> ===
> RCS file: /cvs/ports/emulators/BasiliskII/Makefile,v
> retrieving revision 1.38
> diff -u -p -r1.38 Makefile
> --- Makefile  21 Nov 2017 00:13:00 -  1.38
> +++ Makefile  16 Apr 2018 13:02:33 -
> @@ -4,7 +4,7 @@ COMMENT=  open source 68k Macintosh emul
>  
>  DISTNAME=BasiliskII_src_01052006
>  PKGNAME= BasiliskII-1.0
> -REVISION=8
> +REVISION=9
>  CATEGORIES=  emulators
>  
>  HOMEPAGE=http://basilisk.cebix.net/
> Index: patches/patch-src_Unix_clip_unix_cpp
> ===
> RCS file: patches/patch-src_Unix_clip_unix_cpp
> diff -N patches/patch-src_Unix_clip_unix_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_Unix_clip_unix_cpp  16 Apr 2018 13:02:33 -
> @@ -0,0 +1,17 @@
> +$OpenBSD$
> +
> +Fix for Clang 6.
> +Upstream commit 71852dae82445b5a43803e42897ccd0989d135ab.
> +
> +Index: src/Unix/clip_unix.cpp
> +--- src/Unix/clip_unix.cpp.orig
>  src/Unix/clip_unix.cpp
> +@@ -496,7 +496,7 @@ static void do_getscrap(void **handle, uint32 type, in
> + 0x2f, 0x3c, 0, 0, 0, 0, // move.l   
> #outbuf,-(sp)
> + 0xa9, 0xfe, // 
> PutScrap()
> + 0x58, 0x8f, // 
> addq.l   #4,sp
> +-M68K_RTS >> 8, M68K_RTS
> ++M68K_RTS >> 8, M68K_RTS & 0xff
> + };
> + r.d[0] = sizeof(proc);
> + Execute68kTrap(0xa71e, ); // NewPtrSysClear()
> 

CVS: cvs.openbsd.org: ports

[Aaron Bieber]

CVSROOT:/cvs
Module name:ports
Changes by: abie...@cvs.openbsd.org 2018/04/16 07:12:22

Modified files:
games/ioquake3 : Makefile distinfo 
games/ioquake3/patches: patch-Makefile 

Log message:
Bump to the latest.

- remove CFLAGS. Spotted by Tom Murphy!
- remove -O3 from build.

OK awolk@

Clang 6 fix for emulators/BasiliskII

[Frederic Cambus]

Hi ports@,

Here is a diff to fix BasiliskII build with Clang 6 (from upstream).

Comments? OK?

Index: Makefile
===
RCS file: /cvs/ports/emulators/BasiliskII/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile21 Nov 2017 00:13:00 -  1.38
+++ Makefile16 Apr 2018 13:02:33 -
@@ -4,7 +4,7 @@ COMMENT=open source 68k Macintosh emul
 
 DISTNAME=  BasiliskII_src_01052006
 PKGNAME=   BasiliskII-1.0
-REVISION=  8
+REVISION=  9
 CATEGORIES=emulators
 
 HOMEPAGE=  http://basilisk.cebix.net/
Index: patches/patch-src_Unix_clip_unix_cpp
===
RCS file: patches/patch-src_Unix_clip_unix_cpp
diff -N patches/patch-src_Unix_clip_unix_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_Unix_clip_unix_cpp16 Apr 2018 13:02:33 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix for Clang 6.
+Upstream commit 71852dae82445b5a43803e42897ccd0989d135ab.
+
+Index: src/Unix/clip_unix.cpp
+--- src/Unix/clip_unix.cpp.orig
 src/Unix/clip_unix.cpp
+@@ -496,7 +496,7 @@ static void do_getscrap(void **handle, uint32 type, in
+   0x2f, 0x3c, 0, 0, 0, 0, // move.l   
#outbuf,-(sp)
+   0xa9, 0xfe, // 
PutScrap()
+   0x58, 0x8f, // 
addq.l   #4,sp
+-  M68K_RTS >> 8, M68K_RTS
++  M68K_RTS >> 8, M68K_RTS & 0xff
+   };
+   r.d[0] = sizeof(proc);
+   Execute68kTrap(0xa71e, ); // NewPtrSysClear()

Re: Remove japanese/groff

[Ingo Schwarze]

Hi Anthony,

Anthony J. Bentley wrote on Mon, Apr 16, 2018 at 03:58:05AM -0600:

> japanese/groff is an ancient patchset on top of even more ancient
> groff (specifically groff-1.10, released in 1995).

Indeed, we are now almost at 1.22.4, and i regard anything older
than 1.22 as ancient and anything older than 1.17 as extremely
ancient.  The technical and functional improvements in 1.17 were
so major that going back beyond that seems like a really bad idea.

> Nothing uses it anymore. So remove it as below (plus quirks of course).

Certainly no objection from me to removing it.

I can't think of a reason why anyone might still need it.
If people still have non-UTF-8 input files, they can be
converted before running modern groff.  If people still require
non-UTF-8 nroff(1) output, they can use -Tutf8 and postprocess
with a character set converter.  Multibyte character support
is likely to be better in modern groff than in such an old version.

So unless somebody objects, OK schwarze@
  Ingo


> Index: Makefile
> ===
> RCS file: /cvs/ports/japanese/Makefile,v
> retrieving revision 1.30
> diff -u -p -r1.30 Makefile
> --- Makefile  19 Apr 2017 05:58:48 -  1.30
> +++ Makefile  16 Apr 2018 09:56:29 -
> @@ -3,7 +3,6 @@
>   SUBDIR =
>   SUBDIR += Wnn
>   SUBDIR += canna
> - SUBDIR += groff
>   SUBDIR += gwaei
>   SUBDIR += kakasi
>   SUBDIR += kanatest
> Index: groff/Makefile
> ===
> RCS file: groff/Makefile
> diff -N groff/Makefile
> --- groff/Makefile26 Jul 2017 22:45:25 -  1.18
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,40 +0,0 @@
> -# $OpenBSD: Makefile,v 1.18 2017/07/26 22:45:25 sthen Exp $
> -
> -COMMENT= japanese groff
> -
> -CATEGORIES=  japanese textproc print
> -
> -PKGNAME= ja-groff-1.10_0.99
> -REVISION =   2
> -DISTNAME=groff-1.10
> -
> -PATCHFILES=  jgroff-0.99.diff.gz:0
> -
> -MASTER_SITES=${MASTER_SITE_GNU:=groff/}
> -
> -MASTER_SITES0=   ftp://ftp.ae.keio.ac.jp/pub/GNU/ \
> -ftp://ftp.tohoku.ac.jp/pub/GNU/japanese/
[...]

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/16 06:44:29

Added files:
databases/soprano/patches: patch-soprano_pluginmanager_cpp 
   patch-soprano_sopranodirs_cpp 

Log message:
clang6 <3 whitespace

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/16 06:30:49

Modified files:
productivity/attica: Makefile 

Log message:
use g++98 to unbreak; similar to freebsd

exim upgrade to 4.91

[Renaud Allard]

Hello,

Here is the patch to upgrade exim to 4.91.

This fixes CVE-2018-6789

Best Regards
Index: mail/exim/Makefile
===
RCS file: /cvs/ports/mail/exim/Makefile,v
retrieving revision 1.119
diff -u -p -u -r1.119 Makefile
--- mail/exim/Makefile	10 Feb 2018 22:28:29 -	1.119
+++ mail/exim/Makefile	16 Apr 2018 12:02:15 -
@@ -3,7 +3,7 @@
 COMMENT-main =		flexible mail transfer agent
 COMMENT-eximon =	X11 monitor tool for Exim MTA
 
-VERSION =		4.90.1
+VERSION =		4.91
 DISTNAME =		exim-${VERSION}
 PKGNAME-main =		exim-${VERSION}
 FULLPKGNAME-eximon =	exim-eximon-${VERSION}
Index: mail/exim/distinfo
===
RCS file: /cvs/ports/mail/exim/distinfo,v
retrieving revision 1.32
diff -u -p -u -r1.32 distinfo
--- mail/exim/distinfo	10 Feb 2018 22:28:29 -	1.32
+++ mail/exim/distinfo	16 Apr 2018 12:02:15 -
@@ -1,2 +1,2 @@
-SHA256 (exim-4.90.1.tar.gz) = bh1RLTTHVCAE4WkUjMlV71hTGHKvx7c5abnoorVSpgE=
-SIZE (exim-4.90.1.tar.gz) = 2355783
+SHA256 (exim-4.91.tar.gz) = yLTiggoeTjdpokyWb3BDLQLzBqnjpHg81Y93A1AKdJY=
+SIZE (exim-4.91.tar.gz) = 2407413


smime.p7s
Description: S/MIME Cryptographic Signature

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/16 06:00:40

Modified files:
textproc/wkhtmltopdf: Makefile distinfo 

Log message:
use new wkhtmltopdf-qt distfile; github have updated tar(1) and/or
git-archive since this port was created so the autogenerated distfile
has changed.  noticed by jca

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/16 05:35:27

Modified files:
net/dhcpcd : Makefile 
Added files:
net/dhcpcd/patches: patch-src_if-bsd_c 

Log message:
Add patch from dhcpcd upstream, "OpenBSD: Fix adding INET6 on-link
routes without an address"

https://roy.marples.name/archives/dhcpcd-discuss/0002044.html

Re: CVS: cvs.openbsd.org: ports

[Alexander Bluhm]

On Mon, Apr 16, 2018 at 05:24:47AM -0600, Alexander Bluhm wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   bl...@cvs.openbsd.org   2018/04/16 05:24:47
> 
> Modified files:
>   sysutils/facter: Makefile 
> Added files:
>   sysutils/facter/patches: 
>patch-lib_inc_facter_facts_collection_hpp 
>
> patch-lib_inc_facter_facts_external_resolver_hpp 
> 
> Log message:
> Fix facter build with clang6.
> OK jasper@

and OK jca@

Re: clang6 sysutils/facter

[Jeremie Courreges-Anglas]

+cc maintainer

On Mon, Apr 16 2018, Alexander Bluhm  wrote:
> Hi,
>
> This fixes facter build with clang6.
>
> /usr/include/c++/v1/memory:2541:13: error: delete called on 
> 'facter::facts::external::resolver' that is abstract but has non-virtual 
> destructor [-Werror,-Wdelete-non-virtual-dtor]
> delete __ptr;
> ^
> /usr/include/c++/v1/memory:2541:13: error: delete called on non-final 
> 'facter::facts::collection' that has virtual functions but non-virtual 
> destructor [-Werror,-Wdelete-non-virtual-dtor]
> delete __ptr;
> ^
>
> ok?

We should really stop using -Werror (iiuc those CFLAGS come from
leatherman) but the fix looks right anyway.  ok jca@

> bluhm
>
> Index: sysutils/facter/patches/patch-lib_inc_facter_facts_collection_hpp
> ===
> RCS file: sysutils/facter/patches/patch-lib_inc_facter_facts_collection_hpp
> diff -N sysutils/facter/patches/patch-lib_inc_facter_facts_collection_hpp
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ sysutils/facter/patches/patch-lib_inc_facter_facts_collection_hpp 15 Apr 
> 2018 22:36:22 -
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: lib/inc/facter/facts/collection.hpp
> +--- lib/inc/facter/facts/collection.hpp.orig
>  lib/inc/facter/facts/collection.hpp
> +@@ -101,7 +101,7 @@ namespace facter { namespace facts {
> + /**
> +  * Destructor for fact collection.
> +  */
> +-~collection();
> ++virtual ~collection();
> + 
> + /**
> +  * Prevents the fact collection from being copied.
> Index: 
> sysutils/facter/patches/patch-lib_inc_facter_facts_external_resolver_hpp
> ===
> RCS file: 
> sysutils/facter/patches/patch-lib_inc_facter_facts_external_resolver_hpp
> diff -N 
> sysutils/facter/patches/patch-lib_inc_facter_facts_external_resolver_hpp
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ sysutils/facter/patches/patch-lib_inc_facter_facts_external_resolver_hpp  
> 16 Apr 2018 00:07:52 -
> @@ -0,0 +1,17 @@
> +$OpenBSD$
> +
> +Index: lib/inc/facter/facts/external/resolver.hpp
> +--- lib/inc/facter/facts/external/resolver.hpp.orig
>  lib/inc/facter/facts/external/resolver.hpp
> +@@ -44,6 +44,11 @@ namespace facter { namespace facts { namespace externa
> +  * @param facts The fact collection to populate the external facts 
> into.
> +  */
> + virtual void resolve(std::string const& path, collection& facts) 
> const = 0;
> ++
> ++/**
> ++ * Destructor for external resolver.
> ++ */
> ++virtual ~resolver() {}
> + };
> + 
> + }}}  // namespace facter::facts::external
>

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: clang6: FIX for devel/sdcc

[Jeremie Courreges-Anglas]

On Sun, Apr 15 2018, Brian Callahan  wrote:
> Hi ports --
>
> For some reason I'm not quite sure about, with clang6 sdcc decides it
> needs to regen all its configure scripts. So let's oblige. Also adds
> a whole lot of items to the PLIST.
>
> OK?

ok, please mention (in the commit message and/or in a comment) that we
don't know why the autotools files need a refresh...

> ~Brian
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/sdcc/Makefile,v
> retrieving revision 1.21
> diff -u -p -r1.21 Makefile
> --- Makefile  7 Mar 2018 21:34:43 -   1.21
> +++ Makefile  15 Apr 2018 19:35:47 -
> @@ -7,6 +7,7 @@ BROKEN-aarch64=   *** BFD does not support
>  
>  DISTNAME=sdcc-src-3.7.0
>  PKGNAME= ${DISTNAME:S/-src//}
> +REVISION=0
>  EXTRACT_SUFX=.tar.bz2
>  CATEGORIES=  devel
>  
> @@ -20,6 +21,8 @@ WANTLIB=c curses m ${COMPILER_LIBCXX} 
>  MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=sdcc/}
>  
>  BUILD_DEPENDS=   ${RUN_DEPENDS} \
> + ${MODGNU_AUTOCONF_DEPENDS} \
> + ${MODGNU_AUTOMAKE_DEPENDS} \
>   devel/boost
>  RUN_DEPENDS= devel/gputils
>  
> @@ -31,6 +34,11 @@ CONFIGURE_ENV+=sdcc_cv_CCggdb=no \
>   LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
>  
>  USE_GMAKE=   Yes
> +MAKE_ENV=AUTOCONF_VERSION="${AUTOCONF_VERSION}" \
> + AUTOMAKE_VERSION="${AUTOMAKE_VERSION}"
> +
> +AUTOCONF_VERSION=2.69
> +AUTOMAKE_VERSION=1.11
>  
>  WRKDIST= ${WRKDIR}/sdcc
>  
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/devel/sdcc/pkg/PLIST,v
> retrieving revision 1.5
> diff -u -p -r1.5 PLIST
> --- pkg/PLIST 7 Mar 2018 21:34:43 -   1.5
> +++ pkg/PLIST 15 Apr 2018 19:36:21 -
> @@ -288,7 +288,414 @@ share/sdcc/lib/medium/liblonglong.lib
>  share/sdcc/lib/medium/libsdcc.lib
>  share/sdcc/lib/medium/mcs51.lib
>  share/sdcc/lib/pic14/
> +share/sdcc/lib/pic14/libm.lib
> +share/sdcc/lib/pic14/libme.lib
> +share/sdcc/lib/pic14/libsdcc.lib
> +share/sdcc/lib/pic14/libsdcce.lib
>  share/sdcc/lib/pic16/
> +share/sdcc/lib/pic16/crt0.o
> +share/sdcc/lib/pic16/crt0i.o
> +share/sdcc/lib/pic16/crt0iz.o
> +share/sdcc/lib/pic16/libc18f.lib
> +share/sdcc/lib/pic16/libcrt0.lib
> +share/sdcc/lib/pic16/libcrt0i.lib
> +share/sdcc/lib/pic16/libcrt0iz.lib
> +share/sdcc/lib/pic16/libdebug.lib
> +share/sdcc/lib/pic16/libio18f1220.lib
> +share/sdcc/lib/pic16/libio18f1230.lib
> +share/sdcc/lib/pic16/libio18f1320.lib
> +share/sdcc/lib/pic16/libio18f1330.lib
> +share/sdcc/lib/pic16/libio18f13k22.lib
> +share/sdcc/lib/pic16/libio18f13k50.lib
> +share/sdcc/lib/pic16/libio18f14k22.lib
> +share/sdcc/lib/pic16/libio18f14k50.lib
> +share/sdcc/lib/pic16/libio18f2220.lib
> +share/sdcc/lib/pic16/libio18f2221.lib
> +share/sdcc/lib/pic16/libio18f2320.lib
> +share/sdcc/lib/pic16/libio18f2321.lib
> +share/sdcc/lib/pic16/libio18f2331.lib
> +share/sdcc/lib/pic16/libio18f23k20.lib
> +share/sdcc/lib/pic16/libio18f23k22.lib
> +share/sdcc/lib/pic16/libio18f2410.lib
> +share/sdcc/lib/pic16/libio18f242.lib
> +share/sdcc/lib/pic16/libio18f2420.lib
> +share/sdcc/lib/pic16/libio18f2423.lib
> +share/sdcc/lib/pic16/libio18f2431.lib
> +share/sdcc/lib/pic16/libio18f2439.lib
> +share/sdcc/lib/pic16/libio18f2450.lib
> +share/sdcc/lib/pic16/libio18f2455.lib
> +share/sdcc/lib/pic16/libio18f2458.lib
> +share/sdcc/lib/pic16/libio18f248.lib
> +share/sdcc/lib/pic16/libio18f2480.lib
> +share/sdcc/lib/pic16/libio18f24j10.lib
> +share/sdcc/lib/pic16/libio18f24j11.lib
> +share/sdcc/lib/pic16/libio18f24j50.lib
> +share/sdcc/lib/pic16/libio18f24k20.lib
> +share/sdcc/lib/pic16/libio18f24k22.lib
> +share/sdcc/lib/pic16/libio18f24k50.lib
> +share/sdcc/lib/pic16/libio18f2510.lib
> +share/sdcc/lib/pic16/libio18f2515.lib
> +share/sdcc/lib/pic16/libio18f252.lib
> +share/sdcc/lib/pic16/libio18f2520.lib
> +share/sdcc/lib/pic16/libio18f2523.lib
> +share/sdcc/lib/pic16/libio18f2525.lib
> +share/sdcc/lib/pic16/libio18f2539.lib
> +share/sdcc/lib/pic16/libio18f2550.lib
> +share/sdcc/lib/pic16/libio18f2553.lib
> +share/sdcc/lib/pic16/libio18f258.lib
> +share/sdcc/lib/pic16/libio18f2580.lib
> +share/sdcc/lib/pic16/libio18f2585.lib
> +share/sdcc/lib/pic16/libio18f25j10.lib
> +share/sdcc/lib/pic16/libio18f25j11.lib
> +share/sdcc/lib/pic16/libio18f25j50.lib
> +share/sdcc/lib/pic16/libio18f25k20.lib
> +share/sdcc/lib/pic16/libio18f25k22.lib
> +share/sdcc/lib/pic16/libio18f25k50.lib
> +share/sdcc/lib/pic16/libio18f25k80.lib
> +share/sdcc/lib/pic16/libio18f2610.lib
> +share/sdcc/lib/pic16/libio18f2620.lib
> +share/sdcc/lib/pic16/libio18f2680.lib
> +share/sdcc/lib/pic16/libio18f2682.lib
> +share/sdcc/lib/pic16/libio18f2685.lib
> +share/sdcc/lib/pic16/libio18f26j11.lib
> +share/sdcc/lib/pic16/libio18f26j13.lib
> +share/sdcc/lib/pic16/libio18f26j50.lib

CVS: cvs.openbsd.org: ports

[Alexander Bluhm]

CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2018/04/16 05:24:47

Modified files:
sysutils/facter: Makefile 
Added files:
sysutils/facter/patches: 
 patch-lib_inc_facter_facts_collection_hpp 
 
patch-lib_inc_facter_facts_external_resolver_hpp 

Log message:
Fix facter build with clang6.
OK jasper@

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2018/04/16 05:15:49

Modified files:
games/vegastrike/engine: Makefile 
games/vegastrike/engine/patches: 
 patch-setup_src_include_central_cpp 
Added files:
games/vegastrike/engine/patches: 
 patch-objconv_basemaker_base_maker_cpp 
 patch-src_gfx_cockpit_xml_cpp 
 patch-src_gui_text_area_cpp 
 patch-src_pk3_cpp 

Log message:
Fix for clang 6.

Re: UPDATE: Sqtop-2015.02.08

[Stuart Henderson]

On 2018/04/16 11:35, Gonzalo L. Rodriguez wrote:
> > -DISTNAME=  sqtop-2011-11-01
> > -PKGNAME=   sqtop-2011.11.01
> > -REVISION=  2
> > +PKGNAME=   sqtop-2015.02.08
> > +GH_ACCOUNT=paleg
> > +GH_PROJECT=sqtop
> > +GH_TAGNAME=v2015-02-08
> > +
> > CATEGORIES= www
> > FIX_EXTRACT_PERMISSIONS=Yes
> > 
> > MAINTAINER= Gonzalo L. R. 
> > 
> > -HOMEPAGE=  https://code.google.com/p/sqtop/
> > -EXTRACT_SUFX=  .tar.bz2
> > +HOMEPAGE=  https://github.com/paleg/sqtop

HOMEPAGE is set automatically for ports using GH_*

Otherwise looks OK.

Re: Exim DANE support

[Stuart Henderson]

On 2018/04/16 11:05, Renaud Allard wrote:
> Hello,
> 
> In the new exim version (4.91), DANE support moved from experimental to
> production. I tested by modifying the port to just include
> SUPPORT_DANE=yes in files/Makefile
> 
> It compiles and runs fine without any other modification.
> 
> Could you enable this in further build with 4.91+?

I'm not keen on adding any new things to the exim port (especially any
which might increase attack surface) unless someone is willing to
take on maintainership.

Re: [UPDATE] www/links+ to 1.15

[Stuart Henderson]

On 2018/04/15 16:48, trondd wrote:
> What is the policy around setting SEPARATE_BUILD?  Any GNU build?  Not
> just builds that require it?

It's useful for large ports where you might want to "make clean=build"
and they take a long time to extract/patch.

Otherwise it's pointless and can make extra work for updates because
upstreams often don't test out-of-tree builds (and especially "make
test" in that case) regularly.

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/16 04:59:17

Added files:
games/blobby/patches: patch-src_RenderManagerGL2D_cpp 
  patch-src_RenderManagerSDL_cpp 

Log message:
fix build with clang6

Remove japanese/groff

[Anthony J. Bentley]

Hi,

japanese/groff is an ancient patchset on top of even more ancient
groff (specifically groff-1.10, released in 1995).

Nothing uses it anymore. So remove it as below (plus quirks of course).

ok?

Index: Makefile
===
RCS file: /cvs/ports/japanese/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile19 Apr 2017 05:58:48 -  1.30
+++ Makefile16 Apr 2018 09:56:29 -
@@ -3,7 +3,6 @@
  SUBDIR =
  SUBDIR += Wnn
  SUBDIR += canna
- SUBDIR += groff
  SUBDIR += gwaei
  SUBDIR += kakasi
  SUBDIR += kanatest
Index: groff/Makefile
===
RCS file: groff/Makefile
diff -N groff/Makefile
--- groff/Makefile  26 Jul 2017 22:45:25 -  1.18
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,40 +0,0 @@
-# $OpenBSD: Makefile,v 1.18 2017/07/26 22:45:25 sthen Exp $
-
-COMMENT=   japanese groff
-
-CATEGORIES=japanese textproc print
-
-PKGNAME=   ja-groff-1.10_0.99
-REVISION = 2
-DISTNAME=  groff-1.10
-
-PATCHFILES=jgroff-0.99.diff.gz:0
-
-MASTER_SITES=  ${MASTER_SITE_GNU:=groff/}
-
-MASTER_SITES0= ftp://ftp.ae.keio.ac.jp/pub/GNU/ \
-ftp://ftp.tohoku.ac.jp/pub/GNU/japanese/
-
-
-PERMIT_PACKAGE_CDROM=  Yes
-WANTLIB=   c ${COMPILER_LIBCXX} m
-
-PATCH_DIST_STRIP=  -p1
-
-CONFIGURE_STYLE=   gnu old dest
-USE_GROFF =Yes
-
-#post-configure:
-#  @cd ${WRKSRC}/xditview && ${SETENV} ${MAKE_ENV} ${XMKMF}
-#
-#post-build:
-#  @cd ${WRKBUILD}/xditview && ${SETENV} ${MAKE_ENV} \
-#  make ${MAKE_FLAGS} -f ${MAKE_FILE} ${ALL_TARGET}
-#
-#post-install:
-#  @cd ${WRKBUILD}/xditview && ${SETENV} ${MAKE_ENV} \
-#  make ${ALL_FAKE_FLAGS} -f ${MAKE_FILE} install install.man
-
-MAINTAINER=Marc Espie 
-
-.include 
Index: groff/distinfo
===
RCS file: groff/distinfo
diff -N groff/distinfo
--- groff/distinfo  18 Jan 2015 03:14:16 -  1.4
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,4 +0,0 @@
-SHA256 (groff-1.10.tar.gz) = WffsLElBTE/JZ7N5ZBj9/UTI0ZbnSG3Snd6BXKb2XTE=
-SHA256 (jgroff-0.99.diff.gz) = wOj1w6LEVpE0gbzob0rzwbGlk8cYbtI9GhRnN4rvjQs=
-SIZE (groff-1.10.tar.gz) = 986431
-SIZE (jgroff-0.99.diff.gz) = 84778
Index: groff/patches/patch-Makefile_comm
===
RCS file: groff/patches/patch-Makefile_comm
diff -N groff/patches/patch-Makefile_comm
--- groff/patches/patch-Makefile_comm   9 May 2010 21:26:54 -   1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,31 +0,0 @@
-Install everything with a `j' prefix, including all manpages.
-$OpenBSD: patch-Makefile_comm,v 1.2 2010/05/09 21:26:54 robert Exp $
 Makefile.comm.orig Tue Jun 27 13:08:27 1995
-+++ Makefile.comm  Sun May  9 22:33:01 2010
-@@ -44,7 +44,7 @@ MOSTLYCLEANFILES=$(MANCLEAN) $(PROG) $(OBJS) $(GENSRCS
- CLEANFILES=$(LIBCLEAN)
- DISTCLEANFILES=TAGS Makefile
- REALCLEANFILES=$(YTABC) $(YTABH)
--NAMEPREFIX=
-+NAMEPREFIX=j
- HDRS=
- MANPAGES=$(MAN1) $(MAN5) $(MAN7)
- MANCLEAN=$(MANPAGES)
-@@ -144,7 +144,7 @@ install_man:
-   -test -d $(man5dir) || mkdir $(man5dir)
-   @-pages="$(MAN5)"; \
-   for p in $$pages; do \
--   target=$(man5dir)/`basename $$p .n`.$(man5ext); \
-+   target=$(man5dir)/$(NAMEPREFIX)`basename $$p .n`.$(man5ext); \
-rm -f $$target; \
-echo $(INSTALL_DATA) $$p $$target; \
-$(INSTALL_DATA) $$p $$target; \
-@@ -152,7 +152,7 @@ install_man:
-   -test -d $(man7dir) || mkdir $(man7dir)
-   @-pages="$(MAN7)"; \
-   for p in $$pages; do \
--   target=$(man7dir)/`basename $$p .n`.$(man7ext); \
-+   target=$(man7dir)/$(NAMEPREFIX)`basename $$p .n`.$(man7ext); \
-rm -f $$target; \
-echo $(INSTALL_DATA) $$p $$target; \
-$(INSTALL_DATA) $$p $$target; \
Index: groff/patches/patch-Makefile_in
===
RCS file: groff/patches/patch-Makefile_in
diff -N groff/patches/patch-Makefile_in
--- groff/patches/patch-Makefile_in 12 Apr 2000 20:34:11 -  1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-Put data into jgroff. 
-Issue: don't install everything, but link redundant stuff from 
-/usr/share/groff ?
-$OpenBSD: patch-Makefile_in,v 1.1.1.1 2000/04/12 20:34:11 espie Exp $
 Makefile.in.orig   Tue Apr 11 23:43:40 2000
-+++ Makefile.inTue Apr 11 23:44:42 2000
-@@ -75,7 +75,7 @@ bindir=$(exec_prefix)/bin
- 
- # datasubdir says where to install data files
- datadir=$(prefix)/share
--datasubdir=$(datadir)/groff
-+datasubdir=$(datadir)/jgroff
- 
- # fontdir says where to install dev*/*.
- fontdir=$(datasubdir)/font
Index: groff/patches/patch-afmtodit_Makefile_sub
===
RCS file: 

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2018/04/16 03:53:29

Modified files:
japanese/canna : Makefile 
japanese/canna/patches: patch-Canna_conf 
japanese/canna/pkg: PLIST-dict PLIST-main PLIST-server 

Log message:
Install unformatted UTF-8 manpages instead of preformatted EUC-JP.

As a result, remove the build dependency on jgroff.
Add some PLIST tweaks suggested by schwarze@.

Discussed with schwarze@ espie@ yasuoka@

Re: UPDATE: Sqtop-2015.02.08

[Gonzalo L. Rodriguez]

On [09/04/18] [07:54P], Gonzalo L. Rodriguez wrote:

Hallo,

Update for Sqtop to 2015.02.08:

Switch to github, with the clang6 fix included,

https://github.com/paleg/sqtop/compare/v2015-02-08...master

OK? Comments?

Cheers.-

--
Sending from my toaster.



Index: Makefile
===
RCS file: /cvs/ports/www/sqtop/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile7 Dec 2017 13:12:44 -   1.9
+++ Makefile9 Apr 2018 07:51:55 -
@@ -2,23 +2,22 @@

COMMENT=top-like monitor for Squid

-DISTNAME=  sqtop-2011-11-01
-PKGNAME=   sqtop-2011.11.01
-REVISION=  2
+PKGNAME=   sqtop-2015.02.08
+GH_ACCOUNT=paleg
+GH_PROJECT=sqtop
+GH_TAGNAME=v2015-02-08
+
CATEGORIES= www
FIX_EXTRACT_PERMISSIONS=Yes

MAINTAINER= Gonzalo L. R. 

-HOMEPAGE=  https://code.google.com/p/sqtop/
-EXTRACT_SUFX=  .tar.bz2
+HOMEPAGE=  https://github.com/paleg/sqtop

# GPLv2
PERMIT_PACKAGE_CDROM=   Yes

-WANTLIB += c m ncurses pthread ${COMPILER_LIBCXX}
-
-MASTER_SITES=  ${MASTER_SITE_GOOGLECODE:=sqtop/}
+WANTLIB += ${COMPILER_LIBCXX} c curses m

CONFIGURE_STYLE=gnu

Index: distinfo
===
RCS file: /cvs/ports/www/sqtop/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo18 Jan 2015 03:15:50 -  1.2
+++ distinfo9 Apr 2018 07:51:55 -
@@ -1,2 +1,2 @@
-SHA256 (sqtop-2011-11-01.tar.bz2) = 
GCPv6rmcEYxwc2KoIFOALQiaGKCUD9Kg2hmxI+Sy0OI=
-SIZE (sqtop-2011-11-01.tar.bz2) = 116110
+SHA256 (sqtop-2015-02-08.tar.gz) = 6uTIvBbb/nDHdtmQ7PFDKKyrDtc28L870WR6OsL16L8=
+SIZE (sqtop-2015-02-08.tar.gz) = 154535
Index: patches/patch-src_Utils_cpp
===
RCS file: patches/patch-src_Utils_cpp
diff -N patches/patch-src_Utils_cpp
--- patches/patch-src_Utils_cpp 30 Jun 2013 03:17:43 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,82 +0,0 @@
-$OpenBSD: patch-src_Utils_cpp,v 1.1 2013/06/30 03:17:43 william Exp $
-
-Revision: 8ce6ee3cad09: print errors in more convenient way
-Revision: 502a2c7e81bf: renamed (Gb, Mb, Kb) -> (GB, MB, KB) as bytes
-Revision: f04cf1d965bc: sqstat: reworked parsing peer info to properly handle 
ipv6 addresses
-Revision: 50c930f74dc7: Utils: bugfix - replaced size_t with 
std::string::size_type for find_last_of result
-
-
 src/Utils.cpp.orig Fri Nov  4 16:10:30 2011
-+++ src/Utils.cpp  Wed Jun 26 21:30:44 2013
-@@ -35,6 +35,16 @@ vector Utils::SplitString(string str, string d
-return result;
- }
-
-+std::pair  Utils::SplitIPPort(string ipport) {
-+   std::pair  result;
-+   std::string::size_type found = ipport.find_last_of(":");
-+   if (found != string::npos) {
-+  result.first = ipport.substr(0, found);
-+  result.second = ipport.substr(found+1);
-+   }
-+   return result;
-+}
-+
- string Utils::JoinVector(vector inv, string delim) {
-string result = "";
-for (vector::iterator it = inv.begin(); it != inv.end(); ++it)
-@@ -105,12 +115,12 @@ string Utils::ConvertSize(long long esize) {
- long long mb = esize/1024/1024 - gb*1024;
- long long kb = (esize/1024) % 1024;
- if (gb != 0) {
--result += itos(gb) + "Gb ";
-+result += itos(gb) + "GB ";
- }
- if (mb != 0) {
--result += itos(mb) + "Mb ";
-+result += itos(mb) + "MB ";
- }
--result += itos(kb) + "Kb";
-+result += itos(kb) + "KB";
- return result;
- }
-
-@@ -120,17 +130,17 @@ std::pair  Utils::ConvertSpeedPair(lon
-//long kb = speed/1024;
-if (mb != 0) {
-result.first = ftos(speed/1024.0/1024.0, 2);
--   result.second = "Mb/s";
-+   result.second = "MB/s";
-} else {
-result.first = ftos(speed/1024.0, 1);
--   result.second = "Kb/s";
-+   result.second = "KB/s";
-}
-return result;
- }
-
- string Utils::ConvertSpeed(long long speed) {
-std::pair  result = Utils::ConvertSpeedPair(speed);
--   return result.first+result.second;
-+   return result.first+" "+result.second;
- }
-
- bool Utils::VectorFindSubstr(vector& v, string& str) {
-@@ -192,6 +202,17 @@ bool Utils::UserMemberOf(vector& v, vector SplitString(std::string str, std::string 
delim);
-+   extern std::pair  SplitIPPort(std::string 
ipport);
-extern std::string JoinVector(std::vector inv, std::string 
delim);
-extern std::string itos(long long num);
-extern long int stol(std::string s);
-@@ -26,6 +27,7 @@ namespace Utils {
-extern bool IPMemberOf(std::vector& v, std::string& ip_in);
-extern void ToLower(std::string& rData);
-extern bool UserMemberOf(std::vector& v, 
std::vector& users);
-+   extern std::string 

Exim DANE support

[Renaud Allard]

Hello,

In the new exim version (4.91), DANE support moved from experimental to 
production. I tested by modifying the port to just include

SUPPORT_DANE=yes in files/Makefile

It compiles and runs fine without any other modification.

Could you enable this in further build with 4.91+?

Thank you,
Best Regards


diff -aur exim.old/files/Makefile exim/files/Makefile
--- exim.old/files/Makefile Mon Apr 16 11:03:36 2018
+++ exim/files/Makefile Mon Apr 16 11:04:43 2018
@@ -350,6 +350,11 @@
 PCRE_CONFIG=yes
 PCRE_LIBS=-lpcre

+#-- 


+# Uncomment the following line to add DANE support
+# Note: Enabling this unconditionally overrides DISABLE_DNSSEC 

+# For DANE under GnuTLS we need an additional library.  See TLS_LIBS 
below.

+SUPPORT_DANE=yes


#--
 # Additional libraries and include directories may be required for some



smime.p7s
Description: S/MIME Cryptographic Signature

CVS: cvs.openbsd.org: ports

[Theo Buehler]

CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2018/04/16 02:58:32

Modified files:
databases/mysqlcc/patches: patch-src_main_cpp 

Log message:
better fix: change the constant.

pointed out by & ok bentley

Re: databases/pgadmin3 fixes (clang6)

[Theo Buehler]

On Sun, Apr 15, 2018 at 09:45:54PM +0200, Theo Buehler wrote:
> Three things:
> 
> It seems upstream changed the server layout and killed the ftp://
> protocol, at least it isn't reachable from anywhere for me. I tried to
> find an official announcement for this, but gave up after 5 minutes.
> 
> Add a static_cast to appease clang6.
> 
> There is a newer version 1.22.2 available for pgadmin3, but it's no
> longer maintained anyway.  There are lots of warnings that one should
> move to pgadmin4. Since I don't use this, I leave this one to pea :)

For ease of review, here are the error messages:

frm/frmEditGrid.cpp:2405:10: error: case value evaluates to -42, which cannot 
be narrowed to type 'OID'
  (aka 'unsigned long') [-Wc++11-narrowing]
case PGOID_TYPE_SERIAL:
 ^
../pgadmin/include/utils/pgDefs.h:21:45: note: expanded from macro 
'PGOID_TYPE_SERIAL'
#define PGOID_TYPE_SERIAL   -42L
^
frm/frmEditGrid.cpp:2401:10: error: case value evaluates to -44, which cannot 
be narrowed to type 'OID'
  (aka 'unsigned long') [-Wc++11-narrowing]
case PGOID_TYPE_SERIAL2:
 ^
../pgadmin/include/utils/pgDefs.h:23:45: note: expanded from macro 
'PGOID_TYPE_SERIAL2'
#define PGOID_TYPE_SERIAL2  -44L
^
frm/frmEditGrid.cpp:2397:10: error: case value evaluates to -43, which cannot 
be narrowed to type 'OID'
  (aka 'unsigned long') [-Wc++11-narrowing]
case PGOID_TYPE_SERIAL8:
 ^
../pgadmin/include/utils/pgDefs.h:22:45: note: expanded from macro 
'PGOID_TYPE_SERIAL8'
#define PGOID_TYPE_SERIAL8  -43L


Index: Makefile
===
RCS file: /var/cvs/ports/databases/pgadmin3/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- Makefile26 Jul 2017 22:45:16 -  1.37
+++ Makefile15 Apr 2018 19:27:21 -
@@ -16,8 +16,7 @@ PERMIT_PACKAGE_CDROM= Yes
 
 WANTLIB=   c m pthread ${COMPILER_LIBCXX} crypto z
 
-MASTER_SITES=  https://ftp.postgresql.org/pub/pgadmin3/release/v$V/src/ \
-   ftp://ftp.postgresql.org/pub/pgadmin3/release/v$V/src/
+MASTER_SITES=  https://ftp.postgresql.org/pub/pgadmin/pgadmin3/v$V/src/
 
 LIB_DEPENDS=   x11/wxWidgets>=2.8.7 \
databases/postgresql \
Index: patches/patch-pgadmin_frm_frmEditGrid_cpp
===
RCS file: patches/patch-pgadmin_frm_frmEditGrid_cpp
diff -N patches/patch-pgadmin_frm_frmEditGrid_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-pgadmin_frm_frmEditGrid_cpp   16 Apr 2018 08:31:24 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: pgadmin/frm/frmEditGrid.cpp
+--- pgadmin/frm/frmEditGrid.cpp.orig
 pgadmin/frm/frmEditGrid.cpp
+@@ -2386,7 +2386,7 @@ sqlTable::sqlTable(pgConn *conn, pgQueryThread *_threa
+   columns[i].typlen = colSet->GetLong(wxT("typlen"));
+   columns[i].typmod = colSet->GetLong(wxT("typmod"));
+ 
+-  switch (columns[i].type)
++  switch (static_cast(columns[i].type))
+   {
+   case PGOID_TYPE_BOOL:
+   columns[i].numeric = false;

CVS: cvs.openbsd.org: ports

[Kirill Bychkov]

CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2018/04/16 02:38:27

Modified files:
games/freeciv  : Makefile 

Log message:
server does not require gtk

Re: NEW: godot - a 2D and 3D game engine and game development framework

[Christian Ruesch]

I have waited a long time for a working port of Godot.  Godot runs on
my Thinkpad t460p on OpenBSD -current amd64 without any problems.  I
hope Godot will be included in the ports tree and made available as a
package.

Best regards,
Christian

Re: clang6: fix databases/mysqlcc

[Theo Buehler]

On Mon, Apr 16, 2018 at 02:22:58AM -0600, Anthony J. Bentley wrote:
> Theo Buehler writes:
> > +-   (uchar**) _limit, 0, GET_ULONG, REQUIRED_ARG, 1000L, 1, ~0L, 0, 
> > 1
> > , 0},
> > ++   (uchar**) _limit, 0, GET_ULONG, REQUIRED_ARG, 1000L, 1, 
> > static_ca
> > st(~0L), 0, 1, 0},
> 
> Would it make sense to use ~0ULL instead?
> 

Yes, I think that's better:

Index: patches/patch-src_main_cpp
===
RCS file: /cvs/ports/databases/mysqlcc/patches/patch-src_main_cpp,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_main_cpp
--- patches/patch-src_main_cpp  16 Apr 2018 08:20:10 -  1.4
+++ patches/patch-src_main_cpp  16 Apr 2018 08:33:25 -
@@ -8,7 +8,7 @@ Index: src/main.cpp
  
{"select_limit", OPT_SELECT_LIMIT, "", (uchar**) _limit,
 -   (uchar**) _limit, 0, GET_ULONG, REQUIRED_ARG, 1000L, 1, ~0L, 0, 1, 
0},
-+   (uchar**) _limit, 0, GET_ULONG, REQUIRED_ARG, 1000L, 1, 
static_cast(~0L), 0, 1, 0},
++   (uchar**) _limit, 0, GET_ULONG, REQUIRED_ARG, 1000L, 1, ~0ULL, 0, 
1, 0},

{"net_buffer_length", OPT_NET_BUFFER_LENGTH, "",
 (uchar**) _net_buffer_length, (uchar**) _net_buffer_length, 0, 
GET_ULONG,
@@ -17,7 +17,7 @@ Index: src/main.cpp
  
{"max_join_size", OPT_MAX_JOIN_SIZE, "", (uchar**) _join_size,
 -   (uchar**) _join_size, 0, GET_ULONG, REQUIRED_ARG, 100L, 1, ~0L, 0, 
1,
-+   (uchar**) _join_size, 0, GET_ULONG, REQUIRED_ARG, 100L, 1, 
static_cast(~0L), 0, 1,
++   (uchar**) _join_size, 0, GET_ULONG, REQUIRED_ARG, 100L, 1, ~0ULL, 
0, 1,
 0},
  
{ 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}

Re: clang6: fix databases/mysqlcc

[Anthony J. Bentley]

Theo Buehler writes:
> +-   (uchar**) _limit, 0, GET_ULONG, REQUIRED_ARG, 1000L, 1, ~0L, 0, 1
> , 0},
> ++   (uchar**) _limit, 0, GET_ULONG, REQUIRED_ARG, 1000L, 1, static_ca
> st(~0L), 0, 1, 0},

Would it make sense to use ~0ULL instead?

CVS: cvs.openbsd.org: ports

[Theo Buehler]

CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2018/04/16 02:20:10

Added files:
databases/mysqlcc/patches: patch-src_main_cpp 

Log message:
Fix build with clang6 by adding two static_cast()s

ok jasper

CVS: cvs.openbsd.org: ports

[Pavel Korovin]

CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2018/04/16 02:07:35

Modified files:
x11/qt4: Makefile 
x11/qt4/pkg: PLIST-main 
Added files:
x11/qt4/patches: patch-mkspecs_openbsd-clang_qmake_conf 
 patch-mkspecs_openbsd-clang_qplatformdefs_h 

Log message:
fix build with clang6
ok jasper@ sthen@

clang6: fix databases/mysqlcc

[Theo Buehler]

Only need to fix these two to build:

src/main.cpp:98:67: note: insert an explicit cast to silence this issue
   (uchar**) _limit, 0, GET_ULONG, REQUIRED_ARG, 1000L, 1, ~0L, 0, 1, 0},
  ^~~
  
static_cast( )
src/main.cpp:114:71: note: insert an explicit cast to silence this issue
   (uchar**) _join_size, 0, GET_ULONG, REQUIRED_ARG, 100L, 1, ~0L, 0, 1,
  ^~~
  
static_cast( )

Index: patches/patch-src_main_cpp
===
RCS file: patches/patch-src_main_cpp
diff -N patches/patch-src_main_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_main_cpp  16 Apr 2018 07:46:18 -
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: src/main.cpp
+--- src/main.cpp.orig
 src/main.cpp
+@@ -95,7 +95,7 @@ static struct my_option my_long_options[] =
+0, (void*)1},
+ 
+   {"select_limit", OPT_SELECT_LIMIT, "", (uchar**) _limit,
+-   (uchar**) _limit, 0, GET_ULONG, REQUIRED_ARG, 1000L, 1, ~0L, 0, 1, 
0},
++   (uchar**) _limit, 0, GET_ULONG, REQUIRED_ARG, 1000L, 1, 
static_cast(~0L), 0, 1, 0},
+   
+   {"net_buffer_length", OPT_NET_BUFFER_LENGTH, "",
+(uchar**) _net_buffer_length, (uchar**) _net_buffer_length, 0, 
GET_ULONG,
+@@ -111,7 +111,7 @@ static struct my_option my_long_options[] =
+(uchar**) _local_infile, 0, GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0},
+ 
+   {"max_join_size", OPT_MAX_JOIN_SIZE, "", (uchar**) _join_size,
+-   (uchar**) _join_size, 0, GET_ULONG, REQUIRED_ARG, 100L, 1, ~0L, 0, 
1,
++   (uchar**) _join_size, 0, GET_ULONG, REQUIRED_ARG, 100L, 1, 
static_cast(~0L), 0, 1,
+0},
+ 
+   { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}

Re: clang6: FIX for games/ja2-stracciatella

[Anthony J. Bentley]

Brian Callahan writes:
> 
> On 04/15/18 15:37, Klemens Nanni wrote:
> > On Sun, Apr 15, 2018 at 02:56:41PM -0400, Brian Callahan wrote:
> >> Index: Makefile
> >> ===
> >> RCS file: /cvs/ports/games/ja2-stracciatella/Makefile,v
> >> retrieving revision 1.3
> >> diff -u -p -r1.3 Makefile
> >> --- Makefile   26 Jul 2017 22:45:21 -  1.3
> >> +++ Makefile   15 Apr 2018 18:50:40 -
> >> @@ -27,7 +27,7 @@ RUN_DEPENDS =x11/gtk+3,-guic \
> >>   
> >>   USE_GMAKE =  Yes
> >>   MAKE_FLAGS = Q= WITH_UNITTESTS=0 WITH_DEBUGINFO=1 \
> >> -  CXX=c++
> >> +  CXX="${CXX}"
> >>   
> >>   NO_TEST =Yes
> >>   
> >> Index: patches/patch-Makefile
> >> ===
> >> RCS file: /cvs/ports/games/ja2-stracciatella/patches/patch-Makefile,v
> >> retrieving revision 1.1.1.1
> >> diff -u -p -r1.1.1.1 patch-Makefile
> >> --- patches/patch-Makefile 13 Jun 2017 09:24:23 -  1.1.1.1
> >> +++ patches/patch-Makefile 15 Apr 2018 18:50:40 -
> >> @@ -1,6 +1,7 @@
> >>   $OpenBSD: patch-Makefile,v 1.1.1.1 2017/06/13 09:24:23 kirby Exp $
> >>  Makefile.orig Sun Sep 11 12:13:27 2016
> >> -+++ Makefile  Wed Sep 21 14:30:42 2016
> >> +Index: Makefile
> >> +--- Makefile.orig
> >>  Makefile
> >>   @@ -3,15 +3,11 @@
> >># Please update COMPILATION.txt if necessary after changing this file.
> >>#
> >> @@ -38,6 +39,15 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2017/
> >>CFLAGS += -I _build/lib-rapidjson
> >>CFLAGS += -I _build/lib-slog
> >>CFLAGS += -I _build/lib-smacker/libsmacker
> >> +@@ -155,7 +151,7 @@ CCFLAGS += -Werror-implicit-function-declaration
> >> + CCFLAGS += -Wimplicit-int
> >> + CCFLAGS += -Wmissing-prototypes
> >> +
> >> +-CXXFLAGS += $(CFLAGS)
> >> ++CXXFLAGS += $(CFLAGS) -std=gnu++98
> > Why not passing it through CFLAGS in MAKE_FLAGS as done with CXX?
>
> Because it ends up obliterating all the other CXXFLAGS, and compilation 
> fails immediately.

I agree with the CXX fix. David Carlier already sent a diff that uses
MAKE_ENV to fix clang6. I would prefer that to setting CXXFLAGS, except
with -Wno-narrowing instead of -std.

MAKE_ENV =  CXXFLAGS="${CXXFLAGS} -Wno-narrowing"

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/16 01:35:27

Added files:
games/dangerdeep/patches: patch-src_freeview_display_cpp 
  patch-src_gun_shell_cpp 
  patch-src_sky_cpp 

Log message:
fix build with clang6

Re: [UPDATE] www/links+ to 1.15

[Anthony J. Bentley]

trondd writes:
> What is the policy around setting SEPARATE_BUILD?  Any GNU build?  Not
> just builds that require it?

I don't know that there is any "policy", other than "set SEPARATE_BUILD
if needed, and don't set it if it breaks".

Certainly if it works, it's nice to have even when it's not strictly
needed. But I doubt anybody will be sweeping the whole tree for it
anytime soon, probably...

-- 
Anthony J. Bentley

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/16 01:05:34

Added files:
games/sumwars/patches: patch-src_gussound_gopenal_cpp 

Log message:
fix build with clang6

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/16 00:47:54

Added files:
multimedia/swfmill/patches: patch-src_swfmill_cpp 
patch-src_swft_swft_import_jpeg_cpp 

Log message:
fix build with clang6