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

directly into site_ruby.

5 files changed, 45 insertions, 9 deletions

diff --git a/textproc/xhtmldiff/DESCR b/textproc/xhtmldiff/DESCR
index 3fbee6cfedc..b1e2532afff 100644
--- a/textproc/xhtmldiff/DESCR
+++ b/textproc/xhtmldiff/DESCR
@@ -1,2 +1,4 @@
-xhtmldiff is a tool for generating valid XHTML redline documents from
-valid XHTML documents.
+XHTMLDiff is a tool and library for taking valid XHTML documents as
+input, and generating redlined, valid XHTML text highlighting the
+changes between them as output.
+
diff --git a/textproc/xhtmldiff/Makefile b/textproc/xhtmldiff/Makefile
index 3e660310f65..98675f1f40d 100644
--- a/textproc/xhtmldiff/Makefile
+++ b/textproc/xhtmldiff/Makefile
@@ -1,15 +1,21 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/05/26 00:56:50 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2008/04/04 15:30:01 jlam Exp $
 
 DISTNAME=	xhtmldiff-1.2.2
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://theinternetco.net/projects/ruby/
+EXTRACT_SUFX=	.tar.gz
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://theinternetco.net/projects/ruby/xhtmldiff.html
 COMMENT=	Tool for generating valid XHTML redline documents
 
-USE_LANGUAGES=	# none
-USE_RUBY_SETUP= yes
+DEPENDS+=	${RUBY_PKGPREFIX}-diff-lcs>=1.1.1:../../textproc/ruby-diff-lcs
 
-.include "../../lang/ruby/modules.mk"
+GEM_BUILD=	gemspec
+
+post-extract:
+	cp ${WRKSRC}/packaging/xhtmldiff.gemspec ${GEM_SPECFILE}
+
+.include "../../misc/rubygems/rubygem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xhtmldiff/PLIST b/textproc/xhtmldiff/PLIST
index b6146bd25b6..455093f8e99 100644
--- a/textproc/xhtmldiff/PLIST
+++ b/textproc/xhtmldiff/PLIST
@@ -1,3 +1,18 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/05/26 00:56:50 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/04/04 15:30:01 jlam Exp $
 bin/xhtmldiff
-${RUBY_SITELIBDIR}/xhtmldiff.rb
+${GEM_HOME}/cache/xhtmldiff-${PKGVERSION}.gem
+${GEM_LIBDIR}/CHANGES
+${GEM_LIBDIR}/README
+${GEM_LIBDIR}/bin/xhtmldiff
+${GEM_LIBDIR}/examples/a.html
+${GEM_LIBDIR}/examples/b.html
+${GEM_LIBDIR}/examples/example.css
+${GEM_LIBDIR}/lib/xhtmldiff.rb
+${GEM_LIBDIR}/packaging/xhtmldiff.gemspec
+${GEM_LIBDIR}/setup.rb
+${GEM_HOME}/specifications/xhtmldiff-${PKGVERSION}.gemspec
+@dirrm ${GEM_LIBDIR}/packaging
+@dirrm ${GEM_LIBDIR}/lib
+@dirrm ${GEM_LIBDIR}/examples
+@dirrm ${GEM_LIBDIR}/bin
+@dirrm ${GEM_LIBDIR}
diff --git a/textproc/xhtmldiff/distinfo b/textproc/xhtmldiff/distinfo
index ae6cec30ed6..c03749b7710 100644
--- a/textproc/xhtmldiff/distinfo
+++ b/textproc/xhtmldiff/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/05/26 00:56:50 minskim Exp $
+$NetBSD: distinfo,v 1.2 2008/04/04 15:30:01 jlam Exp $
 
 SHA1 (xhtmldiff-1.2.2.tar.gz) = 72692677f214c5e275077b7ce7b32a8fe59436f5
 RMD160 (xhtmldiff-1.2.2.tar.gz) = 81bca58acfd60f985a66564e4fbbc63d6a7af39d
 Size (xhtmldiff-1.2.2.tar.gz) = 10457 bytes
+SHA1 (patch-aa) = f3bc25f87613e021d121d857080e48678c69d63d
diff --git a/textproc/xhtmldiff/patches/patch-aa b/textproc/xhtmldiff/patches/patch-aa
new file mode 100644
index 00000000000..f30f4073da3
--- /dev/null
+++ b/textproc/xhtmldiff/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.1 2008/04/04 15:30:01 jlam Exp $
+
+--- ../xhtmldiff-1.2.2.gemspec.orig	2008-03-20 02:49:25.000000000 -0400
++++ ../xhtmldiff-1.2.2.gemspec
+@@ -1,6 +1,6 @@
+ Gem::Specification.new do |s|
+   s.name = %q{xhtmldiff}
+-  s.version = "1.0.0"
++  s.version = "1.2.2"
+   s.date = Time.now
+   s.summary = %q{XHTMLDiff is a tool and library for taking valid XHTML documents as input, and generating redlined valid XHTML text highlighting the changes between them as output.}
+   s.author = %q{Aredridel}