- Update to version 0.3.1 [1]

- Add LICENSE (GPLv2) while here

Submitted by:	maintainer [1]

6 files changed, 17 insertions, 56 deletions

diff --git a/audio/scmpc/Makefile b/audio/scmpc/Makefile
index 4842c79bf1c1..8135a9eafc2a 100644
--- a/audio/scmpc/Makefile
+++ b/audio/scmpc/Makefile
@@ -6,28 +6,31 @@
 #
 
 PORTNAME=	scmpc
-PORTVERSION=	0.2.2
-PORTREVISION=	2
+PORTVERSION=	0.3.1
 CATEGORIES=	audio
-MASTER_SITES=	BERLIOS
+MASTER_SITES=	http://cloud.github.com/downloads/cmende/${PORTNAME}/
 
 MAINTAINER=	legioner.r@gmail.com
 COMMENT=	An Audioscrobbler client for MPD
 
-LIB_DEPENDS=	argtable2.1:${PORTSDIR}/devel/argtable \
-		confuse.0:${PORTSDIR}/devel/libconfuse \
-		daemon.0:${PORTSDIR}/devel/libdaemon \
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	confuse.0:${PORTSDIR}/devel/libconfuse \
 		curl.6:${PORTSDIR}/ftp/curl
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+USE_GMAKE=	yes
+USE_GNOME=	glib20
 
 MAN1=		scmpc.1
-PLIST_FILES=	bin/scmpc share/scmpc/scmpc.conf
-PLIST_DIRS=	share/scmpc
+PLIST_FILES=	bin/scmpc
+PORTDOCS=	NEWS README scmpc.conf.example
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/audio/scmpc/distinfo b/audio/scmpc/distinfo
index 75513315dd25..22466b3d50ee 100644
--- a/audio/scmpc/distinfo
+++ b/audio/scmpc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (scmpc-0.2.2.tar.bz2) = 38d5992abd0b4ee55f9c7e40e979c56e90c685216e9b61fc8675e2ddece562de
-SIZE (scmpc-0.2.2.tar.bz2) = 72561
+SHA256 (scmpc-0.3.1.tar.bz2) = a7c171686ffe5dd15fd38f8fdcaf3d162076e02900557ec1eb96b59f16b1f557
+SIZE (scmpc-0.3.1.tar.bz2) = 89287
diff --git a/audio/scmpc/files/patch-Makefile.in b/audio/scmpc/files/patch-Makefile.in
deleted file mode 100644
index b1f8506e1a96..000000000000
--- a/audio/scmpc/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Wed Jan 16 12:48:28 2008
-+++ Makefile.in	Sun Dec  3 02:59:18 2006
-@@ -11,7 +11,7 @@
- .SUFFIXES: .c .o
- 
- CC := @CC@
--CFLAGS := @CFLAGS@
-+CFLAGS := @CFLAGS@ @libcurl_CFLAGS@ @confuse_CFLAGS@ @libdaemon_CFLAGS@
- LDFLAGS := @LDFLAGS@
- LIBS := @LIBS@ @libcurl_LIBS@ @confuse_LIBS@ @libdaemon_LIBS@
- LIBOBJS := @LIBOBJS@
diff --git a/audio/scmpc/files/patch-src_audioscrobbler.c b/audio/scmpc/files/patch-src_audioscrobbler.c
deleted file mode 100644
index 64539cc8ab2f..000000000000
--- a/audio/scmpc/files/patch-src_audioscrobbler.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/audioscrobbler.c.orig	Fri Jun 22 02:50:36 2007
-+++ src/audioscrobbler.c	Fri Jun 22 02:50:52 2007
-@@ -743,6 +743,8 @@ static void queue_load(void)
- 	}
- 	
- 	while (getline(&line, &buffer_size, cache_file) != -1) {
-+		if (line == NULL)
-+			break;
- 		char *p = strchr(line, '\n');
- 		if (p != NULL)
- 			*p = '\0';
diff --git a/audio/scmpc/files/patch-src_libmpd.c b/audio/scmpc/files/patch-src_libmpd.c
deleted file mode 100644
index 10e6a8191bb3..000000000000
--- a/audio/scmpc/files/patch-src_libmpd.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/libmpd.c.orig	Sat Jun 23 00:31:14 2007
-+++ src/libmpd.c	Sat Jun 23 00:31:42 2007
-@@ -420,6 +420,7 @@ void mpd_disconnect(mpd_connection *mpd_conn)
- 
- 	shutdown(mpd_conn->sockd, SHUT_RDWR);
- 	close(mpd_conn->sockd);
-+	mpd_conn->status = DISCONNECTED;
- }
- 
- int mpd_check_server(mpd_connection *mpd_conn, struct s_exception *e)
diff --git a/audio/scmpc/files/patch-src_mpd.c b/audio/scmpc/files/patch-src_mpd.c
deleted file mode 100644
index bc102df6e6bd..000000000000
--- a/audio/scmpc/files/patch-src_mpd.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/mpd.c.orig	Wed Jan 16 12:49:48 2008
-+++ src/mpd.c	Sun Dec  3 02:59:18 2006
-@@ -26,6 +26,7 @@
- #include <unistd.h>
- #include <pthread.h>
- #include <sys/types.h>
-+#include <sys/select.h>
- #include <signal.h>
- #include <math.h>
- #include <string.h>