Date: Mon, 1 Dec 2003 02:20:06 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/59841: Update port: audio/mp3blaster to 3.2.0 Message-ID: <20031201022006.437945b8.tkato@prontomail.com> Resent-Message-ID: <200311301730.hAUHUONj041086@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 59841 >Category: ports >Synopsis: Update port: audio/mp3blaster to 3.2.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Nov 30 09:30:24 PST 2003 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.9-RELEASE-p1 i386 >Organization: >Environment: >Description: - Update to version 3.2.0 New file: files/patch-nmixer::Makefile.in files/patch-src::Makefile.in Remove file: files/patch-ab files/patch-nmixer_getopt.h files/patch-src_getopt.h >How-To-Repeat: >Fix: diff -urN /usr/ports/audio/mp3blaster/Makefile audio/mp3blaster/Makefile --- /usr/ports/audio/mp3blaster/Makefile Mon Nov 3 14:21:16 2003 +++ audio/mp3blaster/Makefile Sat Nov 29 22:44:35 2003 @@ -6,40 +6,52 @@ # PORTNAME= mp3blaster -PORTVERSION= 3.1.3 +PORTVERSION= 3.2.0 CATEGORIES= audio MASTER_SITES= http://www.stack.nl/~brama/mp3blaster/src/ MAINTAINER= ports@FreeBSD.org COMMENT= MP3 console ncurses-based player +USE_GETOPT_LONG= yes +USE_REINPLACE= yes +USE_GMAKE= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +CONFIGURE_ARGS= --with-cxxflags="${CXXFLAGS}" \ + --without-sidplay + +MAN1= mp3blaster.1 nmixer.1 splay.1 + +CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} + .include <bsd.port.pre.mk> .if ${OSVERSION} < 400010 LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses .endif -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-cxxflags="${CXXFLAGS}" \ - --without-sidplay -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" +.if defined(WITH_LIRC) +LIB_DEPENDS+= lirc_client.0:${PORTSDIR}/comms/lirc +CONFIGURE_ARGS+= --with-lirc +.endif -.if !defined(WITHOUT_VORBIS) -LIB_DEPENDS+= vorbisfile.3:${PORTSDIR}/audio/libvorbis -.else +.if defined(WITHOUT_VORBIS) CONFIGURE_ARGS+= --without-oggvorbis +.else +LIB_DEPENDS+= vorbisfile.3:${PORTSDIR}/audio/libvorbis .endif -MAN1= mp3blaster.1 nmixer.1 splay.1 - -.if !defined(WITHOUT_VORBIS) pre-everything:: - @${ECHO_MSG} - @${ECHO_MSG} "You can disable support for Ogg Vorbis by defining WITHOUT_VORBIS." - @${ECHO_MSG} -.endif + @${ECHO_MSG} "" + @${ECHO_MSG} "MP3Blaster has the following tunable option(s):" + @${ECHO_MSG} "" + @${ECHO_MSG} " WITH_LIRC=yes Turns on LIRC support" + @${ECHO_MSG} " WITHOUT_VORBIS=yes Turns off Ogg Vorbis support" + @${ECHO_MSG} "" + +post-patch: + @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure .include <bsd.port.post.mk> diff -urN /usr/ports/audio/mp3blaster/distinfo audio/mp3blaster/distinfo --- /usr/ports/audio/mp3blaster/distinfo Tue Oct 22 19:01:05 2002 +++ audio/mp3blaster/distinfo Sat Nov 29 22:25:46 2003 @@ -1 +1 @@ -MD5 (mp3blaster-3.1.3.tar.gz) = 38beb6a5648cbca4ec87ee14b0982283 +MD5 (mp3blaster-3.2.0.tar.gz) = d01a36de2ebb5b4f7c407ae6cc7668b1 diff -urN /usr/ports/audio/mp3blaster/files/patch-ab audio/mp3blaster/files/patch-ab --- /usr/ports/audio/mp3blaster/files/patch-ab Fri Sep 26 19:46:39 2003 +++ audio/mp3blaster/files/patch-ab Thu Jan 1 09:00:00 1970 @@ -1,38 +0,0 @@ - -$FreeBSD: ports/audio/mp3blaster/files/patch-ab,v 1.7 2003/09/26 00:07:08 naddy Exp $ - ---- configure.orig Sun Oct 20 19:04:59 2002 -+++ configure Thu Sep 25 23:33:55 2003 -@@ -1970,7 +1970,11 @@ - - - if test "$INCLUDEPTHREAD" = 1 ; then -- if test "$FREEBSD" = 1 -o "$OPENBSD" = 1 ; then -+ if test "${PTHREAD_CFLAGS}${PTHREAD_LIBS}" != ""; then -+ CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" -+ CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}" -+ LIBS="${LIBS} ${PTHREAD_LIBS}" -+ elif test "$OPENBSD" = 1 ; then - LDFLAGS="$LDFLAGS -pthread" - else - echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6 -@@ -2420,7 +2424,7 @@ - fi - done - --for ac_hdr in sys/soundcard.h machine/soundcard.h soundcard.h getopt.h -+for ac_hdr in sys/soundcard.h machine/soundcard.h soundcard.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -@@ -3704,7 +3708,9 @@ - - - if test "$INCLUDEPTHREAD" = 1 ; then -- if test "$FREEBSD" = 1 -o "$OPENBSD" = 1 ; then -+ if test "${PTHREAD_CFLAGS}${PTHREAD_LIBS}" != ""; then -+ : already handled -+ elif test "$OPENBSD" = 1 ; then - LDFLAGS="$LDFLAGS -pthread" - cat >> confdefs.h <<\EOF - #define _THREAD_SAFE 1 diff -urN /usr/ports/audio/mp3blaster/files/patch-nmixer::Makefile.in audio/mp3blaster/files/patch-nmixer::Makefile.in --- /usr/ports/audio/mp3blaster/files/patch-nmixer::Makefile.in Thu Jan 1 09:00:00 1970 +++ audio/mp3blaster/files/patch-nmixer::Makefile.in Sat Nov 29 22:46:21 2003 @@ -0,0 +1,24 @@ +--- nmixer/Makefile.in.orig Sat Nov 29 05:07:25 2003 ++++ nmixer/Makefile.in Sat Nov 29 22:46:08 2003 +@@ -87,9 +87,8 @@ + LDADD = @LIBNMIXER@ @NCURSES_LIBS@ + INCLUDES = -I/usr/include/ncurses -I$(srcdir) -I$(includedir) + noinst_LIBRARIES = libnmixer.a +-libnmixer_a_SOURCES = nmixer.cc mixers.cc ossmixer.cc nasmixer.cc nmixer.h getopt.c getopt1.c getopt.h +- +-CXXFLAGS = @NAS_CFLAGS@ ++libnmixer_a_SOURCES = nmixer.cc mixers.cc ossmixer.cc nasmixer.cc nmixer.h ++CXXFLAGS = @CXXFLAGS@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = +@@ -105,8 +104,7 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ + libnmixer_a_LIBADD = +-libnmixer_a_OBJECTS = nmixer.o mixers.o ossmixer.o nasmixer.o getopt.o \ +-getopt1.o ++libnmixer_a_OBJECTS = nmixer.o mixers.o ossmixer.o nasmixer.o + AR = ar + PROGRAMS = $(bin_PROGRAMS) + diff -urN /usr/ports/audio/mp3blaster/files/patch-nmixer_getopt.h audio/mp3blaster/files/patch-nmixer_getopt.h --- /usr/ports/audio/mp3blaster/files/patch-nmixer_getopt.h Thu Mar 6 09:02:51 2003 +++ audio/mp3blaster/files/patch-nmixer_getopt.h Thu Jan 1 09:00:00 1970 @@ -1,14 +0,0 @@ - -$FreeBSD: ports/audio/mp3blaster/files/patch-nmixer_getopt.h,v 1.1 2003/03/06 00:02:51 naddy Exp $ - ---- nmixer/getopt.h.orig Thu Mar 6 00:37:11 2003 -+++ nmixer/getopt.h Thu Mar 6 00:37:21 2003 -@@ -103,7 +103,7 @@ - errors, only prototype getopt for the GNU C library. */ - extern int getopt (int argc, char *const *argv, const char *shortopts); - #else /* not __GNU_LIBRARY__ */ --extern int getopt (); -+/* extern int getopt (); */ - #endif /* __GNU_LIBRARY__ */ - extern int getopt_long (int argc, char *const *argv, const char *shortopts, - const struct option *longopts, int *longind); diff -urN /usr/ports/audio/mp3blaster/files/patch-src::Makefile.in audio/mp3blaster/files/patch-src::Makefile.in --- /usr/ports/audio/mp3blaster/files/patch-src::Makefile.in Thu Jan 1 09:00:00 1970 +++ audio/mp3blaster/files/patch-src::Makefile.in Sat Nov 29 14:40:47 2003 @@ -0,0 +1,23 @@ +--- src/Makefile.in.orig Sat Nov 29 05:07:27 2003 ++++ src/Makefile.in Sat Nov 29 14:39:21 2003 +@@ -83,7 +83,7 @@ + + bin_PROGRAMS = mp3blaster mp3tag splay + #bin_PROGRAMS = mp3blaster mp3tag +-mp3blaster_SOURCES = fileman.cc main.cc scrollwin.cc getopt.c getopt1.c fileman.h genretab.h getopt.h id3parse.cc id3parse.h mp3blaster.h global.cc global.h config.cc scrollwin.h winitem.cc winitem.h mp3win.cc mp3win.h mp3item.cc mp3item.h keybindings.h history.cc history.h getinput.cc getinput.h interface.cc interface.h ++mp3blaster_SOURCES = fileman.cc main.cc scrollwin.cc fileman.h genretab.h id3parse.cc id3parse.h mp3blaster.h global.cc global.h config.cc scrollwin.h winitem.cc winitem.h mp3win.cc mp3win.h mp3item.cc mp3item.h keybindings.h history.cc history.h getinput.cc getinput.h interface.cc interface.h + + splay_SOURCES = splay.cc splay.h splay_common.cc + splay_DEPENDENCIES = ../mpegsound/libmpegsound.a +@@ -110,9 +110,8 @@ + X_LIBS = @X_LIBS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ +-mp3blaster_OBJECTS = fileman.o main.o scrollwin.o getopt.o getopt1.o \ +-id3parse.o global.o config.o winitem.o mp3win.o mp3item.o history.o \ +-getinput.o interface.o ++mp3blaster_OBJECTS = fileman.o main.o scrollwin.o id3parse.o global.o \ ++config.o winitem.o mp3win.o mp3item.o history.o getinput.o interface.o + mp3blaster_LDFLAGS = + mp3tag_OBJECTS = id3parse.o mp3tag.o + mp3tag_LDFLAGS = diff -urN /usr/ports/audio/mp3blaster/files/patch-src_getopt.h audio/mp3blaster/files/patch-src_getopt.h --- /usr/ports/audio/mp3blaster/files/patch-src_getopt.h Mon Jul 22 05:54:54 2002 +++ audio/mp3blaster/files/patch-src_getopt.h Thu Jan 1 09:00:00 1970 @@ -1,14 +0,0 @@ - -$FreeBSD: ports/audio/mp3blaster/files/patch-src_getopt.h,v 1.1 2002/07/21 20:54:54 naddy Exp $ - ---- src/getopt.h.orig Sun Jul 21 13:54:13 2002 -+++ src/getopt.h Sun Jul 21 13:54:27 2002 -@@ -103,7 +103,7 @@ - errors, only prototype getopt for the GNU C library. */ - extern int getopt (int argc, char *const *argv, const char *shortopts); - #else /* not __GNU_LIBRARY__ */ --extern int getopt (); -+/* extern int getopt (); */ - #endif /* __GNU_LIBRARY__ */ - extern int getopt_long (int argc, char *const *argv, const char *shortopts, - const struct option *longopts, int *longind); >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031201022006.437945b8.tkato>