From owner-svn-ports-all@freebsd.org Thu Nov 24 14:18:54 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 40D2DC51D24; Thu, 24 Nov 2016 14:18:54 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EA23FD6A; Thu, 24 Nov 2016 14:18:53 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAOEIrFC066189; Thu, 24 Nov 2016 14:18:53 GMT (envelope-from ehaupt@FreeBSD.org) Received: (from ehaupt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAOEIrBA066187; Thu, 24 Nov 2016 14:18:53 GMT (envelope-from ehaupt@FreeBSD.org) Message-Id: <201611241418.uAOEIrBA066187@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ehaupt set sender to ehaupt@FreeBSD.org using -f From: Emanuel Haupt Date: Thu, 24 Nov 2016 14:18:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r427013 - in head/audio/playgsf: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Nov 2016 14:18:54 -0000 Author: ehaupt Date: Thu Nov 24 14:18:52 2016 New Revision: 427013 URL: https://svnweb.freebsd.org/changeset/ports/427013 Log: - Fix build with libc++ 3.9 - Switch to USES=localbase - Add LICENSE: GPLv2+ for VBA code, LGPL21 for bundled libresample code and NONE for playgsf code, as no license is specified neither for it nor for code it's based on (http://www.caitsith2.com/gsf/) PR: 214653 Submitted by: amdmi3 Reported by: jbeich Modified: head/audio/playgsf/Makefile head/audio/playgsf/files/patch-VBA_Util.cpp Modified: head/audio/playgsf/Makefile ============================================================================== --- head/audio/playgsf/Makefile Thu Nov 24 14:05:35 2016 (r427012) +++ head/audio/playgsf/Makefile Thu Nov 24 14:18:52 2016 (r427013) @@ -3,7 +3,7 @@ PORTNAME= playgsf PORTVERSION= 0.7.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= http://projects.raphnet.net/playgsf/ \ LOCAL/ehaupt @@ -11,15 +11,16 @@ MASTER_SITES= http://projects.raphnet.ne MAINTAINER= ehaupt@FreeBSD.org COMMENT= Command-line player for gsf audio files +LICENSE= GPLv2+ LGPL21 NONE +LICENSE_COMB= multi +LICENSE_FILE_LGPL21= ${WRKSRC}/libresample-0.1.3/LICENSE.txt + LIB_DEPENDS= libao.so:audio/libao -USES= gmake dos2unix +USES= dos2unix gmake localbase:ldflags GNU_CONFIGURE= yes - -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - -CONFIGURE_ARGS+= --enable-ccore --disable-optimisations +CONFIGURE_ARGS= --enable-ccore \ + --disable-optimisations PLIST_FILES= bin/playgsf Modified: head/audio/playgsf/files/patch-VBA_Util.cpp ============================================================================== --- head/audio/playgsf/files/patch-VBA_Util.cpp Thu Nov 24 14:05:35 2016 (r427012) +++ head/audio/playgsf/files/patch-VBA_Util.cpp Thu Nov 24 14:18:52 2016 (r427013) @@ -1,5 +1,23 @@ ---- VBA/Util.cpp.orig 2016-07-26 15:40:39 UTC +--- VBA/Util.cpp.orig 2016-11-24 13:15:44 UTC +++ VBA/Util.cpp +@@ -917,7 +917,7 @@ bool utilIsGSF(const char * file) + + + if(strlen(file) > 4) { +- char *p = strrchr(file,'.'); ++ const char *p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".gsf") == 0) +@@ -934,7 +934,7 @@ bool utilIsGBAImage(const char * file) + { + cpuIsMultiBoot = false; + if(strlen(file) > 4) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + //if(_stricmp(p, ".gba") == 0) @@ -1484,7 +1484,8 @@ void utilWriteData(gzFile gzFile, variab gzFile utilGzOpen(const char *file, const char *mode)