UPDATE: net/mininet - various bug fixes

[Ayaka Koshibe]

> Sure, updated diff below.
> 
> Note how README.md is now installed from WRKSRC from WRKBUILD: they
> used to be the same so the fake target would work, but with
> SEPARATE_BUILD this would fail.
> 
> > > Maybe also use the latest git commit instead of bumping revision?
> > 
> > If I understand correctly, this would be interpreted as an upstream version
> > change, hence not need the REVSISON bump? 
> Yes, GH_TAGNAME and DISTNAME would change instead of bumping REVISION.
> But I looked closer and none of the new commits seem to affect us, so
> that might just do next time.

Got it, thanks for clarifying.
 
> pre-install now goes into post-install as well, as I could find a reason
> to keep these apart.
> 
> Feedback? OK?

Looks good, OK akoshibe

> Index: Makefile
> ===
> RCS file: /cvs/ports/net/mininet/Makefile,v
> retrieving revision 1.7
> diff -u -p -r1.7 Makefile
> --- Makefile  10 Apr 2018 07:55:10 -  1.7
> +++ Makefile  15 Apr 2018 08:54:25 -
> @@ -3,7 +3,7 @@
>  COMMENT =emulator for rapid prototyping of software defined networks
>  
>  DISTNAME =   mininet-0.0.20170813
> -REVISION =   4
> +REVISION =   5
>  GH_ACCOUNT = mininet
>  GH_PROJECT = mininet
>  GH_COMMIT =  87e26ef931ee6063332ceba77db472140f832d3a
> @@ -18,33 +18,30 @@ MAINTAINER =  Ayaka Koshibe   PERMIT_PACKAGE_CDROM =   Yes
>  
>  WANTLIB =c
> +
>  MODULES =lang/python
>  MODPY_SETUPTOOLS =   Yes
>  BUILD_DEPENDS =  devel/help2man
>  RUN_DEPENDS =net/socat \
>   net/iperf
>  
> +SEPARATE_BUILD = Yes
> +
>  do-build:
> - $(CC) ${WRKSRC}/mnexec.c -o ${WRKBUILD}/mnexec
> + ${CC} ${CFLAGS} ${WRKSRC}/mnexec.c -o ${WRKBUILD}/mnexec
>   help2man -N -n "create a Mininet network."  --no-discard-stderr \
>   "PYTHONPATH=${WRKBUILD} ${MODPY_BIN} -B ${WRKBUILD}/bin/mn" \
>   -o ${WRKBUILD}/mn.1
>   help2man -N -n "execution utility for Mininet."  -h "-h" -v "-v" \
>   --no-discard-stderr ${WRKBUILD}/mnexec -o ${WRKBUILD}/mnexec.1
>  
> -pre-install:
> +post-install:
>   ${INSTALL_PROGRAM} ${WRKBUILD}/mnexec ${PREFIX}/bin
> -.for m in mnexec mn
> - ${INSTALL_MAN} ${WRKBUILD}/$m.1 ${PREFIX}/man/man1
> -.endfor
> + ${INSTALL_MAN} ${WRKBUILD}/*.1 ${PREFIX}/man/man1
>   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mininet
> - ${INSTALL_DATA} ${WRKBUILD}/README.md ${PREFIX}/share/doc/mininet
> -
> -post-install:
> + ${INSTALL_DATA} ${WRKSRC}/README.md ${PREFIX}/share/doc/mininet
>   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mininet
> - ${INSTALL_DATA} ${WRKSRC}/util/switchd.conf \
> - ${PREFIX}/share/examples/mininet/switchd.mininet.conf-sample
> -.for f in examples/README.md examples/*.py
> +.for f in examples/README.md examples/*.py util/switchd.conf
>   ${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/share/examples/mininet
>  .endfor
>  
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/net/mininet/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST
> --- pkg/PLIST 7 Dec 2017 06:33:40 -   1.4
> +++ pkg/PLIST 15 Apr 2018 08:54:25 -
> @@ -94,7 +94,7 @@ share/examples/mininet/scratchnet.py
>  share/examples/mininet/scratchnetuser.py
>  share/examples/mininet/simpleperf.py
>  share/examples/mininet/sshd.py
> -share/examples/mininet/switchd.mininet.conf-sample
> +share/examples/mininet/switchd.conf
>  @sample ${SYSCONFDIR}/switchd.mininet.conf
>  share/examples/mininet/tree1024.py
>  share/examples/mininet/treeping64.py
> ===
> Stats: --- 13 lines 440 chars
> Stats: +++ 10 lines 321 chars
> Stats: -3 lines
> Stats: -119 chars
> 

Re: clang6: Fix for games/enigma

[Ingo Schwarze]

Hi Christian,

Christian Weisgerber wrote on Mon, Apr 16, 2018 at 12:05:20AM +0200:

> FreeBSD fixed Proxy.cc this way.  I'm uncertain if this is correct.

It is.
The intention of the test is to find out whether the file was opened
successfully.  My old Stroustrup book says that can be tested with
"basic_ifstream<...> ifs(...); if (ifs)", without explaining why.
I found the reason in the base-base class basic_ios in the file
bits/basic_ios.h: it defines a conversion function (KNF'ed):

public:
operator
void*() const
{
return this->fail() ? 0 :
const_cast(this);
}

Because there is a standard conversion from any pointer type
to bool, casting basic_ifstream to bool actually goes via void *
and ultimately calls basic_ios::fail.  The wonders of C++ type
conversion.

The Value.cc patch is also correct.  Weird as it may seem,
the Value class really represents NULL pointers by
setting the double[2] array val.dval to { 0.0, whatever }.
You can see that in other places in the file...

The game also builds and works for me with the patch.

OK schwarze@
  Ingo


> Index: Makefile
> ===
> RCS file: /cvs/ports/games/enigma/Makefile,v
> retrieving revision 1.33
> diff -u -p -r1.33 Makefile
> --- Makefile  13 Mar 2018 21:13:48 -  1.33
> +++ Makefile  15 Apr 2018 22:03:43 -
> @@ -4,6 +4,7 @@ COMMENT=  Oxyd/Rock'n'Roll clone
>  
>  V=   1.21
>  DISTNAME=enigma-${V}
> +REVISION=0
>  
>  CATEGORIES=  games x11
>  
> Index: patches/patch-src_Value_cc
> ===
> RCS file: patches/patch-src_Value_cc
> diff -N patches/patch-src_Value_cc
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_Value_cc15 Apr 2018 22:03:43 -
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: src/Value.cc
> +--- src/Value.cc.orig
>  src/Value.cc
> +@@ -149,7 +149,7 @@ namespace enigma {
> + val.dval[0] = false;
> + break;
> + case OBJECT :
> +-val.dval[0] = (double) NULL;
> ++val.dval[0] = 0;
> + break;
> + case NAMEDOBJECT:
> + ASSERT(false, XLevelRuntime, "Value: illegal type usage");
> Index: patches/patch-src_lev_Proxy_cc
> ===
> RCS file: patches/patch-src_lev_Proxy_cc
> diff -N patches/patch-src_lev_Proxy_cc
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_lev_Proxy_cc15 Apr 2018 22:03:43 -
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: src/lev/Proxy.cc
> +--- src/lev/Proxy.cc.orig
>  src/lev/Proxy.cc
> +@@ -933,7 +933,7 @@ namespace enigma { namespace lev {
> + } else if (haveLocalCopy) {
> + // plain file
> + basic_ifstream ifs(absExtPath.c_str(), 
> ios::binary | ios::in);
> +-if (ifs != NULL)
> ++if (ifs)
> + Readfile(ifs, extCode);
> + else
> + haveLocalCopy = false;

Re: Firefox does not start (at least without significant lag) sometimes after crashing

[Z Ero]

$ firefox &
[2] 24794
$ top
$ ps
  PID TT  STAT   TIME COMMAND
16819 p1  Z   0:00.00 (firefox)
61237 p1  Z   0:00.00 (firefox)
32024 p1  Ssp 0:00.01 ksh
 8876 p1  I   0:00.19 firefox
24794 p1  S   0:04.79 firefox
  373 p1  R+p/0   0:00.00 ps
$ kill -9 16819
$ ps
  PID TT  STAT   TIME COMMAND
61237 p1  Z   0:00.00 (firefox)
32024 p1  Ssp 0:00.01 ksh
24794 p1  I   0:04.79 firefox
28606 p1  R+p/1   0:00.00 ps
[1] - Done firefox
$ kill -9 61237
$ ps
  PID TT  STAT   TIME COMMAND
61237 p1  Z   0:00.00 (firefox)
32024 p1  Ssp 0:00.01 ksh
24794 p1  I   0:04.79 firefox
91733 p1  R+p/1   0:00.00 ps
$ kill -9 61237
ksh: kill: 61237: No such process
$ ps
  PID TT  STAT   TIME COMMAND
32024 p1  Ssp 0:00.01 ksh
24794 p1  D   0:06.13 firefox
17741 p1  S   0:00.00 dbus-launch
--autolaunch=d3a4785d28139dbad41abb225a91d3af --binary-syntax
--close-stderr
46916 p1  R+p/0   0:00.00 ps

On Sun, Apr 15, 2018 at 10:58 PM, Z Ero  wrote:
> 6.2 AMD64, firefox 58.
>
> If firefox crashes (which happens rarely) sometimes I find it does not
> start back up again. It seems to become a zombie or something. It
> starts then goes directly to suspend. Why? Any work around known?
>
> I suspect it has something to do with dbus waiting for something or
> firefox waiting for something from dbus.
>
> I have found killing my multiple attempts at starting firefox
> eventually produces a dialogue window saying "firefox is already
> running but not responding." Well... Then when I kill the process that
> started the dialogue window it firefox finally starts.
>
> But this behaviour is strange and the solution would not be intuitive
> to many less technical users (e.g. if one was using OpenBSD + Firefox
> as a platform for a thinclient / web browser + think client based
> application). Maybe firefox eventually starts on its own (after 5
> minutes) but I have never had the patience to wait around to try
> that...in any case that would be unacceptable for a general user.
>
> Does any one else experience this?
>
> Is there any solution / work around?
>
> Thanks.

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2018/04/15 18:33:28

Modified files:
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 

Log message:
Register xnc removal.

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2018/04/15 18:33:10

Removed files:
misc/xnc   : Makefile distinfo 
misc/xnc/patches: patch-Makefile_in patch-_xlaunch__launch_menu 
  patch-_xlaunch__xnlaunch_ini 
  patch-bookmark_cxx patch-configure_in 
  patch-filedir_makefile_in 
  patch-filedir_softmagic_c 
  patch-image2_sdl_image_IMG_png_c 
  patch-plugins_aqua_aquagui_cxx 
  patch-plugins_five_fivegui_cxx 
  patch-rxvt2_command_c patch-rxvt2_grkelot_c 
  patch-xh_cxx 
misc/xnc/pkg   : DESCR MESSAGE PLIST 

Log message:
Remove misc/xnc. Ancient software that hasn't seen an update since 2001.
ok bentley@ jca@

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2018/04/15 18:32:24

Modified files:
misc   : Makefile 

Log message:
-xnc

clang6 sysutils/facter

[Alexander Bluhm]

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?

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

CVS: cvs.openbsd.org: ports

[Alexander Bluhm]

CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2018/04/15 18:06:19

Modified files:
games/warmux   : Makefile 
Added files:
games/warmux/patches: patch-src_interface_weapon_menu_cpp 
  patch-src_map_tile_h 

Log message:
Fix warmux build with clang6.
OK bcallah@

Re: clang6: REMOVE misc/xnc

[Jeremie Courreges-Anglas]

On Sun, Apr 15 2018, Brian Callahan  wrote:
> Hi ports --
>
> misc/xnc has a copyright date of 96-98, hasn't seen an update since
> 2001, has a dead HOMEPAGE, and now segfaults when I try to run it after
> fixing the clang6 build. Does anyone use this? Can we just send it off
> to the attic?
>
> OK?

ok jca@

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

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

[Jeremie Courreges-Anglas]

+cc maintainer

> -Original Message-
> From: owner-po...@openbsd.org  On Behalf Of Markus 
> Hennecke
> Sent: April 15, 2018 9:04 AM
> To: ports@openbsd.org
> Subject: Re: [armv7 fix] Fix build lang/gcc/4.9
>
> Attached is a new diff fixing build on armv7 and adding patches to fix
> the build after the switch to clang 6. The patch became pretty big,
> because clang complains about error: invalid suffix on literal; C++11
> requires a space between literal and identifier
> [-Wreserved-user-defined-literal] in a lot of files.
> No change in the armv7 fixes, still setting -fbracket-depth=512 in case CC is 
> clang and adding #include  in gcc/system.h when compiling c++.

On Sun, Apr 15 2018,  wrote:
> I tried to build gcc with your patch and ran into the error below. I did not 
> see any patches applied to ipa-devirt.c
>
> /usr/ports/pobj/gcc-4.9.4/gcc-4.9.4/gcc/ipa-devirt.c:1637:32: error: invalid 
> suffix on literal; C++11
>   requires a space between literal and identifier 
> [-Wreserved-user-defined-literal]
>   fprintf (f, " at offset "HOST_WIDE_INT_PRINT_DEC"\n",

Correct, I've spotted this also.  I have committed
the -Wreserved-user-defined-literal diffs (including the one for
ipa-devirt.c) since they are trivial and we need a working ports-gcc for
the upcoming hackathon.

I'm testing the -fbracket-depth=512 diff on arm, build still ongoing.


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

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2018/04/15 17:39:26

Modified files:
lang/gcc/4.9/patches: patch-gcc_defaults_h patch-gcc_toplev_c 
Added files:
lang/gcc/4.9/patches: patch-gcc_bitmap_c patch-gcc_cgraph_c 
  patch-gcc_config_elfos_h 
  patch-gcc_cppbuiltin_c 
  patch-gcc_dwarf2cfi_c 
  patch-gcc_dwarf2out_c 
  patch-gcc_ipa-devirt_c 
  patch-gcc_ipa-inline_c 
  patch-gcc_ipa-profile_c 
  patch-gcc_ipa-prop_c patch-gcc_loop-iv_c 
  patch-gcc_profile_c 
  patch-gcc_stor-layout_c patch-gcc_system_h 
  patch-gcc_tree-ssa-reassoc_c 
  patch-gcc_value-prof_c 

Log message:
Trivial clang6 fixes for lang/gcc/4.9

Part of a diff from Markus Hennecke, not waiting for maintainer since
p2k18 is near.

clang6: Fix for games/enigma

[Christian Weisgerber]

FreeBSD fixed Proxy.cc this way.  I'm uncertain if this is correct.

Index: Makefile
===
RCS file: /cvs/ports/games/enigma/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile13 Mar 2018 21:13:48 -  1.33
+++ Makefile15 Apr 2018 22:03:43 -
@@ -4,6 +4,7 @@ COMMENT=Oxyd/Rock'n'Roll clone
 
 V= 1.21
 DISTNAME=  enigma-${V}
+REVISION=  0
 
 CATEGORIES=games x11
 
Index: patches/patch-src_Value_cc
===
RCS file: patches/patch-src_Value_cc
diff -N patches/patch-src_Value_cc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_Value_cc  15 Apr 2018 22:03:43 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/Value.cc
+--- src/Value.cc.orig
 src/Value.cc
+@@ -149,7 +149,7 @@ namespace enigma {
+ val.dval[0] = false;
+ break;
+ case OBJECT :
+-val.dval[0] = (double) NULL;
++val.dval[0] = 0;
+ break;
+ case NAMEDOBJECT:
+ ASSERT(false, XLevelRuntime, "Value: illegal type usage");
Index: patches/patch-src_lev_Proxy_cc
===
RCS file: patches/patch-src_lev_Proxy_cc
diff -N patches/patch-src_lev_Proxy_cc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_lev_Proxy_cc  15 Apr 2018 22:03:43 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/lev/Proxy.cc
+--- src/lev/Proxy.cc.orig
 src/lev/Proxy.cc
+@@ -933,7 +933,7 @@ namespace enigma { namespace lev {
+ } else if (haveLocalCopy) {
+ // plain file
+ basic_ifstream ifs(absExtPath.c_str(), 
ios::binary | ios::in);
+-if (ifs != NULL)
++if (ifs)
+ Readfile(ifs, extCode);
+ else
+ haveLocalCopy = false;
-- 
Christian "naddy" Weisgerber  na...@mips.inka.de

CVS: cvs.openbsd.org: ports

[Brian Callahan]

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

Added files:
games/amoebax/patches: patch-src_NewHighScoreState_cxx 

Log message:
Fix build on clang6
ok bentley@

clang6: REMOVE misc/xnc

[Brian Callahan]

Hi ports --

misc/xnc has a copyright date of 96-98, hasn't seen an update since 
2001, has a dead HOMEPAGE, and now segfaults when I try to run it after 
fixing the clang6 build. Does anyone use this? Can we just send it off 
to the attic?


OK?

~Brian

games/supertux is broken

[mazocomp]

mazocomp$ supertux2
[WARNING] 
/usr/obj/ports/supertux-0.5.1/SuperTux-v0.5.1-Source/src/supertux/main.cpp:188 
Couldn't add './share/supertux2' to physfs searchpath: not found
[FATAL] 
/usr/obj/ports/supertux-0.5.1/SuperTux-v0.5.1-Source/src/supertux/main.cpp:510 
Unexpected exception: Couldn't open 'images/engine/icons/supertux-256x256.png': 
not found
mazocomp$

clang6 games/warmux

[Alexander Bluhm]

Hi,

This fixes warmux build with clang6 on amd64.

interface/weapon_menu.cpp:394:12: error: cannot initialize return object of type
  'Weapon *' with an rvalue of type 'bool'
return false;
   ^
map/tile.cpp:676:30: error: non-constant-expression cannot be narrowed from type
  'uint' (aka 'unsigned int') to 'uint16_t' (aka 'unsigned short') in
  initializer list [-Wc++11-narrowing]
  SynchTileInfo info = { i, t->GetSynchsum() };

ok?

bluhm

Index: games/warmux/Makefile
===
RCS file: /data/mirror/openbsd/cvs/ports/games/warmux/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- games/warmux/Makefile   25 Sep 2017 14:33:14 -  1.13
+++ games/warmux/Makefile   15 Apr 2018 21:19:01 -
@@ -3,7 +3,7 @@
 COMMENT=   free software clone of Worms(R) game concept
 
 DISTNAME=  warmux-11.04.1
-REVISION=  6
+REVISION=  7
 WRKDIST=   ${WRKDIR}/warmux-11.04
 CATEGORIES=games
 
Index: games/warmux/patches/patch-src_interface_weapon_menu_cpp
===
RCS file: games/warmux/patches/patch-src_interface_weapon_menu_cpp
diff -N games/warmux/patches/patch-src_interface_weapon_menu_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ games/warmux/patches/patch-src_interface_weapon_menu_cpp15 Apr 2018 
21:16:30 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/interface/weapon_menu.cpp
+--- src/interface/weapon_menu.cpp.orig
 src/interface/weapon_menu.cpp
+@@ -391,7 +391,7 @@ void WeaponsMenu::Draw()
+ Weapon * WeaponsMenu::UpdateCurrentOverflyItem(const Polygon * poly)
+ {
+   if (!show)
+-return false;
++return NULL;
+   const std::vector& items = poly->GetItem();
+   WeaponMenuItem * tmp;
+   Interface::GetInstance()->SetCurrentOverflyWeapon(NULL);
Index: games/warmux/patches/patch-src_map_tile_h
===
RCS file: games/warmux/patches/patch-src_map_tile_h
diff -N games/warmux/patches/patch-src_map_tile_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ games/warmux/patches/patch-src_map_tile_h   15 Apr 2018 21:16:32 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: src/map/tile.h
+--- src/map/tile.h.orig
 src/map/tile.h
+@@ -38,7 +38,8 @@ class Tile : public Rectanglei
+ public:
+   typedef struct
+   {
+-uint16_t index, new_crc;
++uint32_t index;
++uint16_t new_crc;
+   } SynchTileInfo;
+   typedef std::vector SynchTileList;
+ 

CVS: cvs.openbsd.org: ports

[Alexander Bluhm]

CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2018/04/15 15:29:32

Modified files:
emulators/frodo: Makefile 
emulators/frodo/patches: patch-Src_SID_cpp 

Log message:
Fix frodo build with clang6.
OK bcallah@

clang6: FIX games/amoebax

[Brian Callahan]

Just one static_cast to add.
OK?

~Brian

Index: patches/patch-src_NewHighScoreState_cxx
===
RCS file: patches/patch-src_NewHighScoreState_cxx
diff -N patches/patch-src_NewHighScoreState_cxx
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-src_NewHighScoreState_cxx	15 Apr 2018 21:26:31 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+clang6 fix
+
+Index: src/NewHighScoreState.cxx
+--- src/NewHighScoreState.cxx.orig
 src/NewHighScoreState.cxx
+@@ -396,7 +396,7 @@ NewHighScoreState::unicodeCharacterPressed (uint16_t c
+ // FIXME: We are only interessted with ASCII values.
+ if ( 0 == (code & 0xff80) )
+ {
+-char character[2] = {toupper (static_cast(code & 0x7f)), '\0'};
++char character[2] = {static_cast(toupper (static_cast(code & 0x7f))), '\0'};
+ std::string::size_type characterPos =
+ m_CursorValues.find (std::string (character));
+ if ( std::string::npos != characterPos )

CVS: cvs.openbsd.org: ports

[Brian Callahan]

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

Modified files:
games/roadfighter/patches: patch-build_linux_Makefile 
Added files:
games/roadfighter/patches: patch-src_auxiliar_cpp 

Log message:
Fix build on clang6. Remove hardcoded -O2 while here.
ok landry@

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

[s_graf]

I tried to build gcc with your patch and ran into the error below. I did not 
see any patches applied to ipa-devirt.c

/usr/ports/pobj/gcc-4.9.4/gcc-4.9.4/gcc/ipa-devirt.c:1637:32: error: invalid 
suffix on literal; C++11
  requires a space between literal and identifier 
[-Wreserved-user-defined-literal]
  fprintf (f, " at offset "HOST_WIDE_INT_PRINT_DEC"\n",
   ^

5 warnings and 1 error generated.
gmake[3]: *** [Makefile:1058: ipa-devirt.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/infrastructure/mk/bsd.port.mk:2742 
'/usr/ports/pobj/gcc-4.9.4/build-arm/.build_done')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:1938 
'/usr/ports/packages/arm/all/gcc-4.9.4p9.tgz')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2440 
'_internal-package')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2419 'package')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:1956 
'/var/db/pkg/gcc-4.9.4p9/+CONTENTS')
*** Error 1 in /usr/ports/lang/gcc/4.9 
(/usr/ports/infrastructure/mk/bsd.port.mk:2419 'install')

-Original Message-
From: owner-po...@openbsd.org  On Behalf Of Markus 
Hennecke
Sent: April 15, 2018 9:04 AM
To: ports@openbsd.org
Subject: Re: [armv7 fix] Fix build lang/gcc/4.9

Attached is a new diff fixing build on armv7 and adding patches to fix the 
build after the switch to clang 6. The patch became pretty big, because clang 
complains about error: invalid suffix on literal; C++11 requires a space 
between literal and identifier [-Wreserved-user-defined-literal] in a lot of 
files.
No change in the armv7 fixes, still setting -fbracket-depth=512 in case CC is 
clang and adding #include  in gcc/system.h when compiling c++.

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

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

Modified files:
games/f1spirit : Makefile 
games/f1spirit/patches: patch-build_linux_Makefile 
Added files:
games/f1spirit/patches: patch-sources_auxiliar_cpp 

Log message:
fix build with clang6; fix CFLAGS while here

clang6: FIX games/roadfighter

[Brian Callahan]

Hi ports --

The fix for this one is the same as f1spirit. While here, remove a 
hardcoded -O2.


OK?

~Brian

Index: patches/patch-build_linux_Makefile
===
RCS file: /cvs/ports/games/roadfighter/patches/patch-build_linux_Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-build_linux_Makefile
--- patches/patch-build_linux_Makefile	19 Mar 2009 18:28:18 -	1.1.1.1
+++ patches/patch-build_linux_Makefile	15 Apr 2018 21:09:10 -
@@ -1,6 +1,7 @@
 $OpenBSD: patch-build_linux_Makefile,v 1.1.1.1 2009/03/19 18:28:18 landry Exp $
 build/linux/Makefile.orig	Wed Mar 19 21:58:51 2008
-+++ build/linux/Makefile	Sat Mar  7 12:44:30 2009
+Index: build/linux/Makefile
+--- build/linux/Makefile.orig
 build/linux/Makefile
 @@ -1,11 +1,11 @@
  EXE = roadfighter
  SRC = src
@@ -22,7 +23,7 @@ $OpenBSD: patch-build_linux_Makefile,v 1
  CC = g++
 -CFLAGS = -g3 -O3 `sdl-config --cflags` -I/usr/X11R6/include
 -LDFLAGS = `sdl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lSDL_sound -lSDL_ttf
-+CFLAGS+= -g -O2 `sdl-config --cflags` -I/usr/X11R6/include
++CFLAGS+= -g `sdl-config --cflags` -I/usr/X11R6/include
 +LDFLAGS+= `sdl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lSDL_sound -lSDL_ttf
  RM = rm -f
  CP = cp -r
Index: patches/patch-src_auxiliar_cpp
===
RCS file: patches/patch-src_auxiliar_cpp
diff -N patches/patch-src_auxiliar_cpp
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-src_auxiliar_cpp	15 Apr 2018 21:09:10 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+clang6 fix
+
+Index: src/auxiliar.cpp
+--- src/auxiliar.cpp.orig
 src/auxiliar.cpp
+@@ -84,7 +84,7 @@ SDL_Surface *load_maskedimage(char *imagefile,char *ma
+ 	mask=IMG_Load(name);
+ 
+ if (tmp==0 ||
+-		mask==0) return false;
++		mask==0) return 0;
+ 
+ 	res=SDL_DisplayFormatAlpha(tmp);
+ 

Re: clang6: FIX games/f1spirit

[Landry Breuil]

On Sun, Apr 15, 2018 at 04:55:33PM -0400, Brian Callahan wrote:
> Hi ports --
> 
> Here's the fix for games/f1spirit. While here, remove libidn from
> LIB_DEPENDS (make port-lib-depends-check says not needed) and remove a
> hardcoded -O3.

you beat me to it... as for libidn, i think it was added in a sweep when
libidn support was removed from curl, so it should be safe to remove.
curl usage is limited to sources/F1Shttp.cpp but i don't really
understand what it does.

clang6 emulators/frodo

[Alexander Bluhm]

Hi

This fixes the build of frodo on amd64 clang 6.

SID.cpp:813:2: error: constant expression evaluates to 32768 which cannot be
  narrowed to type 'int16' (aka 'short') [-Wc++11-narrowing]
0x8000, 0x9111, 0xa222, 0xb333, 0xc444, 0xd555, 0xe666, 0xf777,
^~

ok?

bluhm

Index: emulators/frodo/Makefile
===
RCS file: /data/mirror/openbsd/cvs/ports/emulators/frodo/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- emulators/frodo/Makefile26 Jul 2017 22:45:19 -  1.28
+++ emulators/frodo/Makefile15 Apr 2018 20:53:21 -
@@ -4,7 +4,7 @@ COMMENT=Commodore 64 emulator
 
 DISTNAME=  FrodoV4_1b.Src
 PKGNAME=   frodo-4.1b
-REVISION=  8
+REVISION=  9
 DISTFILES= FrodoV4_1b.Src${EXTRACT_SUFX}
 
 CATEGORIES=emulators games
Index: emulators/frodo/patches/patch-Src_SID_cpp
===
RCS file: 
/data/mirror/openbsd/cvs/ports/emulators/frodo/patches/patch-Src_SID_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Src_SID_cpp
--- emulators/frodo/patches/patch-Src_SID_cpp   30 Jun 2010 22:25:57 -  
1.2
+++ emulators/frodo/patches/patch-Src_SID_cpp   15 Apr 2018 20:49:41 -
@@ -1,6 +1,7 @@
 $OpenBSD: patch-Src_SID_cpp,v 1.2 2010/06/30 22:25:57 jakemsr Exp $
 Src/SID.cpp.orig   Wed Jan  2 13:18:59 2002
-+++ Src/SID.cppThu Jan 14 09:16:38 2010
+Index: Src/SID.cpp
+--- Src/SID.cpp.orig
 Src/SID.cpp
 @@ -64,6 +64,9 @@ class DigitalPlayer;
  #define ldSINTAB 9// size of sinus table (0 to 90 degrees)
  #endif
@@ -11,6 +12,15 @@ $OpenBSD: patch-Src_SID_cpp,v 1.2 2010/0
  
  #ifdef USE_FIXPOINT_MATHS
  #include "FixPoint.i"
+@@ -374,7 +377,7 @@ class DigitalRenderer : public SIDRenderer { (private)
+   static const uint16 TriSawRectTable[0x100];
+   static const uint32 EGTable[16];// Increment/decrement values 
for all A/D/R settings
+   static const uint8 EGDRShift[256]; // For exponential approximation of 
D/R
+-  static const int16 SampleTab[16]; // Table for sampled voice
++  static const uint16 SampleTab[16]; // Table for sampled voice
+ 
+   DRVoice voice[3];   // Data for 3 voices
+ 
 @@ -481,6 +484,12 @@ class DigitalRenderer : public SIDRenderer { (private)
uint8 *sound_buffer;
C64 *the_c64;
@@ -24,6 +34,15 @@ $OpenBSD: patch-Src_SID_cpp,v 1.2 2010/0
  };
  
  // Static data members
+@@ -800,7 +809,7 @@ const uint8 DigitalRenderer::EGDRShift[256] = {
+   0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+ };
+ 
+-const int16 DigitalRenderer::SampleTab[16] = {
++const uint16 DigitalRenderer::SampleTab[16] = {
+   0x8000, 0x9111, 0xa222, 0xb333, 0xc444, 0xd555, 0xe666, 0xf777,
+   0x0888, 0x1999, 0x2aaa, 0x3bbb, 0x4ccc, 0x5ddd, 0x6eee, 0x7fff,
+ };
 @@ -1353,6 +1362,9 @@ void DigitalRenderer::calc_buffer(int16 *buf, long cou
  
  #elif defined(__linux__)

CVS: cvs.openbsd.org: ports

[Brian Callahan]

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

Modified files:
emulators/nestopia: Makefile 

Log message:
Fix build with clang6. Correct upstream approach pointed out by bentley@.

clang6: FIX games/f1spirit

[Brian Callahan]

Hi ports --

Here's the fix for games/f1spirit. While here, remove libidn from 
LIB_DEPENDS (make port-lib-depends-check says not needed) and remove a 
hardcoded -O3.


OK?

~Brian

Index: Makefile
===
RCS file: /cvs/ports/games/f1spirit/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile	2 Nov 2017 15:04:18 -	1.13
+++ Makefile	15 Apr 2018 20:54:11 -
@@ -4,7 +4,7 @@ COMMENT=	remake of Konami's F1-Spirit
 
 DISTNAME=	f1spirit.src_0.rc9-1615
 PKGNAME=	${DISTNAME:S/.src_0.rc9-/-0./}
-REVISION =	3
+REVISION =	4
 WRKDIST=	${WRKDIR}/${DISTNAME:S/.src_0.rc9-/-0.rc9./}
 
 EXTRACT_SUFX=	.tgz
@@ -28,7 +28,6 @@ RUN_DEPENDS=	devel/desktop-file-utils
 LIB_DEPENDS=	devel/sdl-image \
 		devel/sdl-net \
 		devel/sdl-mixer \
-		net/curl \
-		devel/libidn
+		net/curl
 
 .include 
Index: patches/patch-build_linux_Makefile
===
RCS file: /cvs/ports/games/f1spirit/patches/patch-build_linux_Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-build_linux_Makefile
--- patches/patch-build_linux_Makefile	27 Apr 2014 09:18:01 -	1.2
+++ patches/patch-build_linux_Makefile	15 Apr 2018 20:54:11 -
@@ -1,6 +1,7 @@
 $OpenBSD: patch-build_linux_Makefile,v 1.2 2014/04/27 09:18:01 landry Exp $
 build/linux/Makefile.orig	Fri Feb  6 11:12:51 2009
-+++ build/linux/Makefile	Sun Apr 27 11:05:01 2014
+Index: build/linux/Makefile
+--- build/linux/Makefile.orig
 build/linux/Makefile
 @@ -1,11 +1,11 @@
  EXE = f1spirit
  SRC = sources
@@ -25,7 +26,7 @@ $OpenBSD: patch-build_linux_Makefile,v 1
  #CFLAGS = -g3 -O3 -Wall `sdl-config --cflags` `curl-config --cflags` -I/usr/X11R6/include
 -CFLAGS = -g3 -O3 -Wno-write-strings `sdl-config --cflags` `curl-config --cflags` -I/usr/X11R6/include
 -LDFLAGS = `sdl-config --libs` `curl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lSDL_net -lGL -lGLU
-+CFLAGS += -g3 -O3 -Wno-write-strings `sdl-config --cflags` `curl-config --cflags` -I/usr/X11R6/include
++CFLAGS += -g3 -Wno-write-strings `sdl-config --cflags` `curl-config --cflags` -I/usr/X11R6/include
 +LDFLAGS += `sdl-config --libs` `curl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lSDL_net -lGL -lGLU
  RM = rm -f
  CP = cp -r
Index: patches/patch-sources_auxiliar_cpp
===
RCS file: patches/patch-sources_auxiliar_cpp
diff -N patches/patch-sources_auxiliar_cpp
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-sources_auxiliar_cpp	15 Apr 2018 20:54:11 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+clang6 fix
+
+Index: sources/auxiliar.cpp
+--- sources/auxiliar.cpp.orig
 sources/auxiliar.cpp
+@@ -93,7 +93,7 @@ SDL_Surface *load_maskedimage(char *imagefile, char *m
+ 
+ 	if (tmp == 0 ||
+ 	mask == 0)
+-		return false;
++		return 0;
+ 
+ 	res = SDL_DisplayFormatAlpha(tmp);
+ 

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

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

Added files:
emulators/fceux/patches: patch-src_utils_xstring_cpp 

Log message:
fix build for clang6; code shared with emulators/desmume

Re: clang6: FIX for emulators/nestopia

[Anthony J. Bentley]

Brian Callahan writes:
> 
> On 04/15/18 16:33, Anthony J. Bentley wrote:
> > Brian Callahan writes:
> >> Hi ports --
> >>
> >> Minimal clang6 fix for emulators/nestopia.
> >> OK?
> > Yes, except please use -Wno-narrowing instead as that's what I see in
> > upstream git.
>
> Sure, but where is upstream git? All I could find was the sourceforge 
> page and I didn't see any git stuff there.

It's linked from HOMEPAGE.
https://github.com/0ldsk00l/nestopia/blob/master/configure.ac#L54

Re: [UPDATE] www/links+ to 1.15

[trondd]

On Sun, April 15, 2018 12:36 pm, Klemens Nanni wrote:
> On Sun, Apr 15, 2018 at 11:30:22AM -0400, trondd wrote:
>> Easy update for links+ to 1.15.  Built against clang 6.
>>
>> Full changelog at http://links.twibright.com/download/ChangeLog
>> Some notable udates:
>>
>> Rewrite google docs URLs to the download link, so that the file can be
>> viewed in external viewer
>>
>> Support international domain names
>>
>> Fix reading one byte beyond allocated space in case of corrupted
>> UTF-8 data - CVE-2017-4
>>
>> Use built-in SSL certificates (ed. Optional)
>> This improves tor hardening (the tor exit node could not differentiate
>> links users from each other based on installed certificates)
>> It also makes it possible to use certificate verification on systems
>> with no default certificate store
>>
>> Report IP addresses in the "Document info" box.
>>
>> Implement a small connection timeout when connecting to a host with
>> multiple addresses, so that there is faster fallback from IPv6 to IPv4.
>>
>> Avoid memcpy with NULL source argument and zero length (it doesn't
>> crash, but it's formally incorrect and the sanitizer warns about it)
>>
>> Make the "dns-prefetch" link prefetch just dns, not the whole document
>>
>> Fix compilation failure on OpenBSD because OpenBSD removed
>> the timeout_* macros from libevent
>>
>> Use OpenSSL functions X509_check_host and X509_check_ip if available
>>
>> Use session cache on https
> Builds fine on amd64, lightly run tested.
>
> OK kn with SEPARATE_BUILD=Yes set.
>

Sorry for the multi-post.  Network issue on my end.

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

Tim.

Re: clang6: FIX for emulators/nestopia

[Brian Callahan]

On 04/15/18 16:33, Anthony J. Bentley wrote:

Brian Callahan writes:

Hi ports --

Minimal clang6 fix for emulators/nestopia.
OK?

Yes, except please use -Wno-narrowing instead as that's what I see in
upstream git.


Sure, but where is upstream git? All I could find was the sourceforge 
page and I didn't see any git stuff there.


~Brian

Re: databases/pgadmin3 fixes (clang6)

[Landry Breuil]

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 :)

yeaaah pgadmin4 is a clusterfuck of moving to a new langage/platform and
requiring a shitload of web stuff, so i guess we'll stay with pgadmin3
for a while :)

CVS: cvs.openbsd.org: ports

[Lawrence Teo]

CVSROOT:/cvs
Module name:ports
Changes by: l...@cvs.openbsd.org2018/04/15 14:37:55

Added files:
math/libqalculate/patches: patch-libqalculate_MathStructure_cc 

Log message:
Fix build for clang6; fix matches libqalculate-0.9.8 and the latest upstream
code.

ok tb@

Re: clang6: FIX for emulators/nestopia

[Anthony J. Bentley]

Brian Callahan writes:
> Hi ports --
>
> Minimal clang6 fix for emulators/nestopia.
> OK?

Yes, except please use -Wno-narrowing instead as that's what I see in
upstream git.

CVS: cvs.openbsd.org: ports

[Brian Callahan]

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

Modified files:
games/lostpixels: Makefile 
Added files:
games/lostpixels/patches: patch-drawprimitives_cpp 
  patch-fonthandler_cpp 

Log message:
Fix build for clang6
ok tb@

Fix libtorrent-rasterbar for gcc 4.9 on -rOPENBSD_6_3 (tested on OpenBSD/Loongson)

[manphiz]

The patch attached fixes building libtorrent-rasterbar on 
OpenBSD/Loongson for -rOPENBSD_6_3. It added several missing includes, 
added "-std=gnu++14" to CXXFLAGS as it is now default for newer compiler 
and the code uses those new features, and another patch from -current. 
I'm not sure whether this is the correct way to update ports for a 
-stable branch so let me know.


Thanks.
Index: Makefile
===
RCS file: /cvs/ports/net/libtorrent-rasterbar/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile8 Feb 2018 06:30:34 -   1.1.1.1
+++ Makefile15 Apr 2018 20:19:13 -
@@ -3,6 +3,7 @@
 COMMENT =  C++ library implementing a BitTorrent client
 
 MODPY_EGG_VERSION =1.1.6
+REVISION = 1
 DISTNAME = libtorrent-rasterbar-${MODPY_EGG_VERSION}
 
 SHARED_LIBS += torrent-rasterbar 0.0   # 9.0.0
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-configure 15 Apr 2018 20:19:13 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- configure.orig Sun Dec 31 06:21:37 2017
 configure  Sat Apr 14 17:39:19 2018
+@@ -16763,7 +16763,7 @@
+ LIBS="$PTHREAD_LIBS $LIBS"
+ CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
+ CC="$PTHREAD_CC"
+-CXXFLAGS="$CXXFLAGS -ftemplate-depth=120 -Wno-format-zero-length"
++CXXFLAGS="$CXXFLAGS -std=gnu++14 -ftemplate-depth=120 -Wno-format-zero-length"
+ 
+ $as_echo  "Checking for visibility support:"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 
__attribute__((visibility(\"hidden\")))" >&5
Index: patches/patch-include_libtorrent_aux__session_interface_hpp
===
RCS file: patches/patch-include_libtorrent_aux__session_interface_hpp
diff -N patches/patch-include_libtorrent_aux__session_interface_hpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-include_libtorrent_aux__session_interface_hpp 15 Apr 2018 
20:19:13 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- include/libtorrent/aux_/session_interface.hpp.orig Mon Dec 11 14:59:32 2017
 include/libtorrent/aux_/session_interface.hpp  Sat Apr 14 16:36:02 2018
+@@ -33,6 +33,8 @@
+ #ifndef TORRENT_SESSION_INTERFACE_HPP_INCLUDED
+ #define TORRENT_SESSION_INTERFACE_HPP_INCLUDED
+ 
++#include  // for va_list
++
+ #include "libtorrent/config.hpp"
+ #include "libtorrent/peer_id.hpp"
+ #include "libtorrent/address.hpp"
Index: patches/patch-src_disk_io_thread_cpp
===
RCS file: patches/patch-src_disk_io_thread_cpp
diff -N patches/patch-src_disk_io_thread_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_disk_io_thread_cpp15 Apr 2018 20:19:13 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/disk_io_thread.cpp.origMon Dec 11 14:59:32 2017
 src/disk_io_thread.cpp Sat Apr 14 16:44:04 2018
+@@ -57,6 +57,8 @@
+ 
+ #include "libtorrent/debug.hpp"
+ 
++#include  // for va_list
++
+ #define DEBUG_DISK_THREAD 0
+ 
+ #if __cplusplus >= 201103L || defined __clang__
Index: patches/patch-src_kademlia_dht_tracker_cpp
===
RCS file: patches/patch-src_kademlia_dht_tracker_cpp
diff -N patches/patch-src_kademlia_dht_tracker_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_kademlia_dht_tracker_cpp  15 Apr 2018 20:19:13 -
@@ -0,0 +1,18 @@
+$OpenBSD: patch-src_kademlia_dht_tracker_cpp,v 1.1 2018/04/12 04:40:41 bentley 
Exp $
+
+https://github.com/arvidn/libtorrent/pull/2931
+
+Index: src/kademlia/dht_tracker.cpp
+--- src/kademlia/dht_tracker.cpp.orig
 src/kademlia/dht_tracker.cpp
+@@ -224,7 +224,9 @@ namespace libtorrent { namespace dht
+   void dht_tracker::get_peers(sha1_hash const& ih
+   , boost::function f)
+   {
+-  m_dht.get_peers(ih, f, NULL, false);
++  m_dht.get_peers(ih, f
++  , 
boost::function > const&)>()
++  , false);
+   }
+ 
+   void dht_tracker::announce(sha1_hash const& ih, int listen_port, int 
flags
Index: patches/patch-src_session_impl_cpp
===
RCS file: patches/patch-src_session_impl_cpp
diff -N patches/patch-src_session_impl_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_session_impl_cpp  15 Apr 2018 20:19:13 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/session_impl.cpp.orig  Thu Dec 28 07:54:12 2017
 src/session_impl.cpp   Sat Apr 14 16:44:23 2018
+@@ -107,6 +107,8 @@
+ // for logging stat layout
+ #include "libtorrent/stat.hpp"
+ 
++#include  // for va_list
++
+ // for logging the size of DHT structures
+ #ifndef 

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2018/04/15 14:22:21

Modified files:
japanese/groff/patches: patch-troff_node_cc 

Log message:
Fix build with clang6. This port will go away soon but it does not hurt to
reduce the current clang6 fallout for the time being.
ok kn@

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

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

Modified files:
emulators/desmume: Makefile 
Added files:
emulators/desmume/patches: patch-src_gfx3d_cpp 
   patch-src_utils_libfat_directory_cpp 
   patch-src_utils_xstring_cpp 
   patch-src_wifi_cpp 

Log message:
fix build with clang6 and fix a bug in the process; from upstream git

clang6: FIX games/lostpixels

[Brian Callahan]

Hi ports --

Add some casts to appease clang6.
Also remove a USE_GMAKE=Yes since gmake isn't being used and it builds 
fine with ninja.


OK?

~Brian

Index: Makefile
===
RCS file: /cvs/ports/games/lostpixels/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile	26 Jul 2017 22:45:21 -	1.17
+++ Makefile	15 Apr 2018 20:15:19 -
@@ -25,7 +25,6 @@ LIB_DEPENDS =		devel/sdl-net		\
 WANTLIB +=		SDL SDL_image SDL_mixer SDL_net SDL_ttf X11 Xau
 WANTLIB +=		Xdmcp Xext Xrandr Xrender c freetype m pthread ${COMPILER_LIBCXX}
 
-USE_GMAKE =		Yes
 MODULES +=		devel/cmake \
 			lang/lua
 MODLUA_BUILDDEP =	No
Index: patches/patch-drawprimitives_cpp
===
RCS file: patches/patch-drawprimitives_cpp
diff -N patches/patch-drawprimitives_cpp
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-drawprimitives_cpp	15 Apr 2018 20:15:19 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: drawprimitives.cpp
+--- drawprimitives.cpp.orig
 drawprimitives.cpp
+@@ -35,7 +35,7 @@ void drawcircle(const Sint32 x, const Sint32 y, const 
+ // Draw a rectangle - this is just a convinience wrapper around SDL_FillRect
+ void drawrect(const Sint32 x, const Sint32 y, const Sint32 width, const Sint32 height, const Uint32 color)
+ {
+-	SDL_Rect rectLocation = { x, y, width, height };
++	SDL_Rect rectLocation = { static_cast(x), static_cast(y), static_cast(width), static_cast(height) };
+ 	SDL_FillRect(gScreen, , color);
+ }
+ 
Index: patches/patch-fonthandler_cpp
===
RCS file: patches/patch-fonthandler_cpp
diff -N patches/patch-fonthandler_cpp
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-fonthandler_cpp	15 Apr 2018 20:15:19 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: fonthandler.cpp
+--- fonthandler.cpp.orig
 fonthandler.cpp
+@@ -130,7 +130,7 @@ void renderFontHandlerText(Sint32 x, Sint32 y, const c
+ 		y = (SCR_HEIGHT - textsurface->h) / 2;
+ 	}
+ 
+-	SDL_Rect textLocation = { x, y, 0, 0 };
++	SDL_Rect textLocation = { static_cast(x), static_cast(y), 0, 0 };
+ 
+ 	// BlitSurface neeeds an UNLOCKED screen!!
+ 	SDL_BlitSurface(textsurface, NULL, gScreen, );

Re: clang6: FIX for japanese/groff

[Ingo Schwarze]

Hi Brian,

Brian Callahan wrote on Sun, Apr 15, 2018 at 03:52:39PM -0400:
> On 04/15/18 15:41, Anthony J. Bentley wrote:
>> Brian Callahan writes:

>>> Let japanese/groff build again on clang6.
>>> OK?

>> I intend to delete japanese/groff immediately after removing the build
>> dependencies in Wnn and canna.

> Looks like Ingo just pushed the Wnn changes in. So sure let's forget 
> about this and delete it.

The patch for canna is not yet ready, though.  It may take a day
to polish it, another day for review before commit...

I understand bringing down the clang 6 failures is important.
So if you consider OK kn@ sufficient (i wouldn't know why not),
you can as well commit right now and shorten the failure log
sooner rather than later.

Having the best possible version in the attic does no harm.

Even if you would break something at runtime, which seems very
unlikely, harm is minimal in a moribund port.

Yours,
  Ingo

Re: clang6: FIX for japanese/groff

[Brian Callahan]

On 04/15/18 15:41, Anthony J. Bentley wrote:

Brian Callahan writes:

Hi ports --

Let japanese/groff build again on clang6.
OK?

I intend to delete japanese/groff immediately after removing the build
dependencies in Wnn and canna.


Looks like Ingo just pushed the Wnn changes in. So sure let's forget 
about this and delete it.


~Brian

clang6 fix: math/libqalculate

[Lawrence Teo]

This lets math/libqalculate build with clang6.

The error is:

/usr/ports/pobj/libqalculate-0.9.7/libqalculate-0.9.7/libqalculate/MathStructure.cc:7166:48:
 error: cannot initialize a parameter of type 'MathStructure *' with an rvalue 
of type 'bool'
MathStructure::gcd(cont_c, cont_d, gamma, eo, false);
  ^
The function prototype of MathStructure::gcd in MathStructure.h is:

static bool gcd(const MathStructure , const MathStructure ,
MathStructure , const EvaluationOptions ,
MathStructure *ca = NULL, MathStructure *cb = NULL,
bool check_args = true);

Their latest Github code and libqalculate-0.9.8 indicate that it is
meant to be:

MathStructure::gcd(cont_c, cont_d, gamma, eo, NULL, NULL, false);

References:
* 
https://github.com/Qalculate/libqalculate/blob/master/libqalculate/MathStructure.cc#L9883
* libqalculate-0.9.8/libqalculate/MathStructure.cc in
  
https://github.com/Qalculate/libqalculate/files/316260/libqalculate-0.9.8.tar.gz

ok?


Index: patches/patch-libqalculate_MathStructure_cc
===
RCS file: patches/patch-libqalculate_MathStructure_cc
diff -N patches/patch-libqalculate_MathStructure_cc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-libqalculate_MathStructure_cc 15 Apr 2018 19:02:04 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: libqalculate/MathStructure.cc
+--- libqalculate/MathStructure.cc.orig
 libqalculate/MathStructure.cc
+@@ -7163,7 +7163,7 @@ bool sr_gcd(const MathStructure , const MathStructu
+   c.polynomialContent(xvar, cont_c, eo);
+   d.polynomialContent(xvar, cont_d, eo);
+   MathStructure gamma;
+-  MathStructure::gcd(cont_c, cont_d, gamma, eo, false);
++  MathStructure::gcd(cont_c, cont_d, gamma, eo, NULL, NULL, false);
+   if(ddeg.isZero()) {
+   mgcd = gamma;
+   return true;

CVS: cvs.openbsd.org: ports

[Ingo Schwarze]

CVSROOT:/cvs
Module name:ports
Changes by: schwa...@cvs.openbsd.org2018/04/15 13:48:38

Modified files:
japanese/Wnn   : Makefile 
japanese/Wnn/patches: patch-Xwnmo_xjutil_Imakefile 
  patch-Xwnmo_xwnmo_Imakefile 
  patch-config_Project_tmpl 
japanese/Wnn/pkg: PLIST-ko PLIST-main PLIST-xwnmo PLIST-zh 
Added files:
japanese/Wnn/patches: patch-Wnn_man_2_env_dic_Imakefile 
  patch-Wnn_man_2_env_wnn_Imakefile 
  patch-Wnn_man_3_libwnn_jl_lib_Imakefile 
  patch-Wnn_man_3_libwnn_js_lib_Imakefile 
  patch-Wnn_man_3_libwnn_misc_lib_Imakefile 
  patch-Wnn_man_3_libwnn_rk_lib_Imakefile 
  patch-Wnn_man_4_cmd_Imakefile 
  patch-Wnn_man_6_jutil_Imakefile 

Log message:
Install Japanese manual pages as UTF-8 rather than EUC using japanese/nkf
and install the English manual pages to the correct directories.
Add missing @bin annotations in the PLISTs.

OK yasuoka@, espie@ (MAINTAINER) agrees with the direction,
in part based on earlier work by bentley@.

Helps with clang 6 because it removes the build dependency on the
broken japanese/groff.

databases/pgadmin3 fixes (clang6)

[Theo Buehler]

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 :)

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   15 Apr 2018 19:25:26 -
@@ -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;

Re: clang6: FIX for japanese/groff

[Klemens Nanni]

On Sun, Apr 15, 2018 at 02:52:36PM -0400, Brian Callahan wrote:
> Index: patches/patch-troff_node_cc
> ===
> RCS file: /cvs/ports/japanese/groff/patches/patch-troff_node_cc,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-troff_node_cc
> --- patches/patch-troff_node_cc   9 May 2010 21:26:54 -   1.1
> +++ patches/patch-troff_node_cc   15 Apr 2018 18:50:57 -

> @@ -18,3 +19,12 @@ $OpenBSD: patch-troff_node_cc,v 1.1 2010
>   }
>   
>   glyph_node::glyph_node(charinfo *c, tfont *t, node *x)
> +@@ -4943,7 +4944,7 @@ int is_boldfont(int fontno)
> + {
> +   if (fontno >= 0 && fontno < font_table_size && font_table[fontno] != 
> NULL) {
> + const char *name = font_table[fontno]->external_name.contents();
> +-if (name == '\0')
> ++if (name == NULL)
> +   return fontno == 3 ? 1 : 0;
> + for (char **p = boldfont_list; *p; p++) {
> +   if (strcmp(name, *p) == 0)
OK kn.

Re: clang6: FIX for japanese/groff

[Anthony J. Bentley]

Brian Callahan writes:
> Hi ports --
>
> Let japanese/groff build again on clang6.
> OK?

I intend to delete japanese/groff immediately after removing the build
dependencies in Wnn and canna.

clang6: FIX for devel/sdcc

[Brian Callahan]

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?

~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
+share/sdcc/lib/pic16/libio18f26j53.lib
+share/sdcc/lib/pic16/libio18f26k20.lib
+share/sdcc/lib/pic16/libio18f26k22.lib
+share/sdcc/lib/pic16/libio18f26k80.lib
+share/sdcc/lib/pic16/libio18f27j13.lib
+share/sdcc/lib/pic16/libio18f27j53.lib
+share/sdcc/lib/pic16/libio18f4220.lib
+share/sdcc/lib/pic16/libio18f4221.lib
+share/sdcc/lib/pic16/libio18f4320.lib
+share/sdcc/lib/pic16/libio18f4321.lib
+share/sdcc/lib/pic16/libio18f4331.lib
+share/sdcc/lib/pic16/libio18f43k20.lib
+share/sdcc/lib/pic16/libio18f43k22.lib
+share/sdcc/lib/pic16/libio18f4410.lib
+share/sdcc/lib/pic16/libio18f442.lib
+share/sdcc/lib/pic16/libio18f4420.lib

Re: clang6: FIX for games/ja2-stracciatella

[Brian Callahan]

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
--- Makefile26 Jul 2017 22:45:21 -  1.3
+++ Makefile15 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.

Re: clang6: FIX for games/ja2-stracciatella

[Klemens Nanni]

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-Makefile13 Jun 2017 09:24:23 -  1.1.1.1
> +++ patches/patch-Makefile15 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.origSun 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?

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2018/04/15 13:27:49

Modified files:
x11/xdrawchem/patches: patch-xdrawchem_molecule_obmol_cpp 

Log message:
fix build for clang6; agrees with latest upstream version

clang6: FIX for games/meandmyshadow

[Brian Callahan]

Hi ports --

Minimal clang6 fix for games/meandmyshadow.
OK?

~Brian

Index: Makefile
===
RCS file: /cvs/ports/games/meandmyshadow/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile	26 Jul 2017 22:45:21 -	1.10
+++ Makefile	15 Apr 2018 19:17:23 -
@@ -28,6 +28,8 @@ WANTLIB += curl m pthread ssl ${COMPILER
 RUN_DEPENDS =	devel/desktop-file-utils \
 		x11/gtk+3,-guic
 
+CONFIGURE_ARGS =	-DCMAKE_CXX_FLAGS="${CXXFLAGS} -std=gnu++98"
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/meandmyshadow.desktop \

clang6: FIX for emulators/nestopia

[Brian Callahan]

Hi ports --

Minimal clang6 fix for emulators/nestopia.
OK?

~Brian

Index: Makefile
===
RCS file: /cvs/ports/emulators/nestopia/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile	23 Sep 2017 11:30:03 -	1.12
+++ Makefile	15 Apr 2018 18:56:12 -
@@ -42,7 +42,7 @@ MAKE_FLAGS =		CC="${CC}" \
 			CFLAGS="${CFLAGS} `sdl2-config --cflags` \
 `pkg-config --cflags gtk+-3.0`" \
 			CXXFLAGS="${CFLAGS} `sdl2-config --cflags` \
-`pkg-config --cflags gtk+-3.0`"
+`pkg-config --cflags gtk+-3.0` -std=gnu++98"
 FAKE_FLAGS =		PREFIX="${WRKINST}/${TRUEPREFIX}"
 
 USE_GMAKE =		Yes

clang6: FIX for games/ja2-stracciatella

[Brian Callahan]

Hi ports --

Minimal clang6 fix for games/ja2-stracciatella. De-hardcode a c++ while 
here.

OK?

~Brian

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
+ 
+ LDFLAGS += -lm
+ 
 @@ -524,16 +520,6 @@ SRCS += _build/lib-MicroIni/src/MicroIni/File.cpp
  SRCS += _build/lib-MicroIni/src/MicroIni/Line.cpp
  SRCS += _build/lib-MicroIni/src/MicroIni/Section.cpp

clang6: FIX for japanese/groff

[Brian Callahan]

Hi ports --

Let japanese/groff build again on clang6.
OK?

~Brian

Index: patches/patch-troff_node_cc
===
RCS file: /cvs/ports/japanese/groff/patches/patch-troff_node_cc,v
retrieving revision 1.1
diff -u -p -r1.1 patch-troff_node_cc
--- patches/patch-troff_node_cc	9 May 2010 21:26:54 -	1.1
+++ patches/patch-troff_node_cc	15 Apr 2018 18:50:57 -
@@ -1,6 +1,7 @@
 $OpenBSD: patch-troff_node_cc,v 1.1 2010/05/09 21:26:54 robert Exp $
 troff/node.cc.orig	Sun May  9 23:21:17 2010
-+++ troff/node.cc	Sun May  9 23:22:54 2010
+Index: troff/node.cc
+--- troff/node.cc.orig
 troff/node.cc
 @@ -171,6 +171,7 @@ class tfont : public tfont_spec { (public)
hunits get_subscript_correction(charinfo *);
friend tfont *make_tfont(tfont_spec &);
@@ -18,3 +19,12 @@ $OpenBSD: patch-troff_node_cc,v 1.1 2010
  }
  
  glyph_node::glyph_node(charinfo *c, tfont *t, node *x)
+@@ -4943,7 +4944,7 @@ int is_boldfont(int fontno)
+ {
+   if (fontno >= 0 && fontno < font_table_size && font_table[fontno] != NULL) {
+ const char *name = font_table[fontno]->external_name.contents();
+-if (name == '\0')
++if (name == NULL)
+   return fontno == 3 ? 1 : 0;
+ for (char **p = boldfont_list; *p; p++) {
+   if (strcmp(name, *p) == 0)

FIX build x11/xdrawchem with clang6

[Björn Ketelaars]

OK?


Index: patches/patch-xdrawchem_molecule_obmol_cpp
===
RCS file: /cvs/ports/x11/xdrawchem/patches/patch-xdrawchem_molecule_obmol_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-xdrawchem_molecule_obmol_cpp
--- patches/patch-xdrawchem_molecule_obmol_cpp  22 May 2017 18:28:05 -  
1.1
+++ patches/patch-xdrawchem_molecule_obmol_cpp  15 Apr 2018 18:35:22 -
@@ -12,3 +12,21 @@ Index: xdrawchem/molecule_obmol.cpp
  
  };
  
+@@ -198,7 +198,7 @@ OBMol * Molecule::convertToOBMol() {
+ atom.SetType( type );
+ 
+ if (!obmol->AddAtom(atom))
+-  return(false);
++  return(0);
+ atom.Clear();
+   }
+ 
+@@ -212,7 +212,7 @@ OBMol * Molecule::convertToOBMol() {
+ bst = tmp_bond->Stereo();
+ if (bst == STEREO_UP) flag |= OB_WEDGE_BOND;
+ if (bst == STEREO_DOWN) flag |= OB_HASH_BOND;
+-if (!obmol->AddBond(start,end,order,flag)) return(false);
++if (!obmol->AddBond(start,end,order,flag)) return(0);
+   }
+ 
+   obmol->EndModify();

Re: [UPDATE] www/links+ to 1.15

[Klemens Nanni]

On Sun, Apr 15, 2018 at 11:30:22AM -0400, trondd wrote:
> Easy update for links+ to 1.15.  Built against clang 6.
> 
> Full changelog at http://links.twibright.com/download/ChangeLog
> Some notable udates:
> 
> Rewrite google docs URLs to the download link, so that the file can be
> viewed in external viewer
> 
> Support international domain names
> 
> Fix reading one byte beyond allocated space in case of corrupted
> UTF-8 data - CVE-2017-4
> 
> Use built-in SSL certificates (ed. Optional)
> This improves tor hardening (the tor exit node could not differentiate
> links users from each other based on installed certificates)
> It also makes it possible to use certificate verification on systems
> with no default certificate store
> 
> Report IP addresses in the "Document info" box.
> 
> Implement a small connection timeout when connecting to a host with
> multiple addresses, so that there is faster fallback from IPv6 to IPv4.
> 
> Avoid memcpy with NULL source argument and zero length (it doesn't
> crash, but it's formally incorrect and the sanitizer warns about it)
> 
> Make the "dns-prefetch" link prefetch just dns, not the whole document
> 
> Fix compilation failure on OpenBSD because OpenBSD removed
> the timeout_* macros from libevent
> 
> Use OpenSSL functions X509_check_host and X509_check_ip if available
> 
> Use session cache on https
Builds fine on amd64, lightly run tested.

OK kn with SEPARATE_BUILD=Yes set.

Re: [armv7 fix] Build database/redis

[Markus Hennecke]

On Sat, 14 Apr 2018, Jeremie Courreges-Anglas wrote:

> On Thu, Apr 12 2018, Klemens Nanni  wrote:
> > On Sat, Apr 07, 2018 at 08:26:10AM +0200, Markus Hennecke wrote:
> >> With the attached fix the redis port builds, but is unable to complete the 
> >> regression tests (see https://github.com/antirez/redis/issues/4640).
> > What's the status on armv7 without this fix?
> [ ] 
> > Have you tried the newer
> > 4.0.9 version?
> 
> *I* haven't, but the snippet above is still in the master branch
> upstream, so I wouldn't expect an improvement.

No change with 4.0.9. The build still needs one of the fixes 
proposed in this thread and the regression tests still fail.

> > I don't have access to that platform but the diff looks ok port-wise.
> >
> > There's another redis diff from me pending on ports@. but I'd also like
> > to update the port to 4.0.9, maybe we can combine this with your fix?
> 
> Personally I prefer when different issues are addressed by separate
> commits.
> 
> 
> Index: patch-src_Makefile
> ===
> RCS file: /d/cvs/ports/databases/redis/patches/patch-src_Makefile,v
> retrieving revision 1.27
> diff -u -p -p -u -r1.27 patch-src_Makefile
> --- patch-src_Makefile9 Aug 2017 09:16:09 -   1.27
> +++ patch-src_Makefile14 Apr 2018 00:27:57 -
> @@ -21,6 +21,15 @@ Index: src/Makefile
>   INSTALL=install
>   
>   # Default allocator defaults to Jemalloc if it's not an ARM
> +@@ -40,7 +41,7 @@ endif
> + 
> + # To get ARM stack traces if Redis crashes we need a special C flag.
> + ifneq (,$(findstring armv,$(uname_M)))
> +-CFLAGS+=-funwind-tables
> ++#CFLAGS+=-funwind-tables
> + endif
> + 
> + # Backwards compatibility for selecting an allocator
>  @@ -66,7 +67,7 @@ endif
>   FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
>   FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
> 

This won't pull in libc++abi, so I think it would be a much cleaner 
solution port wise.

Regards,
Markus

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

[Markus Hennecke]

Attached is a new diff fixing build on armv7 and adding patches to fix the 
build after the switch to clang 6. The patch became pretty big, because 
clang complains about error: invalid suffix on literal; C++11 requires a 
space between literal and identifier [-Wreserved-user-defined-literal] in 
a lot of files.
No change in the armv7 fixes, still setting -fbracket-depth=512 in case CC 
is clang and adding #include  in gcc/system.h when compiling c++.

Index: Makefile
===
RCS file: /cvs/ports/lang/gcc/4.9/Makefile,v
retrieving revision 1.54
diff -u -p -r1.54 Makefile
--- Makefile15 Mar 2018 01:16:42 -  1.54
+++ Makefile15 Apr 2018 16:02:31 -
@@ -4,7 +4,7 @@ ONLY_FOR_ARCHS = ${GCC49_ARCHS}
 DPB_PROPERTIES = parallel
 
 V = 4.9.4
-REVISION = 8
+REVISION = 9
 FULL_VERSION = $V
 FULL_PKGVERSION = $V
 
Index: patches/patch-gcc_bitmap_c
===
RCS file: patches/patch-gcc_bitmap_c
diff -N patches/patch-gcc_bitmap_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-gcc_bitmap_c  15 Apr 2018 16:02:31 -
@@ -0,0 +1,27 @@
+$OpenBSD$
+
+Index: gcc/bitmap.c
+--- gcc/bitmap.c.orig
 gcc/bitmap.c
+@@ -2166,9 +2166,9 @@ print_statistics (bitmap_descriptor_d **slot, output_i
+   s[41] = 0;
+   fprintf (stderr,
+  "%-41s %9u"
+- " %15"HOST_WIDEST_INT_PRINT"d %15"HOST_WIDEST_INT_PRINT"d"
+- " %15"HOST_WIDEST_INT_PRINT"d"
+- " %10"HOST_WIDEST_INT_PRINT"d %10"HOST_WIDEST_INT_PRINT"d\n",
++ " %15" HOST_WIDEST_INT_PRINT "d %15" HOST_WIDEST_INT_PRINT "d"
++ " %15" HOST_WIDEST_INT_PRINT "d"
++ " %10" HOST_WIDEST_INT_PRINT "d %10" HOST_WIDEST_INT_PRINT "d\n",
+  s, d->created,
+  d->allocated, d->peak, d->current,
+  d->nsearches, d->search_iter);
+@@ -2201,7 +2201,7 @@ dump_bitmap_statistics (void)
+   bitmap_desc_hash.traverse  ();
+   fprintf (stderr, 
"-\n");
+   fprintf (stderr,
+- "%-41s %9"HOST_WIDEST_INT_PRINT"d %15"HOST_WIDEST_INT_PRINT"d\n",
++ "%-41s %9" HOST_WIDEST_INT_PRINT "d %15" HOST_WIDEST_INT_PRINT "d\n",
+  "Total", info.count, info.size);
+   fprintf (stderr, 
"-\n");
+ }
Index: patches/patch-gcc_cgraph_c
===
RCS file: patches/patch-gcc_cgraph_c
diff -N patches/patch-gcc_cgraph_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-gcc_cgraph_c  15 Apr 2018 16:02:31 -
@@ -0,0 +1,41 @@
+$OpenBSD$
+
+Index: gcc/cgraph.c
+--- gcc/cgraph.c.orig
 gcc/cgraph.c
+@@ -1378,7 +1378,7 @@ cgraph_redirect_edge_call_stmt_to_callee (struct cgrap
+ if (dump_file)
+   fprintf (dump_file,
+"Expanding speculative call of %s/%i -> %s/%i count:"
+-   HOST_WIDEST_INT_PRINT_DEC"\n",
++   HOST_WIDEST_INT_PRINT_DEC "\n",
+xstrdup (e->caller->name ()),
+e->caller->order,
+xstrdup (e->callee->name ()),
+@@ -1976,7 +1976,7 @@ dump_cgraph_node (FILE *f, struct cgraph_node *node)
+   fprintf (f, "  First run: %i\n", node->tp_first_run);
+   fprintf (f, "  Function flags:");
+   if (node->count)
+-fprintf (f, " executed "HOST_WIDEST_INT_PRINT_DEC"x",
++fprintf (f, " executed " HOST_WIDEST_INT_PRINT_DEC "x",
+(HOST_WIDEST_INT)node->count);
+   if (node->origin)
+ fprintf (f, " nested in: %s", node->origin->asm_name ());
+@@ -2028,7 +2028,7 @@ dump_cgraph_node (FILE *f, struct cgraph_node *node)
+   fprintf (f, "%s/%i ", edge->caller->asm_name (),
+  edge->caller->order);
+   if (edge->count)
+-  fprintf (f, "("HOST_WIDEST_INT_PRINT_DEC"x) ",
++  fprintf (f, "(" HOST_WIDEST_INT_PRINT_DEC "x) ",
+(HOST_WIDEST_INT)edge->count);
+   if (edge->frequency)
+   fprintf (f, "(%.2f per call) ",
+@@ -2055,7 +2055,7 @@ dump_cgraph_node (FILE *f, struct cgraph_node *node)
+   if (edge->indirect_inlining_edge)
+   fprintf (f, "(indirect_inlining) ");
+   if (edge->count)
+-  fprintf (f, "("HOST_WIDEST_INT_PRINT_DEC"x) ",
++  fprintf (f, "(" HOST_WIDEST_INT_PRINT_DEC "x) ",
+(HOST_WIDEST_INT)edge->count);
+   if (edge->frequency)
+   fprintf (f, "(%.2f per call) ",
Index: patches/patch-gcc_config_elfos_h
===
RCS file: patches/patch-gcc_config_elfos_h
diff -N patches/patch-gcc_config_elfos_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-gcc_config_elfos_h15 Apr 2018 16:02:31 -
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: gcc/config/elfos.h
+--- gcc/config/elfos.h.orig
 gcc/config/elfos.h
+@@ 

[UPDATE] www/links+ to 1.15

[trondd]

Easy update for links+ to 1.15.  Built against clang 6.

Full changelog at http://links.twibright.com/download/ChangeLog
Some notable udates:

Rewrite google docs URLs to the download link, so that the file can be
viewed in external viewer

Support international domain names

Fix reading one byte beyond allocated space in case of corrupted
UTF-8 data - CVE-2017-4

Use built-in SSL certificates (ed. Optional)
This improves tor hardening (the tor exit node could not differentiate
links users from each other based on installed certificates)
It also makes it possible to use certificate verification on systems
with no default certificate store

Report IP addresses in the "Document info" box.

Implement a small connection timeout when connecting to a host with
multiple addresses, so that there is faster fallback from IPv6 to IPv4.

Avoid memcpy with NULL source argument and zero length (it doesn't
crash, but it's formally incorrect and the sanitizer warns about it)

Make the "dns-prefetch" link prefetch just dns, not the whole document

Fix compilation failure on OpenBSD because OpenBSD removed
the timeout_* macros from libevent

Use OpenSSL functions X509_check_host and X509_check_ip if available

Use session cache on https


Tim.


Index: Makefile
===
RCS file: /cvs/ports/www/links+/Makefile,v
retrieving revision 1.60
diff -u -p -r1.60 Makefile
--- Makefile30 Nov 2016 19:42:15 -  1.60
+++ Makefile14 Apr 2018 20:54:22 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.60 2016/11/30 19:42:15 fcambus Exp $
 
 COMMENT=   graphics and text browser
-VER=   2.14
+VER=   2.15
 DISTNAME=  links-${VER}
 PKGNAME=   links+-${VER}
 CATEGORIES=www
Index: distinfo
===
RCS file: /cvs/ports/www/links+/distinfo,v
retrieving revision 1.31
diff -u -p -r1.31 distinfo
--- distinfo30 Nov 2016 19:42:15 -  1.31
+++ distinfo14 Apr 2018 20:54:22 -
@@ -1,2 +1,2 @@
-SHA256 (links-2.14.tar.gz) = IvqNy1pguP/WEd4x69THntzkcmN6NVS6tAF5XakdQ4c=
-SIZE (links-2.14.tar.gz) = 7142389
+SHA256 (links-2.15.tar.gz) = Z39ZS1jcUy5jkTzWG4XMGqbwOF4zO4h2brNBW0Gzo3U=
+SIZE (links-2.15.tar.gz) = 7358450
Index: patches/patch-html_c
===
RCS file: /cvs/ports/www/links+/patches/patch-html_c,v
retrieving revision 1.16
diff -u -p -r1.16 patch-html_c
--- patches/patch-html_c3 Sep 2016 09:33:19 -   1.16
+++ patches/patch-html_c14 Apr 2018 20:54:22 -
@@ -1,7 +1,8 @@
 $OpenBSD: patch-html_c,v 1.16 2016/09/03 09:33:19 sthen Exp $
 html.c.origFri Jun 17 16:33:57 2016
-+++ html.c Thu Sep  1 20:13:58 2016
-@@ -987,6 +987,7 @@ static void html_a(unsigned char *a)
+Index: html.c
+--- html.c.orig
 html.c
+@@ -1004,6 +1004,7 @@ static void html_a(unsigned char *a)
format_.target = stracpy(format_.target_base);
}
/*format_.attr ^= AT_BOLD;*/
Index: patches/patch-https_c
===
RCS file: /cvs/ports/www/links+/patches/patch-https_c,v
retrieving revision 1.5
diff -u -p -r1.5 patch-https_c
--- patches/patch-https_c   30 Nov 2016 19:42:15 -  1.5
+++ patches/patch-https_c   14 Apr 2018 20:54:22 -
@@ -1,7 +1,8 @@
 $OpenBSD: patch-https_c,v 1.5 2016/11/30 19:42:15 fcambus Exp $
 https.c.orig   Sat Nov 19 13:52:07 2016
