Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 6 Jun 2017 21:20:56 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r442807 - in head/audio/mp3blaster: . files
Message-ID:  <201706062120.v56LKuZ9011490@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706062120.v56LKuZ9011490>