diff -ruN --exclude=CVS /usr/ports/audio/mpdscribble.orig/Makefile /usr/ports/audio/mpdscribble/Makefile
--- /usr/ports/audio/mpdscribble.orig/Makefile	2009-03-13 15:41:02.000000000 +0100
+++ /usr/ports/audio/mpdscribble/Makefile	2009-03-13 17:31:45.000000000 +0100
@@ -6,24 +6,20 @@
 #

 PORTNAME=	mpdscribble
-PORTVERSION=	0.2.12
-PORTREVISION=	3
+PORTVERSION=	0.17
 CATEGORIES=	audio
-MASTER_SITES=	http://www.frob.nl/projects/scribble/ \
-		http://www.carpetsmoker.net/distfiles/ \
-		http://www.xs4all.nl/~tournoij/distfiles/ \
-		http://www.rwxrwxrwx.net/distfiles/
+MASTER_SITES=	SF/musicpd

 MAINTAINER=	carpetsmoker@rwxrwxrwx.net
 COMMENT=	Musicpd last.fm client

-LIB_DEPENDS=	soup:${PORTSDIR}/devel/libsoup22
+LIB_DEPENDS=	soup:${PORTSDIR}/devel/libsoup

+USE_BZIP2=	yes
+USE_GNOME=	glib20 pkgconfig
 GNU_CONFIGURE=	yes
 MAN1=		mpdscribble.1
-PLIST_FILES=	bin/mpdscribble bin/mpdscribble-setup

-post-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/setup.sh ${PREFIX}/bin/mpdscribble-setup
+USE_RC_SUBR=	mpdscribble

 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/audio/mpdscribble.orig/distinfo /usr/ports/audio/mpdscribble/distinfo
--- /usr/ports/audio/mpdscribble.orig/distinfo	2009-03-13 15:41:02.000000000 +0100
+++ /usr/ports/audio/mpdscribble/distinfo	2009-03-13 15:51:07.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (mpdscribble-0.2.12.tar.gz) = 7f0e976e7a066df0ddf21f3f4041ef6a
-SHA256 (mpdscribble-0.2.12.tar.gz) = bc15d633abca93d245c013e2f9ce40bc69a01c45da0a63423c437d891f404768
-SIZE (mpdscribble-0.2.12.tar.gz) = 140039
+MD5 (mpdscribble-0.17.tar.bz2) = af8e565c8b5c0e8e5363bca35df0438a
+SHA256 (mpdscribble-0.17.tar.bz2) = 228a66b7544228cabef9df4cbc44f9704c26e1f4a3ed7792f81abbf6366fd416
+SIZE (mpdscribble-0.17.tar.bz2) = 124652
diff -ruN --exclude=CVS /usr/ports/audio/mpdscribble.orig/files/mpdscribble.in /usr/ports/audio/mpdscribble/files/mpdscribble.in
--- /usr/ports/audio/mpdscribble.orig/files/mpdscribble.in	1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/audio/mpdscribble/files/mpdscribble.in	2009-03-13 17:48:48.000000000 +0100
@@ -0,0 +1,26 @@
+#!/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"
diff -ruN --exclude=CVS /usr/ports/audio/mpdscribble.orig/files/patch-setup.sh /usr/ports/audio/mpdscribble/files/patch-setup.sh
--- /usr/ports/audio/mpdscribble.orig/files/patch-setup.sh	2009-03-13 15:41:02.000000000 +0100
+++ /usr/ports/audio/mpdscribble/files/patch-setup.sh	1970-01-01 01:00:00.000000000 +0100
@@ -1,43 +0,0 @@
---- 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."
diff -ruN --exclude=CVS /usr/ports/audio/mpdscribble.orig/pkg-descr /usr/ports/audio/mpdscribble/pkg-descr
--- /usr/ports/audio/mpdscribble.orig/pkg-descr	2009-03-13 15:41:02.000000000 +0100
+++ /usr/ports/audio/mpdscribble/pkg-descr	2009-03-13 16:33:37.000000000 +0100
@@ -1,4 +1,4 @@
 mpdscribble is a music player daemon client which submits information about
-tracks being played to audioscrobbler.
+tracks being played to Last.fm (formerly audioscrobbler).

-WWW: http://www.frob.nl/scribble.html
+WWW: http://mpd.wikia.com/wiki/Client:Mpdscribble
diff -ruN --exclude=CVS /usr/ports/audio/mpdscribble.orig/pkg-plist /usr/ports/audio/mpdscribble/pkg-plist
--- /usr/ports/audio/mpdscribble.orig/pkg-plist	1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/audio/mpdscribble/pkg-plist	2009-03-13 15:58:37.000000000 +0100
@@ -0,0 +1,6 @@
+bin/mpdscribble
+etc/mpdscribble.conf
+share/doc/mpdscribble/README
+share/doc/mpdscribble/AUTHORS
+share/doc/mpdscribble/NEWS
+@dirrm share/doc/mpdscribble