Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 3 Feb 2014 14:30:49 +0000 (UTC)
From:      Brendan Fabeny <bf@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r342449 - head/devel/pcre
Message-ID:  <201402031430.s13EUnPH014162@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bf
Date: Mon Feb  3 14:30:48 2014
New Revision: 342449
URL: http://svnweb.freebsd.org/changeset/ports/342449
QAT: https://qat.redports.org/buildarchive/r342449/

Log:
  Use staging; update LICENSE; strip libraries; remove some outdated material

Modified:
  head/devel/pcre/Makefile
  head/devel/pcre/pkg-plist

Modified: head/devel/pcre/Makefile
==============================================================================
--- head/devel/pcre/Makefile	Mon Feb  3 14:23:07 2014	(r342448)
+++ head/devel/pcre/Makefile	Mon Feb  3 14:30:48 2014	(r342449)
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=${PORTNAME}
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Perl Compatible Regular Expressions library
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
 USE_BZIP2=	yes
@@ -21,14 +21,15 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USES=	pathfix
 CONFIGURE_ARGS=	--enable-utf --enable-unicode-properties \
-		--enable-pcre8 --enable-pcre16 --enable-pcre32
+		--enable-pcre8 --enable-pcre16 --enable-pcre32 \
+		--enable-pcretest-libedit
+MAKE_ENV+=	INSTALL_STRIP_FLAG="${STRIP}"
 
 OPTIONS_DEFINE=		STACK_RECURSION
 OPTIONS_DEFAULT=	STACK_RECURSION
 
 STACK_RECURSION_DESC=	Use the stack for recursion during matching
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${ARCH} != "sparc64" && ${ARCH} != "ia64"
@@ -47,11 +48,6 @@ PORTDOCS=	*
 CONFIGURE_ARGS+=	--disable-stack-for-recursion
 .endif
 
-# For FreeBSD 8.3 and above link pcretest against libedit
-.if ${OSVERSION} >= 803000
-CONFIGURE_ARGS+=	--enable-pcretest-libedit
-.endif
-
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
 CFLAGS+=	-fPIC
 .endif
@@ -83,125 +79,14 @@ CONFIGURE_ARGS+=	--with-match-limit-recu
 CONFIGURE_ARGS+=	--with-posix-malloc-threshold=${WITH_POSIX_MALLOC_THRESHOLD}
 .endif
 
