From fbef5e397d0d07aeede2e15a8afc4de97974c13a Mon Sep 17 00:00:00 2001 From: obache Date: Sun, 25 Mar 2012 15:20:04 +0000 Subject: * included oauth is reuqired to use user stream. * no need to move escape.rb, include one will be picked up. Bump PKGREVISION. --- net/mikutter/Makefile | 9 ++++--- net/mikutter/PLIST | 44 ++++++++++++++++++++++++++++++-- net/mikutter/distinfo | 3 +-- net/mikutter/patches/patch-core_utils.rb | 15 ----------- 4 files changed, 48 insertions(+), 23 deletions(-) delete mode 100644 net/mikutter/patches/patch-core_utils.rb (limited to 'net') diff --git a/net/mikutter/Makefile b/net/mikutter/Makefile index 815ad3dacef..269117a4430 100644 --- a/net/mikutter/Makefile +++ b/net/mikutter/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.42 2012/03/24 03:01:54 obache Exp $ +# $NetBSD: Makefile,v 1.43 2012/03/25 15:20:04 obache Exp $ # DISTNAME= mikutter.0.1.0.723 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/./-/} +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= http://mikutter.hachune.net/bin/ @@ -20,7 +21,8 @@ RUBY_VERSION_SUPPORTED= 192 193 DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils DEPENDS+= ${RUBY_PKGPREFIX}-hmac>=0.4.0:../../security/ruby-hmac DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gtk>=1.0.0:../../x11/ruby-gnome2-gtk -DEPENDS+= ${RUBY_PKGPREFIX}-oauth>=0.3.6:../../security/ruby-oauth +# need included oauth +#DEPENDS+= ${RUBY_PKGPREFIX}-oauth>=0.3.6:../../security/ruby-oauth # need included escape.rb #DEPENDS+= ${RUBY_PKGPREFIX}-escape-[0-9]*:../../textproc/ruby-escape DEPENDS+= ${RUBY_PKGPREFIX}-memoize>=1.3.1:../../devel/ruby-memoize @@ -44,8 +46,7 @@ INSTALLATION_DIRS+= bin share/doc/mikutter share/applications share/mikutter do-build: cd ${WRKSRC}/core/lib && \ - ${RM} -rf json* hmac*.rb oauth* memoize.rb ruby-bsearch-* addressable && \ - ${MKDIR} miku && ${MV} escape.rb miku/escape.rb + ${RM} -rf json* hmac*.rb memoize.rb ruby-bsearch-* addressable && \ ${SED} -e 's,@PREFIX@,${PREFIX},g' < ${FILESDIR}/desktop.in > ${WRKDIR}/desktop ${SED} -e 's,@PREFIX@,${PREFIX},g' < ${FILESDIR}/mikutter.sh.in > ${WRKDIR}/mikutter.sh diff --git a/net/mikutter/PLIST b/net/mikutter/PLIST index ab9f165e7ad..623d971201d 100644 --- a/net/mikutter/PLIST +++ b/net/mikutter/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2012/03/16 15:46:36 obache Exp $ +@comment $NetBSD: PLIST,v 1.14 2012/03/25 15:20:04 obache Exp $ bin/mikutter share/applications/mikutter.desktop share/doc/mikutter/README @@ -61,8 +61,8 @@ share/mikutter/core/lib/deferred.rb share/mikutter/core/lib/deferred/deferred.rb share/mikutter/core/lib/deferred/deferredable.rb share/mikutter/core/lib/deferred/test.deferred.rb +share/mikutter/core/lib/escape.rb share/mikutter/core/lib/lazy.rb -share/mikutter/core/lib/miku/escape.rb share/mikutter/core/lib/mikutwitter.rb share/mikutter/core/lib/mikutwitter/api_call_support.rb share/mikutter/core/lib/mikutwitter/api_shortcuts.rb @@ -97,6 +97,46 @@ share/mikutter/core/lib/mikutwitter/test/user.json share/mikutter/core/lib/mikutwitter/test/user_timeline.json share/mikutter/core/lib/mikutwitter/unauthorized.rb share/mikutter/core/lib/mikutwitter/utils.rb +share/mikutter/core/lib/oauth.rb +share/mikutter/core/lib/oauth/cli.rb +share/mikutter/core/lib/oauth/client.rb +share/mikutter/core/lib/oauth/client/action_controller_request.rb +share/mikutter/core/lib/oauth/client/helper.rb +share/mikutter/core/lib/oauth/client/net_http.rb +share/mikutter/core/lib/oauth/consumer.rb +share/mikutter/core/lib/oauth/errors.rb +share/mikutter/core/lib/oauth/errors/error.rb +share/mikutter/core/lib/oauth/errors/problem.rb +share/mikutter/core/lib/oauth/errors/unauthorized.rb +share/mikutter/core/lib/oauth/helper.rb +share/mikutter/core/lib/oauth/oauth.rb +share/mikutter/core/lib/oauth/oauth_test_helper.rb +share/mikutter/core/lib/oauth/request_proxy.rb +share/mikutter/core/lib/oauth/request_proxy/action_controller_request.rb +share/mikutter/core/lib/oauth/request_proxy/base.rb +share/mikutter/core/lib/oauth/request_proxy/jabber_request.rb +share/mikutter/core/lib/oauth/request_proxy/mock_request.rb +share/mikutter/core/lib/oauth/request_proxy/net_http.rb +share/mikutter/core/lib/oauth/request_proxy/rack_request.rb +share/mikutter/core/lib/oauth/server.rb +share/mikutter/core/lib/oauth/signature.rb +share/mikutter/core/lib/oauth/signature/base.rb +share/mikutter/core/lib/oauth/signature/hmac/base.rb +share/mikutter/core/lib/oauth/signature/hmac/md5.rb +share/mikutter/core/lib/oauth/signature/hmac/rmd160.rb +share/mikutter/core/lib/oauth/signature/hmac/sha1.rb +share/mikutter/core/lib/oauth/signature/hmac/sha2.rb +share/mikutter/core/lib/oauth/signature/md5.rb +share/mikutter/core/lib/oauth/signature/plaintext.rb +share/mikutter/core/lib/oauth/signature/rsa/sha1.rb +share/mikutter/core/lib/oauth/signature/sha1.rb +share/mikutter/core/lib/oauth/token.rb +share/mikutter/core/lib/oauth/tokens/access_token.rb +share/mikutter/core/lib/oauth/tokens/consumer_token.rb +share/mikutter/core/lib/oauth/tokens/request_token.rb +share/mikutter/core/lib/oauth/tokens/server_token.rb +share/mikutter/core/lib/oauth/tokens/token.rb +share/mikutter/core/lib/oauth/version.rb share/mikutter/core/lib/piapro.rb share/mikutter/core/lib/reserver.rb share/mikutter/core/lib/test_unit_extensions.rb diff --git a/net/mikutter/distinfo b/net/mikutter/distinfo index 40145a34a75..7f5012a17fb 100644 --- a/net/mikutter/distinfo +++ b/net/mikutter/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.37 2012/03/24 03:01:54 obache Exp $ +$NetBSD: distinfo,v 1.38 2012/03/25 15:20:04 obache Exp $ SHA1 (mikutter.0.1.0.723.tar.gz) = 7020de3fe7111c41a41d4db9aefd449ce0b7eb71 RMD160 (mikutter.0.1.0.723.tar.gz) = 61bfaf0809a09997dfc9c73ae1d5f3703e40c9c5 Size (mikutter.0.1.0.723.tar.gz) = 2228502 bytes SHA1 (patch-core_mui_cairo__inner__tl.rb) = a91ddfc1c2ba0a86d4b05d4e18acc9034c800f57 -SHA1 (patch-core_utils.rb) = 62a4bdc0621b544dded13d952d0c95954b2c901b diff --git a/net/mikutter/patches/patch-core_utils.rb b/net/mikutter/patches/patch-core_utils.rb deleted file mode 100644 index 0e94d724acd..00000000000 --- a/net/mikutter/patches/patch-core_utils.rb +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-core_utils.rb,v 1.3 2012/03/02 06:34:35 obache Exp $ - -* use included escape library instead of system one. - ---- core/utils.rb.orig 2012-02-14 15:07:52.000000000 +0000 -+++ core/utils.rb -@@ -32,7 +32,7 @@ Dir::chdir(File::dirname(__FILE__)) - ['.', 'lib', 'miku'].each{|path| - $LOAD_PATH.push(File.expand_path(File.join(Dir.pwd, path))) - } --miquire :lib, 'escape' -+miquire :lib, 'miku/escape' - miquire :lib, 'lazy' - - # すべてのクラスにメモ化機能を -- cgit v1.2.3