-+++ https.cMon Nov 28 22:16:21 2016
-@@ -88,6 +88,11 @@ links_ssl *getSSL(void)
+Index: https.c
+--- https.c.orig
 https.c
+@@ -261,6 +261,11 @@ links_ssl *getSSL(void)
RAND_write_file(cast_const_char 
f_randfile);
}
}

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2018/04/15 08:30:15

Modified files:
audio/caps-plugins: Makefile 
audio/caps-plugins/patches: patch-dsp_v4f_IIR2_h 
Added files:
audio/caps-plugins/patches: patch-dsp_v4f_h 

Log message:
For some reason, clang6 does not accept __builtin_sinf in this construct;
replace with sinf().

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

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

Added files:
inputmethods/scim-anthy/patches: patch-src_scim_anthy_prefs_cpp 

Log message:
add missing initializers to fix build with clang6

Re: clang6 fallout

[Christian Weisgerber]

Updated list as of Apr 15, 13:00 UTC:

audio/caps-plugins
cad/kicad
databases/mysqlcc
databases/pgadmin3
devel/qt-creator
devel/sdcc
emulators/BasiliskII
emulators/desmume
emulators/fceux!
emulators/frodo
emulators/nestopia
games/alephone/alephone
games/amoebax
games/blobby
games/dangerdeep
games/enigma
games/f1spirit
games/ja2-stracciatella
games/lostpixels
games/meandmyshadow
games/roadfighter
games/stepmania
games/sumwars
games/vegastrike/engine
games/warmux
games/xminehunter
graphics/discwrapper
graphics/rawstudio
inputmethods/scim-anthy
japanese/groff
math/libqalculate
misc/xnc
multimedia/swfmill
net/nam
net/nepenthes
sysutils/facter
textproc/wkhtmltopdf
www/mongrel2
x11/kde/libs3
x11/qt4
x11/xdrawchem

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

