[UPDATE] www/py-django

[Remi Pointel]

Hi,

there are the diff to update Django "LTS & stable" to latest releases.

Ok?

Cheers,

Remi.Index: Makefile
===
RCS file: /cvs/ports/www/py-django/lts/Makefile,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 Makefile
--- Makefile	22 Aug 2017 21:06:58 -	1.21
+++ Makefile	6 Sep 2017 07:36:23 -
@@ -4,7 +4,7 @@ PORTROACH =	limit:^1\.11
 
 COMMENT =	high-level Python web framework (LTS version)
 
-MODPY_EGG_VERSION =	1.11.4
+MODPY_EGG_VERSION =	1.11.5
 LNAME =			django-lts
 
 MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
Index: distinfo
===
RCS file: /cvs/ports/www/py-django/lts/distinfo,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 distinfo
--- distinfo	22 Aug 2017 21:06:58 -	1.17
+++ distinfo	6 Sep 2017 07:36:23 -
@@ -1,2 +1,2 @@
-SHA256 (Django-1.11.4.tar.gz) = q+huZ92piXoVNqcn7Vfb77WkK0GUO+OxFv4+2rTAe7I=
-SIZE (Django-1.11.4.tar.gz) = 7870752
+SHA256 (Django-1.11.5.tar.gz) = GDaHgWLf34ZUkrrP3/AyHk7o8efVHZMZJUYAC1SYKyk=
+SIZE (Django-1.11.5.tar.gz) = 7875054
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/py-django/lts/pkg/PLIST,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 PLIST
--- pkg/PLIST	22 Aug 2017 21:06:58 -	1.19
+++ pkg/PLIST	6 Sep 2017 07:36:24 -
@@ -6815,10 +6815,12 @@ share/doc/${MODPY_PY_PREFIX}-${LNAME}-${
 share/doc/${MODPY_PY_PREFIX}-${LNAME}-${MODPY_EGG_VERSION}/releases/1.10.5.txt
 share/doc/${MODPY_PY_PREFIX}-${LNAME}-${MODPY_EGG_VERSION}/releases/1.10.6.txt
 share/doc/${MODPY_PY_PREFIX}-${LNAME}-${MODPY_EGG_VERSION}/releases/1.10.7.txt
+share/doc/${MODPY_PY_PREFIX}-${LNAME}-${MODPY_EGG_VERSION}/releases/1.10.8.txt
 share/doc/${MODPY_PY_PREFIX}-${LNAME}-${MODPY_EGG_VERSION}/releases/1.10.txt
 share/doc/${MODPY_PY_PREFIX}-${LNAME}-${MODPY_EGG_VERSION}/releases/1.11.1.txt
 share/doc/${MODPY_PY_PREFIX}-${LNAME}-${MODPY_EGG_VERSION}/releases/1.11.2.txt
 share/doc/${MODPY_PY_PREFIX}-${LNAME}-${MODPY_EGG_VERSION}/releases/1.11.3.txt
+share/doc/${MODPY_PY_PREFIX}-${LNAME}-${MODPY_EGG_VERSION}/releases/1.11.4.txt
 share/doc/${MODPY_PY_PREFIX}-${LNAME}-${MODPY_EGG_VERSION}/releases/${MODPY_EGG_VERSION}.txt
 share/doc/${MODPY_PY_PREFIX}-${LNAME}-${MODPY_EGG_VERSION}/releases/1.11.txt
 share/doc/${MODPY_PY_PREFIX}-${LNAME}-${MODPY_EGG_VERSION}/releases/1.2.1.txt
Index: Makefile
===
RCS file: /cvs/ports/www/py-django/stable/Makefile,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 Makefile
--- Makefile	10 Apr 2017 19:10:33 -	1.18
+++ Makefile	6 Sep 2017 07:41:53 -
@@ -2,7 +2,7 @@
 
 COMMENT =	high-level Python web framework
 
-MODPY_EGG_VERSION =	1.10.7
+MODPY_EGG_VERSION =	1.10.8
 
 LNAME =			django
 
Index: distinfo
===
RCS file: /cvs/ports/www/py-django/stable/distinfo,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 distinfo
--- distinfo	10 Apr 2017 19:10:33 -	1.16
+++ distinfo	6 Sep 2017 07:41:53 -
@@ -1,2 +1,2 @@
-SHA256 (Django-1.10.7.tar.gz) = WT13nbwjUKJFxPdtJr3K1Yo5iV6HME/m1yW734S1sLg=
-SIZE (Django-1.10.7.tar.gz) = 7737654
+SHA256 (Django-1.10.8.tar.gz) = 1O+DvTJlc8AJcsuUKb6zltIQNBpjbkuBb8mz9QXEmLs=
+SIZE (Django-1.10.8.tar.gz) = 7739226
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/py-django/stable/pkg/PLIST,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 PLIST
--- pkg/PLIST	10 Apr 2017 19:10:33 -	1.16
+++ pkg/PLIST	6 Sep 2017 07:41:53 -
@@ -6702,6 +6702,7 @@ share/doc/${MODPY_PY_PREFIX}-${LNAME}-${
 share/doc/${MODPY_PY_PREFIX}-${LNAME}-${MODPY_EGG_VERSION}/releases/1.10.4.txt
 share/doc/${MODPY_PY_PREFIX}-${LNAME}-${MODPY_EGG_VERSION}/releases/1.10.5.txt
 share/doc/${MODPY_PY_PREFIX}-${LNAME}-${MODPY_EGG_VERSION}/releases/1.10.6.txt
+share/doc/${MODPY_PY_PREFIX}-${LNAME}-${MODPY_EGG_VERSION}/releases/1.10.7.txt
 share/doc/${MODPY_PY_PREFIX}-${LNAME}-${MODPY_EGG_VERSION}/releases/${MODPY_EGG_VERSION}.txt
 share/doc/${MODPY_PY_PREFIX}-${LNAME}-${MODPY_EGG_VERSION}/releases/1.10.txt
 share/doc/${MODPY_PY_PREFIX}-${LNAME}-${MODPY_EGG_VERSION}/releases/1.2.1.txt

Re: UPDATE: devel/intellij 2017.2.3

[Caspar Schutijser]

A new diff that updates devel/intellij to 2017.2.3. Tested on amd64.

Thanks,
Caspar Schutijser


Index: Makefile
===
RCS file: /cvs/ports/devel/intellij/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- Makefile16 Jun 2017 15:25:09 -  1.43
+++ Makefile6 Sep 2017 08:11:21 -
@@ -2,7 +2,7 @@
 
 COMMENT=   IntelliJ IDEA Java IDE
 
-V= 2017.1.4
+V= 2017.2.3
 DISTNAME=  ideaIC-${V}
 PKGNAME=   intellij-${V}
 CATEGORIES=devel
@@ -26,7 +26,7 @@ NO_TEST=  Yes
 
 SUBST_VARS+=   JAVA_HOME
 
-WRKDIST=   ${WRKDIR}/idea-IC-171.4694.23
+WRKDIST=   ${WRKDIR}/idea-IC-172.3968.16
 IJ=${PREFIX}/intellij
 
 # If NO_BUILD is set, JAVA_HOME doesn't get defined. So do
Index: distinfo
===
RCS file: /cvs/ports/devel/intellij/distinfo,v
retrieving revision 1.24
diff -u -p -r1.24 distinfo
--- distinfo16 Jun 2017 15:25:09 -  1.24
+++ distinfo6 Sep 2017 08:11:21 -
@@ -1,2 +1,2 @@
-SHA256 (ideaIC-2017.1.4.tar.gz) = heQiUNJ/tFzj1ZAzRdCwX2+RGeI1ZThpz4i2ZBK2M/A=
-SIZE (ideaIC-2017.1.4.tar.gz) = 429087526
+SHA256 (ideaIC-2017.2.3.tar.gz) = cnuhC1XJu6nSHhcDvYavgy0F8lJC79353TuZhB0j1xs=
+SIZE (ideaIC-2017.2.3.tar.gz) = 442982180
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/intellij/pkg/PLIST,v
retrieving revision 1.26
diff -u -p -r1.26 PLIST
--- pkg/PLIST   16 Jun 2017 15:25:09 -  1.26
+++ pkg/PLIST   6 Sep 2017 08:11:21 -
@@ -23,6 +23,8 @@ intellij/bin/restart.py
 intellij/build.txt
 intellij/idea.png
 intellij/lib/
+intellij/lib/aether-1.1.0-all.jar
+intellij/lib/aether-dependency-resolver.jar
 intellij/lib/annotations.jar
 intellij/lib/ant/
 intellij/lib/ant/INSTALL
@@ -93,11 +95,15 @@ intellij/lib/boot.jar
 intellij/lib/bootstrap.jar
 intellij/lib/cglib-nodep-3.2.4.jar
 intellij/lib/cli-parser-1.1.jar
+intellij/lib/common-image-3.2.1.jar
+intellij/lib/common-io-3.2.1.jar
+intellij/lib/common-lang-3.2.1.jar
 intellij/lib/commons-codec-1.9.jar
 intellij/lib/commons-compress-1.10.jar
 intellij/lib/commons-httpclient-3.1-patched.jar
 intellij/lib/commons-logging-1.2.jar
 intellij/lib/commons-net-3.3.jar
+intellij/lib/constraint-layout.jar
 intellij/lib/coverage-agent.jar
 intellij/lib/coverage-instrumenter.jar
 intellij/lib/coverage-util.jar
@@ -106,9 +112,10 @@ intellij/lib/extensions.jar
 intellij/lib/external-system-rt.jar
 intellij/lib/fluent-hc-4.5.2.jar
 intellij/lib/forms_rt.jar
+intellij/lib/google-analytics-library.jar
 intellij/lib/groovy-all-2.4.6.jar
 intellij/lib/gson-2.5.jar
-intellij/lib/guava-19.0.jar
+intellij/lib/guava-21.0.jar
 intellij/lib/hamcrest-core-1.3.jar
 intellij/lib/httpclient-4.5.2.jar
 intellij/lib/httpcore-4.4.5.jar
@@ -116,7 +123,11 @@ intellij/lib/httpmime-4.5.2.jar
 intellij/lib/icons.jar
 intellij/lib/idea.jar
 intellij/lib/idea_rt.jar
+intellij/lib/imageio-core-3.2.1.jar
+intellij/lib/imageio-metadata-3.2.1.jar
+intellij/lib/imageio-tiff-3.2.1.jar
 intellij/lib/imgscalr-lib-4.2.jar
+intellij/lib/ini4j-0.5.2-patched.jar
 intellij/lib/isorelax.jar
 intellij/lib/javac2.jar
 intellij/lib/jaxen-1.1.3.jar
@@ -140,6 +151,7 @@ intellij/lib/jps-model.jar
 intellij/lib/jsch-0.1.54.jar
 intellij/lib/jsch.agentproxy.connector-factory.jar
 intellij/lib/jsch.agentproxy.core.jar
+intellij/lib/jsch.agentproxy.jsch.jar
 intellij/lib/jsch.agentproxy.pageant.jar
 intellij/lib/jsch.agentproxy.sshagent.jar
 intellij/lib/jsch.agentproxy.usocket-jna.jar
@@ -157,19 +169,21 @@ intellij/lib/libpty/linux/x86/libpty.so
 intellij/lib/libpty/linux/x86_64/
 intellij/lib/libpty/linux/x86_64/libpty.so
 intellij/lib/log4j.jar
+intellij/lib/lz4-java-1.3.jar
 intellij/lib/markdownj-core-0.4.2-SNAPSHOT.jar
+intellij/lib/maven-aether-provider-3.3.9-all.jar
 intellij/lib/microba.jar
 intellij/lib/miglayout-core-5.0.jar
 intellij/lib/miglayout-swing-5.0.jar
 intellij/lib/nanoxml-2.2.3.jar
 intellij/lib/nekohtml-1.9.14.jar
-intellij/lib/netty-all-4.1.9.Final.jar
+intellij/lib/netty-all-4.1.10.Final.jar
 intellij/lib/openapi.jar
 intellij/lib/optimizedFileManager.jar
 intellij/lib/oromatcher.jar
 intellij/lib/picocontainer.jar
 intellij/lib/protobuf-2.5.0.jar
-intellij/lib/proxy-vole_20131209.jar
+intellij/lib/proxy-vole-1.0.3.jar
 intellij/lib/pty4j-0.7.1.jar
 intellij/lib/purejavacomm.jar
 intellij/lib/resolver.jar
@@ -178,22 +192,23 @@ intellij/lib/resources_en.jar
 intellij/lib/rngom-20051226-patched.jar
 intellij/lib/sanselan-0.98-snapshot.jar
 intellij/lib/serviceMessages.jar
-intellij/lib/sherpa-solver.jar
 intellij/lib/slf4j-api-1.7.10.jar
 intellij/lib/slf4j-log4j12-1.7.10.jar
 intellij/lib/snakeyaml-1.17.jar
 intellij/lib/snappy-in-java-0.5.1.jar
-intellij/lib/sqlite-jdbc-3.8.11.2.jar
+intellij/lib/sqlite-jdbc-3.16.1.jar
 

Re: ncmpcpp core dumps on amd64

[Marc Peters]

On Tue, Sep 05, 2017 at 08:34:53PM +0200, Ingo Schwarze wrote:
> To make sure that i did not break this, i just did that as well
> on amd64-current: i rebuilt ncmpcpp with all its dependencies,
> and i can no longer reproduce the crash.  So it should be good
> when the next complete package snapshot arrives on your mirror.

> (My system is still slightly Frankenstein'ed because i have various
> ports installed that were built against a libc with my xlocale patch
> but without guenther@'s pthread patch.  Those no longer work, but
> i no longer have anything of that kind in what affects ncmpcpp.)
> 
> Yours,
>   Ingo

Thanks a lot for the update and tests on this.

Cheers,
Marc

[update] audacious-3.9

[Timo Myyrä]

Hi,

Here's an update for the audacious port to bring it to latest version.
Lightly tested on amd64 and playback works in various formats.
Someone could try this on hppa/alpha to see if they are still broken.

Most notably features is the switching back to gtk2. The plan seems to be to
switch to Qt UI eventually and keep gtk2 running until Qt side matures.

Note that this requires update to the audacious-plugins port as well which is
coming soon in another mail.

Timo

Index: Makefile
===
RCS file: /cvs/ports/audio/audacious/Makefile,v
retrieving revision 1.55
diff -u -p -r1.55 Makefile
--- Makefile31 Dec 2016 04:12:09 -  1.55
+++ Makefile6 Sep 2017 10:06:35 -
@@ -3,14 +3,13 @@
 BROKEN-hppa =  no atomic ops / __sync_fetch_and_add_4
 BROKEN-alpha = tinylock.c:58: internal compiler error: in extract_insn, at 
recog.c:2077
 
-COMMENT =  Gtk+3 media player
+COMMENT =  graphical audio player which supports lots of formats
 
-DISTNAME = audacious-3.5.2
-REVISION = 0
+DISTNAME = audacious-3.9
 
-SHARED_LIBS += audcore 3.0 # 1.0
-SHARED_LIBS += audgui  3.0 # 1.0
-SHARED_LIBS += audtag  2.1 # 1.0
+SHARED_LIBS += audcore 4.0 # 5.0
+SHARED_LIBS += audgui  4.0 # 5.0
+SHARED_LIBS += audtag  3.0 # 3.0
 
 CATEGORIES =   audio multimedia
 
@@ -19,10 +18,11 @@ HOMEPAGE =  http://audacious-media-playe
 # BSD
 PERMIT_PACKAGE_CDROM =Yes
 
-WANTLIB += atk-1.0 c cairo cairo-gobject fontconfig freetype gdk-3
-WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
-WANTLIB += gtk-3 guess m pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += pthread z
+WANTLIB += ${COMPILER_LIBCXX} X11 Xcomposite Xcursor Xdamage Xext
+WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo fontconfig
+WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
+WANTLIB += gmodule-2.0 gobject-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 z
 
 MASTER_SITES = http://distfiles.audacious-media-player.org/
 
@@ -32,10 +32,8 @@ MODULES =devel/gettext gcc4
 # for atomic builtins
 MODGCC4_ARCHS =arm
 
-RUN_DEPENDS =  devel/desktop-file-utils \
-   x11/gtk+3,-guic
-LIB_DEPENDS =  devel/libguess>=1.2 \
-   x11/gtk+3
+RUN_DEPENDS =  devel/desktop-file-utils
+LIB_DEPENDS =  x11/gtk+2
 
 MAKE_ENV = LIBaudcore_VERSION=${LIBaudcore_VERSION} \
LIBaudgui_VERSION=${LIBaudgui_VERSION} \
Index: distinfo
===
RCS file: /cvs/ports/audio/audacious/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- distinfo3 Nov 2014 04:28:11 -   1.21
+++ distinfo6 Sep 2017 10:06:35 -
@@ -1,2 +1,2 @@
-SHA256 (audacious-3.5.2.tar.bz2) = ORW5aS74rLJYiw4mwnOOWeNnZs/oPn5SwOYBaI5sGVY=
-SIZE (audacious-3.5.2.tar.bz2) = 448436
+SHA256 (audacious-3.9.tar.bz2) = LYBEZzrHhtcbCABPGQu8o2gli/YOZgL/wNliKDXMsF4=
+SIZE (audacious-3.9.tar.bz2) = 599488
Index: patches/patch-src_libaudcore_Makefile
===
RCS file: /cvs/ports/audio/audacious/patches/patch-src_libaudcore_Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 patch-src_libaudcore_Makefile
--- patches/patch-src_libaudcore_Makefile   3 Nov 2014 04:28:11 -   
1.7
+++ patches/patch-src_libaudcore_Makefile   6 Sep 2017 10:06:35 -
@@ -1,9 +1,10 @@
 $OpenBSD: patch-src_libaudcore_Makefile,v 1.7 2014/11/03 04:28:11 bcallah Exp $
 src/libaudcore/Makefile.orig   Thu Oct 16 20:00:28 2014
-+++ src/libaudcore/MakefileSat Nov  1 19:11:40 2014
+Index: src/libaudcore/Makefile
+--- src/libaudcore/Makefile.orig
 src/libaudcore/Makefile
 @@ -1,4 +1,4 @@
 -SHARED_LIB = ${LIB_PREFIX}audcore${LIB_SUFFIX}
 +SHARED_LIB = ${LIB_PREFIX}audcore.so.${LIBaudcore_VERSION}
- LIB_MAJOR = 2
+ LIB_MAJOR = 5
  LIB_MINOR = 0
  
Index: patches/patch-src_libaudgui_Makefile
===
RCS file: /cvs/ports/audio/audacious/patches/patch-src_libaudgui_Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_libaudgui_Makefile
--- patches/patch-src_libaudgui_Makefile3 Nov 2014 04:28:11 -   
1.4
+++ patches/patch-src_libaudgui_Makefile6 Sep 2017 10:06:35 -
@@ -1,9 +1,10 @@
 $OpenBSD: patch-src_libaudgui_Makefile,v 1.4 2014/11/03 04:28:11 bcallah Exp $
 src/libaudgui/Makefile.origThu Oct 16 20:00:28 2014
-+++ src/libaudgui/Makefile Sat Nov  1 19:11:40 2014
+Index: src/libaudgui/Makefile
+--- src/libaudgui/Makefile.orig
 src/libaudgui/Makefile
 @@ -1,4 +1,4 @@
 -SHARED_LIB = ${LIB_PREFIX}audgui${LIB_SUFFIX}
 +SHARED_LIB = 

devel/ectags broken

[Ingo Schwarze]

Hi,

similar to devel/universal-ctags, the parent project devel/ectags
is broken for the same reasons, also analyzed by guenther@.
Also, lots of people keep reporting it to me in private, so i'm
posting here.

Here is a minimal patch letting it build again; not tested at
run-time.  Note that this is a band-aid; a proper fix would require
changing all instances of __unused__ and __printf__ in all *.c files
to something like "ectags_unused", or even better just rely on the
standard __attribute__ names throughout and not define anything in
the first place.  But i'm not sure whether upstream still exists.

Should this be committed?

This overrides my previous patch sent to the MAINTAINER in private,
incorporating stylistic feedback from naddy@.

Yours,
  Ingo


Index: patches/patch-eiffel_c
===
RCS file: patches/patch-eiffel_c
diff -N patches/patch-eiffel_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-eiffel_c  6 Sep 2017 11:23:43 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+stop stomping on implementation namespace
+
+Index: eiffel.c
+--- eiffel.c.orig
 eiffel.c
+@@ -34,6 +34,8 @@
+ #include "read.h"
+ #endif
+ 
++#define __unused__ __unused
++
+ /*
+ *   MACROS
+ */
Index: patches/patch-general_h
===
RCS file: patches/patch-general_h
diff -N patches/patch-general_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-general_h 6 Sep 2017 11:23:43 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+stop stomping on implementation namespace
+
+Index: general.h
+--- general.h.orig
 general.h
+@@ -57,7 +57,9 @@
+  *  to prevent warnings about unused variables.
+  */
+ #if (__GNUC__ > 2  ||  (__GNUC__ == 2  &&  __GNUC_MINOR__ >= 7)) && !defined 
(__GNUG__)
++#if 0
+ # define __unused__  __attribute__((unused))
++#endif
+ # define __printf__(s,f)  __attribute__((format (printf, s, f)))
+ #else
+ # define __unused__
Index: patches/patch-lregex_c
===
RCS file: patches/patch-lregex_c
diff -N patches/patch-lregex_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-lregex_c  6 Sep 2017 11:23:43 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+stop stomping on implementation namespace
+
+Index: lregex.c
+--- lregex.c.orig
 lregex.c
+@@ -35,6 +35,8 @@
+ #include "read.h"
+ #include "routines.h"
+ 
++#define __unused__ __unused
++
+ #ifdef HAVE_REGEX
+ 
+ /*
Index: patches/patch-lua_c
===
RCS file: patches/patch-lua_c
diff -N patches/patch-lua_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-lua_c 6 Sep 2017 11:23:43 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+stop stomping on implementation namespace
+
+Index: lua.c
+--- lua.c.orig
 lua.c
+@@ -21,6 +21,8 @@
+ #include "read.h"
+ #include "vstring.h"
+ 
++#define __unused__ __unused
++
+ /*
+ *   DATA DEFINITIONS
+ */
Index: patches/patch-main_c
===
RCS file: patches/patch-main_c
diff -N patches/patch-main_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-main_c6 Sep 2017 11:23:43 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+stop stomping on implementation namespace
+
+Index: main.c
+--- main.c.orig
 main.c
+@@ -83,6 +83,8 @@
+ #include "read.h"
+ #include "routines.h"
+ 
++#define __unused__ __unused
++
+ /*
+ *   MACROS
+ */
Index: patches/patch-options_c
===
RCS file: patches/patch-options_c
diff -N patches/patch-options_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-options_c 6 Sep 2017 11:23:43 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+stop stomping on implementation namespace
+
+Index: options.c
+--- options.c.orig
 options.c
+@@ -27,6 +27,8 @@
+ #include "parse.h"
+ #include "routines.h"
+ 
++#define __unused__ __unused
++
+ /*
+ *   MACROS
+ */
Index: patches/patch-parse_c
===
RCS file: patches/patch-parse_c
diff -N patches/patch-parse_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-parse_c   6 Sep 2017 11:23:43 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+stop stomping on implementation namespace
+
+Index: parse.c
+--- parse.c.orig
 parse.c
+@@ -27,6 +27,8 @@
+ #include "routines.h"
+ #include "vstring.h"
+ 
++#define __unused__ __unused
++
+ /*
+ *   DATA DEFINITIONS
+ */
Index: patches/patch-python_c
===
RCS file: patches/patch-python_c
diff -N patches/patch-python_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-python_c  6 Sep 2017 11:23:43 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+stop stomping on implementation namespace
+
+Index: python.c
+--- python.c.orig
 python.c
+@@ -24,6 +24,8 @@
+ #include "routines.h"
+ #include "debug.h"
+ 
++#define __unused__ 

[update] audacious-plugins-3.9

[Timo Myyrä]

Hi,

Here's update to bring audacious-plugins to latest version. Requires update to
audacious port itself I sent earlier.

The diff is a bit off, I couldn't restore updated patch-configure so here's the
updated patch-configure file inline:

$OpenBSD$

Set AUDACIOUS_{CFLAGS,LIBS} only after the end of all plugin checks.
This fixes some of the autoconf checks as the LIBS variable is being
polluted very early on, breaking most of the checks using AC_CHECK_LIB.

Index: configure
--- configure.orig
+++ configure
@@ -9675,8 +9675,6 @@ $as_echo "yes" >&6; }
 
 fi
 
-CPPFLAGS="$CPPFLAGS $AUDACIOUS_CFLAGS"
-LIBS="$LIBS $AUDACIOUS_LIBS"
 
 
 if test $HAVE_DARWIN = yes ; then
@@ -14657,6 +14655,8 @@ as_fn_error ()
   as_fn_exit $as_status
 } # as_fn_error
 
