Use devel/oniguruma to build ruby with oniguruma.

8 files changed, 40 insertions, 44 deletions

diff --git a/lang/ruby-devel/Makefile b/lang/ruby-devel/Makefile
index a0f80fc47bff..e556d165de96 100644
--- a/lang/ruby-devel/Makefile
+++ b/lang/ruby-devel/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 "
@@ -114,7 +112,9 @@ post-patch:
 
 pre-configure:
 .if defined(WITH_ONIGURUMA)
-	cd ${WRKDIR}/oniguruma; ./configure; ${MAKE} 18 RUBYDIR=${WRKSRC}
+	cd ${ONIGURUMA_WRKSRC}; \
+	./configure; \
+	${MAKE} -f Makefile ${RUBY_VER:S/.//} RUBYDIR=${WRKSRC}
 .endif
 
 post-install:
diff --git a/lang/ruby-devel/distinfo b/lang/ruby-devel/distinfo
index ae73de5382a0..058a8dc770e2 100644
--- a/lang/ruby-devel/distinfo
+++ b/lang/ruby-devel/distinfo
@@ -1,4 +1,3 @@
 MD5 (ruby/ruby-1.8.0-preview1.tar.gz) = 1c37ec680b91cbea7a343252e4bd1e8d
 MD5 (ruby/ruby-1.8.0-preview1-2003.01.11.diff.bz2) = 3264264760b657920a3540152c062f19
 MD5 (ruby/ruby-1.8.0-preview1-2003.01.11-2003.01.28.diff.bz2) = 1ba36daed1d951bd9d3f718253118f17
-MD5 (ruby/onigd20030204.tar.gz) = aec4bb39e1211dde6cdc4a920be99a45
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
diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile
index 0f6cebbee944..7946636e271b 100644
--- a/lang/ruby16/Makefile
+++ b/lang/ruby16/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/ruby16/distinfo b/lang/ruby16/distinfo
index cf250fdf3842..55717ef7b45e 100644
--- a/lang/ruby16/distinfo
+++ b/lang/ruby16/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
diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile
index a0f80fc47bff..e556d165de96 100644
--- a/lang/ruby18/Makefile
+++ b/lang/ruby18/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 "
@@ -114,7 +112,9 @@ post-patch:
 
 pre-configure:
 .if defined(WITH_ONIGURUMA)
-	cd ${WRKDIR}/oniguruma; ./configure; ${MAKE} 18 RUBYDIR=${WRKSRC}
+	cd ${ONIGURUMA_WRKSRC}; \
+	./configure; \
+	${MAKE} -f Makefile ${RUBY_VER:S/.//} RUBYDIR=${WRKSRC}
 .endif
 
 post-install:
diff --git a/lang/ruby18/distinfo b/lang/ruby18/distinfo
index ae73de5382a0..058a8dc770e2 100644
--- a/lang/ruby18/distinfo
+++ b/lang/ruby18/distinfo
@@ -1,4 +1,3 @@
 MD5 (ruby/ruby-1.8.0-preview1.tar.gz) = 1c37ec680b91cbea7a343252e4bd1e8d
 MD5 (ruby/ruby-1.8.0-preview1-2003.01.11.diff.bz2) = 3264264760b657920a3540152c062f19
 MD5 (ruby/ruby-1.8.0-preview1-2003.01.11-2003.01.28.diff.bz2) = 1ba36daed1d951bd9d3f718253118f17
-MD5 (ruby/onigd20030204.tar.gz) = aec4bb39e1211dde6cdc4a920be99a45