Re: UPDATE: x11/qt4 (clang6)

[Pavel Korovin]

Rafael, thanks!
Updated diff attached.

On 04/15, Rafael Sadowski wrote:
> PLIST update is required!
> 
> $ ls -la /usr/local/lib/qt4/mkspecs/
> lrwxr-xr-x1 root  wheel13 Apr 15 12:56 default -> openbsd-clang
> 
> Otherwise Qt4 builds fine with clang6

-- 
With best regards,
Pavel Korovin
Index: Makefile
===
RCS file: /cvs/ports/x11/qt4/Makefile,v
retrieving revision 1.151
diff -u -p -r1.151 Makefile
--- Makefile20 Jan 2018 14:03:39 -  1.151
+++ Makefile15 Apr 2018 12:55:23 -
@@ -25,13 +25,13 @@ PKGNAME-main =  qt4-${PKGVERSION}
 PKGNAME-debug =qt4-debug-${PKGVERSION}
 FULLPKGNAME-html = qt4-html-${PKGVERSION}
 FULLPKGPATH-html = ${BASE_PKGPATH},-html
-REVISION-main =14
-REVISION-mysql =   2
-REVISION-postgresql =  2
-REVISION-sqlite2 = 2
-REVISION-tds = 2
-REVISION-debug =   1
-REVISION-examples =3
+REVISION-main =15
+REVISION-mysql =   3
+REVISION-postgresql =  3
+REVISION-sqlite2 = 3
+REVISION-tds = 3
+REVISION-debug =   2
+REVISION-examples =4
 REVISION-html =0
 
 # XXX qmake include parser is bogus
