- update to version 4.5

- use PORTDOCS
- set homepage to freshmeat (under control of the author)

Approved by:	marcus (mentor)

4 files changed, 16 insertions, 65 deletions

diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile
index e5f230fd9e3e..5e13902ab10b 100644
--- a/devel/pcre/Makefile
+++ b/devel/pcre/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pcre
-PORTVERSION=	4.4
+PORTVERSION=	4.5
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/programming/%SUBDIR%/ \
 		ftp://ftp.fu-berlin.de/unix/misc/%SUBDIR%/ \
@@ -20,10 +20,14 @@ COMMENT=	Perl Compatible Regular Expressions library
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_LIBTOOL_VER=	\
-		14	
+		14
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	*
+.endif
+
 .if defined(WITH_UTF8)
 CONFIGURE_ARGS+=	\
 		--enable-utf8
@@ -43,19 +47,6 @@ MAN3=		pcre.3 pcre_compile.3 pcre_config.3 \
 		pcrepattern.3 pcreperform.3 pcreposix.3 \
 		pcresample.3
 
-TXTDOC=		Tech.Notes pcre.txt pcregrep.txt \
-		pcretest.txt perltest.txt
-HTMLDOC=	index pcre pcre_compile \
-		pcre_config pcre_copy_named_substring pcre_copy_substring \
-		pcre_exec pcre_free_substring pcre_free_substring_list \
-		pcre_fullinfo pcre_get_named_substring pcre_get_stringnumber \
-		pcre_get_substring pcre_get_substring_list pcre_info \
-		pcre_maketables pcre_study pcre_version \
-		pcreapi pcrebuild pcrecallout \
-		pcrecompat pcregrep pcrepattern \
-		pcreperform pcreposix pcresample \
-		pcretest
-
 pre-configure:
 	@${REINPLACE_CMD} -e '/^LIBTOOL=/s,\$$(top_builddir)/libtool,${LIBTOOL},g' \
 		${WRKSRC}/configure
@@ -64,14 +55,9 @@ post-install:
 	@${STRIP_CMD} ${STRIP} ${PREFIX}/bin/pcregrep
 	@${STRIP_CMD} ${STRIP} ${PREFIX}/bin/pcretest
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@for txt in ${TXTDOC}; do \
-		${INSTALL_DATA} ${WRKSRC}/doc/$${txt} ${DOCSDIR}; \
-	done
-	@${MKDIR} ${DOCSDIR}/html
-	@for html in ${HTMLDOC}; do \
-		${INSTALL_DATA} ${WRKSRC}/doc/html/$${html}.html ${DOCSDIR}/html; \
-	done
+	@${MKDIR} ${DOCSDIR} ${DOCSDIR}/html
+	@cd ${WRKSRC}; ${INSTALL_DATA} ChangeLog NEWS doc/Tech.Notes doc/*.txt ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/html/*.html ${DOCSDIR}/html
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/pcre/distinfo b/devel/pcre/distinfo
index ba075d0477a1..0d46a7ea4a75 100644
--- a/devel/pcre/distinfo
+++ b/devel/pcre/distinfo
@@ -1 +1 @@
-MD5 (pcre-4.4.tar.bz2) = 89fc389191d9611b314c3fc23235377b
+MD5 (pcre-4.5.tar.bz2) = c51bd34197008b128046f0799d2242e4
diff --git a/devel/pcre/pkg-descr b/devel/pcre/pkg-descr
index 076ccbf0cc4a..3452393637de 100644
--- a/devel/pcre/pkg-descr
+++ b/devel/pcre/pkg-descr
@@ -1,8 +1,8 @@
-PCRE is a Perl-compatible library of regular expressions.
-They are based on a completely separate code-base from Henry
-Spencer's originals.  The library has been designed to make
-efficient use of memory for compiled regular expressions.
+The PCRE library is a set of functions that implement regular expression
+pattern matching using the same syntax and semantics as Perl 5, with just
+a few differences. The current implementation corresponds to Perl 5.005.
+PCRE is  used by many programs, including Exim, Postfix, and PHP.
 
-Original Author:  Phil Hazel <ph10@cam.ac.uk>
+Written by: Phil Hazel <ph10@cam.ac.uk>
 
-WWW: http://www.pcre.org/
+WWW: http://freshmeat.net/projects/pcre/
diff --git a/devel/pcre/pkg-plist b/devel/pcre/pkg-plist
index 1fe1d5ae5a52..aa17c7e686cd 100644
--- a/devel/pcre/pkg-plist
+++ b/devel/pcre/pkg-plist
@@ -9,38 +9,3 @@ lib/libpcre.so.0
 lib/libpcreposix.a
 lib/libpcreposix.so
 lib/libpcreposix.so.0
-%%PORTDOCS%%%%DOCSDIR%%/Tech.Notes
-%%PORTDOCS%%%%DOCSDIR%%/pcre.txt
-%%PORTDOCS%%%%DOCSDIR%%/pcregrep.txt
-%%PORTDOCS%%%%DOCSDIR%%/pcretest.txt
-%%PORTDOCS%%%%DOCSDIR%%/perltest.txt
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pcre.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pcre_compile.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pcre_config.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pcre_copy_named_substring.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pcre_copy_substring.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pcre_exec.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pcre_free_substring.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pcre_free_substring_list.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pcre_fullinfo.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pcre_get_named_substring.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pcre_get_stringnumber.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pcre_get_substring.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pcre_get_substring_list.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pcre_info.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pcre_maketables.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pcre_study.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pcre_version.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pcreapi.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pcrebuild.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pcrecallout.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pcrecompat.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pcregrep.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pcrepattern.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pcreperform.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pcreposix.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pcresample.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pcretest.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%