Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/net/mikutter/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/net/mikutter/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- pkgsrc/net/mikutter/Makefile	2013/05/03 12:49:15	1.65
+++ pkgsrc/net/mikutter/Makefile	2013/05/15 11:24:14	1.66
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.65 2013/05/03 12:49:15 obache Exp $
+# $NetBSD: Makefile,v 1.66 2013/05/15 11:24:14 obache Exp $
 #
 
-DISTNAME=	mikutter.0.2.1.1142
+DISTNAME=	mikutter.0.2.2.1230
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/./-/}
 CATEGORIES=	net
 MASTER_SITES=	http://mikutter.hachune.net/bin/
 
 MAINTAINER=	obache@NetBSD.org
 HOMEPAGE=	http://mikutter.hachune.net/
-COMMENT=	Simply, powerfully, and moefully twitter client
+COMMENT=	Simple, powerful, and moeful twitter client
 LICENSE=	gnu-gpl-v3 AND cc-by-sa-v3.0
 
 RUBY_VERSION_SUPPORTED=	193
@@ -17,17 +17,17 @@ RUBY_VERSION_SUPPORTED=	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}-gnome2-gtk>=1.2.5:../../x11/ruby-gnome2-gtk
+DEPENDS+=	${RUBY_PKGPREFIX}-rcairo>=1.10.0:../../graphics/ruby-rcairo
 DEPENDS+=	${RUBY_PKGPREFIX}-oauth>=0.4.7:../../security/ruby-oauth
 DEPENDS+=	${RUBY_PKGPREFIX}-memoize>=1.3.1:../../devel/ruby-memoize
 DEPENDS+=	${RUBY_PKGPREFIX}-bsearch>=1.5:../../devel/ruby-bsearch
-DEPENDS+=	${RUBY_PKGPREFIX}-httpclient-[0-9]*:../../www/ruby-httpclient
-DEPENDS+=	${RUBY_PKGPREFIX}-addressable>=2.2.6nb1:../../net/ruby-addressable
+DEPENDS+=	${RUBY_PKGPREFIX}-addressable-[0-9]*:../../net/ruby-addressable
 DEPENDS+=	${RUBY_PKGPREFIX}-typed-array-[0-9]*:../../misc/ruby-typed-array
+#DEPENDS+=	${RUBY_PKGPREFIX}-test-unmit-[0-9]*:../../devel/ruby-test-unit
 # notify-send
-DEPENDS+=	libnotify-[0-9]*:../../sysutils/libnotify
+DEPENDS+=	{libnotify-[0-9]*,libnotify07-[0-9]*}:../../sysutils/libnotify
 
-RUBY_JSON_REQD=	1.5.1
 WRKSRC=		${WRKDIR}/mikutter
 USE_LANGUAGES=	# none
 USE_TOOLS+=	pax
@@ -41,16 +41,13 @@ INSTALLATION_DIRS+=	bin share/doc/mikutt
 do-build:
 	cd ${WRKSRC}/devel && \
 		${RM} -rf debian
-	cd ${WRKSRC}/core/lib && \
-		${RM} -rf addressable json oauth ruby-bsearch-1.5 typed-array
-	cd ${WRKSRC}/vendor && \
-		${RM} -rf addressable bsearch* hmac*.rb json* memoize.rb oauth* ruby-bsearch-1.5 typed-array*
+	${RM} -rf ${WRKSRC}/vendor
 	${SED} -e 's,@PREFIX@,${PREFIX},g' < ${FILESDIR}/desktop.in > ${WRKDIR}/desktop
 	${SED} -e 's,@PREFIX@,${PREFIX},g' < ${FILESDIR}/mikutter.sh.in > ${WRKDIR}/mikutter.sh
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/mikutter.rb ${DESTDIR}${PREFIX}/share/mikutter
-	cd ${WRKSRC} && pax -rwpp -s '/.*\.orig//' core devel plugin vendor ${DESTDIR}${PREFIX}/share/mikutter
+	cd ${WRKSRC} && pax -rwpp -s '/.*\.orig//' core devel plugin ${DESTDIR}${PREFIX}/share/mikutter
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/mikutter
 	${INSTALL_SCRIPT} ${WRKDIR}/mikutter.sh ${DESTDIR}${PREFIX}/bin/mikutter
 	${INSTALL_DATA} ${WRKDIR}/desktop ${DESTDIR}${PREFIX}/share/applications/mikutter.desktop