@@ -119,7 +119,6 @@ CONFIGURE_ARGS +=   -I${LOCALBASE}/include
 CONFIGURE_ARGS +=  -I${LOCALBASE}/include/postgresql \
-I${LOCALBASE}/include/postgresql/server \
-plugin-sql-psql
-CONFIGURE_ARGS +=  -platform openbsd-g++4
 
 # XXX make sure those libraries gets written to libQtGui.la
 QMAKE_LIBS_GUI =   freetype SM ICE Xi Xrender Xinerama fontconfig Xext X11
@@ -242,8 +241,16 @@ MAKE_FLAGS +=  LIB$l_VERSION=$v
 
 DESTDIRNAME =  INSTALL_ROOT
 
+.include 
+.if ${PROPERTIES:Mclang}
+CONFIGURE_ARGS +=  -platform openbsd-clang
+.else
+CONFIGURE_ARGS +=  -platform openbsd-g++4
+.endif
+
 pre-patch:
cd ${WRKDIST} && cp -R mkspecs/openbsd-g++ mkspecs/openbsd-g++4
+   cd ${WRKDIST} && cp -R mkspecs/openbsd-g++ mkspecs/openbsd-clang
 
 post-build:
 .for l v in ${SHARED_LIBS}
Index: patches/patch-mkspecs_openbsd-clang_qmake_conf
===
RCS file: patches/patch-mkspecs_openbsd-clang_qmake_conf
diff -N patches/patch-mkspecs_openbsd-clang_qmake_conf
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-mkspecs_openbsd-clang_qmake_conf  15 Apr 2018 12:55:23 
-
@@ -0,0 +1,77 @@
+$OpenBSD$
+
+Index: mkspecs/openbsd-clang/qmake.conf
+--- mkspecs/openbsd-clang/qmake.conf.orig
 mkspecs/openbsd-clang/qmake.conf
