From 0cbb7e2402bb8766a0fbfc3520c254d9d72f4118 Mon Sep 17 00:00:00 2001
From: kili <kili@openbsd.org>
Date: Sat, 20 Jun 2009 20:06:55 +0000
Subject: [PATCH] Update to 0.7.6 and adjust license marker (2 clause BSD now).

No code changes except for some cleanups and small bugs, so no
change of the shared lib version is required.
---
 textproc/tre/Makefile                     |  6 ++---
 textproc/tre/distinfo                     | 10 +++----
 textproc/tre/patches/patch-tests_retest_c | 33 +++++++++++------------
 textproc/tre/pkg/PLIST                    |  4 +--
 4 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/textproc/tre/Makefile b/textproc/tre/Makefile
index 131c8190b56..b0bbfab9f36 100644
--- a/textproc/tre/Makefile
+++ b/textproc/tre/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.2 2007/09/15 20:59:42 merdely Exp $
+# $OpenBSD: Makefile,v 1.3 2009/06/20 20:06:55 kili Exp $
 
 COMMENT=	lightweight regexp matching library with additional features
 
-DISTNAME=		tre-0.7.5
+DISTNAME=		tre-0.7.6
 EXTRACT_SUFX=		.tar.bz2
 CATEGORIES=		textproc
 
@@ -12,7 +12,7 @@ MASTER_SITES=		${HOMEPAGE}
 
 MAINTAINER=		Matthias Kilian <kili@openbsd.org>
 
-# LGPL
+# 2-clause BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
diff --git a/textproc/tre/distinfo b/textproc/tre/distinfo
index 45f94f1af42..cdf9546c3b7 100644
--- a/textproc/tre/distinfo
+++ b/textproc/tre/distinfo
@@ -1,5 +1,5 @@
-MD5 (tre-0.7.5.tar.bz2) = 5y5clACIZc9yCZKgsl1uiQ==
-RMD160 (tre-0.7.5.tar.bz2) = JAwQbK71AJepv7rZT1zAAqm0tJc=
-SHA1 (tre-0.7.5.tar.bz2) = FrhgR5NB8xee+Yd2WqzanigD97s=
-SHA256 (tre-0.7.5.tar.bz2) = Aw8l5uTBcU3wExBUlLxeJLPgrMZYhxWKUqA+/Y4HWao=
-SIZE (tre-0.7.5.tar.bz2) = 396346
+MD5 (tre-0.7.6.tar.bz2) = raiE9lJAk6p9SWHwyX3+AQ==
+RMD160 (tre-0.7.6.tar.bz2) = 9TDFDuS22ZHzUyNg1346ZPsDZY8=
+SHA1 (tre-0.7.6.tar.bz2) = 2KWdLXKH+KffhnTZeEO9ikhwvng=
+SHA256 (tre-0.7.6.tar.bz2) = nKpoFPPEuBIxb6rI60AeA78BCPczViChqcre5DRFAOc=
+SIZE (tre-0.7.6.tar.bz2) = 378891
diff --git a/textproc/tre/patches/patch-tests_retest_c b/textproc/tre/patches/patch-tests_retest_c
index 2ad69eece8d..fb4f1089669 100644
--- a/textproc/tre/patches/patch-tests_retest_c
+++ b/textproc/tre/patches/patch-tests_retest_c
@@ -1,10 +1,8 @@
-$OpenBSD: patch-tests_retest_c,v 1.1.1.1 2007/01/29 20:14:29 kili Exp $
+$OpenBSD: patch-tests_retest_c,v 1.2 2009/06/20 20:06:55 kili Exp $
 
-# Skip one more i18n test that fails at least on alpha and sparc64.
-
---- tests/retest.c.orig	Sat Dec  9 21:42:56 2006
-+++ tests/retest.c	Fri Jan  5 20:57:34 2007
-@@ -1460,6 +1460,7 @@ main(int argc, char **argv)
+--- tests/retest.c.orig	Fri May 22 14:22:44 2009
++++ tests/retest.c	Sat Jun 20 15:41:37 2009
+@@ -1625,6 +1625,7 @@ main(int argc, char **argv)
  
  
  
@@ -12,22 +10,23 @@ $OpenBSD: patch-tests_retest_c,v 1.1.1.1 2007/01/29 20:14:29 kili Exp $
    /*
     * Internationalization tests.
     */
-@@ -1468,7 +1469,7 @@ main(int argc, char **argv)
+@@ -1632,8 +1633,9 @@ main(int argc, char **argv)
+   /* This same test with the correct locale is below. */
    test_comp("µ¡+", REG_EXTENDED, 0);
    test_exec("¤³¤Î¾Þ¤Ï¡¢µ¡¡¦ÍøÊØÀ­¡¦¥»¥­", 0, REG_OK, 10, 13, END);
++#endif
  
 -#if !defined(WIN32) && !defined(__OpenBSD__)
 +#ifndef WIN32
-   if (setlocale(LC_CTYPE, "fi_FI.ISO-8859-1") != NULL)
+   if (setlocale(LC_CTYPE, "en_US.ISO-8859-1") != NULL)
      {
-       printf("\nTesting LC_CTYPE fi_FI.ISO-8859-1\n");
-@@ -1492,7 +1493,8 @@ main(int argc, char **argv)
-       test_exec("abc", 0, REG_OK, 2, 3, END);
+       printf("\nTesting LC_CTYPE en_US.ISO-8859-1\n");
+@@ -1641,7 +1643,7 @@ main(int argc, char **argv)
+       test_exec("abCDefGhiJKlmNoPqRStuVwXyzÅÄÖ", 0, REG_OK, 0, 29, END);
      }
- #endif /* TRE_MULTIBYTE */
--#endif
-+#endif /* WIN32 */
-+#endif /* __OpenBSD__ */
- 
-   regfree(&reobj);
  
+-#ifdef TRE_MULTIBYTE
++#if defined(TRE_MULTIBYTE) && !defined(__OpenBSD__)
+   if (setlocale(LC_CTYPE, "ja_JP.eucjp") != NULL)
+     {
+       printf("\nTesting LC_CTYPE ja_JP.eucjp\n");
diff --git a/textproc/tre/pkg/PLIST b/textproc/tre/pkg/PLIST
index 02e07f3f09e..91fc00a91dc 100644
--- a/textproc/tre/pkg/PLIST
+++ b/textproc/tre/pkg/PLIST
@@ -1,7 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2007/01/29 20:14:29 kili Exp $
+@comment $OpenBSD: PLIST,v 1.2 2009/06/20 20:06:55 kili Exp $
 @conflict agrep-*
 @conflict glimpse-*
-bin/agrep
+@bin bin/agrep
 include/tre/
 include/tre/regex.h
 include/tre/tre-config.h