Sun Sep 12 03:02:22 2010 UTC ()
Update www/merb package to 1.1.3.

* Use lang/ruby/gem.mk instead of misc/rubygems/rubygem.mk.
* Add LICENSE.
* Ajust new ruby package's framework.
* Update dependency according to gemspec.

Exact changes are unknown but many.


(taca)
diff -r1.1.1.1 -r1.2 pkgsrc/www/merb/Makefile
diff -r1.2 -r1.3 pkgsrc/www/merb/PLIST
diff -r1.2 -r1.3 pkgsrc/www/merb/distinfo
cvs diff -r1.1.1.1 -r1.2 pkgsrc/www/merb/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/merb/Attic/Makefile 2008/04/04 15:23:01 1.1.1.1
+++ pkgsrc/www/merb/Attic/Makefile 2010/09/12 03:02:22 1.2
@@ -1,14 +1,28 @@ @@ -1,14 +1,28 @@
1# $NetBSD: Makefile,v 1.1.1.1 2008/04/04 15:23:01 jlam Exp $ 1# $NetBSD: Makefile,v 1.2 2010/09/12 03:02:22 taca Exp $
2 2
3DISTNAME= merb-0.9.2 3DISTNAME= merb-1.1.3
4CATEGORIES= www 4CATEGORIES= www
5 5
6MAINTAINER= pkgsrc-users@NetBSD.org 6MAINTAINER= pkgsrc-users@NetBSD.org
7HOMEPAGE= http://www.merbivore.com/ 7HOMEPAGE= http://www.merbivore.com/
8COMMENT= Mongrel + Erb -- pocket rocket web framework 8COMMENT= Mongrel + Erb -- pocket rocket web framework
 9LICENSE= mit
9 10
10DEPENDS+= merb-core>=0.9.2:../../www/merb-core 11DEPENDS+= ${RUBY_PKGPREFIX}-merb-action-args>=1.1.3:../../www/merb-action-args
11DEPENDS+= merb-more>=0.9.2:../../www/merb-more 12DEPENDS+= ${RUBY_PKGPREFIX}-merb-assets>=1.1.3:../../www/merb-assets
 13DEPENDS+= ${RUBY_PKGPREFIX}-merb-auth>=1.1:../../www/merb-auth
 14DEPENDS+= ${RUBY_PKGPREFIX}-merb-cache>=1.1.3:../../www/merb-cache
 15DEPENDS+= ${RUBY_PKGPREFIX}-merb-exceptions>=1.1.3:../../www/merb-exceptions
 16DEPENDS+= ${RUBY_PKGPREFIX}-merb-gen>=1.1.3:../../www/merb-gen
 17DEPENDS+= ${RUBY_PKGPREFIX}-merb-haml>=1.1.3:../../www/merb-haml
 18DEPENDS+= ${RUBY_PKGPREFIX}-merb-helpers>=1.1.3:../../www/merb-helpers
 19DEPENDS+= ${RUBY_PKGPREFIX}-merb-mailer>=1.1.3:../../www/merb-mailer
 20DEPENDS+= ${RUBY_PKGPREFIX}-merb-param-protection>=1.1.3:../../www/merb-param-protection
 21DEPENDS+= ${RUBY_PKGPREFIX}-merb-slices>=1.1.3:../../www/merb-slices
 22DEPENDS+= ${RUBY_PKGPREFIX}-merb-datamapper>=1.1:../../www/merb-datamapper
 23DEPENDS+= ${RUBY_PKGPREFIX}-datamapper>=0.10.0:../../databases/ruby-datamapper
 24DEPENDS+= ${RUBY_PKGPREFIX}-do_sqlite3>=0.10.0:../../databases/ruby-do_sqlite3
 25DEPENDS+= ${RUBY_PKGPREFIX}-rspec>=0:../../devel/ruby-rspec
12 26
13.include "../../misc/rubygems/rubygem.mk" 27.include "../../lang/ruby/gem.mk"
14.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/www/merb/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/www/merb/Attic/PLIST 2009/06/14 22:00:26 1.2
+++ pkgsrc/www/merb/Attic/PLIST 2010/09/12 03:02:22 1.3
@@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
1@comment $NetBSD: PLIST,v 1.2 2009/06/14 22:00:26 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.3 2010/09/12 03:02:22 taca Exp $
2${GEM_HOME}/cache/merb-${PKGVERSION}.gem 2${GEM_HOME}/cache/${GEM_NAME}.gem
3${GEM_LIBDIR}/LICENSE 3${GEM_LIBDIR}/LICENSE
4${GEM_LIBDIR}/README 4${GEM_LIBDIR}/README
5${GEM_LIBDIR}/Rakefile 5${GEM_LIBDIR}/lib/merb.rb
6${GEM_LIBDIR}/TODO 6${GEM_HOME}/specifications/${GEM_NAME}.gemspec
7${GEM_HOME}/specifications/merb-${PKGVERSION}.gemspec 
cvs diff -r1.2 -r1.3 pkgsrc/www/merb/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/www/merb/Attic/distinfo 2009/05/16 07:30:41 1.2
+++ pkgsrc/www/merb/Attic/distinfo 2010/09/12 03:02:22 1.3
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.2 2009/05/16 07:30:41 rillig Exp $ 1$NetBSD: distinfo,v 1.3 2010/09/12 03:02:22 taca Exp $
2 2
3SHA1 (merb-0.9.2.gem) = 9c74851c51dbc19feeb5d1efdf734863139a7399 3SHA1 (merb-1.1.3.gem) = 300043ce825a2b180e7d2c99b93467ee3198b2bb
4RMD160 (merb-0.9.2.gem) = 4972ab2b666db39e431b75f14f0b728b254109d3 4RMD160 (merb-1.1.3.gem) = c6c37773fe53302f927bfac1c8096887cf3f2612
5Size (merb-0.9.2.gem) = 4608 bytes 5Size (merb-1.1.3.gem) = 4096 bytes