--- pcre3-7.8.orig/ltmain.sh
+++ pcre3-7.8/ltmain.sh
@@ -485,6 +485,34 @@
 	;;
       esac
       ;;
+    tag)
+      tagname="$arg"
+      preserve_args="${preserve_args}=$arg"
+
+      # Check whether tagname contains only valid characters
+      case $tagname in
+      *[!-_A-Za-z0-9,/]*)
+	$echo "$progname: invalid tag name: $tagname" 1>&2
+	exit 1
+	;;
+      esac
+
+      case $tagname in
+      CC)
+	# Don't test for the "default" C tag, as we know, it's there, but
+	# not specially marked.
+	;;
+      *)
+	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
+	  taglist="$taglist $tagname"
+	  # Evaluate the configuration.
+	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
+	else
+	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
+	fi
+	;;
+      esac
+      ;;
     *)
       eval "$prev=\$arg"
       ;;
@@ -859,6 +887,75 @@
     fi
     lobj=${xdir}$objdir/$objname
 
+    # Infer tagged configuration to use if any are available and
+    # if one wasn't chosen via the "--tag" command line option.
+    # Only attempt this if the compiler in the base compile
+    # command doesn't match the default compiler.
+    if test -n "$available_tags" && test -z "$tagname"; then
+      case $base_compile in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+	for z in $available_tags; do
+	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+	    # Evaluate the configuration.
+	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+	    case "$base_compile " in
+	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+	      # The compiler in the base compile command matches
+	      # the one in the tagged configuration.
+	      # Assume this is the tagged configuration we want.
+	      tagname=$z
+	      break
+	      ;;
+	    esac
+	  fi
+	done
+	# If $tagname still isn't set, then no tagged configuration
+	# was found and let the user know that the "--tag" command
+	# line option must be used.
+	if test -z "$tagname"; then
+	  $echo "$modename: unable to infer tagged configuration"
+	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+	  exit 1
+#        else
+#          $echo "$modename: using $tagname tagged configuration"
+	fi
+	;;
+      esac
+    fi
+
+    for arg in $later; do
+      case $arg in
+      -static)
+	build_old_libs=yes
+	continue
+	;;
+
+      -prefer-pic)
+	pic_mode=yes
+	continue
+	;;
+
+      -prefer-non-pic)
+	pic_mode=no
+	continue
+	;;
+      esac
+    done
+
+    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
+    if test "X$xdir" = "X$obj"; then
+      xdir=
+    else
+      xdir=$xdir/
+    fi
+    lobj=${xdir}$objdir/$objname
+
     if test -z "$base_compile"; then
       $echo "$modename: you must specify a compilation command" 1>&2
       $echo "$help" 1>&2
@@ -1802,6 +1899,11 @@
 	vinfo_number=yes
 	continue
 	;;
+      -version-number)
+	prev=vinfo
+	vinfo_number=yes
+	continue
+	;;
 
       -Wc,*)
 	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
@@ -1855,6 +1957,11 @@
 	continue
 	;;
 
+      -XCClinker)
+	prev=xcclinker
+	continue
+	;;
+
       # Some other compiler flag.
       -* | +*)
 	# Unknown arguments in both finalize_command and compile_command need
@@ -2750,6 +2857,14 @@
 		*-*-sunos*) add_shlibpath="$dir" ;;
 		esac
 		add_dir="-L$dir"
+		# Try looking first in the location we're being installed to.
+		if test -n "$inst_prefix_dir"; then
+		  case "$libdir" in
+		    [\\/]*)
+		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
+		      ;;
+		  esac
+		fi
 		add="-l$name"
 	      elif test "$hardcode_shlibpath_var" = no; then
 		add_shlibpath="$dir"
@@ -6287,6 +6402,7 @@
 	;;
       esac
     done
+    objdir="$origobjdir"
 
     for file in $staticlibs; do
       name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
--- pcre3-7.8.orig/configure
+++ pcre3-7.8/configure
@@ -4890,7 +4890,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd*)
+netbsd* | netbsdelf*-gnu)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
   else
@@ -8600,12 +8600,13 @@
   $echo "local: *; };" >> $output_objdir/$libname.ver~
 	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
+	link_all_deplibs=no
       else
 	ld_shlibs=no
       fi
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -9148,7 +9149,7 @@
       link_all_deplibs=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -9686,14 +9687,7 @@
     *) objformat=elf ;;
     esac
   fi
-  # Handle Gentoo/FreeBSD as it was Linux
-  case $host_vendor in
-    gentoo)
-      version_type=linux ;;
-    *)
-      version_type=freebsd-$objformat ;;
-  esac
-
+  version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -9704,12 +9698,6 @@
       library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
       need_version=yes
       ;;
-    linux)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-      soname_spec='${libname}${release}${shared_ext}$major'
-      need_lib_prefix=no
-      need_version=no
-      ;;
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
@@ -9872,6 +9860,18 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -12400,7 +12400,7 @@
 	;;
     esac
     ;;
-  netbsd*)
+  netbsd* | netbsdelf*-gnu)
     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
       archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
       wlarc=
@@ -13104,7 +13104,7 @@
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | netbsdelf*-gnu)
 	;;
       osf3* | osf4* | osf5*)
 	case $cc_basename in
@@ -13389,6 +13389,9 @@
   cygwin* | mingw*)
     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
   ;;
+  linux* | k*bsd*-gnu)
+    link_all_deplibs_CXX=no
+  ;;
   *)
     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
@@ -13662,14 +13665,7 @@
     *) objformat=elf ;;
     esac
   fi
-  # Handle Gentoo/FreeBSD as it was Linux
-  case $host_vendor in
-    gentoo)
-      version_type=linux ;;
-    *)
-      version_type=freebsd-$objformat ;;
-  esac
-
+  version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -13680,12 +13676,6 @@
       library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
       need_version=yes
       ;;
-    linux)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-      soname_spec='${libname}${release}${shared_ext}$major'
-      need_lib_prefix=no
-      need_version=no
-      ;;
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
@@ -13848,6 +13838,18 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -15282,12 +15284,13 @@
   $echo "local: *; };" >> $output_objdir/$libname.ver~
 	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
+	link_all_deplibs_F77=no
       else
 	ld_shlibs_F77=no
       fi
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -15810,7 +15813,7 @@
       link_all_deplibs_F77=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -16296,14 +16299,7 @@
     *) objformat=elf ;;
     esac
   fi
-  # Handle Gentoo/FreeBSD as it was Linux
-  case $host_vendor in
-    gentoo)
-      version_type=linux ;;
-    *)
-      version_type=freebsd-$objformat ;;
-  esac
-
+  version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -16314,12 +16310,6 @@
       library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
       need_version=yes
       ;;
-    linux)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-      soname_spec='${libname}${release}${shared_ext}$major'
-      need_lib_prefix=no
-      need_version=no
-      ;;
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
@@ -16482,6 +16472,18 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -17896,12 +17898,13 @@
   $echo "local: *; };" >> $output_objdir/$libname.ver~
 	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
