From f0631c9279ddbcc586ba8604660283793a4dddfd Mon Sep 17 00:00:00 2001 From: Akinori MUSHA Date: Tue, 4 Feb 2003 09:39:50 +0000 Subject: [PATCH] Update to 1.7 (20030204), with improved performance. According to the author's post on a mailing list, a simple benchmark shows that Oniguruma is 10-20% faster than PCRE 3.9 under the ASCII (single byte) encoding. --- devel/oniguruma/Makefile | 10 +++++++--- devel/oniguruma/distinfo | 2 +- devel/oniguruma/files/BSDmakefile | 2 +- devel/oniguruma/pkg-plist | 1 + devel/oniguruma4/Makefile | 10 +++++++--- devel/oniguruma4/distinfo | 2 +- devel/oniguruma4/files/BSDmakefile | 2 +- devel/oniguruma4/pkg-plist | 1 + devel/oniguruma5/Makefile | 10 +++++++--- devel/oniguruma5/distinfo | 2 +- devel/oniguruma5/files/BSDmakefile | 2 +- devel/oniguruma5/pkg-plist | 1 + 12 files changed, 30 insertions(+), 15 deletions(-) diff --git a/devel/oniguruma/Makefile b/devel/oniguruma/Makefile index 8d37fd530b1c..74751a0adf78 100644 --- a/devel/oniguruma/Makefile +++ b/devel/oniguruma/Makefile @@ -6,11 +6,11 @@ # PORTNAME= oniguruma -PORTVERSION= 1.6 +PORTVERSION= 1.7 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_RUBY} MASTER_SITE_SUBDIR= contrib -DISTNAME= onigd20030121 +DISTNAME= onigd20030204 DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org @@ -21,6 +21,8 @@ MAKEFILE= BSDmakefile MAKE_ARGS= NOPROFILE=true INSTALLS_SHLIB= yes +DOCS= README doc/* + pre-build: ${CP} ${FILESDIR}/${MAKEFILE} ${WRKSRC}/ @@ -29,7 +31,9 @@ post-install: ${MKDIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/sample/* ${EXAMPLESDIR}/ ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/ +.for f in ${DOCS} + ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/ +.endfor .endif .include diff --git a/devel/oniguruma/distinfo b/devel/oniguruma/distinfo index aa8d9c6fd003..c838536c73f2 100644 --- a/devel/oniguruma/distinfo +++ b/devel/oniguruma/distinfo @@ -1 +1 @@ -MD5 (ruby/onigd20030121.tar.gz) = 92ba124a64e0852e067f3aaeecf11f87 +MD5 (ruby/onigd20030204.tar.gz) = aec4bb39e1211dde6cdc4a920be99a45 diff --git a/devel/oniguruma/files/BSDmakefile b/devel/oniguruma/files/BSDmakefile index 6d09167981f1..43333010bf08 100644 --- a/devel/oniguruma/files/BSDmakefile +++ b/devel/oniguruma/files/BSDmakefile @@ -3,7 +3,7 @@ LIB= onig SHLIB_MAJOR?= 0 SHLIB_MINOR?= 0 -CFLAGS+= -DHAVE_CONFIG_H +CFLAGS+= -DHAVE_CONFIG_H -DNOT_RUBY SRCS= regerror.o regcomp.o regexec.o reggnu.o \ regposix.o regposerr.o INCS= regex.h \ diff --git a/devel/oniguruma/pkg-plist b/devel/oniguruma/pkg-plist index 55e2976ae843..a2462187b216 100644 --- a/devel/oniguruma/pkg-plist +++ b/devel/oniguruma/pkg-plist @@ -4,6 +4,7 @@ include/onig/regex.h lib/libonig.a lib/libonig.so lib/libonig.so.0 +%%PORTDOCS%%%%DOCSDIR%%/API %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%@dirrm %%DOCSDIR%% %%PORTDOCS%%%%EXAMPLESDIR%%/simple.c diff --git a/devel/oniguruma4/Makefile b/devel/oniguruma4/Makefile index 8d37fd530b1c..74751a0adf78 100644 --- a/devel/oniguruma4/Makefile +++ b/devel/oniguruma4/Makefile @@ -6,11 +6,11 @@ # PORTNAME= oniguruma -PORTVERSION= 1.6 +PORTVERSION= 1.7 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_RUBY} MASTER_SITE_SUBDIR= contrib -DISTNAME= onigd20030121 +DISTNAME= onigd20030204 DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org @@ -21,6 +21,8 @@ MAKEFILE= BSDmakefile MAKE_ARGS= NOPROFILE=true INSTALLS_SHLIB= yes +DOCS= README doc/* + pre-build: ${CP} ${FILESDIR}/${MAKEFILE} ${WRKSRC}/ @@ -29,7 +31,9 @@ post-install: ${MKDIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/sample/* ${EXAMPLESDIR}/ ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/ +.for f in ${DOCS} + ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/ +.endfor .endif .include diff --git a/devel/oniguruma4/distinfo b/devel/oniguruma4/distinfo index aa8d9c6fd003..c838536c73f2 100644 --- a/devel/oniguruma4/distinfo +++ b/devel/oniguruma4/distinfo @@ -1 +1 @@ -MD5 (ruby/onigd20030121.tar.gz) = 92ba124a64e0852e067f3aaeecf11f87 +MD5 (ruby/onigd20030204.tar.gz) = aec4bb39e1211dde6cdc4a920be99a45 diff --git a/devel/oniguruma4/files/BSDmakefile b/devel/oniguruma4/files/BSDmakefile index 6d09167981f1..43333010bf08 100644 --- a/devel/oniguruma4/files/BSDmakefile +++ b/devel/oniguruma4/files/BSDmakefile @@ -3,7 +3,7 @@ LIB= onig SHLIB_MAJOR?= 0 SHLIB_MINOR?= 0 -CFLAGS+= -DHAVE_CONFIG_H +CFLAGS+= -DHAVE_CONFIG_H -DNOT_RUBY SRCS= regerror.o regcomp.o regexec.o reggnu.o \ regposix.o regposerr.o INCS= regex.h \ diff --git a/devel/oniguruma4/pkg-plist b/devel/oniguruma4/pkg-plist index 55e2976ae843..a2462187b216 100644 --- a/devel/oniguruma4/pkg-plist +++ b/devel/oniguruma4/pkg-plist @@ -4,6 +4,7 @@ include/onig/regex.h lib/libonig.a lib/libonig.so lib/libonig.so.0 +%%PORTDOCS%%%%DOCSDIR%%/API %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%@dirrm %%DOCSDIR%% %%PORTDOCS%%%%EXAMPLESDIR%%/simple.c diff --git a/devel/oniguruma5/Makefile b/devel/oniguruma5/Makefile index 8d37fd530b1c..74751a0adf78 100644 --- a/devel/oniguruma5/Makefile +++ b/devel/oniguruma5/Makefile @@ -6,11 +6,11 @@ # PORTNAME= oniguruma -PORTVERSION= 1.6 +PORTVERSION= 1.7 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_RUBY} MASTER_SITE_SUBDIR= contrib -DISTNAME= onigd20030121 +DISTNAME= onigd20030204 DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org @@ -21,6 +21,8 @@ MAKEFILE= BSDmakefile MAKE_ARGS= NOPROFILE=true INSTALLS_SHLIB= yes +DOCS= README doc/* + pre-build: ${CP} ${FILESDIR}/${MAKEFILE} ${WRKSRC}/ @@ -29,7 +31,9 @@ post-install: ${MKDIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/sample/* ${EXAMPLESDIR}/ ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/ +.for f in ${DOCS} + ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/ +.endfor .endif .include diff --git a/devel/oniguruma5/distinfo b/devel/oniguruma5/distinfo index aa8d9c6fd003..c838536c73f2 100644 --- a/devel/oniguruma5/distinfo +++ b/devel/oniguruma5/distinfo @@ -1 +1 @@ -MD5 (ruby/onigd20030121.tar.gz) = 92ba124a64e0852e067f3aaeecf11f87 +MD5 (ruby/onigd20030204.tar.gz) = aec4bb39e1211dde6cdc4a920be99a45 diff --git a/devel/oniguruma5/files/BSDmakefile b/devel/oniguruma5/files/BSDmakefile index 6d09167981f1..43333010bf08 100644 --- a/devel/oniguruma5/files/BSDmakefile +++ b/devel/oniguruma5/files/BSDmakefile @@ -3,7 +3,7 @@ LIB= onig SHLIB_MAJOR?= 0 SHLIB_MINOR?= 0 -CFLAGS+= -DHAVE_CONFIG_H +CFLAGS+= -DHAVE_CONFIG_H -DNOT_RUBY SRCS= regerror.o regcomp.o regexec.o reggnu.o \ regposix.o regposerr.o INCS= regex.h \ diff --git a/devel/oniguruma5/pkg-plist b/devel/oniguruma5/pkg-plist index 55e2976ae843..a2462187b216 100644 --- a/devel/oniguruma5/pkg-plist +++ b/devel/oniguruma5/pkg-plist @@ -4,6 +4,7 @@ include/onig/regex.h lib/libonig.a lib/libonig.so lib/libonig.so.0 +%%PORTDOCS%%%%DOCSDIR%%/API %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%@dirrm %%DOCSDIR%% %%PORTDOCS%%%%EXAMPLESDIR%%/simple.c