svn commit: r433013 - in head/audio/muse: . files

Jan Beich jbeich at FreeBSD.org
Wed Feb 1 12:28:11 UTC 2017


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

Log:
  audio/muse: unbreak with libc++ 3.9
  
  httpstream.cpp:366:4: error: assigning to 'char *' from incompatible type 'const char *'
          p = strstr(url, HTTP_PREFIX); if (!p) goto out;
            ^ ~~~~~~~~~~~~~~~~~~~~~~~~
  
  Reported by:	pkg-fallout

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

Modified: head/audio/muse/Makefile
==============================================================================
--- head/audio/muse/Makefile	Wed Feb  1 12:26:15 2017	(r433012)
+++ head/audio/muse/Makefile	Wed Feb  1 12:28:09 2017	(r433013)
@@ -3,7 +3,7 @@
 
 PORTNAME=	MuSE
 PORTVERSION=	0.9.2
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	audio
 MASTER_SITES=	https://files.dyne.org/muse/sources/
 

Added: head/audio/muse/files/patch-src_httpstream.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/muse/files/patch-src_httpstream.cpp	Wed Feb  1 12:28:09 2017	(r433013)
@@ -0,0 +1,22 @@
+--- src/httpstream.cpp.orig	2005-12-27 14:26:06 UTC
++++ src/httpstream.cpp
+@@ -356,6 +356,7 @@ http_open( const char *url )
+ {
+     int sock = INVALID_SOCKET;
+     FILE *fd = NULL;
++    const char *hp = NULL;
+     char *host=NULL, *file=NULL, *p;
+ 	int port = 0;
+ 	
+@@ -363,9 +364,8 @@ http_open( const char *url )
+ 	file = (char*)calloc( 1, strlen(url)+1 );
+ 	if (!host || !file) goto out;
+ 	
+-	p = strstr(url, HTTP_PREFIX); if (!p) goto out;
+-	p += 7;
+-	strcpy(host, p);
++	hp = strstr(url, HTTP_PREFIX); if (!hp) goto out;
++	strcpy(host, hp + 7);
+ 	
+ 	p = strchr(host, '/');
+ 	if (p) {


More information about the svn-ports-head mailing list