+	link_all_deplibs_GCJ=no
       else
 	ld_shlibs_GCJ=no
       fi
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -18444,7 +18447,7 @@
       link_all_deplibs_GCJ=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -18930,14 +18933,7 @@
     *) objformat=elf ;;
     esac
   fi
-  # Handle Gentoo/FreeBSD as it was Linux
-  case $host_vendor in
-    gentoo)
-      version_type=linux ;;
-    *)
-      version_type=freebsd-$objformat ;;
-  esac
-
+  version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -18948,12 +18944,6 @@
       library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
       need_version=yes
       ;;
-    linux)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-      soname_spec='${libname}${release}${shared_ext}$major'
-      need_lib_prefix=no
-      need_version=no
-      ;;
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
@@ -19116,6 +19106,18 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -22835,10 +22837,10 @@
 # (Note: The libpcre*_version bits are m4 variables, assigned above)
 
 EXTRA_LIBPCRE_LDFLAGS="$EXTRA_LIBPCRE_LDFLAGS \
-                       $NO_UNDEFINED -version-info 0:1:0"
+                       $NO_UNDEFINED -version-info 15:1:12"
 
 EXTRA_LIBPCREPOSIX_LDFLAGS="$EXTRA_LIBPCREPOSIX_LDFLAGS \
-                            $NO_UNDEFINED -version-info 0:0:0"
+                            $NO_UNDEFINED -version-info 15:1:12"
 
 EXTRA_LIBPCRECPP_LDFLAGS="$EXTRA_LIBPCRECPP_LDFLAGS \
                           $NO_UNDEFINED -version-info 0:0:0 \
--- pcre3-7.8.orig/pcrecpp.cc
+++ pcre3-7.8/pcrecpp.cc
@@ -79,6 +79,12 @@
 // If the user doesn't ask for any options, we just use this one
 static RE_Options default_options;
 
+// PCRE6.x compatible API
+void RE::Init(const char *c_pat, const RE_Options* options) {
+  const string cxx_pat(c_pat);
+  Init(cxx_pat, options);
+}
+
 void RE::Init(const string& pat, const RE_Options* options) {
   pattern_ = pat;
   if (options == NULL) {
--- pcre3-7.8.orig/aclocal.m4
+++ pcre3-7.8/aclocal.m4
@@ -228,14 +228,6 @@
     [pic_mode=default])
 test -z "$pic_mode" && pic_mode=default
 
-# Check if we have a version mismatch between libtool.m4 and ltmain.sh.
-#
-# Note:  This should be in AC_LIBTOOL_SETUP, _after_ $ltmain have been defined.
-#        We also should do it _before_ AC_LIBTOOL_LANG_C_CONFIG that actually
-#        calls AC_LIBTOOL_CONFIG and creates libtool.
-#
-_LT_VERSION_CHECK
-
 # Use C for the default configuration in the libtool script
 tagname=
 AC_LIBTOOL_LANG_C_CONFIG
@@ -1593,14 +1585,7 @@
     *) objformat=elf ;;
     esac
   fi
-  # Handle Gentoo/FreeBSD as it was Linux
-  case $host_vendor in
-    gentoo)
-      version_type=linux ;;
-    *)
-      version_type=freebsd-$objformat ;;
-  esac
-
+  version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -1611,12 +1596,6 @@
       library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
       need_version=yes
       ;;
-    linux)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-      soname_spec='${libname}${release}${shared_ext}$major'
-      need_lib_prefix=no
-      need_version=no
-      ;;
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
@@ -1779,6 +1758,18 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -2560,7 +2551,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd*)
+netbsd* | netbsdelf*-gnu)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   else
@@ -3567,7 +3558,7 @@
 	;;
     esac
     ;;
-  netbsd*)
+  netbsd* | netbsdelf*-gnu)
     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
       wlarc=
@@ -5259,7 +5250,7 @@
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | netbsdelf*-gnu)
 	;;
       osf3* | osf4* | osf5*)
 	case $cc_basename in
@@ -5636,6 +5627,9 @@
   cygwin* | mingw*)
     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
   ;;
+  linux* | k*bsd*-gnu)
+    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+  ;;
   *)
     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
@@ -5844,12 +5838,13 @@
   $echo "local: *; };" >> $output_objdir/$libname.ver~
 	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
+	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
       else
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -6280,7 +6275,7 @@
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
--- pcre3-7.8.orig/pcreposix.h
+++ pcre3-7.8/pcreposix.h
@@ -130,14 +130,19 @@
 
 /* The functions */
 
-PCREPOSIX_EXP_DECL int regcomp(regex_t *, const char *, int);
-PCREPOSIX_EXP_DECL int regexec(const regex_t *, const char *, size_t,
+PCREPOSIX_EXP_DECL int pcreposix_regcomp(regex_t *, const char *, int);
+PCREPOSIX_EXP_DECL int pcreposix_regexec(const regex_t *, const char *, size_t,
                      regmatch_t *, int);
-PCREPOSIX_EXP_DECL size_t regerror(int, const regex_t *, char *, size_t);
-PCREPOSIX_EXP_DECL void regfree(regex_t *);
+PCREPOSIX_EXP_DECL size_t pcreposix_regerror(int, const regex_t *, char *, size_t);
+PCREPOSIX_EXP_DECL void pcreposix_regfree(regex_t *);
 
 #ifdef __cplusplus
 }   /* extern "C" */
 #endif
 
+#define regcomp pcreposix_regcomp
+#define regexec pcreposix_regexec
+#define regerror pcreposix_regerror
+#define regfree pcreposix_regfree
+
 #endif /* End of pcreposix.h */
--- pcre3-7.8.orig/Makefile.in
+++ pcre3-7.8/Makefile.in
@@ -403,7 +403,7 @@
 
 # The Libtool libraries to install.  We'll add to this later.
 lib_LTLIBRARIES = libpcre.la libpcreposix.la $(am__append_4)
-check_SCRIPTS =
+check_SCRIPTS = 
 dist_noinst_SCRIPTS = RunTest RunGrepTest
 
 # Additional files to delete on 'make clean' and 'make maintainer-clean'.
@@ -614,7 +614,7 @@
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in:  $(am__configure_deps)
+$(srcdir)/config.h.in:  $(am__configure_deps) 
 	cd $(top_srcdir) && $(AUTOHEADER)
 	rm -f stamp-h1
 	touch $@
@@ -660,11 +660,11 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libpcre.la: $(libpcre_la_OBJECTS) $(libpcre_la_DEPENDENCIES)
+libpcre.la: $(libpcre_la_OBJECTS) $(libpcre_la_DEPENDENCIES) 
 	$(libpcre_la_LINK) -rpath $(libdir) $(libpcre_la_OBJECTS) $(libpcre_la_LIBADD) $(LIBS)
-libpcrecpp.la: $(libpcrecpp_la_OBJECTS) $(libpcrecpp_la_DEPENDENCIES)
+libpcrecpp.la: $(libpcrecpp_la_OBJECTS) $(libpcrecpp_la_DEPENDENCIES) 
 	$(libpcrecpp_la_LINK) $(am_libpcrecpp_la_rpath) $(libpcrecpp_la_OBJECTS) $(libpcrecpp_la_LIBADD) $(LIBS)
