Tue Jun 21 14:03:39 2016 UTC ()
Set DIST_SUBDIR to work around distfile modifications, per the pkgsrc guide.

Requested by wiz@.


(tsutsui)
diff -r1.122 -r1.123 pkgsrc/net/mikutter/Makefile
diff -r1.108 -r1.109 pkgsrc/net/mikutter/distinfo
cvs diff -r1.122 -r1.123 pkgsrc/net/mikutter/Makefile (switch to unified diff)

--- pkgsrc/net/mikutter/Makefile 2016/06/18 12:33:28 1.122
+++ pkgsrc/net/mikutter/Makefile 2016/06/21 14:03:39 1.123
@@ -1,59 +1,60 @@ @@ -1,59 +1,60 @@
1# $NetBSD: Makefile,v 1.122 2016/06/18 12:33:28 tsutsui Exp $ 1# $NetBSD: Makefile,v 1.123 2016/06/21 14:03:39 tsutsui Exp $
2# 2#
3 3
4DISTNAME= mikutter.3.4.1 4DISTNAME= mikutter.3.4.1
5PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/./-/} 5PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/./-/}
 6DIST_SUBDIR= ${PKGNAME_NOREV}
6CATEGORIES= net 7CATEGORIES= net
7MASTER_SITES= http://mikutter.hachune.net/bin/ 8MASTER_SITES= http://mikutter.hachune.net/bin/
8 9
9MAINTAINER= tsutsui@NetBSD.org 10MAINTAINER= tsutsui@NetBSD.org
10HOMEPAGE= http://mikutter.hachune.net/ 11HOMEPAGE= http://mikutter.hachune.net/
11COMMENT= Simple, powerful, and moeful twitter client 12COMMENT= Simple, powerful, and moeful twitter client
12LICENSE= mit AND cc-by-sa-v3.0 13LICENSE= mit AND cc-by-sa-v3.0
13 14
14.include "../../lang/ruby/rubyversion.mk" 15.include "../../lang/ruby/rubyversion.mk"
15 16
16DEPENDS+= ${RUBY_PKGPREFIX}-pluggaloid>=1.1.1:../../net/ruby-pluggaloid 17DEPENDS+= ${RUBY_PKGPREFIX}-pluggaloid>=1.1.1:../../net/ruby-pluggaloid
17DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gtk>=3.0.8:../../x11/ruby-gnome2-gtk 18DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gtk>=3.0.8:../../x11/ruby-gnome2-gtk
18DEPENDS+= ${RUBY_PKGPREFIX}-gettext>=3.0.1:../../devel/ruby-gettext 19DEPENDS+= ${RUBY_PKGPREFIX}-gettext>=3.0.1:../../devel/ruby-gettext
19DEPENDS+= ${RUBY_PKGPREFIX}-oauth>=0.5.1:../../security/ruby-oauth 20DEPENDS+= ${RUBY_PKGPREFIX}-oauth>=0.5.1:../../security/ruby-oauth
20DEPENDS+= ${RUBY_PKGPREFIX}-addressable>=2.3:../../net/ruby-addressable 21DEPENDS+= ${RUBY_PKGPREFIX}-addressable>=2.3:../../net/ruby-addressable
21DEPENDS+= ${RUBY_PKGPREFIX}-memoist-[0-9]*:../../devel/ruby-memoist 22DEPENDS+= ${RUBY_PKGPREFIX}-memoist-[0-9]*:../../devel/ruby-memoist
22DEPENDS+= ${RUBY_PKGPREFIX}-hmac>=0.4:../../security/ruby-hmac 23DEPENDS+= ${RUBY_PKGPREFIX}-hmac>=0.4:../../security/ruby-hmac
23DEPENDS+= ${RUBY_PKGPREFIX}-typed-array>=0.1:../../misc/ruby-typed-array 24DEPENDS+= ${RUBY_PKGPREFIX}-typed-array>=0.1:../../misc/ruby-typed-array
24DEPENDS+= ${RUBY_PKGPREFIX}-delayer-[0-9]*:../../devel/ruby-delayer 25DEPENDS+= ${RUBY_PKGPREFIX}-delayer-[0-9]*:../../devel/ruby-delayer
25DEPENDS+= ${RUBY_PKGPREFIX}-delayer-deferred-[0-9]*:../../devel/ruby-delayer-deferred 26DEPENDS+= ${RUBY_PKGPREFIX}-delayer-deferred-[0-9]*:../../devel/ruby-delayer-deferred
26DEPENDS+= ${RUBY_PKGPREFIX}-nokogiri-[0-9]*:../../textproc/ruby-nokogiri 27DEPENDS+= ${RUBY_PKGPREFIX}-nokogiri-[0-9]*:../../textproc/ruby-nokogiri
27DEPENDS+= ${RUBY_PKGPREFIX}-httpclient-[0-9]*:../../www/ruby-httpclient 28DEPENDS+= ${RUBY_PKGPREFIX}-httpclient-[0-9]*:../../www/ruby-httpclient
28DEPENDS+= ${RUBY_PKGPREFIX}-moneta>=0.7:../../databases/ruby-moneta 29DEPENDS+= ${RUBY_PKGPREFIX}-moneta>=0.7:../../databases/ruby-moneta
29DEPENDS+= ${RUBY_PKGPREFIX}-twitter-text-[0-9]*:../../net/ruby-twitter-text 30DEPENDS+= ${RUBY_PKGPREFIX}-twitter-text-[0-9]*:../../net/ruby-twitter-text
30 31
31WRKSRC= ${WRKDIR}/mikutter 32WRKSRC= ${WRKDIR}/mikutter
32USE_LANGUAGES= # none 33USE_LANGUAGES= # none
33USE_TOOLS+= pax 34USE_TOOLS+= pax
34 35
35REPLACE_RUBY= mikutter.rb devel/makechi.rb 36REPLACE_RUBY= mikutter.rb devel/makechi.rb
36REPLACE_RUBY_DIRS= core 37REPLACE_RUBY_DIRS= core
37.include "../../lang/ruby/replace.mk" 38.include "../../lang/ruby/replace.mk"
38 39
39INSTALLATION_DIRS+= bin share/doc/mikutter share/applications share/mikutter 40INSTALLATION_DIRS+= bin share/doc/mikutter share/applications share/mikutter
40 41
41do-build: 42do-build:
42 cd ${WRKSRC}/devel && \ 43 cd ${WRKSRC}/devel && \
43 ${RM} -rf debian 44 ${RM} -rf debian
44 ${RM} -rf ${WRKSRC}/vendor 45 ${RM} -rf ${WRKSRC}/vendor
45 ${SED} -e 's,@PREFIX@,${PREFIX},g' < ${FILESDIR}/desktop.in > ${WRKDIR}/desktop 46 ${SED} -e 's,@PREFIX@,${PREFIX},g' < ${FILESDIR}/desktop.in > ${WRKDIR}/desktop
46 ${SED} -e 's,@PREFIX@,${PREFIX},g' < ${FILESDIR}/mikutter.sh.in > ${WRKDIR}/mikutter.sh 47 ${SED} -e 's,@PREFIX@,${PREFIX},g' < ${FILESDIR}/mikutter.sh.in > ${WRKDIR}/mikutter.sh
47 48
48do-install: 49do-install:
49 ${INSTALL_SCRIPT} ${WRKSRC}/mikutter.rb ${DESTDIR}${PREFIX}/share/mikutter 50 ${INSTALL_SCRIPT} ${WRKSRC}/mikutter.rb ${DESTDIR}${PREFIX}/share/mikutter
50 ${INSTALL_DATA} ${WRKSRC}/Gemfile ${DESTDIR}${PREFIX}/share/mikutter 51 ${INSTALL_DATA} ${WRKSRC}/Gemfile ${DESTDIR}${PREFIX}/share/mikutter
51 cd ${WRKSRC} && pax -rwpp -s '/.*\.orig//' core devel plugin ${DESTDIR}${PREFIX}/share/mikutter 52 cd ${WRKSRC} && pax -rwpp -s '/.*\.orig//' core devel plugin ${DESTDIR}${PREFIX}/share/mikutter
52 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/mikutter 53 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/mikutter
53 ${INSTALL_SCRIPT} ${WRKDIR}/mikutter.sh ${DESTDIR}${PREFIX}/bin/mikutter 54 ${INSTALL_SCRIPT} ${WRKDIR}/mikutter.sh ${DESTDIR}${PREFIX}/bin/mikutter
54 ${INSTALL_DATA} ${WRKDIR}/desktop ${DESTDIR}${PREFIX}/share/applications/mikutter.desktop 55 ${INSTALL_DATA} ${WRKDIR}/desktop ${DESTDIR}${PREFIX}/share/applications/mikutter.desktop
55 56
56RUBY_JSON_TYPE= pure 57RUBY_JSON_TYPE= pure
57RUBY_JSON_REQD= 1.8 58RUBY_JSON_REQD= 1.8
58.include "../../lang/ruby/json.mk" 59.include "../../lang/ruby/json.mk"
59.include "../../mk/bsd.pkg.mk" 60.include "../../mk/bsd.pkg.mk"
cvs diff -r1.108 -r1.109 pkgsrc/net/mikutter/distinfo (switch to unified diff)

