3 files changed, 12 insertions, 95 deletions

diff --git a/textproc/rubygem-syntax/Makefile b/textproc/rubygem-syntax/Makefile
index 6a0376b5055b..09fdee0a4298 100644
--- a/textproc/rubygem-syntax/Makefile
+++ b/textproc/rubygem-syntax/Makefile
@@ -6,58 +6,15 @@
 
 PORTNAME=	syntax
 PORTVERSION=	1.0.0
+PKGVERSION=	1
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-PKGNAMEPREFIX=	rubygem-
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	A module for using Systax highlighting in Ruby
 
 USE_RUBY=	yes
+USE_RUBYGEMS=	yes
 
-.include <bsd.port.pre.mk>
-#.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-# syntax.gem has invalid content, we need to buuild the gem ourself
-
-.if ${RUBY_VER} == 1.8
-BUILD_DEPENDS+=	${RUBYGEMBIN}:${PORTSDIR}/devel/ruby-gems
-RUN_DEPENDS+=	${BUILD_DEPENDS}
-.endif
-
-REV=		${RUBY_VER}
-GEMS_BASE_DIR=	lib/ruby/gems/${REV}
-GEMS_DIR=	${GEMS_BASE_DIR}/gems
-DOC_DIR=	${GEMS_BASE_DIR}/doc
-CACHE_DIR=	${GEMS_BASE_DIR}/cache
-SPEC_DIR=	${GEMS_BASE_DIR}/specifications
-GEM_NAME?=	${PORTNAME}-${PORTVERSION}
-GEM_LIB_DIR=	${GEMS_DIR}/${GEM_NAME}
-GEM_DOC_DIR=	${DOC_DIR}/${GEM_NAME}
-GEM_SPEC=	${SPEC_DIR}/${GEM_NAME}.gemspec
-GEM_CACHE=	${CACHE_DIR}/${GEM_NAME}.gem
-
-PLIST_SUB+=	PORTVERSION="${PORTVERSION}" \
-		REV="${REV}" \
-		GEMS_BASE_DIR="lib/ruby/gems/${REV}" \
-		GEMS_DIR="${GEMS_BASE_DIR}/gems" \
-		DOC_DIR="${GEMS_BASE_DIR}/doc" \
-		CACHE_DIR="${GEMS_BASE_DIR}/cache" \
-		SPEC_DIR="${GEMS_BASE_DIR}/specifications" \
-		PORT="${PORTNAME}-${PORTVERSION}" \
-		GEM_NAME="${GEM_NAME}" \
-		GEM_LIB_DIR="${GEM_LIB_DIR}" \
-		GEM_DOC_DIR="${GEM_DOC_DIR}" \
-		GEM_SPEC="${GEM_SPEC}" \
-		GEM_CACHE="${GEM_CACHE}" \
-		EXTRACT_SUFX="${EXTRACT_SUFX}"
-
-RUBYGEMBIN=	${LOCALBASE}/bin/gem${RUBY_VER:S/.//}
-
-do-build:
-	cd ${WRKSRC} && ${RUBYGEMBIN} build syntax.gemspec
-
-do-install:
-	${RUBYGEMBIN} install --install-dir ${PREFIX}/lib/ruby/gems/${REV} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.gem
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/rubygem-syntax/distinfo b/textproc/rubygem-syntax/distinfo
index ca59c3365be1..5e18663a4017 100644
--- a/textproc/rubygem-syntax/distinfo
+++ b/textproc/rubygem-syntax/distinfo
@@ -1,3 +1,3 @@
-MD5 (syntax-1.0.0.tar.gz) = bfba585cd8d1511dad3daff910a9cc8e
-SHA256 (syntax-1.0.0.tar.gz) = 93dd44920adac57e454419497e8188479b053fe089828ecd1d02185b99fa49f6
-SIZE (syntax-1.0.0.tar.gz) = 54191
+MD5 (rubygem/syntax-1.0.0.gem) = d9d2eabc03bc937adfa00e35f228f9a8
+SHA256 (rubygem/syntax-1.0.0.gem) = 605e2f62770bad04e849b3a1a2234e45b2904a8592f2f4dcc0bb14dce09c23fd
+SIZE (rubygem/syntax-1.0.0.gem) = 15360
diff --git a/textproc/rubygem-syntax/pkg-plist b/textproc/rubygem-syntax/pkg-plist
index 7a0f14dee89f..291f0ded4159 100644
--- a/textproc/rubygem-syntax/pkg-plist
+++ b/textproc/rubygem-syntax/pkg-plist
@@ -9,13 +9,14 @@
 %%GEM_DOC_DIR%%/rdoc/classes/Syntax/Convertors/HTML.html
 %%GEM_DOC_DIR%%/rdoc/classes/Syntax/Convertors/HTML.src/M000003.html
 %%GEM_DOC_DIR%%/rdoc/classes/Syntax/Default.html
-%%GEM_DOC_DIR%%/rdoc/classes/Syntax/Default.src/M000010.html
+%%GEM_DOC_DIR%%/rdoc/classes/Syntax/Default.src/M000018.html
 %%GEM_DOC_DIR%%/rdoc/classes/Syntax/Ruby.html
 %%GEM_DOC_DIR%%/rdoc/classes/Syntax/Ruby.src/M000008.html
 %%GEM_DOC_DIR%%/rdoc/classes/Syntax/Ruby.src/M000009.html
 %%GEM_DOC_DIR%%/rdoc/classes/Syntax/Token.html
 %%GEM_DOC_DIR%%/rdoc/classes/Syntax/Token.src/M000020.html
 %%GEM_DOC_DIR%%/rdoc/classes/Syntax/Tokenizer.html
+%%GEM_DOC_DIR%%/rdoc/classes/Syntax/Tokenizer.src/M000010.html
 %%GEM_DOC_DIR%%/rdoc/classes/Syntax/Tokenizer.src/M000011.html
 %%GEM_DOC_DIR%%/rdoc/classes/Syntax/Tokenizer.src/M000012.html
 %%GEM_DOC_DIR%%/rdoc/classes/Syntax/Tokenizer.src/M000013.html
@@ -23,7 +24,6 @@
 %%GEM_DOC_DIR%%/rdoc/classes/Syntax/Tokenizer.src/M000015.html
 %%GEM_DOC_DIR%%/rdoc/classes/Syntax/Tokenizer.src/M000016.html
 %%GEM_DOC_DIR%%/rdoc/classes/Syntax/Tokenizer.src/M000017.html
-%%GEM_DOC_DIR%%/rdoc/classes/Syntax/Tokenizer.src/M000018.html
 %%GEM_DOC_DIR%%/rdoc/classes/Syntax/Version.html
 %%GEM_DOC_DIR%%/rdoc/classes/Syntax/XML.html
 %%GEM_DOC_DIR%%/rdoc/classes/Syntax/XML.src/M000006.html
@@ -44,38 +44,9 @@
 %%GEM_DOC_DIR%%/rdoc/fr_method_index.html
 %%GEM_DOC_DIR%%/rdoc/index.html
 %%GEM_DOC_DIR%%/rdoc/rdoc-style.css
-%%GEM_DOC_DIR%%/ri/Syntax/Convertors/Abstract/cdesc-Abstract.yaml
-%%GEM_DOC_DIR%%/ri/Syntax/Convertors/Abstract/for_syntax-c.yaml
-%%GEM_DOC_DIR%%/ri/Syntax/Convertors/Abstract/new-c.yaml
-%%GEM_DOC_DIR%%/ri/Syntax/Convertors/HTML/cdesc-HTML.yaml
-%%GEM_DOC_DIR%%/ri/Syntax/Convertors/HTML/convert-i.yaml
-%%GEM_DOC_DIR%%/ri/Syntax/Convertors/cdesc-Convertors.yaml
-%%GEM_DOC_DIR%%/ri/Syntax/Default/cdesc-Default.yaml
-%%GEM_DOC_DIR%%/ri/Syntax/Default/tokenize-i.yaml
-%%GEM_DOC_DIR%%/ri/Syntax/Ruby/cdesc-Ruby.yaml
-%%GEM_DOC_DIR%%/ri/Syntax/Ruby/setup-i.yaml
-%%GEM_DOC_DIR%%/ri/Syntax/Ruby/step-i.yaml
-%%GEM_DOC_DIR%%/ri/Syntax/Token/cdesc-Token.yaml
-%%GEM_DOC_DIR%%/ri/Syntax/Token/new-c.yaml
-%%GEM_DOC_DIR%%/ri/Syntax/Tokenizer/cdesc-Tokenizer.yaml
-%%GEM_DOC_DIR%%/ri/Syntax/Tokenizer/finish-i.yaml
-%%GEM_DOC_DIR%%/ri/Syntax/Tokenizer/option-i.yaml
-%%GEM_DOC_DIR%%/ri/Syntax/Tokenizer/set-i.yaml
-%%GEM_DOC_DIR%%/ri/Syntax/Tokenizer/setup-i.yaml
-%%GEM_DOC_DIR%%/ri/Syntax/Tokenizer/start-i.yaml
-%%GEM_DOC_DIR%%/ri/Syntax/Tokenizer/step-i.yaml
-%%GEM_DOC_DIR%%/ri/Syntax/Tokenizer/teardown-i.yaml
-%%GEM_DOC_DIR%%/ri/Syntax/Tokenizer/tokenize-i.yaml
-%%GEM_DOC_DIR%%/ri/Syntax/Version/cdesc-Version.yaml
-%%GEM_DOC_DIR%%/ri/Syntax/XML/cdesc-XML.yaml
-%%GEM_DOC_DIR%%/ri/Syntax/XML/setup-i.yaml
-%%GEM_DOC_DIR%%/ri/Syntax/XML/step-i.yaml
-%%GEM_DOC_DIR%%/ri/Syntax/YAML/cdesc-YAML.yaml
-%%GEM_DOC_DIR%%/ri/Syntax/YAML/step-i.yaml
-%%GEM_DOC_DIR%%/ri/Syntax/all-i.yaml
-%%GEM_DOC_DIR%%/ri/Syntax/cdesc-Syntax.yaml
-%%GEM_DOC_DIR%%/ri/Syntax/load-i.yaml
-%%GEM_DOC_DIR%%/ri/created.rid
+%%GEM_LIB_DIR%%/data/ruby.css
+%%GEM_LIB_DIR%%/data/xml.css
+%%GEM_LIB_DIR%%/data/yaml.css
 %%GEM_LIB_DIR%%/lib/syntax.rb
 %%GEM_LIB_DIR%%/lib/syntax/common.rb
 %%GEM_LIB_DIR%%/lib/syntax/convertors/abstract.rb
@@ -97,19 +68,8 @@
 @dirrm %%GEM_LIB_DIR%%/lib/syntax/convertors
 @dirrm %%GEM_LIB_DIR%%/lib/syntax
 @dirrm %%GEM_LIB_DIR%%/lib
+@dirrm %%GEM_LIB_DIR%%/data
 @dirrm %%GEM_LIB_DIR%%
-@dirrm %%GEM_DOC_DIR%%/ri/Syntax/YAML
-@dirrm %%GEM_DOC_DIR%%/ri/Syntax/XML
-@dirrm %%GEM_DOC_DIR%%/ri/Syntax/Version
-@dirrm %%GEM_DOC_DIR%%/ri/Syntax/Tokenizer
-@dirrm %%GEM_DOC_DIR%%/ri/Syntax/Token
-@dirrm %%GEM_DOC_DIR%%/ri/Syntax/Ruby
-@dirrm %%GEM_DOC_DIR%%/ri/Syntax/Default
-@dirrm %%GEM_DOC_DIR%%/ri/Syntax/Convertors/HTML
-@dirrm %%GEM_DOC_DIR%%/ri/Syntax/Convertors/Abstract
-@dirrm %%GEM_DOC_DIR%%/ri/Syntax/Convertors
-@dirrm %%GEM_DOC_DIR%%/ri/Syntax
-@dirrm %%GEM_DOC_DIR%%/ri
 @dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/syntax/lang
 @dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/syntax/convertors
 @dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/syntax