Update to 7.8

PR:		ports/127135
Submitted by:	chinsan@FreeBSD.org

4 files changed, 6 insertions, 33 deletions

diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile
index 5067d3a91806..0a856344fa90 100644
--- a/devel/pcre/Makefile
+++ b/devel/pcre/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	pcre
-PORTVERSION=	7.7
-PORTREVISION=	1
+PORTVERSION=	7.8
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/programming/%SUBDIR%/ \
 		ftp://ftp.fu-berlin.de/unix/misc/%SUBDIR%/ \
@@ -50,6 +49,8 @@ post-patch:
 	@${REINPLACE_CMD} -E -e '/^install-data-am/,/^$$/ s,install-(dist_doc|dist_html|html)DATA,,g' \
 		${WRKSRC}/Makefile.in
 .endif
+	${REINPLACE_CMD} -e 's/\(pkgconfigdir = \).*/\1$$\(DESTDIR\)$$\(prefix\)\/libdata\/pkgconfig/' \
+		${WRKSRC}/Makefile.in
 
 post-install:
 	@${STRIP_CMD} ${PREFIX}/bin/pcregrep ${PREFIX}/bin/pcretest
diff --git a/devel/pcre/distinfo b/devel/pcre/distinfo
index 8432edc790ce..15ec6e421d95 100644
--- a/devel/pcre/distinfo
+++ b/devel/pcre/distinfo
@@ -1,3 +1,3 @@
-MD5 (pcre-7.7.tar.bz2) = 4b2e9cde1f7227448dddba59843efa0b
-SHA256 (pcre-7.7.tar.bz2) = bada84f483b428bb45ee68899b62c996f03e8c9422408fc72e60ec854c9df640
-SIZE (pcre-7.7.tar.bz2) = 818897
+MD5 (pcre-7.8.tar.bz2) = 141132d6af14dccc7b08fa797e4fd441
+SHA256 (pcre-7.8.tar.bz2) = 795f3c2ae29339e633a4dac7b596d6cd4d86504befbe951c9d5ff42aca9858ff
+SIZE (pcre-7.8.tar.bz2) = 840922
diff --git a/devel/pcre/files/patch-Makefile.in b/devel/pcre/files/patch-Makefile.in
deleted file mode 100644
index 1c0cbe296f26..000000000000
--- a/devel/pcre/files/patch-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in.orig
-+++ Makefile.in
-@@ -502,7 +502,7 @@
- pcredemo_LDADD = libpcre.la
- 
- # We have .pc files for pkg-config users.
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(DESTDIR)$(prefix)/libdata/pkgconfig
- pkgconfig_DATA = libpcre.pc $(am__append_7)
- dist_man_MANS = \
-   doc/pcre.3 \
diff --git a/devel/pcre/files/patch-pcre__compile.c b/devel/pcre/files/patch-pcre__compile.c
deleted file mode 100644
index a492df897aee..000000000000
--- a/devel/pcre/files/patch-pcre__compile.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- pcre_compile.c.orig
-+++ pcre_compile.c
-@@ -4931,7 +4931,7 @@
-                (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE))
-             {
-             cd->external_options = newoptions;
--            options = newoptions;
-+            options = *optionsptr = newoptions;
-             }
-          else
-             {