diff options
| author | knu <knu@FreeBSD.org> | 2002-03-13 22:57:19 +0000 |
|---|---|---|
| committer | knu <knu@FreeBSD.org> | 2002-03-13 22:57:19 +0000 |
| commit | 9a2a5eeeaf7f9f866e5b3efc836391c5e295a3c6 (patch) | |
| tree | c8260193a1819bae2c4a683a07db7016e4db41e5 | |
| parent | c70c947fe50b9e89b549ecfd33e3f54fd96a114e (diff) | |
| download | FreeBSD-ports-9a2a5eeeaf7f9f866e5b3efc836391c5e295a3c6.zip FreeBSD-ports-9a2a5eeeaf7f9f866e5b3efc836391c5e295a3c6.tar.gz | |
Update to the latest stable snapshot as of 2002.03.13.
Add a WITH_ONIGURUMA knob that enables the Oni Guruma regex engine
that's currently under development that will eventually replace the
stock one that's derived from LGPL'd GNU regex. [experimental]
| -rw-r--r-- | Mk/bsd.ruby.mk | 4 | ||||
| -rw-r--r-- | lang/ruby/Makefile | 27 | ||||
| -rw-r--r-- | lang/ruby/distinfo | 2 | ||||
| -rw-r--r-- | lang/ruby16/Makefile | 27 | ||||
| -rw-r--r-- | lang/ruby16/distinfo | 2 |
5 files changed, 52 insertions, 10 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index d9a09e6..caaed10 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -109,8 +109,8 @@ RUBY_PORTVERSION?= ${RUBY_VERSION}.2002.03.01 .else RUBY_VERSION?= 1.6.7 RUBY_DISTVERSION?= ${RUBY_VERSION} -#RUBY_PATCHFILES?= ruby-${RUBY_DISTVERSION}-yyyy.mm.dd.diff.bz2 -RUBY_PORTVERSION?= ${RUBY_VERSION} +RUBY_PATCHFILES?= ruby-${RUBY_DISTVERSION}-2002.03.13.diff.bz2 +RUBY_PORTVERSION?= ${RUBY_VERSION}.2002.03.13 .endif # defined(RUBY_VER) && ${RUBY_VER} == 1.7 diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile index 545be5b..a21a033 100644 --- a/lang/ruby/Makefile +++ b/lang/ruby/Makefile @@ -8,10 +8,14 @@ PORTNAME= ruby${RUBY_R} PORTVERSION= ${RUBY_PORTVERSION} CATEGORIES= lang ruby ipv6 -MASTER_SITES= ${MASTER_SITE_RUBY} -MASTER_SITE_SUBDIR= stable -DISTNAME= ${RUBY_DISTNAME} +MASTER_SITES= ${MASTER_SITE_RUBY} \ + ${ONIGURUMA_MASTER_SITES:S,$,:oniguruma,} +MASTER_SITE_SUBDIR= stable \ + ${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,12 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= knu@FreeBSD.org +.if defined(WITH_ONIGURUMA) +ONIGURUMA_MASTER_SITES= ${MASTER_SITE_RUBY} +ONIGURUMA_MASTER_SITE_SUBDIR= contrib +ONIGURUMA_DISTFILE= onigd20020313.tar.gz +.endif + #USE_BZIP2= yes USE_RUBY= yes @@ -62,8 +72,17 @@ IRB_WITH_SUFFIX= ${IRB_WITHOUT_SUFFIX}${_RUBY_SUFFIX} OBSOLETED_MODULES= sha1 shell 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.166.patch +.endif + ${FIND} ${WRKSRC} -name '*.orig' -delete .for d in Win32API ${RM} -rf ${WRKSRC}/ext/${d} .endfor diff --git a/lang/ruby/distinfo b/lang/ruby/distinfo index dd2986e..3b9d5c9 100644 --- a/lang/ruby/distinfo +++ b/lang/ruby/distinfo @@ -1 +1,3 @@ MD5 (ruby/ruby-1.6.7.tar.gz) = 4213d723911ce346717d60256fa925e1 +MD5 (ruby/onigd20020313.tar.gz) = d1bfc1cdff9c399e8ae532883943e6c1 +MD5 (ruby/ruby-1.6.7-2002.03.13.diff.bz2) = 6279da2be167ad7a1140775a51fa06af diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile index 545be5b..a21a033 100644 --- a/lang/ruby16/Makefile +++ b/lang/ruby16/Makefile @@ -8,10 +8,14 @@ PORTNAME= ruby${RUBY_R} PORTVERSION= ${RUBY_PORTVERSION} CATEGORIES= lang ruby ipv6 -MASTER_SITES= ${MASTER_SITE_RUBY} -MASTER_SITE_SUBDIR= stable -DISTNAME= ${RUBY_DISTNAME} +MASTER_SITES= ${MASTER_SITE_RUBY} \ + ${ONIGURUMA_MASTER_SITES:S,$,:oniguruma,} +MASTER_SITE_SUBDIR= stable \ + ${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,12 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= knu@FreeBSD.org +.if defined(WITH_ONIGURUMA) +ONIGURUMA_MASTER_SITES= ${MASTER_SITE_RUBY} +ONIGURUMA_MASTER_SITE_SUBDIR= contrib +ONIGURUMA_DISTFILE= onigd20020313.tar.gz +.endif + #USE_BZIP2= yes USE_RUBY= yes @@ -62,8 +72,17 @@ IRB_WITH_SUFFIX= ${IRB_WITHOUT_SUFFIX}${_RUBY_SUFFIX} OBSOLETED_MODULES= sha1 shell 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.166.patch +.endif + ${FIND} ${WRKSRC} -name '*.orig' -delete .for d in Win32API ${RM} -rf ${WRKSRC}/ext/${d} .endfor diff --git a/lang/ruby16/distinfo b/lang/ruby16/distinfo index dd2986e..3b9d5c9 100644 --- a/lang/ruby16/distinfo +++ b/lang/ruby16/distinfo @@ -1 +1,3 @@ MD5 (ruby/ruby-1.6.7.tar.gz) = 4213d723911ce346717d60256fa925e1 +MD5 (ruby/onigd20020313.tar.gz) = d1bfc1cdff9c399e8ae532883943e6c1 +MD5 (ruby/ruby-1.6.7-2002.03.13.diff.bz2) = 6279da2be167ad7a1140775a51fa06af |
