Install as a gem using the pkgsrc rubygem.mk framework instead of

directly into site_ruby.

4 files changed, 144 insertions, 90 deletions

diff --git a/devel/rake/Makefile b/devel/rake/Makefile
index 1fe703d60ea..66a142ccbb8 100644
--- a/devel/rake/Makefile
+++ b/devel/rake/Makefile
@@ -1,53 +1,24 @@
-# $NetBSD: Makefile,v 1.8 2008/03/12 03:21:05 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2008/04/04 15:30:00 jlam Exp $
 
 DISTNAME=	rake-0.8.1
-CATEGORIES=	devel ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/29752/
-EXTRACT_SUFX=	.tgz
+PKGREVISION=	1
+CATEGORIES=	devel
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://rake.rubyforge.org/
 COMMENT=	Ruby Make
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-NO_BUILD=		yes
-USE_RUBY_INSTALL=	yes
-USE_TOOLS+=		gunzip
-DOCDIR=			${RUBY_DOCDIR}/rake
-EXAMPLESDIR=		${RUBY_EXAMPLESDIR}/rake
-DOCS=			CHANGES README TODO doc/glossary.rdoc \
-			doc/jamis.rb doc/proto_rake.rdoc \
-			doc/rakefile.rdoc doc/rational.rdoc
-EXAMPLES=		Rakefile1 Rakefile2 a.c b.c main.c
-
-SUBST_CLASSES+=		paths
-SUBST_MESSAGE.paths=	Fixing hardcoded paths.
-SUBST_STAGE.paths=	pre-configure
-SUBST_FILES.paths=	doc/rake.1
-SUBST_SED.paths=	-e 's,/usr/share/doc/,${RUBY_DOCDIR}/,g'
+USE_TOOLS+=	gzip
+GEM_BUILD=	gemspec
 
 INSTALLATION_DIRS=	${PKGMANDIR}/man1
 
-.include "../../lang/ruby/modules.mk"
-
 post-extract:
