From 303383eaeda61abd47cb67011ea47a9116d36683 Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Sat, 24 Apr 2010 17:38:06 +0000
Subject: [PATCH] - update xmms2-scrobbler to 0.4.0

---
 audio/xmms2-scrobbler/Makefile               |  5 ++---
 audio/xmms2-scrobbler/distinfo               | 10 +++++-----
 audio/xmms2-scrobbler/patches/patch-Makefile | 12 +++++++-----
 audio/xmms2-scrobbler/pkg/MESSAGE            | 19 ++++---------------
 audio/xmms2-scrobbler/pkg/PLIST              |  4 +++-
 5 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/audio/xmms2-scrobbler/Makefile b/audio/xmms2-scrobbler/Makefile
index e03ffcd2d91..c33d20c4fe0 100644
--- a/audio/xmms2-scrobbler/Makefile
+++ b/audio/xmms2-scrobbler/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2009/06/05 21:31:58 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.4 2010/04/24 17:38:06 jasper Exp $
 
 COMMENT =		last.fm client for xmms2
 
-DISTNAME =		xmms2-scrobbler-0.3.0
-PKGNAME =		${DISTNAME}p0
+DISTNAME =		xmms2-scrobbler-0.4.0
 
 CATEGORIES =		audio
 
diff --git a/audio/xmms2-scrobbler/distinfo b/audio/xmms2-scrobbler/distinfo
index 9670240b799..2229539d88e 100644
--- a/audio/xmms2-scrobbler/distinfo
+++ b/audio/xmms2-scrobbler/distinfo
@@ -1,5 +1,5 @@
-MD5 (xmms2-scrobbler-0.3.0.tar.gz) = 70MBMnHRc42745ueiluWYg==
-RMD160 (xmms2-scrobbler-0.3.0.tar.gz) = YTRrcwLhX5Vo9oA2ijQbajG7zeA=
-SHA1 (xmms2-scrobbler-0.3.0.tar.gz) = kAO1rp63bwvt5N0/FGJ0zUmDAqw=
-SHA256 (xmms2-scrobbler-0.3.0.tar.gz) = 17OZV3RKFGz0e5kG2kViZGculBfj9f1WPvN3qqlqRFA=
-SIZE (xmms2-scrobbler-0.3.0.tar.gz) = 16988
+MD5 (xmms2-scrobbler-0.4.0.tar.gz) = 9b4VyQz3xgIJAxuJaPd7GQ==
+RMD160 (xmms2-scrobbler-0.4.0.tar.gz) = Ad3rJlWoqHyRZm338iL4WIV+rII=
+SHA1 (xmms2-scrobbler-0.4.0.tar.gz) = zwxvmCiAY0DP8QEpgKN+lEshK30=
+SHA256 (xmms2-scrobbler-0.4.0.tar.gz) = eu0WcPOBRj5ERmCD8uSRGWNulgBbm5OJnt951hOi0rw=
+SIZE (xmms2-scrobbler-0.4.0.tar.gz) = 19831
diff --git a/audio/xmms2-scrobbler/patches/patch-Makefile b/audio/xmms2-scrobbler/patches/patch-Makefile
index 0d938c02a20..23a9a9b71d7 100644
--- a/audio/xmms2-scrobbler/patches/patch-Makefile
+++ b/audio/xmms2-scrobbler/patches/patch-Makefile
@@ -1,18 +1,20 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2009/06/05 09:28:24 pea Exp $
---- Makefile.orig	Sat May  9 21:28:01 2009
-+++ Makefile	Sun May 17 01:20:26 2009
-@@ -22,11 +22,11 @@ OBJECTS := src/xmms2-scrobbler.o src/queue.o src/strbu
+$OpenBSD: patch-Makefile,v 1.2 2010/04/24 17:38:06 jasper Exp $
+--- Makefile.orig	Wed Dec 30 18:04:01 2009
++++ Makefile	Mon Mar 15 21:31:54 2010
+@@ -31,11 +31,13 @@ OBJECTS := src/xmms2-scrobbler.o \
  all: $(BINARY)
  
  install: $(BINARY)
 -	install -d $(DESTDIR)$(PREFIX)/bin
 -	install -m 755 $(BINARY) $(DESTDIR)$(PREFIX)/bin
 +	install -d $(PREFIX)/bin
++	install -d $(PREFIX)/share/doc/xmms2-scrobbler
 +	install -m 755 $(BINARY) $(PREFIX)/bin
++	install -m 644 README $(PREFIX)/share/doc/xmms2-scrobbler
  
  $(BINARY): $(OBJECTS) bin
 -	$(QUIET_LINK)$(CC) $(LDFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) $(OBJECTS) -o $@
 +	$(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) $(OBJECTS) -o $@
  
  src/%.o : src/%.c
- 	$(QUIET_CC)$(CC) $(CFLAGS) $(XMMS_CFLAGS) $(CURL_CFLAGS) -o $@ -c $<
+ 	$(QUIET_CC)$(CC) $(CFLAGS) $(XMMS_CFLAGS) $(CURL_CFLAGS) $(ENDIAN_CFLAGS) -o $@ -c $<
diff --git a/audio/xmms2-scrobbler/pkg/MESSAGE b/audio/xmms2-scrobbler/pkg/MESSAGE
index 7c79449f7d0..886c435c219 100644
--- a/audio/xmms2-scrobbler/pkg/MESSAGE
+++ b/audio/xmms2-scrobbler/pkg/MESSAGE
@@ -1,15 +1,4 @@
-You need to store your Audioscrobbler username and password in the
-config file:
- echo -e "user: foo\npassword: bar" > \
- ~/.config/xmms2/clients/xmms2-scrobbler/config
-
-Optionally, if you're behind a proxy, you'll need to tell
-XMMS2-Scrobbler about that proxy:
-  echo -e "proxy: my.proxy\nproxy_port: 8080" >> \
-  ~/.config/xmms2/clients/xmms2-scrobbler/config
-
-If you want to launch and stop xmms2-scrobbler with xmms2d you can
-execute:
-  ln -s ${PREFIX}/bin/xmms2-scrobbler ~/.config/xmms2/startup.d
-
-Log will be saved in ~/.config/xmms2/clients/xmms2-scrobbler/logfile.log
\ No newline at end of file
+The format of the configuration file has changed since version 0.3.
+See section "Usage" and "Upgrading from 0.3.x" of
+${PREFIX}/share/doc/xmms2-scrobbler/README to update your current
+configuration, or to create a new one.
diff --git a/audio/xmms2-scrobbler/pkg/PLIST b/audio/xmms2-scrobbler/pkg/PLIST
index 1abde70112d..77118f00454 100644
--- a/audio/xmms2-scrobbler/pkg/PLIST
+++ b/audio/xmms2-scrobbler/pkg/PLIST
@@ -1,2 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2009/06/05 09:28:24 pea Exp $
+@comment $OpenBSD: PLIST,v 1.2 2010/04/24 17:38:06 jasper Exp $
 @bin bin/xmms2-scrobbler
+share/doc/xmms2-scrobbler/
+share/doc/xmms2-scrobbler/README