+CPPFLAGS="$CPPFLAGS $AUDACIOUS_CFLAGS"
+LIBS="$LIBS $AUDACIOUS_LIBS"
 
 # as_fn_set_status STATUS
 # ---


And here's the rest of the diff without the above bits.

Timo

Index: Makefile
===
RCS file: /cvs/ports/audio/audacious-plugins/Makefile,v
retrieving revision 1.71
diff -u -p -r1.71 Makefile
--- Makefile26 Jul 2017 22:45:14 -  1.71
+++ Makefile6 Sep 2017 10:26:10 -
@@ -2,8 +2,7 @@
 
 COMMENT =  input and output plugins for Audacious
 
-V =3.5.2
-REVISION = 3
+V =3.9
 
 DISTNAME = audacious-plugins-$V
 CATEGORIES =   audio multimedia
@@ -13,14 +12,15 @@ HOMEPAGE =  http://audacious-media-playe
 # BSD / GPL
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB += FLAC GL X11 Xcomposite Xrender atk-1.0 audgui audtag
-WANTLIB += avcodec avformat avutil c cairo cairo-gobject cddb
-WANTLIB += cdio cdio_cdda cue curl dbus-1 dbus-glib-1 faad fontconfig
-WANTLIB += freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
-WANTLIB += gobject-2.0 gtk-3 m mms modplug mp3lame mpg123 neon
-WANTLIB += notify ogg pango-1.0 pangocairo-1.0 pangoft2-1.0 pthread
-WANTLIB += samplerate sndfile sndio soxr ${COMPILER_LIBCXX} vorbis vorbisenc
-WANTLIB += vorbisfile wavpack xml2 z
+WANTLIB += ${COMPILER_LIBCXX} FLAC GL X11 Xcomposite Xcursor Xdamage
+WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 audgui
+WANTLIB += audtag avcodec avformat avutil c cairo cddb cdio cdio_cdda
+WANTLIB += cue curl dbus-1 dbus-glib-1 faad fontconfig freetype
+WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
+WANTLIB += gobject-2.0 gtk-x11-2.0 m mms modplug mp3lame mpg123
+WANTLIB += neon notify ogg pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += samplerate sndfile sndio soxr vorbis vorbisenc vorbisfile
+WANTLIB += wavpack xml2 z
 
 MASTER_SITES = http://distfiles.audacious-media-player.org/
 
@@ -52,7 +52,7 @@ LIB_DEPENDS = audio/faad>=2.7 \
net/curl \
net/neon \
textproc/libxml \
-   x11/gtk+3 \
+   x11/gtk+2 \
x11/dbus-glib
 
 USE_GMAKE =Yes
Index: distinfo
===
RCS file: /cvs/ports/audio/audacious-plugins/distinfo,v
retrieving revision 1.22
diff -u -p -r1.22 distinfo
--- distinfo3 Nov 2014 04:29:05 -   1.22
+++ distinfo6 Sep 2017 10:26:10 -
@@ -1,2 +1,2 @@
-SHA256 (audacious-plugins-3.5.2.tar.bz2) = 
F5YA1/iuMafZxXhc5vp+CRhNvRJx4K24xXdgQyxqTNk=
-SIZE (audacious-plugins-3.5.2.tar.bz2) = 1734588
+SHA256 (audacious-plugins-3.9.tar.bz2) = 
i/fyEInLNAaWjMnHEwd3Su5xAOxGB/KPY89WkNXJJ7g=
+SIZE (audacious-plugins-3.9.tar.bz2) = 1843084
Index: patches/patch-src_psf_psx_hw_c
===
RCS file: patches/patch-src_psf_psx_hw_c
diff -N patches/patch-src_psf_psx_hw_c
--- patches/patch-src_psf_psx_hw_c  9 Dec 2014 20:29:03 -   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_psf_psx_hw_c,v 1.1 2014/12/09 20:29:03 sthen Exp $
 src/psf/psx_hw.c.orig  Tue Dec  9 20:10:57 2014
-+++ src/psf/psx_hw.c   Tue Dec  9 20:11:17 2014
-@@ -1547,7 +1547,7 @@ void psx_bios_hle(uint32_t pc)
-   #if DEBUG_HLE_BIOS
-   printf("HLEBIOS: srand(%x)\n", a0);
-   #endif
--  srand(a0);
-+  srand_deterministic(a0);
-   break;
- 
-   case 0x33:  // malloc
Index: patches/patch-src_psf_psx_hw_cc
===
RCS file: patches/patch-src_psf_psx_hw_cc
diff -N patches/patch-src_psf_psx_hw_cc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_psf_psx_hw_cc 6 Sep 2017 10:26:10 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+change some srand to srand_deterministic, found by deraadt@