-libpcreposix.la: $(libpcreposix_la_OBJECTS) $(libpcreposix_la_DEPENDENCIES)
+libpcreposix.la: $(libpcreposix_la_OBJECTS) $(libpcreposix_la_DEPENDENCIES) 
 	$(libpcreposix_la_LINK) -rpath $(libdir) $(libpcreposix_la_OBJECTS) $(libpcreposix_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
--- pcre3-7.8.orig/configure.ac
+++ pcre3-7.8/configure.ac
@@ -12,8 +12,8 @@
 m4_define(pcre_date, [2008-09-05])
 
 # Libtool shared library interface versions (current:revision:age)
-m4_define(libpcre_version, [0:1:0])
-m4_define(libpcreposix_version, [0:0:0])
+m4_define(libpcre_version, [15:1:12])
+m4_define(libpcreposix_version, [15:1:12])
 m4_define(libpcrecpp_version, [0:0:0])
 
 AC_PREREQ(2.57)
--- pcre3-7.8.orig/pcretest.c
+++ pcre3-7.8/pcretest.c
@@ -812,7 +812,7 @@
 int main(int argc, char **argv)
 {
 FILE *infile = stdin;
-int options = 0;
+long int options = 0;
 int study_options = 0;
 int op = 1;
 int timeit = 0;
--- pcre3-7.8.orig/config.sub
+++ pcre3-7.8/config.sub
@@ -416,6 +416,12 @@
 	amd64-*)
 		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
@@ -821,6 +827,10 @@
 	np1)
 		basic_machine=np1-gould
 		;;
+	nv1)
+		basic_machine=nv1-cray
+		os=-unicosmp
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -835,6 +845,10 @@
 		basic_machine=powerpc-ibm
 		os=-os400
 		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
 		os=-ose
@@ -968,6 +982,10 @@
 		basic_machine=mips-sei
 		os=-seiux
 		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -981,6 +999,9 @@
 	sh64)
 		basic_machine=sh64-unknown
 		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
 	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
@@ -1088,6 +1109,10 @@
 		basic_machine=s390x-ibm
 		os=-tpf
 		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
 	udi29k)
 		basic_machine=a29k-amd
 		os=-udi
@@ -1303,6 +1328,9 @@
 	-linux-dietlibc)
 		os=-linux-dietlibc
 		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
 	-linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
@@ -1318,6 +1346,9 @@
         -os400*)
 		os=-os400
 		;;
+        -os400*)
+		os=-os400
+		;;
 	-wince*)
 		os=-wince
 		;;
@@ -1342,6 +1373,9 @@
 	-syllable*)
 		os=-syllable
 		;;
+	-syllable*)
+		os=-syllable
+		;;
 	-386bsd)
 		os=-bsd
 		;;
@@ -1367,6 +1401,9 @@
         -tpf*)
 		os=-tpf
 		;;
+        -tpf*)
+		os=-tpf
+		;;
 	-triton*)
 		os=-sysv3
 		;;
@@ -1406,6 +1443,12 @@
 	-zvmoe)
 		os=-zvmoe
 		;;
+	-aros*)
+		os=-aros
+		;;
+	-kaos*)
+		os=-kaos
+		;;
 	-none)
 		;;
 	*)
@@ -1636,12 +1679,18 @@
 			-os400*)
 				vendor=ibm
 				;;
+			-os400*)
+				vendor=ibm
+				;;
 			-ptx*)
 				vendor=sequent
 				;;
 			-tpf*)
 				vendor=ibm
 				;;
+			-tpf*)
+				vendor=ibm
+				;;
 			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
--- pcre3-7.8.orig/pcrecpp.h
+++ pcre3-7.8/pcrecpp.h
@@ -652,6 +652,8 @@
  private:
 
   void Init(const string& pattern, const RE_Options* options);
+  // Old version from PCRE 6.x, for compatibility
+  void Init(const char *pattern, const RE_Options* options);
   void Cleanup();
 
   // Match against "text", filling in "vec" (up to "vecsize" * 2/3) with
