update ruby-racc pakage to 1.4.1.

Move common definition to Makefile.common and include it.

It seems that official changes aren't available.

4 files changed, 55 insertions, 60 deletions

diff --git a/devel/ruby-racc/Makefile b/devel/ruby-racc/Makefile
index ca9b580cfa2..113a076c332 100644
--- a/devel/ruby-racc/Makefile
+++ b/devel/ruby-racc/Makefile
@@ -1,72 +1,49 @@
-# $NetBSD: Makefile,v 1.2 2001/08/13 09:20:40 agc Exp $
+# $NetBSD: Makefile,v 1.3 2001/12/30 17:13:47 taca Exp $
 # FreeBSD: ports/devel/ruby-racc/Makefile,v 1.20 2001/01/27 09:54:30 knu Exp
 
-DISTNAME=	racc-${RACC_VERSION}
-PKGNAME?=	${RUBY_PKGNAMEPREFIX}${DISTNAME}
+DISTNAME=	${RACC_DISTFILE}
+PKGNAME?=	${RACC_NAME}-${RACC_VERSION}
 CATEGORIES=	devel
-MASTER_SITES=	http://www.xdsl.ne.jp/Cd/aamine/soft/
+MASTER_SITES=	${RACC_SITES}
 
 MAINTAINER=	taca@netbsd.org
-HOMEPAGE=	http://www.xdsl.ne.jp/Cd/aamine/
+HOMEPAGE=	${RACC_HOMEPAGE}
 COMMENT=	LALR(1) parser generator for Ruby
 
-RACC_VERSION=	1.3.9
-
-DIST_SUBDIR=	ruby
-USE_RUBY=	yes
-USE_RUBY_AMSTD=	yes
-USE_RUBY_SETUP=	yes
-
-.if !defined(RUNTIME)
-DEPENDS+= ${RUBY_PKGNAMEPREFIX}racc-runtime-${RACC_VERSION}:../../devel/ruby-racc-runtime
+DEPENDS+= ${RACC_NAME}-runtime>=${RACC_VERSION}:../../devel/ruby-racc-runtime
 DEPENDS+= ${RUBY_PKGNAMEPREFIX}strscan>=0.6.1:../../devel/ruby-strscan
 
-REPLACE_RUBY=	misc/racc2y misc/y2racc
+CONFIGURE_ARGS+=--with=racc
 
-DOCS_EN=	changes.html command.html debug.html grammer.html index.html \
+DOCS=		BUGS.en BUGS.ja README.en README.ja
+DOCS_EN=	changes.html command.html debug.html grammar.html index.html \
 		parser.html usage.html
-DOCS_JA=	changes.html command.html debug.html grammer.html index.html \
+DOCS_JA=	changes.html command.html debug.html grammar.html index.html \
 		parser.html usage.html
 EXAMPLES=	array.y array2.y calc-ja.y calc.y conflict.y hash.y lalr.y \
 		syntax.y yyerr.y
-.endif
 
-pre-patch:
-	${RUBY} -i -ne '/^amstd\b/ || /^strscan\b/ || print' ${WRKSRC}/lib/PATHCONV
-	${RM} -rf ${WRKSRC}/lib/amstd ${WRKSRC}/lib/strscan
-.if defined(RUNTIME)
-	${RUBY} -i -ne '/^racc\b/ || print' ${WRKSRC}/bin/PATHCONV
-	${RM} -rf ${WRKSRC}/bin/racc
-	${RUBY} -i -ne '/^strscanso\b/ || print' ${WRKSRC}/ext/PATHCONV
-	${RM} -rf ${WRKSRC}/ext/strscanso
-	${RUBY} -i -ne '/^racc\b/ || print' ${WRKSRC}/lib/PATHCONV
-	${RM} -rf ${WRKSRC}/lib/racc
-.else
-	${RM} -rf ${WRKSRC}/ext
-	${RUBY} -i -ne '/^raccrt\b/ || print' ${WRKSRC}/lib/PATHCONV
-	${RM} -rf ${WRKSRC}/lib/raccrt
-.endif
+pre-configure:
+	${CP} -p ${WRKSRC}/packages/racc/misc/* ${WRKSRC}/packages/racc/bin
 
-.if defined(RUNTIME)
-pre-install:
-	${INSTALL_DATA_DIR} ${RUBY_SITELIBDIR}/racc
-	${INSTALL_DATA_DIR} ${RUBY_SITEARCHLIBDIR}/racc
-.else
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/racc/racc \
-		${WRKSRC}/misc/racc2y ${WRKSRC}/misc/y2racc ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/racc
 .for f in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/sample/${f} ${RUBY_EXAMPLESDIR}/racc
+	${INSTALL_DATA} ${WRKSRC}/packages/racc/sample/${f} \
+		${RUBY_EXAMPLESDIR}/racc
 .endfor
+	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/racc/en
 	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/racc/ja
+.for f in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/packages/racc/${f} ${RUBY_DOCDIR}/racc
+.endfor
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/doc.en/${f} ${RUBY_DOCDIR}/racc
+	${INSTALL_DATA} ${WRKSRC}/packages/racc/doc.en/${f} \
+		${RUBY_DOCDIR}/racc/en
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/doc.ja/${f} ${RUBY_DOCDIR}/racc/ja
+	${INSTALL_DATA} ${WRKSRC}/packages/racc/doc.ja/${f} \
+		${RUBY_DOCDIR}/racc/ja
 .endfor
-.endif
 
-.include "../../lang/ruby-base/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
+.include "Makefile.common"
diff --git a/devel/ruby-racc/Makefile.common b/devel/ruby-racc/Makefile.common
new file mode 100644
index 00000000000..4746dff1233
--- /dev/null
+++ b/devel/ruby-racc/Makefile.common
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile.common,v 1.1 2001/12/30 17:13:47 taca Exp $
+RACC_DISTFILE=	racc-${RACC_VERSION}-all
+RACC_NAME=	${RUBY_PKGNAMEPREFIX}racc
+RACC_VERSION=	1.4.1
+RACC_HOMEPAGE=	http://www.loveruby.net/en/racc.html
+RACC_SITES=	http://www.loveruby.net/archive/
+
+DIST_SUBDIR=	ruby
+USE_RUBY=	yes
+USE_RUBY_SETUP=	yes
+
+.include "../../lang/ruby-base/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/ruby-racc/PLIST b/devel/ruby-racc/PLIST
index 00e5165c3c0..17623bd1184 100644
--- a/devel/ruby-racc/PLIST
+++ b/devel/ruby-racc/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:26:25 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/12/30 17:13:47 taca Exp $
 bin/racc
 bin/racc2y
 bin/y2racc
 ${RUBY_SITELIBDIR}/racc/compiler.rb
-${RUBY_SITELIBDIR}/racc/grammer.rb
+${RUBY_SITELIBDIR}/racc/grammar.rb
 ${RUBY_SITELIBDIR}/racc/info.rb
 ${RUBY_SITELIBDIR}/racc/iset.rb
 ${RUBY_SITELIBDIR}/racc/output.rb
@@ -20,20 +20,25 @@ ${RUBY_EXAMPLESDIR}/racc/hash.y
 ${RUBY_EXAMPLESDIR}/racc/lalr.y
 ${RUBY_EXAMPLESDIR}/racc/syntax.y
 ${RUBY_EXAMPLESDIR}/racc/yyerr.y
+@dirrm ${RUBY_EXAMPLESDIR}/racc
+${RUBY_DOCDIR}/racc/BUGS.en
+${RUBY_DOCDIR}/racc/BUGS.ja
+${RUBY_DOCDIR}/racc/README.en
+${RUBY_DOCDIR}/racc/README.ja
+${RUBY_DOCDIR}/racc/en/changes.html
+${RUBY_DOCDIR}/racc/en/command.html
+${RUBY_DOCDIR}/racc/en/debug.html
+${RUBY_DOCDIR}/racc/en/grammar.html
+${RUBY_DOCDIR}/racc/en/index.html
+${RUBY_DOCDIR}/racc/en/parser.html
+${RUBY_DOCDIR}/racc/en/usage.html
+@dirrm ${RUBY_DOCDIR}/racc/en
 ${RUBY_DOCDIR}/racc/ja/changes.html
 ${RUBY_DOCDIR}/racc/ja/command.html
 ${RUBY_DOCDIR}/racc/ja/debug.html
-${RUBY_DOCDIR}/racc/ja/grammer.html
+${RUBY_DOCDIR}/racc/ja/grammar.html
 ${RUBY_DOCDIR}/racc/ja/index.html
 ${RUBY_DOCDIR}/racc/ja/parser.html
 ${RUBY_DOCDIR}/racc/ja/usage.html
-${RUBY_DOCDIR}/racc/changes.html
-${RUBY_DOCDIR}/racc/command.html
-${RUBY_DOCDIR}/racc/debug.html
-${RUBY_DOCDIR}/racc/grammer.html
-${RUBY_DOCDIR}/racc/index.html
-${RUBY_DOCDIR}/racc/parser.html
-${RUBY_DOCDIR}/racc/usage.html
-@dirrm ${RUBY_EXAMPLESDIR}/racc
 @dirrm ${RUBY_DOCDIR}/racc/ja
 @dirrm ${RUBY_DOCDIR}/racc
diff --git a/devel/ruby-racc/distinfo b/devel/ruby-racc/distinfo
index 536a27cbe2e..a783700be46 100644
--- a/devel/ruby-racc/distinfo
+++ b/devel/ruby-racc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/06/30 23:26:15 taca Exp $
+$NetBSD: distinfo,v 1.2 2001/12/30 17:13:47 taca Exp $
 
-SHA1 (ruby/racc-1.3.9.tar.gz) = 4eab7aec51d2492dde149b6d6560921e625a126a
-Size (ruby/racc-1.3.9.tar.gz) = 91563 bytes
+SHA1 (ruby/racc-1.4.1-all.tar.gz) = f09e2285e9a8a2c2a9d12b92169048f03fad6ed5
+Size (ruby/racc-1.4.1-all.tar.gz) = 120111 bytes