Attachment #95048 for bug #133341




#
PORTNAME=	mpdscribble
PORTVERSION=	0.17
PORTREVISION=	3
CATEGORIES=	audio
MASTER_SITES=	SF/musicpd
		http://www.carpetsmoker.net/distfiles/ \
		http://www.xs4all.nl/~tournoij/distfiles/ \
		http://www.rwxrwxrwx.net/distfiles/
MAINTAINER=	carpetsmoker@rwxrwxrwx.net
COMMENT=	Musicpd last.fm client
LIB_DEPENDS=	soup:${PORTSDIR}/devel/libsoup
USE_BZIP2=	yes
USE_GNOME=	glib20 pkgconfig
GNU_CONFIGURE=	yes
MAN1=		mpdscribble.1
USE_RC_SUBR=	mpdscribble
post-install:
	@${INSTALL_SCRIPT} ${WRKSRC}/setup.sh ${PREFIX}/bin/mpdscribble-setup
.include <bsd.port.mk>

Lines 1-3 Link Here

(-)/usr/ports/audio/mpdscribble/distinfo (-3 / +3 lines)
1	MD5 (mpdscribble-0.2.12.tar.gz) = 7f0e976e7a066df0ddf21f3f4041ef6a	1	MD5 (mpdscribble-0.17.tar.bz2) = af8e565c8b5c0e8e5363bca35df0438a
2	SHA256 (mpdscribble-0.2.12.tar.gz) = bc15d633abca93d245c013e2f9ce40bc69a01c45da0a63423c437d891f404768	2	SHA256 (mpdscribble-0.17.tar.bz2) = 228a66b7544228cabef9df4cbc44f9704c26e1f4a3ed7792f81abbf6366fd416
3	SIZE (mpdscribble-0.2.12.tar.gz) = 140039	3	SIZE (mpdscribble-0.17.tar.bz2) = 124652




#!/bin/sh
#

# PROVIDE: mpdscribble
# REQUIRE: LOGIN
# KEYWORD: shutdown

# Add the following line to /etc/rc.conf to enable mpdscribble:
#
#mpdscribble_enable="YES"

. %%RC_SUBR%%

name=mpdscribble
rcvar=`set_rcvar`

command=%%PREFIX%%/bin/mpdscribble

load_rc_config $name

: ${mpdscribble_enable="NO"}
: ${mpdscribble_user="nobody"}

command_args="--daemon-user ${mpdscribble_user}"

run_rc_command "$1"




--- setup.sh.orig	2005-04-17 16:53:46.000000000 +0200
+++ setup.sh	2008-07-22 02:30:33.000000000 +0200
@@ -1,6 +1,6 @@
 #!/bin/sh

-if [ $UID = "0" ]; then
+if [ $(id -u) -eq 0 ]; then
   echo "user root, system-wide installation assumed."
   echo
   CONF_DIR=/etc
@@ -25,8 +25,8 @@
 echo "log file:            $LOG"
 echo
 echo "press ctrl-c to cancel if this is not intended."
-echo "continue..."
-read -s
+echo "press enter to continue..."
+read junk

 mkdir -p $CONF_DIR
 mkdir -p $CACHE_DIR
@@ -35,17 +35,19 @@
 echo -n "Please enter your audioscrobbler username: "
 read -e USERNAME
 echo -n "and password: "
-read -s -e PASSWORD
+read -e PASSWORD

 echo "username = $USERNAME" > $LOGIN
 chmod 600 $LOGIN
-MD5=`echo -n $PASSWORD | md5sum | awk '{print $1}'`
+MD5=$(echo -n $PASSWORD | md5 -q)
 echo "password = $MD5" >> $LOGIN

 echo "cache = $CACHE" >> $LOGIN
 echo "log = $LOG" >> $LOGIN
 echo "verbose = 2" >> $LOGIN

+touch $CACHE
+
 echo ""
 echo "Thank you."
 echo "You can try running mpdscribble now."

Lines 1-4 Link Here

(-)/usr/ports/audio/mpdscribble/pkg-descr (-2 / +2 lines)
1	mpdscribble is a music player daemon client which submits information about	1	mpdscribble is a music player daemon client which submits information about
2	tracks being played to audioscrobbler.	2	tracks being played to Last.fm (formerly audioscrobbler).
3	WWW: http://www.frob.nl/scribble.html	3	WWW: http://mpd.wikia.com/wiki/Client:Mpdscribble

Line 0 Link Here

(-)/usr/ports/audio/mpdscribble/pkg-plist (+6 lines)
	1	bin/mpdscribble
	2	etc/mpdscribble.conf
	3	share/doc/mpdscribble/README
	4	share/doc/mpdscribble/AUTHORS
	5	share/doc/mpdscribble/NEWS
	6	@dirrm share/doc/mpdscribble

