From owner-svn-ports-all@freebsd.org Tue Jun 6 21:20:57 2017 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 98199BF52EF; Tue, 6 Jun 2017 21:20:57 +0000 (UTC) (envelope-from tobik@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 73BFA7B960; Tue, 6 Jun 2017 21:20:57 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v56LKuFN011493; Tue, 6 Jun 2017 21:20:56 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v56LKuZ9011490; Tue, 6 Jun 2017 21:20:56 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201706062120.v56LKuZ9011490@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Tue, 6 Jun 2017 21:20:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r442807 - in head/audio/mp3blaster: . 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: Tue, 06 Jun 2017 21:20:57 -0000 Author: tobik Date: Tue Jun 6 21:20:56 2017 New Revision: 442807 URL: https://svnweb.freebsd.org/changeset/ports/442807 Log: Update to 3.2.6 While here: - Add license - Add the missing SDL option to OPTIONS_DEFINE - Fix ESOUND option - Fix build of NAS option with Clang < 4.0 - The configure script says this configure: WARNING: unrecognized options: --with-cxxflags so remove it from CONFIGURE_ARGS - Regenerate patches Changes: http://www.mp3blaster.org/2017/05/its-only-been-8-years.html PR: 219808 Approved by: lme (mentor), novel (maintainer) Differential Revision: https://reviews.freebsd.org/D11076 Added: head/audio/mp3blaster/files/patch-mpegsound_nasplayer.cc (contents, props changed) head/audio/mp3blaster/files/patch-src_main.cc (contents, props changed) Deleted: head/audio/mp3blaster/files/patch-src__global.cc head/audio/mp3blaster/files/patch-src__main.cc Modified: head/audio/mp3blaster/Makefile head/audio/mp3blaster/distinfo Modified: head/audio/mp3blaster/Makefile ============================================================================== --- head/audio/mp3blaster/Makefile Tue Jun 6 20:59:52 2017 (r442806) +++ head/audio/mp3blaster/Makefile Tue Jun 6 21:20:56 2017 (r442807) @@ -2,23 +2,20 @@ # $FreeBSD$ PORTNAME= mp3blaster -PORTVERSION= 3.2.5 -PORTREVISION= 6 +PORTVERSION= 3.2.6 CATEGORIES= audio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= novel@FreeBSD.org COMMENT= MP3 console ncurses-based player -USES= gmake ncurses +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING + +USES= gmake localbase:ldflags ncurses GNU_CONFIGURE= yes -WANT_GNOME= yes -CONFIGURE_ARGS= --with-cxxflags="${CXXFLAGS}" -CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT -LDFLAGS+= -lpthread -L${LOCALBASE}/lib - -OPTIONS_DEFINE= LIRC NAS SIDPLAY VORBIS DOCS ESOUND +OPTIONS_DEFINE= DOCS ESOUND LIRC NAS SDL SIDPLAY VORBIS OPTIONS_DEFAULT= SIDPLAY VORBIS SIDPLAY_DESC= Sidplayer support @@ -41,7 +38,7 @@ NAS_LIB_DEPENDS= libaudio.so:audio/nas NAS_LDFLAGS= -laudio ESOUND_CONFIGURE_WITH= esd -ESOUND_GNOME= esound +ESOUND_USE= GNOME=esound post-patch: @${REINPLACE_CMD} -e 's|/usr/local/share/mp3blaster/win2koi.tbl|${DATADIR}/charmap/win2koi.tbl|' \ Modified: head/audio/mp3blaster/distinfo ============================================================================== --- head/audio/mp3blaster/distinfo Tue Jun 6 20:59:52 2017 (r442806) +++ head/audio/mp3blaster/distinfo Tue Jun 6 21:20:56 2017 (r442807) @@ -1,2 +1,3 @@ -SHA256 (mp3blaster-3.2.5.tar.gz) = 129115742c77362cc3508eb7782702cfb44af2463a5453e8d19ea68abccedc29 -SIZE (mp3blaster-3.2.5.tar.gz) = 329407 +TIMESTAMP = 1496705259 +SHA256 (mp3blaster-3.2.6.tar.gz) = 43d9f656367d16aaac163f93dc323e9843c3dd565401567edef3e1e72b9e1ee0 +SIZE (mp3blaster-3.2.6.tar.gz) = 354019 Added: head/audio/mp3blaster/files/patch-mpegsound_nasplayer.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/mp3blaster/files/patch-mpegsound_nasplayer.cc Tue Jun 6 21:20:56 2017 (r442807) @@ -0,0 +1,14 @@ +nasplayer.cc:37:23: error: out-of-line definition of 'opendevice' does not match any declaration in 'NASplayer' +NASplayer *NASplayer::opendevice(char *server) + ^~~~~~~~~~ +--- mpegsound/nasplayer.cc.orig 2017-06-06 00:05:37 UTC ++++ mpegsound/nasplayer.cc +@@ -34,7 +34,7 @@ NASplayer::~NASplayer() + } + } + +-NASplayer *NASplayer::opendevice(char *server) ++NASplayer *NASplayer::opendevice(const char *server) + { + AuServer *aud; + char *return_status; Added: head/audio/mp3blaster/files/patch-src_main.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/mp3blaster/files/patch-src_main.cc Tue Jun 6 21:20:56 2017 (r442807) @@ -0,0 +1,11 @@ +--- src/main.cc.orig 2017-05-15 22:14:13 UTC ++++ src/main.cc +@@ -5480,7 +5480,7 @@ main(int argc, char *argv[], char *envp[]) + { 0, 0, 0, 0} + }; + +- c = getopt_long(argc, argv, "28a:c:df:hl:m:no:p:qRr:s:t:v", long_options, ++ c = getopt_long_only(argc, argv, "28a:c:df:hl:m:no:p:qRr:s:t:v", long_options, + &long_index); + + if (c == EOF)