svn commit: r433015 - in head/audio/sidplay2: . files

[Jan Beich]

Author: jbeich
Date: Wed Feb  1 12:28:30 2017
New Revision: 433015
URL: https://svnweb.freebsd.org/changeset/ports/433015

Log:
  audio/sidplay2: unbreak with libc++ 3.9
  
  args.cpp:105:9: error: assigning to 'char *' from incompatible type 'const char *'
      sep = strstr (str, ":");
          ^ ~~~~~~~~~~~~~~~~~
  
  Reported by:	pkg-fallout

Added:
  head/audio/sidplay2/files/patch-src_args.cpp   (contents, props changed)
Modified:
  head/audio/sidplay2/Makefile   (contents, props changed)

Modified: head/audio/sidplay2/Makefile
==============================================================================
--- head/audio/sidplay2/Makefile	Wed Feb  1 12:28:19 2017	(r433014)
+++ head/audio/sidplay2/Makefile	Wed Feb  1 12:28:30 2017	(r433015)
@@ -3,7 +3,7 @@
 
 PORTNAME=	sidplay2
 PORTVERSION=	2.0.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio emulators
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/sidplay-${PORTVERSION}
 DISTNAME=	sidplay-${PORTVERSION}

Added: head/audio/sidplay2/files/patch-src_args.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/sidplay2/files/patch-src_args.cpp	Wed Feb  1 12:28:30 2017	(r433015)
@@ -0,0 +1,22 @@
+--- src/args.cpp.orig	2004-05-05 23:49:20 UTC
++++ src/args.cpp
+@@ -95,7 +95,7 @@ using std::endl;
+ // Convert time from integer
+ bool ConsolePlayer::parseTime (const char *str, uint_least32_t &time)
+ {
+-    char *sep;
++    const char *sep;
+     uint_least32_t _time;
+ 
+     // Check for empty string
+@@ -110,8 +110,9 @@ bool ConsolePlayer::parseTime (const cha
+     else
+     {   // Read in MM:SS format
+         int val;
+-        *sep = '\0';
++        char *tmp = strndup(str, sep - str);
+         val  = atoi (str);
++        free(tmp);
+         if (val < 0 || val > 99)
+             return false;
+         _time = (uint_least32_t) val * 60;