Return to bug 133341

Lines 6-29 Link Here

(-)/usr/ports/audio/mpdscribble/Makefile (-10 / +6 lines)
6	#	6	#
7	PORTNAME= mpdscribble	7	PORTNAME= mpdscribble
8	PORTVERSION= 0.2.12	8	PORTVERSION= 0.17
9	PORTREVISION= 3
10	CATEGORIES= audio	9	CATEGORIES= audio
11	MASTER_SITES= http://www.frob.nl/projects/scribble/ \	10	MASTER_SITES= SF/musicpd
12	http://www.carpetsmoker.net/distfiles/ \
13	http://www.xs4all.nl/~tournoij/distfiles/ \
14	http://www.rwxrwxrwx.net/distfiles/
15	MAINTAINER= carpetsmoker@rwxrwxrwx.net	11	MAINTAINER= carpetsmoker@rwxrwxrwx.net
16	COMMENT= Musicpd last.fm client	12	COMMENT= Musicpd last.fm client
17	LIB_DEPENDS= soup:${PORTSDIR}/devel/libsoup22	13	LIB_DEPENDS= soup:${PORTSDIR}/devel/libsoup
		14	USE_BZIP2= yes
		15	USE_GNOME= glib20 pkgconfig
18	GNU_CONFIGURE= yes	16	GNU_CONFIGURE= yes
19	MAN1= mpdscribble.1	17	MAN1= mpdscribble.1
20	PLIST_FILES= bin/mpdscribble bin/mpdscribble-setup	18	USE_RC_SUBR= mpdscribble
21	post-install:
22	@${INSTALL_SCRIPT} ${WRKSRC}/setup.sh ${PREFIX}/bin/mpdscribble-setup
23	.include <bsd.port.mk>	19	.include <bsd.port.mk>

Line 0 Link Here

(-)/usr/ports/audio/mpdscribble/files/mpdscribble.in (+26 lines)
	1	#!/bin/sh
	2	#
	3
	4	# PROVIDE: mpdscribble
	5	# REQUIRE: LOGIN
	6	# KEYWORD: shutdown
	7
	8	# Add the following line to /etc/rc.conf to enable mpdscribble:
	9	#
	10	#mpdscribble_enable="YES"
	11
	12	. %%RC_SUBR%%
	13
	14	name=mpdscribble
	15	rcvar=`set_rcvar`
	16
	17	command=%%PREFIX%%/bin/mpdscribble
	18
	19	load_rc_config $name
	20
	21	: ${mpdscribble_enable="NO"}
	22	: ${mpdscribble_user="nobody"}
	23
	24	command_args="--daemon-user ${mpdscribble_user}"
	25
	26	run_rc_command "$1"

Lines 1-43 Link Here

(-)/usr/ports/audio/mpdscribble/files/patch-setup.sh (-43 lines)
1	--- setup.sh.orig 2005-04-17 16:53:46.000000000 +0200
2	+++ setup.sh 2008-07-22 02:30:33.000000000 +0200
3	@@ -1,6 +1,6 @@
4	#!/bin/sh
5
6	-if [ $UID = "0" ]; then
7	+if [ $(id -u) -eq 0 ]; then
8	echo "user root, system-wide installation assumed."
9	echo
10	CONF_DIR=/etc
11	@@ -25,8 +25,8 @@
12	echo "log file: $LOG"
13	echo
14	echo "press ctrl-c to cancel if this is not intended."
15	-echo "continue..."
16	-read -s
17	+echo "press enter to continue..."
18	+read junk
19
20	mkdir -p $CONF_DIR
21	mkdir -p $CACHE_DIR
22	@@ -35,17 +35,19 @@
23	echo -n "Please enter your audioscrobbler username: "
24	read -e USERNAME
25	echo -n "and password: "
26	-read -s -e PASSWORD
27	+read -e PASSWORD
28
29	echo "username = $USERNAME" > $LOGIN
30	chmod 600 $LOGIN
31	-MD5=`echo -n $PASSWORD \| md5sum \| awk '{print $1}'`
32	+MD5=$(echo -n $PASSWORD \| md5 -q)
33	echo "password = $MD5" >> $LOGIN
34
35	echo "cache = $CACHE" >> $LOGIN
36	echo "log = $LOG" >> $LOGIN
37	echo "verbose = 2" >> $LOGIN
38
39	+touch $CACHE
40	+
41	echo ""
42	echo "Thank you."
43	echo "You can try running mpdscribble now."