[Midnightbsd-cvs] mports: devel/pcre: Update to 7.2

[laffer1 at midnightbsd.org]

Log Message:
-----------
Update to 7.2

Modified Files:
--------------
    mports/devel/pcre:
        Makefile (r1.3 -> r1.4)
        distinfo (r1.1 -> r1.2)
        pkg-plist (r1.1 -> r1.2)
    mports/devel/pcre/files:
        patch-Makefile.in (r1.1 -> r1.2)

Removed Files:
-------------
    mports/devel/pcre/files:
        patch-pcretest.c

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/devel/pcre/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ldevel/pcre/pkg-plist -Ldevel/pcre/pkg-plist -u -r1.1 -r1.2
--- devel/pcre/pkg-plist
+++ devel/pcre/pkg-plist
@@ -20,3 +20,4 @@
 lib/libpcreposix.so
 lib/libpcreposix.so.0
 libdata/pkgconfig/libpcre.pc
+libdata/pkgconfig/libpcrecpp.pc
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/pcre/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -Ldevel/pcre/Makefile -Ldevel/pcre/Makefile -u -r1.3 -r1.4
--- devel/pcre/Makefile
+++ devel/pcre/Makefile
@@ -3,11 +3,11 @@
 # Whom:					dom
 #
 # $MidnightBSD$
-# $FreeBSD: ports/devel/pcre/Makefile,v 1.37 2006/07/07 07:58:19 krion Exp $
+# $FreeBSD: ports/devel/pcre/Makefile,v 1.46 2007/08/04 11:40:49 gabor Exp $
 #
 
 PORTNAME=	pcre
-PORTVERSION=	6.7
+PORTVERSION=	7.2
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/programming/%SUBDIR%/ \
 		ftp://ftp.fu-berlin.de/unix/misc/%SUBDIR%/ \
@@ -17,28 +17,21 @@
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Perl Compatible Regular Expressions library
 
-CONFLICTS?=	pcre-utf8-[0-9]*
-
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+CONFIGURE_ARGS=	--enable-utf8 --enable-unicode-properties
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd6.0
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
 .endif
 
-.if defined(WITH_UTF8)
-CONFIGURE_ARGS+=--enable-utf8 \
-		--enable-unicode-properties
-.endif
-
 .if defined(WITH_LINK_SIZE)
 CONFIGURE_ARGS+=--with-link-size=${WITH_LINK_SIZE}
 .endif
 
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-
-MAN1=		pcregrep.1 pcretest.1
+MAN1=		pcre-config.1 pcregrep.1 pcretest.1
 MAN3=		pcre.3 pcre_compile.3 pcre_compile2.3 pcre_config.3 \
 		pcre_copy_named_substring.3 pcre_copy_substring.3 \
 		pcre_dfa_exec.3 pcre_exec.3 pcre_free_substring.3 \
@@ -53,11 +46,11 @@
 		pcreperform.3 pcreposix.3 pcresample.3 pcrestack.3
 
 post-install:
-	@${STRIP_CMD} ${DESTDIR}${PREFIX}/bin/pcregrep ${DESTDIR}${PREFIX}/bin/pcretest
+	@${STRIP_CMD} ${PREFIX}/bin/pcregrep ${PREFIX}/bin/pcretest
 .if !defined(NOPORTDOCS)
-	@${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
+	@${MKDIR} ${DOCSDIR} ${DOCSDIR}/html
+	@cd ${WRKSRC}; ${INSTALL_DATA} ChangeLog NEWS LICENCE doc/*.txt ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/html/*.html ${DOCSDIR}/html
 .endif
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/devel/pcre/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ldevel/pcre/distinfo -Ldevel/pcre/distinfo -u -r1.1 -r1.2
--- devel/pcre/distinfo
+++ devel/pcre/distinfo
@@ -1,3 +1,3 @@
-MD5 (pcre-6.7.tar.bz2) = dbbec9d178ce199e67e98c9a4f994f90
-SHA256 (pcre-6.7.tar.bz2) = 006097cd72835acc9a15fc9239136975f354efa3d39cb9617b3f37432f7ed795
-SIZE (pcre-6.7.tar.bz2) = 570867
+MD5 (pcre-7.2.tar.bz2) = 53305db73855f1ff155dcd2c05d448d3
+SHA256 (pcre-7.2.tar.bz2) = e10ace2d0361f74f759b52534f05872d93ccce10b5efe7eec73dd39dc0ac52f4
+SIZE (pcre-7.2.tar.bz2) = 738540
--- devel/pcre/files/patch-pcretest.c
+++ /dev/null
@@ -1,12 +0,0 @@
-*** pcretest.c.orig	Wed Jul  5 21:28:01 2006
---- pcretest.c	Fri Jul  7 19:35:47 2006
-***************
-*** 45,50 ****
---- 45,51 ----
-  #include <errno.h>
-  
-  #ifndef _WIN32
-+ #include <sys/time.h>
-  #include <sys/resource.h>
-  #endif
-  
Index: patch-Makefile.in
===================================================================
RCS file: /home/cvs/mports/devel/pcre/files/patch-Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ldevel/pcre/files/patch-Makefile.in -Ldevel/pcre/files/patch-Makefile.in -u -r1.1 -r1.2
--- devel/pcre/files/patch-Makefile.in
+++ devel/pcre/files/patch-Makefile.in
@@ -1,13 +1,14 @@
---- Makefile.in.orig	Wed Jul 27 14:02:36 2005
-+++ Makefile.in	Wed Jul 27 14:04:08 2005
-@@ -483,8 +483,8 @@
- 		$(LIBTOOL) --mode=install $(INSTALL) pcregrep at EXEEXT@ $(DESTDIR)$(BINDIR)/pcregrep at EXEEXT@
- 		$(LIBTOOL) --mode=install $(INSTALL) pcretest at EXEEXT@ $(DESTDIR)$(BINDIR)/pcretest at EXEEXT@
- 		$(INSTALL) pcre-config $(DESTDIR)$(BINDIR)/pcre-config
--		$(mkinstalldirs) $(DESTDIR)$(LIBDIR)/pkgconfig
--		$(INSTALL_DATA) libpcre.pc $(DESTDIR)$(LIBDIR)/pkgconfig/libpcre.pc
-+		$(mkinstalldirs) $(DESTDIR)$(prefix)/libdata/pkgconfig
-+		$(INSTALL_DATA) libpcre.pc $(DESTDIR)$(prefix)/libdata/pkgconfig/libpcre.pc
- 
- # The uninstall target removes all the files that were installed.
+
+$FreeBSD: ports/devel/pcre/files/patch-Makefile.in,v 1.4 2007/05/28 12:45:17 krion Exp $
+
+--- 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 = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = libpcre.pc $(am__append_7)
+ dist_man_MANS = \
+   doc/pcre.3 \