From 1423ddf3358c4ca72c08907db19240a432116e12 Mon Sep 17 00:00:00 2001
From: Akinori MUSHA <knu@FreeBSD.org>
Date: Sat, 11 Jan 2003 08:46:30 +0000
Subject: Update Oni Guruma (alternative BSDL regexp engine) to 20030109.
---
lang/ruby18/Makefile | 15 ++++++---------
lang/ruby18/distinfo | 2 +-
2 files changed, 7 insertions(+), 10 deletions(-)
(limited to 'lang/ruby18')
diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile
index df64904de83c..0614137736a3 100644
--- a/lang/ruby18/Makefile
+++ b/lang/ruby18/Makefile
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR= ${MASTER_SITE_SUBDIR_RUBY} \
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
@@ -27,7 +26,7 @@ MAINTAINER= knu@FreeBSD.org
.if defined(WITH_ONIGURUMA)
ONIGURUMA_MASTER_SITES= ${MASTER_SITE_RUBY}
ONIGURUMA_MASTER_SITE_SUBDIR= contrib
-ONIGURUMA_DISTFILE= onigd20021210.tar.gz
+ONIGURUMA_DISTFILE= onigd20030109.tar.gz
PLIST_SUB+= ONIGURUMA=""
.else
PLIST_SUB+= ONIGURUMA="@comment "
@@ -99,15 +98,8 @@ OBSOLETED_MODULES= dl \
post-extract:
${RMDIR} ${WRKSRC}/doc/net
${MV} ${WRKSRC}/ext/dl/h2rb ${WRKSRC}/bin/
-.if defined(WITH_ONIGURUMA)
- ${TAR} -zxvf ${DISTDIR}/${DIST_SUBDIR}/${ONIGURUMA_DISTFILE} -C ${WRKDIR}
-.endif
post-patch:
-.if defined(WITH_ONIGURUMA)
- ${CP} -f ${WRKDIR}/oniguruma/*.[ch] ${WRKSRC}/
- cd ${WRKSRC}; ${PATCH} < ${WRKDIR}/oniguruma/re.c.172.patch
-.endif
${FIND} ${WRKSRC} -name '*.orig' -delete
.for d in Win32API
${RM} -rf ${WRKSRC}/ext/${d}
@@ -116,6 +108,11 @@ post-patch:
${MV} ${WRKSRC}/ext/${d} ${WRKDIR}/
.endfor
+pre-configure:
+.if defined(WITH_ONIGURUMA)
+ cd ${WRKDIR}/oniguruma; ./configure; ${MAKE} 18 RUBYDIR=${WRKSRC}
+.endif
+
post-install:
.if defined(STRIP) && ${STRIP} == -s
${STRIP_CMD} ${RUBY}
diff --git a/lang/ruby18/distinfo b/lang/ruby18/distinfo
index 5df437bd4211..dd1e5d43b2e3 100644
--- a/lang/ruby18/distinfo
+++ b/lang/ruby18/distinfo
@@ -1,3 +1,3 @@
MD5 (ruby/ruby-1.8.0-preview1.tar.gz) = 1c37ec680b91cbea7a343252e4bd1e8d
MD5 (ruby/ruby-1.8.0-preview1-errata.diff) = 7ae6289348c59ca5107064cc75edc64e
-MD5 (ruby/onigd20021210.tar.gz) = 941d1d963de7eb9455a1874449679950
+MD5 (ruby/onigd20030109.tar.gz) = b553a8fda41cdec52fed70002b2d3f26
--
cgit v1.2.3