diff options
Diffstat (limited to 'lang/ruby18/Makefile')
| -rw-r--r-- | lang/ruby18/Makefile | 20 |
1 files changed, 10 insertions, 10 deletions
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: |