CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2017/01/02 00:07:30

Modified files:
sysutils/menulibre: Makefile 

Log message:
use MODPY_DEFAULT_VERSION_3 instead of hardcoding 3.4

CVS: cvs.openbsd.org: ports

[Jonathan Gray]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2017/01/01 22:18:42

Modified files:
devel/codeblocks: Makefile 

Log message:
Mark codeblocks as broken on arm.  GCC 4.4 changed the C++ symbol
mangling of va_list on arm to conform to a newer revision of the EABI
specification.  Codeblocks is built with ports gcc (4.9) but depends
on wxwidgets which has va_list in a public symbol in the form of
wxString::FormatV() and wxwidgets is built with base gcc (4.2.1).

This can be revisited when wxwidgets is built with a different compiler.

ok Josh Grosse (MAINTAINER)

Re: arm bulk build report

[Jonathan Gray]

On Sun, Jan 01, 2017 at 10:22:27PM -0500, Josh Grosse wrote:
> On Tue, Dec 27, 2016 at 09:49:58PM -0700, phess...@openbsd.org wrote:
> 
> > http://build-failures.rhaalovely.net//arm/2016-12-20/devel/codeblocks.log
> 
> And in this port, the failure message apparently comes from ld(1):
> 
> app.cpp:  undefined reference to `wxString::FormatV(wchar_t const*, 
> std::__va_list)'
> 
> I tried USE_LIBTOOL=gnu, and it also produced this error message so I
> could recreate the problem.  I am unsure of its root cause.

on arm libwx_base.so.3.0 has
_ZN8wxString7FormatVEPKwPv / wxString::FormatV(wchar_t const*, void*)

gcc 4.4 changed the c++ symbol mangling of va_list on arm.

https://groups.google.com/forum/#!topic/android-ndk/mrk5dDqWioM

https://gcc.gnu.org/gcc-4.4/changes.html

"On ARM EABI targets, the C++ mangling of the va_list type has been
changed to conform to the current revision of the EABI. This does not
affect the libstdc++ library included with GCC."

wxwidgets is built with base gcc, codeblocks with gcc 4.9.

As it stands wxwidgets will only work with c++ using ports built with
base gcc on arm.

Re: arm bulk build report

[Josh Grosse]

On Tue, Dec 27, 2016 at 09:49:58PM -0700, phess...@openbsd.org wrote:

> http://build-failures.rhaalovely.net//arm/2016-12-20/devel/codeblocks.log

And in this port, the failure message apparently comes from ld(1):

app.cpp:  undefined reference to `wxString::FormatV(wchar_t const*, 
std::__va_list)'

I tried USE_LIBTOOL=gnu, and it also produced this error message so I
could recreate the problem.  I am unsure of its root cause.

I recommend the port be marked BROKEN-arm until someone smarter than
me has time to review the link error.  A diff (which also eliminates a
trailing whitespace) is attached containing this recommendation.

Please note: portcheck(1) doesn't like that both the port's Makefile 
and pkg/DESC are chmod 755. That dates from the initial commit in
2009.

---

The testing of gnu libtool on amd64 showed that it solved one
outstanding problem on but unfortunately it also introduced three
new ones.

Solved: removed an outstanding stdc++ in front of estdc++ for
libwxsmith.

New:missing symbols in libThreadSearch, liblib_finder, and
libwxsmithcontribitems.

Comparing the logs between builds with libtool(1) and builds with gnu
libtoo, I don't see anything that would cause the symbols to be
eliminated when these three libs are linked.  I also do not understand
the source of the large number of WANTLIBs that were deemed extra by
port-lib-depends-check.
 
Operationally the only difference (other than these three broken libs) 
is that the gnu libtool builds shared libs only rather than both static
and shared.  The port eliminates the static libraries as they are not
used, but I noted that if I set LIBTOOL_FLAGS=-static, I could get
correctly built static libraries.


  -Josh- 
Index: Makefile
===
RCS file: /systems/cvs/ports/devel/codeblocks/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile18 Mar 2016 23:12:16 -  1.33
+++ Makefile2 Jan 2017 03:04:10 -
@@ -1,6 +1,8 @@
 # $OpenBSD: Makefile,v 1.33 2016/03/18 23:12:16 naddy Exp $
 
 BROKEN-alpha=  sqvm.cpp:394:1: internal compiler error: Segmentation fault
