svn commit: r301016 - in head/devel/pcre: . files

[Martin Matuska]

Author: mm
Date: Tue Jul 17 16:30:18 2012
New Revision: 301016
URL: http://svn.freebsd.org/changeset/ports/301016

Log:
  Update to 8.31
  Switch to new options framework
  Link pcretest against libedit on FreeBSD 8.x and higher

Deleted:
  head/devel/pcre/files/extra-patch-libedit
  head/devel/pcre/files/patch-bug-1236
Modified:
  head/devel/pcre/Makefile
  head/devel/pcre/distinfo

Modified: head/devel/pcre/Makefile
==============================================================================
--- head/devel/pcre/Makefile	Tue Jul 17 16:25:25 2012	(r301015)
+++ head/devel/pcre/Makefile	Tue Jul 17 16:30:18 2012	(r301016)
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	pcre
-PORTVERSION=	8.30
-PORTREVISION=	2
+PORTVERSION=	8.31
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/programming/%SUBDIR%/ \
 		ftp://ftp.fu-berlin.de/unix/misc/%SUBDIR%/ \
@@ -20,8 +19,9 @@ COMMENT=	Perl Compatible Regular Express
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
-OPTIONS=	JIT "Enable Just-In-Time compiling support" on \
-		LIBEDIT "Link pcretest against libedit" off
+OPTIONS_DEFINE=		JIT
+OPTIONS_DEFAULT=	JIT
+JIT_DESC=		Enable Just-In-Time compiling support
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
@@ -32,26 +32,23 @@ CONFIGURE_ARGS=	--enable-utf --enable-un
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_LIBEDIT)
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libedit
-CONFIGURE_ARGS+=	--enable-pcretest-libedit
-GNOME_MAKEFILEIN+=	Makefile.am
-USE_AUTOTOOLS+=	aclocal autoconf autoheader automake libtool libtoolize
-ACLOCAL_ARGS+=	#undefined
-.endif
-
-.if !defined(WITHOUT_JIT) && ${ARCH} != "sparc64"
+.if ${PORT_OPTIONS:MJIT} && ${ARCH} != "sparc64"
 CONFIGURE_ARGS+=	--enable-jit
 .else
 CONFIGURE_ARGS+=	--disable-jit
 .endif
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	*
 .endif
 
 .include <bsd.port.pre.mk>
 
+# For FreeBSD 8.x and above link pcretest against libedit
+.if ${OSVERSION} > 800000
+CONFIGURE_ARGS+=	--enable-pcretest-libedit
+.endif
+
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
 CFLAGS+=	-fPIC
 .endif

Modified: head/devel/pcre/distinfo
==============================================================================
--- head/devel/pcre/distinfo	Tue Jul 17 16:25:25 2012	(r301015)
+++ head/devel/pcre/distinfo	Tue Jul 17 16:30:18 2012	(r301016)
@@ -1,2 +1,2 @@
-SHA256 (pcre-8.30.tar.bz2) = c1113fd7db934e97ad8b3917d432e5b642e9eb9afd127eb797804937c965f4ac
-SIZE (pcre-8.30.tar.bz2) = 1248556
+SHA256 (pcre-8.31.tar.bz2) = 5778a02535473c7ee7838ea598c19f451e63cf5eec0bf0307a688301c9078c3c
+SIZE (pcre-8.31.tar.bz2) = 1257162