sysutils/sleuthkit: why CONFIGURE_STYLE=simple?

[Stuart Henderson]

I just ran into this...

===>  Configuring for sleuthkit-4.3.0p0
checking for a BSD-compatible install... 
/usr/obj/ports/sleuthkit-4.3.0/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /usr/local/bin/gmkdir -p
[..snip..]
Making install in auto
 /usr/local/bin/gmkdir -p 
'/usr/obj/ports/sleuthkit-4.3.0/fake-i386/usr/local/lib'
/bin/sh: /usr/local/bin/gmkdir: not found

...which shows that it's not using CONFIGURE_STYLE=gnu.

Is there a reason why?

Re: devel/ectags broken

[Jeremie Courreges-Anglas]

On Wed, Sep 06 2017, Ingo Schwarze  wrote:
> Hi,
>
> similar to devel/universal-ctags, the parent project devel/ectags
> is broken for the same reasons, also analyzed by guenther@.
> Also, lots of people keep reporting it to me in private, so i'm
> posting here.
>
> Here is a minimal patch letting it build again; not tested at
> run-time.  Note that this is a band-aid; a proper fix would require
> changing all instances of __unused__ and __printf__ in all *.c files
> to something like "ectags_unused", or even better just rely on the
> standard __attribute__ names throughout and not define anything in
> the first place.  But i'm not sure whether upstream still exists.
>
> Should this be committed?
>
> This overrides my previous patch sent to the MAINTAINER in private,
> incorporating stylistic feedback from naddy@.

I was cooking up a mail for Alexandr and Rafael but got interrupted.
Here's the diff I wanted to send.  Not a proper fix for upstream either,
but at least this is more compact than multiple patches.  And I'm not
sure it's a good idea to use stuff like __unused in the ports tree.

ok?


Index: devel/ectags/Makefile
===
RCS file: /d/cvs/ports/devel/ectags/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- devel/ectags/Makefile   29 Dec 2016 14:48:51 -  1.20
+++ devel/ectags/Makefile   6 Sep 2017 11:00:07 -
@@ -20,6 +20,10 @@ CONFIGURE_STYLE=gnu
 
 DOCS=  FAQ NEWS README EXTENDING.html
 
+post-extract:
+   find ${WRKSRC} -type f -name '*.[ch]' -exec sed -i \
+   's/__unused__/ect_unused/g; s/__printf__/ect_printf/g' {} +
+
 do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/ctags ${PREFIX}/bin/ectags
${INSTALL_MAN} ${WRKSRC}/ctags.1 ${PREFIX}/man/man1/ectags.1
Index: devel/universal-ctags/Makefile
===
RCS file: /d/cvs/ports/devel/universal-ctags/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- devel/universal-ctags/Makefile  12 Apr 2017 20:00:30 -  1.1.1.1
+++ devel/universal-ctags/Makefile  6 Sep 2017 10:55:33 -
@@ -51,6 +51,10 @@ LIB_DEPENDS+=converters/libiconv
 WANTLIB+=  iconv
 .endif
 
+post-extract:
+   find ${WRKSRC} -type f -name '*.[ch]' -exec sed -i \
+   's/__unused__/uct_unused/g; s/__printf__/uct_printf/g' {} +
+
 pre-configure:
cd ${WRKSRC} && ${SETENV} AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
AUTOCONF_VERSION=${AUTOCONF_VERSION} ./autogen.sh


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

Re: [update] audacious-3.9

[Antoine Jacoutot]

On Wed, Sep 06, 2017 at 01:21:58PM +0300, Timo Myyrä wrote:
> Hi,
> 
> Here's an update for the audacious port to bring it to latest version.
> Lightly tested on amd64 and playback works in various formats.
> Someone could try this on hppa/alpha to see if they are still broken.
> 
> Most notably features is the switching back to gtk2. The plan seems to be to
> switch to Qt UI eventually and keep gtk2 running until Qt side matures.
> 
> Note that this requires update to the audacious-plugins port as well which is
> coming soon in another mail.
> 
> Timo
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/audacious/Makefile,v
> retrieving revision 1.55
> diff -u -p -r1.55 Makefile
> --- Makefile  31 Dec 2016 04:12:09 -  1.55
> +++ Makefile  6 Sep 2017 10:06:35 -
> @@ -3,14 +3,13 @@
>  BROKEN-hppa =no atomic ops / __sync_fetch_and_add_4
>  BROKEN-alpha =   tinylock.c:58: internal compiler error: in 
> extract_insn, at recog.c:2077
>  
> -COMMENT =Gtk+3 media player
> +COMMENT =graphical audio player which supports lots of formats
>  
> -DISTNAME =   audacious-3.5.2
> -REVISION =   0
> +DISTNAME =   audacious-3.9
>  
> -SHARED_LIBS +=   audcore 3.0 # 1.0
> -SHARED_LIBS +=   audgui  3.0 # 1.0
> -SHARED_LIBS +=   audtag  2.1 # 1.0
> +SHARED_LIBS +=   audcore 4.0 # 5.0
> +SHARED_LIBS +=   audgui  4.0 # 5.0
> +SHARED_LIBS +=   audtag  3.0 # 3.0
>  
>  CATEGORIES = audio multimedia
>  
> @@ -19,10 +18,11 @@ HOMEPAGE =http://audacious-media-playe
>  # BSD
>  PERMIT_PACKAGE_CDROM =Yes
>  
> -WANTLIB += atk-1.0 c cairo cairo-gobject fontconfig freetype gdk-3
> -WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
> -WANTLIB += gtk-3 guess m pango-1.0 pangocairo-1.0 pangoft2-1.0
> -WANTLIB += pthread z
> +WANTLIB += ${COMPILER_LIBCXX} X11 Xcomposite Xcursor Xdamage Xext
> +WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo fontconfig
> +WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
> +WANTLIB += gmodule-2.0 gobject-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0
> +WANTLIB += pangoft2-1.0 z
>  
>  MASTER_SITES =   http://distfiles.audacious-media-player.org/
>  
> @@ -32,10 +32,8 @@ MODULES =  devel/gettext gcc4
>  # for atomic builtins
>  MODGCC4_ARCHS =  arm
>  
> -RUN_DEPENDS =devel/desktop-file-utils \
> - x11/gtk+3,-guic

RUN_DEPENDS should not be modified.


> -LIB_DEPENDS =devel/libguess>=1.2 \
> - x11/gtk+3
> +RUN_DEPENDS =devel/desktop-file-utils
> +LIB_DEPENDS =x11/gtk+2
>  
>  MAKE_ENV =   LIBaudcore_VERSION=${LIBaudcore_VERSION} \
>   LIBaudgui_VERSION=${LIBaudgui_VERSION} \
> Index: distinfo
> ===
> RCS file: /cvs/ports/audio/audacious/distinfo,v
> retrieving revision 1.21
> diff -u -p -r1.21 distinfo
> --- distinfo  3 Nov 2014 04:28:11 -   1.21
> +++ distinfo  6 Sep 2017 10:06:35 -
> @@ -1,2 +1,2 @@
> -SHA256 (audacious-3.5.2.tar.bz2) = 
> ORW5aS74rLJYiw4mwnOOWeNnZs/oPn5SwOYBaI5sGVY=
> -SIZE (audacious-3.5.2.tar.bz2) = 448436
> +SHA256 (audacious-3.9.tar.bz2) = LYBEZzrHhtcbCABPGQu8o2gli/YOZgL/wNliKDXMsF4=
> +SIZE (audacious-3.9.tar.bz2) = 599488
> Index: patches/patch-src_libaudcore_Makefile
> ===
> RCS file: /cvs/ports/audio/audacious/patches/patch-src_libaudcore_Makefile,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-src_libaudcore_Makefile
> --- patches/patch-src_libaudcore_Makefile 3 Nov 2014 04:28:11 -   
> 1.7
> +++ patches/patch-src_libaudcore_Makefile 6 Sep 2017 10:06:35 -
> @@ -1,9 +1,10 @@
>  $OpenBSD: patch-src_libaudcore_Makefile,v 1.7 2014/11/03 04:28:11 bcallah 
> Exp $
>  src/libaudcore/Makefile.orig Thu Oct 16 20:00:28 2014
> -+++ src/libaudcore/Makefile  Sat Nov  1 19:11:40 2014
> +Index: src/libaudcore/Makefile
> +--- src/libaudcore/Makefile.orig
>  src/libaudcore/Makefile
>  @@ -1,4 +1,4 @@
>  -SHARED_LIB = ${LIB_PREFIX}audcore${LIB_SUFFIX}
>  +SHARED_LIB = ${LIB_PREFIX}audcore.so.${LIBaudcore_VERSION}
> - LIB_MAJOR = 2
> + LIB_MAJOR = 5
>   LIB_MINOR = 0
>   
> Index: patches/patch-src_libaudgui_Makefile
> ===
> RCS file: /cvs/ports/audio/audacious/patches/patch-src_libaudgui_Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-src_libaudgui_Makefile
> --- patches/patch-src_libaudgui_Makefile  3 Nov 2014 04:28:11 -   
> 1.4
> +++ patches/patch-src_libaudgui_Makefile  6 Sep 2017 10:06:35 -
> @@ -1,9 +1,10 @@
>  $OpenBSD: 

Re: [update] audacious-3.9

[Antoine Jacoutot]

On Wed, Sep 06, 2017 at 02:33:25PM +0300, Timo Myyrä wrote:
> Antoine Jacoutot  writes:
> 
> > On Wed, Sep 06, 2017 at 01:21:58PM +0300, Timo Myyrä wrote:
> >
> >> Hi,
> >> 
> >> Here's an update for the audacious port to bring it to latest version.
> >> Lightly tested on amd64 and playback works in various formats.
> >> Someone could try this on hppa/alpha to see if they are still broken.
> >> 
> >> Most notably features is the switching back to gtk2. The plan seems to be 
> >> to
> >> switch to Qt UI eventually and keep gtk2 running until Qt side matures.
> >> 
> >> Note that this requires update to the audacious-plugins port as well which 
> >> is
> >> coming soon in another mail.
> >> 
> >> Timo
> >> 
> >> Index: Makefile
> >> ===
> >> RCS file: /cvs/ports/audio/audacious/Makefile,v
> >> retrieving revision 1.55
> >> diff -u -p -r1.55 Makefile
> >> --- Makefile   31 Dec 2016 04:12:09 -  1.55
> >> +++ Makefile   6 Sep 2017 10:06:35 -
> >> @@ -3,14 +3,13 @@
> >>  BROKEN-hppa = no atomic ops / __sync_fetch_and_add_4
> >>  BROKEN-alpha =tinylock.c:58: internal compiler error: in 
> >> extract_insn, at recog.c:2077
> >>  
> >> -COMMENT = Gtk+3 media player
> >> +COMMENT = graphical audio player which supports lots of formats
> >>  
> >> -DISTNAME =audacious-3.5.2
> >> -REVISION =0
> >> +DISTNAME =audacious-3.9
> >>  
> >> -SHARED_LIBS +=audcore 3.0 # 1.0
> >> -SHARED_LIBS +=audgui  3.0 # 1.0
> >> -SHARED_LIBS +=audtag  2.1 # 1.0
> >> +SHARED_LIBS +=audcore 4.0 # 5.0
> >> +SHARED_LIBS +=audgui  4.0 # 5.0
> >> +SHARED_LIBS +=audtag  3.0 # 3.0
> >>  
> >>  CATEGORIES =  audio multimedia
> >>  
> >> @@ -19,10 +18,11 @@ HOMEPAGE = http://audacious-media-playe
> >>  # BSD
> >>  PERMIT_PACKAGE_CDROM =Yes
> >>  
> >> -WANTLIB += atk-1.0 c cairo cairo-gobject fontconfig freetype gdk-3
> >> -WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
> >> -WANTLIB += gtk-3 guess m pango-1.0 pangocairo-1.0 pangoft2-1.0
> >> -WANTLIB += pthread z
> >> +WANTLIB += ${COMPILER_LIBCXX} X11 Xcomposite Xcursor Xdamage Xext
> >> +WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo fontconfig
> >> +WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
> >> +WANTLIB += gmodule-2.0 gobject-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0
> >> +WANTLIB += pangoft2-1.0 z
> >>  
> >>  MASTER_SITES =http://distfiles.audacious-media-player.org/
> >>  
> >> @@ -32,10 +32,8 @@ MODULES =   devel/gettext gcc4
> >>  # for atomic builtins
> >>  MODGCC4_ARCHS =   arm
> >>  
> >> -RUN_DEPENDS = devel/desktop-file-utils \
> >> -  x11/gtk+3,-guic
> >
> > RUN_DEPENDS should not be modified.
> >
> >
> 
> Should x11/gtk+3,guic be needed with gtk2 ports?

Yes.

> I assumed its only gtk3-only stuff so no longer needed.

It's needed to regen the icon cache.
$ cd /usr/ports/x11/gtk+3 && make show=PKGNAME-guic
gtk-update-icon-cache-3.22.19

Look at your PLIST.

> 
> >> -LIB_DEPENDS = devel/libguess>=1.2 \
> >> -  x11/gtk+3
> >> +RUN_DEPENDS = devel/desktop-file-utils
> >> +LIB_DEPENDS = x11/gtk+2
> >>  
> >>  MAKE_ENV =LIBaudcore_VERSION=${LIBaudcore_VERSION} \
> >>LIBaudgui_VERSION=${LIBaudgui_VERSION} \
> >> Index: distinfo
> >> ===
> >> RCS file: /cvs/ports/audio/audacious/distinfo,v
> >> retrieving revision 1.21
> >> diff -u -p -r1.21 distinfo
> >> --- distinfo   3 Nov 2014 04:28:11 -   1.21
> >> +++ distinfo   6 Sep 2017 10:06:35 -
> >> @@ -1,2 +1,2 @@
> >> -SHA256 (audacious-3.5.2.tar.bz2) = 
> >> ORW5aS74rLJYiw4mwnOOWeNnZs/oPn5SwOYBaI5sGVY=
> >> -SIZE (audacious-3.5.2.tar.bz2) = 448436
> >> +SHA256 (audacious-3.9.tar.bz2) = 
> >> LYBEZzrHhtcbCABPGQu8o2gli/YOZgL/wNliKDXMsF4=
> >> +SIZE (audacious-3.9.tar.bz2) = 599488
> >> Index: patches/patch-src_libaudcore_Makefile
> >> ===
> >> RCS file: 
> >> /cvs/ports/audio/audacious/patches/patch-src_libaudcore_Makefile,v
> >> retrieving revision 1.7
> >> diff -u -p -r1.7 patch-src_libaudcore_Makefile
> >> --- patches/patch-src_libaudcore_Makefile  3 Nov 2014 04:28:11 -   
> >> 1.7
> >> +++ patches/patch-src_libaudcore_Makefile  6 Sep 2017 10:06:35 -
> >> @@ -1,9 +1,10 @@
> >>  $OpenBSD: patch-src_libaudcore_Makefile,v 1.7 2014/11/03 04:28:11 bcallah 
> >> Exp $
> >>  src/libaudcore/Makefile.orig  Thu Oct 16 20:00:28 2014
> >> -+++ src/libaudcore/Makefile   Sat Nov  1 19:11:40 2014
> >> +Index: src/libaudcore/Makefile
> >> 

