ports/137527: Update port: audio/mpdscribble to 0.18

[KATO Tsuguru]

>Number:         137527
>Category:       ports
>Synopsis:       Update port: audio/mpdscribble to 0.18
>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:   Fri Aug 07 18:10:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.2-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Update to version 0.18

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/audio/mpdscribble/Makefile audio/mpdscribble/Makefile
--- /usr/ports/audio/mpdscribble/Makefile	2009-08-02 16:22:28.000000000 +0900
+++ audio/mpdscribble/Makefile	2009-08-08 02:39:37.000000000 +0900
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	mpdscribble
-PORTVERSION=	0.17
-PORTREVISION=	1
+PORTVERSION=	0.18
 CATEGORIES=	audio
 MASTER_SITES=	SF/musicpd
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Musicpd last.fm client
 
-LIB_DEPENDS=	soup:${PORTSDIR}/devel/libsoup
+OPTIONS=	SOUP    "Use libsoup for HTTP client library"    off
 
 USE_BZIP2=	yes
 USE_GNOME=	glib20 pkgconfig
@@ -23,17 +22,28 @@
 
 USE_RC_SUBR=	mpdscribble
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_SOUP)
+LIB_DEPENDS+=	soup-2.4.1:${PORTSDIR}/devel/libsoup
+CONFIGURE_ARGS+=	--with-http-client=soup
+.else
+LIB_DEPENDS+=	curl.5:${PORTSDIR}/ftp/curl
+CONFIGURE_ARGS+=	--with-http-client=curl
+.endif
+
 do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/src/mpdscribble ${PREFIX}/bin/mpdscribble
+	${INSTALL_MAN} ${WRKSRC}/doc/mpdscribble.1 ${MANPREFIX}/man/man1/mpdscribble.1
+	${INSTALL_DATA} ${WRKSRC}/doc/mpdscribble.conf ${PREFIX}/etc/mpdscribble.conf.sample
+.if !exists(${PREFIX}/etc/mpdscribble.conf)
+	@(cd ${PREFIX}/etc && ${CP} mpdscribble.conf.sample mpdscribble.conf)
+.endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for i in README AUTHORS NEWS
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.for file in AUTHORS NEWS README
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
-	@[ -f ${PREFIX}/etc/mpdscribble.conf ] || \
-		${INSTALL_DATA} ${WRKSRC}/doc/mpdscribble.conf ${PREFIX}/etc/mpdscribble.conf
-	@${INSTALL_DATA} ${WRKSRC}/doc/mpdscribble.conf ${PREFIX}/etc/mpdscribble.conf.sample
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/mpdscribble ${PREFIX}/bin/mpdscribble
-	@${INSTALL_MAN} ${WRKSRC}/doc/mpdscribble.1 ${PREFIX}/man/man1/mpdscribble.1
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -urN /usr/ports/audio/mpdscribble/distinfo audio/mpdscribble/distinfo
--- /usr/ports/audio/mpdscribble/distinfo	2009-05-01 19:23:13.000000000 +0900
+++ audio/mpdscribble/distinfo	2009-08-06 04:38:12.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (mpdscribble-0.17.tar.bz2) = af8e565c8b5c0e8e5363bca35df0438a
-SHA256 (mpdscribble-0.17.tar.bz2) = 228a66b7544228cabef9df4cbc44f9704c26e1f4a3ed7792f81abbf6366fd416
-SIZE (mpdscribble-0.17.tar.bz2) = 124652
+MD5 (mpdscribble-0.18.tar.bz2) = 688d4df2a7ab7de4f4605a1a8b804de9
+SHA256 (mpdscribble-0.18.tar.bz2) = 030727cbe149c3129b0b12d745830ce37f678fda247ddbcc093e34c1954bf508
+SIZE (mpdscribble-0.18.tar.bz2) = 126355
>Release-Note:
>Audit-Trail:
>Unformatted: