pcre port update

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

pcre port update

Jakob Schlyter-2
please test.

        jakob


Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/pcre/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- Makefile 27 May 2007 14:31:03 -0000 1.20
+++ Makefile 11 Jun 2007 09:17:16 -0000
@@ -2,11 +2,11 @@

  COMMENT= "perl-compatible regular expression library"

-DISTNAME= pcre-6.4
-PKGNAME= ${DISTNAME}p2
-SHARED_LIBS= pcre 1.0 \
- pcrecpp 2.0 \
- pcreposix 1.0
+DISTNAME= pcre-7.1
+
+SHARED_LIBS= pcre 1.1 \
+ pcrecpp 2.1 \
+ pcreposix 1.1

  CATEGORIES= devel

@@ -24,11 +24,11 @@
  PERMIT_DISTFILES_FTP= Yes
  WANTLIB= c

+NO_REGRESS= Yes
+USE_LIBTOOL= Yes
  CONFIGURE_STYLE= gnu
  CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
  --enable-utf8 \
  --enable-unicode-properties
-
-USE_LIBTOOL= Yes

  .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/pcre/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo 5 Apr 2007 15:38:04 -0000 1.5
+++ distinfo 11 Jun 2007 09:17:16 -0000
@@ -1,5 +1,5 @@
-MD5 (pcre-6.4.tar.gz) = BmCPhDjQNPVwzBwLYwke4g==
-RMD160 (pcre-6.4.tar.gz) = gdew/ofOrJJxHD+UuX4nqGgNVhk=
-SHA1 (pcre-6.4.tar.gz) = hYWX7ssIYRaZNuBhTImLhZJ/VJo=
-SHA256 (pcre-6.4.tar.gz) = i4/nv/2G2/kJiBBm3jVQUY+9jwIMAsDQF3Kku/+LcDw=
-SIZE (pcre-6.4.tar.gz) = 820083
+MD5 (pcre-7.1.tar.gz) = zZh7zkz0gLbcpwI1Rkgu8Q==
+RMD160 (pcre-7.1.tar.gz) = L4tfp/ECy0lh14YBJIcnuWR3DuM=
+SHA1 (pcre-7.1.tar.gz) = M/rPkmVouTOM9ECHXaw6pVmdUAc=
+SHA256 (pcre-7.1.tar.gz) = iCig1ZJONZ1aONjtaWEa9EKyf4W/GqFbVN50Bzz03CA=
+SIZE (pcre-7.1.tar.gz) = 1041275
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 19 Jun 2006 09:46:43 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
---- Makefile.in.orig Mon Sep 12 10:45:39 2005
-+++ Makefile.in Thu Dec 22 17:27:13 2005
-@@ -438,7 +438,6 @@ install:        all @ON_WINDOWS@ wininst
- @NOT_ON_WINDOWS@       $(LIBTOOL) --mode=install $(INSTALL)  
libpcreposix.la $(DESTDIR)$(LIBDIR)/libpcreposix.la
- @NOT_ON_WINDOWS@@HAVE_CPP@ echo "$(LIBTOOL) --mode=install $
(INSTALL) libpcrecpp.la $(DESTDIR)$(LIBDIR)/libpcrecpp.la"
- @NOT_ON_WINDOWS@@HAVE_CPP@ $(LIBTOOL) --mode=install $(INSTALL)  
libpcrecpp.la $(DESTDIR)$(LIBDIR)/libpcrecpp.la
--@NOT_ON_WINDOWS@       $(LIBTOOL) --finish $(DESTDIR)$(LIBDIR)
- $(mkinstalldirs) $(DESTDIR)$(INCDIR)
- $(INSTALL_DATA) pcre.h $(DESTDIR)$(INCDIR)/pcre.h
- $(INSTALL_DATA) $(top_srcdir)/pcreposix.h $(DESTDIR)$(INCDIR)/
pcreposix.h
-@@ -479,8 +478,8 @@ install:        all @ON_WINDOWS@ wininst
- $(INSTALL_DATA) $(top_srcdir)/doc/pcregrep.1 $(DESTDIR)$(MANDIR)/
man1/pcregrep.1
- $(INSTALL_DATA) $(top_srcdir)/doc/pcretest.1 $(DESTDIR)$(MANDIR)/
man1/pcretest.1
- $(mkinstalldirs) $(DESTDIR)$(BINDIR)
-- $(LIBTOOL) --mode=install $(INSTALL) pcregrep@EXEEXT@ $(DESTDIR)$
(BINDIR)/pcregrep@EXEEXT@
-- $(LIBTOOL) --mode=install $(INSTALL) pcretest@EXEEXT@ $(DESTDIR)$
(BINDIR)/pcretest@EXEEXT@
-+ $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP)  
pcregrep@EXEEXT@ $(DESTDIR)$(BINDIR)/pcregrep@EXEEXT@
-+ $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP)  
pcretest@EXEEXT@ $(DESTDIR)$(BINDIR)/pcretest@EXEEXT@
- $(INSTALL) pcre-config $(DESTDIR)$(BINDIR)/pcre-config
- $(mkinstalldirs) $(DESTDIR)$(LIBDIR)/pkgconfig
- $(INSTALL_DATA) libpcre.pc $(DESTDIR)$(LIBDIR)/pkgconfig/libpcre.pc
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/pcre/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- pkg/PLIST 7 Dec 2005 20:11:49 -0000 1.7
+++ pkg/PLIST 11 Jun 2007 09:17:16 -0000
@@ -6,6 +6,7 @@
  include/pcre_scanner.h
  include/pcre_stringpiece.h
  include/pcrecpp.h