Re: [update] audacious-3.9

[Timo Myyrä]

Antoine Jacoutot  writes:

> On Wed, Sep 06, 2017 at 02:33:25PM +0300, Timo Myyrä wrote:
>
>> Antoine Jacoutot  writes:
>> 
>> > On Wed, Sep 06, 2017 at 01:21:58PM +0300, Timo Myyrä wrote:
>> >
>> >> Hi,
>> >> 
>> >> Here's an update for the audacious port to bring it to latest version.
>> >> Lightly tested on amd64 and playback works in various formats.
>> >> Someone could try this on hppa/alpha to see if they are still broken.
>> >> 
>> >> Most notably features is the switching back to gtk2. The plan seems to be 
>> >> to
>> >> switch to Qt UI eventually and keep gtk2 running until Qt side matures.
>> >> 
>> >> Note that this requires update to the audacious-plugins port as well 
>> >> which is
>> >> coming soon in another mail.
>> >> 
>> >> Timo
>> >> 
>> >> Index: Makefile
>> >> ===
>> >> RCS file: /cvs/ports/audio/audacious/Makefile,v
>> >> retrieving revision 1.55
>> >> diff -u -p -r1.55 Makefile
>> >> --- Makefile  31 Dec 2016 04:12:09 -  1.55
>> >> +++ Makefile  6 Sep 2017 10:06:35 -
>> >> @@ -3,14 +3,13 @@
>> >>  BROKEN-hppa =no atomic ops / __sync_fetch_and_add_4
>> >>  BROKEN-alpha =   tinylock.c:58: internal compiler error: in 
>> >> extract_insn, at recog.c:2077
>> >>  
>> >> -COMMENT =Gtk+3 media player
>> >> +COMMENT =graphical audio player which supports lots of 
>> >> formats
>> >>  
>> >> -DISTNAME =   audacious-3.5.2
>> >> -REVISION =   0
>> >> +DISTNAME =   audacious-3.9
>> >>  
>> >> -SHARED_LIBS +=   audcore 3.0 # 1.0
>> >> -SHARED_LIBS +=   audgui  3.0 # 1.0
>> >> -SHARED_LIBS +=   audtag  2.1 # 1.0
>> >> +SHARED_LIBS +=   audcore 4.0 # 5.0
>> >> +SHARED_LIBS +=   audgui  4.0 # 5.0
>> >> +SHARED_LIBS +=   audtag  3.0 # 3.0
>> >>  
>> >>  CATEGORIES = audio multimedia
>> >>  
>> >> @@ -19,10 +18,11 @@ HOMEPAGE =http://audacious-media-playe
>> >>  # BSD
>> >>  PERMIT_PACKAGE_CDROM =Yes
>> >>  
>> >> -WANTLIB += atk-1.0 c cairo cairo-gobject fontconfig freetype gdk-3
>> >> -WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
>> >> -WANTLIB += gtk-3 guess m pango-1.0 pangocairo-1.0 pangoft2-1.0
>> >> -WANTLIB += pthread z
>> >> +WANTLIB += ${COMPILER_LIBCXX} X11 Xcomposite Xcursor Xdamage Xext
>> >> +WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo fontconfig
>> >> +WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
>> >> +WANTLIB += gmodule-2.0 gobject-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0
>> >> +WANTLIB += pangoft2-1.0 z
>> >>  
>> >>  MASTER_SITES =   http://distfiles.audacious-media-player.org/
>> >>  
>> >> @@ -32,10 +32,8 @@ MODULES =  devel/gettext gcc4
>> >>  # for atomic builtins
>> >>  MODGCC4_ARCHS =  arm
>> >>  
>> >> -RUN_DEPENDS =devel/desktop-file-utils \
>> >> - x11/gtk+3,-guic
>> >
>> > RUN_DEPENDS should not be modified.
>> >
>> >
>> 
>> Should x11/gtk+3,guic be needed with gtk2 ports?
>
> Yes.
>
>> I assumed its only gtk3-only stuff so no longer needed.
>
> It's needed to regen the icon cache.
> $ cd /usr/ports/x11/gtk+3 && make show=PKGNAME-guic
> gtk-update-icon-cache-3.22.19
>
> Look at your PLIST.
>

Ok, got it. Here's updated diff which restores the package back.


>> 
>> >> -LIB_DEPENDS =devel/libguess>=1.2 \
>> >> - x11/gtk+3
>> >> +RUN_DEPENDS =devel/desktop-file-utils
>> >> +LIB_DEPENDS =x11/gtk+2
>> >>  
>> >>  MAKE_ENV =   LIBaudcore_VERSION=${LIBaudcore_VERSION} \
>> >>   LIBaudgui_VERSION=${LIBaudgui_VERSION} \
>> >> Index: distinfo
>> >> ===
>> >> RCS file: /cvs/ports/audio/audacious/distinfo,v
>> >> retrieving revision 1.21
>> >> diff -u -p -r1.21 distinfo
>> >> --- distinfo  3 Nov 2014 04:28:11 -   1.21
>> >> +++ distinfo  6 Sep 2017 10:06:35 -
>> >> @@ -1,2 +1,2 @@
>> >> -SHA256 (audacious-3.5.2.tar.bz2) = 
>> >> ORW5aS74rLJYiw4mwnOOWeNnZs/oPn5SwOYBaI5sGVY=
>> >> -SIZE (audacious-3.5.2.tar.bz2) = 448436
>> >> +SHA256 (audacious-3.9.tar.bz2) = 
>> >> LYBEZzrHhtcbCABPGQu8o2gli/YOZgL/wNliKDXMsF4=
>> >> +SIZE (audacious-3.9.tar.bz2) = 599488
>> >> Index: patches/patch-src_libaudcore_Makefile
>> >> ===
>> >> RCS file: 
>> >> /cvs/ports/audio/audacious/patches/patch-src_libaudcore_Makefile,v
>> >> retrieving revision 1.7
>> >> diff -u -p -r1.7 patch-src_libaudcore_Makefile
>> >> --- patches/patch-src_libaudcore_Makefile 3 Nov 2014 04:28:11 -   
>> >> 1.7
>> >> +++ patches/patch-src_libaudcore_Makefile 6 Sep 2017 10:06:35 -
>> >> @@ -1,9 +1,10 @@
>> >>  $OpenBSD: 

Re: textproc/aspell uselocale undefined symbol from converters/libiconv

[Ingo Schwarze]

Hi Ian,

I suspect that you have some parts of your ports/packages out of
sync with other parts.

Ian McWilliam wrote on Wed, Sep 06, 2017 at 04:32:34AM +:

> ===>  Building for aspell-af-0.50.0v1
> /usr/local/bin/word-list-compress d < af.cwl | /usr/local/bin/aspell  
> --lang=af create master ./af.rws
> aspell:/usr/local/lib/libintl.so.6.0: undefined symbol 'uselocale'
> ld.so: aspell: lazy binding failed!

That looks like /usr/local/bin/aspell is still linking against an
old version of libc, even though it looks like you have already
updated your copy of the devel/gettext package.

What does

  $ ldd /usr/local/bin/aspell

tell you, in particular regarding libc.so.*.*?
It ought to report /usr/lib/libc.so.90.0.

Does it help to first rebuild and re-install textproc/aspell
before attemptimg to build aspell-af?

> I'll assume this has some interaction with the change in libc
> 
> New POSIX xlocale implementation written from scratch.
> Complete in the sense that all POSIX *locale(3) and *_l(3) functions
> are included, but in OpenBSD, we of course only really care about
> LC_CTYPE and we only support ASCII and UTF-8.
> 
> With important help from kettenis@, guenther@, and jca@.
> Repeated testing in ports bulk builds by naddy@.
> Additional testing by jca@, sebastia@, dcoppa@, and others.
> OK kettenis@ dcoppa@, and guenther@ on an earlier version.
> Riding guenther@'s libc/librthread major bump.
> 
> converters/libiconv was rebuilt and updated too due to library bumps.

That sounds fine and is expected (because it uses libc), but i do
not think that libiconv is related to your problem: libintl is part
of gettext, not of libiconv.  But gettext is unlikely to be your
problem either: the fact that it wants uselocale(3) indicates that
it is probably already up-to-date.  So my hunch is that aspell
itself is what you forgot to update; not sure though because of
slightly sparse information.

In any case, aspell-af builds and installs fine for me on amd64-current;
not tested at runtime.

Yours,
  Ingo

devel/universal-ctags broken

[Ingo Schwarze]

Hi,

lots of people keep telling me privately that my xlocale commit
exposes a previously present insanity in devel/universal-ctags:
As guenther@ found out, the upstream code stomps on the implementation
namespace by re-#define-ing __unused__ and __printf__ instead
of using names like "uctags_unused" in the application namespace
or instead of simply using the standard __attribute__ names.

I'm not Cc:ing all the people bringing this up separately because
that would cause too much noise.  Instead, i'm simply posting here.

Naddy@ points out that updating the port shoves the problem under
the carpet:  The following patch lets the port build (i did not
test running it).  It is not a proper fix though because upstream
still  re-#define-s __unused__ etc., just in different files,
such that for some reason the bomb no longer explodes in our port,
but peacefully keeps ticking, so upstream should still fix the mess
properly.

Should this go in?

I have no idea whether the renaming s/readtags/ureadtags/
and the dropping of libexec/ and share/ is desirable;
those changes seem to be due to what the upstream build does.
Also, "make test" does not appear to work, an i don't
currently understand what is failing.

Alternatively, i have a minimal patch to fix the port without
updating, just tweaking the defines (not very cleanly) to not
blow up (alredy sent to the MAINTAINER, not included here).

Yours,
  Ingo


Index: Makefile
===
RCS file: /cvs/ports/devel/universal-ctags/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile12 Apr 2017 20:00:30 -  1.1.1.1
+++ Makefile6 Sep 2017 10:44:02 -
@@ -4,9 +4,9 @@ COMMENT =   multilanguage reimplementation
 
 GH_ACCOUNT =   universal-ctags
 GH_PROJECT =   ctags
-GH_COMMIT =6742b034f43af57da7ba478528f2c628389ba16e
+GH_COMMIT =70a6275bd22668ef8cad4068acedf6509190afbf
 # commit date MMDD
-DISTNAME = universal-ctags-0.20170318
+DISTNAME = universal-ctags-0.20170903
 
 CATEGORIES =   devel
 
Index: distinfo
===
RCS file: /cvs/ports/devel/universal-ctags/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo6 May 2017 15:10:17 -   1.2
+++ distinfo6 Sep 2017 10:44:02 -
@@ -1,2 +1,2 @@
-SHA256 (universal-ctags-0.20170318-6742b034.tar.gz) = 
ikFwAvSYh6V8GN6gi9hIK0tkaZ/Vh8AerC3S6kOfmxg=
-SIZE (universal-ctags-0.20170318-6742b034.tar.gz) = 893293
+SHA256 (universal-ctags-0.20170903-70a6275b.tar.gz) = 
da1j6x8EdZ6MeW3pz0bCKMXztTljRcZ17ibfWD1NrBk=
+SIZE (universal-ctags-0.20170903-70a6275b.tar.gz) = 1307684
Index: patches/patch-makefiles_testing_mak
===
RCS file: /cvs/ports/devel/universal-ctags/patches/patch-makefiles_testing_mak,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-makefiles_testing_mak
--- patches/patch-makefiles_testing_mak 12 Apr 2017 20:00:30 -  1.1.1.1
+++ patches/patch-makefiles_testing_mak 6 Sep 2017 10:44:02 -
@@ -1,12 +1,13 @@
 $OpenBSD: patch-makefiles_testing_mak,v 1.1.1.1 2017/04/12 20:00:30 rsadowski 
Exp $
 makefiles/testing.mak.orig Fri Mar 17 18:28:32 2017
-+++ makefiles/testing.mak  Fri Mar 17 18:29:01 2017
-@@ -2,7 +2,7 @@
+Index: makefiles/testing.mak
+--- makefiles/testing.mak.orig
 makefiles/testing.mak
+@@ -5,7 +5,7 @@ check: tmain units
  
- check: tmain units
+ clean-local: clean-units clean-tmain
  
 -CTAGS_TEST = ./ctags$(EXEEXT)
 +CTAGS_TEST = ./$(CTAGS_PROG)$(EXEEXT)
- READ_TEST = ./$(READ_CMD)
+ READ_TEST = ./readtags$(EXEEXT)
  TIMEOUT=
  LANGUAGES=
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/universal-ctags/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   12 Apr 2017 20:00:30 -  1.1.1.1
+++ pkg/PLIST   6 Sep 2017 10:44:02 -
@@ -1,15 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2017/04/12 20:00:30 rsadowski Exp $
-@bin bin/readtags
 @bin bin/uctags
-libexec/ctags/
-libexec/ctags/drivers/
-libexec/ctags/drivers/coffeetags
+@bin bin/ureadtags
 @man man/man1/uctags.1
-share/ctags/
-share/ctags/optlib/
-share/ctags/optlib/coffee.ctags
-share/ctags/optlib/ctags.ctags
-share/ctags/optlib/gdbinit.ctags
-share/ctags/optlib/m4.ctags
-share/ctags/preload/
-share/ctags/preload/default.ctags
+@man man/man7/uctags-incompatibilities.7
+@man man/man7/uctags-optlib.7

Re: [update] audacious-3.9

[Timo Myyrä]

Antoine Jacoutot  writes:

