aboutsummaryrefslogtreecommitdiffstats
path: root/lang/ruby
diff options
context:
space:
mode:
authorknu <knu@FreeBSD.org>2003-02-04 21:13:05 +0800
committerknu <knu@FreeBSD.org>2003-02-04 21:13:05 +0800
commita9f35acd672e5e13d93ceda13c865f307b454d86 (patch)
tree68e775f394a2ff979f93d95f74a64756e7c8167a /lang/ruby
parenta52fd3595027b34cd1909a7fc37ae08c3ebb85f6 (diff)
downloadfreebsd-ports-gnome-a9f35acd672e5e13d93ceda13c865f307b454d86.tar.gz
freebsd-ports-gnome-a9f35acd672e5e13d93ceda13c865f307b454d86.tar.zst
freebsd-ports-gnome-a9f35acd672e5e13d93ceda13c865f307b454d86.zip
Use devel/oniguruma to build ruby with oniguruma.
Diffstat (limited to 'lang/ruby')
-rw-r--r--lang/ruby/Makefile20
-rw-r--r--lang/ruby/distinfo1
2 files changed, 10 insertions, 11 deletions
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index 0f6cebbee944..7946636e271b 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -8,12 +8,9 @@
PORTNAME= ruby${RUBY_R}
PORTVERSION= ${RUBY_PORTVERSION}
CATEGORIES= lang ruby ipv6
-MASTER_SITES= ${MASTER_SITE_RUBY} \
- ${ONIGURUMA_MASTER_SITES:S,$,:oniguruma,}
-MASTER_SITE_SUBDIR= ${MASTER_SITE_SUBDIR_RUBY} \
- ${ONIGURUMA_MASTER_SITE_SUBDIR:S,$,/:oniguruma,}
-DISTFILES= ${RUBY_DISTNAME}${EXTRACT_SUFX} \
- ${ONIGURUMA_DISTFILE:S,$,:oniguruma,}
+MASTER_SITES= ${MASTER_SITE_RUBY}
+MASTER_SITE_SUBDIR= ${MASTER_SITE_SUBDIR_RUBY}
+DISTFILES= ${RUBY_DISTNAME}${EXTRACT_SUFX}
DIST_SUBDIR= ruby
PATCH_SITES= ${MASTER_SITE_RUBY}
@@ -24,9 +21,10 @@ 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= onigd20030204.tar.gz
+PKGNAMESUFFIX= +oniguruma
+BUILD_DEPENDS+= ${NONEXISTENT}:${ONIGURUMA_PORTDIR}:patch
+ONIGURUMA_PORTDIR= ${PORTSDIR}/devel/oniguruma
+ONIGURUMA_WRKSRC= `cd ${ONIGURUMA_PORTDIR}; ${MAKE} -V WRKSRC`
PLIST_SUB+= ONIGURUMA=""
.else
PLIST_SUB+= ONIGURUMA="@comment "
@@ -103,7 +101,9 @@ post-patch:
pre-configure:
.if defined(WITH_ONIGURUMA)
- cd ${WRKDIR}/oniguruma; ./configure; ${MAKE} 16 RUBYDIR=${WRKSRC}
+ cd ${ONIGURUMA_WRKSRC}; \
+ ./configure; \
+ ${MAKE} -f Makefile ${RUBY_VER:S/.//} RUBYDIR=${WRKSRC}
.endif
post-install:
diff --git a/lang/ruby/distinfo b/lang/ruby/distinfo
index cf250fdf3842..55717ef7b45e 100644
--- a/lang/ruby/distinfo
+++ b/lang/ruby/distinfo
@@ -1,3 +1,2 @@
MD5 (ruby/ruby-1.6.8.tar.gz) = bf48d49dbd94b5c0eda5f75b3bfbac16
MD5 (ruby/ruby-1.6.8-2003.01.19.diff.bz2) = cf198340b4b7d6db6aae80e10cf64f91
-MD5 (ruby/onigd20030204.tar.gz) = aec4bb39e1211dde6cdc4a920be99a45