+include/pcrecpparg.h
  include/pcreposix.h
  lib/libpcre.a
  lib/libpcre.la
@@ -15,10 +16,13 @@
  lib/libpcreposix.la
  lib/pkgconfig/
  lib/pkgconfig/libpcre.pc
+lib/pkgconfig/libpcrecpp.pc
+@man man/man1/pcre-config.1
  @man man/man1/pcregrep.1
  @man man/man1/pcretest.1
  @man man/man3/pcre.3
  @man man/man3/pcre_compile.3
+@man man/man3/pcre_compile2.3
  @man man/man3/pcre_config.3
  @man man/man3/pcre_copy_named_substring.3
  @man man/man3/pcre_copy_substring.3
@@ -29,6 +33,7 @@
  @man man/man3/pcre_fullinfo.3
  @man man/man3/pcre_get_named_substring.3
  @man man/man3/pcre_get_stringnumber.3
+@man man/man3/pcre_get_stringtable_entries.3
  @man man/man3/pcre_get_substring.3
  @man man/man3/pcre_get_substring_list.3
  @man man/man3/pcre_info.3
@@ -42,8 +47,61 @@
  @man man/man3/pcrecompat.3
  @man man/man3/pcrecpp.3
  @man man/man3/pcrematching.3
+@man man/man3/pcrepartial.3
  @man man/man3/pcrepattern.3
  @man man/man3/pcreperform.3
  @man man/man3/pcreposix.3
+@man man/man3/pcreprecompile.3
  @man man/man3/pcresample.3
  %%SHARED%%
+@man man/man3/pcrestack.3
+share/doc/pcre/
+share/doc/pcre/AUTHORS
+share/doc/pcre/COPYING
+share/doc/pcre/ChangeLog
+share/doc/pcre/LICENCE
+share/doc/pcre/NEWS
+share/doc/pcre/README
+share/doc/pcre/html/
+share/doc/pcre/html/index.html
+share/doc/pcre/html/pcre-config.html
+share/doc/pcre/html/pcre.html
+share/doc/pcre/html/pcre_compile.html
+share/doc/pcre/html/pcre_compile2.html
+share/doc/pcre/html/pcre_config.html
+share/doc/pcre/html/pcre_copy_named_substring.html
+share/doc/pcre/html/pcre_copy_substring.html
+share/doc/pcre/html/pcre_dfa_exec.html
+share/doc/pcre/html/pcre_exec.html
+share/doc/pcre/html/pcre_free_substring.html
+share/doc/pcre/html/pcre_free_substring_list.html
+share/doc/pcre/html/pcre_fullinfo.html
+share/doc/pcre/html/pcre_get_named_substring.html
+share/doc/pcre/html/pcre_get_stringnumber.html
+share/doc/pcre/html/pcre_get_stringtable_entries.html
+share/doc/pcre/html/pcre_get_substring.html
+share/doc/pcre/html/pcre_get_substring_list.html
+share/doc/pcre/html/pcre_info.html
+share/doc/pcre/html/pcre_maketables.html
+share/doc/pcre/html/pcre_refcount.html
+share/doc/pcre/html/pcre_study.html
+share/doc/pcre/html/pcre_version.html
+share/doc/pcre/html/pcreapi.html
+share/doc/pcre/html/pcrebuild.html
+share/doc/pcre/html/pcrecallout.html
+share/doc/pcre/html/pcrecompat.html
+share/doc/pcre/html/pcrecpp.html
+share/doc/pcre/html/pcregrep.html
+share/doc/pcre/html/pcrematching.html
+share/doc/pcre/html/pcrepartial.html
+share/doc/pcre/html/pcrepattern.html
+share/doc/pcre/html/pcreperform.html
+share/doc/pcre/html/pcreposix.html
+share/doc/pcre/html/pcreprecompile.html
+share/doc/pcre/html/pcresample.html
+share/doc/pcre/html/pcrestack.html
+share/doc/pcre/html/pcretest.html
+share/doc/pcre/pcre-config.txt
+share/doc/pcre/pcre.txt
+share/doc/pcre/pcregrep.txt
+share/doc/pcre/pcretest.txt


