aboutsummaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorAkinori MUSHA <knu@FreeBSD.org>2002-03-13 22:57:19 +0000
committerAkinori MUSHA <knu@FreeBSD.org>2002-03-13 22:57:19 +0000
commitc990483df52c8a6f2580cdbc5684fb1567796104 (patch)
treef3744bc627d295037a2a3405d3b6b352515d6f17 /lang
parentdf744e816562920da296beecea39ebe84f7b6bf7 (diff)
downloadports-c990483df52c8a6f2580cdbc5684fb1567796104.tar.gz
ports-c990483df52c8a6f2580cdbc5684fb1567796104.zip
Notes
Diffstat (limited to 'lang')
-rw-r--r--lang/ruby/Makefile27
-rw-r--r--lang/ruby/distinfo2
-rw-r--r--lang/ruby16/Makefile27
-rw-r--r--lang/ruby16/distinfo2
4 files changed, 50 insertions, 8 deletions
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index 545be5b39bcf..a21a0334193d 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 dd2986e2332c..3b9d5c985016 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 545be5b39bcf..a21a0334193d 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 dd2986e2332c..3b9d5c985016 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