5 files changed, 24 insertions, 30 deletions

diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile
index 1e0dbfd74d47..c4f65c82366d 100644
--- a/devel/pcre/Makefile
+++ b/devel/pcre/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pcre
-PORTVERSION=	4.5
+PORTVERSION=	5.0
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/programming/%SUBDIR%/ \
 		ftp://ftp.fu-berlin.de/unix/misc/%SUBDIR%/ \
@@ -18,10 +18,8 @@ MAINTAINER=	eik@FreeBSD.org
 COMMENT=	Perl Compatible Regular Expressions library
 
 USE_BZIP2=	yes
-GNU_CONFIGURE=	yes
 USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
-USE_REINPLACE=	yes
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
@@ -29,7 +27,8 @@ PORTDOCS=	*
 
 .if defined(WITH_UTF8)
 CONFIGURE_ARGS+=	\
-		--enable-utf8
+		--enable-utf8 \
+		--enable-unicode-properties
 .endif
 
 CONFIGURE_TARGET=	\
@@ -46,17 +45,12 @@ MAN3=		pcre.3 pcre_compile.3 pcre_config.3 \
 		pcrepattern.3 pcreperform.3 pcreposix.3 \
 		pcresample.3
 
-pre-configure:
-	@${REINPLACE_CMD} -e '/^LIBTOOL=/s,\$$(top_builddir)/libtool,${LIBTOOL},g' \
-		${WRKSRC}/configure
-
 post-install:
-	@${STRIP_CMD} ${STRIP} ${PREFIX}/bin/pcregrep
-	@${STRIP_CMD} ${STRIP} ${PREFIX}/bin/pcretest
+	@${STRIP_CMD} ${DESTDIR}${PREFIX}/bin/pcregrep ${DESTDIR}${PREFIX}/bin/pcretest
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR} ${DOCSDIR}/html
-	@cd ${WRKSRC}; ${INSTALL_DATA} ChangeLog NEWS doc/Tech.Notes doc/*.txt ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/html/*.html ${DOCSDIR}/html
+	@${MKDIR} ${DESTDIR}${DOCSDIR} ${DESTDIR}${DOCSDIR}/html
+	@cd ${WRKSRC}; ${INSTALL_DATA} ChangeLog NEWS LICENCE doc/Tech.Notes doc/*.txt ${DESTDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/html/*.html ${DESTDIR}${DOCSDIR}/html
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/pcre/distinfo b/devel/pcre/distinfo
index 385131836633..a83ad5c5cd0b 100644
--- a/devel/pcre/distinfo
+++ b/devel/pcre/distinfo
@@ -1,2 +1,2 @@
-MD5 (pcre-4.5.tar.bz2) = c51bd34197008b128046f0799d2242e4
-SIZE (pcre-4.5.tar.bz2) = 349536
+MD5 (pcre-5.0.tar.bz2) = 813850808894d99fb5b1c41ec6335d4f
+SIZE (pcre-5.0.tar.bz2) = 465738
diff --git a/devel/pcre/files/patch-Makefile.in b/devel/pcre/files/patch-Makefile.in
new file mode 100644
index 000000000000..ba7e095b7f60
--- /dev/null
+++ b/devel/pcre/files/patch-Makefile.in
@@ -0,0 +1,13 @@
+--- Makefile.in.orig	Sun Sep 26 01:33:12 2004
++++ Makefile.in	Sun Sep 26 01:35:05 2004
+@@ -259,8 +259,8 @@
+ 		$(LIBTOOL) --mode=install $(INSTALL) pcregrep@EXEEXT@ $(DESTDIR)$(BINDIR)/pcregrep@EXEEXT@
+ 		$(LIBTOOL) --mode=install $(INSTALL) pcretest@EXEEXT@ $(DESTDIR)$(BINDIR)/pcretest@EXEEXT@
+ 		$(INSTALL) pcre-config $(DESTDIR)$(BINDIR)/pcre-config
+-		$(mkinstalldirs) $(DESTDIR)$(LIBDIR)/pkgconfig
+-		$(INSTALL) libpcre.pc $(DESTDIR)$(LIBDIR)/pkgconfig/libpcre.pc
++		$(mkinstalldirs) $(DESTDIR)$(prefix)/libdata/pkgconfig
++		$(INSTALL) libpcre.pc $(DESTDIR)$(prefix)/libdata/pkgconfig/libpcre.pc
+ 
+ # We deliberately omit dftables and chartables.c from 'make clean'; once made
+ # chartables.c shouldn't change, and if people have edited the tables by hand,
diff --git a/devel/pcre/files/patch-ltmain.sh b/devel/pcre/files/patch-ltmain.sh
deleted file mode 100644
index 4ced780581f2..000000000000
--- a/devel/pcre/files/patch-ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- ltmain.sh.orig	Thu May 22 15:25:54 2003
-+++ ltmain.sh	Thu Jun 26 01:26:04 2003
-@@ -4286,12 +4286,6 @@
- 	  IFS="$save_ifs"
- 	fi
- 
--	# Install the pseudo-library for information purposes.
--	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
--	instname="$dir/$name"i
--	$show "$install_prog $instname $destdir/$name"
--	$run eval "$install_prog $instname $destdir/$name" || exit $?
--
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
- 	;;
diff --git a/devel/pcre/pkg-plist b/devel/pcre/pkg-plist
index aa17c7e686cd..0912f3ecea04 100644
--- a/devel/pcre/pkg-plist
+++ b/devel/pcre/pkg-plist
@@ -9,3 +9,5 @@ lib/libpcre.so.0
 lib/libpcreposix.a
 lib/libpcreposix.so
 lib/libpcreposix.so.0
+libdata/pkgconfig/libpcre.pc
+@unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true