+BROKEN-arm=app.cpp:  undefined reference to `wxString::FormatV(wchar_t 
const*, std::__va_list)'
+
 COMMENT=   Code::Blocks C/C++ IDE
 
 V= 16.01
@@ -77,7 +79,7 @@ CONFIGURE_ARGS=   --with-contrib-plugins=a
 MAKE_ENV=  AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
AUTOCONF_VERSION=${AUTOCONF_VERSION}
 
-pre-patch: 
+pre-patch:
cd ${WRKSRC}; \
env \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \

UPDATE: hexchat to 2.12.4

[Florian Stinglmayr]

Hi list,

below is an update for hexchat to bring it to 2.12.4.
At first upstream butchered the release tarball [1] and then they
broke compability with LibreSSL [2]. All of these issues are now fixed
upstream however, so after a new release I should be able to remove the
patches and quirks from the port. The upstream patch for LibreSSL is far
nicer and better, but I wanted to avoid calling autoreconf in prebuild
so the not so clean patch it is.

New things and fixes in hexchat 2.12.4:

* Minor utf8 problems fixes
* doat is now an internal command and no longer a plugin. Loading doat
  via startup script might give you trouble
* Support for OpenSSL >= 1.1
* Important bugfix for unwanted ping timeouts on high latency networks.

Regards,
Florian


[1] https://github.com/hexchat/hexchat/issues/1897
[2] https://github.com/hexchat/hexchat/pull/1899



Index: Makefile
===
RCS file: /cvs/ports/net/hexchat/Makefile,v
retrieving revision 1.14
diff -u -p -u -r1.14 Makefile
--- Makefile28 Oct 2016 14:55:19 -  1.14
+++ Makefile2 Jan 2017 01:51:33 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.14 2016/10/28 14:55:19 fcambus Exp $
 
 COMMENT =  GTK+2 IRC Client
-DISTNAME = hexchat-2.12.3
+DISTNAME = hexchat-2.12.4
 EXTRACT_SUFX = .tar.xz
 CATEGORIES =   net x11
 
@@ -21,6 +21,8 @@ WANTLIB += png proxy pthread pthread-stu
 WANTLIB += xcb xcb-render xcb-shm z
 
 MASTER_SITES = http://dl.hexchat.net/hexchat/
+
+DISTFILES =hexchat-2.12.4-repack.tar.xz
 
 MODULES =  textproc/intltool \
lang/lua \
Index: distinfo
===
RCS file: /cvs/ports/net/hexchat/distinfo,v
retrieving revision 1.7
diff -u -p -u -r1.7 distinfo
--- distinfo28 Oct 2016 14:55:19 -  1.7
+++ distinfo2 Jan 2017 01:51:33 -
@@ -1,2 +1,2 @@
-SHA256 (hexchat-2.12.3.tar.xz) = bysiNyx6ntj/q4FweWOOj0F49fi6Y8ics7qgG+YU8ro=
-SIZE (hexchat-2.12.3.tar.xz) = 1577736
+SHA256 (hexchat-2.12.4-repack.tar.xz) = 
F0Fo1IcFwqaGIyRrKrJA3cE2LkXLAjsi69X6cCm64PA=
+SIZE (hexchat-2.12.4-repack.tar.xz) = 1577684
Index: patches/patch-plugins_fishlim_dh1080_c
===
RCS file: patches/patch-plugins_fishlim_dh1080_c
diff -N patches/patch-plugins_fishlim_dh1080_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-plugins_fishlim_dh1080_c  2 Jan 2017 01:51:33 -
@@ -0,0 +1,30 @@
+$OpenBSD$
+--- plugins/fishlim/dh1080.c.orig  Sun Oct 23 09:40:01 2016
 plugins/fishlim/dh1080.c   Mon Jan  2 02:43:16 2017
+@@ -74,7 +74,7 @@ dh1080_init (void)
+ 
+   BN_set_word (g, 2);
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || LIBRESSL_VERSION_NUMBER
+   g_dh->p = p;
+   g_dh->g = g;
+ #else
+@@ -162,7 +162,7 @@ dh1080_generate_key (char **priv_key, char **pub_key)
+   return 0;
+   }
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || LIBRESSL_VERSION_NUMBER
+   dh_pub_key = dh->pub_key;
+   dh_priv_key = dh->priv_key;
+ #else
+@@ -213,7 +213,7 @@ dh1080_compute_key (const char *priv_key, const char *
+ 
+   priv_key_data = dh1080_decode_b64 (priv_key, _key_len);
+   priv_key_num = BN_bin2bn(priv_key_data, priv_key_len, NULL);
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || LIBRESSL_VERSION_NUMBER
+   dh->priv_key = priv_key_num;
+ #else
+   DH_set0_key (dh, NULL, priv_key_num);
Index: patches/patch-src_common_ssl_c
===
RCS file: patches/patch-src_common_ssl_c
diff -N patches/patch-src_common_ssl_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_common_ssl_c  2 Jan 2017 01:51:33 -
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- src/common/ssl.c.orig  Sun Oct 23 09:40:01 2016
 src/common/ssl.c   Mon Jan  2 02:43:16 2017
+@@ -176,7 +176,7 @@ _SSL_get_cert_info (struct cert_info *cert_info, SSL *
+   return 1;
+ 
+   alg = OBJ_obj2nid (algor->algorithm);
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || LIBRESSL_VERSION_NUMBER
+   sign_alg = OBJ_obj2nid (peer_cert->sig_alg->algorithm);
+ #else
+   sign_alg = X509_get_signature_nid (peer_cert);
+@@ -306,7 +306,7 @@ _SSL_socket (SSL_CTX *ctx, int sd)
+ 
+   SSL_set_fd (ssl, sd);
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || LIBRESSL_VERSION_NUMBER
+   method = ctx->method;
+ #else
+   method = SSL_CTX_get_ssl_method (ctx);
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/hexchat/pkg/PLIST,v
retrieving revision 1.2
diff -u -p 

Re: emulators/advancemame i386: can't find a register in class 'GENERAL_REGS'

[Stuart Henderson]

Thanks - ok sthen (the revision bump is probably not needed as it couldn't 
have built with asm before, but no problem including it).


If you wanted to try enabling the asm on i386 you could try playing with 
no-pie.




On 1 January 2017 23:07:25 Frederic Cambus  wrote:


On Sat, Dec 31, 2016 at 12:39:31PM +, Stuart Henderson wrote:

> cc -DHAVE_CONFIG_H -DUSE_LSB -DUSE_ASM_INLINE -DUSE_ASM_EMUMIPS3 -O2 
-pipe -DNDEBUG -D_REENTRANT -I./advance/osd -I./advance/lib 
-I./advance/blit -I./advance/linux 
-DADV_DATADIR=\"/usr/local/share/advance\" -DADV_SYSCONFDIR=\"/etc\" 
-DUSE_VIDEO_NONE -DUSE_SOUND_NONE -DUSE_KEYBOARD_NONE -DUSE_MOUSE_NONE 
-DUSE_JOYSTICK_NONE -DUSE_LCD -DUSE_SMP -I/usr/local/include 
-I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/X11R6/include 
-DXTHREADS -I./advance/sdl -DUSE_VIDEO_SDL -DUSE_SOUND_SDL 
-DUSE_KEYBOARD_SDL -DUSE_MOUSE_SDL -DUSE_JOYSTICK_SDL  
-I/usr/X11R6/include/freetype2 -DUSE_FREETYPE -DUSE_MOUSE_RAW 
-DADV_VERSION=\"3.0\" -DADV_EMU -c advance/blit/blit.c -o 
obj/mame/generic/blend/advance/blit/blit.o

> advance/blit/vpalette.h: In function 'video_line_palette16to8_asm':
> advance/blit/vpalette.h:347: error: can't find a register in class 
'GENERAL_REGS' while reloading 'asm'

> advance/blit/vpalette.h:347: error: 'asm' operand has impossible constraints
> ===> Exiting emulators/advancemame with an error

advancemess has the same build problem, and I see what's triggering it now:
if nasm is installed then things fail on i386.


Indeed, thanks for diagnosing and reporting the issue Stuart.

Here is a diff to disable assembly code on i386 for advancemame and
advancemess.

When nasm is installed, assembly optimized code is enabled at configure
time on i386, and compilation fails. This code only exists for i386,
so disabling it globally using CONFIGURE_ARGS does not affect other
architectures.

Comments? OK?

Index: emulators/advancemame/Makefile
===
RCS file: /cvs/ports/emulators/advancemame/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- emulators/advancemame/Makefile  5 Dec 2016 10:05:39 -   1.3
+++ emulators/advancemame/Makefile  1 Jan 2017 19:44:35 -
@@ -4,6 +4,7 @@ COMMENT =   MAME port with advanced video

 V =3.0
 DISTNAME = advancemame-$V
+REVISION = 0

 CATEGORIES =   emulators games

@@ -23,6 +24,9 @@ MASTER_SITES =https://github.com/amadva
 LIB_DEPENDS =  devel/sdl

 CONFIGURE_STYLE = gnu
+
+CONFIGURE_ARGS += --disable-asm \
+ --disable-asm-mips3

 USE_GMAKE =Yes

Index: emulators/advancemess/Makefile
===
RCS file: /cvs/ports/emulators/advancemess/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- emulators/advancemess/Makefile  16 Dec 2016 21:24:54 -  1.2
+++ emulators/advancemess/Makefile  1 Jan 2017 19:44:35 -
@@ -2,9 +2,10 @@

 COMMENT =  MESS port with advanced video support for monitors and TVs

-V = 3.0
-DISTNAME =  advancemame-$V
-PKGNAME =   advancemess-$V
+V =3.0
+DISTNAME = advancemame-$V
+PKGNAME =  advancemess-$V
+REVISION = 0

 CATEGORIES =   emulators games

@@ -25,7 +26,9 @@ LIB_DEPENDS = devel/sdl

 CONFIGURE_STYLE = gnu

-CONFIGURE_ARGS += --with-emu=mess
+CONFIGURE_ARGS += --with-emu=mess \
+ --disable-asm \
+ --disable-asm-mips3

 USE_GMAKE =Yes

Re: emulators/advancemame i386: can't find a register in class 'GENERAL_REGS'

[Frederic Cambus]

On Sat, Dec 31, 2016 at 12:39:31PM +, Stuart Henderson wrote:

> > cc -DHAVE_CONFIG_H -DUSE_LSB -DUSE_ASM_INLINE -DUSE_ASM_EMUMIPS3 -O2 -pipe 
> > -DNDEBUG -D_REENTRANT -I./advance/osd -I./advance/lib -I./advance/blit 
> > -I./advance/linux -DADV_DATADIR=\"/usr/local/share/advance\" 
> > -DADV_SYSCONFDIR=\"/etc\" -DUSE_VIDEO_NONE -DUSE_SOUND_NONE 
> > -DUSE_KEYBOARD_NONE -DUSE_MOUSE_NONE -DUSE_JOYSTICK_NONE -DUSE_LCD 
> > -DUSE_SMP -I/usr/local/include -I/usr/local/include/SDL -D_GNU_SOURCE=1 
> > -D_REENTRANT -I/usr/X11R6/include -DXTHREADS -I./advance/sdl 
> > -DUSE_VIDEO_SDL -DUSE_SOUND_SDL -DUSE_KEYBOARD_SDL -DUSE_MOUSE_SDL 
> > -DUSE_JOYSTICK_SDL  -I/usr/X11R6/include/freetype2 -DUSE_FREETYPE 
> > -DUSE_MOUSE_RAW -DADV_VERSION=\"3.0\" -DADV_EMU -c advance/blit/blit.c -o 
> > obj/mame/generic/blend/advance/blit/blit.o
> > advance/blit/vpalette.h: In function 'video_line_palette16to8_asm':
> > advance/blit/vpalette.h:347: error: can't find a register in class 
> > 'GENERAL_REGS' while reloading 'asm'
> > advance/blit/vpalette.h:347: error: 'asm' operand has impossible constraints
> > ===> Exiting emulators/advancemame with an error
> 
> advancemess has the same build problem, and I see what's triggering it now:
> if nasm is installed then things fail on i386.

Indeed, thanks for diagnosing and reporting the issue Stuart.

Here is a diff to disable assembly code on i386 for advancemame and
advancemess.

When nasm is installed, assembly optimized code is enabled at configure
time on i386, and compilation fails. This code only exists for i386,
so disabling it globally using CONFIGURE_ARGS does not affect other
architectures.

Comments? OK?

Index: emulators/advancemame/Makefile
===
RCS file: /cvs/ports/emulators/advancemame/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- emulators/advancemame/Makefile  5 Dec 2016 10:05:39 -   1.3
+++ emulators/advancemame/Makefile  1 Jan 2017 19:44:35 -
@@ -4,6 +4,7 @@ COMMENT =   MAME port with advanced video 
 
 V =3.0
 DISTNAME = advancemame-$V
+REVISION = 0
 
 CATEGORIES =   emulators games
 
@@ -23,6 +24,9 @@ MASTER_SITES =https://github.com/amadva
 LIB_DEPENDS =  devel/sdl
 
 CONFIGURE_STYLE = gnu
+
+CONFIGURE_ARGS += --disable-asm \
+ --disable-asm-mips3
 
 USE_GMAKE =Yes
 
Index: emulators/advancemess/Makefile
===
RCS file: /cvs/ports/emulators/advancemess/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- emulators/advancemess/Makefile  16 Dec 2016 21:24:54 -  1.2
+++ emulators/advancemess/Makefile  1 Jan 2017 19:44:35 -
@@ -2,9 +2,10 @@
 
 COMMENT =  MESS port with advanced video support for monitors and TVs
 
-V = 3.0
-DISTNAME =  advancemame-$V
-PKGNAME =   advancemess-$V
+V =3.0
+DISTNAME = advancemame-$V
+PKGNAME =  advancemess-$V
+REVISION = 0
 
 CATEGORIES =   emulators games
 
@@ -25,7 +26,9 @@ LIB_DEPENDS = devel/sdl
 
 CONFIGURE_STYLE = gnu
 
-CONFIGURE_ARGS += --with-emu=mess
+CONFIGURE_ARGS += --with-emu=mess \
+ --disable-asm \
+ --disable-asm-mips3
 
 USE_GMAKE =Yes
 

avidemux on arm

[Jeremie Courreges-Anglas]

gas can't cope with -falign-loops=16:

  http://build-failures.rhaalovely.net//arm/2016-12-20/multimedia/avidemux.log

i386 already needs a hack, let's use generic variables for
platform-specific quirks.  Additionally, we'd better define facts such
as endianness.  While here, "test foo == bar" is not posix.

ok?


Index: Makefile
===
RCS file: /d/cvs/ports/multimedia/avidemux/Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile
--- Makefile30 Aug 2016 10:20:15 -  1.47
+++ Makefile1 Jan 2017 20:53:23 -
@@ -6,7 +6,7 @@ V=  2.4.4
 DISTNAME=  avidemux_${V}
 PKGNAME=   avidemux-${V}
 
-REVISION=  17
+REVISION=  18
 
 CATEGORIES=multimedia
 
@@ -45,15 +45,18 @@ AUTOCONF_VERSION=2.60
 AUTOMAKE_VERSION=1.9
 
 .if ${MACHINE_ARCH} == "i386"
-PIE_CFLAGS = -fno-pie
-PIE_LDFLAGS = -nopie
+MD_CFLAGS =-fno-pie
+MD_LDFLAGS =   -nopie
+.elif ${MACHINE_ARCH} == "arm"
+# binutils-2.17 can't handle -falign-loops=16 on arm; 0 == default
+MD_CFLAGS =-falign-loops=0
 .endif
 
 CONFIGURE_STYLE=gnu
-CONFIGURE_ENV+=CFLAGS="${PIE_CFLAGS} ${CFLAGS}" \
-   CXXFLAGS="${PIE_CFLAGS} ${CXXFLAGS}" \
+CONFIGURE_ENV+=CFLAGS="${MD_CFLAGS} ${CFLAGS}" \
+   CXXFLAGS="${MD_CFLAGS} ${CXXFLAGS}" \
CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-   LDFLAGS="${PIE_LDFLAGS} -L${LOCALBASE}/lib -logg -lm -lz"
+   LDFLAGS="${MD_LDFLAGS} -L${LOCALBASE}/lib -logg -lm -lz"
 CONFIGURE_ARGS+=--enable-xv \
--with-x \
--with-freetype2 \
Index: patches/patch-configure_in_in
===
RCS file: /d/cvs/ports/multimedia/avidemux/patches/patch-configure_in_in,v
retrieving revision 1.9
diff -u -p -r1.9 patch-configure_in_in
--- patches/patch-configure_in_in   18 Jan 2013 11:37:54 -  1.9
+++ patches/patch-configure_in_in   1 Jan 2017 20:57:50 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-configure_in_in,v 1.9 2013/01/18 11:37:54 jasper Exp $
 --- configure.in.in.orig   Fri Feb  6 20:07:37 2009
-+++ configure.in.inWed Jan 16 11:07:32 2013
 configure.in.inSun Jan  1 21:57:46 2017
 @@ -740,6 +740,37 @@ if test "x$with_esd" != "xno"; then
fi
  fi
@@ -39,7 +39,7 @@ $OpenBSD: patch-configure_in_in,v 1.9 20
  dnl ___ OSS ___
  AC_ARG_WITH([oss],
[AC_HELP_STRING([--without-oss], [force compilation without OSS 
[default=test]])],
-@@ -1153,10 +1184,39 @@ case $host_cpu in
+@@ -1153,10 +1184,46 @@ case $host_cpu in
AC_DEFINE(HAVE_FAST_64BIT,1,"FFMPEG")
echo "IA64"
;;
@@ -51,6 +51,13 @@ $OpenBSD: patch-configure_in_in,v 1.9 20
 +  AC_DEFINE(ENABLE_MMX,0,[post proc])
 +  echo "ALPHA"
 +  ;;
++  armv7)
++  have_little_endian=yes
++  LMPG_OPT="";
++  AC_DEFINE(FPM_DEFAULT,1,[Mad ])
++  AC_DEFINE(ENABLE_MMX,0,[post proc])
++  echo "ARM"
++  ;;
 +  loongson)
 +  have_little_endian=yes
 +  LMPG_OPT="";
@@ -73,13 +80,13 @@ $OpenBSD: patch-configure_in_in,v 1.9 20
have_little_endian=no;
LMPG_OPT="";
AC_DEFINE(ADM_BIG_ENDIAN,1,[Big endian CPU - SPARC or PowerPC])
-+  if test "$host_cpu" == "sparc64"; then
++  if test "$host_cpu" = "sparc64"; then
 +  AC_DEFINE(ARCH_64_BITS,1,"X86_64 AMD64 assembly")
 +  fi
AC_DEFINE(FPM_SPARC,1,[Mad ])
AC_DEFINE(WORDS_BIGENDIAN,1,[Big endian CPU - SPARC or PowerPC])
AC_DEFINE(ENABLE_MMX,0,[post proc])
-@@ -1173,7 +1233,7 @@ case $host_cpu in
+@@ -1173,7 +1240,7 @@ case $host_cpu in
AC_DEFINE(ENABLE_MMX,0,[post proc])
AC_DEFINE(HAVE_FAST_64BIT,1,"FFMPEG")
;;
@@ -88,7 +95,7 @@ $OpenBSD: patch-configure_in_in,v 1.9 20
have_little_endian=no;
LMPG_OPT="";
AC_DEFINE(FPM_PPC,1,[Mad ])   
-@@ -1184,7 +1244,7 @@ case $host_cpu in
+@@ -1184,7 +1251,7 @@ case $host_cpu in
AC_DEFINE(ARCH_POWERPC,1,[Enable PowerPC optim])
AC_ARG_ENABLE(altivec, 
AC_HELP_STRING([--enable-altivec], [enable AltiVec 
acceleration (PowerPC)]),
@@ -97,7 +104,7 @@ $OpenBSD: patch-configure_in_in,v 1.9 20
AC_DEFINE(WORDS_BIGENDIAN,1,[Big endian CPU - SPARC or PowerPC])
AC_DEFINE(ENABLE_MMX,0,[post proc])   
;;
-@@ -1321,15 +1381,6 @@ if test "x$use_debug" = "xyes"; then
+@@ -1321,15 +1388,6 @@ if test "x$use_debug" = "xyes"; then
AC_DEFINE(ADM_DEBUG,1,[be verbose])
CXXFLAGS="$CXXFLAGS -O1 -g3"
CFLAGS="$CFLAGS -O1 -g3"
@@ -113,3 

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2017/01/01 14:27:51

Added files:
emulators/BasiliskII/patches: patch-src_Unix_sigsegv_cpp 

Log message:
Unbreak on arm, os-specific segv handler.

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2017/01/01 14:02:12

Modified files:
graphics/png   : Tag: OPENBSD_6_0 Makefile distinfo 
graphics/png/pkg: Tag: OPENBSD_6_0 PLIST 

Log message:
security update to 1.6.27 for null pointer dereference bug

CVS: cvs.openbsd.org: ports

[SASANO Takayoshi]

CVSROOT:/cvs
Module name:ports
Changes by: u...@cvs.openbsd.org2017/01/01 13:58:24

Modified files:
devel/openocd  : Makefile distinfo 
devel/openocd/patches: patch-src_flash_mflash_c 
devel/openocd/pkg: PLIST 
Removed files:
devel/openocd/patches: patch-src_helper_command_c 
   patch-src_helper_command_h 

Log message:
update 0.6.1 -> 0.9.0

ok sthen@

Re: [UPDATE] www/otter-browser 0.9.12-dev152 => 0.9.12

[Adam Wolk]

On Sun, Jan 01, 2017 at 09:20:50PM +0100, Adam Wolk wrote:
> On Sun, Jan 01, 2017 at 03:58:10PM +0100, Adam Wolk wrote:
> > Hi ports@
> > 
> > Attaching a bump to the latest otter browser weekly
> > 
> > Feedback? OK's?
> 
> Just got noticed from upstream tag a new beta will be
> released shortly. Will follow up with a diff after
> upstream tarballs show up.
> 
> Regards,
> Adam
> 

Attaching the diff for the new 0.9.12 beta full upstream
changelog since 0.9.11 will show up on http://otter-browser.org
in a day or two.

Feedback? OK's?
Index: Makefile
===
RCS file: /cvs/ports/www/otter-browser/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile25 Dec 2016 14:34:40 -  1.21
+++ Makefile1 Jan 2017 20:42:56 -
@@ -3,9 +3,7 @@
 COMMENT =  browser aiming to recreate classic Opera (12.x) UI 
using Qt5
 
 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=otter-browser/}
-DISTNAME = otter-browser-0.9.12-dev152
-PKGNAME =  ${DISTNAME:S/-dev/pre/}
-REVISION = 0
+DISTNAME = otter-browser-0.9.12
 
 EXTRACT_SUFX = .tar.bz2
 
@@ -21,7 +19,7 @@ PERMIT_PACKAGE_CDROM =Yes
 WANTLIB += c m pthread Qt5Core Qt5DBus Qt5Gui Qt5Multimedia
 WANTLIB += Qt5Network Qt5PrintSupport Qt5Qml Qt5WebKit
 WANTLIB += Qt5WebKitWidgets Qt5Widgets Qt5XmlPatterns
-WANTLIB += hunspell-1.3
+WANTLIB += hunspell-1.3 X11
 
 
 RUN_DEPENDS =  devel/desktop-file-utils x11/gtk+3,-guic
Index: distinfo
===
RCS file: /cvs/ports/www/otter-browser/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo6 Dec 2016 13:00:19 -   1.15
+++ distinfo1 Jan 2017 20:42:56 -
@@ -1,2 +1,2 @@
-SHA256 (otter-browser-0.9.12-dev152.tar.bz2) = 
JMFAyIMKNGpE0mBoMfrrIiUnD4WJbhyrMS0kne/xpgQ=
-SIZE (otter-browser-0.9.12-dev152.tar.bz2) = 4810750
+SHA256 (otter-browser-0.9.12.tar.bz2) = 
9mW9zDrzlufFz1iiI50BNuQ3vyLwOW/mvZeFaFa4sVc=
+SIZE (otter-browser-0.9.12.tar.bz2) = 2805058

CVS: cvs.openbsd.org: ports

[Matthias Kilian]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/01/01 13:29:39

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

Log message:
databases/hs-postgresql-simple and devel/hs-uuid hare gone.

CVS: cvs.openbsd.org: ports

[Matthias Kilian]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/01/01 13:25:09

Removed files:
devel/hs-uuid  : Makefile distinfo 
devel/hs-uuid/pkg: DESCR PLIST 

Log message:
Remove devel/hs-uuid, it's longer used.

Maintainer David Schaefer agrees.

CVS: cvs.openbsd.org: ports

[Matthias Kilian]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/01/01 13:23:11

Removed files:
databases/hs-postgresql-simple: Makefile distinfo 
databases/hs-postgresql-simple/pkg: DESCR PLIST 

Log message:
Remove databases/hs-postgresql-simple, it's in the way of an ghc
update.

Maintainer David Schaefer agrees.

CVS: cvs.openbsd.org: ports

[Matthias Kilian]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/01/01 13:21:11

Modified files:
databases  : Makefile 
devel  : Makefile 

Log message:
Unhook databases/hs-postgresql-simple and devel/hs-uuid.

Not used by any ports, databases/hs-postgresql-simple would require
a new port (devel/hs-uuid-types) to update it and let it build with
ghc-8.0.

Maintainer David Schaefer agrees.

Re: [UPDATE] www/otter-browser 0.9.12-dev152 => 0.9.12-dev156

[Adam Wolk]

On Sun, Jan 01, 2017 at 03:58:10PM +0100, Adam Wolk wrote:
> Hi ports@
> 
> Attaching a bump to the latest otter browser weekly
> 
> Feedback? OK's?

Just got noticed from upstream tag a new beta will be
released shortly. Will follow up with a diff after
upstream tarballs show up.

Regards,
Adam

net/dsocks tweaks

[Jeremie Courreges-Anglas]

- respect CFLAGS
- don't hardcode /usr/local and the shared lib version
- install scripts with... INSTALL_SCRIPT

ok?


Index: Makefile
===
RCS file: /cvs/ports/net/dsocks/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile1 Jan 2017 18:32:04 -   1.13
+++ Makefile1 Jan 2017 20:16:02 -
@@ -2,6 +2,7 @@
 
 COMMENT=   SOCKS client wrapper for *BSD
 DISTNAME=  dsocks-1.7
+REVISION=  0
 CATEGORIES=net
 SHARED_LIBS=   dsocks 1.0
 
@@ -14,13 +15,17 @@ PERMIT_PACKAGE_CDROM=   Yes
 
 MASTER_SITES=  ${MASTER_SITE_GOOGLECODE:=dsocks/}
 
-MAKE_FLAGS=SHLIB_MAJOR=${LIBdsocks_VERSION:R} \
+MAKE_FLAGS=CFLAGS="-Wall ${CFLAGS}" \
+   SHLIB_MAJOR=${LIBdsocks_VERSION:R} \
SHLIB_MINOR=${LIBdsocks_VERSION:E}
 
 FAKE_FLAGS=DEBUGLIBS=No
 
+do-configure:
+   ${SUBST_CMD} ${WRKSRC}/dsocks.sh ${WRKSRC}/dsocks-torify.sh
+
 post-install:
-   ${INSTALL_PROGRAM} ${WRKSRC}/dsocks.sh ${WRKSRC}/dsocks-torify.sh \
+   ${INSTALL_SCRIPT} ${WRKSRC}/dsocks.sh ${WRKSRC}/dsocks-torify.sh \
${PREFIX}/bin
 
 .include 
Index: patches/patch-dsocks-torify_sh
===
RCS file: patches/patch-dsocks-torify_sh
diff -N patches/patch-dsocks-torify_sh
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-dsocks-torify_sh  1 Jan 2017 20:16:02 -
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- dsocks-torify.sh.orig  Sun Jan  1 17:53:30 2017
 dsocks-torify.sh   Sun Jan  1 17:54:38 2017
+@@ -11,6 +11,6 @@ if [ `uname -s` = "Darwin" ]; then
+   LIBDSOCKS=/usr/local/lib/libdsocks.dylib
+   DYLD_INSERT_LIBRARIES=$LIBDSOCKS DYLD_FORCE_FLAT_NAMESPACE=1 exec "$@"
+ else
+-  LIBDSOCKS=/usr/local/lib/libdsocks.so.1.0
++  LIBDSOCKS=${PREFIX}/lib/libdsocks.so.${LIBdsocks_VERSION}
+   LD_PRELOAD=$LIBDSOCKS exec "$@"
+ fi
Index: patches/patch-dsocks_sh
===
RCS file: patches/patch-dsocks_sh
diff -N patches/patch-dsocks_sh
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-dsocks_sh 1 Jan 2017 20:16:02 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- dsocks.sh.orig Sun Jan  1 17:53:33 2017
 dsocks.sh  Sun Jan  1 17:54:31 2017
+@@ -18,7 +18,7 @@ if [ `uname -s` = "Darwin" ]; then
+   LIBDSOCKS=/usr/local/lib/libdsocks.dylib
+   DYLD_INSERT_LIBRARIES=$LIBDSOCKS DYLD_FORCE_FLAT_NAMESPACE=1 exec "$@"
+ else
+-  LIBDSOCKS=/usr/local/lib/libdsocks.so.1.0
++  LIBDSOCKS=${PREFIX}/lib/libdsocks.so.${LIBdsocks_VERSION}
+   LD_PRELOAD=$LIBDSOCKS exec "$@"
+ 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.org2017/01/01 13:07:49

ports/net/dsocks/patches

Update of /cvs/ports/net/dsocks/patches
In directory cvs.openbsd.org:/tmp/cvs-serv69829/patches

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

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2017/01/01 11:49:58

Modified files:
devel/cargo: Makefile cargo.port.mk distinfo 
devel/cargo/patches: patch-tests_cargotest_support_paths_rs 
Removed files:
devel/cargo/patches: patch-Makefile_in 

Log message:
Update to cargo 0.15.0, from Maintainer semarie@

Re: Switch default python3 to 3.6

[Landry Breuil]

On Sun, Jan 01, 2017 at 06:18:15PM +0100, Landry Breuil wrote:
> On Sat, Dec 31, 2016 at 12:45:52PM +0100, Landry Breuil wrote:
> > On Sat, Dec 31, 2016 at 04:38:10PM +0500, Alexandr Shadchin wrote:
> > > On Sat, Dec 31, 2016 at 11:43:00AM +0100, Landry Breuil wrote:
> > > > On Thu, Dec 29, 2016 at 07:19:38PM +0500, Alexandr Shadchin wrote:
> > > > > On Thu, Dec 29, 2016 at 03:01:12PM +0100, Landry Breuil wrote:
> > > > > > On Thu, Dec 29, 2016 at 02:53:04PM +0100, Remi Pointel wrote:
> > > > > > > On 12/29/16 14:00, Alexandr Shadchin wrote:
> > > > > > > > On Mon, Dec 26, 2016 at 11:33:43PM +0500, Alexandr Shadchin 
> > > > > > > > wrote:
> > > > > > > > > On Mon, Dec 26, 2016 at 07:18:54PM +0100, Remi Pointel wrote:
> > > > > > > > > > On 12/26/16 19:12, Alexandr Shadchin wrote:
> > > > > > > > > > > Hi,
> > > > > > > > > > > 
> > > > > > > > > > > What is the timeline of flipping py3 flavour
> > > > > > > > > > > over to python3.5?
> > > > > > > > > > > 
> > > > > > > > > > 
> > > > > > > > > > Hi,
> > > > > > > > > > 
> > > > > > > > > > I would like to switch the default python 3 version to 3.6 
> > > > > > > > > > (I think 3.6 will
> > > > > > > > > > be imported these days).
> > > > > > > > > > 
> > > > > > > > > > We should import python 3.6, then run a bulk build and fix 
> > > > > > > > > > the ports don't
> > > > > > > > > > build. Then we will remove python 3.4 and 3.5 if we can.
> > > > > > > > > > 
> > > > > > > > > > Remi.
> > > > > > > > > 
> > > > > > > > > For me, it's even better :-)
> > > > > > > > > 
> > > > > > > > > I have two weeks free, I can work with fails.
> > > > > > > > > 
> > > > > > > > 
> > > > > > > > I tried switch on Python 3.6, for me works fine.
> > > > > > > > 
> > > > > > > > 1. Fix pyo-files (1_fix_pyo.diff)
> > > > > > > >For more details read PEP 488 [1]
> > > > > > > > 2. Fix py3-cairo (2_fix_py3-cairo.diff)
> > > > > > > > 3. Fix py-tornado (3_fix_tornado.diff)
> > > > > > > > 4. Switch on Python 3.6
> > > > > > > > 
> > > > > > > > [1] - https://www.python.org/dev/peps/pep-0488/
> > > > > > > > 
> > > > > > > 
> > > > > > > Sounds good for me, this diff should be tested by landry@ in a 
> > > > > > > bulk.
> > > > > > > 
> > > > > > > Thank you for your work.
> > > > > > 
> > > > > > Does this diff has *all* the REVISION bumps needed ?
> > > > > > I'll put it in the next bulk..
> > > > > > 
> > > > > > Landry
> > > > > 
> > > > > Yes, on clean system.
> > > > > 
> > > > > For my laptop was required bump py-setuptools.
> > > > > But I'm a noob at this, so it may have missed something :-)
> > > > 
> > > > So im about to start a bulk with this, but some things that worry me:
> > > > 
> > > > - you *really* should explain your diffs. the py-tornado looks like
> > > >   magic, why suddenly would the egg-info/requires.txt file be not
> > > > installed anymore ? wont it affect other ports ?
> > > 
> > > py-tornado depend:
> > > py3.4 need py-backport-abc (requires.txt generated)
> > > py3.6 not need anything (requires.txt not generated)
> > 
> > ok, thant makes sense :)
> > 
> > > > - the py3-cairo diff looks like magic. i know waf sucks, but why is this
> > > >   return needed ?
> > > 
> > > this patch from FreeBSD, that was obtained from Ubuntu repository :)
> > > 
> > > https://svnweb.freebsd.org/ports/head/graphics/py3-cairo/files/pycairo-1.10.0-waf-py3_5.patch?view=log
> > 
> > great cargo culting :)
> > 
> > > > - you didnt bump *any* of the other ports depending on py3, so they will
> > > >   all break because of the plist db. This sucks, because i'll have to do
> > > > the work (as i explained to remi).
> > > 
> > > I can make diff for bump all py3 ports.
> > > 
> > > > - i suppose you didnt build any of the other ports depending on py3
> > > >   besides setuptools ?
> > > 
> > > I built this py3 ports:
> > > sqlite3 /usr/local/share/sqlports "select distinct fullpkgpath from 
> > > depends where dependspath like '%python/3.4%'"
> > 
> > great, but had you built them *before* with py34 so that they were all
> > registered in your plistdb ? that's the whole point 
> > 
> > anyway, starting the bulk with a portstree updated to
> > https://github.com/openbsd/ports/commit/6864fa0e1c5e96a8095dda077af04c0b30a6ccc2
> > 
> > with this diff on top:
> > http://rhaalovely.net/~landry/stuff/py36.fulldiff
> > 
> > curated list passed to portbump from sqlports, and removed all the
> > flavors/subpackages.
> 
> Fwiw, after 25h and 4300 pkgs, the only 'important' fallout is
> libreoffice, something about pyuno:
> 
> checking whether /usr/local/bin/python3.6 version is >= 2.6... yes
> checking for /usr/local/bin/python3.6 version... 3.6
> checking for /usr/local/bin/python3.6 platform... openbsd6
> checking for /usr/local/bin/python3.6 script directory... 
> ${prefix}/lib/python3.6/site-packages
> checking for /usr/local/bin/python3.6 extension module directory... 
> ${exec_prefix}/lib/python3.6/site-packages
> checking which Python to use for Pyuno... checking for a 

CVS: cvs.openbsd.org: ports

[Ingo Feinerer]

CVSROOT:/cvs
Module name:ports
Changes by: feine...@cvs.openbsd.org2017/01/01 11:32:04

Modified files:
net/dsocks : Makefile distinfo 

Log message:
Update to dsocks 1.7

ok jca@

Re: UPDATE: net/dsocks

[Jeremie Courreges-Anglas]

Ingo Feinerer  writes:

> Hi,
>
> update net/dsocks 1.6 -> 1.7
>
> Now hosted at MASTER_SITE_GOOGLECODE instead of monkey.org.
> No visible changes (via nm -g) in .so so keep SHARED_LIBS at 1.0.
> Works for me on amd64.
>
> OK?

ok jca@

The only C code change is not relevant on OpenBSD.  Please go ahead,
I have a few packaging fixes.


 diff -pruN dsocks-1.6/dsocks.c dsocks-1.7/dsocks.c
 --- dsocks-1.6/dsocks.c Thu Oct 12 06:13:58 2006
 +++ dsocks-1.7/dsocks.c Wed Jun  4 06:08:03 2008
 @@ -604,9 +604,10 @@ _dsocks_init(void)
 }
 if ((pw = getpwuid(getuid())) != NULL) {
 strlcpy(_dsocks_user, pw->pw_name, sizeof(_dsocks_user));
 -   } else
 -   errx(1, "(dsocks) who are you?");
 -
 +   } else {
 +   /* XXX - getpwuid() actually fails on MacOS X Leopard! */
 +   strlcpy(_dsocks_user, getenv("USER"), sizeof(_dsocks_user));
 +   }
  #ifndef DL_LAZY
  # define DL_LAZY RTLD_LAZY
  #endif



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

UPDATE: net/dsocks

[Ingo Feinerer]

Hi,

update net/dsocks 1.6 -> 1.7

Now hosted at MASTER_SITE_GOOGLECODE instead of monkey.org.
No visible changes (via nm -g) in .so so keep SHARED_LIBS at 1.0.
Works for me on amd64.

OK?

Best regards,
Ingo

Index: Makefile
===
RCS file: /cvs/ports/net/dsocks/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile4 Apr 2016 16:09:10 -   1.12
+++ Makefile1 Jan 2017 15:41:23 -
@@ -1,8 +1,7 @@
 # $OpenBSD: Makefile,v 1.12 2016/04/04 16:09:10 naddy Exp $
 
 COMMENT=   SOCKS client wrapper for *BSD
-DISTNAME=  dsocks-1.6
-REVISION=  2
+DISTNAME=  dsocks-1.7
 CATEGORIES=net
 SHARED_LIBS=   dsocks 1.0
 
@@ -13,7 +12,7 @@ MAINTAINER=   Todd T. Fries 

[UPDATE] www/otter-browser 0.9.12-dev152 => 0.9.12-dev156

[Adam Wolk]

Hi ports@

Attaching a bump to the latest otter browser weekly

Feedback? OK's?
Index: Makefile
===
RCS file: /cvs/ports/www/otter-browser/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile25 Dec 2016 14:34:40 -  1.21
+++ Makefile1 Jan 2017 14:56:19 -
@@ -3,9 +3,8 @@
 COMMENT =  browser aiming to recreate classic Opera (12.x) UI 
using Qt5
 
 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=otter-browser/}
-DISTNAME = otter-browser-0.9.12-dev152
+DISTNAME = otter-browser-0.9.12-dev156
 PKGNAME =  ${DISTNAME:S/-dev/pre/}
-REVISION = 0
 
 EXTRACT_SUFX = .tar.bz2
 
@@ -21,7 +20,7 @@ PERMIT_PACKAGE_CDROM =Yes
 WANTLIB += c m pthread Qt5Core Qt5DBus Qt5Gui Qt5Multimedia
 WANTLIB += Qt5Network Qt5PrintSupport Qt5Qml Qt5WebKit
 WANTLIB += Qt5WebKitWidgets Qt5Widgets Qt5XmlPatterns
-WANTLIB += hunspell-1.3
+WANTLIB += hunspell-1.3 X11
 
 
 RUN_DEPENDS =  devel/desktop-file-utils x11/gtk+3,-guic
Index: distinfo
===
RCS file: /cvs/ports/www/otter-browser/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo6 Dec 2016 13:00:19 -   1.15
+++ distinfo1 Jan 2017 14:56:19 -
@@ -1,2 +1,2 @@
-SHA256 (otter-browser-0.9.12-dev152.tar.bz2) = 
JMFAyIMKNGpE0mBoMfrrIiUnD4WJbhyrMS0kne/xpgQ=
-SIZE (otter-browser-0.9.12-dev152.tar.bz2) = 4810750
+SHA256 (otter-browser-0.9.12-dev156.tar.bz2) = 
KN59cGkxX5HdIGczOGZqJItXM5IJzDhd7sKlv85tKew=
+SIZE (otter-browser-0.9.12-dev156.tar.bz2) = 4835106

Re: [UPDATE] devel/zeal 0.2.1 => 0.3.1

[Adam Wolk]

On Sun, Jan 01, 2017 at 03:02:10PM +0100, Antoine Jacoutot wrote:
> On Sun, Jan 01, 2017 at 02:57:30PM +0100, Adam Wolk wrote:
> > Hi ports@
> > 
> > Attaching a bump to devel/zeal
> > 
> > port changes:
> >  - add x11/qt5/qt5base dependency to LIB_DEPENDS
> >  - add Qt5Concurrent to WANTLIB (from qtbase)
> >  - mark USE_WXNEEDED = Yes (uses qt webkit)
> 
> Hmm, can't the qtwebkit port be patched like www/webkitgtk4 so that pkg-config
> files or whatever cmake magic pass the proper -Wl flags insead of adding 
> USE_WXNEEDED to all qtwebkit consumers?

I just checked why www/otter-browser doesn't need it as a qtwebkit consumer and
in that case devel/cmake was patched to pass the wx flags during the build.

This port uses devel/qmake to build hence it doens't get the same automatic
benefit. 

x11/qt5/qtwebkit/ has USE_WNEEDED = Yes in what way could it impact producing a
downstream (consumer) binary that's also marked as wxneeded?

> Also we usually put USE_WXNEEDED at the top of the Makefile.
> 
> 

Will move that to the top of the file before comitting (assuming I will get an
OK of course ;)).

Regards,
Adam

Re: [UPDATE] devel/zeal 0.2.1 => 0.3.1

[Antoine Jacoutot]

On Sun, Jan 01, 2017 at 02:57:30PM +0100, Adam Wolk wrote:
> Hi ports@
> 
> Attaching a bump to devel/zeal
> 
> port changes:
>  - add x11/qt5/qt5base dependency to LIB_DEPENDS
>  - add Qt5Concurrent to WANTLIB (from qtbase)
>  - mark USE_WXNEEDED = Yes (uses qt webkit)

Hmm, can't the qtwebkit port be patched like www/webkitgtk4 so that pkg-config
files or whatever cmake magic pass the proper -Wl flags insead of adding 
USE_WXNEEDED to all qtwebkit consumers?
Also we usually put USE_WXNEEDED at the top of the Makefile.


> upstream changelog:
> ---
> =
> 0.3.1
> =
> 
> Fixed Issues:
> 
> Fixed random crashing on application start and exit. (#595)
> Fixed web view hanging caused by URLs with no schema. (#532)
> Fixed docset removal on Windows. (#621)
> Fixed race condition (and warning) in docset removal logic.
> Fixed docset selection with Select All shortcut (usually Ctrl+A).
> 
> =
> 0.3.0
> =
> This releases contains a lot of bug fixes, as well as improvements to the UI 
> and
> application performance. See the link above for the complete list of changes.
> The most interesting changes are listed below.
> 
> New Features:
> 
> Dedicated docset management UI available via Tools -> Docsets (#354)
> Added portable mode support. (#486)
> Search results now have two icons per item: docset and symbol type.
> New search term highlighting instead of the bold font.
> Tabs can be cloned with Ctrl+Alt+T. (#524)
> Remote resources can be open within the application. (#474)
> Added support for system style icons (FreeDesktop) if available.
> A new tab can set to open after currently selected one.
> Dropped support for --query command line parameter. Plugins should have
> switched to dash-plugin URL scheme by now. Users can invoke search by running
> zeal .
> 
> Improvements:
> 
> A lot of search performance improvements!
> Implemented a short delay before starting a search to allow user to finish
> typing.
> Added tooltips for elided texts across the app (tabs, search results).
> Page Up/Page Down now work when search text box is focused.
> Splitters and tool bars do not override system styling.
> Splitters cannot be collapsed anymore.
> Updated symbol type icons and definitions.
> Main menu updated to be more browser-like.
> Show current page title in the window title.
> Better detection of another application instances.
> 
> Fixed Issues:
> 
> Fixed viewing of Android 7 docset. (#596)
> Fixed AppIndicator support with Cinnamon DE. (#487)
> Fixed many crashes in different situations.
> Ctrl+Shift+Tab now properly navigates through tabs backwards. (#518)
> Fixed filename corruption on Windows with non-Latin locale. (#508)
> Fixed docset list not updating on storage change. (#475)
> 
> Known Issues:
> 
> Under some circumstances Zeal crashes on exit or start. (#595 and #605 )
> Due to performance optimisations ordering of search results became less
> relevant. (#603)
> 
> ---
> 
> Feedback? OK's? :)

> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/zeal/Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile
> --- Makefile  25 Dec 2016 14:34:39 -  1.3
> +++ Makefile  1 Jan 2017 13:35:52 -
> @@ -4,8 +4,7 @@ COMMENT = simple offline API documentati
>  
>  GH_ACCOUNT = zealdocs
>  GH_PROJECT = zeal
> -GH_TAGNAME = v0.2.1
> -REVISION =   1
> +GH_TAGNAME = v0.3.1
>  
>  CATEGORIES = devel
>  
> @@ -16,13 +15,16 @@ MAINTAINER =  Adam Wolk   # GPLv3
>  PERMIT_PACKAGE_CDROM =   Yes
>  
> -WANTLIB += GL Qt5Core Qt5Gui Qt5Network Qt5Sql Qt5WebKit Qt5WebKitWidgets
> -WANTLIB += Qt5Widgets Qt5X11Extras X11 archive c m pthread xcb
> +WANTLIB += GL Qt5Concurrent Qt5Core Qt5Gui Qt5Network Qt5Sql Qt5WebKit
> +WANTLIB += Qt5WebKitWidgets Qt5Widgets Qt5X11Extras X11 archive c m pthread 
> xcb
>  WANTLIB += xcb-keysyms
>  
> +USE_WXNEEDED =   Yes
> +
>  MODULES =devel/qmake x11/qt5
>  RUN_DEPENDS =devel/desktop-file-utils x11/gtk+3,-guic
>  LIB_DEPENDS =archivers/libarchive \
> + x11/qt5/qtbase \
>   x11/qt5/qtwebkit \
>   x11/qt5/qtx11extras
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/zeal/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- distinfo  18 Apr 2016 15:01:43 -  1.1.1.1
> +++ distinfo  1 Jan 2017 13:35:52 -
> @@ -1,2 +1,2 @@
> -SHA256 (zeal-0.2.1.tar.gz) = mUxfrQecs0lS/AWwZjkgEYSJ7X8A+OWliH/y4r0Fhh0=
> -SIZE (zeal-0.2.1.tar.gz) = 914998
> +SHA256 (zeal-0.3.1.tar.gz) = VfhRGXeBhhLgCuh6T92qNGIQGJUxRpaQ8uOWG7TCwxg=
> +SIZE (zeal-0.3.1.tar.gz) = 920814


-- 
Antoine

[UPDATE] devel/zeal 0.2.1 => 0.3.1

[Adam Wolk]

Hi ports@

Attaching a bump to devel/zeal

port changes:
 - add x11/qt5/qt5base dependency to LIB_DEPENDS
 - add Qt5Concurrent to WANTLIB (from qtbase)
 - mark USE_WXNEEDED = Yes (uses qt webkit)

upstream changelog:
---
=
0.3.1
=

Fixed Issues:

Fixed random crashing on application start and exit. (#595)
Fixed web view hanging caused by URLs with no schema. (#532)
Fixed docset removal on Windows. (#621)
Fixed race condition (and warning) in docset removal logic.
Fixed docset selection with Select All shortcut (usually Ctrl+A).

=
0.3.0
=
This releases contains a lot of bug fixes, as well as improvements to the UI and
application performance. See the link above for the complete list of changes.
The most interesting changes are listed below.

New Features:

Dedicated docset management UI available via Tools -> Docsets (#354)
Added portable mode support. (#486)
Search results now have two icons per item: docset and symbol type.
New search term highlighting instead of the bold font.
Tabs can be cloned with Ctrl+Alt+T. (#524)
Remote resources can be open within the application. (#474)
Added support for system style icons (FreeDesktop) if available.
A new tab can set to open after currently selected one.
Dropped support for --query command line parameter. Plugins should have
switched to dash-plugin URL scheme by now. Users can invoke search by running
zeal .

Improvements:

A lot of search performance improvements!
Implemented a short delay before starting a search to allow user to finish
typing.
Added tooltips for elided texts across the app (tabs, search results).
Page Up/Page Down now work when search text box is focused.
Splitters and tool bars do not override system styling.
Splitters cannot be collapsed anymore.
Updated symbol type icons and definitions.
Main menu updated to be more browser-like.
Show current page title in the window title.
Better detection of another application instances.

Fixed Issues:

Fixed viewing of Android 7 docset. (#596)
Fixed AppIndicator support with Cinnamon DE. (#487)
Fixed many crashes in different situations.
Ctrl+Shift+Tab now properly navigates through tabs backwards. (#518)
Fixed filename corruption on Windows with non-Latin locale. (#508)
Fixed docset list not updating on storage change. (#475)

Known Issues:

Under some circumstances Zeal crashes on exit or start. (#595 and #605 )
Due to performance optimisations ordering of search results became less
relevant. (#603)

---

Feedback? OK's? :)
Index: Makefile
===
RCS file: /cvs/ports/devel/zeal/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile25 Dec 2016 14:34:39 -  1.3
+++ Makefile1 Jan 2017 13:35:52 -
@@ -4,8 +4,7 @@ COMMENT =   simple offline API documentati
 
 GH_ACCOUNT =   zealdocs
 GH_PROJECT =   zeal
-GH_TAGNAME =   v0.2.1
-REVISION = 1
+GH_TAGNAME =   v0.3.1
 
 CATEGORIES =   devel
 
@@ -16,13 +15,16 @@ MAINTAINER =Adam Wolk 

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/01/01 03:50:55

Modified files:
emulators/qemu : Makefile 

Log message:
Enable QEMU on arm.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/01/01 03:50:18

Modified files:
infrastructure/mk: arch-defines.mk 

Log message:
Add arm to LLVM_ARCHS.

from Brad

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/01/01 03:48:58

Modified files:
devel/llvm : Makefile 

Log message:
Unbreak on powerpc: don't build lld there.

from Brad (maintainer)

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2017/01/01 02:44:30

Modified files:
x11/qt4: Makefile 

Log message:
Unbreak on arm, use lang/gcc for atomic builtins.

May have drawbacks (stdc++/estdc++ mixed up).  ok espie@

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2017/01/01 02:40:42

Modified files:
x11/qt3/patches: patch-src_tools_qglobal_h 

Log message:
Unbreak on arm: disable a hack not needed with EABI.

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2017/01/01 02:32:12

Modified files:
x11/gnustep/libobjc2: Makefile 
Added files:
x11/gnustep/libobjc2/patches: patch-objc_msgSend_arm_S 

Log message:
Unbreak on arm, the use of ".fpu neon" doesn't seem warranted.

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2017/01/01 02:30:21

Modified files:
x11/gnustep/libobjc2/patches: patch-CMakeLists_txt 

Log message:
Regen patch

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2017/01/01 02:29:09

Modified files:
lang/spidermonkey: Makefile 
Added files:
lang/spidermonkey/patches: patch-nanojit_CodeAlloc_cpp 

Log message:
Unbreak on arm.  Use arm_sync_icache(2) instead of __clear_cache.

Re: Fix boehm-gc runtime on arm

[Jeremie Courreges-Anglas]

Jonathan Gray  writes:

> On Sat, Dec 31, 2016 at 01:55:22AM +0100, Jeremie Courreges-Anglas wrote:
>> 
>> (gdb) r
>> Starting program: /home/jca/a.out
>> (no debugging symbols found)
>> 
>> Program received signal SIGILL, Illegal instruction.
>> 0x55f9e880 in GC_stop_world () at arm.h:587
>> 587 arm.h: No such file or directory.
>> in arm.h
>> (gdb) bt
>> #0  0x55f9e880 in GC_stop_world () at arm.h:587
>> #1  0x55f87610 in GC_stopped_mark (stop_func=0x55f866a4 
>> ) at alloc.c:646
>> #2  0x55f87adc in GC_try_to_collect_inner (stop_func=Variable "stop_func" is 
>> not available.
>> ) at alloc.c:486
>> #3  0x55f96370 in GC_init () at misc.c:1282
>> #4  0x0ff5749c in main () from /home/jca/a.out
>> 
>> This is the cause of the w3m failure:
>> 
>> http://build-failures.rhaalovely.net//arm/2016-12-20/www/w3m,image.log
>> 
>> gc/libatomic_ops tries to use swp instead of ldrex, because our base gcc
>> defines __ARM_ARCH_5TE__ instead of something more recent.  But swp
>> doesn't work anymore on armv7 (I read that it can be enabled with
>> appropriate black magic).
>> 
>> Let's pretend that we don't define __ARM_ARCH_5TE__, which is enough to
>> convince gc to use ldrex.  With this, all tests pass.
>> 
>> ok?
>
> Does building with base gcc and "-march=armv6" like the kernel does work?
>
> That will then define __ARM_ARCH_6__.

This produced a working gc package.

The diff not needed anymore after Jonathan's commit to
gnu/gcc/gcc/config/arm/openbsd.h.

>> 
>> 
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/devel/boehm-gc/Makefile,v
>> retrieving revision 1.63
>> diff -u -p -r1.63 Makefile
>> --- Makefile 12 Nov 2016 10:33:04 -  1.63
>> +++ Makefile 31 Dec 2016 00:40:55 -
>> @@ -7,6 +7,7 @@ VERSION= 7.6.0
>>  LIBAO_VERSION=  7.4.4
>>  
>>  DISTNAME=   gc-${VERSION}
>> +REVISION=   0
>>  
>>  PKGNAME-atomic= libatomic_ops-${LIBAO_VERSION}
>>  PKGNAME-main=   boehm-gc-${VERSION}
>> Index: patches/patch-libatomic_ops_src_atomic_ops_sysdeps_gcc_arm_h
>> ===
>> RCS file: patches/patch-libatomic_ops_src_atomic_ops_sysdeps_gcc_arm_h
>> diff -N patches/patch-libatomic_ops_src_atomic_ops_sysdeps_gcc_arm_h
>> --- /dev/null1 Jan 1970 00:00:00 -
>> +++ patches/patch-libatomic_ops_src_atomic_ops_sysdeps_gcc_arm_h 31 Dec 
>> 2016 00:40:55 -
>> @@ -0,0 +1,19 @@
>> +$OpenBSD$
>> +
>> +gcc-4.2.1 says our armv7 port is __ARM_ARCH_5TE__ instead of
>> +__ARM_ARCH_7something__.  Fix test to use ldrex and friends instead of
>> +swp (deprecated).
>> +
>> +--- libatomic_ops/src/atomic_ops/sysdeps/gcc/arm.h.orig Sat Dec 31 
>> 01:02:18 2016
>>  libatomic_ops/src/atomic_ops/sysdeps/gcc/arm.h  Sat Dec 31 01:06:15 2016
>> +@@ -44,9 +44,7 @@
>> + #if !defined(__ARM_ARCH_2__) && !defined(__ARM_ARCH_3__) \
>> + && !defined(__ARM_ARCH_3M__) && !defined(__ARM_ARCH_4__) \
>> + && !defined(__ARM_ARCH_4T__) \
>> +-&& ((!defined(__ARM_ARCH_5__) && !defined(__ARM_ARCH_5E__) \
>> +- && !defined(__ARM_ARCH_5T__) && !defined(__ARM_ARCH_5TE__) \
>> +- && !defined(__ARM_ARCH_5TEJ__) && !defined(__ARM_ARCH_6M__)) \
>> ++&& (1 \
>> + || defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \
>> + || defined(__ARM_ARCH_8A__))
>> + # define AO_ARM_HAVE_LDREX
>> 
>> 
>> -- 
>> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE
>

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