+@@ -8,47 +8,48 @@ TEMPLATE = app
+ CONFIG+= qt warn_on release link_prl gdb_dwarf_index
+ QT+= core gui
+ 
+-QMAKE_CC  = gcc
++QMAKE_OPENBSD_SHLIBS= 1
++QMAKE_CC  = cc
+ QMAKE_LEX = flex
+ QMAKE_LEXFLAGS=
+ QMAKE_YACC= yacc
+ QMAKE_YACCFLAGS   = -d
+-QMAKE_CFLAGS  = -pipe
++QMAKE_CFLAGS  = -pipe -O2 -fno-wrapv $(COPTS)
+ QMAKE_CFLAGS_DEPS = -M
+ QMAKE_CFLAGS_WARN_ON  = -Wall -W
+ QMAKE_CFLAGS_WARN_OFF = -w
+-QMAKE_CFLAGS_RELEASE  = -O2
++QMAKE_CFLAGS_RELEASE  = -O2 -fno-wrapv $(COPTS)
+ QMAKE_CFLAGS_DEBUG= -g
+ QMAKE_CFLAGS_SHLIB= -fPIC
+ QMAKE_CFLAGS_STATIC_LIB   = $$QMAKE_CFLAGS_SHLIB
+ QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
+ QMAKE_CFLAGS_THREAD   = -pthread
+ 
+-QMAKE_CXX = g++
+-QMAKE_CXXFLAGS= $$QMAKE_CFLAGS
++QMAKE_CXX = c++
++QMAKE_CXXFLAGS= -std=c++03 $$QMAKE_CFLAGS
+ QMAKE_CXXFLAGS_DEPS   = $$QMAKE_CFLAGS_DEPS
+ QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
+ QMAKE_CXXFLAGS_WARN_OFF   = $$QMAKE_CFLAGS_WARN_OFF
+-QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
++QMAKE_CXXFLAGS_RELEASE= -std=c++03 $$QMAKE_CFLAGS_RELEASE
+ QMAKE_CXXFLAGS_DEBUG  = $$QMAKE_CFLAGS_DEBUG
+ QMAKE_CXXFLAGS_SHLIB  = $$QMAKE_CFLAGS_SHLIB
+ QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
+ QMAKE_CXXFLAGS_YACC   = $$QMAKE_CFLAGS_YACC
+ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
+ 
+-QMAKE_INCDIR  = /usr/local/include
+-QMAKE_LIBDIR  = /usr/local/lib
+-QMAKE_INCDIR_X11  = /usr/X11R6/include
+-QMAKE_LIBDIR_X11  = /usr/X11R6/lib
++QMAKE_INCDIR  = $(LOCALBASE)/include
++QMAKE_LIBDIR  = $(LOCALBASE)/lib
++QMAKE_INCDIR_X11  = $(X11BASE)/include
++QMAKE_LIBDIR_X11  = $(X11BASE)/lib
+ QMAKE_INCDIR_QT   = $$[QT_INSTALL_HEADERS]
+ QMAKE_LIBDIR_QT   = $$[QT_INSTALL_LIBS]
+ QMAKE_INCDIR_OPENGL   = /usr/X11R6/include
+ QMAKE_LIBDIR_OPENGL   = /usr/X11R6/lib
+ 
+-QMAKE_LINK= g++
+-QMAKE_LINK_SHLIB  = g++
+-QMAKE_LINK_C  = gcc
+-QMAKE_LINK_C_SHLIB= gcc
++QMAKE_LINK= c++
++QMAKE_LINK_SHLIB  = c++
++QMAKE_LINK_C  = cc
++QMAKE_LINK_C_SHLIB= cc
+ QMAKE_LINK_SHLIB_CMD  = 

