Update to 2.1.0. Support for several more encodings is added.

Do not build a shared library for now because it does not link.

15 files changed, 21 insertions, 366 deletions

diff --git a/devel/oniguruma/Makefile b/devel/oniguruma/Makefile
index 2611fa37e124..95c6eebc6f55 100644
--- a/devel/oniguruma/Makefile
+++ b/devel/oniguruma/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	oniguruma
-PORTVERSION=	1.9.5
-PORTREVISION=	1
+PORTVERSION=	2.1.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_RUBY}
 MASTER_SITE_SUBDIR=	contrib
-DISTNAME=	onigd20031112
+DISTNAME=	onigd20040202
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
@@ -19,21 +18,10 @@ COMMENT=	A BSDL Regular Expressions library compatible with POSIX/GNU/Perl
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 GNU_CONFIGURE=	yes
-MAKEFILE=	BSDmakefile
-MAKE_ARGS=	NOPROFILE=true
 INSTALLS_SHLIB=	yes
 
 DOCS=		HISTORY README doc/*
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 502000
-BROKEN=		"Does not compile"
-.endif
-
-pre-build:
-	${CP} ${FILESDIR}/${MAKEFILE} ${WRKSRC}/
-
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${EXAMPLESDIR}
@@ -44,4 +32,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/oniguruma/distinfo b/devel/oniguruma/distinfo
index 931980fe7bf6..34e901cfab56 100644
--- a/devel/oniguruma/distinfo
+++ b/devel/oniguruma/distinfo
@@ -1 +1 @@
-MD5 (ruby/onigd20031112.tar.gz) = e0eff399310ce45a8a449791d1141804
+MD5 (ruby/onigd20040202.tar.gz) = e93c9691fe700a2dd4e6fc5c56ff85bf
diff --git a/devel/oniguruma/files/BSDmakefile b/devel/oniguruma/files/BSDmakefile
deleted file mode 100644
index 44d935204399..000000000000
--- a/devel/oniguruma/files/BSDmakefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-LIB=		onig
-SHLIB_MAJOR?=	0
-SHLIB_MINOR?=	0
-CFLAGS+=	-DHAVE_CONFIG_H -DNOT_RUBY
-SRCS=		regerror.o regcomp.o regexec.o reggnu.o \
-		regposix.o regposerr.o regparse.o
-INCS=		onigposix.h \
-		oniguruma.h
-NOMAN=		YES
-LIBDIR=		${LOCALBASE}/lib
-INCSDIR=	${LOCALBASE}/include/onig
-INCDIR=		${INCSDIR}		# for pre-bsd.incs.mk API
-
-beforeinstall:
-	mkdir -p ${INCSDIR}
-
-.include <bsd.lib.mk>
diff --git a/devel/oniguruma/files/patch-ruby-dev-21973 b/devel/oniguruma/files/patch-ruby-dev-21973
deleted file mode 100644
index a825c121c31c..000000000000
--- a/devel/oniguruma/files/patch-ruby-dev-21973
+++ /dev/null
@@ -1,82 +0,0 @@
-Taken from: [ruby-dev:21973]
-
-Index: regparse.c
-===================================================================
---- regparse.c (.../ags/oniguruma/1.9.5)	(revision 245)
-+++ regparse.c (.../runk/oniguruma)	(revision 245)
-@@ -833,6 +833,10 @@
- 	e->back_refs = (int* )NULL;
-       }
-     }
-+    if (IS_NOT_NULL(t->e)) {
-+      xfree(t->e);
-+      t->e = NULL;
-+    }
-     t->num = 0;
-   }
-   return 0;
-@@ -3611,6 +3615,7 @@
-   enum CCVALTYPE val_type, in_type;
-   int val_israw, in_israw;
- 
-+  prev_cc = (CClassNode* )NULL;
-   *np = NULL_NODE;
-   r = fetch_token_in_cc(tok, src, end, env);
-   if (r == TK_BYTE && tok->u.c == '^') {
-@@ -3633,7 +3638,6 @@
-   *np = node = node_new_cclass();
-   CHECK_NULL_RETURN_VAL(node, REGERR_MEMORY);
-   cc = &(NCCLASS(node));
--  prev_cc = (CClassNode* )NULL;
- 
-   and_start = 0;
-   state = CCS_START;
-@@ -3810,6 +3814,7 @@
- 	if (IS_NOT_NULL(prev_cc)) {
- 	  r = and_cclass(prev_cc, cc);
- 	  if (r != 0) goto err;
-+	  bbuf_free(cc->mbuf);
- 	}
- 	else {
- 	  prev_cc = cc;
-@@ -3846,6 +3851,7 @@
-   if (IS_NOT_NULL(prev_cc)) {
-     r = and_cclass(prev_cc, cc);
-     if (r != 0) goto err;
-+    bbuf_free(cc->mbuf);
-     cc = prev_cc;
-   }
- 
-@@ -3864,6 +3870,8 @@
-   return 0;
- 
-  err:
-+  if (cc != &(NCCLASS(*np)))
-+    bbuf_free(cc->mbuf);
-   regex_node_free(*np);
-   return r;
- }
-@@ -4490,7 +4498,10 @@
- 
-   *top = NULL;
-   r = parse_branch(&node, tok, term, src, end, env);
--  if (r < 0) return r;
-+  if (r < 0) {
-+    regex_node_free(node);
-+    return r;
-+  }
- 
-   if (r == term) {
-     *top = node;
-Index: regcomp.c
-===================================================================
---- regcomp.c (.../ags/oniguruma/1.9.5)	(revision 245)
-+++ regcomp.c (.../runk/oniguruma)	(revision 245)
-@@ -3675,6 +3675,7 @@
-     }
-     else {
-       len = mblen(code, *p);
-+      if (i + len > OPT_EXACT_MAXLEN) break;
-       for (j = 0; j < len; j++)
- 	to->s[i++] = *p++;
-     }
diff --git a/devel/oniguruma/pkg-plist b/devel/oniguruma/pkg-plist
index 557c5d4c9a1f..5fbfff32f5b2 100644
--- a/devel/oniguruma/pkg-plist
+++ b/devel/oniguruma/pkg-plist
@@ -1,15 +1,13 @@
-include/onig/onigposix.h
-include/onig/oniguruma.h
-@dirrm include/onig
+include/onigposix.h
+include/oniguruma.h
 lib/libonig.a
-lib/libonig.so
-lib/libonig.so.0
 %%PORTDOCS%%%%DOCSDIR%%/API
 %%PORTDOCS%%%%DOCSDIR%%/HISTORY
 %%PORTDOCS%%%%DOCSDIR%%/RE
 %%PORTDOCS%%%%DOCSDIR%%/RE.ja
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%EXAMPLESDIR%%/encode.c
 %%PORTDOCS%%%%EXAMPLESDIR%%/listcap.c
 %%PORTDOCS%%%%EXAMPLESDIR%%/names.c
 %%PORTDOCS%%%%EXAMPLESDIR%%/posix.c
diff --git a/devel/oniguruma4/Makefile b/devel/oniguruma4/Makefile
index 2611fa37e124..95c6eebc6f55 100644
--- a/devel/oniguruma4/Makefile
+++ b/devel/oniguruma4/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	oniguruma
-PORTVERSION=	1.9.5
-PORTREVISION=	1
+PORTVERSION=	2.1.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_RUBY}
 MASTER_SITE_SUBDIR=	contrib
-DISTNAME=	onigd20031112
+DISTNAME=	onigd20040202
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
@@ -19,21 +18,10 @@ COMMENT=	A BSDL Regular Expressions library compatible with POSIX/GNU/Perl
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 GNU_CONFIGURE=	yes
-MAKEFILE=	BSDmakefile
-MAKE_ARGS=	NOPROFILE=true
 INSTALLS_SHLIB=	yes
 
 DOCS=		HISTORY README doc/*
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 502000
-BROKEN=		"Does not compile"
-.endif
-
-pre-build:
-	${CP} ${FILESDIR}/${MAKEFILE} ${WRKSRC}/
-
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${EXAMPLESDIR}
@@ -44,4 +32,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/oniguruma4/distinfo b/devel/oniguruma4/distinfo
index 931980fe7bf6..34e901cfab56 100644
--- a/devel/oniguruma4/distinfo
+++ b/devel/oniguruma4/distinfo
@@ -1 +1 @@
-MD5 (ruby/onigd20031112.tar.gz) = e0eff399310ce45a8a449791d1141804
+MD5 (ruby/onigd20040202.tar.gz) = e93c9691fe700a2dd4e6fc5c56ff85bf
diff --git a/devel/oniguruma4/files/BSDmakefile b/devel/oniguruma4/files/BSDmakefile
deleted file mode 100644
index 44d935204399..000000000000
--- a/devel/oniguruma4/files/BSDmakefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-LIB=		onig
-SHLIB_MAJOR?=	0
-SHLIB_MINOR?=	0
-CFLAGS+=	-DHAVE_CONFIG_H -DNOT_RUBY
-SRCS=		regerror.o regcomp.o regexec.o reggnu.o \
-		regposix.o regposerr.o regparse.o
-INCS=		onigposix.h \
-		oniguruma.h
-NOMAN=		YES
-LIBDIR=		${LOCALBASE}/lib
-INCSDIR=	${LOCALBASE}/include/onig
-INCDIR=		${INCSDIR}		# for pre-bsd.incs.mk API
-
-beforeinstall:
-	mkdir -p ${INCSDIR}
-
-.include <bsd.lib.mk>
diff --git a/devel/oniguruma4/files/patch-ruby-dev-21973 b/devel/oniguruma4/files/patch-ruby-dev-21973
deleted file mode 100644
index a825c121c31c..000000000000
--- a/devel/oniguruma4/files/patch-ruby-dev-21973
+++ /dev/null
@@ -1,82 +0,0 @@
-Taken from: [ruby-dev:21973]
-
-Index: regparse.c
-===================================================================
---- regparse.c (.../ags/oniguruma/1.9.5)	(revision 245)
-+++ regparse.c (.../runk/oniguruma)	(revision 245)
-@@ -833,6 +833,10 @@
- 	e->back_refs = (int* )NULL;
-       }
-     }
-+    if (IS_NOT_NULL(t->e)) {
-+      xfree(t->e);
-+      t->e = NULL;
-+    }
-     t->num = 0;
-   }
-   return 0;
-@@ -3611,6 +3615,7 @@
-   enum CCVALTYPE val_type, in_type;
-   int val_israw, in_israw;
- 
-+  prev_cc = (CClassNode* )NULL;
-   *np = NULL_NODE;
-   r = fetch_token_in_cc(tok, src, end, env);
-   if (r == TK_BYTE && tok->u.c == '^') {
-@@ -3633,7 +3638,6 @@
-   *np = node = node_new_cclass();
-   CHECK_NULL_RETURN_VAL(node, REGERR_MEMORY);
-   cc = &(NCCLASS(node));
--  prev_cc = (CClassNode* )NULL;
- 
-   and_start = 0;
-   state = CCS_START;
-@@ -3810,6 +3814,7 @@
- 	if (IS_NOT_NULL(prev_cc)) {
- 	  r = and_cclass(prev_cc, cc);
- 	  if (r != 0) goto err;
-+	  bbuf_free(cc->mbuf);
- 	}
- 	else {
- 	  prev_cc = cc;
-@@ -3846,6 +3851,7 @@
-   if (IS_NOT_NULL(prev_cc)) {
-     r = and_cclass(prev_cc, cc);
-     if (r != 0) goto err;
-+    bbuf_free(cc->mbuf);
-     cc = prev_cc;
-   }
- 
-@@ -3864,6 +3870,8 @@
-   return 0;
- 
-  err:
-+  if (cc != &(NCCLASS(*np)))
-+    bbuf_free(cc->mbuf);
-   regex_node_free(*np);
-   return r;
- }
-@@ -4490,7 +4498,10 @@
- 
-   *top = NULL;
-   r = parse_branch(&node, tok, term, src, end, env);
--  if (r < 0) return r;
-+  if (r < 0) {
-+    regex_node_free(node);
-+    return r;
-+  }
- 
-   if (r == term) {
-     *top = node;
-Index: regcomp.c
-===================================================================
---- regcomp.c (.../ags/oniguruma/1.9.5)	(revision 245)
-+++ regcomp.c (.../runk/oniguruma)	(revision 245)
-@@ -3675,6 +3675,7 @@
-     }
-     else {
-       len = mblen(code, *p);
-+      if (i + len > OPT_EXACT_MAXLEN) break;
-       for (j = 0; j < len; j++)
- 	to->s[i++] = *p++;
-     }
diff --git a/devel/oniguruma4/pkg-plist b/devel/oniguruma4/pkg-plist
index 557c5d4c9a1f..5fbfff32f5b2 100644
--- a/devel/oniguruma4/pkg-plist
+++ b/devel/oniguruma4/pkg-plist
@@ -1,15 +1,13 @@
-include/onig/onigposix.h
-include/onig/oniguruma.h
-@dirrm include/onig
+include/onigposix.h
+include/oniguruma.h
 lib/libonig.a
-lib/libonig.so
-lib/libonig.so.0
 %%PORTDOCS%%%%DOCSDIR%%/API
 %%PORTDOCS%%%%DOCSDIR%%/HISTORY
 %%PORTDOCS%%%%DOCSDIR%%/RE
 %%PORTDOCS%%%%DOCSDIR%%/RE.ja
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%EXAMPLESDIR%%/encode.c
 %%PORTDOCS%%%%EXAMPLESDIR%%/listcap.c
 %%PORTDOCS%%%%EXAMPLESDIR%%/names.c
 %%PORTDOCS%%%%EXAMPLESDIR%%/posix.c
diff --git a/devel/oniguruma5/Makefile b/devel/oniguruma5/Makefile
index 2611fa37e124..95c6eebc6f55 100644
--- a/devel/oniguruma5/Makefile
+++ b/devel/oniguruma5/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	oniguruma
-PORTVERSION=	1.9.5
-PORTREVISION=	1
+PORTVERSION=	2.1.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_RUBY}
 MASTER_SITE_SUBDIR=	contrib
-DISTNAME=	onigd20031112
+DISTNAME=	onigd20040202
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
@@ -19,21 +18,10 @@ COMMENT=	A BSDL Regular Expressions library compatible with POSIX/GNU/Perl
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 GNU_CONFIGURE=	yes
-MAKEFILE=	BSDmakefile
-MAKE_ARGS=	NOPROFILE=true
 INSTALLS_SHLIB=	yes
 
 DOCS=		HISTORY README doc/*
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 502000
-BROKEN=		"Does not compile"
-.endif
-
-pre-build:
-	${CP} ${FILESDIR}/${MAKEFILE} ${WRKSRC}/
-
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${EXAMPLESDIR}
@@ -44,4 +32,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/oniguruma5/distinfo b/devel/oniguruma5/distinfo
index 931980fe7bf6..34e901cfab56 100644
--- a/devel/oniguruma5/distinfo
+++ b/devel/oniguruma5/distinfo
@@ -1 +1 @@
-MD5 (ruby/onigd20031112.tar.gz) = e0eff399310ce45a8a449791d1141804
+MD5 (ruby/onigd20040202.tar.gz) = e93c9691fe700a2dd4e6fc5c56ff85bf
diff --git a/devel/oniguruma5/files/BSDmakefile b/devel/oniguruma5/files/BSDmakefile
deleted file mode 100644
index 44d935204399..000000000000
--- a/devel/oniguruma5/files/BSDmakefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-LIB=		onig
-SHLIB_MAJOR?=	0
-SHLIB_MINOR?=	0
-CFLAGS+=	-DHAVE_CONFIG_H -DNOT_RUBY
-SRCS=		regerror.o regcomp.o regexec.o reggnu.o \
-		regposix.o regposerr.o regparse.o
-INCS=		onigposix.h \
-		oniguruma.h
-NOMAN=		YES
-LIBDIR=		${LOCALBASE}/lib
-INCSDIR=	${LOCALBASE}/include/onig
-INCDIR=		${INCSDIR}		# for pre-bsd.incs.mk API
-
-beforeinstall:
-	mkdir -p ${INCSDIR}
-
-.include <bsd.lib.mk>
diff --git a/devel/oniguruma5/files/patch-ruby-dev-21973 b/devel/oniguruma5/files/patch-ruby-dev-21973
deleted file mode 100644
index a825c121c31c..000000000000
--- a/devel/oniguruma5/files/patch-ruby-dev-21973
+++ /dev/null
@@ -1,82 +0,0 @@
-Taken from: [ruby-dev:21973]
-
-Index: regparse.c
-===================================================================
---- regparse.c (.../ags/oniguruma/1.9.5)	(revision 245)
-+++ regparse.c (.../runk/oniguruma)	(revision 245)
-@@ -833,6 +833,10 @@
- 	e->back_refs = (int* )NULL;
-       }
-     }
-+    if (IS_NOT_NULL(t->e)) {
-+      xfree(t->e);
-+      t->e = NULL;
-+    }
-     t->num = 0;
-   }
-   return 0;
-@@ -3611,6 +3615,7 @@
-   enum CCVALTYPE val_type, in_type;
-   int val_israw, in_israw;
- 
-+  prev_cc = (CClassNode* )NULL;
-   *np = NULL_NODE;
-   r = fetch_token_in_cc(tok, src, end, env);
-   if (r == TK_BYTE && tok->u.c == '^') {
-@@ -3633,7 +3638,6 @@
-   *np = node = node_new_cclass();
-   CHECK_NULL_RETURN_VAL(node, REGERR_MEMORY);
-   cc = &(NCCLASS(node));
--  prev_cc = (CClassNode* )NULL;
- 
-   and_start = 0;
-   state = CCS_START;
-@@ -3810,6 +3814,7 @@
- 	if (IS_NOT_NULL(prev_cc)) {
- 	  r = and_cclass(prev_cc, cc);
- 	  if (r != 0) goto err;
-+	  bbuf_free(cc->mbuf);
- 	}
- 	else {
- 	  prev_cc = cc;
-@@ -3846,6 +3851,7 @@
-   if (IS_NOT_NULL(prev_cc)) {
-     r = and_cclass(prev_cc, cc);
-     if (r != 0) goto err;
-+    bbuf_free(cc->mbuf);
-     cc = prev_cc;
-   }
- 
-@@ -3864,6 +3870,8 @@
-   return 0;
- 
-  err:
-+  if (cc != &(NCCLASS(*np)))
-+    bbuf_free(cc->mbuf);
-   regex_node_free(*np);
-   return r;
- }
-@@ -4490,7 +4498,10 @@
- 
-   *top = NULL;
-   r = parse_branch(&node, tok, term, src, end, env);
--  if (r < 0) return r;
-+  if (r < 0) {
-+    regex_node_free(node);
-+    return r;
-+  }
- 
-   if (r == term) {
-     *top = node;
-Index: regcomp.c
-===================================================================
---- regcomp.c (.../ags/oniguruma/1.9.5)	(revision 245)
-+++ regcomp.c (.../runk/oniguruma)	(revision 245)
-@@ -3675,6 +3675,7 @@
-     }
-     else {
-       len = mblen(code, *p);
-+      if (i + len > OPT_EXACT_MAXLEN) break;
-       for (j = 0; j < len; j++)
- 	to->s[i++] = *p++;
-     }
diff --git a/devel/oniguruma5/pkg-plist b/devel/oniguruma5/pkg-plist
index 557c5d4c9a1f..5fbfff32f5b2 100644
--- a/devel/oniguruma5/pkg-plist
+++ b/devel/oniguruma5/pkg-plist
@@ -1,15 +1,13 @@
-include/onig/onigposix.h
-include/onig/oniguruma.h
-@dirrm include/onig
+include/onigposix.h
+include/oniguruma.h
 lib/libonig.a
-lib/libonig.so
-lib/libonig.so.0
 %%PORTDOCS%%%%DOCSDIR%%/API
 %%PORTDOCS%%%%DOCSDIR%%/HISTORY
 %%PORTDOCS%%%%DOCSDIR%%/RE
 %%PORTDOCS%%%%DOCSDIR%%/RE.ja
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%EXAMPLESDIR%%/encode.c
 %%PORTDOCS%%%%EXAMPLESDIR%%/listcap.c
 %%PORTDOCS%%%%EXAMPLESDIR%%/names.c
 %%PORTDOCS%%%%EXAMPLESDIR%%/posix.c