Reply | Threaded
Open this post in threaded view
|

Re: pcre port update

steven mestdagh
Jakob Schlyter [2007-06-11, 11:19:20]:
> please test.

the tests pass on amd64. you should not set NO_REGRESS.

>
> jakob
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/pcre/Makefile,v
> retrieving revision 1.20
> diff -u -r1.20 Makefile
> --- Makefile 27 May 2007 14:31:03 -0000 1.20
> +++ Makefile 11 Jun 2007 09:17:16 -0000
> @@ -2,11 +2,11 @@
>
>  COMMENT= "perl-compatible regular expression library"
>
> -DISTNAME= pcre-6.4
> -PKGNAME= ${DISTNAME}p2
> -SHARED_LIBS= pcre 1.0 \
> - pcrecpp 2.0 \
> - pcreposix 1.0
> +DISTNAME= pcre-7.1
> +
> +SHARED_LIBS= pcre 1.1 \
> + pcrecpp 2.1 \
> + pcreposix 1.1
>
>  CATEGORIES= devel
>
> @@ -24,11 +24,11 @@
>  PERMIT_DISTFILES_FTP= Yes
>  WANTLIB= c
>
> +NO_REGRESS= Yes
> +USE_LIBTOOL= Yes
>  CONFIGURE_STYLE= gnu
>  CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
>   --enable-utf8 \
>   --enable-unicode-properties
> -
> -USE_LIBTOOL= Yes
>
>  .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/pcre/distinfo,v
> retrieving revision 1.5
> diff -u -r1.5 distinfo
> --- distinfo 5 Apr 2007 15:38:04 -0000 1.5
> +++ distinfo 11 Jun 2007 09:17:16 -0000
> @@ -1,5 +1,5 @@
> -MD5 (pcre-6.4.tar.gz) = BmCPhDjQNPVwzBwLYwke4g==
> -RMD160 (pcre-6.4.tar.gz) = gdew/ofOrJJxHD+UuX4nqGgNVhk=
> -SHA1 (pcre-6.4.tar.gz) = hYWX7ssIYRaZNuBhTImLhZJ/VJo=
> -SHA256 (pcre-6.4.tar.gz) = i4/nv/2G2/kJiBBm3jVQUY+9jwIMAsDQF3Kku/+LcDw=
> -SIZE (pcre-6.4.tar.gz) = 820083
> +MD5 (pcre-7.1.tar.gz) = zZh7zkz0gLbcpwI1Rkgu8Q==
> +RMD160 (pcre-7.1.tar.gz) = L4tfp/ECy0lh14YBJIcnuWR3DuM=
> +SHA1 (pcre-7.1.tar.gz) = M/rPkmVouTOM9ECHXaw6pVmdUAc=
> +SHA256 (pcre-7.1.tar.gz) = iCig1ZJONZ1aONjtaWEa9EKyf4W/GqFbVN50Bzz03CA=
> +SIZE (pcre-7.1.tar.gz) = 1041275
> Index: patches/patch-Makefile_in
> ===================================================================
> RCS file: patches/patch-Makefile_in
> diff -N patches/patch-Makefile_in
> --- patches/patch-Makefile_in 19 Jun 2006 09:46:43 -0000 1.5
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,21 +0,0 @@
> ---- Makefile.in.orig Mon Sep 12 10:45:39 2005
> -+++ Makefile.in Thu Dec 22 17:27:13 2005
> -@@ -438,7 +438,6 @@ install:        all @ON_WINDOWS@ wininst
> - @NOT_ON_WINDOWS@       $(LIBTOOL) --mode=install $(INSTALL)  
> libpcreposix.la $(DESTDIR)$(LIBDIR)/libpcreposix.la
> - @NOT_ON_WINDOWS@@HAVE_CPP@ echo "$(LIBTOOL) --mode=install $
> (INSTALL) libpcrecpp.la $(DESTDIR)$(LIBDIR)/libpcrecpp.la"
> - @NOT_ON_WINDOWS@@HAVE_CPP@ $(LIBTOOL) --mode=install $(INSTALL)
> libpcrecpp.la $(DESTDIR)$(LIBDIR)/libpcrecpp.la
> --@NOT_ON_WINDOWS@       $(LIBTOOL) --finish $(DESTDIR)$(LIBDIR)
> - $(mkinstalldirs) $(DESTDIR)$(INCDIR)
> - $(INSTALL_DATA) pcre.h $(DESTDIR)$(INCDIR)/pcre.h
> - $(INSTALL_DATA) $(top_srcdir)/pcreposix.h
> $(DESTDIR)$(INCDIR)/ pcreposix.h
> -@@ -479,8 +478,8 @@ install:        all @ON_WINDOWS@ wininst
> - $(INSTALL_DATA) $(top_srcdir)/doc/pcregrep.1
> $(DESTDIR)$(MANDIR)/ man1/pcregrep.1
> - $(INSTALL_DATA) $(top_srcdir)/doc/pcretest.1
> $(DESTDIR)$(MANDIR)/ man1/pcretest.1
> - $(mkinstalldirs) $(DESTDIR)$(BINDIR)
> -- $(LIBTOOL) --mode=install $(INSTALL) pcregrep@EXEEXT@
> $(DESTDIR)$ (BINDIR)/pcregrep@EXEEXT@
> -- $(LIBTOOL) --mode=install $(INSTALL) pcretest@EXEEXT@
> $(DESTDIR)$ (BINDIR)/pcretest@EXEEXT@
> -+ $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP)  
> pcregrep@EXEEXT@ $(DESTDIR)$(BINDIR)/pcregrep@EXEEXT@
> -+ $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP)  
> pcretest@EXEEXT@ $(DESTDIR)$(BINDIR)/pcretest@EXEEXT@
> - $(INSTALL) pcre-config $(DESTDIR)$(BINDIR)/pcre-config
> - $(mkinstalldirs) $(DESTDIR)$(LIBDIR)/pkgconfig
> - $(INSTALL_DATA) libpcre.pc
> $(DESTDIR)$(LIBDIR)/pkgconfig/libpcre.pc
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/pcre/pkg/PLIST,v
> retrieving revision 1.7
> diff -u -r1.7 PLIST
> --- pkg/PLIST 7 Dec 2005 20:11:49 -0000 1.7
> +++ pkg/PLIST 11 Jun 2007 09:17:16 -0000
> @@ -6,6 +6,7 @@
>  include/pcre_scanner.h
>  include/pcre_stringpiece.h
>  include/pcrecpp.h
> +include/pcrecpparg.h
>  include/pcreposix.h
>  lib/libpcre.a
>  lib/libpcre.la
> @@ -15,10 +16,13 @@
>  lib/libpcreposix.la
>  lib/pkgconfig/
>  lib/pkgconfig/libpcre.pc
> +lib/pkgconfig/libpcrecpp.pc
> +@man man/man1/pcre-config.1
>  @man man/man1/pcregrep.1
>  @man man/man1/pcretest.1
>  @man man/man3/pcre.3
>  @man man/man3/pcre_compile.3
> +@man man/man3/pcre_compile2.3
>  @man man/man3/pcre_config.3
>  @man man/man3/pcre_copy_named_substring.3
>  @man man/man3/pcre_copy_substring.3
> @@ -29,6 +33,7 @@
>  @man man/man3/pcre_fullinfo.3
>  @man man/man3/pcre_get_named_substring.3
>  @man man/man3/pcre_get_stringnumber.3
> +@man man/man3/pcre_get_stringtable_entries.3
>  @man man/man3/pcre_get_substring.3
>  @man man/man3/pcre_get_substring_list.3
>  @man man/man3/pcre_info.3
> @@ -42,8 +47,61 @@
>  @man man/man3/pcrecompat.3
>  @man man/man3/pcrecpp.3
>  @man man/man3/pcrematching.3
> +@man man/man3/pcrepartial.3
>  @man man/man3/pcrepattern.3
>  @man man/man3/pcreperform.3
>  @man man/man3/pcreposix.3
> +@man man/man3/pcreprecompile.3
>  @man man/man3/pcresample.3
>  %%SHARED%%
> +@man man/man3/pcrestack.3
> +share/doc/pcre/
> +share/doc/pcre/AUTHORS
> +share/doc/pcre/COPYING
> +share/doc/pcre/ChangeLog
> +share/doc/pcre/LICENCE
> +share/doc/pcre/NEWS
> +share/doc/pcre/README
> +share/doc/pcre/html/
> +share/doc/pcre/html/index.html
> +share/doc/pcre/html/pcre-config.html
> +share/doc/pcre/html/pcre.html
> +share/doc/pcre/html/pcre_compile.html
> +share/doc/pcre/html/pcre_compile2.html
> +share/doc/pcre/html/pcre_config.html
> +share/doc/pcre/html/pcre_copy_named_substring.html
> +share/doc/pcre/html/pcre_copy_substring.html
> +share/doc/pcre/html/pcre_dfa_exec.html
> +share/doc/pcre/html/pcre_exec.html
> +share/doc/pcre/html/pcre_free_substring.html
> +share/doc/pcre/html/pcre_free_substring_list.html
> +share/doc/pcre/html/pcre_fullinfo.html
> +share/doc/pcre/html/pcre_get_named_substring.html
> +share/doc/pcre/html/pcre_get_stringnumber.html
> +share/doc/pcre/html/pcre_get_stringtable_entries.html
> +share/doc/pcre/html/pcre_get_substring.html
> +share/doc/pcre/html/pcre_get_substring_list.html
> +share/doc/pcre/html/pcre_info.html
> +share/doc/pcre/html/pcre_maketables.html
> +share/doc/pcre/html/pcre_refcount.html
> +share/doc/pcre/html/pcre_study.html
> +share/doc/pcre/html/pcre_version.html
> +share/doc/pcre/html/pcreapi.html
> +share/doc/pcre/html/pcrebuild.html
> +share/doc/pcre/html/pcrecallout.html
> +share/doc/pcre/html/pcrecompat.html
> +share/doc/pcre/html/pcrecpp.html
> +share/doc/pcre/html/pcregrep.html
> +share/doc/pcre/html/pcrematching.html
> +share/doc/pcre/html/pcrepartial.html
> +share/doc/pcre/html/pcrepattern.html
> +share/doc/pcre/html/pcreperform.html
> +share/doc/pcre/html/pcreposix.html
> +share/doc/pcre/html/pcreprecompile.html
> +share/doc/pcre/html/pcresample.html
> +share/doc/pcre/html/pcrestack.html
> +share/doc/pcre/html/pcretest.html
> +share/doc/pcre/pcre-config.txt
> +share/doc/pcre/pcre.txt
> +share/doc/pcre/pcregrep.txt
> +share/doc/pcre/pcretest.txt
>

Reply | Threaded
Open this post in threaded view
|

Re: pcre port update

Markus Lude-3
In reply to this post by Jakob Schlyter-2
On Mon, Jun 11, 2007 at 11:19:20AM +0200, Jakob Schlyter wrote:
> please test.
>
> jakob

I removed NO_REGRESS=Yes. make package and make regress works on
sparc64.


make regress shows:
<----
PCRE C library tests
PCRE version 7.1 2007-04-24

Test 1: main functionality (Perl compatible)
OK
Test 2: API and error handling (not Perl compatible)
OK
./RunTest[186]: locale: not found
Cannot test locale-specific features - 'fr_FR' locale not found,
or the "locale" command is not available to check for it.
 
Test 4: UTF-8 support (Perl compatible)
OK
Test 5: API and internals for UTF-8 support (not Perl compatible)
OK
Test 6: Unicode property support
OK
Test 7: DFA matching
OK
Test 8: DFA matching with UTF-8
OK
Test 9: DFA matching with Unicode properties
OK
PASS: RunTest
---->

but I think this is no real problem.

Regards,
Markus