Re: UPDATE: x11/qt4 (clang6)

[Rafael Sadowski]

On Sat Apr 14, 2018 at 03:44:32PM +0300, Pavel Korovin wrote:
> Dear all,
> 
> Please find the diff for x11/qt4 attached.
> Quick-fix for build with clang6.
> 
> -- 
> With best regards,
> Pavel Korovin

> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/qt4/Makefile,v
> retrieving revision 1.151
> diff -u -p -r1.151 Makefile
> --- Makefile  20 Jan 2018 14:03:39 -  1.151
> +++ Makefile  14 Apr 2018 12:37:00 -
> @@ -25,13 +25,13 @@ PKGNAME-main =qt4-${PKGVERSION}
>  PKGNAME-debug =  qt4-debug-${PKGVERSION}
>  FULLPKGNAME-html =   qt4-html-${PKGVERSION}
>  FULLPKGPATH-html =   ${BASE_PKGPATH},-html
> -REVISION-main =  14
> -REVISION-mysql = 2
> -REVISION-postgresql =2
> -REVISION-sqlite2 =   2
> -REVISION-tds =   2
> -REVISION-debug = 1
> -REVISION-examples =  3
> +REVISION-main =  15
> +REVISION-mysql = 3
> +REVISION-postgresql =3
> +REVISION-sqlite2 =   3
> +REVISION-tds =   3
> +REVISION-debug = 2
> +REVISION-examples =  4
>  REVISION-html =  0
>  
>  # XXX qmake include parser is bogus
> @@ -119,7 +119,6 @@ CONFIGURE_ARGS += -I${LOCALBASE}/include
>  CONFIGURE_ARGS +=-I${LOCALBASE}/include/postgresql \
>   -I${LOCALBASE}/include/postgresql/server \
>   -plugin-sql-psql
> -CONFIGURE_ARGS +=-platform openbsd-g++4
>  
>  # XXX make sure those libraries gets written to libQtGui.la
>  QMAKE_LIBS_GUI = freetype SM ICE Xi Xrender Xinerama fontconfig Xext X11
> @@ -242,8 +241,16 @@ MAKE_FLAGS +=LIB$l_VERSION=$v
>  
>  DESTDIRNAME =INSTALL_ROOT
>  
> +.include 
> +.if ${PROPERTIES:Mclang}
> +CONFIGURE_ARGS +=-platform openbsd-clang
> +.else
> +CONFIGURE_ARGS +=-platform openbsd-g++4
> +.endif
> +
>  pre-patch:
>   cd ${WRKDIST} && cp -R mkspecs/openbsd-g++ mkspecs/openbsd-g++4
> + cd ${WRKDIST} && cp -R mkspecs/openbsd-g++ mkspecs/openbsd-clang

