ports/129634: [maintainer-update] Updating multimedia/shell-fm to v0.6
Nikos Ntarmos
ntarmos at ceid.upatras.gr
Sun Dec 14 14:20:04 UTC 2008
>Number: 129634
>Category: ports
>Synopsis: [maintainer-update] Updating multimedia/shell-fm to v0.6
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Dec 14 14:20:04 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Nikos Ntarmos
>Release: FreeBSD 7.1-PRERELEASE i386
>Organization:
NetCInS Lab., C.E.I.D., U. of Patras, Greece
>Environment:
System: FreeBSD ace.netcins.ceid.upatras.gr 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #0: Fri Dec 12 20:50:24 EET 2008 ntarmos at ace.netcins.ceid.upatras.gr:/opt/obj/opt/src/sys/ACE i386
>Description:
Updating multimedia/shell-fm to v0.6.
>How-To-Repeat:
>Fix:
--- shell-fm-v0.6.diff begins here ---
diff -urNbB shell-fm.orig/Makefile shell-fm/Makefile
--- shell-fm.orig/Makefile 2008-12-14 15:40:50.000000000 +0200
+++ shell-fm/Makefile 2008-12-14 15:38:55.000000000 +0200
@@ -6,10 +6,10 @@
#
PORTNAME= shell-fm
-PORTVERSION= 0.4
+PORTVERSION= 0.6
PORTEPOCH= 1
CATEGORIES= multimedia
-MASTER_SITES= http://ntarmos.dyndns.org/Software/FreeBSD/
+MASTER_SITES= http://nex.scrapping.cc/code/shell-fm/downloads/
MAINTAINER= ntarmos at ceid.upatras.gr
COMMENT= A command-line client for Last.FM
@@ -17,35 +17,37 @@
LIB_DEPENDS= ao:${PORTSDIR}/audio/libao \
mad:${PORTSDIR}/audio/libmad
-USE_AUTOTOOLS= aclocal:19 automake:19 autoheader:262 autoconf:262
-AUTOMAKE_ARGS= --add-missing --copy
-ACLOCAL_ARGS= -I m4
+USE_BZIP2= true
+USE_GMAKE= true
LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-pre-configure:
- @(cd ${CONFIGURE_WRKSRC} && \
- ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL})
+MAN1= shell-fm.1
+MANCOMPRESSED= yes
+PLIST_FILES= bin/shell-fm
+PORTDOCS= AUTHORS CHANGES RELEASE INSTALL
+PORTEXAMPLES= shell-colors.sh shell-fm-tune.sh \
+ unix.pl zcontrol
+
+pre-build:
+ @${REINPLACE_CMD} \
+ -e 's/^DESTDIR.*$$/\DESTDIR := $$(LOCALBASE)/g' \
+ ${WRKSRC}/Makefile
post-install:
.if !defined(NOPORTDOCS)
@${ECHO_MSG} "installing additional documentation to ${DOCSDIR}"
@${MKDIR} ${DOCSDIR}
- @${INSTALL_MAN} ${WRKSRC}/AUTHORS ${DOCSDIR}
- @${INSTALL_MAN} ${WRKSRC}/COPYING ${DOCSDIR}
- @${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}
+. for doc in ${PORTDOCS}
+ @${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
+. endfor
.endif
.if !defined(NOPORTEXAMPLES)
- @${ECHO_MSG} "installing example config file to ${EXAMPLESDIR}"
@${MKDIR} ${EXAMPLESDIR}
- @${INSTALL_MAN} ${WRKSRC}/shell-fm.rc-example ${EXAMPLESDIR}
+ @${ECHO_MSG} "installing examples to ${EXAMPLESDIR}"
+. for example in ${PORTEXAMPLES}
+ @${INSTALL_DATA} ${WRKSRC}/scripts/${example} ${EXAMPLESDIR}
+. endfor
.endif
-MAN1= shell-fm.1
-MANCOMPRESSED= no
-PLIST_FILES= bin/shell-fm
-PORTDOCS= AUTHORS COPYING README
-PORTEXAMPLES= shell-fm.rc-example
-
.include <bsd.port.mk>
diff -urNbB shell-fm.orig/distinfo shell-fm/distinfo
--- shell-fm.orig/distinfo 2008-12-14 15:40:50.000000000 +0200
+++ shell-fm/distinfo 2008-12-14 15:03:10.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (shell-fm-0.4.tar.gz) = 8042dca006ebc8c29bce0ef4e3c964a8
-SHA256 (shell-fm-0.4.tar.gz) = 03fd3ea13a1ecd97355aa9a504480b3b407c46bc6893477d3d1b61f300c3425b
-SIZE (shell-fm-0.4.tar.gz) = 56641
+MD5 (shell-fm-0.6.tar.bz2) = dc8b1ffedf93df565f426f26943842ab
+SHA256 (shell-fm-0.6.tar.bz2) = b66dc51b95b323b30198c8e95af136b232bd3e2aae8b3ec40c07cae0073ad7c7
+SIZE (shell-fm-0.6.tar.bz2) = 35422
diff -urNbB shell-fm.orig/files/patch-shell-fm.1 shell-fm/files/patch-shell-fm.1
--- shell-fm.orig/files/patch-shell-fm.1 2008-12-14 15:40:50.000000000 +0200
+++ shell-fm/files/patch-shell-fm.1 1970-01-01 02:00:00.000000000 +0200
@@ -1,237 +0,0 @@
---- /dev/null 2007-11-19 22:27:41.000000000 +0200
-+++ src/shell-fm.1 2007-11-19 22:27:20.000000000 +0200
-@@ -0,0 +1,223 @@
-+.\"
-+.\" $Id$
-+.\"
-+.Dd December 15, 2006
-+.Dt SHELL-FM 1
-+.Os
-+.Sh NAME
-+.Nm shell-fm
-+.Nd command-line Last.FM client
-+.Sh SYNOPSIS
-+.Nm shell-fm
-+.Op Fl d
-+.Op Fl i Ar address to listen on
-+.Op Fl p Ar port to listen on
-+.Op Fl D Ar device to play on
-+.Op Fl y Ar http://proxy-server
-+.Op Fl h
-+.Op lastfm://...
-+.Sh DESCRIPTION
-+.Nm shell-fm
-+is a console based player for the streams provided by Last.FM. It's
-+lightweight, easy to use and under heavy development. New features might
-+be added every day.
-+.Nm shell-fm
-+is Open Source and published under the terms of the GNU General Public
-+License, so feel free to modify and/or redistribute it.
-+.Sh RUNNINF SHELL-FM
-+Usage of
-+.Nm shell-fm
-+is pretty simple. To tell
-+.Nm shell-fm
-+what to play, you simply give it the direct link to a Last.FM stream (a
-+URL starting with lastfm://). The URLs are very clear and easy to
-+understand. Here are some examples:
-+.Pp
-+.nf
-+ lastfm://user/shell-monkey/personal - my personal radio
-+ lastfm://user/shell-monkey/loved - my loved tracks radio
-+ lastfm://artist/Blood For Blood/similar - bands similar to Blood For
-+ Blood
-+ lastfm://artist/The Distillers/fans - The Distillers fan radio
-+ lastfm://globaltags/punk rock - songs that have been
-+ tagged as "punk rock"
-+.fi
-+.Pp
-+Radios can be specified in three ways. First you can give a stream URL
-+as command line argument to
-+.Nm shell-fm
-+:
-+.Pp
-+[~]$ shell-fm "lastfm://artist/The Distillers/fans"
-+.Pp
-+Note that you need to quote the URL, if it contains white spaces.
-+.br
-+Next you can enter a new URL while
-+.Nm shell-fm
-+is already running by pressing the r key.
-+.Nm shell-fm
-+then will prompt you for a new URL. Note that you don't need / may not
-+quote the URL here like in the command line.
-+.Nm shell-fm
-+will take care of whitespaces for you. Finally, you can name a default
-+stream in your configuration file, which is started by default if you
-+run
-+.Nm shell-fm
-+without an URL as command line argument.
-+.Sh CONFIGURATION
-+Your configuration should be placed in the file ~/.shell-fm/shell-fm.rc.
-+It consists of simple associations in the format key = value. Following
-+keys are known at the moment (may/will be more in future).
-+.br
-+.nf
-+ username = YourLogin - your Last.FM username.
-+ password = YourPass - your Last.FM password.
-+ np-file = /path/to/np-file - the (absolute) path to a file in which
-+ you want shell-fm to save information
-+ about the currently played track in.
-+ np-file-format = format - the format in which shell-fm will write
-+ the song information to your np-file.
-+ Note that both, np-file and
-+ np-file-format need to be specified to
-+ make shell-fm write to the np-file. The
-+ format may contain any character plus
-+ some placeholders shell-fm will replace.
-+ They are:
-+ %a - artist
-+ %t - track
-+ %A - album
-+ %d - track duration
-+ %s - station name
-+ %u - station URL
-+ %U - artist URL
-+ %X - album URL
-+ %T - track URL
-+ %R - remaining seconds of the played
-+ track
-+ np-cmd = command - if defined, this command will be
-+ executed every time a new track is
-+ played. Accepts the sape format flast as
-+ np-file-format.
-+ default-radio = lastfm://.. - the default radio which shell-fm will
-+ play on startup if you called it without
-+ an command line argument.
-+ key0x?? = command - bind an external command to the key with
-+ the hexadecimal, UPPERCASE (!),
-+ zero-padded ASCII code "??". Keys that
-+ are already bound to an action (as
-+ listed here) can't be overwritten.
-+ Again, you can use all the variables as
-+ in "np-file-format" and "np-cmp". Please
-+ note that future versions may use
-+ further keys, so you might need to
-+ change your configuration then.
-+ ?-color = color-code - (where ? is one of the meta tag
-+ variables (see list above). This allows
-+ you to color every kind of tag with a
-+ different color (e.g. paint track titles
-+ red, artists green and so on). This is
-+ the list of valid color codes:
-+ 0;30 = black (not very useful)
-+ 1;30 = dark gray
-+ 0;31 = red
-+ 1;31 = light red
-+ 0;32 = green
-+ 1;32 = light green
-+ 0;33 = dark yellow/brown
-+ 1;33 = yellow
-+ 0;34 = blue
-+ 1;34 = light blue
-+ 0;35 = violet
-+ 1;35 = pink
-+ 0;36 = turquoise
-+ 1;36 = cyan
-+ 0;37 = gray
-+ 1;37 = white
-+ bind = ip/host - binds a socket to the given host so you
-+ can send simple commands to Shell.FM
-+ over a network to control it. For now,
-+ only the most common commands are
-+ supported: "skip", "love", "ban",
-+ "quit", "play" and "info". "play" takes
-+ a radio statio URI as paramater. "info"
-+ takes a format string as parameter (same
-+ as for np-file-format) and returns the
-+ string (formatted).
-+ port = 123 - if defined, the socket interface will be
-+ bound to this port instead of the
-+ default, 54311.
-+ extern = command - on some platforms, Shell.FM is still
-+ unable to play streams properly. This
-+ option enables you to use Shell.FM for
-+ stream control, but use another player
-+ for the playback. The stream will be
-+ written to STDIN of the external player.
-+ For example, extern = /usr/bin/madplay
-+ -Q - should work find on Mac OS X (if
-+ you have madplay installed).
-+ extern-restart = anything - if defined (no matter what value),
-+ Shell.FM will stop and restart the
-+ external player whenever the track
-+ changes.
-+ proxy = http://proxy-server - use proxy server for HTTP requests.
-+ expiry = 86400 - TTL of cached files in seconds.
-+.fi
-+.Pp
-+This is what your configuration file for
-+.Nm shell-fm
-+could look like:
-+.nf
-+ [~]$ cat ~/.shell-fm/shell-fm.rc
-+ username = shell-monkey
-+ password = secret
-+ default-radio = lastfm://user/shell-monkey/loved
-+ np-file = /tmp/np.txt
-+ np-file-format = %a - %t
-+ key0x6F = /usr/bin/elinks "%u"
-+ t-color = 1;32
-+ a-color = 0;32
-+ s-color = 1;37
-+ [~]$
-+.fi
-+.Sh CONTROLS
-+These keys are available from within
-+.Nm shell-fm
-+to control it's behaviour:
-+.br
-+.nf
-+ l - love the currently played track.
-+ B - (uppercase!) ban the currently played track.
-+ n - skip the currently played track.
-+ Q - (uppercase!) quit.
-+ r - prompt for a new station URL.
-+ i - display some information about the currently played track.
-+ d - enable/disable discovery mode.
-+ A - ban the artist of the currently played track (whenever another
-+ track of this artist is streamed again, it will be banned
-+ automatically).
-+ R - recommend currently played track/artist/album to someone.
-+ f - jump to the currently played tracks artists fan radio.
-+ s - jump to the currently played tracks artists similar artists
-+ radio.
-+ H - bookmark the currently played stream.
-+ h - list bookmarks.
-+ [0-9] - jump to a previously bookmarked stream.
-+ p - pause (experimental - after a while the stream will be
-+ closed)
-+ S - stop playing
-+ T - tag the currently played track/artist/album.
-+ ? - show a list of available keys.
-+.fi
-+.br
-+Note that the radio URL prompt provides a simple history (use up/down
-+arrow keys to browse it). By default,
-+.Nm Shell.FM
-+will remember only the URLs you entered in the current session. If you
-+want the history to survive, you need to create an empty file name
-+~/.shell-fm/radio-history. Simply touch(1) it and you're done.
-+.Sh SEE ALSO
-+http://nex.scrapping.cc/shell-fm/
-+.Sh CREDITS
-+Read the AUTHORS file in the port's doc directory.
-+.Sh AUTHOR
-+Nikos Ntarmos <ntarmos at ceid.upatras.gr>
---- src/Makefile.am.orig Sat Dec 16 04:37:00 2006
-+++ src/Makefile.am Sat Dec 16 04:37:59 2006
-@@ -26,5 +26,7 @@
- tag.c \
- utility.c
-
-+man_MANS = shell-fm.1
-+EXTRA_DIST = ${man_MANS}
-
- ## vim: noet ts=8 sw=8
-
diff -urNbB shell-fm.orig/files/patch-strndup.c shell-fm/files/patch-strndup.c
--- shell-fm.orig/files/patch-strndup.c 2008-12-14 15:40:50.000000000 +0200
+++ shell-fm/files/patch-strndup.c 1970-01-01 02:00:00.000000000 +0200
@@ -1,74 +0,0 @@
---- src/strndup.c.orig Sat Dec 16 04:21:22 2006
-+++ src/strndup.c Sat Dec 16 04:20:48 2006
-@@ -0,0 +1,17 @@
-+#include "strndup.h"
-+#include <string.h>
-+#include <stdlib.h>
-+
-+#ifdef __STRNDUP__
-+
-+char* strndup(const char* src, size_t len) {
-+ char* _tmpStr = (char*)malloc(len + 1);
-+ if (_tmpStr) {
-+ strncpy(_tmpStr, src, len);
-+ _tmpStr[len] = 0;
-+ }
-+ return _tmpStr;
-+}
-+
-+#endif
-+
---- src/include/strndup.h.orig Sat Dec 16 04:21:27 2006
-+++ src/include/strndup.h Sat Dec 16 04:20:28 2006
-@@ -0,0 +1,11 @@
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+
-+#if ((defined(__FreeBSD__) || defined(__OpenBSD__)) && !defined(__STRNDUP__))
-+#define __STRNDUP__
-+
-+extern char* strndup(const char* src, size_t len);
-+
-+#endif
-+
---- src/Makefile.am.orig Sat Dec 16 04:18:32 2006
-+++ src/Makefile.am Sat Dec 16 04:18:41 2006
-@@ -169,6 +169,7 @@
- SUBDIRS = include
- INCLUDES = -I$(srcdir)/include
- shell_fm_SOURCES = \
-+strndup.c \
- autoban.c \
- bookmark.c \
- getln.c \
---- src/tag.c.orig Sat Dec 16 04:25:15 2006
-+++ src/tag.c Sat Dec 16 02:07:49 2006
-@@ -22,6 +22,7 @@
- #include "split.h"
- #include "interface.h"
- #include "completion.h"
-+#include "strndup.h"
- #include "md5.h"
- #include "feeds.h"
-
---- src/feeds.c.o 2007-11-19 18:31:19.000000000 +0200
-+++ src/feeds.c 2007-11-19 18:31:43.000000000 +0200
-@@ -8,6 +8,7 @@
- #include "http.h"
- #include "feeds.h"
- #include "tag.h"
-+#include "strndup.h"
-
- char ** neighbors(const char * user) {
- char * encoded = NULL, feed[128], ** names = NULL;
---- src/playlist.c.o 2007-11-19 18:31:15.000000000 +0200
-+++ src/playlist.c 2007-11-19 18:31:31.000000000 +0200
-@@ -18,6 +18,7 @@
- #include "http.h"
- #include "settings.h"
- #include "service.h"
-+#include "strndup.h"
-
- #include "playlist.h"
- #include "globals.h"
--- shell-fm-v0.6.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list