-MAN1=		pcre-config.1 \
-		pcregrep.1 \
-		pcretest.1
-MAN3=		pcre.3 \
-		pcre16.3 \
-		pcre32.3 \
-		pcre_assign_jit_stack.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_study.3 \
-		pcre_free_substring.3 \
-		pcre_free_substring_list.3 \
-		pcre_fullinfo.3 \
-		pcre_get_named_substring.3 \
-		pcre_get_stringnumber.3 \
-		pcre_get_stringtable_entries.3 \
-		pcre_get_substring.3 \
-		pcre_get_substring_list.3 \
-		pcre_jit_exec.3 \
-		pcre_jit_stack_alloc.3 \
-		pcre_jit_stack_free.3 \
-		pcre_maketables.3 \
-		pcre_pattern_to_host_byte_order.3 \
-		pcre_refcount.3 \
-		pcre_study.3 \
-		pcre_version.3 \
-		pcreapi.3 \
-		pcrebuild.3 \
-		pcrecallout.3 \
-		pcrecompat.3 \
-		pcrecpp.3 \
-		pcredemo.3 \
-		pcrejit.3 \
-		pcrelimits.3 \
-		pcrematching.3 \
-		pcrepartial.3 \
-		pcrepattern.3 \
-		pcreperform.3 \
-		pcreposix.3 \
-		pcreprecompile.3 \
-		pcresample.3 \
-		pcrestack.3 \
-		pcresyntax.3 \
-		pcre_utf16_to_host_byte_order.3 \
-		pcre_utf32_to_host_byte_order.3 \
-		pcreunicode.3
-
-MLINKS+=	pcre_assign_jit_stack.3 pcre16_assign_jit_stack.3 \
-		pcre_assign_jit_stack.3 pcre32_assign_jit_stack.3 \
-		pcre_compile.3 pcre16_compile.3 \
-		pcre_compile.3 pcre32_compile.3 \
-		pcre_compile2.3 pcre16_compile2.3 \
-		pcre_compile2.3 pcre32_compile2.3 \
-		pcre_config.3 pcre16_config.3 \
-		pcre_config.3 pcre32_config.3 \
-		pcre_copy_named_substring.3 pcre16_copy_named_substring.3 \
-		pcre_copy_named_substring.3 pcre32_copy_named_substring.3 \
-		pcre_copy_substring.3 pcre16_copy_substring.3 \
-		pcre_copy_substring.3 pcre32_copy_substring.3 \
-		pcre_dfa_exec.3 pcre16_dfa_exec.3 \
-		pcre_dfa_exec.3 pcre32_dfa_exec.3 \
-		pcre_exec.3 pcre16_exec.3 \
-		pcre_exec.3 pcre32_exec.3 \
-		pcre_free_study.3 pcre16_free_study.3 \
-		pcre_free_study.3 pcre32_free_study.3 \
-		pcre_free_substring.3 pcre16_free_substring.3 \
-		pcre_free_substring.3 pcre32_free_substring.3 \
-		pcre_free_substring_list.3 pcre16_free_substring_list.3 \
-		pcre_free_substring_list.3 pcre32_free_substring_list.3 \
-		pcre_fullinfo.3 pcre16_fullinfo.3 \
-		pcre_fullinfo.3 pcre32_fullinfo.3 \
-		pcre_get_named_substring.3 pcre16_get_named_substring.3 \
-		pcre_get_named_substring.3 pcre32_get_named_substring.3 \
-		pcre_get_stringnumber.3 pcre16_get_stringnumber.3 \
-		pcre_get_stringnumber.3 pcre32_get_stringnumber.3 \
-		pcre_get_stringtable_entries.3 pcre16_get_stringtable_entries.3 \
-		pcre_get_stringtable_entries.3 pcre32_get_stringtable_entries.3 \
-		pcre_get_substring.3 pcre16_get_substring.3 \
-		pcre_get_substring.3 pcre32_get_substring.3 \
-		pcre_get_substring_list.3 pcre16_get_substring_list.3 \
-		pcre_get_substring_list.3 pcre32_get_substring_list.3 \
-		pcre_jit_exec.3 pcre16_jit_exec.3 \
-		pcre_jit_exec.3 pcre32_jit_exec.3 \
-		pcre_jit_stack_alloc.3 pcre16_jit_stack_alloc.3 \
-		pcre_jit_stack_alloc.3 pcre32_jit_stack_alloc.3 \
-		pcre_jit_stack_free.3 pcre16_jit_stack_free.3 \
-		pcre_jit_stack_free.3 pcre32_jit_stack_free.3 \
-		pcre_maketables.3 pcre16_maketables.3 \
-		pcre_maketables.3 pcre32_maketables.3 \
-		pcre_pattern_to_host_byte_order.3 pcre16_pattern_to_host_byte_order.3 \
-		pcre_pattern_to_host_byte_order.3 pcre32_pattern_to_host_byte_order.3 \
-		pcre_refcount.3 pcre16_refcount.3 \
-		pcre_refcount.3 pcre32_refcount.3 \
-		pcre_study.3 pcre16_study.3 \
-		pcre_study.3 pcre32_study.3 \
-		pcre_utf16_to_host_byte_order.3 pcre16_utf16_to_host_byte_order.3 \
-		pcre_utf16_to_host_byte_order.3 pcre32_utf16_to_host_byte_order.3 \
-		pcre_utf32_to_host_byte_order.3 pcre32_utf32_to_host_byte_order.3 \
-		pcre_version.3 pcre16_version.3 \
-		pcre_version.3 pcre32_version.3
-
 post-patch:
 .if !${PORT_OPTIONS:MDOCS}
 	@${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
 # work around for a autoconf assumption, to fix c++ linking with clang
 	@${REINPLACE_CMD} -e 's|GREP "\\-L"|GREP "conftest\\.$$objext"|g' ${WRKSRC}/configure
 
-post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/pcregrep ${PREFIX}/bin/pcretest
-
 #prevent regression test coredumps from causing failures on the
 #package-building cluster:
 .ifndef(MAINTAINER_MODE)

Modified: head/devel/pcre/pkg-plist
==============================================================================
--- head/devel/pcre/pkg-plist	Mon Feb  3 14:23:07 2014	(r342448)
+++ head/devel/pcre/pkg-plist	Mon Feb  3 14:30:48 2014	(r342449)
@@ -32,3 +32,106 @@ libdata/pkgconfig/libpcre16.pc
 libdata/pkgconfig/libpcre32.pc
 libdata/pkgconfig/libpcrecpp.pc
 libdata/pkgconfig/libpcreposix.pc
+man/man1/pcre-config.1.gz
+man/man1/pcregrep.1.gz
+man/man1/pcretest.1.gz
+man/man3/pcre.3.gz
+man/man3/pcre16.3.gz
+man/man3/pcre16_assign_jit_stack.3.gz
+man/man3/pcre16_compile.3.gz
+man/man3/pcre16_compile2.3.gz
+man/man3/pcre16_config.3.gz
+man/man3/pcre16_copy_named_substring.3.gz
+man/man3/pcre16_copy_substring.3.gz
+man/man3/pcre16_dfa_exec.3.gz
+man/man3/pcre16_exec.3.gz
+man/man3/pcre16_free_study.3.gz
+man/man3/pcre16_free_substring.3.gz
+man/man3/pcre16_free_substring_list.3.gz
+man/man3/pcre16_fullinfo.3.gz
+man/man3/pcre16_get_named_substring.3.gz
+man/man3/pcre16_get_stringnumber.3.gz
+man/man3/pcre16_get_stringtable_entries.3.gz
+man/man3/pcre16_get_substring.3.gz
+man/man3/pcre16_get_substring_list.3.gz
+man/man3/pcre16_jit_exec.3.gz
+man/man3/pcre16_jit_stack_alloc.3.gz
+man/man3/pcre16_jit_stack_free.3.gz
+man/man3/pcre16_maketables.3.gz
+man/man3/pcre16_pattern_to_host_byte_order.3.gz
+man/man3/pcre16_refcount.3.gz
+man/man3/pcre16_study.3.gz
+man/man3/pcre16_utf16_to_host_byte_order.3.gz
+man/man3/pcre16_version.3.gz
+man/man3/pcre32.3.gz
+man/man3/pcre32_assign_jit_stack.3.gz
+man/man3/pcre32_compile.3.gz
+man/man3/pcre32_compile2.3.gz
+man/man3/pcre32_config.3.gz
+man/man3/pcre32_copy_named_substring.3.gz
+man/man3/pcre32_copy_substring.3.gz
+man/man3/pcre32_dfa_exec.3.gz
+man/man3/pcre32_exec.3.gz
+man/man3/pcre32_free_study.3.gz
+man/man3/pcre32_free_substring.3.gz
+man/man3/pcre32_free_substring_list.3.gz
+man/man3/pcre32_fullinfo.3.gz
+man/man3/pcre32_get_named_substring.3.gz
+man/man3/pcre32_get_stringnumber.3.gz
+man/man3/pcre32_get_stringtable_entries.3.gz
+man/man3/pcre32_get_substring.3.gz
+man/man3/pcre32_get_substring_list.3.gz
+man/man3/pcre32_jit_exec.3.gz
+man/man3/pcre32_jit_stack_alloc.3.gz
+man/man3/pcre32_jit_stack_free.3.gz
+man/man3/pcre32_maketables.3.gz
+man/man3/pcre32_pattern_to_host_byte_order.3.gz
+man/man3/pcre32_refcount.3.gz
+man/man3/pcre32_study.3.gz
+man/man3/pcre32_utf32_to_host_byte_order.3.gz
+man/man3/pcre32_version.3.gz
+man/man3/pcre_assign_jit_stack.3.gz
+man/man3/pcre_compile.3.gz
+man/man3/pcre_compile2.3.gz
+man/man3/pcre_config.3.gz
+man/man3/pcre_copy_named_substring.3.gz
+man/man3/pcre_copy_substring.3.gz
+man/man3/pcre_dfa_exec.3.gz
+man/man3/pcre_exec.3.gz
+man/man3/pcre_free_study.3.gz
+man/man3/pcre_free_substring.3.gz
+man/man3/pcre_free_substring_list.3.gz
+man/man3/pcre_fullinfo.3.gz
+man/man3/pcre_get_named_substring.3.gz
+man/man3/pcre_get_stringnumber.3.gz
+man/man3/pcre_get_stringtable_entries.3.gz
+man/man3/pcre_get_substring.3.gz
+man/man3/pcre_get_substring_list.3.gz
+man/man3/pcre_jit_exec.3.gz
+man/man3/pcre_jit_stack_alloc.3.gz
+man/man3/pcre_jit_stack_free.3.gz
+man/man3/pcre_maketables.3.gz
+man/man3/pcre_pattern_to_host_byte_order.3.gz
+man/man3/pcre_refcount.3.gz
+man/man3/pcre_study.3.gz
+man/man3/pcre_utf16_to_host_byte_order.3.gz
+man/man3/pcre_utf32_to_host_byte_order.3.gz
+man/man3/pcre_version.3.gz
+man/man3/pcreapi.3.gz
+man/man3/pcrebuild.3.gz
+man/man3/pcrecallout.3.gz
+man/man3/pcrecompat.3.gz
+man/man3/pcrecpp.3.gz
+man/man3/pcredemo.3.gz
+man/man3/pcrejit.3.gz
+man/man3/pcrelimits.3.gz
+man/man3/pcrematching.3.gz
+man/man3/pcrepartial.3.gz
+man/man3/pcrepattern.3.gz
+man/man3/pcreperform.3.gz
+man/man3/pcreposix.3.gz
+man/man3/pcreprecompile.3.gz
+man/man3/pcresample.3.gz
+man/man3/pcrestack.3.gz
+man/man3/pcresyntax.3.gz
+man/man3/pcreunicode.3.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402031430.s13EUnPH014162>