diff options
Diffstat (limited to 'devel')
-rw-r--r-- | devel/oniguruma/Makefile | 5 | ||||
-rw-r--r-- | devel/oniguruma/distinfo | 2 | ||||
-rw-r--r-- | devel/oniguruma/files/patch-regparse.c | 29 | ||||
-rw-r--r-- | devel/oniguruma/pkg-plist | 1 | ||||
-rw-r--r-- | devel/oniguruma4/Makefile | 5 | ||||
-rw-r--r-- | devel/oniguruma4/distinfo | 2 | ||||
-rw-r--r-- | devel/oniguruma4/files/patch-regparse.c | 29 | ||||
-rw-r--r-- | devel/oniguruma4/pkg-plist | 1 | ||||
-rw-r--r-- | devel/oniguruma5/Makefile | 5 | ||||
-rw-r--r-- | devel/oniguruma5/distinfo | 2 | ||||
-rw-r--r-- | devel/oniguruma5/files/patch-regparse.c | 29 | ||||
-rw-r--r-- | devel/oniguruma5/pkg-plist | 1 |
12 files changed, 12 insertions, 99 deletions
diff --git a/devel/oniguruma/Makefile b/devel/oniguruma/Makefile index 992bcaf77c7d..22bb9da766ef 100644 --- a/devel/oniguruma/Makefile +++ b/devel/oniguruma/Makefile @@ -6,12 +6,11 @@ # PORTNAME= oniguruma -PORTVERSION= 1.9.3 -PORTREVISION= 1 +PORTVERSION= 1.9.5 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_RUBY} MASTER_SITE_SUBDIR= contrib -DISTNAME= onigd20030819 +DISTNAME= onigd20031112 DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org diff --git a/devel/oniguruma/distinfo b/devel/oniguruma/distinfo index 23d8d195d076..931980fe7bf6 100644 --- a/devel/oniguruma/distinfo +++ b/devel/oniguruma/distinfo @@ -1 +1 @@ -MD5 (ruby/onigd20030819.tar.gz) = 00091bd10a9986140445ae637e2a0ce2 +MD5 (ruby/onigd20031112.tar.gz) = e0eff399310ce45a8a449791d1141804 diff --git a/devel/oniguruma/files/patch-regparse.c b/devel/oniguruma/files/patch-regparse.c deleted file mode 100644 index f0714d214678..000000000000 --- a/devel/oniguruma/files/patch-regparse.c +++ /dev/null @@ -1,29 +0,0 @@ -Obtained from [ruby-dev:21263] - -Index: regparse.c -=================================================================== ---- regparse.c (revision 217) -+++ regparse.c (working copy) -@@ -3571,7 +3571,10 @@ - in_israw = 1; - val_entry: - len = WC2MBLEN(env->enc, v); -- if (len < 0) return len; -+ if (len < 0) { -+ r = len; -+ goto err; -+ } - in_type = (len == 1 ? CCV_SB : CCV_WC); - r = next_state_val(cc, &vs, v, &val_israw, in_israw, in_type, &val_type, - &state, env); -@@ -3658,8 +3661,8 @@ - acc = &(NCCLASS(anode)); - r = or_cclass(cc, acc); - -+ regex_node_free(anode); - cc_open_err: -- regex_node_free(anode); - if (r != 0) goto err; - } - break; - diff --git a/devel/oniguruma/pkg-plist b/devel/oniguruma/pkg-plist index 62d4d954fe68..557c5d4c9a1f 100644 --- a/devel/oniguruma/pkg-plist +++ b/devel/oniguruma/pkg-plist @@ -14,4 +14,5 @@ lib/libonig.so.0 %%PORTDOCS%%%%EXAMPLESDIR%%/names.c %%PORTDOCS%%%%EXAMPLESDIR%%/posix.c %%PORTDOCS%%%%EXAMPLESDIR%%/simple.c +%%PORTDOCS%%%%EXAMPLESDIR%%/sql.c %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% diff --git a/devel/oniguruma4/Makefile b/devel/oniguruma4/Makefile index 992bcaf77c7d..22bb9da766ef 100644 --- a/devel/oniguruma4/Makefile +++ b/devel/oniguruma4/Makefile @@ -6,12 +6,11 @@ # PORTNAME= oniguruma -PORTVERSION= 1.9.3 -PORTREVISION= 1 +PORTVERSION= 1.9.5 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_RUBY} MASTER_SITE_SUBDIR= contrib -DISTNAME= onigd20030819 +DISTNAME= onigd20031112 DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org diff --git a/devel/oniguruma4/distinfo b/devel/oniguruma4/distinfo index 23d8d195d076..931980fe7bf6 100644 --- a/devel/oniguruma4/distinfo +++ b/devel/oniguruma4/distinfo @@ -1 +1 @@ -MD5 (ruby/onigd20030819.tar.gz) = 00091bd10a9986140445ae637e2a0ce2 +MD5 (ruby/onigd20031112.tar.gz) = e0eff399310ce45a8a449791d1141804 diff --git a/devel/oniguruma4/files/patch-regparse.c b/devel/oniguruma4/files/patch-regparse.c deleted file mode 100644 index f0714d214678..000000000000 --- a/devel/oniguruma4/files/patch-regparse.c +++ /dev/null @@ -1,29 +0,0 @@ -Obtained from [ruby-dev:21263] - -Index: regparse.c -=================================================================== ---- regparse.c (revision 217) -+++ regparse.c (working copy) -@@ -3571,7 +3571,10 @@ - in_israw = 1; - val_entry: - len = WC2MBLEN(env->enc, v); -- if (len < 0) return len; -+ if (len < 0) { -+ r = len; -+ goto err; -+ } - in_type = (len == 1 ? CCV_SB : CCV_WC); - r = next_state_val(cc, &vs, v, &val_israw, in_israw, in_type, &val_type, - &state, env); -@@ -3658,8 +3661,8 @@ - acc = &(NCCLASS(anode)); - r = or_cclass(cc, acc); - -+ regex_node_free(anode); - cc_open_err: -- regex_node_free(anode); - if (r != 0) goto err; - } - break; - diff --git a/devel/oniguruma4/pkg-plist b/devel/oniguruma4/pkg-plist index 62d4d954fe68..557c5d4c9a1f 100644 --- a/devel/oniguruma4/pkg-plist +++ b/devel/oniguruma4/pkg-plist @@ -14,4 +14,5 @@ lib/libonig.so.0 %%PORTDOCS%%%%EXAMPLESDIR%%/names.c %%PORTDOCS%%%%EXAMPLESDIR%%/posix.c %%PORTDOCS%%%%EXAMPLESDIR%%/simple.c +%%PORTDOCS%%%%EXAMPLESDIR%%/sql.c %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% diff --git a/devel/oniguruma5/Makefile b/devel/oniguruma5/Makefile index 992bcaf77c7d..22bb9da766ef 100644 --- a/devel/oniguruma5/Makefile +++ b/devel/oniguruma5/Makefile @@ -6,12 +6,11 @@ # PORTNAME= oniguruma -PORTVERSION= 1.9.3 -PORTREVISION= 1 +PORTVERSION= 1.9.5 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_RUBY} MASTER_SITE_SUBDIR= contrib -DISTNAME= onigd20030819 +DISTNAME= onigd20031112 DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org diff --git a/devel/oniguruma5/distinfo b/devel/oniguruma5/distinfo index 23d8d195d076..931980fe7bf6 100644 --- a/devel/oniguruma5/distinfo +++ b/devel/oniguruma5/distinfo @@ -1 +1 @@ -MD5 (ruby/onigd20030819.tar.gz) = 00091bd10a9986140445ae637e2a0ce2 +MD5 (ruby/onigd20031112.tar.gz) = e0eff399310ce45a8a449791d1141804 diff --git a/devel/oniguruma5/files/patch-regparse.c b/devel/oniguruma5/files/patch-regparse.c deleted file mode 100644 index f0714d214678..000000000000 --- a/devel/oniguruma5/files/patch-regparse.c +++ /dev/null @@ -1,29 +0,0 @@ -Obtained from [ruby-dev:21263] - -Index: regparse.c -=================================================================== ---- regparse.c (revision 217) -+++ regparse.c (working copy) -@@ -3571,7 +3571,10 @@ - in_israw = 1; - val_entry: - len = WC2MBLEN(env->enc, v); -- if (len < 0) return len; -+ if (len < 0) { -+ r = len; -+ goto err; -+ } - in_type = (len == 1 ? CCV_SB : CCV_WC); - r = next_state_val(cc, &vs, v, &val_israw, in_israw, in_type, &val_type, - &state, env); -@@ -3658,8 +3661,8 @@ - acc = &(NCCLASS(anode)); - r = or_cclass(cc, acc); - -+ regex_node_free(anode); - cc_open_err: -- regex_node_free(anode); - if (r != 0) goto err; - } - break; - diff --git a/devel/oniguruma5/pkg-plist b/devel/oniguruma5/pkg-plist index 62d4d954fe68..557c5d4c9a1f 100644 --- a/devel/oniguruma5/pkg-plist +++ b/devel/oniguruma5/pkg-plist @@ -14,4 +14,5 @@ lib/libonig.so.0 %%PORTDOCS%%%%EXAMPLESDIR%%/names.c %%PORTDOCS%%%%EXAMPLESDIR%%/posix.c %%PORTDOCS%%%%EXAMPLESDIR%%/simple.c +%%PORTDOCS%%%%EXAMPLESDIR%%/sql.c %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% |