PLIST update is required!

$ ls -la /usr/local/lib/qt4/mkspecs/
lrwxr-xr-x1 root  wheel13 Apr 15 12:56 default -> openbsd-clang

Otherwise Qt4 builds fine with clang6

CVS: cvs.openbsd.org: ports

[Remi Pointel]

CVSROOT:/cvs
Module name:ports
Changes by: rpoin...@cvs.openbsd.org2018/04/15 05:52:26

Modified files:
devel/py-xlsxwriter: Makefile distinfo 

Log message:
update to 1.0.4.

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/15 05:51:48

Added files:
misc/openbabel/patches: patch-src_bitvec_cpp 
patch-src_formats_chemdrawcdx_cpp 
patch-src_formats_chemkinformat_cpp 
patch-src_formats_xml_xml_cpp 
patch-src_math_spacegroup_cpp 
patch-src_parsmart_cpp 
patch-src_rand_cpp 

Log message:
fix build with clang6

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2018/04/15 05:43:52

Modified files:
security/fwknop: Makefile 
security/gpa   : Makefile 

Log message:
Bump after security/gpgme update

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2018/04/15 05:37:20

Modified files:
x11/gnome/seahorse-sharing: Makefile 

Log message:
Bump after security/gpgme update

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

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

Modified files:
net/minio/server: Makefile distinfo 

Log message:
update to minio-0.20180412

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/15 05:03:09

Added files:
graphics/animorph/patches: patch-src_xmlParser_cpp 

Log message:
fix build with clang6

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/15 05:00:37

Modified files:
graphics/gegl03: Makefile distinfo 

Log message:
Update to gegl03-0.3.32.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/15 05:00:10

Modified files:
graphics/babl  : Makefile distinfo 
graphics/babl/pkg: PLIST 

Log message:
Update to babl-0.1.46.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/15 04:42:01

Modified files:
sysutils/awless: Makefile distinfo 

Log message:
Update to awless-0.1.10.

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/15 04:39:32

Modified files:
java/jlint/patches: patch-jlint_cc patch-types_hh 

Log message:
fix build with clang6; from Matthew Martin

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/15 04:31:21

Modified files:
security/libhttpseverywhere: Makefile distinfo 

Log message:
Update to libhttpseverywhere-0.8.3.

Re: NEW: editors/dte

[Alexandre Ratchov]

On Sun, Apr 15, 2018 at 02:22:36AM -0400, Brian Callahan wrote:
> Hi ports --
> 
> Attached is a new port, editors/dte. dte is a small and easy to use console
> text editor.
> 
> ---
> pkg/DESCR:
> dte is a small and easy to use console text editor.
> 
> Features:
> * Multiple buffers/tabs
> * Unlimited undo/redo
> * Search and replace
> * Syntax highlighting
> * Customizable color schemes
> * Customizable key bindings
> * Command language with auto-completion
> * Jump to definition (using ctags)
> * Jump to compiler error
> ---
> 
> Works well here, upstream has been really good working out issues and even
> updating the openbsd-wip port. You'll note that on a machine with clang,
> it'll use -std=gnu11 but it'll use -std=gnu99 if you're on a platform with
> older gcc so I did not set COMPILER.
> 
> OK?

Works for me, thanks.

Re: UPDATE: net/mininet - various bug fixes

[Klemens Nanni]

On Sun, Apr 15, 2018 at 12:15:20AM -0700, Ayaka Koshibe wrote:
> On Sun, Apr 08, 2018 at 07:17:30PM +0200, Klemens Nanni wrote:
> > On Sat, Apr 07, 2018 at 05:50:54PM -0700, Ayaka Koshibe wrote:
> > > And I found the manpage for mn isn't generated properly during last-minute
> > > testing...
> > > 
> > > Updated Makefile diff, plus cleanup to run MAKEDEV in /dev, rather than 
> > > create
> > > and move a file, as suggested by phessler.
> > How about these on top of your diff:
>  
> I wanted to keep my diffs as-is since they were purely bug fixes, and seemed
> better off separate from pure improvements.
That makes sense, I didn't want to stuff all that into your diff/commit.

> > Use CFLAGS in do-build, enabling DEBUG.
> > 
> > Compact .for loops in targets to smaller brace expansion. IMO the
> > examples/ path is clear enough, so I also avoided renaming switchd.conf.
> > 
> > Set SEPARATE_BUILD since you're already using WRKSRC and WRKBUILD
> > accordingly.
> > 
> > Feedback?
> 
> Personally I find it easier to read without the brace expansions, but
> otherwise the suggestions make sense to me, thanks.
Sure, updated diff below.

Note how README.md is now installed from WRKSRC from WRKBUILD: they
used to be the same so the fake target would work, but with
SEPARATE_BUILD this would fail.