--- pcre3-7.8.orig/debian/libpcre3-udeb.install
+++ pcre3-7.8/debian/libpcre3-udeb.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/libpcre.so.* lib
+debian/tmp/usr/lib/libpcreposix.so.*
--- pcre3-7.8.orig/debian/libpcre3.docs
+++ pcre3-7.8/debian/libpcre3.docs
@@ -0,0 +1,2 @@
+README AUTHORS NEWS
+
--- pcre3-7.8.orig/debian/copyright
+++ pcre3-7.8/debian/copyright
@@ -0,0 +1,74 @@
+This is Debian GNU/Linux's prepackaged version of the PCRE regular 
+expression library and associated pgrep utility.
+
+This package was put together by me, Mark Baker <mbaker@iee.org> from the
+original sources obtained from ftp.csx.cam.ac.uk:/pub/software/programming/pcre.
+
+PCRE LICENCE
+------------
+
+PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+Release 7 of PCRE is distributed under the terms of the "BSD" licence, as
+specified below. The documentation for PCRE, supplied in the "doc"
+directory, is distributed under the same terms as the software itself.
+
+The basic library functions are written in C and are freestanding. Also
+included in the distribution is a set of C++ wrapper functions.
+
+
+THE BASIC LIBRARY FUNCTIONS
+---------------------------
+
+Written by:       Philip Hazel
+Email local part: ph10
+Email domain:     cam.ac.uk
+
+University of Cambridge Computing Service,
+Cambridge, England.
+
+Copyright (c) 1997-2007 University of Cambridge
+All rights reserved.
+
+
+THE C++ WRAPPER FUNCTIONS
+-------------------------
+
+Contributed by:   Google Inc.
+
+Copyright (c) 2007, Google Inc.
+All rights reserved.
+
+
+THE "BSD" LICENCE
+-----------------
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the name of Google
+      Inc. nor the names of their contributors may be used to endorse or
+      promote products derived from this software without specific prior
+      written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+End
--- pcre3-7.8.orig/debian/README.Debian
+++ pcre3-7.8/debian/README.Debian
@@ -0,0 +1,11 @@
+libpcre for debian
+------------------
+
+Upstream's library version is much lower than Debian's - PCRE_LIB_VERSION=0:1:0
+instead of 13:0:10 (soname libpcre.so.0 instead of libpcre.so.3)
+
+The other change I made is to prefix the names of the functions in libpcreposix
+with "pcreposix_". This is required so they don't clash with the ones in
+libc. Suitable #defines have been added to pcreposix.h so that the
+unprefixed names can be used.
+
--- pcre3-7.8.orig/debian/changelog
+++ pcre3-7.8/debian/changelog
@@ -0,0 +1,489 @@
+pcre3 (7.8-2ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/libpcre3{,-udeb}.install, debian/libpcre3-dev.links,
+      debian/rules: move libpcre3 to /lib.  LP: #15051, Debian Bug: #350468.
+
+ -- Scott James Remnant <scott@ubuntu.com>  Wed, 05 Nov 2008 06:58:30 +0000
+
+pcre3 (7.8-2) unstable; urgency=low
+
+  * debian/rules: Bumped shlib version to 7.7 because of new feature in
+    that version (Closes: #500987)
+
+ -- Mark Baker <mark@mnb.org.uk>  Sun, 05 Oct 2008 17:06:46 +0100
+
+pcre3 (7.8-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Mark Baker <mark@mnb.org.uk>  Sun, 21 Sep 2008 21:23:00 +0100
+
+pcre3 (7.6-2.1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/libpcre3{,-udeb}.install, debian/libpcre3-dev.links,
+      debian/rules: move libpcre3 to /lib.
+
+ -- Kees Cook <kees@ubuntu.com>  Fri, 01 Aug 2008 15:31:12 -0700
+
+pcre3 (7.6-2.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Fix heap overflow in the pcre compiler triggered by
+    patterns which contain options and multiple branches
+    (CVE-2008-2371; Closes: #488919).
+  * debian/rules (patch by Bryan Donlan): Update shlibdeps invocation for
+    libpcrecpp0 due to new symbols (Closes: #476925).
+  * debian/copyright: replace license information with the current license
+    information shipped with upstream sources (Closes: #489318).
+
+ -- Nico Golde <nion@debian.org>  Mon, 14 Jul 2008 19:13:11 +0200
+
+pcre3 (7.6-2ubuntu1) intrepid; urgency=low
+
+  * Move libpcre3 to /lib (LP: #15051, Debian #350468)
+    - debian/libpcre3.install, debian/libpcre3-udeb.install:
+      Move libpcre3.so.* to /lib
+    - debian/rules: include /lib in dh_shlibdeps call
+    - debian/libpcre3-dev.links:
+      Create symlink in /usr/lib/libpcre.so to /lib/libpcre.so.3
+
+ -- Daniel Hahler <ubuntu@thequod.de>  Wed, 18 Jun 2008 10:22:41 +0000
+
+pcre3 (7.6-2) unstable; urgency=low
+
+  * pcrecpp.cc: Applied patch from PCRE bugzilla (bug 664) to fix ABI
+    breakage (Closes: #463170, #463266, #463413, #464974)
+  
+ -- Mark Baker <mark@mnb.org.uk>  Wed, 13 Feb 2008 22:19:35 +0000
+
+pcre3 (7.6-1) unstable; urgency=low
+
+  * New upstream release
+  * Ship pcredemo.c in examples directory (Closes: #377587)
+
+ -- Mark Baker <mark@mnb.org.uk>  Mon, 28 Jan 2008 23:01:05 +0000
+
+pcre3 (7.4-1) unstable; urgency=low
+
+  * Build a -dbg package with debug symbols
+  
+  Thanks to Sebastian Dröge <slomo@debian.org>,for all of the following:
+
+  * New upstream release (Closes: #453372).
+  * debian/control,
+    debian/rules:
+    + Provide udeb (Closes: #443114). Build depend on debhelper (>= 5.0.22)
+      for this.
+  * debian/rules:
+    + Bump shlibs to >= 7.4 (Closes: #449289).
+  * debian/compat:
+    + Update debhelper compat level to 5.
+  * debian/control:
+    + Update Standards-Version to 3.7.3, no additional changes needed.
+    + Use ${binary:Version} instead of ${Source-Version} to make package
+      binNMU safe.
+  * debian/*.files,
+    debian/*.install,
+    debian/rules:
+    + Convert from dh_movefiles to dh_install.
+  * debian/*.dirs:
+    + Removed, not necessary.
+
+ -- Mark Baker <mark@mnb.org.uk>  Mon,  7 Jan 2008 21:03:34 +0000
+
+pcre3 (7.3-2) unstable; urgency=low
+
+  * Overloaded RE::Init(), for compatibility with PCRE 6.x API (Closes
+    #436210). Thanks to Matthias Klose for the patch.
+  * Increased shlibdeps from 4.5 to 6.0. 6.0 introduced a new function
+    (pcre_compile2) to the API, so anything using that requires at least
+    6.0. (Closes #441345)
+
+ -- Mark Baker <mark@mnb.org.uk>  Mon,  7 Jan 2008 21:02:52 +0000
+
+pcre3 (7.3-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Mark Baker <mark@mnb.org.uk>  Tue, 28 Aug 2007 20:53:39 +0100
+
+pcre3 (7.2-1) unstable; urgency=low
+
+  * New upstream release (Closes: #420280)
+  * debian/rules: dummy binary-indep target (Closes: #395730)
+
+ -- Mark Baker <mark@mnb.org.uk>  Fri,  3 Aug 2007 23:06:28 +0100
+
+pcre3 (6.7-1) unstable; urgency=low
+
+  * New upstream release (Closes: #389305)
+
+ -- Mark Baker <mark@mnb.org.uk>  Mon, 25 Sep 2006 23:24:55 +0100
+
+pcre3 (6.4-2) unstable; urgency=low
+
+  * Makefile.in: Install pcrepartial.3 (Closes: #362011)
+  * doc/pcreapi.3, doc/pcre_version.3: document pcre_version() as
+    returning a const char * not a char * (Closes: #278619)
+  * debian/libpcre3-dev.files: install libpcre.pc (Closes: #359662)
+  * doc/pcregrep.1: fixed typo (Closes: #310338)
+  * debian/control: drop dummy pgrep package (Closes: #247550)
+
+ -- Mark Baker <mark@mnb.org.uk>  Thu, 27 Apr 2006 22:32:06 +0100
+
+pcre3 (6.4-1.1) unstable; urgency=low
+
+  * Split out the C++ library into it's own package libpcrecpp0, as
+    discussed in #339250. The C++ library was recently added, no
+    package references the C++ library yet.
+    Closes: #339250.
+  * debian/rules: Remove testsavedregex in clean target.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 25 Nov 2005 07:59:14 +0100
+
+pcre3 (6.4-1) unstable; urgency=low
+
+  * New upstream release (Closes: 333191)
+
+ -- Mark Baker <mark@mnb.org.uk>  Mon, 10 Oct 2005 23:14:53 +0100
+
+pcre3 (6.3-1) unstable; urgency=low
+
+  * New upstream release (Closes: 323761).
+  * This includes fix to security issue CAN-2005-2491 (Closes: 324531)
+
+ -- Mark Baker <mark@mnb.org.uk>  Sat, 27 Aug 2005 18:12:22 +0100
+
+pcre3 (5.0-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Correct an alignment error in the pcretest.c test case, which was
+    causing build failures on ia64 (closes: #309606).
+
+ -- Steve Langasek <vorlon@debian.org>  Thu, 26 May 2005 05:15:34 +0000
+
+pcre3 (5.0-1) unstable; urgency=low
+
+  * New upstream release (Closes: #295287)
+    - compatible, so same soname and package name can be used.
+  * Compile with --enable-unicode-properties, a new feature of PCRE 5.0
+  * Removed . from description in control file
+  * Included patch from Niibe Yutaka for cross building (Closes: #285407)
+  
+  Thanks Andreas for the NMU, which this is based on (Closes: #237644, #237265)
+
+ -- Mark Baker <mark@mnb.org.uk>  Wed, 16 Feb 2005 21:47:14 +0000
+
+pcre3 (4.5-1.1) unstable; urgency=low
+
+  * NMU to fix rc-bugs.
+  * Update libtool related files to fix build-error on mips, keep original
+    config.in, as it is no generated file. (Closes: #237265)
+  * pcregrep replaces pgrep. (Closes: #237564)
+  * Bump shlibs, pcre 4.5 includes two new functions.
+  * Let pgrep's /usr/share/doc symlink point to the package it depends on,
+    pcregrep.
+
+ -- Andreas Metzler <ametzler@debian.org>  Fri, 12 Mar 2004 13:23:02 +0100
+
+pcre3 (4.5-1) unstable; urgency=low
+
+  * New upstream release
+
+  Thanks to Andreas Metzler for patches for all the following:
+  
+  * doc/pcregrep.1: added newline between synopsis for pcregrep and that
+    for zpcregrp (Closes: #197899)
+  * debian/control: Change package descriptions (Closes: #209904)
+  * debian/rules and others: Renamed pgrep package to pcregrep, to match
+    name of binary and avoid confusion with pgrep (which greps for
+    processes, and is in the procps package; a dummy pgrep package will
+    ease upgrades (Closes: #217076)
+
+ -- Mark Baker <mark@mnb.org.uk>  Wed, 25 Feb 2004 20:49:33 +0000
+
+pcre3 (4.3-4) unstable; urgency=low
+
+  * debian/libpcre3.files: include pcrepattern(3) manpage in libpcre3
+    package instead of libpcre3-dev package. This means that anyone using
+    a PCRE based application will have the man page available.
+
+ -- Mark Baker <mark@mnb.org.uk>  Thu,  8 Jan 2004 21:19:51 +0000
+
+pcre3 (4.3-3) unstable; urgency=low
+
+  * ltmain.sh: Replaced with standard version from debian libtool package,
+    but with Phil Hazel's patch applied (although I suspect his patch
+    isn't necessary on debian systems). (Closes: #198147, #198668) I hope.
+
+ -- Mark Baker <mark@mnb.org.uk>  Wed, 25 Jun 2003 21:09:22 +0100
+
+pcre3 (4.3-2) unstable; urgency=low
+
+  * pcretest.c: Cheat at test! Always print 40 instead of the size,
+    because the size varies on different architectures, and we don't
+    really want to fail the test because of this.
+
+ -- Mark Baker <mark@mnb.org.uk>  Thu, 19 Jun 2003 21:00:39 +0100
+
+pcre3 (4.3-1) unstable; urgency=low
+
+  This release is entirely the work of Andreas Metzler <ametzler@debian.org>.
+  Thanks Andreas.  
+
+  * new upstream version (Closes: 182570)
+  * this version apparently fixes infinite loop bug (Closes: 161184)
+  * repacked using debhelper and upstream's Makefile. Switch to libtool's
+    versioning scheme, see debian/README.Versioning.libtool for details.
+    (Closes: #187371)
+  * (however, don't ship .la files, they only give libtool strange ideas, see
+    http://lists.debian.org/debian-devel/2003/debian-devel-200304/msg00827.html
+    for an example.)
+  * changed compile-options to really follow policy 3.5.7
+  * debian/control: changed description to say "Perl 5" as Perl 6, when it
+    eventually appears, will have yet another different regex syntax
+    (Closes: #166939) 
+
+ -- Mark Baker <mark@mnb.org.uk>  Mon, 16 Jun 2003 22:11:08 +0100
+
+pcre3 (3.9-1) unstable; urgency=low
+
+  * New upstream version (Closes: #119429, #161424)
+  * Added zpcregrep script by Samuel Tardieu (Closes: #36897)
+  * doc/pcregrep.1: mention zpcregrep
+  * debian/rules: use && in test rule rather than -a option to test, for
+    better POSIX compatibility (Closes: #158775)
+  * debian/Makefile: build pcretest once with -rpath for doing tests, and
+    once without, so that:
+  * debian/rules: install pcretest program (Closes: #162998)
+  * Don't create or remove /usr/doc/foo symlinks. This means that none of
+    the packages have prerms and only libpcre3 has a postinst
+  * debian/copyright: corrected to "Debian GNU/Linux"
+  * debian/control: standards version updated to 3.5.7.0
+  * debian/rules: strip comment and note sections from libraries
+  * The result of the last four changes is that it should now be
+    lintian-clean apart from one caused by a known bug in lintian (see
+    lintian bug #117260) (Closes: #162999)
+
+ -- Mark Baker <mark@mnb.org.uk>  Sat, 26 Oct 2002 18:12:13 +0100
+
+pcre3 (3.4-1.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Rebuild with a version of libc6 without a broken atexit() symbol
+    (closes: #108597, critical).
+  * Add to LD_LIBRARY_PATH rather than clobbering it, to avoid fakeroot
+    dying (closes: #108661, #108891).
+
+ -- Colin Watson <cjwatson@debian.org>  Sun, 19 Aug 2001 20:43:28 +0100
+
+pcre3 (3.4-1) unstable; urgency=low
+
+  * new upstream version (Closes: #93876)
+
+ -- Mark Baker <mark@mnb.org.uk>  Sat, 28 Apr 2001 00:05:22 +0100
+
+pcre3 (3.3-5) unstable; urgency=low
+
+  * debian/rules: install pcregrep as that name (only) rather than as
+    pgrep with a symlink called pcregrep. This avoids a name clash with
+    the process table grepper also called pgrep.
+  * doc/pcregrep.1: change name of program being documented (back) to
+    pcregrep.
+
+ -- Mark Baker <mark@mnb.org.uk>  Tue, 23 Jan 2001 23:54:08 +0000
+
+pcre3 (3.3-4) unstable; urgency=low
+
+  * debian/rules: only install config files that are meant to be installed
+    in libpcre3-dev package (Closes: #78354)
+  * debian/Makefile: distclean target clears up configure output
+
+ -- Mark Baker <mark@mnb.org.uk>  Wed, 29 Nov 2000 23:59:19 +0000
+
+pcre3 (3.3-3) unstable; urgency=low
+
+  * debian/rules: make debian/Makefile executable before trying to run it
+    (Closes: #74316)
+
+ -- Mark Baker <mbaker@iee.org>  Sun,  8 Oct 2000 21:18:15 +0100
+
+pcre3 (3.3-2) unstable; urgency=low
+
+  * debian/rules: pgrep should symlink to docs in /usr/doc/libpcre3, not
+    /usr/doc/libpcre2
+  * debian/rules: manpage pgrep.1.gz should not be installed as executable!
+  * debian/rules: pcregrep.1.gz is symlink to pgrep.1.gz
+  * doc/pcre-config.1: basic manpage for pcre-config written
+  * debian/rules: install pcre-config.1
+  * debian/rules: use -isp option to dpkg-gencontrol
+
+ -- Mark Baker <mbaker@iee.org>  Tue, 22 Aug 2000 00:11:54 +0100
+
+pcre3 (3.3-1) unstable; urgency=low
+
+  * new package for pcre 3.x
+
+ -- Mark Baker <mbaker@iee.org>  Sat, 19 Aug 2000 13:44:00 +0000
+
+What follows is the changelog from pcre 3, up to the point where the pcre3
+package was made.
+pcre2 (2.08-1) unstable; urgency=low
+
+  * new upstream version (#50386)
+  * put -lc after -lpcre when linking libpcreposix (#50046)
+
+ -- Mark Baker <mbaker@iee.org>  Thu, 18 Nov 1999 21:45:14 +0000
+
+pcre2 (2.07-2) unstable; urgency=low
+
+  * debian/rules: use /usr/share/doc and /usr/share/man, as mandated by
+    policy 3.1.0
+  * debian/postinst: create /usr/doc symlink; don't install library
+  * debian/postinst-lib (new file): create /usr/doc symlink and install library
+  * debian/prerm: remove /usr/doc symlink
+  * debian/rules: install postinst and prerm for all packages; but
+    postinst-lib for library package
+
+ -- Mark Baker <mbaker@iee.org>  Sat, 13 Nov 1999 18:57:59 +0000
+
+pcre2 (2.07-1) unstable; urgency=low
+
+  * new upstream version
+  * pcre.c, pcre.h: new upstream version is incompatible with old one! I've 
+    done a nasty hack so that old binaries will still work. Old source won't, 
+    but at least it won't fail silently so this shouldn't be a major problem.
+  * debian/rules: /usr/doc/pgrep should be a link to libpcre2, not libpcre1
+    (#42450)
+
+ -- Mark Baker <mbaker@iee.org>  Tue,  3 Aug 1999 23:58:35 +0100
+
+pcre2 (2.05-1) unstable; urgency=low
+
+  * new upstream version (#36776)
+
+ -- Mark Baker <mbaker@iee.org>  Tue, 27 Apr 1999 23:00:25 +0100
+
+pcre2 (2.02-3) unstable; urgency=low
+
+  * pcre.3: removed description of regular expression syntax and semantics
+  * pcre.7: new file, containing material removed from above
+    (this is so it can be put in the libpcre2 package (#34087)
+
+ -- Mark Baker <mbaker@iee.org>  Fri,  5 Mar 1999 01:08:47 +0000
+
+pcre2 (2.02-2) unstable; urgency=low
+
+  * debian/rules: install copyright in correct location in libpcre2-dev; 
+    a typo before meant the package wouldn't install
+  * debian/shlibs: update to refer to libpcre2 instead of libpcre1
+
+ -- Mark Baker <mbaker@iee.org>  Fri, 29 Jan 1999 00:12:00 +0000
+
+pcre2 (2.02-1) unstable; urgency=low
+
+  * first release of pcre2
+  * install source of pgrep (it's small) in /usr/doc/libpcre2-dev/examples
+
+ -- Mark Baker <mbaker@iee.org>  Thu, 28 Jan 1999 00:45:00 +0000
+
+What follows is the changelog from pcre 1, up to the point where the pcre2
+package was made.
+The changes are not that large but the API, and therefore the ABI, are
+changed so version 2 is not compatible.
+pcre (1.09-2) unstable; urgency=low
+
+  * pcreposix.c,pcreposix.h: prefixed function names with pcreposix_
+  * pcreposix.h: #defines so un-prefixed names can be used
+  * These mean pcre routines will be used instead of the regex library
+    built into libc (#22525)
+  * debian/shlibs: pcreposix needs libpcre1 >=1.09-2 now
+  * debian/rules: it's not pcre 1.01 any more.
+
+ -- Mark Baker <mbaker@iee.org>  Sat, 30 May 1998 16:54:31 +0100
+
+pcre (1.09-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Mark Baker <mbaker@iee.org>  Sat, 28 Feb 1998 21:29:07 +0000
+
+pcre (1.08-1) unstable; urgency=low
+
+  * New upstream version (new features, so in unstable only)
+
+ -- Mark Baker <mbaker@iee.org>  Sat, 28 Feb 1998 21:29:07 +0000
+
+pcre (1.06-3) unstable; urgency=low
+
+  * Strip pgrep
+
+ -- Mark Baker <mbaker@iee.org>  Sat, 28 Feb 1998 21:29:07 +0000
+
+pcre (1.06-2) unstable; urgency=low
+
+  * Extended description for pgrep
+  * Compress manpage
+  * Updated standards-version to 2.4.0.0
+
+ -- Mark Baker <mbaker@iee.org>  Mon,  9 Feb 1998 23:56:15 +0000
+
+pcre (1.06-1) unstable; urgency=low
+
+  * New upstream version (bug fixes)
+
+ -- Mark Baker <mbaker@iee.org>  Sun, 25 Jan 1998 22:37:37 +0000
+
+pcre (1.05-2) unstable; urgency=low
+
+  * Remove debian/*~ in clean target
+  * Only run ldconfig on "configure"
+
+ -- Mark Baker <mbaker@iee.org>  Wed,  7 Jan 1998 21:14:51 +0000
+
+pcre (1.05-1) unstable; urgency=low
+
+  * New upstream version (bug fixes)
+
+ -- Mark Baker <mbaker@iee.org>  Sat, 27 Dec 1997 11:26:32 +0000
+
+pcre (1.02-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Mark Baker <mbaker@iee.org>  Sat, 13 Dec 1997 22:01:48 +0000
+
+pcre (1.01-4) unstable; urgency=low
+
+  * Use -fPIC instead of -fpic (identical on i386, but different on other
+    architectures like m68k)
+  * Nasty trick so pgrep gets the right dependencies whether or not
+    libpcre1 is installed
+  
+ -- Mark Baker <mbaker@iee.org>  Tue,  2 Dec 1997 17:57:07 +0000
+
+pcre (1.01-3) unstable; urgency=low
+
+  * Apply patch to manpage from Karl Hegbloom
+  * Rewritten makefile (copy sent upstream)
+
+ -- Mark Baker <mbaker@iee.org>  Tue, 25 Nov 1997 12:12:05 +0000
+
+pcre (1.01-2) unstable; urgency=low
+
+  * Correct typo (libprce) in debian/rules
+  * Use gcc instead of ld in makefile
+  * Build static libraries
+  * Use shlibdeps instead of hard-coding libc6
+  * Use --strip-unneeded when stripping
+
+ -- Mark Baker <mbaker@iee.org>  Fri, 21 Nov 1997 23:52:06 +0000
+
+pcre (1.01-1) unstable; urgency=low
+
+  * Initial debian release
+
+ -- Mark Baker <mbaker@iee.org>  Fri, 21 Nov 1997 20:36:13 +0000
+
--- pcre3-7.8.orig/debian/pcregrep.install
+++ pcre3-7.8/debian/pcregrep.install
@@ -0,0 +1,4 @@
+debian/tmp/usr/bin/pcregrep
+debian/tmp/usr/share/man/man1/pcregrep.1
+debian/zpcregrep /usr/bin/
+
--- pcre3-7.8.orig/debian/libpcre3-dev.manpages
+++ pcre3-7.8/debian/libpcre3-dev.manpages
@@ -0,0 +1,2 @@
+debian/pcre-config.1
+
--- pcre3-7.8.orig/debian/dirs
+++ pcre3-7.8/debian/dirs
@@ -0,0 +1,2 @@
+usr/bin
+usr/sbin
--- pcre3-7.8.orig/debian/libpcre3.install
+++ pcre3-7.8/debian/libpcre3.install
@@ -0,0 +1,5 @@
+debian/tmp/usr/lib/libpcre.so.* lib
+debian/tmp/usr/lib/libpcreposix.so.*
+debian/tmp/usr/bin/pcretest
+debian/tmp/usr/share/man/man1/pcretest.1
+debian/tmp/usr/share/man/man3/pcrepattern.3
--- pcre3-7.8.orig/debian/compat
+++ pcre3-7.8/debian/compat
@@ -0,0 +1 @@
+5
--- pcre3-7.8.orig/debian/libpcre3-dev.examples
+++ pcre3-7.8/debian/libpcre3-dev.examples
@@ -0,0 +1 @@
+pcredemo.c
--- pcre3-7.8.orig/debian/pcregrep.files
+++ pcre3-7.8/debian/pcregrep.files
@@ -0,0 +1,3 @@
+usr/bin/pcregrep
+usr/share/man/man1/pcregrep.1
+
--- pcre3-7.8.orig/debian/control
+++ pcre3-7.8/debian/control
@@ -0,0 +1,80 @@
+Source: pcre3
+Section: libs
+Priority: optional
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer:  Mark Baker <mark@mnb.org.uk>
+Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 5.0.22)
+
+Package: libpcre3
+Section: libs
+Architecture: any
+Priority: important
+Depends: ${shlibs:Depends}
+Conflicts: libpcre3-dev (<= 4.3-3)
+Description: Perl 5 Compatible Regular Expression Library - runtime files
+ This is a library of functions to support regular expressions whose syntax 
+ and semantics are as close as possible to those of the Perl 5 language.
+ .
+ This package contains the runtime libraries.
+
+Package: libpcre3-udeb
+Section: debian-installer
+XC-Package-Type: udeb
+Architecture: any
+Priority: important
+Depends: ${shlibs:Depends}
+Conflicts: libpcre3-dev (<= 4.3-3)
+Description: Perl 5 Compatible Regular Expression Library - runtime files (udeb)
+ This is a library of functions to support regular expressions whose syntax 
+ and semantics are as close as possible to those of the Perl 5 language.
+ .
+ This package contains the runtime libraries for the Debian Installer (udeb).
+
+Package: libpcrecpp0
+Section: libs
+Architecture: any
+Priority: optional
+Depends: ${shlibs:Depends}
+Conflicts: libpcre3 (<< 6.4-1.1)
+Replaces: libpcre3 (<< 6.4-1.1)
+Description: Perl 5 Compatible Regular Expression Library - C++ runtime files
+ This is a C++ library of functions to support regular expressions whose syntax 
+ and semantics are as close as possible to those of the Perl 5 language.
+ .
+ This package contains the C++ runtime library.
+
+Package: libpcre3-dev
+Section: libdevel
+Architecture: any
+Depends: libc6-dev, libpcre3 (= ${binary:Version}), libpcrecpp0 (= ${binary:Version})
+Conflicts: libpcre1-dev, libpcre2-dev
+Description: Perl 5 Compatible Regular Expression Library - development files
+ This is a library of functions to support regular expressions whose syntax 
+ and semantics are as close as possible to those of the Perl 5 language.
+ .
+ This package contains the development files, including headers, static 
+ libraries, and documentation.
+
+Package: libpcre3-dbg
+Section: libdevel
+Architecture: any
+Depends: libpcre3 (= ${binary:Version}), libpcrecpp0 (= ${binary:Version})
+Description: Perl 5 Compatible Regular Expression Library - debug symbols
+ This is a library of functions to support regular expressions whose syntax 
+ and semantics are as close as possible to those of the Perl 5 language.
+ .
+ This package contains the debug symbols,
+
+Package: pcregrep
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: pgrep (<<4.5)
+Description: grep utility that uses perl 5 compatible regexes.
+ Perl-style regexps have many useful features that the standard POSIX ones
+ don't; this is basically the same as grep but with the different
+ regexp syntax.
+ .
+ The other reason for the existence of pcregrep is that its source code is an
+ example of programming with libpcre.
--- pcre3-7.8.orig/debian/libpcre3-dev.links
+++ pcre3-7.8/debian/libpcre3-dev.links
@@ -0,0 +1 @@
+lib/libpcre.so.3 usr/lib/libpcre.so
--- pcre3-7.8.orig/debian/libpcrecpp0.docs
+++ pcre3-7.8/debian/libpcrecpp0.docs
@@ -0,0 +1,2 @@
+README AUTHORS NEWS
+
--- pcre3-7.8.orig/debian/libpcre3-dev.install
+++ pcre3-7.8/debian/libpcre3-dev.install
@@ -0,0 +1,6 @@
+debian/tmp/usr/include/*
+debian/tmp/usr/lib/lib*.a
+debian/tmp/usr/lib/lib*.so
+debian/tmp/usr/lib/pkgconfig/*
+debian/tmp/usr/bin/*-config
+debian/tmp/usr/share/man/man3/*
--- pcre3-7.8.orig/debian/pcre-config.1
+++ pcre3-7.8/debian/pcre-config.1
@@ -0,0 +1,55 @@
+.TH PCRE-CONFIG 1
+.SH NAME
+pcre-config - program to return PCRE configuration
+.SH SYNOPSIS
+.B pcre-config  [--prefix] [--exec-prefix] [--version] [--libs] 
+                [--libs-posix] [--cflags] [--cflags-posix]
+
+.SH DESCRIPTION
+\fBpcre-config\fR returns the configuration of the installed PCRE
+libraries: the options required to compile a program to use them.
+
+
+.SH OPTIONS
+.TP 10
+\fB--prefix\fR
+Writes the directory prefix used in the PCRE installation for
+architecture independent files (/usr on debian systems, /usr/local on
+many other systems) to standard output.
+.TP
+\fB--exec-prefix\fR
+Writes the directory prefix used in the PCRE installation for
+architecture dependent files (normally the same as --prefix)
+to standard output.
+\fB--version\fR
+Writes the version of PCRE installed to standard output.
+.TP
+\fB--libs\fR
+Writes to standard output the command line options required to link
+with PCRE (-lpcre on debian systems).
+.TP
+\fB--libs-posix\fR
+Writes to standard output the command line options required to link
+with the PCRE posix emulation library (-lpcreposix -lpcre on debian
+systems).
+.TP
+\fB--cflags\fR
+Writes to standard output the command line options required to compile 
+files that use PCRE (this often includes some -I options, but is blank 
+on debian systems).
+.TP
+\fB--cflags-posix\fR
+Writes to standard output the command line options required to compile
+files that use the PCRE posix emulation library (this often includes
+some -I options, but is blank on debian systems). Suppress printing of
+filenames when searching multiple files.
+.TP
+
+
+.SH SEE ALSO
+\fBpcre(3)
+
+
+.SH AUTHOR
+This manual page was written by Mark Baker <mark@mnb.org.uk>,
+for the Debian GNU/Linux system (but may be used by others).
--- pcre3-7.8.orig/debian/zpcregrep
+++ pcre3-7.8/debian/zpcregrep
@@ -0,0 +1,2 @@
+#!/bin/sh
+GREP=pcregrep zgrep "$@"
--- pcre3-7.8.orig/debian/rules
+++ pcre3-7.8/debian/rules
@@ -0,0 +1,115 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+CFLAGS = -Wall -g
+INSTALL = install
+INSTALL_FILE    = $(INSTALL) -p    -o root -g root  -m  644
+INSTALL_PROGRAM = $(INSTALL) -p    -o root -g root  -m  755
+INSTALL_SCRIPT  = $(INSTALL) -p    -o root -g root  -m  755
+INSTALL_DIR     = $(INSTALL) -p -d -o root -g root  -m  755
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+CFLAGS += -O0
+else
+CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+INSTALL_PROGRAM += -s
+endif
+
+
+config.status: configure
+	dh_testdir
+	# Add here commands to configure the package.
+	CC_FOR_BUILD=cc CFLAGS="$(CFLAGS)" ./configure \
+		--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+		--prefix=/usr --mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info \
+		--enable-utf8 --enable-unicode-properties
+
+
+build: build-stamp
+build-stamp:  config.status
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE)
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+	$(MAKE) check
+endif
+
+	touch build-stamp
+
+clean: config.status
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+
+	# Add here commands to clean up after the build process.
+	-$(MAKE) distclean
+###	-test -r /usr/share/misc/config.sub && \
+###	  cp -f /usr/share/misc/config.sub config.sub
+###	-test -r /usr/share/misc/config.guess && \
+###	  cp -f /usr/share/misc/config.guess config.guess
+
+
+	rm -f dftables testsavedregex
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Add here commands to install the package into debian/tmp
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir -a
+	dh_testroot -a
+	dh_install -a
+	# This man page is in the main package, don't want it in -dev
+	rm debian/libpcre3-dev/usr/share/man/man3/pcrepattern.3
+	dh_link -a
+
+#	dh_installdebconf -a
+	dh_installdocs -a
+	dh_installexamples -a
+#	dh_installmenu -a
+#	dh_installlogrotate -a
+#	dh_installemacsen -a
+#	dh_installpam -a
+#	dh_installmime -a
+#	dh_installinit -a
+#	dh_installcron -a
+	dh_installman -a
+	dh_installinfo -a
+#	dh_undocumented -a
+	dh_installchangelogs -a ChangeLog
+	dh_strip -a --dbg-package=libpcre3-dbg
+	dh_compress -a
+	dh_fixperms -a
+	dh_makeshlibs -plibpcre3 --add-udeb="libpcre3-udeb" -V 'libpcre3 (>= 7.7)'
+	dh_makeshlibs -plibpcrecpp0 -V 'libpcrecpp0 (>= 7.7)'
+	dh_installdeb -a
+#	dh_perl -a
+	dh_shlibdeps -a -ldebian/libpcre3/lib:debian/libpcre3/usr/lib
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+binary-indep:
+
+binary: binary-arch binary-indep
+.PHONY: build clean binary-arch binary install 
--- pcre3-7.8.orig/debian/pcregrep.links
+++ pcre3-7.8/debian/pcregrep.links
@@ -0,0 +1,2 @@
+usr/share/doc/libpcre3 usr/share/doc/pcregrep
+usr/share/man/man1/pcregrep.1.gz usr/share/man/man1/zpcregrep.1.gz
--- pcre3-7.8.orig/debian/libpcrecpp0.install
+++ pcre3-7.8/debian/libpcrecpp0.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libpcrecpp.so.*
--- pcre3-7.8.orig/debian/README.Versioning.libtool
+++ pcre3-7.8/debian/README.Versioning.libtool
@@ -0,0 +1,29 @@
+Debian release of PCRE 4.5 had
+
+PCRE_LIB_VERSION=13:0:10
+PCRE_POSIXLIB_VERSION=13:0:10
+
+which corresponds to latest debian-revision (soname libpcre.so.3,
+installed as libpcre.so.3.9.0) and followed the instructions about version
+numbering in the libtool manual:
+|  3. If the library source code has changed at all since the last
+|     update, then increment REVISION (`C:R:A' becomes `C:r+1:A').
+
+13:1:10
+
+  4. If any interfaces have been added, removed, or changed since the
+     last update, increment CURRENT, and set REVISION to 0.
+
+14:0:10
+
+  5. If any interfaces have been added since the last public release,
+     then increment AGE.
+
+14:0:11
+
+  6. If any interfaces have been removed since the last public release,
+     then set AGE to 0.
+
+n/a
+
+Therefore I'm using 14:0:11 for this release of PCRE 5.0
--- pcre3-7.8.orig/doc/pcre_version.3
+++ pcre3-7.8/doc/pcre_version.3
@@ -7,7 +7,7 @@
 .B #include <pcre.h>
 .PP
 .SM
-.B char *pcre_version(void);
+.B const char *pcre_version(void);
 .
 .SH DESCRIPTION
 .rs
--- pcre3-7.8.orig/doc/pcreapi.3
+++ pcre3-7.8/doc/pcreapi.3
@@ -96,7 +96,7 @@
 .PP
 .B int pcre_config(int \fIwhat\fP, void *\fIwhere\fP);
 .PP
-.B char *pcre_version(void);
+.B const char *pcre_version(void);
 .PP
 .B void *(*pcre_malloc)(size_t);
 .PP
--- pcre3-7.8.orig/doc/pcregrep.1
+++ pcre3-7.8/doc/pcregrep.1
@@ -3,6 +3,7 @@
 pcregrep - a grep with Perl-compatible regular expressions.
 .SH SYNOPSIS
 .B pcregrep [options] [long options] [pattern] [path1 path2 ...]
+.B zpcregrep [options] [long options] [pattern] [file1 file2 ...]
 .
 .SH DESCRIPTION
 .rs
@@ -64,6 +65,9 @@
 If the \fBLC_ALL\fP or \fBLC_CTYPE\fP environment variable is set,
 \fBpcregrep\fP uses the value to set a locale when calling the PCRE library.
 The \fB--locale\fP option can be used to override this.
+.P 
+\fBzpcregrep\fR is a wrapper script that allows pcregrep to work on
+gzip compressed files.
 .
 .SH "SUPPORT FOR COMPRESSED FILES"
 .rs
@@ -432,7 +436,7 @@
 .rs
 .sp
 Exit status is 0 if any matches were found, 1 if no matches were found, and 2
-for syntax errors and non-existent or inacessible files (even if matches were
+for syntax errors and non-existent or inaccessible files (even if matches were
 found in other files) or too many matching errors. Using the \fB-s\fP option to
 suppress error messages about inaccessble files does not affect the return
 code.