> On Wed, Sep 06, 2017 at 01:21:58PM +0300, Timo Myyrä wrote:
>
>> Hi,
>> 
>> Here's an update for the audacious port to bring it to latest version.
>> Lightly tested on amd64 and playback works in various formats.
>> Someone could try this on hppa/alpha to see if they are still broken.
>> 
>> Most notably features is the switching back to gtk2. The plan seems to be to
>> switch to Qt UI eventually and keep gtk2 running until Qt side matures.
>> 
>> Note that this requires update to the audacious-plugins port as well which is
>> coming soon in another mail.
>> 
>> Timo
>> 
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/audio/audacious/Makefile,v
>> retrieving revision 1.55
>> diff -u -p -r1.55 Makefile
>> --- Makefile 31 Dec 2016 04:12:09 -  1.55
>> +++ Makefile 6 Sep 2017 10:06:35 -
>> @@ -3,14 +3,13 @@
>>  BROKEN-hppa =   no atomic ops / __sync_fetch_and_add_4
>>  BROKEN-alpha =  tinylock.c:58: internal compiler error: in 
>> extract_insn, at recog.c:2077
>>  
>> -COMMENT =   Gtk+3 media player
>> +COMMENT =   graphical audio player which supports lots of formats
>>  
>> -DISTNAME =  audacious-3.5.2
>> -REVISION =  0
>> +DISTNAME =  audacious-3.9
>>  
>> -SHARED_LIBS +=  audcore 3.0 # 1.0
>> -SHARED_LIBS +=  audgui  3.0 # 1.0
>> -SHARED_LIBS +=  audtag  2.1 # 1.0
>> +SHARED_LIBS +=  audcore 4.0 # 5.0
>> +SHARED_LIBS +=  audgui  4.0 # 5.0
>> +SHARED_LIBS +=  audtag  3.0 # 3.0
>>  
>>  CATEGORIES =audio multimedia
>>  
>> @@ -19,10 +18,11 @@ HOMEPAGE =   http://audacious-media-playe
>>  # BSD
>>  PERMIT_PACKAGE_CDROM =Yes
>>  
>> -WANTLIB += atk-1.0 c cairo cairo-gobject fontconfig freetype gdk-3
>> -WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
>> -WANTLIB += gtk-3 guess m pango-1.0 pangocairo-1.0 pangoft2-1.0
>> -WANTLIB += pthread z
>> +WANTLIB += ${COMPILER_LIBCXX} X11 Xcomposite Xcursor Xdamage Xext
>> +WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo fontconfig
>> +WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
>> +WANTLIB += gmodule-2.0 gobject-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0
>> +WANTLIB += pangoft2-1.0 z
>>  
>>  MASTER_SITES =  http://distfiles.audacious-media-player.org/
>>  
>> @@ -32,10 +32,8 @@ MODULES = devel/gettext gcc4
>>  # for atomic builtins
>>  MODGCC4_ARCHS = arm
>>  
>> -RUN_DEPENDS =   devel/desktop-file-utils \
>> -x11/gtk+3,-guic
>
> RUN_DEPENDS should not be modified.
>
>

Should x11/gtk+3,guic be needed with gtk2 ports?
I assumed its only gtk3-only stuff so no longer needed.


>> -LIB_DEPENDS =   devel/libguess>=1.2 \
>> -x11/gtk+3
>> +RUN_DEPENDS =   devel/desktop-file-utils
>> +LIB_DEPENDS =   x11/gtk+2
>>  
>>  MAKE_ENV =  LIBaudcore_VERSION=${LIBaudcore_VERSION} \
>>  LIBaudgui_VERSION=${LIBaudgui_VERSION} \
>> Index: distinfo
>> ===
>> RCS file: /cvs/ports/audio/audacious/distinfo,v
>> retrieving revision 1.21
>> diff -u -p -r1.21 distinfo
>> --- distinfo 3 Nov 2014 04:28:11 -   1.21
>> +++ distinfo 6 Sep 2017 10:06:35 -
>> @@ -1,2 +1,2 @@
>> -SHA256 (audacious-3.5.2.tar.bz2) = 
>> ORW5aS74rLJYiw4mwnOOWeNnZs/oPn5SwOYBaI5sGVY=
>> -SIZE (audacious-3.5.2.tar.bz2) = 448436
>> +SHA256 (audacious-3.9.tar.bz2) = 
>> LYBEZzrHhtcbCABPGQu8o2gli/YOZgL/wNliKDXMsF4=
>> +SIZE (audacious-3.9.tar.bz2) = 599488
>> Index: patches/patch-src_libaudcore_Makefile
>> ===
>> RCS file: /cvs/ports/audio/audacious/patches/patch-src_libaudcore_Makefile,v
>> retrieving revision 1.7
>> diff -u -p -r1.7 patch-src_libaudcore_Makefile
>> --- patches/patch-src_libaudcore_Makefile3 Nov 2014 04:28:11 -   
>> 1.7
>> +++ patches/patch-src_libaudcore_Makefile6 Sep 2017 10:06:35 -
>> @@ -1,9 +1,10 @@
>>  $OpenBSD: patch-src_libaudcore_Makefile,v 1.7 2014/11/03 04:28:11 bcallah 
>> Exp $
>>  src/libaudcore/Makefile.origThu Oct 16 20:00:28 2014
>> -+++ src/libaudcore/Makefile Sat Nov  1 19:11:40 2014
>> +Index: src/libaudcore/Makefile
>> +--- src/libaudcore/Makefile.orig
>>  src/libaudcore/Makefile
>>  @@ -1,4 +1,4 @@
>>  -SHARED_LIB = ${LIB_PREFIX}audcore${LIB_SUFFIX}
>>  +SHARED_LIB = ${LIB_PREFIX}audcore.so.${LIBaudcore_VERSION}
>> - LIB_MAJOR = 2
>> + LIB_MAJOR = 5
>>   LIB_MINOR = 0
>>   
>> Index: patches/patch-src_libaudgui_Makefile
>> ===
>> RCS file: /cvs/ports/audio/audacious/patches/patch-src_libaudgui_Makefile,v
>> 

Re: devel/ectags broken

[Ingo Schwarze]

Hi Jeremie,

Jeremie Courreges-Anglas wrote on Wed, Sep 06, 2017 at 02:30:16PM +0200:

> I was cooking up a mail for Alexandr and Rafael but got interrupted.
> Here's the diff I wanted to send.  Not a proper fix for upstream either,
> but at least this is more compact than multiple patches.  And I'm not
> sure it's a good idea to use stuff like __unused in the ports tree.

That's elegant, cleaner than my patches, reads well to code inspection,
builds for me on amd64-current, and the two-liner can maybe even be used
by upstream to fix their repos.  Not tested at run-time, though.

You might possibly want to add a comment above it, something like

# Application software must not redefine macros in the
# implementation namespace.  For example, redefining __unused__
# blows up in our .

For the sed(1) commands alone, it is not obvious what is going on.

Either way, OK schwarze@ for what that's worth.

Thanks,
  Ingo


> Index: devel/ectags/Makefile
> ===
> RCS file: /d/cvs/ports/devel/ectags/Makefile,v
> retrieving revision 1.20
> diff -u -p -r1.20 Makefile
> --- devel/ectags/Makefile 29 Dec 2016 14:48:51 -  1.20
> +++ devel/ectags/Makefile 6 Sep 2017 11:00:07 -
> @@ -20,6 +20,10 @@ CONFIGURE_STYLE=gnu
>  
>  DOCS=FAQ NEWS README EXTENDING.html
>  
> +post-extract:
> + find ${WRKSRC} -type f -name '*.[ch]' -exec sed -i \
> + 's/__unused__/ect_unused/g; s/__printf__/ect_printf/g' {} +
> +
>  do-install:
>   ${INSTALL_PROGRAM} ${WRKBUILD}/ctags ${PREFIX}/bin/ectags
>   ${INSTALL_MAN} ${WRKSRC}/ctags.1 ${PREFIX}/man/man1/ectags.1
> Index: devel/universal-ctags/Makefile
> ===
> RCS file: /d/cvs/ports/devel/universal-ctags/Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 Makefile
> --- devel/universal-ctags/Makefile12 Apr 2017 20:00:30 -  1.1.1.1
> +++ devel/universal-ctags/Makefile6 Sep 2017 10:55:33 -
> @@ -51,6 +51,10 @@ LIB_DEPENDS+=  converters/libiconv
>  WANTLIB+=iconv
>  .endif
>  
> +post-extract:
> + find ${WRKSRC} -type f -name '*.[ch]' -exec sed -i \
> + 's/__unused__/uct_unused/g; s/__printf__/uct_printf/g' {} +
> +
>  pre-configure:
>   cd ${WRKSRC} && ${SETENV} AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
>   AUTOCONF_VERSION=${AUTOCONF_VERSION} ./autogen.sh

Re: devel/ectags broken

[Stuart Henderson]

On 2017/09/06 15:21, Ingo Schwarze wrote:
> Hi Jeremie,
> 
> Jeremie Courreges-Anglas wrote on Wed, Sep 06, 2017 at 02:30:16PM +0200:
> 
> > I was cooking up a mail for Alexandr and Rafael but got interrupted.
> > Here's the diff I wanted to send.  Not a proper fix for upstream either,
> > but at least this is more compact than multiple patches.  And I'm not
> > sure it's a good idea to use stuff like __unused in the ports tree.
> 
> That's elegant, cleaner than my patches, reads well to code inspection,
> builds for me on amd64-current, and the two-liner can maybe even be used
> by upstream to fix their repos.  Not tested at run-time, though.
> 
> You might possibly want to add a comment above it, something like
> 
> # Application software must not redefine macros in the
> # implementation namespace.  For example, redefining __unused__
> # blows up in our .
> 
> For the sed(1) commands alone, it is not obvious what is going on.
> 
> Either way, OK schwarze@ for what that's worth.
> 
> Thanks,
>   Ingo

I agree that adding a comment would be useful. OK with me too.

Re: clang FFmpeg segfaults on i386 [st...@openbsd.org: CVS: cvs.openbsd.org: ports]

[Stuart Henderson]

On 2017/09/05 10:41, Stuart Henderson wrote:
> - Forwarded message from Stuart Henderson  -
> 
> From: Stuart Henderson 
> Date: Mon, 4 Sep 2017 13:27:56 -0600 (MDT)
> To: ports-chan...@openbsd.org
> Subject: CVS: cvs.openbsd.org: ports
> 
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   st...@cvs.openbsd.org   2017/09/04 13:27:56
> 
> Modified files:
>   graphics/ffmpeg: Makefile 
> 
> Log message:
> Use ports clang to build ffmpeg on amd64. The AAC encoder hangs on amd64 when
> compiled with clang 4.0.x (either 4.0.0 in base or the older ports 4.0.1).
> Based on a diff from Brad.
> 
> Add a comment explaining this and note that there is another issue where the
> H264 decoder segfaults in ff_deblock_v_luma_8_sse2 on i386, but this isn't
> helped by the newer ports clang.
> 
> 
> - End forwarded message -
> 
> So this works around the recently-reported hangs seen on amd64 but we
> still have a segfault issue on i386 (I've only seen this so far when
> decoding H264, though given the function other things may use it too).
> 
> I've tried a few things:
> 
> - clang (ports or base): segfault
> 
> - ports gcc: works, but needs -march=i686 to build, otherwise build fails
> "libpostproc/postprocess_template.c:3184:5: error: 'asm' operand has 
> impossible constraints"
> 
> - CC=/usr/bin/gcc: works, no extra flags
> 
> - I haven't tried a --disable-inline-asm build yet, I suspect that
> this would also work but likely kill performance.
> 
> Any thoughts on how to proceed? As far as getting things ship-shape
> for release goes, setting CC=/usr/bin/gcc for i386 seems the least
> worst option to me.
> 
> Brad points out we had runtime problems in the past with clang-built
> FFmpeg on i386 (ports/graphics/ffmpeg/Makefile r1.119, r1.120) though
> I can't find the ports@ posts referred to in the commit log any more.
> 

So in the absence of better ideas, this is what I'm suggesting.

It's a fairly dirty "fix" but this problem breaks much of the common
use of ffmpeg and its dependent packages on i386 (and the alternative
of -march=i686 will mean SIGILL on older machines).

Any comments, objections or OKs?

Index: Makefile
===
RCS file: /cvs/ports/graphics/ffmpeg/Makefile,v
retrieving revision 1.164
diff -u -p -r1.164 Makefile
--- Makefile4 Sep 2017 19:27:56 -   1.164
+++ Makefile6 Sep 2017 14:24:47 -
@@ -5,7 +5,7 @@ COMMENT=audio/video converter and strea
 V= 20170825
 DISTNAME=  ffmpeg-git-${V}
 PKGNAME=   ffmpeg-${V}
-REVISION=  0
+REVISION=  1
 CATEGORIES=graphics multimedia
 MASTER_SITES=  http://comstyle.com/source/
 EXTRACT_SUFX=  .tar.xz
@@ -35,10 +35,15 @@ WANTLIB=SDL X11 Xext Xv ass bz2 c crypt
 
 # AAC encoder hangs on amd64 when built with clang 4.0.0 or 4.0.1 but
 # succeeds with ports clang 5.0.0rc4.
-# XXX h264 decoder segfaults in ff_deblock_v_luma_8_sse2 on i386
 COMPILER=  base-gcc ports-clang base-clang
 COMPILER_LANGS=c
 MODCLANG_ARCHS=amd64
+# ff_deblock_v_luma_8_sse2 segfaults on i386/clang (e.g. in H264 decode)
+# works with ports gcc, but requires -march=i686 to build
+# works with base gcc
+.if ${MACHINE_ARCH} == "i386"
+CC=/usr/bin/gcc
+.endif
 
 BUILD_DEPENDS= textproc/texi2html
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"

[update] lang/elixir

[Doug Hogan]

Add FLAVORs for all Erlang releases supported by Elixir: 18, 19 and 20.
Add versioned binaries and directories.
Setup an UTF-8 environment so it doesn't complain and 'make test' runs.


diff --git lang/elixir/Makefile lang/elixir/Makefile
index 
983cbb11abcc760b4fa2f6be6f49b68e0699ecc7..b1fbbc5cd6c942348a6219ac001b0566e3979315
 100644
--- lang/elixir/Makefile
+++ lang/elixir/Makefile
@@ -8,6 +8,7 @@ GH_PROJECT= elixir
 GH_TAGNAME=v$V
 DISTNAME=  ${GH_PROJECT}-$V
 CATEGORIES=lang
+REVISION=  0
 
 HOMEPAGE=  http://elixir-lang.org/
 
@@ -17,15 +18,29 @@ MAINTAINER= Jasper Lievisse Adriaanse 

 PERMIT_PACKAGE_CDROM=  Yes
 
 MODULES=   lang/erlang
-MODERL_VERSION=19
+
+# Elixir 1.5.x works with erlang 18+.
+# These flavors correspond to entries in lang/erlang/erlang.port.mk
+FLAVOR ?=  erlang19
+.if ${FLAVOR:Merlang18} || ${FLAVOR:Merlang19} || ${FLAVOR:Merlang20}
+.else
+ERRORS +=  "Fatal: Invalid FLAVOR set: ${FLAVOR}"
+.endif
 
 ALL_TARGET=# empty
 
 TEST_TARGET=   test
 PORTHOME=  ${WRKDIR}
 
+# Elixir expects a UTF-8 environment.
+MAKE_ENV=  LC_CTYPE="en_US.UTF-8" \
+   LANG="en_US.UTF-8"
+
 MAKE_FLAGS=PREFIX="${PREFIX}" \