> > Maybe also use the latest git commit instead of bumping revision?
> 
> If I understand correctly, this would be interpreted as an upstream version
> change, hence not need the REVSISON bump? 
Yes, GH_TAGNAME and DISTNAME would change instead of bumping REVISION.
But I looked closer and none of the new commits seem to affect us, so
that might just do next time.

pre-install now goes into post-install as well, as I could find a reason
to keep these apart.

Feedback? OK?

Index: Makefile
===
RCS file: /cvs/ports/net/mininet/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile10 Apr 2018 07:55:10 -  1.7
+++ Makefile15 Apr 2018 08:54:25 -
@@ -3,7 +3,7 @@
 COMMENT =  emulator for rapid prototyping of software defined networks
 
 DISTNAME = mininet-0.0.20170813
-REVISION = 4
+REVISION = 5
 GH_ACCOUNT =   mininet
 GH_PROJECT =   mininet
 GH_COMMIT =87e26ef931ee6063332ceba77db472140f832d3a
@@ -18,33 +18,30 @@ MAINTAINER =Ayaka Koshibe 

Re: NEW: devel/creduce

[Stuart Henderson]

On 2018/04/15 02:27, Brian Callahan wrote:
> Works well on amd64 following the user guide on the HOMEPAGE. Note that this
> links libLLVM-6.0.so from devel/llvm, though that does not get reflected in
> WANTLIB (I left a comment saying such in the Makefile).

You need to have a WANTLIB entry associated with the LIB_DEPENDS otherwise
the LIB_DEPENDS is stripped.

One way around it might be to use RUN_DEPENDS only and set PKGSPEC in
devel/llvm to force a tight dependency on the version but it's not correct
use of the infrastructure.

This is exactly what I was worried about here:

- Forwarded message from Stuart Henderson  -

From: Stuart Henderson 
Date: Tue, 6 Mar 2018 12:47:07 +
To: Jonathan Gray 
Cc: Brian Callahan , ports@openbsd.org, b...@comstyle.com
User-Agent: Mutt/1.9.3 (2018-01-21)
Subject: Re: build libLLVM.so in devel/llvm
Mail-Followup-To: Jonathan Gray , Brian Callahan
, ports@openbsd.org, b...@comstyle.com

On 2018/03/06 21:32, Jonathan Gray wrote:
> On Sat, Feb 17, 2018 at 11:12:44PM +1100, Jonathan Gray wrote:
> > On Thu, Feb 15, 2018 at 05:08:56PM +, Stuart Henderson wrote:
> > > On 2018/02/15 11:19, Brian Callahan wrote:
> > > > 
> > > > On 02/15/18 10:02, Jonathan Gray wrote:
> > > > > Build libLLVM.so and link tools with it.
> > > > > 
> > > > > This seems to be the way almost all Linux distributions and BSDs
> > > > > ship LLVM and is what Mesa expects.
> > > > > 
> > > > > Use the documented cmake var for RTTI while here.
> > > > 
> > > > Any reason not to use the SHARED_LIBS facility of ports for libLLVM, 
> > > > like
> > > > libclang and libLTO already do in the LLVM port?
> > > 
> > > agreed, it's a bit non-obvious that it might be needed because unlike
> > > other build systems (which normally use a default value if not passed
> > > via SHARED_LIBS) the way we've got cmake setup it just skips the library
> > > version in that case..
> > > 
> > 
> > Trying to use SHARED_LIBS breaks and isn't so useful as the name
> > of the library includes the major/minor llvm version with the abi
> > unlikely to change on new release based from the same branch.
> > 
> > The intent seems to be to allow multiple versions to be installed
> > concurrently as llvm breaks abi/api between most releases.
> > 
> > Warning: symlink(s) point to non-existent 
> > /usr/ports/pobj/llvm-5.0.1/fake-amd64/usr/local/lib/libLLVM-5.0.so
> > /usr/ports/pobj/llvm-5.0.1/fake-amd64/usr/local/lib/libLLVM-5.0.1.so
> > /usr/ports/pobj/llvm-5.0.1/fake-amd64/usr/local/lib/libLLVM.so
> > 
> > $ ls -l /usr/local/lib/libLLVM*.so*
> > lrwxr-xr-x  1 root  wheel14 Feb 17 22:55 
> > /usr/local/lib/libLLVM-5.0.1.so -> libLLVM-5.0.so
> > -rw-r--r--  1 root  bin61453686 Feb 17 22:47 
> > /usr/local/lib/libLLVM-5.0.so.0.0
> > lrwxr-xr-x  1 root  wheel14 Feb 17 22:55 /usr/local/lib/libLLVM.so 
> > -> libLLVM-5.0.so
> > 
> > $ llvm-config --link-shared
> > llvm-config: error: libLLVM-5.0.so is missing
> > $ llvm-config --shared-mode 
> > static
> 
> So would anyone be opposed to the first diff in this thread going in?

The potential issue with this is that if things in ports start linking
to it, we'll run into problems with updates.

That said I don't really have a better idea and I don't want to get in
the way of your work on Mesa, so OK sthen@ but think we will need to keep
an eye on it.


- End forwarded message -

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/04/15 01:27:58

Modified files:
graphics/piglit: Makefile 

Log message:
Set ONLY_FOR_ARCHS=amd64 i386, drm_intel (in WANTLIB) only exists there.

UPDATE: net/mininet - various bug fixes

[Ayaka Koshibe]

On Sun, Apr 08, 2018 at 07:17:30PM +0200, Klemens Nanni wrote:
> On Sat, Apr 07, 2018 at 05:50:54PM -0700, Ayaka Koshibe wrote:
> > And I found the manpage for mn isn't generated properly during last-minute
> > testing...
> > 
> > Updated Makefile diff, plus cleanup to run MAKEDEV in /dev, rather than 
> > create
> > and move a file, as suggested by phessler.
> How about these on top of your diff:
 
I wanted to keep my diffs as-is since they were purely bug fixes, and seemed
better off separate from pure improvements.

> Use CFLAGS in do-build, enabling DEBUG.
> 
> Compact .for loops in targets to smaller brace expansion. IMO the
> examples/ path is clear enough, so I also avoided renaming switchd.conf.
> 
> Set SEPARATE_BUILD since you're already using WRKSRC and WRKBUILD
> accordingly.
> 
> Feedback?

Personally I find it easier to read without the brace expansions, but
otherwise the suggestions make sense to me, thanks.
 
> Maybe also use the latest git commit instead of bumping revision?

If I understand correctly, this would be interpreted as an upstream version
change, hence not need the REVSISON bump? 


Thanks,
Ayaka

> Index: Makefile
> ===
> RCS file: /cvs/ports/net/mininet/Makefile,v
> retrieving revision 1.6
> diff -u -p -r1.6 Makefile
> --- Makefile  7 Dec 2017 06:33:40 -   1.6
> +++ Makefile  8 Apr 2018 17:16:12 -
> @@ -3,7 +3,7 @@
>  COMMENT =emulator for rapid prototyping of software defined networks
>  
>  DISTNAME =   mininet-0.0.20170813
> -REVISION =   3
> +REVISION =   4
>  GH_ACCOUNT = mininet
>  GH_PROJECT = mininet
>  GH_COMMIT =  87e26ef931ee6063332ceba77db472140f832d3a
> @@ -18,33 +18,32 @@ MAINTAINER =  Ayaka Koshibe   PERMIT_PACKAGE_CDROM =   Yes
>  
>  WANTLIB =c
> +
>  MODULES =lang/python
>  MODPY_SETUPTOOLS =   Yes
>  BUILD_DEPENDS =  devel/help2man
>  RUN_DEPENDS =net/socat \
>   net/iperf
>  
> +SEPARATE_BUILD = Yes
> +
>  do-build:
> - $(CC) ${WRKSRC}/mnexec.c -o ${WRKBUILD}/mnexec
> + ${CC} ${CFLAGS} ${WRKSRC}/mnexec.c -o ${WRKBUILD}/mnexec
>   help2man -N -n "create a Mininet network."  --no-discard-stderr \
> - "${MODPY_BIN} -B ${WRKBUILD}/bin/mn" -o ${WRKBUILD}/mn.1
> + "PYTHONPATH=${WRKBUILD} ${MODPY_BIN} -B ${WRKBUILD}/bin/mn" \
> + -o ${WRKBUILD}/mn.1
>   help2man -N -n "execution utility for Mininet."  -h "-h" -v "-v" \
>   --no-discard-stderr ${WRKBUILD}/mnexec -o ${WRKBUILD}/mnexec.1
>  
>  pre-install:
>   ${INSTALL_PROGRAM} ${WRKBUILD}/mnexec ${PREFIX}/bin
> -.for m in mnexec mn
> - ${INSTALL_MAN} ${WRKBUILD}/$m.1 ${PREFIX}/man/man1
> -.endfor
> + ${INSTALL_MAN} ${WRKBUILD}/{mnexec,mn}.1 ${PREFIX}/man/man1
>   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mininet
>   ${INSTALL_DATA} ${WRKBUILD}/README.md ${PREFIX}/share/doc/mininet
>  
>  post-install:
>   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mininet
> - ${INSTALL_DATA} ${WRKSRC}/util/switchd.conf \
> - ${PREFIX}/share/examples/mininet/switchd.mininet.conf-sample
> -.for f in examples/README.md examples/*.py
> - ${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/share/examples/mininet
> -.endfor
> + ${INSTALL_DATA} ${WRKSRC}/{examples{README.md,*.py},util/switchd.conf} \
> + ${PREFIX}/share/examples/mininet
>  
>  .include 
> Index: patches/patch-mininet_cli_py
> ===
> RCS file: /cvs/ports/net/mininet/patches/patch-mininet_cli_py,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 patch-mininet_cli_py
> --- patches/patch-mininet_cli_py  21 Aug 2017 18:47:12 -  1.1.1.1
> +++ patches/patch-mininet_cli_py  8 Apr 2018 17:16:12 -
> @@ -3,7 +3,24 @@ split() automatically splits on whitespa
>  Index: mininet/cli.py
>  --- mininet/cli.py.orig
>  +++ mininet/cli.py
> -@@ -411,7 +411,7 @@ class CLI( Cmd ):
> +@@ -356,12 +356,11 @@ class CLI( Cmd ):
> + """Run dpctl (or ovs-ofctl) command on all switches.
> +Usage: dpctl command [arg1] [arg2] ..."""
> + args = line.split()
> +-if len(args) < 1:
> +-error( 'usage: dpctl command [arg1] [arg2] ...\n' )
> +-return
> + for sw in self.mn.switches:
> +-output( '*** ' + sw.name + ' ' + ('-' * 72) + '\n' )
> +-output( sw.dpctl( *args ) )
> ++res = sw.dpctl( *args )
> ++if res:
> ++output( '*** ' + sw.name + ' ' + ('-' * 72) + '\n' )
> ++output( res )
> + 
> + def do_time( self, line ):
> + "Measure time taken for any command in Mininet."
> +@@ -411,7 +410,7 @@ class CLI( Cmd ):
>  % first )
>   return
>   node = self.mn[ first ]
> Index: patches/patch-mininet_net_py
> 

NEW: devel/creduce

[Brian Callahan]

Hi ports --

Attached is a new port, devel/creduce. C-Reduce is a C and C++ program 
reducer.


---
pkg/DESCR:
C-Reduce is a tool that takes a large C, C++, or OpenCL file that has a
property of interest (such as triggering a compiler bug) and
automatically produces a much smaller C/C++ file that has the same
property. It is intended for use by people who discover and report bugs
in compilers and other tools that process source code.

C-Reduce is a fixpoint computation that calls a collection of plugins.
It is these plugins that actually transform the test case that is being
reduced. C-Reduce is thus very easy to improve and extend. Additionally,
the C-Reduce core can exploit multiple cores without exposing plugins to
concurrency.
---

Works well on amd64 following the user guide on the HOMEPAGE. Note that 
this links libLLVM-6.0.so from devel/llvm, though that does not get 
reflected in WANTLIB (I left a comment saying such in the Makefile).


OK?

~Brian



creduce.tgz
Description: Binary data

NEW: editors/dte

[Brian Callahan]

Hi ports --

Attached is a new port, editors/dte. dte is a small and easy to use 
console text editor.


---
pkg/DESCR:
dte is a small and easy to use console text editor.

Features:
* Multiple buffers/tabs
* Unlimited undo/redo
* Search and replace
* Syntax highlighting
* Customizable color schemes
* Customizable key bindings
* Command language with auto-completion
* Jump to definition (using ctags)
* Jump to compiler error
---

Works well here, upstream has been really good working out issues and 
even updating the openbsd-wip port. You'll note that on a machine with 
clang, it'll use -std=gnu11 but it'll use -std=gnu99 if you're on a 
platform with older gcc so I did not set COMPILER.


OK?

~Brian



dte.tgz
Description: Binary data