--- pkgsrc/net/mikutter/distinfo 2016/06/21 12:45:36 1.108
+++ pkgsrc/net/mikutter/distinfo 2016/06/21 14:03:39 1.109
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.108 2016/06/21 12:45:36 tsutsui Exp $ 1$NetBSD: distinfo,v 1.109 2016/06/21 14:03:39 tsutsui Exp $
2 2
3SHA1 (mikutter.3.4.1.tar.gz) = 1b48eaaba9ba7081ab9f6307c7b2105a0782f9b3 3SHA1 (ruby22-mikutter-3.4.1/mikutter.3.4.1.tar.gz) = 1b48eaaba9ba7081ab9f6307c7b2105a0782f9b3
4RMD160 (mikutter.3.4.1.tar.gz) = 8271919bb42d78adcade260e263c9e82d81b5340 4RMD160 (ruby22-mikutter-3.4.1/mikutter.3.4.1.tar.gz) = 8271919bb42d78adcade260e263c9e82d81b5340
5SHA512 (mikutter.3.4.1.tar.gz) = 7f1d62f567697f44de05c8985203e062c54047fa6571ea7e5682310e1b79797955b420eaca44c0e87479bbfc9c9789d651e01f9f81e6cb40169bfe733bfcc3c3 5SHA512 (ruby22-mikutter-3.4.1/mikutter.3.4.1.tar.gz) = 7f1d62f567697f44de05c8985203e062c54047fa6571ea7e5682310e1b79797955b420eaca44c0e87479bbfc9c9789d651e01f9f81e6cb40169bfe733bfcc3c3
6Size (mikutter.3.4.1.tar.gz) = 2808793 bytes 6Size (ruby22-mikutter-3.4.1/mikutter.3.4.1.tar.gz) = 2808793 bytes
7SHA1 (patch-core_plugin_libnotify_rnotify.rb) = 0bb5630f4411d11ad188c722fb1d14e2d6748d17 7SHA1 (patch-core_plugin_libnotify_rnotify.rb) = 0bb5630f4411d11ad188c722fb1d14e2d6748d17
8SHA1 (patch-core_plugin_photo__support_Gemfile) = 754b96024904e2e2f55c83e88fd3c763eecf723c 8SHA1 (patch-core_plugin_photo__support_Gemfile) = 754b96024904e2e2f55c83e88fd3c763eecf723c
9SHA1 (patch-core_plugin_photo__support_photo__support.rb) = d119209d4de835e6d47d85c8ca5209d1f199bd9e 9SHA1 (patch-core_plugin_photo__support_photo__support.rb) = d119209d4de835e6d47d85c8ca5209d1f199bd9e