From 0cf29136276e5e6548099dc74053408fbda174ef Mon Sep 17 00:00:00 2001
From: Rong-En Fan <rafan@FreeBSD.org>
Date: Sun, 27 Jul 2008 02:47:34 +0000
Subject: - Fix some linux/bash specific commands in mpdscribble-setup - Bump
 PORTREVISION - Add couple mirrors from the new maintainer - Pass
 maintainership to submitter

PR:		ports/125968
Submitted by:	Martin Tournoij <carpetsmoker at rwxrwxrwx.net>
---
 audio/mpdscribble/Makefile             | 12 +++++++-----
 audio/mpdscribble/files/patch-setup.sh | 35 ++++++++++++++++++++++++++++------
 audio/mpdscribble/pkg-descr            |  4 ++--
 3 files changed, 38 insertions(+), 13 deletions(-)

(limited to 'audio/mpdscribble')

diff --git a/audio/mpdscribble/Makefile b/audio/mpdscribble/Makefile
index ec4c07fc0879..ec65b7336dfa 100644
--- a/audio/mpdscribble/Makefile
+++ b/audio/mpdscribble/Makefile
@@ -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@FreeBSD.org
-COMMENT=	Mpd last.fm client
+MAINTAINER=	carpetsmoker@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 --git a/audio/mpdscribble/files/patch-setup.sh b/audio/mpdscribble/files/patch-setup.sh
index 10b8d03b3a71..aaedc2cd6381 100644
--- a/audio/mpdscribble/files/patch-setup.sh
+++ b/audio/mpdscribble/files/patch-setup.sh
@@ -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 --git a/audio/mpdscribble/pkg-descr b/audio/mpdscribble/pkg-descr
index 7529d85cba13..eaf92b86daac 100644
--- a/audio/mpdscribble/pkg-descr
+++ b/audio/mpdscribble/pkg-descr
@@ -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
-- 
cgit v1.2.3