diff --git a/textproc/tre/Makefile b/textproc/tre/Makefile index 67981e5e1b3..62b46101cc6 100644 --- a/textproc/tre/Makefile +++ b/textproc/tre/Makefile @@ -1,20 +1,18 @@ COMMENT= lightweight regexp matching library with additional features -DISTNAME= tre-0.8.0 -EXTRACT_SUFX= .tar.bz2 +V= 0.9.0 +DISTNAME= tre-$V CATEGORIES= textproc -REVISION= 5 -HOMEPAGE= http://laurikari.net/tre/ - -SITES= ${HOMEPAGE} +HOMEPAGE= https://github.com/laurikari/tre +SITES= ${HOMEPAGE}/releases/download/v$V/ MAINTAINER= Matthias Kilian # 2-clause BSD PERMIT_PACKAGE= Yes -SHARED_LIBS += tre 7.0 # 5.0 +SHARED_LIBS += tre 7.1 # 5.0 WANTLIB= c iconv intl pthread diff --git a/textproc/tre/distinfo b/textproc/tre/distinfo index b55ddda717e..0fe0dc21a41 100644 --- a/textproc/tre/distinfo +++ b/textproc/tre/distinfo @@ -1,2 +1,2 @@ -SHA256 (tre-0.8.0.tar.bz2) = jcZCws3gKy2saALNvizaIB2vecTry7PqEzkV7fFjZlg= -SIZE (tre-0.8.0.tar.bz2) = 380714 +SHA256 (tre-0.9.0.tar.gz) = 9X9WmMr9/lFtEfsLcXBZFv4RYvFLCM9p18+GkjtaJHc= +SIZE (tre-0.9.0.tar.gz) = 579986 diff --git a/textproc/tre/patches/patch-tests_agrep_exitstatus_ok b/textproc/tre/patches/patch-tests_agrep_exitstatus_ok deleted file mode 100644 index 57c5d8cb87d..00000000000 --- a/textproc/tre/patches/patch-tests_agrep_exitstatus_ok +++ /dev/null @@ -1,91 +0,0 @@ -# Those tests are supposed to bail out with exit code 2 (confirmed by -# upstream). - ---- tests/agrep/exitstatus.ok.orig Fri Dec 8 20:07:03 2006 -+++ tests/agrep/exitstatus.ok Thu Jan 4 15:12:26 2007 -@@ -524,65 +524,64 @@ Exit status 1. - Exit status 1. - #### TEST: agrep -d .* dummy exitstatus.in - --Exit status 1. -+Exit status 2. - #### TEST: agrep -d .* dummy < exitstatus.in - --Exit status 1. -+Exit status 2. - #### TEST: agrep -c -d .* dummy exitstatus.in --exitstatus.in:0 - --Exit status 1. -+Exit status 2. - #### TEST: agrep -c -d .* dummy < exitstatus.in - --Exit status 1. -+Exit status 2. - #### TEST: agrep -H -d .* dummy exitstatus.in - --Exit status 1. -+Exit status 2. - #### TEST: agrep -H -d .* dummy < exitstatus.in - --Exit status 1. -+Exit status 2. - #### TEST: agrep -l -d .* dummy exitstatus.in - --Exit status 1. -+Exit status 2. - #### TEST: agrep -l -d .* dummy < exitstatus.in - --Exit status 1. -+Exit status 2. - #### TEST: agrep -n -d .* dummy exitstatus.in - --Exit status 1. -+Exit status 2. - #### TEST: agrep -n -d .* dummy < exitstatus.in - --Exit status 1. -+Exit status 2. - #### TEST: agrep -s -d .* dummy exitstatus.in - --Exit status 1. -+Exit status 2. - #### TEST: agrep -s -d .* dummy < exitstatus.in - --Exit status 1. -+Exit status 2. - #### TEST: agrep -M -d .* dummy exitstatus.in - --Exit status 1. -+Exit status 2. - #### TEST: agrep -M -d .* dummy < exitstatus.in - --Exit status 1. -+Exit status 2. - #### TEST: agrep --show-position -d .* dummy exitstatus.in - --Exit status 1. -+Exit status 2. - #### TEST: agrep --show-position -d .* dummy < exitstatus.in - --Exit status 1. -+Exit status 2. - #### TEST: agrep --color -d .* dummy exitstatus.in - --Exit status 1. -+Exit status 2. - #### TEST: agrep --color -d .* dummy < exitstatus.in - --Exit status 1. -+Exit status 2. - #### TEST: agrep -H -n -s --color --show-position -d .* dummy exitstatus.in - --Exit status 1. -+Exit status 2. - #### TEST: agrep -H -n -s --color --show-position -d .* dummy < exitstatus.in - --Exit status 1. -+Exit status 2. - #### TEST: agrep -d {1 dummy exitstatus.in - - Exit status 2. diff --git a/textproc/tre/patches/patch-tests_retest_c b/textproc/tre/patches/patch-tests_retest_c deleted file mode 100644 index 5962a4d2ef1..00000000000 --- a/textproc/tre/patches/patch-tests_retest_c +++ /dev/null @@ -1,21 +0,0 @@ ---- 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) - - - -+#ifndef __OpenBSD__ - /* - * Internationalization tests. - */ -@@ -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, "en_US.ISO-8859-1") != NULL) - { - printf("\nTesting LC_CTYPE en_US.ISO-8859-1\n"); diff --git a/textproc/tre/pkg/PLIST b/textproc/tre/pkg/PLIST index f713b8c1ca1..0ecc77acebb 100644 --- a/textproc/tre/pkg/PLIST +++ b/textproc/tre/pkg/PLIST @@ -4,10 +4,11 @@ include/tre/ include/tre/regex.h include/tre/tre-config.h include/tre/tre.h -lib/libtre.a +@static-lib lib/libtre.a lib/libtre.la @lib lib/libtre.so.${LIBtre_VERSION} lib/pkgconfig/tre.pc @man man/man1/agrep.1 share/locale/fi/LC_MESSAGES/tre.mo share/locale/sv/LC_MESSAGES/tre.mo +share/locale/zh_CN/LC_MESSAGES/tre.mo