cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove dependency on libutf8, base locale support is good enough.

Browse Source 
Enable one of the tests that was disabled in a patch (another test is
still disabled; this relates to non-utf8 locales and fails in the same
way with libutf8 or base).  ok kili@
This commit is contained in:
sthen 2011-04-17 10:07:56 +00:00
parent 75214373d1
commit 1aeb126efe
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
textproc/tre/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.6 2010/11/20 19:56:52 espie Exp $
# $OpenBSD: Makefile,v 1.7 2011/04/17 10:07:56 sthen Exp $
COMMENT= lightweight regexp matching library with additional features
DISTNAME= tre-0.7.6
REVISION= 0
REVISION= 1
EXTRACT_SUFX= .tar.bz2
CATEGORIES= textproc
@ -21,15 +21,13 @@ PERMIT_DISTFILES_FTP= Yes
SHARED_LIBS+= tre 6.4 # .6.4
WANTLIB= c utf8>=1
WANTLIB= c
MODULES= devel/gettext converters/libiconv
LIB_DEPENDS= misc/libutf8
USE_LIBTOOL= Yes
USE_GROFF = Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --enable-static --with-libutf8=${LOCALBASE}
CONFIGURE_ARGS+= --enable-static
.include <bsd.port.mk>

15
textproc/tre/patches/patch-tests_retest_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-tests_retest_c,v 1.2 2009/06/20 20:06:55 kili Exp $
$OpenBSD: patch-tests_retest_c,v 1.3 2011/04/17 10:07:56 sthen Exp $
--- tests/retest.c.orig Fri May 22 14:22:44 2009
+++ tests/retest.c Sat Jun 20 15:41:37 2009
--- tests/retest.c.orig Fri May 22 13:22:44 2009
+++ tests/retest.c Sun Apr 17 10:24:01 2011
@@ -1625,6 +1625,7 @@ main(int argc, char **argv)
@ -21,12 +21,3 @@ $OpenBSD: patch-tests_retest_c,v 1.2 2009/06/20 20:06:55 kili Exp $
if (setlocale(LC_CTYPE, "en_US.ISO-8859-1") != NULL)
{
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);
}
-#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");