-   Q=""
+   Q="" \
+   MODERL_VERSION="${MODERL_VERSION}"
+
+SUBST_VARS+=   MODERL_VERSION
 
 pre-configure:
${SUBST_CMD} ${WRKSRC}/bin/elixir
diff --git lang/elixir/patches/patch-Makefile lang/elixir/patches/patch-Makefile
index 
74aaaba5f63b7b32c8802655ab19e79cab008c0e..0a9681efd82be30f9e106b6e53dc5e8c42121533
 100644
--- lang/elixir/patches/patch-Makefile
+++ lang/elixir/patches/patch-Makefile
@@ -1,8 +1,81 @@
 $OpenBSD: patch-Makefile,v 1.1 2017/01/07 13:21:50 jasper Exp $
 Makefile.orig  Sat Jan  7 14:14:00 2017
-+++ Makefile   Sat Jan  7 14:18:37 2017
-@@ -251,9 +251,9 @@ clean_man:
-   rm -f man/iex.1
+Index: Makefile
+--- Makefile.orig
 Makefile
+@@ -3,8 +3,10 @@ PREFIX ?= /usr/local
+ SHARE_PREFIX ?= $(PREFIX)/share
+ CANONICAL := v1.5/
+ ELIXIRC := bin/elixirc --verbose --ignore-module-conflict
+-ERLC := erlc -I lib/elixir/include
+-ERL := erl -I lib/elixir/include -noshell -pa lib/elixir/ebin
++ERLC := erlc$(MODERL_VERSION) -I lib/elixir/include
++ERL := erl$(MODERL_VERSION) -I lib/elixir/include -noshell -pa lib/elixir/ebin
++EPMD := epmd$(MODERL_VERSION)
++DIALYZER := dialyzer$(MODERL_VERSION)
+ VERSION := $(strip $(shell cat VERSION))
+ Q := @
+ LIBDIR := lib
+@@ -22,7 +24,7 @@ GIT_TAG = $(strip $(shell head="$(call GIT_REVISION)";
+ #==> Functions
+ 
+ define CHECK_ERLANG_RELEASE
+-  $(Q) erl -noshell -eval '{V,_} = 
string:to_integer(erlang:system_info(otp_release)), io:fwrite("~s", 
[is_integer(V) and (V >= 18)])' -s erlang halt | grep -q '^true'; \
++  $(Q) erl$(MODERL_VERSION) -noshell -eval '{V,_} = 
string:to_integer(erlang:system_info(otp_release)), io:fwrite("~s", 
[is_integer(V) and (V >= 18)])' -s erlang halt | grep -q '^true'; \
+   if [ $$? != 0 ]; then \
+ echo "At least Erlang 18.0 is required to build Elixir"; \
+ exit 1; \
+@@ -102,15 +104,15 @@ $(eval $(call APP_TEMPLATE,iex,IEx))
+ install: compile
+   @ echo "==> elixir (install)"
+   $(Q) for dir in lib/*; do \
+-  rm -rf $(DESTDIR)$(PREFIX)/$(LIBDIR)/elixir/$$dir/ebin; \
+-  $(INSTALL_DIR) 
"$(DESTDIR)$(PREFIX)/$(LIBDIR)/elixir/$$dir/ebin"; \
+-  $(INSTALL_DATA) $$dir/ebin/* 
"$(DESTDIR)$(PREFIX)/$(LIBDIR)/elixir/$$dir/ebin"; \
++  rm -rf 
$(DESTDIR)$(PREFIX)/$(LIBDIR)/elixir$(MODERL_VERSION)/$$dir/ebin; \
++  $(INSTALL_DIR) 
"$(DESTDIR)$(PREFIX)/$(LIBDIR)/elixir$(MODERL_VERSION)/$$dir/ebin"; \
++  $(INSTALL_DATA) $$dir/ebin/* 
"$(DESTDIR)$(PREFIX)/$(LIBDIR)/elixir$(MODERL_VERSION)/$$dir/ebin"; \
+   done
+-  $(Q) $(INSTALL_DIR) "$(DESTDIR)$(PREFIX)/$(LIBDIR)/elixir/bin"
+-  $(Q) $(INSTALL_PROGRAM) $(filter-out %.ps1, $(filter-out %.bat, 
$(wildcard bin/*))) "$(DESTDIR)$(PREFIX)/$(LIBDIR)/elixir/bin"
++  $(Q) $(INSTALL_DIR) 
"$(DESTDIR)$(PREFIX)/$(LIBDIR)/elixir$(MODERL_VERSION)/bin"
++  $(Q) $(INSTALL_PROGRAM) $(filter-out %.ps1, $(filter-out %.bat, 
$(wildcard bin/*))) "$(DESTDIR)$(PREFIX)/$(LIBDIR)/elixir$(MODERL_VERSION)/bin"
+   $(Q) $(INSTALL_DIR) "$(DESTDIR)$(PREFIX)/$(BINDIR)"
+-  $(Q) for file in "$(DESTDIR)$(PREFIX)"/$(LIBDIR)/elixir/bin/*; do \
+-  ln -sf "../$(LIBDIR)/elixir/bin/$${file##*/}" 
"$(DESTDIR)$(PREFIX)/$(BINDIR)/"; \
++  $(Q) for file in 
"$(DESTDIR)$(PREFIX)"/$(LIBDIR)/elixir$(MODERL_VERSION)/bin/*; do \
++  ln -sf "../$(LIBDIR)/elixir$(MODERL_VERSION)/bin/$${file##*/}" 
"$(DESTDIR)$(PREFIX)/$(BINDIR)/$${file##*/}$(MODERL_VERSION)"; \
+   done
+   $(MAKE) install_man
+ 

Re: ncmpcpp core dumps on amd64

[David Coppa]

Il 05 set 2017 20:50, "Ingo Schwarze"  ha scritto:

Hi,

David Coppa wrote on Tue, Sep 05, 2017 at 04:54:24PM +0200:
> On Tue, Sep 5, 2017 at 4:41 PM, Marc Peters  wrote:

>> running Sundays snapshot and just reinstalled ncmpcpp and dependencies
>> with "pkg_add -D installed -u ncmpcpp" ncmpcpp core dumps:
>>
>> $ ncmpcpp
>> terminating with uncaught exception of type std::runtime_error:
>> ctype_byname::ctype_byname failed to construct for C
>> Abort trap (core dumped)
>>
>> CC'ing the maintainer.
>>
>> Does anyone know what the exception means and how to solve it?

> Ingo's POSIX xlocale implementation
> (https://marc.info/?l=openbsd-cvs=150458138122317) should fix it.
>
> I'm about to rebuild ncmpcpp and all its dependencies to check if it
> is true, but I'm pretty confident...

To make sure that i did not break this, i just did that as well
on amd64-current: i rebuilt ncmpcpp with all its dependencies,
and i can no longer reproduce the crash.  So it should be good
when the next complete package snapshot arrives on your mirror.

(My system is still slightly Frankenstein'ed because i have various
ports installed that were built against a libc with my xlocale patch
but without guenther@'s pthread patch.  Those no longer work, but
i no longer have anything of that kind in what affects ncmpcpp.)


Confirmed.
ncmpcpp works without problems now.

Ciao!
David

Re: /mail/trojita Segmentation fault on i386

[Stuart Henderson]

On 2017/09/06 16:41, Eda Sky wrote:
> Hi
> 
> On the last snapshots /mail/trojita Segmentation fault on i386
> 
> some ideas please?

Lots of things will fail on a libc.so.90.0-based snapshot until you've
updated your packages.

amd64 packages are already on (at least some) mirrors.

i386 packages just finished building and I'm copying them out now,
so try running pkg_add -u sometime tomorrow (the full set is 33GB so it
will take a little time to feed out).

UPDATE: Nextcloud-12.0.2

[Gonzalo L. Rodriguez]

Hello,

Update for Nextcloud to 12.0.2:

https://nextcloud.com/changelog/

Plus, added the new big php change from martijn@

Ok? Comments?

More test are welcome.

Cheers.-

-- 
Sending from my toaster.
Index: Makefile
===
RCS file: /cvs/ports/www/nextcloud/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile21 Aug 2017 19:29:20 -  1.4
+++ Makefile6 Sep 2017 19:48:54 -
@@ -2,10 +2,9 @@
 
 COMMENT=   easy and universal access to shared and/or personal 
files
 
-V= 12.0.0
+V= 12.0.2
 DISTNAME=  nextcloud-${V}
 EXTRACT_SUFX=  .tar.bz2
-REVISION=  0
 
 CATEGORIES=www
 
@@ -35,11 +34,29 @@ PREFIX= ${VARBASE}/www
 INSTDIR=   ${PREFIX}/nextcloud
 TINSTDIR=  ${TRUEPREFIX}/nextcloud
 VR=${V:R}
-MAJOR= 11
+MAJOR= 12
 SUBST_VARS=INSTDIR TINSTDIR MODPHP_BIN VR MAJOR
 
-RUN_DEPENDS=   lang/php/${MODPHP_VERSION},-gd \
-   lang/php/${MODPHP_VERSION},-zip
+RUN_DEPENDS=   lang/php/${MODPHP_VERSION},-bcmath \
+   lang/php/${MODPHP_VERSION},-ctype \
+   lang/php/${MODPHP_VERSION},-dom \
+   lang/php/${MODPHP_VERSION},-exif \
+   lang/php/${MODPHP_VERSION},-fileinfo \
+   lang/php/${MODPHP_VERSION},-ftp \
+   lang/php/${MODPHP_VERSION},-gd \
+   lang/php/${MODPHP_VERSION},-iconv \
+   lang/php/${MODPHP_VERSION},-json\
+   lang/php/${MODPHP_VERSION},-mbstring \
+   lang/php/${MODPHP_VERSION},-pdo \
+   lang/php/${MODPHP_VERSION},-phar \
+   lang/php/${MODPHP_VERSION},-posix \
+   lang/php/${MODPHP_VERSION},-readline \
+   lang/php/${MODPHP_VERSION},-simplexml \
+   lang/php/${MODPHP_VERSION},-sqlite3 \
+   lang/php/${MODPHP_VERSION},-tokenizer \
+   lang/php/${MODPHP_VERSION},-xmlreader \
+   lang/php/${MODPHP_VERSION},-xmlwriter \
+   lang/php/${MODPHP_VERSION},-zip
 
 # http user authentication
 RUN_DEPENDS += lang/php/${MODPHP_VERSION},-curl
Index: distinfo
===
RCS file: /cvs/ports/www/nextcloud/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo28 May 2017 20:03:16 -  1.3
+++ distinfo6 Sep 2017 19:48:54 -
@@ -1,2 +1,2 @@
-SHA256 (nextcloud-12.0.0.tar.bz2) = 
G52c8F5lfNVkpVK0GPv0LWacpR4P0fHxGP5Ey/k6JD8=
-SIZE (nextcloud-12.0.0.tar.bz2) = 41743343
+SHA256 (nextcloud-12.0.2.tar.bz2) = 
6zTWy59V7oS/KthHtLCM25JTIYSP+iJkqbFWbnshoXw=
+SIZE (nextcloud-12.0.2.tar.bz2) = 42756355
Index: patches/patch-version_php
===
RCS file: /cvs/ports/www/nextcloud/patches/patch-version_php,v
retrieving revision 1.3
diff -u -p -r1.3 patch-version_php
--- patches/patch-version_php   28 May 2017 20:03:16 -  1.3
+++ patches/patch-version_php   6 Sep 2017 19:48:54 -
@@ -3,8 +3,8 @@ Index: version.php
 --- version.php.orig
 +++ version.php
 @@ -2,7 +2,7 @@
- $OC_Version = array(12,0,0,29);
- $OC_VersionString = '12.0.0';
+ $OC_Version = array(12,0,2,0);
+ $OC_VersionString = '12.0.2';
  $OC_Edition = '';
 -$OC_Channel = 'stable';
 +$OC_Channel = 'OpenBSD ports';
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/nextcloud/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST   21 Aug 2017 19:29:20 -  1.4
+++ pkg/PLIST   6 Sep 2017 19:49:27 -
@@ -347,13 +347,13 @@ nextcloud/3rdparty/doctrine/dbal/lib/Doc
 
nextcloud/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/PostgreSQL92Keywords.php
 
nextcloud/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/PostgreSQLKeywords.php
 
nextcloud/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/ReservedKeywordsValidator.php
+nextcloud/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/SQLAnywhere11Keywords.php
 
nextcloud/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/SQLAnywhere${MAJOR}Keywords.php
-nextcloud/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/SQLAnywhere12Keywords.php
 
nextcloud/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/SQLAnywhere16Keywords.php
 
nextcloud/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/SQLAnywhereKeywords.php
 
nextcloud/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/SQLServer2005Keywords.php
 
nextcloud/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/SQLServer2008Keywords.php

Re: sysutils/sleuthkit: why CONFIGURE_STYLE=simple?

[nigel]

On 09/06/17 11:34, Stuart Henderson wrote:
> I just ran into this...
> 
> ===>  Configuring for sleuthkit-4.3.0p0
> checking for a BSD-compatible install... 
> /usr/obj/ports/sleuthkit-4.3.0/bin/install -c
> checking whether build environment is sane... yes
> checking for a thread-safe mkdir -p... /usr/local/bin/gmkdir -p
> [..snip..]
> Making install in auto
>  /usr/local/bin/gmkdir -p 
> '/usr/obj/ports/sleuthkit-4.3.0/fake-i386/usr/local/lib'
> /bin/sh: /usr/local/bin/gmkdir: not found
> 
> ...which shows that it's not using CONFIGURE_STYLE=gnu.
> 
> Is there a reason why?
> 
> 

naddy already asked me the same question to which the reply was I took
it over like that, and someone else did the last update, it has been
fixed once I catch up with libc / pthread I have this prepared below
this bring it upto date with latest found by portroach.

It's one of the next lot of portroach updates - socat, tcpreplay once
those already posted to ports@ have been ok'd and cleared

$ ident Makefile
Makefile:
 $OpenBSD: Makefile,v 1.21 2017/07/26 22:45:30 sthen Exp $

$ cvs -R -q diff -uNp | head -30
Index: Makefile
===
RCS file: /home/cvs/ports/sysutils/sleuthkit/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile26 Jul 2017 22:45:30 -  1.21
+++ Makefile29 Aug 2017 21:30:52 -
@@ -2,9 +2,8 @@

 COMMENT=   forensic toolkit based on TCT

-DISTNAME=  sleuthkit-4.3.0
+DISTNAME=  sleuthkit-4.4.2
 CATEGORIES=sysutils security
-REVISION=  0

 SHARED_LIBS += tsk 0.0 # 14.0

@@ -18,17 +17,19 @@ PERMIT_PACKAGE_FTP= Yes

 MASTER_SITES =
https://github.com/sleuthkit/sleuthkit/releases/download/${DISTNAME}/

-WANTLIB += c m pthread ${COMPILER_LIBCXX} z
+WANTLIB += c m pthread ${COMPILER_LIBCXX} sqlite3 z

-CONFIGURE_STYLE =  simple
+CONFIGURE_STYLE =  gnu

 CONFIGURE_ARGS +=  --mandir='${PREFIX}/man' \
--disable-java \

...
$ make show=MAINTAINER
Nigel Taylor 

lang/jruby 9.1.12.0 -> 9.1.13.0

[Jeremy Evans]

This updates JRuby to the latest release.  Release announcement at
http://jruby.org/2017/09/06/jruby-9-1-13-0.html

This release contains the rubygems security fixes that went in a
few days ago, so most of the diff is removing those patches.

Tested on amd64, the only supported arch.  Will be committing in a
couple days unless I hear objections.

Thanks,
Jeremy

Index: Makefile
===
RCS file: /cvs/ports/lang/jruby/Makefile,v
retrieving revision 1.67
diff -u -p -r1.67 Makefile
--- Makefile2 Sep 2017 21:36:55 -   1.67
+++ Makefile6 Sep 2017 21:03:58 -
@@ -5,14 +5,13 @@ ONLY_FOR_ARCHS = amd64
 
 COMMENT =  pure-Java implementation of the Ruby language
 
-V =9.1.12.0
+V =9.1.13.0
 DISTNAME = jruby-bin-${V}
 PKGNAME =  jruby-${V}
 CATEGORIES =   lang lang/ruby
 DISTFILES =${DISTNAME}.tar.gz \
jnr-jffi-1.2.2-0-g4c196bb.tar.gz:0 \
${JRUBY_LAUNCHER_GEM}:1
-REVISION = 1
 
 HOMEPAGE = http://www.jruby.org/
 
Index: distinfo
===
RCS file: /cvs/ports/lang/jruby/distinfo,v
retrieving revision 1.42
diff -u -p -r1.42 distinfo
--- distinfo21 Jun 2017 15:38:00 -  1.42
+++ distinfo6 Sep 2017 21:03:58 -
@@ -1,6 +1,6 @@
 SHA256 (jnr-jffi-1.2.2-0-g4c196bb.tar.gz) = 
xK/m48Z/YA+fg4yFJqcRxceFnT0F98y255Ju9eSE7b0=
-SHA256 (jruby-bin-9.1.12.0.tar.gz) = 
3bI8lfSzzD/BzFe4HLTO7ndklu3kArmm6wYizxXhpZc=
+SHA256 (jruby-bin-9.1.13.0.tar.gz) = 
nRVmRmI6wvJxdHIQNbUlcqSwVpDbfBKTKVqiwEqtOQg=
 SHA256 (jruby-launcher-1.1.1-java.gem) = 
0iJ3vtg6aMTK/AIJdpLChL3TSVYqpbp89chB4ywVlOE=
 SIZE (jnr-jffi-1.2.2-0-g4c196bb.tar.gz) = 1759433
-SIZE (jruby-bin-9.1.12.0.tar.gz) = 20919880
+SIZE (jruby-bin-9.1.13.0.tar.gz) = 20993456
 SIZE (jruby-launcher-1.1.1-java.gem) = 56832
Index: patches/patch-lib_ruby_stdlib_rubygems_commands_open_command_rb
===
RCS file: patches/patch-lib_ruby_stdlib_rubygems_commands_open_command_rb
diff -N patches/patch-lib_ruby_stdlib_rubygems_commands_open_command_rb
--- patches/patch-lib_ruby_stdlib_rubygems_commands_open_command_rb 2 Sep 
2017 21:36:55 -   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-lib_ruby_stdlib_rubygems_commands_open_command_rb,v 1.1 
2017/09/02 21:36:55 jeremy Exp $
-
-Index: lib/ruby/stdlib/rubygems/commands/open_command.rb
 lib/ruby/stdlib/rubygems/commands/open_command.rb.orig
-+++ lib/ruby/stdlib/rubygems/commands/open_command.rb
-@@ -72,7 +72,7 @@ class Gem::Commands::OpenCommand < Gem::Command
-   end
- 
-   def spec_for name
--spec = Gem::Specification.find_all_by_name(name, @version).last
-+spec = Gem::Specification.find_all_by_name(name, @version).first
- 
- return spec if spec
- 
Index: patches/patch-lib_ruby_stdlib_rubygems_commands_query_command_rb
===
RCS file: patches/patch-lib_ruby_stdlib_rubygems_commands_query_command_rb
diff -N patches/patch-lib_ruby_stdlib_rubygems_commands_query_command_rb
--- patches/patch-lib_ruby_stdlib_rubygems_commands_query_command_rb2 Sep 
2017 21:36:55 -   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,24 +0,0 @@
-$OpenBSD: patch-lib_ruby_stdlib_rubygems_commands_query_command_rb,v 1.1 
2017/09/02 21:36:55 jeremy Exp $
-
-Index: lib/ruby/stdlib/rubygems/commands/query_command.rb
 lib/ruby/stdlib/rubygems/commands/query_command.rb.orig
-+++ lib/ruby/stdlib/rubygems/commands/query_command.rb
-@@ -226,7 +226,7 @@ is too hard to use.
- end
-   end
- 
--  output << make_entry(matching_tuples, platforms)
-+  output << clean_text(make_entry(matching_tuples, platforms))
- end
-   end
- 
-@@ -352,7 +352,8 @@ is too hard to use.
-   end
- 
-   def spec_summary entry, spec
--entry << "\n\n" << format_text(spec.summary, 68, 4)
-+summary = truncate_text(spec.summary, "the summary for #{spec.full_name}")
-+entry << "\n\n" << format_text(summary, 68, 4)
-   end
- 
- end
Index: patches/patch-lib_ruby_stdlib_rubygems_commands_sources_command_rb
===
RCS file: patches/patch-lib_ruby_stdlib_rubygems_commands_sources_command_rb
diff -N patches/patch-lib_ruby_stdlib_rubygems_commands_sources_command_rb
--- patches/patch-lib_ruby_stdlib_rubygems_commands_sources_command_rb  2 Sep 
2017 21:36:55 -   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-lib_ruby_stdlib_rubygems_commands_sources_command_rb,v 1.1 
2017/09/02 21:36:55 jeremy Exp $
-
-Index: lib/ruby/stdlib/rubygems/commands/sources_command.rb
 lib/ruby/stdlib/rubygems/commands/sources_command.rb.orig
-+++ lib/ruby/stdlib/rubygems/commands/sources_command.rb
-@@ -44,7 +44,7 @@ class Gem::Commands::SourcesCommand < Gem::Command
- source 

[update] lang/erlang

[Doug Hogan]

I have been working with Jasper to revamp the Erlang port.

Add support for Erlang 20.x as an additional FLAVOR.
Switch lang/erlang/18 to major release 18.3.
Update to the latest patch release for 17.x, 18.x, 19.x and 20.x.
Add versioned calls to erl so versioned erlc, dialyzer, etc work.
Quiet some of the clang warnings by removing undefined behavior.
Reduce differences between the files for each Erlang release.
Make all Erlang versions conflict on the pre-versioned Erlang packages.
Ensure all PLISTs are using *_VER variables in paths.


lang_erlang_20170906.patch.gz
Description: application/gunzip

[update] ctwm-4.0.2

[Timo Myyrä]

Hi,

I was checking old ports in portroach and noticed that ctwm port hasn't been
updated in a while.

Here's an diff to bring it up to date. I'm not ctwm user but seems to basics
seems to work on amd64.

Timo

Index: Makefile
===
RCS file: /cvs/ports/x11/ctwm/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile17 Aug 2017 17:05:03 -  1.25
+++ Makefile6 Sep 2017 18:26:54 -
@@ -1,23 +1,25 @@
 # $OpenBSD: Makefile,v 1.25 2017/08/17 17:05:03 fcambus Exp $
 
-COMMENT=   twm, plus support for multiple virtual screens, etc
+COMMENT =  twm, plus support for multiple virtual screens, etc
 
-DISTNAME=  ctwm-3.6
-REVISION=  2
+DISTNAME = ctwm-4.0.1
 
-CATEGORIES=x11
+CATEGORIES =   x11
 
-HOMEPAGE=  https://www.ctwm.org/
+HOMEPAGE = https://www.ctwm.org/
 
 # BSD-like/badly worded
-PERMIT_PACKAGE_CDROM=  Yes
+PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB=   ICE SM X11 Xau Xdmcp Xext Xmu Xpm Xt c
+WANTLIB += ICE SM X11 Xext Xmu Xpm Xt c jpeg
 
-MASTER_SITES=  ${HOMEPAGE}dist/
+MASTER_SITES = ${HOMEPAGE}dist/
 
-CONFIGURE_STYLE= imake
+MODULES =  devel/cmake
 
-NO_TEST=   Yes
+LIB_DEPENDS =  graphics/jpeg   
+
+post-install:
+   gunzip ${PREFIX}/man/man1/*.1.gz
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/x11/ctwm/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo18 Jan 2015 03:15:52 -  1.5
+++ distinfo6 Sep 2017 18:26:54 -
@@ -1,2 +1,2 @@
-SHA256 (ctwm-3.6.tar.gz) = 2r4rF5ZD3bEAscc68gOME+3qcCFLS4RP0Sl+8nb/uzE=
-SIZE (ctwm-3.6.tar.gz) = 370563
+SHA256 (ctwm-4.0.1.tar.gz) = ONLbvHc+PcnTGYP0zkzB5F5dnDWjh+F+kWRNNOKEgvw=
+SIZE (ctwm-4.0.1.tar.gz) = 897148
Index: patches/patch-Imakefile
===
RCS file: patches/patch-Imakefile
diff -N patches/patch-Imakefile
--- patches/patch-Imakefile 17 Sep 2012 10:25:11 -  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,26 +0,0 @@
 Imakefile.orig Tue Dec 11 16:38:52 2001
-+++ Imakefile  Sun Sep  2 19:01:07 2012
-@@ -11,7 +11,7 @@ XCOMM
- #undef  USE_SOUND
- #define XPM
- #define USEM4
--#undef X11R6
-+#define X11R6
- #undef I18N
- 
-  YFLAGS = -d
-@@ -145,14 +145,6 @@ depend:: lex.c gram.c deftwmrc.c 
- NormalLibraryTarget(ctwm, libctwm.o)
- ComplexProgramTarget(ctwm)
- InstallNonExecFile(system.ctwmrc,$(TWMDIR))
--#ifdef XPM
--install:: xpm
--  MakeDir($(DESTDIR)$(TWMDIR)/images)
--  @case '${MFLAGS}' in *[i]*) set +e;; esac; \
--  for i in xpm/?* ; do \
--  (set -x; $(INSTALL) -c $(INSTLIBFLAGS) $$i 
$(DESTDIR)$(TWMDIR)/images); \
--  done
--#endif
- 
- gram.h gram.c: gram.y
-   $(YACC) $(YFLAGS) gram.y
Index: patches/patch-gram.y
===
RCS file: patches/patch-gram.y
diff -N patches/patch-gram.y
--- patches/patch-gram.y17 Sep 2012 10:25:49 -  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,56 +0,0 @@
 gram.y.origTue Dec 11 16:38:52 2001
-+++ gram.y Sun Sep  2 18:59:56 2012
-@@ -419,7 +419,6 @@ stmt   : error
-   | WINDOW_RING   { list = >WindowRingL; }
- win_list
-   | WINDOW_RING   { Scr->WindowRingAll = TRUE; }
--  ;
-   | WINDOW_RING_EXCLUDE{ if (!Scr->WindowRingL)
- Scr->WindowRingAll = TRUE;
- list = >WindowRingExcludeL; }
-@@ -427,6 +426,7 @@ stmt   : error
- 
-   | WINDOW_GEOMETRIES  {  }
- wingeom_list
-+  ;
- 
- noarg : KEYWORD   { if (!do_single_keyword ($1)) {
-   twmrc_error_prefix();
-@@ -683,10 +683,10 @@ wingeom_entries  : /* Empty */
-   | wingeom_entries wingeom_entry
-   ;
- 
--wingeom_entry : string string { AddToList (>WindowGeometries, $1, $2) }
-+wingeom_entry : string string { AddToList (>WindowGeometries, $1, $2); }
-+  ;
- 
- 
--
- squeeze   : SQUEEZE_TITLE { 
-   if (HasShape) Scr->SqueezeTitle = TRUE;
-   }
-@@ -834,6 +834,7 @@ occupy_workspc_entries :   /* Empty */
- occupy_workspc_entry  : string {
-   AddToClientsList ($1, client);
- }
-+  ;
- 
- occupy_window_list: LB occupy_window_entries RB {}
-   ;
-@@ -845,6 +846,7 @@ occupy_window_entries  :   /* Empty */
- occupy_window_entry   : string {
-   AddToClientsList (workspace, $1);
- }
-+  ;
- 
- icon_list : LB icon_entries RB {}
-   

Re: textproc/aspell uselocale undefined symbol from converters/libiconv

[Ian McWilliam]

You are correct. spell hadn't at that point been updated and still pointed to 
the old libc.

What's interesting is a

make repackage update in textproc/aspell directory sees the failure.

make repackage update in textporoc/aspell/core first, solved the issue.

Thanks.

Ian McWilliam


From: Ingo Schwarze 
Sent: Wednesday, 6 September 2017 10:16 PM
To: Ian McWilliam
Cc: ports@openbsd.org
Subject: Re: textproc/aspell uselocale undefined symbol from converters/libiconv

Hi Ian,

I suspect that you have some parts of your ports/packages out of
sync with other parts.

Ian McWilliam wrote on Wed, Sep 06, 2017 at 04:32:34AM +:

> ===>  Building for aspell-af-0.50.0v1
> /usr/local/bin/word-list-compress d < af.cwl | /usr/local/bin/aspell  
> --lang=af create master ./af.rws
> aspell:/usr/local/lib/libintl.so.6.0: undefined symbol 'uselocale'
> ld.so: aspell: lazy binding failed!

That looks like /usr/local/bin/aspell is still linking against an
old version of libc, even though it looks like you have already
updated your copy of the devel/gettext package.

What does

  $ ldd /usr/local/bin/aspell

tell you, in particular regarding libc.so.*.*?
It ought to report /usr/lib/libc.so.90.0.

Does it help to first rebuild and re-install textproc/aspell
before attemptimg to build aspell-af?

> I'll assume this has some interaction with the change in libc
>
> New POSIX xlocale implementation written from scratch.
> Complete in the sense that all POSIX *locale(3) and *_l(3) functions
> are included, but in OpenBSD, we of course only really care about
> LC_CTYPE and we only support ASCII and UTF-8.
>
> With important help from kettenis@, guenther@, and jca@.
> Repeated testing in ports bulk builds by naddy@.
> Additional testing by jca@, sebastia@, dcoppa@, and others.
> OK kettenis@ dcoppa@, and guenther@ on an earlier version.
> Riding guenther@'s libc/librthread major bump.
>
> converters/libiconv was rebuilt and updated too due to library bumps.

That sounds fine and is expected (because it uses libc), but i do
not think that libiconv is related to your problem: libintl is part
of gettext, not of libiconv.  But gettext is unlikely to be your
problem either: the fact that it wants uselocale(3) indicates that
it is probably already up-to-date.  So my hunch is that aspell
itself is what you forgot to update; not sure though because of
slightly sparse information.

In any case, aspell-af builds and installs fine for me on amd64-current;
not tested at runtime.

Yours,
  Ingo

Re: clang FFmpeg segfaults on i386 [st...@openbsd.org: CVS: cvs.openbsd.org: ports]

[Jan Beich]

Stuart Henderson  writes:

[...]
> So this works around the recently-reported hangs seen on amd64 but we
> still have a segfault issue on i386 (I've only seen this so far when
> decoding H264, though given the function other things may use it too).

Probably same as https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=205958
Update to FFmpeg 3.2+ or try the following patch.

--- configure~
+++ configure
@@ -5685,6 +5685,10 @@ elif enabled llvm_gcc; then
 check_cflags -mllvm -stack-alignment=16
 elif enabled clang; then
 check_cflags -mllvm -stack-alignment=16
+check_cflags -mstack-alignment=16
+if enabled x86_32; then
+check_cflags -mstackrealign
+fi
 check_cflags -Qunused-arguments
 check_cflags -Werror=implicit-function-declaration
 check_cflags -Werror=missing-prototypes


signature.asc
Description: PGP signature

/mail/trojita Segmentation fault on i386

[Eda Sky]

Hi

On the last snapshots /mail/trojita Segmentation fault on i386

some ideas please?


$ gdb trojita
GNU gdb 6.3
Copyright 2004 Free Software Foundation, Inc.
GDB is free software, covered by the GNU General Public License, and you are
welcome to change it and/or distribute copies of it under certain conditions.
Type "show copying" to see the conditions.
There is absolutely no warranty for GDB.  Type "show warranty" for details.
This GDB was configured as "i386-unknown-openbsd6.2"...

(gdb) run
Starting program: /usr/local/bin/trojita
warning: Lowest section in /usr/local/lib/libicudata.so.13.0 is .hash at
2000
QStandardPaths: XDG_RUNTIME_DIR not set, defaulting to '/tmp/runtime-edasky'
[New process 5587]
trojita:/usr/lib/libc++.so.1.0: undefined symbol 'iswalpha_l'
trojita:/usr/lib/libc++.so.1.0: undefined symbol 'iswprint_l'
trojita:/usr/lib/libc++.so.1.0: undefined symbol 'iswlower_l'
trojita:/usr/lib/libc++.so.1.0: undefined symbol 'towlower_l'
trojita:/usr/lib/libc++.so.1.0: undefined symbol 'isupper_l'
trojita:/usr/lib/libc++.so.1.0: undefined symbol 'tolower_l'
trojita:/usr/lib/libc++.so.1.0: undefined symbol 'iswxdigit_l'
trojita:/usr/lib/libc++.so.1.0: undefined symbol 'strxfrm_l'
trojita:/usr/lib/libc++.so.1.0: undefined symbol 'strftime_l'
trojita:/usr/lib/libc++.so.1.0: undefined symbol 'toupper_l'
trojita:/usr/lib/libc++.so.1.0: undefined symbol 'isxdigit_l'
trojita:/usr/lib/libc++.so.1.0: undefined symbol 'wcsxfrm_l'
trojita:/usr/lib/libc++.so.1.0: undefined symbol 'islower_l'
trojita:/usr/lib/libc++.so.1.0: undefined symbol 'newlocale'
trojita:/usr/lib/libc++.so.1.0: undefined symbol 'iswdigit_l'
trojita:/usr/lib/libc++.so.1.0: undefined symbol 'iswblank_l'
trojita:/usr/lib/libc++.so.1.0: undefined symbol 'uselocale'
trojita:/usr/lib/libc++.so.1.0: undefined symbol 'iswcntrl_l'
trojita:/usr/lib/libc++.so.1.0: undefined symbol 'strcoll_l'
trojita:/usr/lib/libc++.so.1.0: undefined symbol 'iswpunct_l'
trojita:/usr/lib/libc++.so.1.0: undefined symbol 'iswspace_l'
trojita:/usr/lib/libc++.so.1.0: undefined symbol 'towupper_l'
trojita:/usr/lib/libc++.so.1.0: undefined symbol 'iswupper_l'
trojita:/usr/lib/libc++.so.1.0: undefined symbol 'freelocale'
trojita:/usr/lib/libc++.so.1.0: undefined symbol 'isdigit_l'
trojita:/usr/lib/libc++.so.1.0: undefined symbol 'wcscoll_l'

Program received signal SIGSEGV, Segmentation fault.
0x025a80c6 in
WebCore::FrameLoaderClientQt::dispatchDecidePolicyForNavigationAction ()
   from /usr/local/lib/libQt5WebKit.so.2.1
Current language:  auto; currently minimal
(gdb)




OpenBSD 6.2-beta (GENERIC.MP) #110: Tue Sep  5 12:46:23 MDT 2017
dera...@i386.openbsd.org:/usr/src/sys/arch/i386/compile/GENERIC.MP
cpu0: Genuine Intel(R) CPU U2500 @ 1.20GHz ("GenuineIntel" 686-class) 1.20
GHz
cpu0:
FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,MWAIT
,VMX,EST,TM2,xTPR,PDCM,PERF,SENSOR
real mem  = 2138390528 (2039MB)
avail mem = 2083315712 (1986MB)
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: date 07/02/08, BIOS32 rev. 0 @ 0xf, SMBIOS rev. 2.4
@ 0xf4170 (21 entries)
bios0: vendor Hewlett-Packard version "68YOP Ver. F.0E" date 07/02/2008
bios0: Hewlett-Packard HP Compaq nc2400(#AKB)
acpi0 at bios0: rev 2
acpi0: sleep states S0 S3 S4 S5
acpi0: tables DSDT FACP SLIC HPET APIC MCFG TCPA SSDT SSDT SSDT SSDT SSDT
acpi0: wakeup devices C094(S5) C1DE(S0) C0EF(S3) C0F6(S3) C0F7(S3)
C0F8(S3) C0F9(S3) C100(S5) C1EA(S5)
acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpihpet0 at acpi0: 14318179 Hz
acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
mtrr: Pentium Pro MTRR support, 8 var ranges, 88 fixed ranges
cpu0: apic clock running at 132MHz
cpu0: mwait min=64, max=64, C-substates=0.2.2.2.2, IBE
cpu1 at mainbus0: apid 1 (application processor)
cpu1: Genuine Intel(R) CPU U2500 @ 1.20GHz ("GenuineIntel" 686-class) 1.20
GHz
cpu1:
FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,MWAIT
,VMX,EST,TM2,xTPR,PDCM,PERF,SENSOR
ioapic0 at mainbus0: apid 1 pa 0xfec0, version 20, 24 pins
, remapped to apid 1
acpimcfg0 at acpi0 addr 0xf800, bus 0-63
acpiprt0 at acpi0: bus 2 (C094)
acpiprt1 at acpi0: bus 8 (C100)
acpiprt2 at acpi0: bus 0 (C002)
acpiec0 at acpi0
acpicpu0 at acpi0: !C2(500@1 io@0x1014), C1(1000@1 halt), PSS
acpicpu1 at acpi0: !C2(500@1 io@0x1014), C1(1000@1 halt), PSS
acpipwrres0 at acpi0: C1D6, resource for C1D4
acpipwrres1 at acpi0: C2C9, resource for C2CD
acpipwrres2 at acpi0: C2CA, resource for C2CE
acpipwrres3 at acpi0: C2CB, resource for C2CF
acpipwrres4 at acpi0: C2CC, resource for C2D0
acpitz0 at acpi0: critical temperature is 105 degC
acpitz1 at acpi0: critical temperature is 105 degC
acpitz2 at acpi0: critical temperature is 105 degC
acpitz3 at acpi0: critical temperature is 105 degC
acpitz4 at acpi0: critical temperature is 110 degC
"SYN0123" at acpi0 not 

UPDATE: Lynis-2.5.4

[Gonzalo L. Rodriguez]

Hello,

Update for Lynis to 2.5.4:

https://cisofy.com/changelog/lynis/2.5.4/

Ok? Comments?

Cheers.-

-- 
Sending from my toaster.
Index: Makefile
===
RCS file: /cvs/ports/security/lynis/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile22 Aug 2017 18:58:40 -  1.18
+++ Makefile6 Sep 2017 15:49:19 -
@@ -2,7 +2,7 @@
 
 COMMENT=   security auditing tool
 
-DISTNAME = lynis-2.5.3
+DISTNAME = lynis-2.5.4
 
 CATEGORIES=security
 
Index: distinfo
===
RCS file: /cvs/ports/security/lynis/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo22 Aug 2017 18:58:40 -  1.16
+++ distinfo6 Sep 2017 15:49:19 -
@@ -1,2 +1,2 @@
-SHA256 (lynis-2.5.3.tar.gz) = rcxEjCs/Pyzf9Cz3EEzpmmCo/PguEiT9hH7j8n8ki4U=
-SIZE (lynis-2.5.3.tar.gz) = 264760
+SHA256 (lynis-2.5.4.tar.gz) = CKZuoG+alshllJW+fX2VMNw06medN379dhMHFi+JVxY=
+SIZE (lynis-2.5.4.tar.gz) = 267233
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/lynis/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- pkg/PLIST   12 Jul 2017 17:30:46 -  1.12
+++ pkg/PLIST   6 Sep 2017 15:49:19 -
@@ -32,6 +32,7 @@ share/lynis/db/languages/he
 share/lynis/db/languages/hu
 share/lynis/db/languages/it
 share/lynis/db/languages/ja
+share/lynis/db/languages/nb-NO
 share/lynis/db/languages/nl
 share/lynis/db/languages/nl-BE
 share/lynis/db/languages/nl-NL

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/09/06 01:10:23

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

Log message:
Register removal of mono-zeroconf and banshee.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/09/06 01:09:21

Modified files:
net: Makefile 
Removed files:
net/mono-zeroconf: Makefile distinfo 
net/mono-zeroconf/patches: patch-configure 
   
patch-src_Mono_Zeroconf_Providers_AvahiDBus_NDesk_DBus_UnixNativeTransport_cs 
net/mono-zeroconf/pkg: DESCR PLIST 

Log message:
Remove mono-zeroconf, nothing uses it anymore and it gets in the way
of building avahi subpackages.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/09/06 01:08:21

Modified files:
x11/gnome  : Makefile 
Removed files:
x11/gnome/banshee: Makefile distinfo 
x11/gnome/banshee/patches: patch-configure 
   patch-src_Clients_Booter_banshee_linux_in 
x11/gnome/banshee/pkg: DESCR PLIST 

Log message:
Remove banshee, it's not developed upstream and is the only port needing
net/mono-zeroconf which will soon join the attic.

ok jasper@

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/09/06 01:27:26

Modified files:
net/py-botocore: Makefile distinfo 

Log message:
Update to py-botocore-1.7.4.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/09/06 01:22:46

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

Log message:
Register removal of mono-avahi.

CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2017/09/06 02:04:05

Modified files:
devel/jsoncpp/patches: patch-meson_build 

Log message:
Sync with upstream

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/09/06 01:21:05

Modified files:
net/avahi  : Makefile 
Removed files:
net/avahi/pkg  : DESCR-mono PLIST-mono 

Log message:
Remove the -mono subpackage, nothing uses it anymore.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/09/06 01:21:37

Modified files:
net/gajim  : Makefile 
net/libepc : Makefile 
print/cups : Makefile 
x11/gnome/vinagre: Makefile 
x11/remmina: Makefile 

Log message:
Fix DEPENDS after the removal of net/avahi,-mono.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/09/06 02:59:44

Modified files:
net/dnsdist: Makefile distinfo 
net/dnsdist/patches: patch-configure_ac 
Removed files:
net/dnsdist/patches: patch-ext_json11_json11_cpp 

Log message:
security update to dnsdist-1.2.0, maintainer timeout

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2017/09/06 05:06:03

Modified files:
textproc/apertium-dicts/dan: Makefile 

Log message:
actually bump REVISION

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/09/06 07:41:55

Modified files:
devel/py-libmagic: Makefile distinfo 
devel/libmagic : Makefile distinfo 

Log message:
update to libmagic (file) 5.32

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/09/06 08:18:08

Modified files:
graphics/ImageMagick: Makefile distinfo 

Log message:
update to ImageMagick 6.9.9-11

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/09/06 08:20:43

Modified files:
graphics/openjp2: Makefile distinfo 
graphics/openjp2/patches: patch-CMakeLists_txt 
  patch-src_bin_jp2_convert_c 
  patch-src_lib_openmj2_opj_malloc_h 
graphics/openjp2/pkg: PLIST 

Log message:
update to OpenJPEG 2.2.0, add some of the tests scaffolding. (requires
a separate fetch of test data; forcing fetch of 470MB test data for a ~2MB
port seems overkill)

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2017/09/06 15:14:16

Modified files:
devel/ectags   : Makefile 

Log message:
Fix build failure due to a macro crashing with system headers

ectags defines an __unused__ macro that clashes with functions using
__attribute__((__unused__).  A bunch of such functions were introduced
recently as part of the uselocale work from schwarze@.

Bulk-rename the offending macro and another one similarly named to
something more reasonable.

Committing early since ectags is needed by vim-taglist and
x11/gnome/builder.  Comment suggested by schwarze@, ok schwarze@ sthen@

CVS: cvs.openbsd.org: ports

[Gonzalo L . Rodriguez]

CVSROOT:/cvs
Module name:ports
Changes by: gonz...@cvs.openbsd.org 2017/09/06 13:40:24

Modified files:
security/lynis : Makefile distinfo 
security/lynis/pkg: PLIST 

Log message:
Update for Lynis to 2.5.4

OK benoit@

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2017/09/06 15:45:22

Modified files:
devel/ectags   : Makefile 

Log message:
Actually add a comment (by schwarze@) explaining previous commit

CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2017/09/06 10:42:57

Modified files:
audio/ncmpcpp  : Makefile 
Added files:
audio/ncmpcpp/patches: patch-src_curses_window_h 

Log message:
- cleanup CPPFLAGS
- remove no longer necessary 'CXXFLAGS += -O1' hack
- unbreak user input in the Find prompts

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2017/09/06 11:14:29

Modified files:
x11/gtksourceview3: Makefile distinfo 
x11/gtksourceview3/pkg: PLIST 

Log message:
update to gtksourceview-3.24.4