-	if [ ! -f ${WRKSRC}/doc/rake.1 ]; then \
-		${GUNZIP_CMD} ${WRKSRC}/doc/rake.1.gz; \
-	fi
+	cd ${WRKSRC}/doc && gzip -d < rake.1.gz > rake.1
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/rake.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}/release_notes
-.for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}
-.endfor
-	for f in ${WRKSRC}/doc/release_notes/*; do \
-		${INSTALL_DATA} $$f ${DESTDIR}${DOCDIR}/release_notes; \
-	done
-	${INSTALL_DATA_DIR} ${DESTDIR}${EXAMPLESDIR}
-.for f in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/doc/example/${f} ${DESTDIR}${EXAMPLESDIR}
-.endfor
+	${INSTALL_MAN} ${WRKSRC}/doc/rake.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
+.include "../../misc/rubygems/rubygem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/rake/PLIST b/devel/rake/PLIST
index 93fe4e9bbb7..13de6c6fba8 100644
--- a/devel/rake/PLIST
+++ b/devel/rake/PLIST
@@ -1,50 +1,120 @@
-@comment $NetBSD: PLIST,v 1.6 2007/04/27 19:40:01 minskim Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/04/04 15:30:00 jlam Exp $
 bin/rake
 man/man1/rake.1
-${RUBY_SITELIBDIR}/rake.rb
-${RUBY_SITELIBDIR}/rake/classic_namespace.rb
-${RUBY_SITELIBDIR}/rake/clean.rb
-${RUBY_SITELIBDIR}/rake/contrib/compositepublisher.rb
-${RUBY_SITELIBDIR}/rake/contrib/ftptools.rb
-${RUBY_SITELIBDIR}/rake/contrib/publisher.rb
-${RUBY_SITELIBDIR}/rake/contrib/rubyforgepublisher.rb
-${RUBY_SITELIBDIR}/rake/contrib/sshpublisher.rb
-${RUBY_SITELIBDIR}/rake/contrib/sys.rb
-${RUBY_SITELIBDIR}/rake/gempackagetask.rb
-${RUBY_SITELIBDIR}/rake/loaders/makefile.rb
-${RUBY_SITELIBDIR}/rake/packagetask.rb
-${RUBY_SITELIBDIR}/rake/rake_test_loader.rb
-${RUBY_SITELIBDIR}/rake/rdoctask.rb
-${RUBY_SITELIBDIR}/rake/ruby182_test_unit_fix.rb
-${RUBY_SITELIBDIR}/rake/runtest.rb
-${RUBY_SITELIBDIR}/rake/tasklib.rb
-${RUBY_SITELIBDIR}/rake/testtask.rb
-${RUBY_DOCDIR}/rake/CHANGES
-${RUBY_DOCDIR}/rake/README
-${RUBY_DOCDIR}/rake/TODO
-${RUBY_DOCDIR}/rake/glossary.rdoc
-${RUBY_DOCDIR}/rake/jamis.rb
-${RUBY_DOCDIR}/rake/proto_rake.rdoc
-${RUBY_DOCDIR}/rake/rakefile.rdoc
-${RUBY_DOCDIR}/rake/rational.rdoc
-${RUBY_DOCDIR}/rake/release_notes/rake-0.4.14.rdoc
-${RUBY_DOCDIR}/rake/release_notes/rake-0.4.15.rdoc
-${RUBY_DOCDIR}/rake/release_notes/rake-0.5.0.rdoc
-${RUBY_DOCDIR}/rake/release_notes/rake-0.5.3.rdoc
-${RUBY_DOCDIR}/rake/release_notes/rake-0.5.4.rdoc
-${RUBY_DOCDIR}/rake/release_notes/rake-0.6.0.rdoc
-${RUBY_DOCDIR}/rake/release_notes/rake-0.7.0.rdoc
-${RUBY_DOCDIR}/rake/release_notes/rake-0.7.1.rdoc
-${RUBY_DOCDIR}/rake/release_notes/rake-0.7.2.rdoc
-${RUBY_DOCDIR}/rake/release_notes/rake-0.7.3.rdoc
-${RUBY_EXAMPLESDIR}/rake/Rakefile1
-${RUBY_EXAMPLESDIR}/rake/Rakefile2
-${RUBY_EXAMPLESDIR}/rake/a.c
-${RUBY_EXAMPLESDIR}/rake/b.c
-${RUBY_EXAMPLESDIR}/rake/main.c
-@dirrm ${RUBY_SITELIBDIR}/rake/loaders
-@dirrm ${RUBY_SITELIBDIR}/rake/contrib
-@dirrm ${RUBY_SITELIBDIR}/rake
-@dirrm ${RUBY_DOCDIR}/rake/release_notes
-@dirrm ${RUBY_DOCDIR}/rake
-@dirrm ${RUBY_EXAMPLESDIR}/rake
+${GEM_HOME}/cache/rake-${PKGVERSION}.gem
+${GEM_LIBDIR}/CHANGES
+${GEM_LIBDIR}/MIT-LICENSE
+${GEM_LIBDIR}/README
+${GEM_LIBDIR}/Rakefile
+${GEM_LIBDIR}/TODO
+${GEM_LIBDIR}/bin/rake
+${GEM_LIBDIR}/doc/example/Rakefile1
+${GEM_LIBDIR}/doc/example/Rakefile2
+${GEM_LIBDIR}/doc/example/a.c
+${GEM_LIBDIR}/doc/example/b.c
+${GEM_LIBDIR}/doc/example/main.c
+${GEM_LIBDIR}/doc/glossary.rdoc
+${GEM_LIBDIR}/doc/jamis.rb
+${GEM_LIBDIR}/doc/proto_rake.rdoc
+${GEM_LIBDIR}/doc/rake.1.gz
+${GEM_LIBDIR}/doc/rakefile.rdoc
+${GEM_LIBDIR}/doc/rational.rdoc
+${GEM_LIBDIR}/doc/release_notes/rake-0.4.14.rdoc
+${GEM_LIBDIR}/doc/release_notes/rake-0.4.15.rdoc
+${GEM_LIBDIR}/doc/release_notes/rake-0.5.0.rdoc
+${GEM_LIBDIR}/doc/release_notes/rake-0.5.3.rdoc
+${GEM_LIBDIR}/doc/release_notes/rake-0.5.4.rdoc
+${GEM_LIBDIR}/doc/release_notes/rake-0.6.0.rdoc
+${GEM_LIBDIR}/doc/release_notes/rake-0.7.0.rdoc
+${GEM_LIBDIR}/doc/release_notes/rake-0.7.1.rdoc
+${GEM_LIBDIR}/doc/release_notes/rake-0.7.2.rdoc
+${GEM_LIBDIR}/doc/release_notes/rake-0.7.3.rdoc
+${GEM_LIBDIR}/install.rb
+${GEM_LIBDIR}/lib/rake.rb
+${GEM_LIBDIR}/lib/rake/classic_namespace.rb
+${GEM_LIBDIR}/lib/rake/clean.rb
+${GEM_LIBDIR}/lib/rake/contrib/compositepublisher.rb
+${GEM_LIBDIR}/lib/rake/contrib/ftptools.rb
+${GEM_LIBDIR}/lib/rake/contrib/publisher.rb
+${GEM_LIBDIR}/lib/rake/contrib/rubyforgepublisher.rb
+${GEM_LIBDIR}/lib/rake/contrib/sshpublisher.rb
+${GEM_LIBDIR}/lib/rake/contrib/sys.rb
+${GEM_LIBDIR}/lib/rake/gempackagetask.rb
+${GEM_LIBDIR}/lib/rake/loaders/makefile.rb
+${GEM_LIBDIR}/lib/rake/packagetask.rb
+${GEM_LIBDIR}/lib/rake/rake_test_loader.rb
+${GEM_LIBDIR}/lib/rake/rdoctask.rb
+${GEM_LIBDIR}/lib/rake/ruby182_test_unit_fix.rb
+${GEM_LIBDIR}/lib/rake/runtest.rb
+${GEM_LIBDIR}/lib/rake/tasklib.rb
+${GEM_LIBDIR}/lib/rake/testtask.rb
+${GEM_LIBDIR}/test/capture_stdout.rb
+${GEM_LIBDIR}/test/contrib/testsys.rb
+${GEM_LIBDIR}/test/data/chains/Rakefile
+${GEM_LIBDIR}/test/data/default/Rakefile
+${GEM_LIBDIR}/test/data/dryrun/Rakefile
+${GEM_LIBDIR}/test/data/file_creation_task/Rakefile
+${GEM_LIBDIR}/test/data/imports/Rakefile
+${GEM_LIBDIR}/test/data/imports/deps.mf
+${GEM_LIBDIR}/test/data/multidesc/Rakefile
+${GEM_LIBDIR}/test/data/namespace/Rakefile
+${GEM_LIBDIR}/test/data/rakelib/test1.rb
+${GEM_LIBDIR}/test/data/rbext/rakefile.rb
+${GEM_LIBDIR}/test/data/sample.mf
+${GEM_LIBDIR}/test/data/statusreturn/Rakefile
+${GEM_LIBDIR}/test/data/unittest/Rakefile
+${GEM_LIBDIR}/test/filecreation.rb
+${GEM_LIBDIR}/test/functional.rb
+${GEM_LIBDIR}/test/rake_test_setup.rb
+${GEM_LIBDIR}/test/reqfile.rb
+${GEM_LIBDIR}/test/reqfile2.rb
+${GEM_LIBDIR}/test/session_functional.rb
+${GEM_LIBDIR}/test/shellcommand.rb
+${GEM_LIBDIR}/test/test_application.rb
+${GEM_LIBDIR}/test/test_clean.rb
+${GEM_LIBDIR}/test/test_definitions.rb
+${GEM_LIBDIR}/test/test_earlytime.rb
+${GEM_LIBDIR}/test/test_extension.rb
+${GEM_LIBDIR}/test/test_file_creation_task.rb
+${GEM_LIBDIR}/test/test_file_task.rb
+${GEM_LIBDIR}/test/test_filelist.rb
+${GEM_LIBDIR}/test/test_fileutils.rb
+${GEM_LIBDIR}/test/test_ftp.rb
+${GEM_LIBDIR}/test/test_invocation_chain.rb
+${GEM_LIBDIR}/test/test_makefile_loader.rb
+${GEM_LIBDIR}/test/test_multitask.rb
+${GEM_LIBDIR}/test/test_namespace.rb
+${GEM_LIBDIR}/test/test_package_task.rb
+${GEM_LIBDIR}/test/test_pathmap.rb
+${GEM_LIBDIR}/test/test_rake.rb
+${GEM_LIBDIR}/test/test_require.rb
+${GEM_LIBDIR}/test/test_rules.rb
+${GEM_LIBDIR}/test/test_task_arguments.rb
+${GEM_LIBDIR}/test/test_task_manager.rb
+${GEM_LIBDIR}/test/test_tasks.rb
+${GEM_LIBDIR}/test/test_test_task.rb
+${GEM_LIBDIR}/test/test_top_level_functions.rb
+${GEM_HOME}/specifications/rake-${PKGVERSION}.gemspec
+@dirrm ${GEM_LIBDIR}/test/data/unittest
+@dirrm ${GEM_LIBDIR}/test/data/statusreturn
+@dirrm ${GEM_LIBDIR}/test/data/rbext
+@dirrm ${GEM_LIBDIR}/test/data/rakelib
+@dirrm ${GEM_LIBDIR}/test/data/namespace
+@dirrm ${GEM_LIBDIR}/test/data/multidesc
+@dirrm ${GEM_LIBDIR}/test/data/imports
+@dirrm ${GEM_LIBDIR}/test/data/file_creation_task
+@dirrm ${GEM_LIBDIR}/test/data/dryrun
+@dirrm ${GEM_LIBDIR}/test/data/default
+@dirrm ${GEM_LIBDIR}/test/data/chains
+@dirrm ${GEM_LIBDIR}/test/data
+@dirrm ${GEM_LIBDIR}/test/contrib
+@dirrm ${GEM_LIBDIR}/test
+@dirrm ${GEM_LIBDIR}/lib/rake/loaders
+@dirrm ${GEM_LIBDIR}/lib/rake/contrib
+@dirrm ${GEM_LIBDIR}/lib/rake
+@dirrm ${GEM_LIBDIR}/lib
+@dirrm ${GEM_LIBDIR}/doc/release_notes
+@dirrm ${GEM_LIBDIR}/doc/example
+@dirrm ${GEM_LIBDIR}/doc
+@dirrm ${GEM_LIBDIR}/bin
+@dirrm ${GEM_LIBDIR}
diff --git a/devel/rake/distinfo b/devel/rake/distinfo
index fcdef2d5082..19e889df00c 100644
--- a/devel/rake/distinfo
+++ b/devel/rake/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2008/01/17 22:05:48 minskim Exp $
+$NetBSD: distinfo,v 1.8 2008/04/04 15:30:00 jlam Exp $
 
-SHA1 (rake-0.8.1.tgz) = 370a1f418c8d79d9fd715785b811c096b5f3d318
-RMD160 (rake-0.8.1.tgz) = dc9acefa9e1d75d4432b1193531a55a371328511
-Size (rake-0.8.1.tgz) = 91006 bytes
+SHA1 (rake-0.8.1.gem) = 349b0853d5a32012a8f282750c2f1abaf1169213
+RMD160 (rake-0.8.1.gem) = fbb00b09f577b71081fe01c7e318e54acaabf37c
+Size (rake-0.8.1.gem) = 90112 bytes
+SHA1 (patch-aa) = 289062ead67e2dde7a5a28a8b3d7c9d0df00ac01
diff --git a/devel/rake/patches/patch-aa b/devel/rake/patches/patch-aa
new file mode 100644
index 00000000000..78ddd2b0fc9
--- /dev/null
+++ b/devel/rake/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.1 2008/04/04 15:30:00 jlam Exp $
+
+--- ../rake-0.8.1.gemspec.orig	2008-03-13 13:26:21.000000000 -0400
++++ ../rake-0.8.1.gemspec
+@@ -41,7 +41,6 @@ extra_rdoc_files: 
+ files: 
+ - install.rb
+ - CHANGES
+-- CVSROOT
+ - MIT-LICENSE
+ - Rakefile
+ - README