From kimelto@gmail.com Fri Apr 3 13:46:28 2009 Return-Path: Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6D7D31065673 for ; Fri, 3 Apr 2009 13:46:28 +0000 (UTC) (envelope-from kimelto@gmail.com) Received: from mail-ew0-f171.google.com (mail-ew0-f171.google.com [209.85.219.171]) by mx1.freebsd.org (Postfix) with ESMTP id EA71B8FC12 for ; Fri, 3 Apr 2009 13:46:27 +0000 (UTC) (envelope-from kimelto@gmail.com) Received: by ewy19 with SMTP id 19so937759ewy.43 for ; Fri, 03 Apr 2009 06:46:27 -0700 (PDT) Received: by 10.216.49.211 with SMTP id x61mr403218web.222.1238766385916; Fri, 03 Apr 2009 06:46:25 -0700 (PDT) Received: from localhost (lns-bzn-48f-62-147-157-205.adsl.proxad.net [62.147.157.205]) by mx.google.com with ESMTPS id 10sm2958175eyd.3.2009.04.03.06.46.24 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 03 Apr 2009 06:46:25 -0700 (PDT) Message-Id: <49d61331.0a04d00a.6509.ffffedcc@mx.google.com> Date: Fri, 03 Apr 2009 06:46:25 -0700 (PDT) From: Julien Laffaye To: FreeBSD-gnats-submit@freebsd.org Cc: carpetsmoker@rwxrwxrwx.net Subject: [PATCH] audio/mpdscribble: update to 0.17 X-Send-Pr-Version: 3.113 X-GNATS-Notify: carpetsmoker@rwxrwxrwx.net >Number: 133341 >Category: ports >Synopsis: [PATCH] audio/mpdscribble: update to 0.17 >Confidential: no >Severity: non-critical >Priority: low >Responsible: miwi >State: closed >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Apr 03 13:50:04 UTC 2009 >Closed-Date: Thu Apr 30 21:17:05 UTC 2009 >Last-Modified: Thu Apr 30 21:20:02 UTC 2009 >Originator: Julien Laffaye >Release: FreeBSD 7.1-RELEASE i386 >Organization: >Environment: System: FreeBSD laptop.kimelto.eu 7.1-RELEASE FreeBSD 7.1-RELEASE #0: Thu Jan 1 14:37:25 UTC >Description: - Update to 0.17 Added file(s): - files/mpdscribble.in - pkg-plist Removed file(s): - files/patch-setup.sh Port maintainer (carpetsmoker@rwxrwxrwx.net) is cc'd. I would like to take maintainership of this port if the actual maintainer can't (or doesnt want to) maintain it anymore. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- mpdscribble-0.17.patch begins here --- 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 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 --- mpdscribble-0.17.patch ends here --- >Release-Note: >Audit-Trail: State-Changed-From-To: open->feedback State-Changed-By: edwin State-Changed-When: Fri Apr 3 13:50:20 UTC 2009 State-Changed-Why: Awaiting maintainers feedback (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=133341 Responsible-Changed-From-To: freebsd-ports-bugs->miwi Responsible-Changed-By: miwi Responsible-Changed-When: Fri Apr 3 13:51:51 UTC 2009 Responsible-Changed-Why: I'll take it. http://www.freebsd.org/cgi/query-pr.cgi?pr=133341 From: Edwin Groothuis To: carpetsmoker@rwxrwxrwx.net Cc: bug-followup@FreeBSD.org Subject: Re: ports/133341: [PATCH] audio/mpdscribble: update to 0.17 Date: Fri, 3 Apr 2009 13:50:18 UT Maintainer of audio/mpdscribble, Please note that PR ports/133341 has just been submitted. If it contains a patch for an upgrade, an enhancement or a bug fix you agree on, reply to this email stating that you approve the patch and a committer will take care of it. The full text of the PR can be found at: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/133341 -- Edwin Groothuis via the GNATS Auto Assign Tool edwin@FreeBSD.org From: Julien Laffaye To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/133341: [PATCH] audio/mpdscribble: update to 0.17 Date: Thu, 30 Apr 2009 21:18:55 +0200 --0016e6d6256234c1fd0468ca9133 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Hi, Here is a new patch. Added: - check in the Makefile + @exec/@unexec in the plist to deal with the configurations files - NOPORTDOCS support - DOCSDIR support Regards, Julien Laffaye --0016e6d6256234c1fd0468ca9133 Content-Type: application/octet-stream; name="mpdscribble-0.17.patch" Content-Disposition: attachment; filename="mpdscribble-0.17.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_fu5tz9qp0 ZGlmZiAtcnVOIC0tZXhjbHVkZT1DVlMgL3Vzci9wb3J0cy9hdWRpby9tcGRzY3JpYmJsZS5vcmln L01ha2VmaWxlIC91c3IvcG9ydHMvYXVkaW8vbXBkc2NyaWJibGUvTWFrZWZpbGUKLS0tIC91c3Iv cG9ydHMvYXVkaW8vbXBkc2NyaWJibGUub3JpZy9NYWtlZmlsZQkyMDA5LTA0LTMwIDE4OjU2OjQ3 LjAwMDAwMDAwMCArMDIwMAorKysgL3Vzci9wb3J0cy9hdWRpby9tcGRzY3JpYmJsZS9NYWtlZmls ZQkyMDA5LTA0LTMwIDIwOjEyOjI4LjAwMDAwMDAwMCArMDIwMApAQCAtNiwyNCArNiwzMyBAQAog IwoKIFBPUlROQU1FPQltcGRzY3JpYmJsZQotUE9SVFZFUlNJT049CTAuMi4xMgotUE9SVFJFVklT SU9OPQkzCitQT1JUVkVSU0lPTj0JMC4xNwogQ0FURUdPUklFUz0JYXVkaW8KLU1BU1RFUl9TSVRF Uz0JaHR0cDovL3d3dy5mcm9iLm5sL3Byb2plY3RzL3NjcmliYmxlLyBcCi0JCWh0dHA6Ly93d3cu Y2FycGV0c21va2VyLm5ldC9kaXN0ZmlsZXMvIFwKLQkJaHR0cDovL3d3dy54czRhbGwubmwvfnRv dXJub2lqL2Rpc3RmaWxlcy8gXAotCQlodHRwOi8vd3d3LnJ3eHJ3eHJ3eC5uZXQvZGlzdGZpbGVz LworTUFTVEVSX1NJVEVTPQlTRi9tdXNpY3BkCgogTUFJTlRBSU5FUj0JY2FycGV0c21va2VyQHJ3 eHJ3eHJ3eC5uZXQKIENPTU1FTlQ9CU11c2ljcGQgbGFzdC5mbSBjbGllbnQKCi1MSUJfREVQRU5E Uz0Jc291cDoke1BPUlRTRElSfS9kZXZlbC9saWJzb3VwMjIKK0xJQl9ERVBFTkRTPQlzb3VwOiR7 UE9SVFNESVJ9L2RldmVsL2xpYnNvdXAKCitVU0VfQlpJUDI9CXllcworVVNFX0dOT01FPQlnbGli MjAgcGtnY29uZmlnCiBHTlVfQ09ORklHVVJFPQl5ZXMKIE1BTjE9CQltcGRzY3JpYmJsZS4xCi1Q TElTVF9GSUxFUz0JYmluL21wZHNjcmliYmxlIGJpbi9tcGRzY3JpYmJsZS1zZXR1cAoKLXBvc3Qt aW5zdGFsbDoKLQlAJHtJTlNUQUxMX1NDUklQVH0gJHtXUktTUkN9L3NldHVwLnNoICR7UFJFRklY fS9iaW4vbXBkc2NyaWJibGUtc2V0dXAKK1VTRV9SQ19TVUJSPQltcGRzY3JpYmJsZQorCitkby1p bnN0YWxsOgorLmlmICFkZWZpbmVkKE5PUE9SVERPQ1MpCisJQCR7TUtESVJ9ICR7RE9DU0RJUn0K Ky5mb3IgaSBpbiBSRUFETUUgQVVUSE9SUyBORVdTCisJQCR7SU5TVEFMTF9EQVRBfSAke1dSS1NS Q30vJHtpfSAke0RPQ1NESVJ9CisuZW5kZm9yCisuZW5kaWYKKwlAWyAtZiAke1BSRUZJWH0vZXRj L21wZHNjcmliYmxlLmNvbmYgXSB8fCBcCisJCSR7SU5TVEFMTF9EQVRBfSAke1dSS1NSQ30vZG9j L21wZHNjcmliYmxlLmNvbmYgJHtQUkVGSVh9L2V0Yy9tcGRzY3JpYmJsZS5jb25mCisJQCR7SU5T VEFMTF9EQVRBfSAke1dSS1NSQ30vZG9jL21wZHNjcmliYmxlLmNvbmYgJHtQUkVGSVh9L2V0Yy9t cGRzY3JpYmJsZS5jb25mLnNhbXBsZQorCUAke0lOU1RBTExfUFJPR1JBTX0gJHtXUktTUkN9L3Ny Yy9tcGRzY3JpYmJsZSAke1BSRUZJWH0vYmluL21wZHNjcmliYmxlCisJQCR7SU5TVEFMTF9NQU59 ICR7V1JLU1JDfS9kb2MvbXBkc2NyaWJibGUuMSAke1BSRUZJWH0vbWFuL21hbjEvbXBkc2NyaWJi bGUuMQoKIC5pbmNsdWRlIDxic2QucG9ydC5taz4KZGlmZiAtcnVOIC0tZXhjbHVkZT1DVlMgL3Vz ci9wb3J0cy9hdWRpby9tcGRzY3JpYmJsZS5vcmlnL2Rpc3RpbmZvIC91c3IvcG9ydHMvYXVkaW8v bXBkc2NyaWJibGUvZGlzdGluZm8KLS0tIC91c3IvcG9ydHMvYXVkaW8vbXBkc2NyaWJibGUub3Jp Zy9kaXN0aW5mbwkyMDA5LTA0LTMwIDE4OjU2OjQ3LjAwMDAwMDAwMCArMDIwMAorKysgL3Vzci9w b3J0cy9hdWRpby9tcGRzY3JpYmJsZS9kaXN0aW5mbwkyMDA5LTA0LTMwIDE5OjE4OjU4LjAwMDAw MDAwMCArMDIwMApAQCAtMSwzICsxLDMgQEAKLU1ENSAobXBkc2NyaWJibGUtMC4yLjEyLnRhci5n eikgPSA3ZjBlOTc2ZTdhMDY2ZGYwZGRmMjFmM2Y0MDQxZWY2YQotU0hBMjU2IChtcGRzY3JpYmJs ZS0wLjIuMTIudGFyLmd6KSA9IGJjMTVkNjMzYWJjYTkzZDI0NWMwMTNlMmY5Y2U0MGJjNjlhMDFj NDVkYTBhNjM0MjNjNDM3ZDg5MWY0MDQ3NjgKLVNJWkUgKG1wZHNjcmliYmxlLTAuMi4xMi50YXIu Z3opID0gMTQwMDM5CitNRDUgKG1wZHNjcmliYmxlLTAuMTcudGFyLmJ6MikgPSBhZjhlNTY1Yzhi NWMwZThlNTM2M2JjYTM1ZGYwNDM4YQorU0hBMjU2IChtcGRzY3JpYmJsZS0wLjE3LnRhci5iejIp ID0gMjI4YTY2Yjc1NDQyMjhjYWJlZjlkZjRjYmM0NGY5NzA0YzI2ZTFmNGEzZWQ3NzkyZjgxYWJi ZjYzNjZmZDQxNgorU0laRSAobXBkc2NyaWJibGUtMC4xNy50YXIuYnoyKSA9IDEyNDY1MgpkaWZm IC1ydU4gLS1leGNsdWRlPUNWUyAvdXNyL3BvcnRzL2F1ZGlvL21wZHNjcmliYmxlLm9yaWcvZmls ZXMvbXBkc2NyaWJibGUuaW4gL3Vzci9wb3J0cy9hdWRpby9tcGRzY3JpYmJsZS9maWxlcy9tcGRz Y3JpYmJsZS5pbgotLS0gL3Vzci9wb3J0cy9hdWRpby9tcGRzY3JpYmJsZS5vcmlnL2ZpbGVzL21w ZHNjcmliYmxlLmluCTE5NzAtMDEtMDEgMDE6MDA6MDAuMDAwMDAwMDAwICswMTAwCisrKyAvdXNy L3BvcnRzL2F1ZGlvL21wZHNjcmliYmxlL2ZpbGVzL21wZHNjcmliYmxlLmluCTIwMDktMDQtMzAg MTk6MTI6NTUuMDAwMDAwMDAwICswMjAwCkBAIC0wLDAgKzEsMjYgQEAKKyMhL2Jpbi9zaAorIwor CisjIFBST1ZJREU6IG1wZHNjcmliYmxlCisjIFJFUVVJUkU6IExPR0lOCisjIEtFWVdPUkQ6IHNo dXRkb3duCisKKyMgQWRkIHRoZSBmb2xsb3dpbmcgbGluZSB0byAvZXRjL3JjLmNvbmYgdG8gZW5h YmxlIG1wZHNjcmliYmxlOgorIworI21wZHNjcmliYmxlX2VuYWJsZT0iWUVTIgorCisuICUlUkNf U1VCUiUlCisKK25hbWU9bXBkc2NyaWJibGUKK3JjdmFyPWBzZXRfcmN2YXJgCisKK2NvbW1hbmQ9 JSVQUkVGSVglJS9iaW4vbXBkc2NyaWJibGUKKworbG9hZF9yY19jb25maWcgJG5hbWUKKworOiAk e21wZHNjcmliYmxlX2VuYWJsZT0iTk8ifQorOiAke21wZHNjcmliYmxlX3VzZXI9Im5vYm9keSJ9 CisKK2NvbW1hbmRfYXJncz0iLS1kYWVtb24tdXNlciAke21wZHNjcmliYmxlX3VzZXJ9IgorCity dW5fcmNfY29tbWFuZCAiJDEiCmRpZmYgLXJ1TiAtLWV4Y2x1ZGU9Q1ZTIC91c3IvcG9ydHMvYXVk aW8vbXBkc2NyaWJibGUub3JpZy9maWxlcy9wYXRjaC1zZXR1cC5zaCAvdXNyL3BvcnRzL2F1ZGlv L21wZHNjcmliYmxlL2ZpbGVzL3BhdGNoLXNldHVwLnNoCi0tLSAvdXNyL3BvcnRzL2F1ZGlvL21w ZHNjcmliYmxlLm9yaWcvZmlsZXMvcGF0Y2gtc2V0dXAuc2gJMjAwOS0wNC0zMCAxODo1Njo0Ny4w MDAwMDAwMDAgKzAyMDAKKysrIC91c3IvcG9ydHMvYXVkaW8vbXBkc2NyaWJibGUvZmlsZXMvcGF0 Y2gtc2V0dXAuc2gJMTk3MC0wMS0wMSAwMTowMDowMC4wMDAwMDAwMDAgKzAxMDAKQEAgLTEsNDMg KzAsMCBAQAotLS0tIHNldHVwLnNoLm9yaWcJMjAwNS0wNC0xNyAxNjo1Mzo0Ni4wMDAwMDAwMDAg KzAyMDAKLSsrKyBzZXR1cC5zaAkyMDA4LTA3LTIyIDAyOjMwOjMzLjAwMDAwMDAwMCArMDIwMAot QEAgLTEsNiArMSw2IEBACi0gIyEvYmluL3NoCi0KLS1pZiBbICRVSUQgPSAiMCIgXTsgdGhlbgot K2lmIFsgJChpZCAtdSkgLWVxIDAgXTsgdGhlbgotICAgZWNobyAidXNlciByb290LCBzeXN0ZW0t d2lkZSBpbnN0YWxsYXRpb24gYXNzdW1lZC4iCi0gICBlY2hvCi0gICBDT05GX0RJUj0vZXRjCi1A QCAtMjUsOCArMjUsOCBAQAotIGVjaG8gImxvZyBmaWxlOiAgICAgICAgICAgICRMT0ciCi0gZWNo bwotIGVjaG8gInByZXNzIGN0cmwtYyB0byBjYW5jZWwgaWYgdGhpcyBpcyBub3QgaW50ZW5kZWQu IgotLWVjaG8gImNvbnRpbnVlLi4uIgotLXJlYWQgLXMKLStlY2hvICJwcmVzcyBlbnRlciB0byBj b250aW51ZS4uLiIKLStyZWFkIGp1bmsKLQotIG1rZGlyIC1wICRDT05GX0RJUgotIG1rZGlyIC1w ICRDQUNIRV9ESVIKLUBAIC0zNSwxNyArMzUsMTkgQEAKLSBlY2hvIC1uICJQbGVhc2UgZW50ZXIg eW91ciBhdWRpb3Njcm9iYmxlciB1c2VybmFtZTogIgotIHJlYWQgLWUgVVNFUk5BTUUKLSBlY2hv IC1uICJhbmQgcGFzc3dvcmQ6ICIKLS1yZWFkIC1zIC1lIFBBU1NXT1JECi0rcmVhZCAtZSBQQVNT V09SRAotCi0gZWNobyAidXNlcm5hbWUgPSAkVVNFUk5BTUUiID4gJExPR0lOCi0gY2htb2QgNjAw ICRMT0dJTgotLU1ENT1gZWNobyAtbiAkUEFTU1dPUkQgfCBtZDVzdW0gfCBhd2sgJ3twcmludCAk MX0nYAotK01ENT0kKGVjaG8gLW4gJFBBU1NXT1JEIHwgbWQ1IC1xKQotIGVjaG8gInBhc3N3b3Jk ID0gJE1ENSIgPj4gJExPR0lOCi0KLSBlY2hvICJjYWNoZSA9ICRDQUNIRSIgPj4gJExPR0lOCi0g ZWNobyAibG9nID0gJExPRyIgPj4gJExPR0lOCi0gZWNobyAidmVyYm9zZSA9IDIiID4+ICRMT0dJ TgotCi0rdG91Y2ggJENBQ0hFCi0rCi0gZWNobyAiIgotIGVjaG8gIlRoYW5rIHlvdS4iCi0gZWNo byAiWW91IGNhbiB0cnkgcnVubmluZyBtcGRzY3JpYmJsZSBub3cuIgpkaWZmIC1ydU4gLS1leGNs dWRlPUNWUyAvdXNyL3BvcnRzL2F1ZGlvL21wZHNjcmliYmxlLm9yaWcvcGtnLWRlc2NyIC91c3Iv cG9ydHMvYXVkaW8vbXBkc2NyaWJibGUvcGtnLWRlc2NyCi0tLSAvdXNyL3BvcnRzL2F1ZGlvL21w ZHNjcmliYmxlLm9yaWcvcGtnLWRlc2NyCTIwMDktMDQtMzAgMTg6NTY6NDcuMDAwMDAwMDAwICsw MjAwCisrKyAvdXNyL3BvcnRzL2F1ZGlvL21wZHNjcmliYmxlL3BrZy1kZXNjcgkyMDA5LTA0LTMw IDE5OjEyOjU1LjAwMDAwMDAwMCArMDIwMApAQCAtMSw0ICsxLDQgQEAKIG1wZHNjcmliYmxlIGlz IGEgbXVzaWMgcGxheWVyIGRhZW1vbiBjbGllbnQgd2hpY2ggc3VibWl0cyBpbmZvcm1hdGlvbiBh Ym91dAotdHJhY2tzIGJlaW5nIHBsYXllZCB0byBhdWRpb3Njcm9iYmxlci4KK3RyYWNrcyBiZWlu ZyBwbGF5ZWQgdG8gTGFzdC5mbSAoZm9ybWVybHkgYXVkaW9zY3JvYmJsZXIpLgoKLVdXVzogaHR0 cDovL3d3dy5mcm9iLm5sL3NjcmliYmxlLmh0bWwKK1dXVzogaHR0cDovL21wZC53aWtpYS5jb20v d2lraS9DbGllbnQ6TXBkc2NyaWJibGUKZGlmZiAtcnVOIC0tZXhjbHVkZT1DVlMgL3Vzci9wb3J0 cy9hdWRpby9tcGRzY3JpYmJsZS5vcmlnL3BrZy1wbGlzdCAvdXNyL3BvcnRzL2F1ZGlvL21wZHNj cmliYmxlL3BrZy1wbGlzdAotLS0gL3Vzci9wb3J0cy9hdWRpby9tcGRzY3JpYmJsZS5vcmlnL3Br Zy1wbGlzdAkxOTcwLTAxLTAxIDAxOjAwOjAwLjAwMDAwMDAwMCArMDEwMAorKysgL3Vzci9wb3J0 cy9hdWRpby9tcGRzY3JpYmJsZS9wa2ctcGxpc3QJMjAwOS0wNC0zMCAyMDo0NTo0Ni4wMDAwMDAw MDAgKzAyMDAKQEAgLTAsMCArMSw4IEBACitiaW4vbXBkc2NyaWJibGUKK0B1bmV4ZWMgaWYgY21w IC1zICVEL2V0Yy9tcGRzY3JpYmJsZS5jb25mLnNhbXBsZSAlRC9ldGMvbXBkc2NyaWJibGUuY29u ZjsgdGhlbiBybSAtZiAlRC9ldGMvbXBkc2NyaWJibGUuY29uZjsgZmkKK2V0Yy9tcGRzY3JpYmJs ZS5jb25mLnNhbXBsZQorQGV4ZWMgWyAtZiAlQi9tcGRzY3JpYmJsZS5jb25mIF0gfHwgY3AgLXAg JUIvJWYgJUIvbXBkc2NyaWJibGUuY29uZgorJSVQT1JURE9DUyUlJSVET0NTRElSJSUvUkVBRE1F CislJVBPUlRET0NTJSUlJURPQ1NESVIlJS9BVVRIT1JTCislJVBPUlRET0NTJSUlJURPQ1NESVIl JS9ORVdTCislJVBPUlRET0NTJSVAZGlycm0gJSVET0NTRElSJSUK --0016e6d6256234c1fd0468ca9133-- From: kimelto To: bug-followup@freebsd.org Cc: Subject: Re: ports/133341: [PATCH] audio/mpdscribble: update to 0.17 Date: Thu, 30 Apr 2009 22:07:04 +0200 --zjcmjzIkjQU2rmur Content-Type: multipart/mixed; boundary="EY/WZ/HvNxOox07X" Content-Disposition: inline --EY/WZ/HvNxOox07X Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Re send the patch as attachment. -- Julien LAFFAYE | GPG: 0x46DE4110 --EY/WZ/HvNxOox07X Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="mpdscribble-0.17.patch" diff -ruN --exclude=CVS /usr/ports/audio/mpdscribble.orig/Makefile /usr/ports/audio/mpdscribble/Makefile --- /usr/ports/audio/mpdscribble.orig/Makefile 2009-04-30 18:56:47.000000000 +0200 +++ /usr/ports/audio/mpdscribble/Makefile 2009-04-30 20:12:28.000000000 +0200 @@ -6,24 +6,33 @@ # 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 + +do-install: +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} +.for i in README AUTHORS NEWS + @${INSTALL_DATA} ${WRKSRC}/${i} ${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 diff -ruN --exclude=CVS /usr/ports/audio/mpdscribble.orig/distinfo /usr/ports/audio/mpdscribble/distinfo --- /usr/ports/audio/mpdscribble.orig/distinfo 2009-04-30 18:56:47.000000000 +0200 +++ /usr/ports/audio/mpdscribble/distinfo 2009-04-30 19:18:58.000000000 +0200 @@ -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-04-30 19:12:55.000000000 +0200 @@ -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-04-30 18:56:47.000000000 +0200 +++ /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-04-30 18:56:47.000000000 +0200 +++ /usr/ports/audio/mpdscribble/pkg-descr 2009-04-30 19:12:55.000000000 +0200 @@ -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-04-30 20:45:46.000000000 +0200 @@ -0,0 +1,8 @@ +bin/mpdscribble +@unexec if cmp -s %D/etc/mpdscribble.conf.sample %D/etc/mpdscribble.conf; then rm -f %D/etc/mpdscribble.conf; fi +etc/mpdscribble.conf.sample +@exec [ -f %B/mpdscribble.conf ] || cp -p %B/%f %B/mpdscribble.conf +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%@dirrm %%DOCSDIR%% --EY/WZ/HvNxOox07X-- --zjcmjzIkjQU2rmur Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (FreeBSD) iEYEARECAAYFAkn6BOgACgkQMLeAwUbeQRDRWwCgshxvZAwMHYMgfRETsMaCfa27 I58AoImuYJ/C5FkE+PgcOTrWosLYg11O =LDnk -----END PGP SIGNATURE----- --zjcmjzIkjQU2rmur-- State-Changed-From-To: feedback->closed State-Changed-By: miwi State-Changed-When: Thu Apr 30 21:17:04 UTC 2009 State-Changed-Why: Committed. Thanks! http://www.freebsd.org/cgi/query-pr.cgi?pr=133341 From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/133341: commit references a PR Date: Thu, 30 Apr 2009 21:17:03 +0000 (UTC) miwi 2009-04-30 21:16:53 UTC FreeBSD ports repository Modified files: audio/mpdscribble Makefile distinfo pkg-descr Added files: audio/mpdscribble pkg-plist audio/mpdscribble/files mpdscribble.in Removed files: audio/mpdscribble/files patch-setup.sh Log: - Update to 0.17 PR: 133341 Submitted by: Julien Laffaye Approved by: maintainer timeout Revision Changes Path 1.11 +19 -10 ports/audio/mpdscribble/Makefile 1.3 +3 -3 ports/audio/mpdscribble/distinfo 1.1 +26 -0 ports/audio/mpdscribble/files/mpdscribble.in (new) 1.3 +0 -43 ports/audio/mpdscribble/files/patch-setup.sh (dead) 1.3 +2 -2 ports/audio/mpdscribble/pkg-descr 1.1 +8 -0 ports/audio/mpdscribble/pkg-plist (new) _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org" >Unformatted: