CVS: cvs.openbsd.org: ports

[Stuart Cassoff]

CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2017/05/14 22:05:55

Modified files:
textproc/pdf4tcl: Makefile distinfo 
textproc/pdf4tcl/pkg: DESCR 

Log message:
Update to 0.9.1.

NEW: tdbc-postgres

[Stuart Cassoff]

Postgresql driver for TDBC.

Tested ok with gcc/clang on i386/amd64.


Stu

tdbc-postgres-1.0.4-port.tar.gz
Description: application/gzip

Re: NEW: graphics/krita

[mitchell wodach]

A whole bunch of tests fail.

# make test
===>  Regression tests for krita-3.1.3
[0/1] cd /usr/ports/pobj/krita-3.1.3/build-amd64 &&
/usr/local/bin/ctest --force-new-ctest-process
Test project /usr/ports/pobj/krita-3.1.3/build-amd64
Start   1: libs-widgetutils-KoPropertiesTest
  1/173 Test   #1: libs-widgetutils-KoPropertiesTest
.   Passed0.08 sec
Start   2: krita-ui-KisSimpleMathParserTest
  2/173 Test   #2: krita-ui-KisSimpleMathParserTest
..   Passed0.30 sec
Start   3: libs-widgets-zoomhandler_test
  3/173 Test   #3: libs-widgets-zoomhandler_test
.   Passed0.13 sec
Start   4: libs-widgets-zoomcontroller_test
  4/173 Test   #4: libs-widgets-zoomcontroller_test
..***Exception: Other  0.20 sec
Start   5: krita-ui-kis_parse_spin_boxes_test
  5/173 Test   #5: krita-ui-kis_parse_spin_boxes_test
***Exception: Other  0.40 sec
Start   6: libs-odf-TestKoLZF
  6/173 Test   #6: libs-odf-TestKoLZF
   Passed0.13 sec
Start   7: libs-odf-TestKoXmlVector
  7/173 Test   #7: libs-odf-TestKoXmlVector
..   Passed0.08 sec
Start   8: libs-odf-TestKoGenStyles
  8/173 Test   #8: libs-odf-TestKoGenStyles
..***Exception: Other  0.12 sec
Start   9: libs-odf-TestOdfSettings
  9/173 Test   #9: libs-odf-TestOdfSettings
..   Passed0.07 sec
Start  10: libs-odf-TestKoOdfLoadingContext
 10/173 Test  #10: libs-odf-TestKoOdfLoadingContext
..   Passed0.06 sec
Start  11: libs-odf-TestStorage
 11/173 Test  #11: libs-odf-TestStorage
..   Passed0.12 sec
Start  12: libs-odf-TestXmlWriter
 12/173 Test  #12: libs-odf-TestXmlWriter
   Passed0.10 sec
Start  13: libs-odf-TestXmlReader
 13/173 Test  #13: libs-odf-TestXmlReader
   Passed0.39 sec
Start  14: libs-odf-TestXmlReaderWithoutSpaces
 14/173 Test  #14: libs-odf-TestXmlReaderWithoutSpaces
...   Passed0.34 sec
Start  15: libs-odf-kodomtest
 15/173 Test  #15: libs-odf-kodomtest
***Exception: Other  0.11 sec
Start  16: libs-odf-TestKoUnit
 16/173 Test  #16: libs-odf-TestKoUnit
...   Passed0.06 sec
Start  17: libs-odf-TestNumberStyle
 17/173 Test  #17: libs-odf-TestNumberStyle
..***Exception: Other  0.10 sec
Start  18: libs-odf-TestKoElementReference
 18/173 Test  #18: libs-odf-TestKoElementReference
...***Exception: Other  0.11 sec
Start  19: libs-kritaflake-TestPosition
 19/173 Test  #19: libs-kritaflake-TestPosition
..   Passed0.14 sec
Start  20: libs-kritaflake-TestSelection
 20/173 Test  #20: libs-kritaflake-TestSelection
.   Passed0.12 sec
Start  21: libs-kritaflake-TestPathTool
 21/173 Test  #21: libs-kritaflake-TestPathTool
..***Exception: Other  0.16 sec
Start  22: libs-kritaflake-TestShapeAt
 22/173 Test  #22: libs-kritaflake-TestShapeAt
...***Exception: Other  0.22 sec
Start  23: libs-kritaflake-TestShapePainting
 23/173 Test  #23: libs-kritaflake-TestShapePainting
.***Exception: Other  0.20 sec
Start  24: libs-kritaflake-TestKoShapeFactory
 24/173 Test  #24: libs-kritaflake-TestKoShapeFactory
   Passed0.15 sec
Start  25: libs-kritaflake-TestKoShapeRegistry
 25/173 Test  #25: libs-kritaflake-TestKoShapeRegistry
...***Exception: Other  0.16 sec
Start  26: libs-kritaflake-TestShapeContainer
 26/173 Test  #26: libs-kritaflake-TestShapeContainer
***Exception: Other  0.22 sec
Start  27: libs-kritaflake-TestShapeGroupCommand
 27/173 Test  #27: libs-kritaflake-TestShapeGroupCommand
.***Exception: Other  0.19 sec
Start  28: libs-kritaflake-TestShapeReorderCommand
 28/173 Test  #28: libs-kritaflake-TestShapeReorderCommand
...***Exception: Other  0.19 sec
Start  29: libs-kritaflake-TestImageCollection
 29/173 Test  #29: libs-kritaflake-TestImageCollection
...***Exception: Other  0.20 sec
Start  30: libs-kritaflake-TestResourceManager
 30/173 Test  #30: libs-kritaflake-TestResourceManager
...***Exception: Other  0.17 sec
Start  31: libs-kritaflake-TestShapeBackgroundCommand
 31/173 Test  #31: libs-kritaflake-TestShapeBackgroundCommand
***Exception: Other  0.21 sec

Re: Core dump in wavpack on sparc

[Tim van der Molen]

