ports/125968: [Patch] audio/mpdscribble Setup script is broken

[Martin Tournoij]

>Number:         125968
>Category:       ports
>Synopsis:       [Patch] audio/mpdscribble Setup script is broken
>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:   Sat Jul 26 03:50:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Martin Tournoij
>Release:        FreeBSD 7.0-STABLE i386
>Organization:
>Environment:
FreeBSD phong.rwxrwxrwx.net 7.0-STABLE FreeBSD 7.0-STABLE #0: Thu Jun 5 22:13:23 CEST 2008 carpetsmoker at phong.rwxrwxrwx.net:/usr/obj/usr/src/sys/PHONG  i386


>Description:
o mpdscribble-setup script is broken, fix it
o Take maintainership

>How-To-Repeat:

>Fix:

--- mpdscribble.diff begins here ---
diff -urN --exclude CVS /ports/audio/mpdscribble/Makefile audio/mpdscribble/Makefile
--- /ports/audio/mpdscribble/Makefile	2008-06-11 17:51:11.000000000 +0200
+++ audio/mpdscribble/Makefile	2008-07-26 05:40:45.000000000 +0200
@@ -7,17 +7,19 @@
 
 PORTNAME=	mpdscribble
 PORTVERSION=	0.2.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
-MASTER_SITES=	http://www.frob.nl/projects/scribble/
+MASTER_SITES=	http://www.frob.nl/projects/scribble/ \
+		http://www.carpetsmoker.net/distfiles/ \
+		http://www.xs4all.nl/~tournoij/distfiles/ \
+		http://www.rwxrwxrwx.net/distfiles/
 
-MAINTAINER=	ports at FreeBSD.org
-COMMENT=	Mpd last.fm client
+MAINTAINER=	carpetsmoker at rwxrwxrwx.net
+COMMENT=	Musicpd last.fm client
 
 LIB_DEPENDS=	soup:${PORTSDIR}/devel/libsoup22
 
 GNU_CONFIGURE=	yes
-
 MAN1=		mpdscribble.1
 PLIST_FILES=	bin/mpdscribble bin/mpdscribble-setup
 
diff -urN --exclude CVS /ports/audio/mpdscribble/files/patch-setup.sh audio/mpdscribble/files/patch-setup.sh
--- /ports/audio/mpdscribble/files/patch-setup.sh	2008-06-01 14:34:11.000000000 +0200
+++ audio/mpdscribble/files/patch-setup.sh	2008-07-22 02:31:16.000000000 +0200
@@ -1,15 +1,25 @@
---- setup.sh.orig	2008-06-01 19:53:53.000000000 +0800
-+++ setup.sh	2008-06-01 19:54:16.000000000 +0800
-@@ -26,7 +26,7 @@
+--- 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..."
+-echo "continue..."
 -read -s
-+read
++echo "press enter to continue..."
++read junk
  
  mkdir -p $CONF_DIR
  mkdir -p $CACHE_DIR
-@@ -35,7 +35,7 @@
+@@ -35,17 +35,19 @@
  echo -n "Please enter your audioscrobbler username: "
  read -e USERNAME
  echo -n "and password: "
@@ -18,3 +28,16 @@
  
  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."
diff -urN --exclude CVS /ports/audio/mpdscribble/pkg-descr audio/mpdscribble/pkg-descr
--- /ports/audio/mpdscribble/pkg-descr	2006-07-13 10:35:51.000000000 +0200
+++ audio/mpdscribble/pkg-descr	2008-07-22 02:17:10.000000000 +0200
@@ -1,4 +1,4 @@
-mpdscribble is a music player daemon client which
-submits information about tracks being played to audioscrobbler.
+mpdscribble is a music player daemon client which submits information about
+tracks being played to audioscrobbler.
 
 WWW: http://www.frob.nl/scribble.html
--- mpdscribble.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: