From ee1429b230a70e2affe9d2f716f0c7b71b73d33a Mon Sep 17 00:00:00 2001 From: knu Date: Tue, 26 Mar 2002 22:20:00 +0000 Subject: lang/ruby: - Update to the latest 1.6 stable snapshot as of 2002-03-27. - Update the Oni Guruma alternative regex engine to 20020325. lang/ruby-devel: - Update to the latest 1.7 development snapshot as of 2002-03-26. - Add the WITH_ONIGURUMA knob as well as lang/ruby. - Require devel/autoconf (2.53 or later is required). - Add several modules to the obsoleted modules list (now included): bigfloat fileutils racc-runtime strscan --- lang/ruby-devel/Makefile | 48 ++++++++++++++++++++++++++++++++++++++++------- lang/ruby-devel/distinfo | 3 ++- lang/ruby-devel/pkg-plist | 14 ++++++++++---- 3 files changed, 53 insertions(+), 12 deletions(-) (limited to 'lang/ruby-devel') diff --git a/lang/ruby-devel/Makefile b/lang/ruby-devel/Makefile index de820da..260ba88 100644 --- a/lang/ruby-devel/Makefile +++ b/lang/ruby-devel/Makefile @@ -8,10 +8,14 @@ PORTNAME= ruby${RUBY_R} PORTVERSION= ${RUBY_PORTVERSION} CATEGORIES= lang ruby ipv6 -MASTER_SITES= ${MASTER_SITE_RUBY} -MASTER_SITE_SUBDIR= snapshots -DISTNAME= ${RUBY_DISTNAME} +MASTER_SITES= ${MASTER_SITE_RUBY} \ + ${ONIGURUMA_MASTER_SITES:S,$,:oniguruma,} +MASTER_SITE_SUBDIR= snapshots \ + ${ONIGURUMA_MASTER_SITE_SUBDIR:S,$,/:oniguruma,} +DISTFILES= ${RUBY_DISTNAME}${EXTRACT_SUFX} \ + ${ONIGURUMA_DISTFILE:S,$,:oniguruma,} DIST_SUBDIR= ruby +EXTRACT_ONLY= ${RUBY_DISTNAME}${EXTRACT_SUFX} PATCH_SITES= ${MASTER_SITE_RUBY} PATCH_SITE_SUBDIR= snapshots @@ -20,6 +24,14 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= knu@FreeBSD.org +BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf + +.if defined(WITH_ONIGURUMA) +ONIGURUMA_MASTER_SITES= ${MASTER_SITE_RUBY} +ONIGURUMA_MASTER_SITE_SUBDIR= contrib +ONIGURUMA_DISTFILE= onigd20020325.tar.gz +.endif + USE_BZIP2= yes RUBY_VER= 1.7 @@ -28,7 +40,8 @@ USE_RUBY= yes RUBY_NO_BUILD_DEPENDS= yes RUBY_NO_RUN_DEPENDS= yes -USE_AUTOCONF_VER=213 +#USE_AUTOCONF= yes # does not work with 2.13; requires 2.53 or later +GNU_CONFIGURE= yes INSTALLS_SHLIB= yes WRKSRC= ${RUBY_WRKSRC} CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \ @@ -64,17 +77,38 @@ PLIST_SUB+= IF_DEFAULT=${IF_DEFAULT} \ IRB_WITHOUT_SUFFIX= ${LOCALBASE}/bin/irb IRB_WITH_SUFFIX= ${IRB_WITHOUT_SUFFIX}${_RUBY_SUFFIX} -OBSOLETED_MODULES= sha1 shell syslog timex urb uri +OBSOLETED_MODULES= bigfloat \ + fileutils \ + racc-runtime \ + sha1 \ + shell \ + strscan \ + syslog \ + timex \ + urb \ + uri + +post-extract: +.if defined(WITH_ONIGURUMA) + cd ${WRKDIR}; ${TAR} zxvf ${_DISTDIR}/${ONIGURUMA_DISTFILE} +.endif post-patch: - find ${WRKSRC} -name '*.orig' -delete +.if defined(WITH_ONIGURUMA) + ${CP} -f ${WRKDIR}/oniguruma/regex.[ch] ${WRKSRC}/ + cd ${WRKSRC}; ${PATCH} < ${WRKDIR}/oniguruma/re.c.172.patch +.endif + ${FIND} ${WRKSRC} -name '*.orig' -delete .for d in Win32API ${RM} -rf ${WRKSRC}/ext/${d} .endfor -.for d in gdbm tcltklib tk +.for d in gdbm iconv tcltklib tk ${MV} ${WRKSRC}/ext/${d} ${WRKDIR}/ .endfor +pre-configure: + cd ${WRKSRC}; autoconf + pre-install: ${RM} -f ${RUBY_WITHOUT_SUFFIX}${RUBY_R} \ ${PREFIX}/man/man1/ruby${RUBY_R}.1 \ diff --git a/lang/ruby-devel/distinfo b/lang/ruby-devel/distinfo index 3a1d1d8..7f38aa3 100644 --- a/lang/ruby-devel/distinfo +++ b/lang/ruby-devel/distinfo @@ -1 +1,2 @@ -MD5 (ruby/ruby-1.7-2002.03.01.tar.bz2) = 62c4ba46198e08f46f8e7dac458350d4 +MD5 (ruby/ruby-1.7-2002.03.26.tar.bz2) = e5f709818307b1fa051dde784dcbbcd2 +MD5 (ruby/onigd20020325.tar.gz) = 3cfa28bd30b7d2a27fb3f402de4e5e19 diff --git a/lang/ruby-devel/pkg-plist b/lang/ruby-devel/pkg-plist index 5c72358..b06776d 100644 --- a/lang/ruby-devel/pkg-plist +++ b/lang/ruby-devel/pkg-plist @@ -4,6 +4,7 @@ bin/irb%%_RUBY_SUFFIX%% bin/ruby%%_RUBY_SUFFIX%% lib/lib%%RUBY_NAME%%.so lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% +%%RUBY_ARCHLIBDIR%%/bigfloat.so %%RUBY_ARCHLIBDIR%%/config.h %%RUBY_ARCHLIBDIR%%/curses.so %%RUBY_ARCHLIBDIR%%/dbm.so @@ -28,6 +29,8 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% %%RUBY_ARCHLIBDIR%%/sdbm.so %%RUBY_ARCHLIBDIR%%/socket.so %%RUBY_ARCHLIBDIR%%/st.h +%%RUBY_ARCHLIBDIR%%/stringio.so +%%RUBY_ARCHLIBDIR%%/strscan.so %%RUBY_ARCHLIBDIR%%/syslog.so %%RUBY_ARCHLIBDIR%%/util.h %%RUBY_ARCHLIBDIR%%/version.h @@ -35,10 +38,13 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% %%RUBY_ARCHLIBDIR%%/digest/rmd160.so %%RUBY_ARCHLIBDIR%%/digest/sha1.so %%RUBY_ARCHLIBDIR%%/digest/sha2.so +%%RUBY_ARCHLIBDIR%%/racc/cparse.so @dirrm %%RUBY_ARCHLIBDIR%%/digest +@dirrm %%RUBY_ARCHLIBDIR%%/racc %%RUBYLIB%%%%RUBY_LIBDIR%%/English.rb %%RUBYLIB%%%%RUBY_LIBDIR%%/Env.rb %%RUBYLIB%%%%RUBY_LIBDIR%%/base64.rb +%%RUBYLIB%%%%RUBY_LIBDIR%%/benchmark.rb %%RUBYLIB%%%%RUBY_LIBDIR%%/cgi-lib.rb %%RUBYLIB%%%%RUBY_LIBDIR%%/cgi.rb %%RUBYLIB%%%%RUBY_LIBDIR%%/complex.rb @@ -49,6 +55,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% %%RUBYLIB%%%%RUBY_LIBDIR%%/e2mmap.rb %%RUBYLIB%%%%RUBY_LIBDIR%%/eregex.rb %%RUBYLIB%%%%RUBY_LIBDIR%%/expect.rb +%%RUBYLIB%%%%RUBY_LIBDIR%%/fileutils.rb %%RUBYLIB%%%%RUBY_LIBDIR%%/final.rb %%RUBYLIB%%%%RUBY_LIBDIR%%/finalize.rb %%RUBYLIB%%%%RUBY_LIBDIR%%/find.rb @@ -94,6 +101,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% %%RUBYLIB%%%%RUBY_LIBDIR%%/time.rb %%RUBYLIB%%%%RUBY_LIBDIR%%/timeout.rb %%RUBYLIB%%%%RUBY_LIBDIR%%/tracer.rb +%%RUBYLIB%%%%RUBY_LIBDIR%%/tsort.rb %%RUBYLIB%%%%RUBY_LIBDIR%%/uri.rb %%RUBYLIB%%%%RUBY_LIBDIR%%/weakref.rb %%RUBYLIB%%%%RUBY_LIBDIR%%/cgi/session.rb @@ -125,6 +133,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% %%RUBYLIB%%%%RUBY_LIBDIR%%/net/protocol.rb %%RUBYLIB%%%%RUBY_LIBDIR%%/net/smtp.rb %%RUBYLIB%%%%RUBY_LIBDIR%%/net/telnet.rb +%%RUBYLIB%%%%RUBY_LIBDIR%%/racc/parser.rb %%RUBYLIB%%%%RUBY_LIBDIR%%/shell/builtin-command.rb %%RUBYLIB%%%%RUBY_LIBDIR%%/shell/command-processor.rb %%RUBYLIB%%%%RUBY_LIBDIR%%/shell/error.rb @@ -149,6 +158,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/irb/lc %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/irb %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/net +%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/racc %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/shell %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/uri %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%% @@ -175,9 +185,6 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% %%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb-tools.rd.ja %%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb.rd %%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb.rd.ja -%%PORTDOCS%%%%RUBY_DOCDIR%%/net/http.rd.ja -%%PORTDOCS%%%%RUBY_DOCDIR%%/net/pop.rd.ja -%%PORTDOCS%%%%RUBY_DOCDIR%%/net/smtp.rd.ja %%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README %%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.ja %%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.expect @@ -188,7 +195,6 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/digest %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/etc %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/irb -%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/net %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/pty %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/readline %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/syslog -- cgit v1.1