Tim van der Molen (2017-05-15 00:38 +0200):
> Graham Stephens (2017-05-14 23:57 +0200):
> > > On 2017/05/14 14:38, Graham Stephens wrote:
> > > > Tested and working/matching against JF's sample.
> > > 
> > > Thanks.
> > > 
> > > > Err... however - and I apologise for not thinking ahead and mentioning 
> > > > it
> > > > earlier - but there's also a wvunpack program in the same package (with 
> > > > the
> > > > opposite functionality). It was only when I came to test it against 
> > > > itself
> > > > that I realised this might also be an issue. :(
> > > 
> > > In theory my diff should have fixed both wavpack and wvunpack.
> > > 
> > 
> > I can see in the diff you sent that wavpack and wvunpack both have md5.c
> > removed from the sources, but alas wvunpack -m fails with the same error
> > that struck wavpack originally.
> 
> Could you send a new backtrace please?

It seems Juan Francisco has already found the problem. Please try this
diff.

Index: Makefile
===
RCS file: /cvs/ports/audio/wavpack/Makefile,v
retrieving revision 1.22
diff -p -u -r1.22 Makefile
--- Makefile1 Feb 2017 22:06:14 -   1.22
+++ Makefile14 May 2017 23:42:25 -
@@ -3,6 +3,7 @@
 COMMENT =  audio codec for lossless, lossy and hybrid compression
 
 DISTNAME = wavpack-5.1.0
+REVISION = 0
 CATEGORIES =   audio
 
 HOMEPAGE = http://www.wavpack.com/
@@ -28,6 +29,9 @@ CONFIGURE_ENV =   CPPFLAGS="-I${LOCALBASE
LDFLAGS="-L${LOCALBASE}/lib"
 
 DOCDIR =   ${PREFIX}/share/doc/wavpack
+
+pre-configure:
+   sed -i 's,#include "md5.h",#include ,' ${WRKSRC}/cli/*.c
 
 post-install:
${INSTALL_DATA_DIR} ${DOCDIR}
Index: patches/patch-cli_Makefile_in
===
RCS file: patches/patch-cli_Makefile_in
diff -N patches/patch-cli_Makefile_in
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-cli_Makefile_in   14 May 2017 23:42:25 -
@@ -0,0 +1,33 @@
+$OpenBSD$
+
+Index: cli/Makefile.in
+--- cli/Makefile.in.orig
 cli/Makefile.in
+@@ -107,7 +107,7 @@ am__wavpack_SOURCES_DIST = wavpack.c riff.c wave64.c c
+ am_wavpack_OBJECTS = wavpack-wavpack.$(OBJEXT) wavpack-riff.$(OBJEXT) \
+   wavpack-wave64.$(OBJEXT) wavpack-caff.$(OBJEXT) \
+   wavpack-dsdiff.$(OBJEXT) wavpack-dsf.$(OBJEXT) \
+-  wavpack-utils.$(OBJEXT) wavpack-md5.$(OBJEXT) \
++  wavpack-utils.$(OBJEXT) \
+   wavpack-import_id3.$(OBJEXT) $(am__objects_1)
+ wavpack_OBJECTS = $(am_wavpack_OBJECTS)
+ am__DEPENDENCIES_1 =
+@@ -144,8 +144,7 @@ wvtag_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTO
+   $(LIBTOOLFLAGS) --mode=link $(CCLD) $(wvtag_CFLAGS) $(CFLAGS) \
+   $(wvtag_LDFLAGS) $(LDFLAGS) -o $@
+ am__wvtest_SOURCES_DIST = wvtest.c md5.c
+-@ENABLE_TESTS_TRUE@am_wvtest_OBJECTS = wvtest-wvtest.$(OBJEXT) \
+-@ENABLE_TESTS_TRUE@   wvtest-md5.$(OBJEXT)
++@ENABLE_TESTS_TRUE@am_wvtest_OBJECTS = wvtest-wvtest.$(OBJEXT)
+ wvtest_OBJECTS = $(am_wvtest_OBJECTS)
+ @ENABLE_TESTS_TRUE@wvtest_DEPENDENCIES =  \
+ @ENABLE_TESTS_TRUE@   $(top_builddir)/src/.libs/libwavpack.la \
+@@ -161,7 +160,7 @@ am_wvunpack_OBJECTS = wvunpack-wvunpack.$(OBJEXT) \
+   wvunpack-riff.$(OBJEXT) wvunpack-wave64.$(OBJEXT) \
+   wvunpack-caff.$(OBJEXT) wvunpack-dsdiff.$(OBJEXT) \
+   wvunpack-dsf.$(OBJEXT) wvunpack-utils.$(OBJEXT) \
+-  wvunpack-md5.$(OBJEXT) $(am__objects_4)
++  $(am__objects_4)
+ wvunpack_OBJECTS = $(am_wvunpack_OBJECTS)
+ wvunpack_DEPENDENCIES = $(top_builddir)/src/.libs/libwavpack.la \
+   $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

CVS: cvs.openbsd.org: ports

[Ingo Schwarze]

CVSROOT:/cvs
Module name:ports
Changes by: schwa...@cvs.openbsd.org2017/05/14 17:12:55

Modified files:
korean/hanterm-xf: Makefile 

Log message:
Translate the manual page from EUC-KR to UTF-8 using iconv(1) at build
time and install the unformatted version to be processed by mandoc(1)
at run time rather than misformatting it with USE_GROFF.
OK Jung Lee (MAINTAINER) and naddy@

Re: Core dump in wavpack on sparc

[Juan Francisco Cantero Hurtado]

On Sun, May 14, 2017 at 10:13:01PM +0100, Stuart Henderson wrote:
> On 2017/05/14 14:38, Graham Stephens wrote:
> > Tested and working/matching against JF's sample.
> 
> Thanks.
> 
> > Err... however - and I apologise for not thinking ahead and mentioning it
> > earlier - but there's also a wvunpack program in the same package (with the
> > opposite functionality). It was only when I came to test it against itself
> > that I realised this might also be an issue. :(
> 
> In theory my diff should have fixed both wavpack and wvunpack.

I added "#error" to md5.c and looks like you missed some line in the
makefiles:

mv -f .deps/wvunpack-utils.Tpo .deps/wvunpack-utils.Po
cc -DPACKAGE_NAME=\"wavpack\" -DPACKAGE_TARNAME=\"wavpack\"
-DPACKAGE_VERSION=\"5.1.0\" -DPACKAGE_STRING=\"wavpack\ 5.1.0\"
-DPACKAGE_BUGREPORT=\"bry...@wavpack.com\" -DPACKAGE_URL=\"\"
-DPACKAGE=\"wavpack\" -DVERSION=\"5.1.0\" -DLIBWAVPACK_MAJOR=5
-DLIBWAVPACK_MINOR=1 -DLIBWAVPACK_MICRO=0
-DLIBWAVPACK_VERSION_STRING=\"5.1.0\" -DVERSION_OS=\"OpenBSD\"
-DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1
-DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1
-DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1
-DLT_OBJDIR=\".libs/\" -DSTDC_HEADERS=1 -DHAVE_FSEEKO=1 -DENABLE_DSD=1
-DOPT_ASM_X64=1 -DHAVE___BUILTIN_CLZ=1 -DHAVE___BUILTIN_CTZ=1 -I.
-I/usr/write-ports/pobj/wavpack-5.1.0/wavpack-5.1.0/cli
-I/usr/local/include
-I/usr/write-ports/pobj/wavpack-5.1.0/wavpack-5.1.0/include -O2 -pipe
-MT wvunpack-md5.o -MD -MP -MF .deps/wvunpack-md5.Tpo -c -o
wvunpack-md5.o `test -f 'md5.c' || echo
'/usr/write-ports/pobj/wavpack-5.1.0/wavpack-5.1.0/cli/'`md5.c
/usr/write-ports/pobj/wavpack-5.1.0/wavpack-5.1.0/cli/md5.c:1:2: error:
#error 
*** Error 1 in cli (Makefile:919 'wvunpack-md5.o')



-- 
Juan Francisco Cantero Hurtado http://juanfra.info

Re: Core dump in wavpack on sparc

[Tim van der Molen]

Graham Stephens (2017-05-14 23:57 +0200):
> > On 2017/05/14 14:38, Graham Stephens wrote:
> > > Tested and working/matching against JF's sample.
> > 
> > Thanks.
> > 
> > > Err... however - and I apologise for not thinking ahead and mentioning it
> > > earlier - but there's also a wvunpack program in the same package (with 
> > > the
> > > opposite functionality). It was only when I came to test it against itself
> > > that I realised this might also be an issue. :(
> > 
> > In theory my diff should have fixed both wavpack and wvunpack.
> > 
> 
> I can see in the diff you sent that wavpack and wvunpack both have md5.c
> removed from the sources, but alas wvunpack -m fails with the same error
> that struck wavpack originally.

Could you send a new backtrace please?

Re: Core dump in wavpack on sparc

[Graham Stephens]

On 2017/05/14 14:38, Graham Stephens wrote:

Tested and working/matching against JF's sample.


Thanks.


Err... however - and I apologise for not thinking ahead and mentioning it
earlier - but there's also a wvunpack program in the same package (with the
opposite functionality). It was only when I came to test it against itself
that I realised this might also be an issue. :(


In theory my diff should have fixed both wavpack and wvunpack.



I can see in the diff you sent that wavpack and wvunpack both have md5.c 
removed from the sources, but alas wvunpack -m fails with the same error 
that struck wavpack originally.

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2017/05/14 15:24:59

Modified files:
infrastructure/bin: register-plist 

Log message:
allow register-plist to display a diff even without write access to
the plist directory.

Re: CVS: cvs.openbsd.org: ports

[Stuart Henderson]

On 2017/05/08 03:04, Patrick Wildt wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   patr...@cvs.openbsd.org 2017/05/08 03:04:54
> 
> Modified files:
>   devel/arm-none-eabi/gcc-linaro: Makefile distinfo 
>   devel/arm-none-eabi/gcc-linaro/patches: patch-Makefile_in 
>   patch-gcc_Makefile_in 
>   
> patch-gcc_config_arm_unknown-elf_h 
>   patch-gcc_config_host 
>   patch-libgcc_Makefile_in 
>   patch-libiberty_Makefile_in 
>   devel/arm-none-eabi/gcc-linaro/pkg: PFRAG.aarch64 PFRAG.arm 
> Added files:
>   devel/arm-none-eabi/gcc-linaro/patches: patch-gcc_configure 
> Removed files:
>   devel/arm-none-eabi/gcc-linaro/patches: 
>   
> patch-gcc_config_aarch64_geniterators_sh 
>   patch-gcc_gcc_c 
> 
> Log message:
> Update to gcc-linaro-6.3-2017.02 so that we can continue to build
> newer U-Boots whose SPL object files get too big to link.  U-Boot
> will require gcc 6.0 or later for ARM starting with v2018.01.
> 
> ok jsg@
> 

I'm having a problem building this on i386, libgcc configure fails:

Checking multilib configuration for libgcc...
mkdir arm-none-eabi
mkdir arm-none-eabi/libgcc
Configuring in arm-none-eabi/libgcc
configure: creating cache ./config.cache
checking build system type... i386-unknown-openbsd6.1
checking host system type... arm-none-eabi
checking for --enable-version-specific-runtime-libs... no
checking for a BSD-compatible install... 
/usr/obj/ports/arm-none-eabi-gcc-linaro-6.3.2017.02-arm/bin/install -c 
checking for gawk... awk
checking for arm-none-eabi-ar... /usr/local/arm-none-eabi/bin/ar
checking for arm-none-eabi-lipo... arm-none-eabi-lipo
checking for arm-none-eabi-nm... 
/usr/obj/ports/arm-none-eabi-gcc-linaro-6.3.2017.02-arm/build-i386-arm/./gcc/nm
checking for arm-none-eabi-ranlib... /usr/local/arm-none-eabi/bin/ranlib
checking for arm-none-eabi-strip... /usr/local/arm-none-eabi/bin/strip
checking whether ln -s works... yes
checking for arm-none-eabi-gcc... 
/usr/obj/ports/arm-none-eabi-gcc-linaro-6.3.2017.02-arm/build-i386-arm/./gcc/xgcc
 
-B/usr/obj/ports/arm-none-eabi-gcc-linaro-6.3.2017.02-arm/build-i386-arm/./gcc/ 
-B/usr/local/arm-none-eabi/bin/ -B/usr/local/arm-none-eabi/lib/ -isystem 
/usr/local/arm-none-eabi/include -isystem /usr/local/arm-none-eabi/sys-include  
 
checking for suffix of object files... configure: error: in 
`/usr/obj/ports/arm-none-eabi-gcc-linaro-6.3.2017.02-arm/build-i386-arm/arm-none-eabi/libgcc':
configure: error: cannot compute suffix of object files: cannot compile
See `config.log' for more details.
gmake[1]: *** [Makefile:10936: configure-target-libgcc] Error 1
gmake[1]: Leaving directory 
'/usr/obj/ports/arm-none-eabi-gcc-linaro-6.3.2017.02-arm/build-i386-arm'
gmake: *** [Makefile:850: all] Error 2
*** Error 2 in devel/arm-none-eabi/gcc-linaro 
(/usr/ports/infrastructure/mk/bsd.port.mk:2662 
'/usr/obj/ports/arm-none-eabi-gcc-linaro-6.3.2017.02-arm/build-i386-arm/.build_done')
*** Error 1 in devel/arm-none-eabi/gcc-linaro 
(/usr/ports/infrastructure/mk/bsd.port.mk:2363 'build')
===> Exiting devel/arm-none-eabi/gcc-linaro with an error
*** Error 1 in /usr/ports (infrastructure/mk/bsd.port.subdir.mk:147 'build')

Excerpt from config.log below, any ideas please?

configure:3653: checking for suffix of object files
configure:3675: 
/usr/obj/ports/arm-none-eabi-gcc-linaro-6.3.2017.02-arm/build-i386-arm/./gcc/xgcc
 
-B/usr/obj/ports/arm-none-eabi-gcc-linaro-6.3.2017.02-arm/build-i386-arm/./gcc/ 
-B/usr/loca
l/arm-none-eabi/bin/ -B/usr/local/arm-none-eabi/lib/ -isystem 
/usr/local/arm-none-eabi/include -isystem /usr/local/arm-none-eabi/sys-include  
  -c -g -O2  conftest.c >&5
conftest.c: In function 'main':
conftest.c:16:1: internal compiler error: Floating point exception
 }
 ^
libbacktrace could not find executable to open
Please submit a full bug report,
with preprocessed source if appropriate.
See  for instructions.
configure:3679: $? = 1
configure: failed program was:
| /* confdefs.h */
| #define PACKAGE_NAME "GNU C Runtime Library"
| #define PACKAGE_TARNAME "libgcc"
| #define PACKAGE_VERSION "1.0"
| #define PACKAGE_STRING "GNU C Runtime Library 1.0"
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL "http://www.gnu.org/software/libgcc/;
| /* end confdefs.h.  */
|
| int
| main ()
| {
|
|   ;
|   return 0;
| }
configure:3693: error: in 
`/usr/obj/ports/arm-none-eabi-gcc-linaro-6.3.2017.02-arm/build-i386-arm/arm-none-eabi/libgcc':
configure:3695: error: cannot compute suffix of object files: cannot compile

CVS: cvs.openbsd.org: ports

[Sebastian Reitenbach]

CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2017/05/14 15:24:13

Modified files:
sysutils/mcollective: Makefile distinfo 

Log message:
simple update to 2.10.4

Repair devel/protobuf tests

[Greg Steuck]

Looks like the upgrade to gtest-1.8 left devel/protobuf test-deficient. I
didn't find a good way to disable currently incompatible death tests, hence
the rash of patches.
History here on github

.

The better option is to move devel/protobuf forward to 3.3.0, but a bunch
of tests break in pretty unpleasant ways and thus I'm not offering these
patches

.


repair-protobuf-test.patch.gz
Description: application/gzip

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/05/14 15:18:05

Modified files:
textproc/tinyxml2: Makefile 
Added files:
textproc/tinyxml2/patches: patch-xmltest_cpp 

Log message:
unbreak on 32-bit

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/05/14 15:16:52

ports/textproc/tinyxml2/patches

Update of /cvs/ports/textproc/tinyxml2/patches
In directory cvs.openbsd.org:/tmp/cvs-serv5470/patches

Log Message:
Directory /cvs/ports/textproc/tinyxml2/patches added to the repository

Re: Core dump in wavpack on sparc

[Stuart Henderson]

On 2017/05/14 14:38, Graham Stephens wrote:
> Tested and working/matching against JF's sample.

Thanks.

> Err... however - and I apologise for not thinking ahead and mentioning it
> earlier - but there's also a wvunpack program in the same package (with the
> opposite functionality). It was only when I came to test it against itself
> that I realised this might also be an issue. :(

In theory my diff should have fixed both wavpack and wvunpack.

CVS: cvs.openbsd.org: ports

[Sebastian Reitenbach]

CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2017/05/14 14:36:21

Modified files:
sysutils/facter: Makefile distinfo 
sysutils/facter/patches: patch-lib_CMakeLists_txt 
Added files:
sysutils/facter/patches: patch-lib_src_facts_posix_cache_cc 

Log message:
Update to 3.6.4

Since 3.5, facts can be configured to be cached in facter.conf,
cached facts are stored in ${LOCALSTATEDIR}/puppetlabs/facter/cached_facts/

Feedback jasper@

Re: devel/sdl2 bug since update to 2.0.5

[Ryan Freeman]

On Sun, May 14, 2017 at 12:50:16PM -0700, Ryan Freeman wrote:
> On Sun, May 14, 2017 at 12:42:34PM -0700, Ryan Freeman wrote:
> > On Fri, Dec 02, 2016 at 10:46:32AM -0800, Ryan Freeman wrote:
> > > I wish I had noticed this sooner when the update was posted...
> > > 
> > > For whatever reason, certain applications with SDL2 2.0.5 are receving
> > > duplicate keyboard events.  Mouse seems unaffected, but the menus of some
> > > games are very hard to navigate.
> > > 
> > > If the Esc key opens a menu, instead what happens is it opens and closes
> > > before you can do anything.  If you happen to be in a menu, arrow keys
> > > for navigation move the selector up or down two spaces at a time.  Trying
> > > to open a console, would make it open and close immediately as well.
> > > 
> > > Gameplay-type keys would work normally in my testing.
> > > 
> > > games/quakespasm shows this problem.  I haven't found others just yet that
> > > are in ports, but it was while checking the SDL2 branch of chocolate-doom
> > > currently in development that led me to this discovery.
> > > Initially thought it was just a local problem with that project until i
> > > duplicated it also with doomretro (not in ports,
> > > http://github.com/bradharding/doomretro) and quakespasm.
> > > 
> > > My workstation at work still has a snapshot from Nov 8th, running SDL2 
> > > 2.0.4.
> > > As a result I can't reproduce the issue here.
> > > 
> > > My workstation at home ran a snapshot from Nov 17th when I found the 
> > > problem.
> > > I updated it to Dec 1 snapshot and verified the problem still exists.
> > > 
> > > I found this post in the SDL2 changelog:
> > > http://hg.libsdl.org/SDL/rev/aea47b61c640
> > > ...and wondered if it was somehow related.  I manually reverted this patch
> > > and gave it a go, but the problem persists.
> > > 
> > > Has anyone else noticed duplicated key events in SDL2 programs?  Any other
> > > examples?  I am not sure where to look, but don't want to keep this to 
> > > myself
> > > for too long...
> > 
> > 
> > FWIW, I finally found a solution for this.  The problem only happened for me
> > when using Gnome3 and SDL2 games, any other window manager was fine.  So I
> > had stopped using Gnome3.
> > 
> > But, I wasn't the only one :D
> > 
> > Lazy perusing the problem description led me here:
> > https://bbs.archlinux.org/viewtopic.php?id=219751
> > 
> > Which led here:
> > https://github.com/spurious/SDL-mirror/commit/2468785f0ac318a1afd0e6ad08b8d2a7d65a42a6
> > 
> > Which led to creating this patch for our sdl2.  after applying and upgrading
> > the sdl2 package, all affected programs above are no-longer affected. 
> > Without
> > rebuilding any of them, either.
> > 
> > Can we slip this in for now until (hopefully) sdl2-2.0.6 arrives?
> > 
> > Cheers!
> > -ryan
> 
> I screwed up the patch somehow, sorry.  fixed patch.
> 

Bah,  premature celebration.  While this patch at least removes
duplicate events to menus and such, it actually eats some events in
other situations.   So sometimes in a quakespasm or yquake2 game,
a movement key gets stuck 'on' until it is pressed again.

Stranger still, in yquake2 i can't open the console at all anymore,
and in quakespasm the console opens but no keypresses are registered...
except when i flutter the shift keys while hitting the key I want.

Seems like it needs to be flooded with enough key events before it
actually accepts the input.  Needless to say it took awhile to
type 'quit' ;)

I will keep nosing around this though, or perhaps try a more current
checkout of sdl2 altogether to see if I can at least expect to see
SDL2 + gnome3 + radeon graphics to have this key issue resolved finally.


> 
> ? sdl2_duplicate_event_fix.diff
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/sdl2/Makefile,v
> retrieving revision 1.16
> diff -u -p -r1.16 Makefile
> --- Makefile  14 May 2017 06:40:35 -  1.16
> +++ Makefile  14 May 2017 19:46:46 -
> @@ -4,7 +4,7 @@ COMMENT=  cross-platform multimedia libra
>  BROKEN-hppa= src/atomic/SDL_spinlock.c:101:2: error: \#error Please 
> implement for your platform.
>  
>  V=   2.0.5
> -REVISION=0
> +REVISION=1
>  DISTNAME=SDL2-${V}
>  PKGNAME= sdl2-${V}
>  CATEGORIES=  devel
> Index: patches/patch-src_video_x11_SDL_x11events_c
> ===
> RCS file: patches/patch-src_video_x11_SDL_x11events_c
> diff -N patches/patch-src_video_x11_SDL_x11events_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_video_x11_SDL_x11events_c   14 May 2017 19:46:46 
> -
> @@ -0,0 +1,24 @@
> +$OpenBSD$
> +
> +Index: src/video/x11/SDL_x11events.c
> +--- src/video/x11/SDL_x11events.c.orig
>  src/video/x11/SDL_x11events.c
> +@@ -571,12 +571,18 @@ X11_DispatchEvent(_THIS)
> + if (orig_keycode) {
> + /* Make sure dead key press/release events are sent */
> + 

Re: tweak: allow simulation of register-plist

[Marc Espie]

Forget hope, I forgot about the symlinks registration and everything.
I guess I'll have to do something smarter in register-plist, should be
feasible.

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2017/05/14 14:06:50

Modified files:
devel/p5-Term-Shell: Makefile distinfo 
devel/p5-Term-Shell/pkg: PLIST 

Log message:
Update to p5-Term-Shell-0.09.

Re: devel/sdl2 bug since update to 2.0.5

[Ryan Freeman]

On Fri, Dec 02, 2016 at 10:46:32AM -0800, Ryan Freeman wrote:
> I wish I had noticed this sooner when the update was posted...
> 
> For whatever reason, certain applications with SDL2 2.0.5 are receving
> duplicate keyboard events.  Mouse seems unaffected, but the menus of some
> games are very hard to navigate.
> 
> If the Esc key opens a menu, instead what happens is it opens and closes
> before you can do anything.  If you happen to be in a menu, arrow keys
> for navigation move the selector up or down two spaces at a time.  Trying
> to open a console, would make it open and close immediately as well.
> 
> Gameplay-type keys would work normally in my testing.
> 
> games/quakespasm shows this problem.  I haven't found others just yet that
> are in ports, but it was while checking the SDL2 branch of chocolate-doom
> currently in development that led me to this discovery.
> Initially thought it was just a local problem with that project until i
> duplicated it also with doomretro (not in ports,
> http://github.com/bradharding/doomretro) and quakespasm.
> 
> My workstation at work still has a snapshot from Nov 8th, running SDL2 2.0.4.
> As a result I can't reproduce the issue here.
> 
> My workstation at home ran a snapshot from Nov 17th when I found the problem.
> I updated it to Dec 1 snapshot and verified the problem still exists.
> 
> I found this post in the SDL2 changelog:
> http://hg.libsdl.org/SDL/rev/aea47b61c640
> ...and wondered if it was somehow related.  I manually reverted this patch
> and gave it a go, but the problem persists.
> 
> Has anyone else noticed duplicated key events in SDL2 programs?  Any other
> examples?  I am not sure where to look, but don't want to keep this to myself
> for too long...


FWIW, I finally found a solution for this.  The problem only happened for me
when using Gnome3 and SDL2 games, any other window manager was fine.  So I
had stopped using Gnome3.

But, I wasn't the only one :D

Lazy perusing the problem description led me here:
https://bbs.archlinux.org/viewtopic.php?id=219751

Which led here:
https://github.com/spurious/SDL-mirror/commit/2468785f0ac318a1afd0e6ad08b8d2a7d65a42a6

Which led to creating this patch for our sdl2.  after applying and upgrading
the sdl2 package, all affected programs above are no-longer affected. Without
rebuilding any of them, either.

Can we slip this in for now until (hopefully) sdl2-2.0.6 arrives?

Cheers!
-ryan


? sdl2_duplicate_event_fix.diff
Index: Makefile
===
RCS file: /cvs/ports/devel/sdl2/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile14 May 2017 06:40:35 -  1.16
+++ Makefile14 May 2017 19:35:03 -
@@ -4,7 +4,7 @@ COMMENT=cross-platform multimedia libra
 BROKEN-hppa=   src/atomic/SDL_spinlock.c:101:2: error: \#error Please 
implement for your platform.
 
 V= 2.0.5
-REVISION=  0
+REVISION=  1
 DISTNAME=  SDL2-${V}
 PKGNAME=   sdl2-${V}
 CATEGORIES=devel
Index: patches/patch-src_video_x11_SDL_x11events_c
===
RCS file: patches/patch-src_video_x11_SDL_x11events_c
diff -N patches/patch-src_video_x11_SDL_x11events_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_video_x11_SDL_x11events_c 14 May 2017 19:35:03 -
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+Index: src/video/x11/SDL_x11events.c
+--- src/video/x11/SDL_x11events.c.orig
 src/video/x11/SDL_x11events.c
+@@ -571,12 +571,18 @@ X11_DispatchEvent(_THIS)
+ if (orig_keycode) {
+ /* Make sure dead key press/release events are sent */
+ SDL_Scancode scancode = videodata->key_layout[orig_keycode];
++   videodata->filter_code = orig_keycode;
++   videodata->filter_time = xevent.xkey.time;
++
+ if (orig_event_type == KeyPress) {
+ SDL_SendKeyboardKey(SDL_PRESSED, scancode);
+ } else {
+ SDL_SendKeyboardKey(SDL_RELEASED, scancode);
+ }
+ }
++return;
++} else if (orig_keycode == videodata->filter_code && xevent.xkey.time == 
videodata->filter_time) {
++/* This is a duplicate event, resent by an IME - skip it. */
+ return;
+ }
+ 
Index: patches/patch-src_video_x11_SDL_x11video_h
===
RCS file: patches/patch-src_video_x11_SDL_x11video_h
diff -N patches/patch-src_video_x11_SDL_x11video_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_video_x11_SDL_x11video_h  14 May 2017 19:35:03 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Index: src/video/x11/SDL_x11video.h
+--- src/video/x11/SDL_x11video.h.orig
 src/video/x11/SDL_x11video.h
+@@ -133,10 +133,6 @@ typedef struct SDL_VideoData
+ #if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
+ XkbDescPtr xkb;
+ #endif
++
++KeyCode filter_code;
++Timefilter_time;
++
+ } 

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2017/05/14 13:54:42

Modified files:
devel/p5-IO-Pager: Makefile distinfo 
devel/p5-IO-Pager/pkg: PLIST 

Log message:
Update to p5-IO-Pager-0.39.

CVS: cvs.openbsd.org: ports

[Ingo Schwarze]

CVSROOT:/cvs
Module name:ports
Changes by: schwa...@cvs.openbsd.org2017/05/14 13:53:58

Modified files:
japanese/canna : Makefile 

Log message:
This port runs groff (along with jnroff) during the "build" target,
not during the "package" target, so "BUILD_DEPENDS += textproc/groff"
makes more sense than "USE_GROFF = Yes".
No package change, no bump.
OK espie@ (MAINTAINER)

Re: devel/sdl2 bug since update to 2.0.5

[Ryan Freeman]

On Sun, May 14, 2017 at 12:42:34PM -0700, Ryan Freeman wrote:
> On Fri, Dec 02, 2016 at 10:46:32AM -0800, Ryan Freeman wrote:
> > I wish I had noticed this sooner when the update was posted...
> > 
> > For whatever reason, certain applications with SDL2 2.0.5 are receving
> > duplicate keyboard events.  Mouse seems unaffected, but the menus of some
> > games are very hard to navigate.
> > 
> > If the Esc key opens a menu, instead what happens is it opens and closes
> > before you can do anything.  If you happen to be in a menu, arrow keys
> > for navigation move the selector up or down two spaces at a time.  Trying
> > to open a console, would make it open and close immediately as well.
> > 
> > Gameplay-type keys would work normally in my testing.
> > 
> > games/quakespasm shows this problem.  I haven't found others just yet that
> > are in ports, but it was while checking the SDL2 branch of chocolate-doom
> > currently in development that led me to this discovery.
> > Initially thought it was just a local problem with that project until i
> > duplicated it also with doomretro (not in ports,
> > http://github.com/bradharding/doomretro) and quakespasm.
> > 
> > My workstation at work still has a snapshot from Nov 8th, running SDL2 
> > 2.0.4.
> > As a result I can't reproduce the issue here.
> > 
> > My workstation at home ran a snapshot from Nov 17th when I found the 
> > problem.
> > I updated it to Dec 1 snapshot and verified the problem still exists.
> > 
> > I found this post in the SDL2 changelog:
> > http://hg.libsdl.org/SDL/rev/aea47b61c640
> > ...and wondered if it was somehow related.  I manually reverted this patch
> > and gave it a go, but the problem persists.
> > 
> > Has anyone else noticed duplicated key events in SDL2 programs?  Any other
> > examples?  I am not sure where to look, but don't want to keep this to 
> > myself
> > for too long...
> 
> 
> FWIW, I finally found a solution for this.  The problem only happened for me
> when using Gnome3 and SDL2 games, any other window manager was fine.  So I
> had stopped using Gnome3.
> 
> But, I wasn't the only one :D
> 
> Lazy perusing the problem description led me here:
> https://bbs.archlinux.org/viewtopic.php?id=219751
> 
> Which led here:
> https://github.com/spurious/SDL-mirror/commit/2468785f0ac318a1afd0e6ad08b8d2a7d65a42a6
> 
> Which led to creating this patch for our sdl2.  after applying and upgrading
> the sdl2 package, all affected programs above are no-longer affected. Without
> rebuilding any of them, either.
> 
> Can we slip this in for now until (hopefully) sdl2-2.0.6 arrives?
> 
> Cheers!
> -ryan

I screwed up the patch somehow, sorry.  fixed patch.


? sdl2_duplicate_event_fix.diff
Index: Makefile
===
RCS file: /cvs/ports/devel/sdl2/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile14 May 2017 06:40:35 -  1.16
+++ Makefile14 May 2017 19:46:46 -
@@ -4,7 +4,7 @@ COMMENT=cross-platform multimedia libra
 BROKEN-hppa=   src/atomic/SDL_spinlock.c:101:2: error: \#error Please 
implement for your platform.
 
 V= 2.0.5
-REVISION=  0
+REVISION=  1
 DISTNAME=  SDL2-${V}
 PKGNAME=   sdl2-${V}
 CATEGORIES=devel
Index: patches/patch-src_video_x11_SDL_x11events_c
===
RCS file: patches/patch-src_video_x11_SDL_x11events_c
diff -N patches/patch-src_video_x11_SDL_x11events_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_video_x11_SDL_x11events_c 14 May 2017 19:46:46 -
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+Index: src/video/x11/SDL_x11events.c
+--- src/video/x11/SDL_x11events.c.orig
 src/video/x11/SDL_x11events.c
+@@ -571,12 +571,18 @@ X11_DispatchEvent(_THIS)
+ if (orig_keycode) {
+ /* Make sure dead key press/release events are sent */
+ SDL_Scancode scancode = videodata->key_layout[orig_keycode];
++   videodata->filter_code = orig_keycode;
++   videodata->filter_time = xevent.xkey.time;
++
+ if (orig_event_type == KeyPress) {
+ SDL_SendKeyboardKey(SDL_PRESSED, scancode);
+ } else {
+ SDL_SendKeyboardKey(SDL_RELEASED, scancode);
+ }
+ }
++return;
++} else if (orig_keycode == videodata->filter_code && xevent.xkey.time == 
videodata->filter_time) {
++/* This is a duplicate event, resent by an IME - skip it. */
+ return;
+ }
+ 
Index: patches/patch-src_video_x11_SDL_x11video_h
===
RCS file: patches/patch-src_video_x11_SDL_x11video_h
diff -N patches/patch-src_video_x11_SDL_x11video_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_video_x11_SDL_x11video_h  14 May 2017 19:46:46 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Index: src/video/x11/SDL_x11video.h
+--- 

CVS: cvs.openbsd.org: ports

[Ingo Schwarze]

CVSROOT:/cvs
Module name:ports
Changes by: schwa...@cvs.openbsd.org2017/05/14 13:49:29

Modified files:
japanese/Wnn   : Makefile 
japanese/kakasi: Makefile 

Log message:
groff is not used at all, so delete USE_GROFF;
no package change, no bump;
OK espie@ (MAINTAINER)

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2017/05/14 13:46:38

Modified files:
databases/p5-DBIx-Class-Cursor-Cached: Makefile distinfo 

Log message:
Update to p5-DBIx-Class-Cursor-Cached-1.001004.

Enable built-in tests of devel/gtest

[Greg Steuck]

The tests now pass for me on amd64 with make test:

100% tests passed, 0 tests failed out of 41


devel-gtest-enable-tests.patch.gz
Description: application/gzip

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2017/05/14 12:51:22

Modified files:
net/librsync   : Makefile 
Added files:
net/librsync/patches: patch-src_search_c 

Log message:
Fix a crash that can affect duplicity.

Problem reported by danj@, already fixed upstream.

openvpn-2.4.2 security update for -stable

[Jeremie Courreges-Anglas]

Daniel Jakots  writes:

> Hey,
>
> OpenVPN got audited and they found some vulnerabilities [1]. 
> They released 2.4.2 to fix these issues.
>
> Here's a diff to update the port. I tested it as a client and as always
> more tests are wanted.
>
> [1]: https://ostif.org/the-openvpn-2-4-0-audit-by-ostif-and-quarkslab-results/

Thanks.  Here's a diff for 6.1, can someone give it a try on -stable?


Index: Makefile
===
RCS file: /d/cvs/ports/net/openvpn/Makefile,v
retrieving revision 1.73
diff -u -p -r1.73 Makefile
--- Makefile28 Mar 2017 22:16:37 -  1.73
+++ Makefile14 May 2017 17:29:16 -
@@ -2,7 +2,7 @@
 
 COMMENT=   easy-to-use, robust, and highly configurable VPN
 
-DISTNAME=  openvpn-2.4.1
+DISTNAME=  openvpn-2.4.2
 CATEGORIES=net security
 
 HOMEPAGE=  https://openvpn.net/index.php/open-source/
Index: distinfo
===
RCS file: /d/cvs/ports/net/openvpn/distinfo,v
retrieving revision 1.36
diff -u -p -r1.36 distinfo
--- distinfo28 Mar 2017 22:16:37 -  1.36
+++ distinfo12 May 2017 13:42:40 -
@@ -1,2 +1,2 @@
-SHA256 (openvpn-2.4.1.tar.gz) = gxoaBSaP47FkbTZ+JVnP+U00fSE8qJlcxIpO7cRSCXo=
-SIZE (openvpn-2.4.1.tar.gz) = 1385789
+SHA256 (openvpn-2.4.2.tar.gz) = skdAydRKgeryvvxIRtUURaUgEEMh4yqvDBNe0uCYpiQ=
+SIZE (openvpn-2.4.2.tar.gz) = 1402516
Index: patches/patch-configure
===
RCS file: /d/cvs/ports/net/openvpn/patches/patch-configure,v
retrieving revision 1.15
diff -u -p -r1.15 patch-configure
--- patches/patch-configure 28 Mar 2017 22:16:37 -  1.15
+++ patches/patch-configure 12 May 2017 13:42:40 -
@@ -1,7 +1,8 @@
 $OpenBSD: patch-configure,v 1.15 2017/03/28 22:16:37 jca Exp $
 configure.orig Wed Mar 22 16:34:35 2017
-+++ configure  Mon Mar 27 06:03:11 2017
-@@ -17299,7 +17299,7 @@ else
+Index: configure
+--- configure.orig
 configure
+@@ -17187,7 +17187,7 @@ else
  fi
  
  
Index: patches/patch-src_openvpn_tun_c
===
RCS file: /d/cvs/ports/net/openvpn/patches/patch-src_openvpn_tun_c,v
retrieving revision 1.12
diff -u -p -r1.12 patch-src_openvpn_tun_c
--- patches/patch-src_openvpn_tun_c 28 Mar 2017 22:16:37 -  1.12
+++ patches/patch-src_openvpn_tun_c 14 May 2017 17:29:51 -
@@ -2,8 +2,9 @@ $OpenBSD: patch-src_openvpn_tun_c,v 1.12
 
 - no need for link0 any more, we have separate tap interfaces
 
 src/openvpn/tun.c.orig Wed Mar 22 16:34:21 2017
-+++ src/openvpn/tun.c  Mon Mar 27 06:01:57 2017
+Index: src/openvpn/tun.c
+--- src/openvpn/tun.c.orig
 src/openvpn/tun.c
 @@ -1201,7 +1201,7 @@ do_ifconfig(struct tuntap *tt,
  if (tun)
  {
@@ -37,3 +38,18 @@ $OpenBSD: patch-src_openvpn_tun_c,v 1.12
  IFCONFIG_PATH,
  actual,
  ifconfig_local,
+@@ -1654,11 +1659,11 @@ write_tun_header(struct tuntap *tt, uint8_t *buf, int 
+ {
+ u_int32_t type;
+ struct iovec iv[2];
+-struct ip *iph;
++struct ip iph;
+ 
+-iph = (struct ip *) buf;
++memcpy(, buf, sizeof(iph));
+ 
+-if (iph->ip_v == 6)
++if (iph.ip_v == 6)
+ {
+ type = htonl(AF_INET6);
+ }


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

CVS: cvs.openbsd.org: ports

[Daniel Jakots]

CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2017/05/14 12:37:08

Modified files:
sysutils/duplicity: Makefile distinfo 
Removed files:
sysutils/duplicity/patches: 
patch-testing_functional_test_restart_py 

Log message:
Update to duplicity-0.7.12

CVS: cvs.openbsd.org: ports

[Frederic Cambus]

CVSROOT:/cvs
Module name:ports
Changes by: fcam...@cvs.openbsd.org 2017/05/14 11:49:27

Modified files:
devel/uthash   : Makefile distinfo 
devel/uthash/patches: patch-tests_Makefile 

Log message:
Update devel/uthash to 2.0.2, and take maintainership.

Also remove the unneeded PORTHOME directive.

CVS: cvs.openbsd.org: ports

[Daniel Jakots]

CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2017/05/14 11:45:52

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

Log message:
Update to pycha-0.7.0

>From semarie

CVS: cvs.openbsd.org: ports

[Daniel Jakots]

CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2017/05/14 11:45:21

Modified files:
print/py-relatorio: Makefile distinfo 
print/py-relatorio/pkg: PLIST 

Log message:
Update to py-relatorio-0.6.4

>From semarie

CVS: cvs.openbsd.org: ports

[Ingo Schwarze]

CVSROOT:/cvs
Module name:ports
Changes by: schwa...@cvs.openbsd.org2017/05/14 11:41:27

Modified files:
archivers/lha  : Makefile 

Log message:
groff is actually unused, drop USE_GROFF, no package change, no bump:
man/mann/lha.n is commented out in the PLIST
man/ja_JP.EUC/man1/lha.1 is installed unformatted even with USE_GROFF

CVS: cvs.openbsd.org: ports

[Daniel Jakots]

CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2017/05/14 10:43:33

Modified files:
net/openvpn: Makefile distinfo 
net/openvpn/patches: patch-configure 

Log message:
Security update to openvpn-2.4.2

OK gonzalo@ jca@ (maitainer)

CVS: cvs.openbsd.org: ports

[Daniel Jakots]

CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2017/05/14 10:39:02

Added files:
net/prosody/patches: patch-tests_run_tests_sh 
Removed files:
net/prosody/patches: patch-prosody 

Log message:
Missed in previous

CVS: cvs.openbsd.org: ports

[Ingo Schwarze]

CVSROOT:/cvs
Module name:ports
Changes by: schwa...@cvs.openbsd.org2017/05/14 10:37:52

Modified files:
x11/ogle   : Makefile 

Log message:
unimportant whitespace differences only, drop USE_GROFF and bump

CVS: cvs.openbsd.org: ports

[Ingo Schwarze]

CVSROOT:/cvs
Module name:ports
Changes by: schwa...@cvs.openbsd.org2017/05/14 10:37:07

Modified files:
editors/se : Makefile 

Log message:
identical output, drop USE_GROFF and bump

CVS: cvs.openbsd.org: ports

[Daniel Jakots]

CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2017/05/14 10:36:55

Modified files:
net/prosody: Makefile distinfo 
net/prosody/patches: patch-certs_Makefile patch-prosody 
 patch-tests_test_lua 

Log message:
Update to prosody-0.9.12

>From Henrik Friedrichsen (maintainer)

CVS: cvs.openbsd.org: ports

[Daniel Jakots]

CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2017/05/14 09:46:10

Modified files:
archivers/luazlib/patches: patch-test_lua 

Log message:
regen

Re: update: textproc/ripgrep 0.5.2

[Sebastien Marie]

On Sun, May 14, 2017 at 04:33:09PM +0200, Marc Espie wrote:
> On Sun, May 14, 2017 at 03:08:59PM +0200, Sebastien Marie wrote:
> > Hi,
> > 
> > An update to textproc/ripgrep 0.5.2.
> > 
> > See https://github.com/BurntSushi/ripgrep/releases/tag/0.5.2 for
> > changelog.
> > 
> > While here, adds gcc4 MODULES in order to use egcc as linker. It should
> > let ripgrep to build with cc=clang configuration. The problem was still
> > the same as cargo: clang doesn't know about libgcc.
> 
> One big question is: do you actually need libgcc, or is libcompiler_rt
> enough ?  For instance, we figured out that  emacs21 is happy with it.

The use of libgcc is for unwinding. libcompiler_rt seems to have some
unwinding symbols (but not all), so it could be valuable to test it.

An alternative way (for rustc at least), would be to provide a
standalone libunwind.a. Currently it is only available via libc++abi.a
(and it isn't compatible with libestdc++).

> libgcc is all nice and dandy, but gcc4 won't help with new arches that are
> clang only.

ripgrep is a Rust program: it requires a Rust compiler, which is only
available for amd64 and i386 currently.

-- 
Sebastien Marie

Re: update: textproc/ripgrep 0.5.2

[Marc Espie]

On Sun, May 14, 2017 at 03:08:59PM +0200, Sebastien Marie wrote:
> Hi,
> 
> An update to textproc/ripgrep 0.5.2.
> 
> See https://github.com/BurntSushi/ripgrep/releases/tag/0.5.2 for
> changelog.
> 
> While here, adds gcc4 MODULES in order to use egcc as linker. It should
> let ripgrep to build with cc=clang configuration. The problem was still
> the same as cargo: clang doesn't know about libgcc.

One big question is: do you actually need libgcc, or is libcompiler_rt
enough ?  For instance, we figured out that  emacs21 is happy with it.

libgcc is all nice and dandy, but gcc4 won't help with new arches that are
clang only.

CVS: cvs.openbsd.org: ports

[Ingo Schwarze]

CVSROOT:/cvs
Module name:ports
Changes by: schwa...@cvs.openbsd.org2017/05/14 08:30:03

Modified files:
devel/openmpi  : Makefile 

Log message:
unimportant blank line differences only, drop USE_GROFF and bump

Re: CVS: cvs.openbsd.org: ports

[Alexandr Shadchin]

On Sun, May 14, 2017 at 08:20:46AM -0600, Alexandr Shadchin wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   shadc...@cvs.openbsd.org2017/05/14 08:20:46
> 
> Modified files:
>   www/py-beautifulsoup4: Makefile distinfo 
> 
> Log message:
> Update to py-beautifulsoup4 4.6.0
> 

It was ok frantisek holop (maintainer)

-- 
Alexandr Shadchin

CVS: cvs.openbsd.org: ports

[Alexandr Shadchin]

CVSROOT:/cvs
Module name:ports
Changes by: shadc...@cvs.openbsd.org2017/05/14 08:20:46

Modified files:
www/py-beautifulsoup4: Makefile distinfo 

Log message:
Update to py-beautifulsoup4 4.6.0

tweak: allow simulation of register-plist

[Marc Espie]

There are actually two patches, one for src, the other for port.

1st patch unconditionally regenerates special files, even in -n mode,
so that they can be checksummed. As a result, the  printed plist contains
@sha256 markers for these.

Con: very slightly slower.

2nd patch allows register-plist to take '-' as a parameter, so that it can
read a packing-list on STDIN.

Together, those two patches allow something like

make print-plist-with-depends | register-plist ${PLIST_DB} -
to work (as register-plist does need checksums for special files)

With this, it should be easy to add a convenience target to the infrastructure
that would  just register all plists without building anything.

One application would be to be able to do broad changes in the ports tree,
like tweaking WANTLIB in modules, and quickly checked that ports didn't change
or didn't change too much.

This should not change anything to existing applications... well, unless
someone has issues with @sha256 in packing-lists.

Index: OpenBSD/PkgCreate.pm
===
RCS file: /cvs/src/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm,v
retrieving revision 1.123
diff -u -p -r1.123 PkgCreate.pm
--- OpenBSD/PkgCreate.pm3 Oct 2016 13:17:30 -   1.123
+++ OpenBSD/PkgCreate.pm14 May 2017 14:13:01 -
@@ -147,6 +147,7 @@ sub pretend_to_archive
$self->comment_create_package($state);
 }
 
+sub makesum_special_file {}
 sub record_digest {}
 sub archive {}
 sub really_archived { 0 }
@@ -358,6 +359,12 @@ sub pretend_to_archive
::PackingElement::FileBase::pretend_to_archive;
 }
 
+sub makesum_special_file
+{
+   my ($self, $state) = @_;
+   $self->add_digest($self->compute_digest($self->fullname));
+}
+
 sub set_destdir
 {
 }
@@ -410,6 +417,10 @@ sub makesum_plist
 {
 }
 
+sub makesum_special_file
+{
+}
+
 sub verify_checksum
 {
 }
@@ -1109,8 +1120,6 @@ sub add_description
if (!defined $opt_d) {
$state->usage("Description required");
}
-   return if $state->opt('q');
-
open(my $fh, '>', $o->fullname) or die "Can't write to DESC: $!";
if (defined $comment) {
print $fh $subst->do($comment), "\n";
@@ -1227,9 +1236,7 @@ sub create_plist
}
$state->say("Creating package #1", $pkgname)
if !(defined $state->opt('q')) && $state->opt('v');
-   if (!$state->opt('q')) {
-   $plist->set_infodir(OpenBSD::Temp->dir);
-   }
+   $plist->set_infodir(OpenBSD::Temp->dir);
 
unless (defined $state->opt('q') && defined $state->opt('n')) {
$state->set_status("reading plist");
@@ -1472,6 +1479,9 @@ sub parse_and_run
$state->defines('HISTORY_DIR'));
$self->show_bad_symlinks($state);
$state->end_status;
+   }
+   if ($state->opt('n')) {
+   $plist->makesum_special_file($state);
}
 
if (!defined $plist->pkgname) {

Index: register-plist
===
RCS file: /cvs/ports/infrastructure/bin/register-plist,v
retrieving revision 1.14
diff -u -p -r1.14 register-plist
--- register-plist  1 Nov 2016 15:34:39 -   1.14
+++ register-plist  14 May 2017 14:13:17 -
@@ -534,14 +534,19 @@ if ($state->opt('p')) {
 my $error =0;
 
 for my $pkgfile (@ARGV) {
-   my $pkg = $state->repo->find($pkgfile);
-   if (!$pkg) {
-   $state->fatal("Bad package #1", $pkgfile);
-   }
+   my $plist;
+   if ($pkgfile eq '-') {
+   $plist = OpenBSD::PackingList->read(\*STDIN);
+   } else {
+   my $pkg = $state->repo->find($pkgfile);
+   if (!$pkg) {
+   $state->fatal("Bad package #1", $pkgfile);
+   }
 
-   my $plist = $pkg->plist;
-   $pkg->close;
-   $pkg->wipe_info;
+   $plist = $pkg->plist;
+   $pkg->close;
+   $pkg->wipe_info;
+   }
 
$plist->forget_details;
for my $dir (@dirs) {

CVS: cvs.openbsd.org: ports

[Stuart Cassoff]

CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2017/05/14 08:06:38

Modified files:
net/tcl-snmptools: Makefile 
net/tcl-snmptools/pkg: PLIST 
Added files:
net/tcl-snmptools/patches: patch-configure 

Log message:
Stop treating loadable lib as linkable lib.
Better install dir. Slight Makefile tidy. Separated build.

ok matthieu@ (maintainer)

CVS: cvs.openbsd.org: ports

[Stuart Cassoff]

CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2017/05/14 08:04:00

ports/net/tcl-snmptools/patches

Update of /cvs/ports/net/tcl-snmptools/patches
In directory cvs.openbsd.org:/tmp/cvs-serv88118/patches

Log Message:
Directory /cvs/ports/net/tcl-snmptools/patches added to the repository

Re: UPDATE: tcl-snmptools

[Stuart Cassoff]

I only mentioned maintainer because I hadn't yet received a response.
I'm happy enough just updating the port.
I'll take what you wrote as an 'ok'.

Thanks!

Stu


> -- Original Message --
> From: Matthieu Herrb 
> Date: May 14, 2017 at 5:52 AM
> 
> 
> On Fri, May 12, 2017 at 03:18:08PM -0400, Stuart Cassoff wrote:
> > Fix wrong lib treatment for Tcl extensions.
> > Better install dir. Slight Makefile tidy. Separated build.
> > Maintainer timeout. I can take this one also.
> 
> Hi,
> 
> Sorry I missed the patch when you originally sent it to me.
> 
> Looks good to me and it sill works in the application where I use it.
> 
> I'm happy to transfer maintainership to you, if you want to take it.
> 
> 
> > 
> > 
> > Stu
> > 
> > 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/net/tcl-snmptools/Makefile,v
> > retrieving revision 1.5
> > diff -u -p -u -p -r1.5 Makefile
> > --- Makefile18 Mar 2016 23:12:19 -  1.5
> > +++ Makefile9 May 2017 13:57:42 -
> > @@ -2,9 +2,9 @@
> >  
> >  COMMENT =  Tcl package that provides SNMP tools
> >  
> > -DISTNAME = tcl-snmptools-1.0
> > -REVISION = 0
> > -SHARED_LIBS =  snmptools10 1.0
> > +V =1.0
> > +DISTNAME = tcl-snmptools-${V}
> > +REVISION = 1
> >  CATEGORIES =   net
> >  MAINTAINER =   Matthieu Herrb 
> >  
> > @@ -19,6 +19,7 @@ LIB_DEPENDS = net/net-snmp
> >  BUILD_DEPENDS =${MODTCL_BUILD_DEPENDS}
> >  RUN_DEPENDS =  ${MODTCL_RUN_DEPENDS}
> >  
> > +SEPARATE_BUILD =   Yes
> >  CONFIGURE_STYLE =  gnu
> >  
> >  CONFIGURE_ARGS+=--with-tcl=${MODTCL_LIBDIR} \
> > @@ -26,6 +27,10 @@ CONFIGURE_ARGS+=--with-tcl=${MODTCL_LIBD
> > CPPFLAGS="-I${LOCALBASE}/include" \
> >  CFLAGS="${CFLAGS} -pthread"
> >  
> > -NO_TEST =Yes
> > +FAKE_FLAGS =   PKG_DIR='$$(PACKAGE_NAME)' 
> > INSTALL_PROGRAM='$$(INSTALL_DATA)'
> > +NO_TEST =  Yes
> > +SUBST_VARS =   VER
> > +
> > +VER =  ${V:S/.//g}
> >  
> >  .include 
> > Index: patches/patch-configure
> > ===
> > RCS file: patches/patch-configure
> > diff -N patches/patch-configure
> > --- /dev/null   1 Jan 1970 00:00:00 -
> > +++ patches/patch-configure 9 May 2017 13:57:42 -
> > @@ -0,0 +1,14 @@
> > +$OpenBSD$
> > +
> > +Index: configure
> > +--- configure.orig
> >  configure
> > +@@ -8771,7 +8771,7 @@ fi
> > + fi
> > + 
> > +   LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
> > +-  SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
> > ++  SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
> > +   { echo "$as_me:$LINENO: checking for ELF" >&5
> > + echo $ECHO_N "checking for ELF... $ECHO_C" >&6; }
> > + if test "${tcl_cv_ld_elf+set}" = set; then
> > Index: pkg/PLIST
> > ===
> > RCS file: /cvs/ports/net/tcl-snmptools/pkg/PLIST,v
> > retrieving revision 1.1.1.1
> > diff -u -p -u -p -r1.1.1.1 PLIST
> > --- pkg/PLIST   8 Jan 2012 14:56:29 -   1.1.1.1
> > +++ pkg/PLIST   9 May 2017 13:57:42 -
> > @@ -1,5 +1,5 @@
> >  @comment $OpenBSD: PLIST,v 1.1.1.1 2012/01/08 14:56:29 matthieu Exp $
> > -lib/tcl/snmptools1.0/
> > -@lib lib/tcl/snmptools1.0/libsnmptools10.so.${LIBsnmptools10_VERSION}
> > -lib/tcl/snmptools1.0/pkgIndex.tcl
> > +lib/tcl/snmptools/
> > +lib/tcl/snmptools/libsnmptools${VER}.so
> > +lib/tcl/snmptools/pkgIndex.tcl
> >  @man man/mann/tcl-snmptools.n
> 
> -- 
> Matthieu Herrb
>

Re: Core dump in wavpack on sparc

[Graham Stephens]

On 2017/05/14 09:44, Graham Stephens wrote:



This port diff switches to using libc's MD5 implementation
which I think should help. It creates a new patches/ directory,
use "patch -E -p0" to apply it (then make clean; make repackage;
make reinstall)..

Index: Makefile
===
RCS file: /cvs/ports/audio/wavpack/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile1 Feb 2017 22:06:14 -   1.22
+++ Makefile13 May 2017 21:54:58 -
@@ -3,6 +3,7 @@
 COMMENT =  audio codec for lossless, lossy and hybrid compression

 DISTNAME = wavpack-5.1.0
+REVISION = 0
 CATEGORIES =   audio

 HOMEPAGE = http://www.wavpack.com/
@@ -28,6 +29,9 @@ CONFIGURE_ENV =   CPPFLAGS="-I${LOCALBASE
LDFLAGS="-L${LOCALBASE}/lib"

 DOCDIR =   ${PREFIX}/share/doc/wavpack
+
+pre-configure:
+   sed -i 's,#include "md5.h",#include ,' ${WRKSRC}/cli/*.c

 post-install:
${INSTALL_DATA_DIR} ${DOCDIR}
Index: patches/patch-cli_Makefile_in
===
RCS file: patches/patch-cli_Makefile_in
diff -N patches/patch-cli_Makefile_in
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-cli_Makefile_in   13 May 2017 21:54:58 -
@@ -0,0 +1,38 @@
+$OpenBSD$
+
+Index: cli/Makefile.in
+--- cli/Makefile.in.orig
 cli/Makefile.in
+@@ -107,7 +107,7 @@ am__wavpack_SOURCES_DIST = wavpack.c riff.c wave64.c c
+ am_wavpack_OBJECTS = wavpack-wavpack.$(OBJEXT) wavpack-riff.$(OBJEXT) \
+   wavpack-wave64.$(OBJEXT) wavpack-caff.$(OBJEXT) \
+   wavpack-dsdiff.$(OBJEXT) wavpack-dsf.$(OBJEXT) \
+-  wavpack-utils.$(OBJEXT) wavpack-md5.$(OBJEXT) \
++  wavpack-utils.$(OBJEXT) \
+   wavpack-import_id3.$(OBJEXT) $(am__objects_1)
+ wavpack_OBJECTS = $(am_wavpack_OBJECTS)
+ am__DEPENDENCIES_1 =
+@@ -362,12 +362,12 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ wavpack_SOURCES = wavpack.c riff.c wave64.c caff.c dsdiff.c dsf.c \
+-  utils.c md5.c import_id3.c $(am__append_1)
++  utils.c import_id3.c $(am__append_1)
+ wavpack_CFLAGS = $(AM_CFLAGS) $(ICONV_CFLAGS) -I$(top_srcdir)/include
+ @ENABLE_RPATH_TRUE@wavpack_LDFLAGS = -rpath $(libdir)
+ wavpack_LDADD = $(AM_LDADD) $(top_builddir)/src/.libs/libwavpack.la $(LIBM) 
$(ICONV_LIBS)
+ wvunpack_SOURCES = wvunpack.c riff.c wave64.c caff.c dsdiff.c dsf.c \
+-  utils.c md5.c $(am__append_2)
++  utils.c $(am__append_2)
+ wvunpack_CFLAGS = $(AM_CFLAGS) $(ICONV_CFLAGS) -I$(top_srcdir)/include
+ @ENABLE_RPATH_TRUE@wvunpack_LDFLAGS = -rpath $(libdir)
+ wvunpack_LDADD = $(AM_LDADD) $(top_builddir)/src/.libs/libwavpack.la $(LIBM) 
$(ICONV_LIBS)
+@@ -379,7 +379,7 @@ wvtag_SOURCES = wvtag.c utils.c import_id3.c $(am__app
+ wvtag_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include
+ @ENABLE_RPATH_TRUE@wvtag_LDFLAGS = -rpath $(libdir)
+ wvtag_LDADD = $(AM_LDADD) $(top_builddir)/src/.libs/libwavpack.la $(LIBM) 
$(ICONV_LIBS)
+-@ENABLE_TESTS_TRUE@wvtest_SOURCES = wvtest.c md5.c
++@ENABLE_TESTS_TRUE@wvtest_SOURCES = wvtest.c
+ @ENABLE_TESTS_TRUE@wvtest_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include
+ @ENABLE_RPATH_TRUE@@ENABLE_TESTS_TRUE@wvtest_LDFLAGS = -rpath $(libdir)
+ @ENABLE_TESTS_TRUE@wvtest_LDADD = $(AM_LDADD) 
$(top_builddir)/src/.libs/libwavpack.la $(LIBM) -lpthread



Sorry Guys, I'm having trouble here...

cd to /usr/ports/audio/wavpack
copy patch to same

Running "patch -E -p0 < wavpack.patch" returns:

Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--
|Index: Makefile
|===
|RCS file: /cvs/ports/audio/wavpack/Makefile,v
|retrieving revision 1.22
|diff -u -p -r1.22 Makefile
|--- Makefile   1 Feb 2017 22:06:14 -   1.22
|+++ Makefile   13 May 2017 21:54:58 -
--
Patching file Makefile using Plan A...
Hunk #1 failed at 3.
Hunk #2 failed at 29.
2 out of 2 hunks failed--saving rejects to Makefile.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--
|Index: patches/patch-cli_Makefile_in
|===
|RCS file: patches/patch-cli_Makefile_in
|diff -N patches/patch-cli_Makefile_in
|--- /dev/null  1 Jan 1970 00:00:00 -
|+++ patches/patch-cli_Makefile_in  13 May 2017 21:54:58 -
--
(Creating file patches/patch-cli_Makefile_in...)
Patching file patches/patch-cli_Makefile_in using Plan A...
Empty context always matches.
Hunk #1 succeeded at 1.
done


I tried to make what changes I thought were necessary manually but obviously
failed as the repackage wouldn't work :(



I suspect your mail client may have mangled the diff. I would do this
to clean and fetch a fresh copy from the 

update: textproc/ripgrep 0.5.2

[Sebastien Marie]

Hi,

An update to textproc/ripgrep 0.5.2.

See https://github.com/BurntSushi/ripgrep/releases/tag/0.5.2 for
changelog.

While here, adds gcc4 MODULES in order to use egcc as linker. It should
let ripgrep to build with cc=clang configuration. The problem was still
the same as cargo: clang doesn't know about libgcc.

Thanks.
-- 
Sebastien Marie

Index: Makefile
===
RCS file: /cvs/ports/textproc/ripgrep/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile12 Apr 2017 02:21:58 -  1.3
+++ Makefile14 May 2017 13:06:03 -
@@ -1,10 +1,10 @@
 # $OpenBSD: Makefile,v 1.3 2017/04/12 02:21:58 danj Exp $
 
-COMMENT =  line oriented search tool using Rust's regex library
+COMMENT =  line oriented search tool using Rust's regex library #'
 
 GH_ACCOUNT =   BurntSushi
 GH_PROJECT =   ripgrep
-GH_TAGNAME =   0.5.1
+GH_TAGNAME =   0.5.2
 
 CATEGORIES =   textproc sysutils
 
@@ -15,7 +15,8 @@ WANTLIB += c pthread
 
 SEPARATE_BUILD =   Yes
 
-MODULES =  devel/cargo
+MODULES =  devel/cargo \
+   gcc4
 
 # as devel/cargo MODULES adds DISTFILES, GH_* didn't
 DISTFILES += ${DISTNAME}${EXTRACT_SUFX}
@@ -26,25 +27,25 @@ MODCARGO_CRATES +=  atty-0.2.2  # MIT
 MODCARGO_CRATES += bitflags-0.8.2  # MIT/Apache-2.0
 MODCARGO_CRATES += bytecount-0.1.6 # Apache-2.0/MIT
 MODCARGO_CRATES += cfg-if-0.1.0# MIT/Apache-2.0
-MODCARGO_CRATES += clap-2.23.1 # MIT
+MODCARGO_CRATES += clap-2.24.1 # MIT
 MODCARGO_CRATES += crossbeam-0.2.10# Apache-2.0/MIT
-MODCARGO_CRATES += encoding_rs-0.5.0   # MIT/Apache-2.0
+MODCARGO_CRATES += encoding_rs-0.5.1   # MIT/Apache-2.0
 MODCARGO_CRATES += env_logger-0.4.2# MIT/Apache-2.0
 MODCARGO_CRATES += fnv-1.0.5   # Apache-2.0 / MIT
 MODCARGO_CRATES += fs2-0.4.1   # MIT/Apache-2.0
 MODCARGO_CRATES += kernel32-sys-0.2.2  # MIT
-MODCARGO_CRATES += lazy_static-0.2.6   # MIT
-MODCARGO_CRATES += libc-0.2.21 # MIT/Apache-2.0
+MODCARGO_CRATES += lazy_static-0.2.8   # MIT/Apache-2.0
+MODCARGO_CRATES += libc-0.2.22 # MIT/Apache-2.0
 MODCARGO_CRATES += log-0.3.7   # MIT/Apache-2.0
 MODCARGO_CRATES += memchr-1.0.1# Unlicense/MIT
 MODCARGO_CRATES += memmap-0.5.2# MIT/Apache-2.0
-MODCARGO_CRATES += num_cpus-1.3.0  # MIT/Apache-2.0
+MODCARGO_CRATES += num_cpus-1.4.0  # MIT/Apache-2.0
 MODCARGO_CRATES += regex-0.2.1 # MIT/Apache-2.0
 MODCARGO_CRATES += regex-syntax-0.4.0  # MIT/Apache-2.0
 MODCARGO_CRATES += same-file-0.1.3 # Unlicense/MIT
 MODCARGO_CRATES += simd-0.1.1  # MIT/Apache-2.0
 MODCARGO_CRATES += strsim-0.6.0# MIT
-MODCARGO_CRATES += term_size-0.2.3 # MIT/Apache-2.0
+MODCARGO_CRATES += term_size-0.3.0 # MIT OR Apache-2.0
 MODCARGO_CRATES += thread-id-3.0.0 # Apache-2.0
 MODCARGO_CRATES += thread_local-0.3.3  # Apache-2.0/MIT
 MODCARGO_CRATES += unicode-segmentation-1.1.0  # MIT/Apache-2.0
Index: distinfo
===
RCS file: /cvs/ports/textproc/ripgrep/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo12 Apr 2017 02:21:58 -  1.3
+++ distinfo14 May 2017 13:06:03 -
@@ -4,25 +4,25 @@ SHA256 (cargo/atty-0.2.2.tar.gz) = 2RLaD
 SHA256 (cargo/bitflags-0.8.2.tar.gz) = 
E3Dp/Cpq5Trqi3pREO29CINu2HyIc236vMreHCtEv/Q=
 SHA256 (cargo/bytecount-0.1.6.tar.gz) = 
Ho8J+8jGcmpLYW3PvU9USRBo1rsbk6wDx4rBj/mlkko=
 SHA256 (cargo/cfg-if-0.1.0.tar.gz) = 
3h52DXtlNa9CQfyovYrfaOLn7azGsp9dOZBQxeSM+Iw=
-SHA256 (cargo/clap-2.23.1.tar.gz) = 
1IDDmi5fmzo3mMZhYT4bDnp65x4AUQLUqpEPwyid9IQ=
+SHA256 (cargo/clap-2.24.1.tar.gz) = 
t1QQab4LiuxBAwgCq+i1ze8EkAcK+qVUGK3qk7HkMeA=
 SHA256 (cargo/crossbeam-0.2.10.tar.gz) = 
DF6iFWZMomTaip2cO+gNLq8wkjwlnQPocDiOuSdQj5c=
-SHA256 (cargo/encoding_rs-0.5.0.tar.gz) = 
ehzKCib5BJVdgNcLm/8QGeT0y8BvL8vM+L09iJzBybc=
+SHA256 (cargo/encoding_rs-0.5.1.tar.gz) = 
5LxRnVcq8Iz3LE1h4N6bBen6ZtH9tec5+1xAWGC0LUM=
 SHA256 (cargo/env_logger-0.4.2.tar.gz) = 
44VvFpcJhgb8bLl6k96Iyj87w1u4eMclkg5uguzwXoM=
 SHA256 (cargo/fnv-1.0.5.tar.gz) = bMSEhC8eKIT69W9Sn5YMwSrYxxzpbMerugoGfJj+40Q=
 SHA256 (cargo/fs2-0.4.1.tar.gz) = NO2u4HVVhZ3BPKOH5q4FaGu00DZMldZJttq5WVEfS68=
 SHA256 (cargo/kernel32-sys-0.2.2.tar.gz) = 
dQdiSylINDHAui2Crs6Mps26k4K/9N3Q90kFYMBWCY0=
-SHA256 (cargo/lazy_static-0.2.6.tar.gz) = 
L2G4Qhx6RkjDkWEWJdVv3Vx1Z9oFrxvmVf2MrMZDq7M=
-SHA256 (cargo/libc-0.2.21.tar.gz) = 
iO6BiF+fBL/5keMG/qfBxgpfD55Anpn2tA4zEaM2MTU=
+SHA256 (cargo/lazy_static-0.2.8.tar.gz) = 
OzdUWrcm3YM+xkIKq6gjHFsyCBS5AprVhVVdKgPpT78=
+SHA256 (cargo/libc-0.2.22.tar.gz) = 
uruCgdqIy6mS+h9N3sfWPtligKGlPsm5Gf03tT1x5QI=
 SHA256 (cargo/log-0.3.7.tar.gz) = UUHsoCd1p2LMbNVk2NLFD2fA6jo3LL8cUVkrPgKeEK0=
 SHA256 (cargo/memchr-1.0.1.tar.gz) = 

Re: Core dump in wavpack on sparc

[Juan Francisco Cantero Hurtado]

On Sun, May 14, 2017 at 09:44:33AM +0100, Graham Stephens wrote:
> 
> > This port diff switches to using libc's MD5 implementation
> > which I think should help. It creates a new patches/ directory,
> > use "patch -E -p0" to apply it (then make clean; make repackage;
> > make reinstall)..
> > 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/audio/wavpack/Makefile,v
> > retrieving revision 1.22
> > diff -u -p -r1.22 Makefile
> > --- Makefile1 Feb 2017 22:06:14 -   1.22
> > +++ Makefile13 May 2017 21:54:58 -
> > @@ -3,6 +3,7 @@
> >  COMMENT =  audio codec for lossless, lossy and hybrid compression
> > 
> >  DISTNAME = wavpack-5.1.0
> > +REVISION = 0
> >  CATEGORIES =   audio
> > 
> >  HOMEPAGE = http://www.wavpack.com/
> > @@ -28,6 +29,9 @@ CONFIGURE_ENV =   CPPFLAGS="-I${LOCALBASE
> > LDFLAGS="-L${LOCALBASE}/lib"
> > 
> >  DOCDIR =   ${PREFIX}/share/doc/wavpack
> > +
> > +pre-configure:
> > +   sed -i 's,#include "md5.h",#include ,' ${WRKSRC}/cli/*.c
> > 
> >  post-install:
> > ${INSTALL_DATA_DIR} ${DOCDIR}
> > Index: patches/patch-cli_Makefile_in
> > ===
> > RCS file: patches/patch-cli_Makefile_in
> > diff -N patches/patch-cli_Makefile_in
> > --- /dev/null   1 Jan 1970 00:00:00 -
> > +++ patches/patch-cli_Makefile_in   13 May 2017 21:54:58 -
> > @@ -0,0 +1,38 @@
> > +$OpenBSD$
> > +
> > +Index: cli/Makefile.in
> > +--- cli/Makefile.in.orig
> >  cli/Makefile.in
> > +@@ -107,7 +107,7 @@ am__wavpack_SOURCES_DIST = wavpack.c riff.c wave64.c c
> > + am_wavpack_OBJECTS = wavpack-wavpack.$(OBJEXT) wavpack-riff.$(OBJEXT) \
> > +   wavpack-wave64.$(OBJEXT) wavpack-caff.$(OBJEXT) \
> > +   wavpack-dsdiff.$(OBJEXT) wavpack-dsf.$(OBJEXT) \
> > +-  wavpack-utils.$(OBJEXT) wavpack-md5.$(OBJEXT) \
> > ++  wavpack-utils.$(OBJEXT) \
> > +   wavpack-import_id3.$(OBJEXT) $(am__objects_1)
> > + wavpack_OBJECTS = $(am_wavpack_OBJECTS)
> > + am__DEPENDENCIES_1 =
> > +@@ -362,12 +362,12 @@ top_build_prefix = @top_build_prefix@
> > + top_builddir = @top_builddir@
> > + top_srcdir = @top_srcdir@
> > + wavpack_SOURCES = wavpack.c riff.c wave64.c caff.c dsdiff.c dsf.c \
> > +-  utils.c md5.c import_id3.c $(am__append_1)
> > ++  utils.c import_id3.c $(am__append_1)
> > + wavpack_CFLAGS = $(AM_CFLAGS) $(ICONV_CFLAGS) -I$(top_srcdir)/include
> > + @ENABLE_RPATH_TRUE@wavpack_LDFLAGS = -rpath $(libdir)
> > + wavpack_LDADD = $(AM_LDADD) $(top_builddir)/src/.libs/libwavpack.la 
> > $(LIBM) $(ICONV_LIBS)
> > + wvunpack_SOURCES = wvunpack.c riff.c wave64.c caff.c dsdiff.c dsf.c \
> > +-  utils.c md5.c $(am__append_2)
> > ++  utils.c $(am__append_2)
> > + wvunpack_CFLAGS = $(AM_CFLAGS) $(ICONV_CFLAGS) -I$(top_srcdir)/include
> > + @ENABLE_RPATH_TRUE@wvunpack_LDFLAGS = -rpath $(libdir)
> > + wvunpack_LDADD = $(AM_LDADD) $(top_builddir)/src/.libs/libwavpack.la 
> > $(LIBM) $(ICONV_LIBS)
> > +@@ -379,7 +379,7 @@ wvtag_SOURCES = wvtag.c utils.c import_id3.c $(am__app
> > + wvtag_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include
> > + @ENABLE_RPATH_TRUE@wvtag_LDFLAGS = -rpath $(libdir)
> > + wvtag_LDADD = $(AM_LDADD) $(top_builddir)/src/.libs/libwavpack.la $(LIBM) 
> > $(ICONV_LIBS)
> > +-@ENABLE_TESTS_TRUE@wvtest_SOURCES = wvtest.c md5.c
> > ++@ENABLE_TESTS_TRUE@wvtest_SOURCES = wvtest.c
> > + @ENABLE_TESTS_TRUE@wvtest_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include
> > + @ENABLE_RPATH_TRUE@@ENABLE_TESTS_TRUE@wvtest_LDFLAGS = -rpath $(libdir)
> > + @ENABLE_TESTS_TRUE@wvtest_LDADD = $(AM_LDADD) 
> > $(top_builddir)/src/.libs/libwavpack.la $(LIBM) -lpthread
> > 
> 
> Sorry Guys, I'm having trouble here...
> 
> cd to /usr/ports/audio/wavpack
> copy patch to same
> 
> Running "patch -E -p0 < wavpack.patch" returns:
> 
> Hmm...  Looks like a unified diff to me...
> The text leading up to this was:
> --
> |Index: Makefile
> |===
> |RCS file: /cvs/ports/audio/wavpack/Makefile,v
> |retrieving revision 1.22
> |diff -u -p -r1.22 Makefile
> |--- Makefile 1 Feb 2017 22:06:14 -   1.22
> |+++ Makefile 13 May 2017 21:54:58 -
> --
> Patching file Makefile using Plan A...
> Hunk #1 failed at 3.
> Hunk #2 failed at 29.
> 2 out of 2 hunks failed--saving rejects to Makefile.rej
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --
> |Index: patches/patch-cli_Makefile_in
> |===
> |RCS file: patches/patch-cli_Makefile_in
> |diff -N patches/patch-cli_Makefile_in
> |--- /dev/null1 Jan 1970 00:00:00 -
> |+++ patches/patch-cli_Makefile_in13 May 2017 21:54:58 -
> --
> (Creating file patches/patch-cli_Makefile_in...)
> 

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2017/05/14 06:43:55

Modified files:
infrastructure/lib/DPB: Heuristics.pm 

Log message:
when requeuing, all infos are not defined for all paths.
this is just a heuristics, so it doesn't matter, but the least
we can do is not crash

Re: UPDATE: www/py-beautifulsoup4 4.6.0

[frantisek holop]

ok, thanks.

Alexandr Shadchin, 12 May 2017 11:56:
> Hi,
> 
> This diff updates py-beautifulsoup4 to the latest release.
> Tested on amd64.
> 
> Comments ? OK ?
> 
> -- 
> Alexandr Shadchin
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/py-beautifulsoup4/Makefile,v
> retrieving revision 1.7
> diff -u -p -r1.7 Makefile
> --- Makefile  18 Feb 2017 13:29:45 -  1.7
> +++ Makefile  12 May 2017 06:50:03 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT =HTML/XML parser that supports invalid markup
>  
> -MODPY_EGG_VERSION =  4.5.3
> +MODPY_EGG_VERSION =  4.6.0
>  DISTNAME =   beautifulsoup4-${MODPY_EGG_VERSION}
>  PKGNAME =py-${DISTNAME}
>  
> @@ -14,7 +14,7 @@ MAINTAINER =frantisek holop   # MIT
>  PERMIT_PACKAGE_CDROM =   Yes
>  
> -MASTER_SITES =   ${HOMEPAGE}bs4/download/4.5/
> +MASTER_SITES =   ${HOMEPAGE}bs4/download/4.6/
>  
>  MODULES =lang/python
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/py-beautifulsoup4/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo  18 Feb 2017 13:29:45 -  1.5
> +++ distinfo  12 May 2017 06:50:03 -
> @@ -1,2 +1,2 @@
> -SHA256 (beautifulsoup4-4.5.3.tar.gz) = 
> shygk2b6WWBDV4/UGIsFK0ZjTSIFnmjdAHfZ7nfgij4=
> -SIZE (beautifulsoup4-4.5.3.tar.gz) = 159185
> +SHA256 (beautifulsoup4-4.6.0.tar.gz) = 
> gItqyTLcywpBJlWPff3PQXEN1EpO9Jegu1mnf58Hjok=
> +SIZE (beautifulsoup4-4.6.0.tar.gz) = 160846

-- 

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2017/05/14 06:02:03

Modified files:
games/galois   : Makefile 
Added files:
games/galois/patches: patch-src_grid_h 

Log message:
most esoteric fix ever for clang

CVS: cvs.openbsd.org: ports

[Sebastian Reitenbach]

CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2017/05/14 05:38:48

Modified files:
sysutils/py-elasticsearch-curator: Makefile 

Log message:
Require right version of py-certifi, bump REVISION

CVS: cvs.openbsd.org: ports

[Sebastian Reitenbach]

CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2017/05/14 05:37:18

Modified files:
sysutils/py-elasticsearch-curator: Makefile distinfo 

Log message:
Small update to 5.0.2, now requires just updated py-certifi

Re: Core dump in wavpack on sparc

[Stuart Henderson]

On 2017/05/14 09:44, Graham Stephens wrote:
> 
> > This port diff switches to using libc's MD5 implementation
> > which I think should help. It creates a new patches/ directory,
> > use "patch -E -p0" to apply it (then make clean; make repackage;
> > make reinstall)..
> > 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/audio/wavpack/Makefile,v
> > retrieving revision 1.22
> > diff -u -p -r1.22 Makefile
> > --- Makefile1 Feb 2017 22:06:14 -   1.22
> > +++ Makefile13 May 2017 21:54:58 -
> > @@ -3,6 +3,7 @@
> >  COMMENT =  audio codec for lossless, lossy and hybrid compression
> > 
> >  DISTNAME = wavpack-5.1.0
> > +REVISION = 0
> >  CATEGORIES =   audio
> > 
> >  HOMEPAGE = http://www.wavpack.com/
> > @@ -28,6 +29,9 @@ CONFIGURE_ENV =   CPPFLAGS="-I${LOCALBASE
> > LDFLAGS="-L${LOCALBASE}/lib"
> > 
> >  DOCDIR =   ${PREFIX}/share/doc/wavpack
> > +
> > +pre-configure:
> > +   sed -i 's,#include "md5.h",#include ,' ${WRKSRC}/cli/*.c
> > 
> >  post-install:
> > ${INSTALL_DATA_DIR} ${DOCDIR}
> > Index: patches/patch-cli_Makefile_in
> > ===
> > RCS file: patches/patch-cli_Makefile_in
> > diff -N patches/patch-cli_Makefile_in
> > --- /dev/null   1 Jan 1970 00:00:00 -
> > +++ patches/patch-cli_Makefile_in   13 May 2017 21:54:58 -
> > @@ -0,0 +1,38 @@
> > +$OpenBSD$
> > +
> > +Index: cli/Makefile.in
> > +--- cli/Makefile.in.orig
> >  cli/Makefile.in
> > +@@ -107,7 +107,7 @@ am__wavpack_SOURCES_DIST = wavpack.c riff.c wave64.c c
> > + am_wavpack_OBJECTS = wavpack-wavpack.$(OBJEXT) wavpack-riff.$(OBJEXT) \
> > +   wavpack-wave64.$(OBJEXT) wavpack-caff.$(OBJEXT) \
> > +   wavpack-dsdiff.$(OBJEXT) wavpack-dsf.$(OBJEXT) \
> > +-  wavpack-utils.$(OBJEXT) wavpack-md5.$(OBJEXT) \
> > ++  wavpack-utils.$(OBJEXT) \
> > +   wavpack-import_id3.$(OBJEXT) $(am__objects_1)
> > + wavpack_OBJECTS = $(am_wavpack_OBJECTS)
> > + am__DEPENDENCIES_1 =
> > +@@ -362,12 +362,12 @@ top_build_prefix = @top_build_prefix@
> > + top_builddir = @top_builddir@
> > + top_srcdir = @top_srcdir@
> > + wavpack_SOURCES = wavpack.c riff.c wave64.c caff.c dsdiff.c dsf.c \
> > +-  utils.c md5.c import_id3.c $(am__append_1)
> > ++  utils.c import_id3.c $(am__append_1)
> > + wavpack_CFLAGS = $(AM_CFLAGS) $(ICONV_CFLAGS) -I$(top_srcdir)/include
> > + @ENABLE_RPATH_TRUE@wavpack_LDFLAGS = -rpath $(libdir)
> > + wavpack_LDADD = $(AM_LDADD) $(top_builddir)/src/.libs/libwavpack.la 
> > $(LIBM) $(ICONV_LIBS)
> > + wvunpack_SOURCES = wvunpack.c riff.c wave64.c caff.c dsdiff.c dsf.c \
> > +-  utils.c md5.c $(am__append_2)
> > ++  utils.c $(am__append_2)
> > + wvunpack_CFLAGS = $(AM_CFLAGS) $(ICONV_CFLAGS) -I$(top_srcdir)/include
> > + @ENABLE_RPATH_TRUE@wvunpack_LDFLAGS = -rpath $(libdir)
> > + wvunpack_LDADD = $(AM_LDADD) $(top_builddir)/src/.libs/libwavpack.la 
> > $(LIBM) $(ICONV_LIBS)
> > +@@ -379,7 +379,7 @@ wvtag_SOURCES = wvtag.c utils.c import_id3.c $(am__app
> > + wvtag_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include
> > + @ENABLE_RPATH_TRUE@wvtag_LDFLAGS = -rpath $(libdir)
> > + wvtag_LDADD = $(AM_LDADD) $(top_builddir)/src/.libs/libwavpack.la $(LIBM) 
> > $(ICONV_LIBS)
> > +-@ENABLE_TESTS_TRUE@wvtest_SOURCES = wvtest.c md5.c
> > ++@ENABLE_TESTS_TRUE@wvtest_SOURCES = wvtest.c
> > + @ENABLE_TESTS_TRUE@wvtest_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include
> > + @ENABLE_RPATH_TRUE@@ENABLE_TESTS_TRUE@wvtest_LDFLAGS = -rpath $(libdir)
> > + @ENABLE_TESTS_TRUE@wvtest_LDADD = $(AM_LDADD) 
> > $(top_builddir)/src/.libs/libwavpack.la $(LIBM) -lpthread
> > 
> 
> Sorry Guys, I'm having trouble here...
> 
> cd to /usr/ports/audio/wavpack
> copy patch to same
> 
> Running "patch -E -p0 < wavpack.patch" returns:
> 
> Hmm...  Looks like a unified diff to me...
> The text leading up to this was:
> --
> |Index: Makefile
> |===
> |RCS file: /cvs/ports/audio/wavpack/Makefile,v
> |retrieving revision 1.22
> |diff -u -p -r1.22 Makefile
> |--- Makefile 1 Feb 2017 22:06:14 -   1.22
> |+++ Makefile 13 May 2017 21:54:58 -
> --
> Patching file Makefile using Plan A...
> Hunk #1 failed at 3.
> Hunk #2 failed at 29.
> 2 out of 2 hunks failed--saving rejects to Makefile.rej
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --
> |Index: patches/patch-cli_Makefile_in
> |===
> |RCS file: patches/patch-cli_Makefile_in
> |diff -N patches/patch-cli_Makefile_in
> |--- /dev/null1 Jan 1970 00:00:00 -
> |+++ patches/patch-cli_Makefile_in13 May 2017 21:54:58 -
> --
> (Creating file patches/patch-cli_Makefile_in...)
> Patching file 

CVS: cvs.openbsd.org: ports

[Sebastian Reitenbach]

CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2017/05/14 05:36:20

Modified files:
devel/py-certifi: Makefile distinfo 

Log message:
Bump to 2017.4.17

OK shadchin@

CVS: cvs.openbsd.org: ports

[Gleydson Soares]

CVSROOT:/cvs
Module name:ports
Changes by: gsoa...@cvs.openbsd.org 2017/05/14 05:27:52

Modified files:
devel/cppcheck : Makefile distinfo 
devel/cppcheck/pkg: PLIST 

Log message:
update to cppcheck-1.79

update: pycha to 0.7.0

[Sebastien Marie]

Hi,

The following diff update pycha from 0.3.0 (2008) to latest 0.7.0 (2012).

The update should permit to use SVG support in py-relatorio (requires
 >=0.4.2 version).

I removed the test target as it works well without.

-- 
Sebastien Marie


Index: Makefile
===
RCS file: /cvs/ports/graphics/pycha/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile17 Jan 2017 16:18:18 -  1.13
+++ Makefile14 May 2017 10:43:44 -
@@ -2,9 +2,8 @@
 
 COMMENT =  Python charting module
 
-MODPY_EGG_VERSION =0.3.0
+MODPY_EGG_VERSION =0.7.0
 DISTNAME = pycha-${MODPY_EGG_VERSION}
-REVISION=  5
 CATEGORIES =   graphics
 
 HOMEPAGE = http://www.lorenzogil.com/projects/pycha/
@@ -20,15 +19,12 @@ MODPY_SETUPTOOLS =  Yes
 RUN_DEPENDS =  graphics/py-cairo
 TEST_DEPENDS = ${RUN_DEPENDS}
 
-do-test: fake
-   @cd ${WRKSRC}/tests && ${MAKE_ENV} \
-   PYTHONPATH=${WRKINST}${MODPY_SITEPKG} \
-   ${MODPY_BIN} ./runner.py
-
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pycha
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pycha/color
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pycha
-   ${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/pycha/
+   ${INSTALL_DATA} ${WRKSRC}/examples/*.* ${PREFIX}/share/examples/pycha/
+   ${INSTALL_DATA} ${WRKSRC}/examples/color/* 
${PREFIX}/share/examples/pycha/color/
${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/pycha/
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/graphics/pycha/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo18 Jan 2015 03:14:14 -  1.2
+++ distinfo14 May 2017 10:43:44 -
@@ -1,2 +1,2 @@
-SHA256 (pycha-0.3.0.tar.gz) = raVzXOissq71lccCO/HJGm01Nk3eRemFQ11wTtEJpvU=
-SIZE (pycha-0.3.0.tar.gz) = 95997
+SHA256 (pycha-0.7.0.tar.gz) = SZG8CWwC1mvXJCHTn3GvEWpTDfuJCNT4Et9QeJ2ARic=
+SIZE (pycha-0.7.0.tar.gz) = 41570
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/pycha/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   8 May 2008 15:45:26 -   1.1.1.1
+++ pkg/PLIST   14 May 2017 10:43:44 -
@@ -1,9 +1,20 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2008/05/08 15:45:26 wcmaier Exp $
+bin/chavier
+lib/python${MODPY_VERSION}/site-packages/chavier/
+lib/python${MODPY_VERSION}/site-packages/chavier/__init__.py
+lib/python${MODPY_VERSION}/site-packages/chavier/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/chavier/app.py
+lib/python${MODPY_VERSION}/site-packages/chavier/app.pyc
+lib/python${MODPY_VERSION}/site-packages/chavier/dialogs.py
+lib/python${MODPY_VERSION}/site-packages/chavier/dialogs.pyc
+lib/python${MODPY_VERSION}/site-packages/chavier/gui.py
+lib/python${MODPY_VERSION}/site-packages/chavier/gui.pyc
 lib/python${MODPY_VERSION}/site-packages/pycha/
 
lib/python${MODPY_VERSION}/site-packages/pycha-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/pycha-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 
lib/python${MODPY_VERSION}/site-packages/pycha-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
 
lib/python${MODPY_VERSION}/site-packages/pycha-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/pycha-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
 
lib/python${MODPY_VERSION}/site-packages/pycha-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 
lib/python${MODPY_VERSION}/site-packages/pycha-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/zip-safe
 lib/python${MODPY_VERSION}/site-packages/pycha/__init__.py
@@ -18,19 +29,32 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/pycha/line.pyc
 lib/python${MODPY_VERSION}/site-packages/pycha/pie.py
 lib/python${MODPY_VERSION}/site-packages/pycha/pie.pyc
+lib/python${MODPY_VERSION}/site-packages/pycha/polygonal.py
+lib/python${MODPY_VERSION}/site-packages/pycha/polygonal.pyc
+lib/python${MODPY_VERSION}/site-packages/pycha/radial.py
+lib/python${MODPY_VERSION}/site-packages/pycha/radial.pyc
+lib/python${MODPY_VERSION}/site-packages/pycha/ring.py
+lib/python${MODPY_VERSION}/site-packages/pycha/ring.pyc
 lib/python${MODPY_VERSION}/site-packages/pycha/scatter.py
 lib/python${MODPY_VERSION}/site-packages/pycha/scatter.pyc
+lib/python${MODPY_VERSION}/site-packages/pycha/stackedbar.py
+lib/python${MODPY_VERSION}/site-packages/pycha/stackedbar.pyc
+lib/python${MODPY_VERSION}/site-packages/pycha/utils.py
+lib/python${MODPY_VERSION}/site-packages/pycha/utils.pyc
 share/doc/pycha/
 share/doc/pycha/README.txt
 share/examples/pycha/
 share/examples/pycha/barchart.py

update: py-relatorio

[Sebastien Marie]

Hi,

Here an update of relatorio.

relatorio.openhex.org isn't available anymore, so I switched to tryton
as upstream (as reflected on pypi).

The python module should be usable with python3, but for now Genshi
dependency isn't switchable: tests are failing.

Thanks.
-- 
Sebastien Marie

Index: Makefile
===
RCS file: /cvs/ports/print/py-relatorio/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile29 Sep 2015 10:52:29 -  1.5
+++ Makefile14 May 2017 10:27:28 -
@@ -2,14 +2,13 @@
 
 COMMENT=   templating library able to output odt and pdf files
 
-MODPY_EGG_VERSION= 0.5.5
+MODPY_EGG_VERSION= 0.6.4
 DISTNAME=  relatorio-${MODPY_EGG_VERSION}
-REVISION=  1
 PKGNAME=   py-${DISTNAME}
 
 CATEGORIES=print textproc
 
-HOMEPAGE=  http://relatorio.openhex.org/
+HOMEPAGE=  http://relatorio.tryton.org/
 
 # GPLv3
 PERMIT_PACKAGE_CDROM = Yes
Index: distinfo
===
RCS file: /cvs/ports/print/py-relatorio/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo18 Jan 2015 03:14:58 -  1.2
+++ distinfo14 May 2017 10:27:28 -
@@ -1,2 +1,2 @@
-SHA256 (relatorio-0.5.5.tar.gz) = LwjB1EzTAKGs7lIhvEbVflORDGwwCSxJFyYqjoaw1x8=
-SIZE (relatorio-0.5.5.tar.gz) = 26908
+SHA256 (relatorio-0.6.4.tar.gz) = n6DpPIwqHTmmRfQOlA+ygyUol2+BwJca/+r9mg5mNlI=
+SIZE (relatorio-0.6.4.tar.gz) = 949912
Index: pkg/PLIST
===
RCS file: /cvs/ports/print/py-relatorio/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   9 Jun 2011 12:55:55 -   1.1.1.1
+++ pkg/PLIST   14 May 2017 10:27:28 -
@@ -21,3 +21,19 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/relatorio/templates/opendocument.pyc
 lib/python${MODPY_VERSION}/site-packages/relatorio/templates/pdf.py
 lib/python${MODPY_VERSION}/site-packages/relatorio/templates/pdf.pyc
+lib/python${MODPY_VERSION}/site-packages/relatorio/tests/
+lib/python${MODPY_VERSION}/site-packages/relatorio/tests/__init__.py
+lib/python${MODPY_VERSION}/site-packages/relatorio/tests/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/relatorio/tests/egg.jpg
+lib/python${MODPY_VERSION}/site-packages/relatorio/tests/one.jpg
+lib/python${MODPY_VERSION}/site-packages/relatorio/tests/templates/
+lib/python${MODPY_VERSION}/site-packages/relatorio/tests/templates/include.tmpl
+lib/python${MODPY_VERSION}/site-packages/relatorio/tests/templates/other.tmpl
+lib/python${MODPY_VERSION}/site-packages/relatorio/tests/templates/test.tmpl
+lib/python${MODPY_VERSION}/site-packages/relatorio/tests/templates/time.tmpl
+lib/python${MODPY_VERSION}/site-packages/relatorio/tests/test.odt
+lib/python${MODPY_VERSION}/site-packages/relatorio/tests/test_api.py
+lib/python${MODPY_VERSION}/site-packages/relatorio/tests/test_api.pyc
+lib/python${MODPY_VERSION}/site-packages/relatorio/tests/test_odt.py
+lib/python${MODPY_VERSION}/site-packages/relatorio/tests/test_odt.pyc
+lib/python${MODPY_VERSION}/site-packages/relatorio/tests/two.png

Re: UPDATE: tcl-snmptools

[Matthieu Herrb]

On Fri, May 12, 2017 at 03:18:08PM -0400, Stuart Cassoff wrote:
> Fix wrong lib treatment for Tcl extensions.
> Better install dir. Slight Makefile tidy. Separated build.
> Maintainer timeout. I can take this one also.

Hi,

Sorry I missed the patch when you originally sent it to me.

Looks good to me and it sill works in the application where I use it.

I'm happy to transfer maintainership to you, if you want to take it.


> 
> 
> Stu
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/tcl-snmptools/Makefile,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 Makefile
> --- Makefile  18 Mar 2016 23:12:19 -  1.5
> +++ Makefile  9 May 2017 13:57:42 -
> @@ -2,9 +2,9 @@
>  
>  COMMENT =Tcl package that provides SNMP tools
>  
> -DISTNAME =   tcl-snmptools-1.0
> -REVISION =   0
> -SHARED_LIBS =snmptools10 1.0
> +V =  1.0
> +DISTNAME =   tcl-snmptools-${V}
> +REVISION =   1
>  CATEGORIES = net
>  MAINTAINER = Matthieu Herrb 
>  
> @@ -19,6 +19,7 @@ LIB_DEPENDS =   net/net-snmp
>  BUILD_DEPENDS =  ${MODTCL_BUILD_DEPENDS}
>  RUN_DEPENDS =${MODTCL_RUN_DEPENDS}
>  
> +SEPARATE_BUILD = Yes
>  CONFIGURE_STYLE =gnu
>  
>  CONFIGURE_ARGS+=--with-tcl=${MODTCL_LIBDIR} \
> @@ -26,6 +27,10 @@ CONFIGURE_ARGS+=--with-tcl=${MODTCL_LIBD
>   CPPFLAGS="-I${LOCALBASE}/include" \
>  CFLAGS="${CFLAGS} -pthread"
>  
> -NO_TEST =Yes
> +FAKE_FLAGS = PKG_DIR='$$(PACKAGE_NAME)' INSTALL_PROGRAM='$$(INSTALL_DATA)'
> +NO_TEST =Yes
> +SUBST_VARS = VER
> +
> +VER =${V:S/.//g}
>  
>  .include 
> Index: patches/patch-configure
> ===
> RCS file: patches/patch-configure
> diff -N patches/patch-configure
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-configure   9 May 2017 13:57:42 -
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: configure
> +--- configure.orig
>  configure
> +@@ -8771,7 +8771,7 @@ fi
> + fi
> + 
> + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
> +-SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
> ++SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
> + { echo "$as_me:$LINENO: checking for ELF" >&5
> + echo $ECHO_N "checking for ELF... $ECHO_C" >&6; }
> + if test "${tcl_cv_ld_elf+set}" = set; then
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/net/tcl-snmptools/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 8 Jan 2012 14:56:29 -   1.1.1.1
> +++ pkg/PLIST 9 May 2017 13:57:42 -
> @@ -1,5 +1,5 @@
>  @comment $OpenBSD: PLIST,v 1.1.1.1 2012/01/08 14:56:29 matthieu Exp $
> -lib/tcl/snmptools1.0/
> -@lib lib/tcl/snmptools1.0/libsnmptools10.so.${LIBsnmptools10_VERSION}
> -lib/tcl/snmptools1.0/pkgIndex.tcl
> +lib/tcl/snmptools/
> +lib/tcl/snmptools/libsnmptools${VER}.so
> +lib/tcl/snmptools/pkgIndex.tcl
>  @man man/mann/tcl-snmptools.n

-- 
Matthieu Herrb

Re: UPDATE: devel/kf5

[Rafael Sadowski]

On Sat May 13, 2017 at 12:07:59AM +0200, Rafael Sadowski wrote:
> Hi ports@,
> 
> please find attached a compressed kf5 5.33.0 diff.
> 
> Port highlights:
> 
> - major bump all SHARED_LIBS (I tested many but not all)
> - kwallet: remove x11/kde-applications/gpgmepp as depend
>   gpgmepp looks upstream dead
> - small PLIST fixes and some simple Makefile tweaks
> 
> Comments? Ok?
> 
> Best regards,
> 
> Rafael Sadowski

Hi All,

Forget 5.33.0, new diff to update KDE Frameworks to 5.34.0:
http://ix.io/tGh (and attached).


Changelog mail from KDE:

13th May 2017. KDE today announces the release of KDE Frameworks 5.34.0.

KDE Frameworks are 70 addon libraries to Qt which provide a wide variety of·
commonly needed functionality in mature, peer reviewed and well tested·
libraries with friendly licensing terms. For an introduction see the·
Frameworks 5.0 release announcement.

Baloo

  balooctl, baloosearch, balooshow: Fix order of QCoreApplication object 
creation (bug 378539)

Breeze Icons

  Add icons for hotspot (https://github.com/KDAB/hotspot)
  Better version control system icons (bug 377380)
  Add plasmate icon (bug 376780)
  Update microphone-sensitivity icons (bug 377012)
  Raise default for 'Panel' icons to 48

Extra CMake Modules

  Sanitizers: Don't use GCC-like flags for e.g. MSVC
  KDEPackageAppTemplates: documentation improvements
  KDECompilerSettings: Pass -Wvla & -Wdate-time
  Support older qmlplugindump versions
  Introduce ecm_generate_qmltypes
  Allow projects to include the file twice
  Fix rx that matches project names out of the git uri
  Introduce fetch-translations build command
  Use -Wno-gnu-zero-variadic-macro-arguments more

KActivities

  We are using only Tier 1 frameworks, so move us to Tier 2
  Removed KIO from the deps

KAuth

  Security fix: verify that whoever is calling us is actually who he says he is

KConfig

  Fix relativePath calculation in KDesktopFile::locateLocal() (bug 345100)

KConfigWidgets

  Set the icon for the Donate action
  Relax constraints for processing QGroupBoxes

KDeclarative

  Don't set ItemHasContents in DropArea
  Don't accept hover events in the DragArea

KDocTools

  Workaround for MSVC and catalog loading
  Solve a visibility conflict for meinproc5 (bug 379142)
  Quote few other variables with path (avoid issues with spaces)
  Quote few variables with path (avoid issues with spaces)
  Temporarily disable the local doc on Windows
  FindDocBookXML4.cmake, FindDocBookXSL.cmake - search in homebrew installations

KFileMetaData

  makes KArchive be optional and do not build extractors needing it
  fix duplicated symbols compilation error with mingw on Windows

KGlobalAccel

  build: Remove KService dependency

KI18n

  fix basename handling of po files (bug 379116)
  Fix ki18n bootstrapping

KIconThemes

  Don't even try to create icons with empty sizes

KIO

  KDirSortFilterProxyModel: bring back natural sorting (bug 343452)
  Fill UDS_CREATION_TIME with the value of st_birthtime on FreeBSD
  http slave: send error page after authorization failure (bug 373323)
  kioexec: delegate upload to a kded module (bug 370532)
  Fix KDirlister Gui Test setting URL scheme twice
  Delete kiod modules on exit
  Generate a moc_predefs.h file for KIOCore (bug 371721)
  kioexec: fix support for --suggestedfilename

KNewStuff

  Allow multiple categories with the same name
  KNewStuff: Show file's size information in grid delegate
  If an entry's size is known, show it in the list view
  Register and declare KNSCore::EntryInternal::List as a metatype
  Don't fall through the switch. Double entries? No please
  always close the downloaded file after downloading

KPackage Framework

  Fix include path in KF5PackageMacros.cmake
  Ignore warnings during appdata generation (bug 378529)

KRunner

  Template: Change toplevel template category to "Plasma"

KTextEditor

  KAuth integration in document saving - vol. 2
  Fix assertion when applying code folding that changes cursor position
  Use non-deprecated  root element in ui.rc file
  Add scroll-bar-marks also to the built-in search
  KAuth integration in document saving

KWayland

  Validate surface is valid when sending TextInput leave event

KWidgetsAddons

  KNewPasswordWidget: don't hide visibility action in plaintext mode (bug 
378276)
  KPasswordDialog: don't hide visibility action in plaintext mode (bug 378276)
  Fix KActionSelectorPrivate::insertionIndex()

KXMLGUI

  kcm_useraccount is dead, long live user_manager
  Reproducible builds: drop version from XMLGUI_COMPILING_OS
  Fix: DOCTYPE name must match root element type
  Fix wrong usage of ANY in kpartgui.dtd
  Use non-deprecated  root element
  API dox fixes: replace 0 with nullptr or remove where not applied

NetworkManagerQt

  Fix crash when retrieving active connection list (bug 373993)
  Set default value for auto-negotiation based on running NM version

Oxygen Icons

  Add icon for hotspot 

CVS: cvs.openbsd.org: ports

[Stuart Cassoff]

CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2017/05/14 03:02:01

Modified files:
devel/tklib: Makefile distinfo 
devel/tklib/patches: patch-support_installation_modules_tcl 
devel/tklib/pkg: PLIST 

Log message:
Update to 0.6pl3.

CVS: cvs.openbsd.org: ports

[Stuart Cassoff]

CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2017/05/14 03:01:31

Modified files:
devel/tcllib   : Makefile distinfo 
devel/tcllib/patches: patch-installer_tcl 
  patch-support_installation_actions_tcl 
  patch-support_installation_modules_tcl 
devel/tcllib/pkg: PLIST 

Log message:
Update to 1.18pl0.

Re: Core dump in wavpack on sparc

[Graham Stephens]

This port diff switches to using libc's MD5 implementation
which I think should help. It creates a new patches/ directory,
use "patch -E -p0" to apply it (then make clean; make repackage;
make reinstall)..

Index: Makefile
===
RCS file: /cvs/ports/audio/wavpack/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile1 Feb 2017 22:06:14 -   1.22
+++ Makefile13 May 2017 21:54:58 -
@@ -3,6 +3,7 @@
 COMMENT =  audio codec for lossless, lossy and hybrid compression

 DISTNAME = wavpack-5.1.0
+REVISION = 0
 CATEGORIES =   audio

 HOMEPAGE = http://www.wavpack.com/
@@ -28,6 +29,9 @@ CONFIGURE_ENV =   CPPFLAGS="-I${LOCALBASE
LDFLAGS="-L${LOCALBASE}/lib"

 DOCDIR =   ${PREFIX}/share/doc/wavpack
+
+pre-configure:
+   sed -i 's,#include "md5.h",#include ,' ${WRKSRC}/cli/*.c

 post-install:
${INSTALL_DATA_DIR} ${DOCDIR}
Index: patches/patch-cli_Makefile_in
===
RCS file: patches/patch-cli_Makefile_in
diff -N patches/patch-cli_Makefile_in
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-cli_Makefile_in   13 May 2017 21:54:58 -
@@ -0,0 +1,38 @@
+$OpenBSD$
+
+Index: cli/Makefile.in
+--- cli/Makefile.in.orig
 cli/Makefile.in
+@@ -107,7 +107,7 @@ am__wavpack_SOURCES_DIST = wavpack.c riff.c wave64.c c
+ am_wavpack_OBJECTS = wavpack-wavpack.$(OBJEXT) wavpack-riff.$(OBJEXT) \
+   wavpack-wave64.$(OBJEXT) wavpack-caff.$(OBJEXT) \
+   wavpack-dsdiff.$(OBJEXT) wavpack-dsf.$(OBJEXT) \
+-  wavpack-utils.$(OBJEXT) wavpack-md5.$(OBJEXT) \
++  wavpack-utils.$(OBJEXT) \
+   wavpack-import_id3.$(OBJEXT) $(am__objects_1)
+ wavpack_OBJECTS = $(am_wavpack_OBJECTS)
+ am__DEPENDENCIES_1 =
+@@ -362,12 +362,12 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ wavpack_SOURCES = wavpack.c riff.c wave64.c caff.c dsdiff.c dsf.c \
+-  utils.c md5.c import_id3.c $(am__append_1)
++  utils.c import_id3.c $(am__append_1)
+ wavpack_CFLAGS = $(AM_CFLAGS) $(ICONV_CFLAGS) -I$(top_srcdir)/include
+ @ENABLE_RPATH_TRUE@wavpack_LDFLAGS = -rpath $(libdir)
+ wavpack_LDADD = $(AM_LDADD) $(top_builddir)/src/.libs/libwavpack.la $(LIBM) 
$(ICONV_LIBS)
+ wvunpack_SOURCES = wvunpack.c riff.c wave64.c caff.c dsdiff.c dsf.c \
+-  utils.c md5.c $(am__append_2)
++  utils.c $(am__append_2)
+ wvunpack_CFLAGS = $(AM_CFLAGS) $(ICONV_CFLAGS) -I$(top_srcdir)/include
+ @ENABLE_RPATH_TRUE@wvunpack_LDFLAGS = -rpath $(libdir)
+ wvunpack_LDADD = $(AM_LDADD) $(top_builddir)/src/.libs/libwavpack.la $(LIBM) 
$(ICONV_LIBS)
+@@ -379,7 +379,7 @@ wvtag_SOURCES = wvtag.c utils.c import_id3.c $(am__app
+ wvtag_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include
+ @ENABLE_RPATH_TRUE@wvtag_LDFLAGS = -rpath $(libdir)
+ wvtag_LDADD = $(AM_LDADD) $(top_builddir)/src/.libs/libwavpack.la $(LIBM) 
$(ICONV_LIBS)
+-@ENABLE_TESTS_TRUE@wvtest_SOURCES = wvtest.c md5.c
++@ENABLE_TESTS_TRUE@wvtest_SOURCES = wvtest.c
+ @ENABLE_TESTS_TRUE@wvtest_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include
+ @ENABLE_RPATH_TRUE@@ENABLE_TESTS_TRUE@wvtest_LDFLAGS = -rpath $(libdir)
+ @ENABLE_TESTS_TRUE@wvtest_LDADD = $(AM_LDADD) 
$(top_builddir)/src/.libs/libwavpack.la $(LIBM) -lpthread



Sorry Guys, I'm having trouble here...

cd to /usr/ports/audio/wavpack
copy patch to same

Running "patch -E -p0 < wavpack.patch" returns:

Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--
|Index: Makefile
|===
|RCS file: /cvs/ports/audio/wavpack/Makefile,v
|retrieving revision 1.22
|diff -u -p -r1.22 Makefile
|--- Makefile   1 Feb 2017 22:06:14 -   1.22
|+++ Makefile   13 May 2017 21:54:58 -
--
Patching file Makefile using Plan A...
Hunk #1 failed at 3.
Hunk #2 failed at 29.
2 out of 2 hunks failed--saving rejects to Makefile.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--
|Index: patches/patch-cli_Makefile_in
|===
|RCS file: patches/patch-cli_Makefile_in
|diff -N patches/patch-cli_Makefile_in
|--- /dev/null  1 Jan 1970 00:00:00 -
|+++ patches/patch-cli_Makefile_in  13 May 2017 21:54:58 -
--
(Creating file patches/patch-cli_Makefile_in...)
Patching file patches/patch-cli_Makefile_in using Plan A...
Empty context always matches.
Hunk #1 succeeded at 1.
done


I tried to make what changes I thought were necessary manually but 
obviously failed as the repackage wouldn't work :(

Re: [PATCH] Fix devel/sdl2 endianness detection

[Jonathan Gray]

On Mon, May 08, 2017 at 10:10:31PM +0200, Donovan Watteau wrote:
> Hi,
> 
> SDL2 apps on macppc give you harsh whitenoise instead of sound at the
> moment.  That's because of a poor endianness check in SDL2, so your
> audio samples are played in little-endian, while we use PowerPC as a
> big-endian arch.  Some other bugs might also happen because of this.
> 
> Instead of looking for arch defines and miss some of them, let's just
> use , which is way simpler, and accurate.  This could also
> be backported to sdl1, which just happens to be luckier, it seems. 
> 
> I think a minor SHARED_LIBS bump is enough (dependent ports need
> to be recompiled for the change to take effect on macppc), but please
> check.

Thanks, I've committed this but dropped the minor crank.  I think
the REVISION change should be enough.

> 
> Tested with scummvm and starfighter.
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/sdl2/Makefile,v
> retrieving revision 1.15
> diff -u -p -r1.15 Makefile
> --- Makefile  10 Nov 2016 10:08:04 -  1.15
> +++ Makefile  8 May 2017 20:03:00 -
> @@ -1,15 +1,16 @@
>  # $OpenBSD: Makefile,v 1.15 2016/11/10 10:08:04 jca Exp $
>  
>  COMMENT= cross-platform multimedia library
> -BROKEN-hppa= src/atomic/SDL_spinlock.c:101:2: error: #error Please implement 
> for your platform.
> +BROKEN-hppa= src/atomic/SDL_spinlock.c:101:2: error: \#error Please 
> implement for your platform.
>  
>  V=   2.0.5
> +REVISION=0
>  DISTNAME=SDL2-${V}
>  PKGNAME= sdl2-${V}
>  CATEGORIES=  devel
>  MASTER_SITES=http://www.libsdl.org/release/
>  
> -SHARED_LIBS= SDL20.3
> +SHARED_LIBS= SDL20.4
>  
>  HOMEPAGE=http://www.libsdl.org/
>  
> Index: patches/patch-include_SDL_endian_h
> ===
> RCS file: patches/patch-include_SDL_endian_h
> diff -N patches/patch-include_SDL_endian_h
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-include_SDL_endian_h8 May 2017 20:03:00 -
> @@ -0,0 +1,19 @@
> +$OpenBSD$
> +
> + is simpler and more reliable.
> +
> +Index: include/SDL_endian.h
> +--- include/SDL_endian.h.orig
>  include/SDL_endian.h
> +@@ -42,7 +42,10 @@
> + #ifdef __linux__
> + #include 
> + #define SDL_BYTEORDER  __BYTE_ORDER
> +-#else /* __linux__ */
> ++#elif defined(__OpenBSD__)
> ++#include 
> ++#define SDL_BYTEORDER  BYTE_ORDER
> ++#else
> + #if defined(__hppa__) || \
> + defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \
> + (defined(__MIPS__) && defined(__MISPEB__)) || \
> 

CVS: cvs.openbsd.org: ports

[Jonathan Gray]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2017/05/14 00:40:35

Modified files:
devel/sdl2 : Makefile 
Added files:
devel/sdl2/patches: patch-include_SDL_endian_h 

Log message:
Use endian.h to determine endianess instead of an incomplete list of
arch ifdefs which didn't cover powerpc.

>From Donovan Watteau.