From owner-svn-ports-head@FreeBSD.ORG  Sun Oct  6 16:18:31 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 06C24F2F;
 Sun,  6 Oct 2013 16:18:31 +0000 (UTC)
 (envelope-from johans@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id CE419224C;
 Sun,  6 Oct 2013 16:18:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r96GIUKj050786;
 Sun, 6 Oct 2013 16:18:30 GMT (envelope-from johans@svn.freebsd.org)
Received: (from johans@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r96GIUYe050776;
 Sun, 6 Oct 2013 16:18:30 GMT (envelope-from johans@svn.freebsd.org)
Message-Id: <201310061618.r96GIUYe050776@svn.freebsd.org>
From: Johan van Selst <johans@FreeBSD.org>
Date: Sun, 6 Oct 2013 16:18:30 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r329600 - head/textproc/gnugrep
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Oct 2013 16:18:31 -0000

Author: johans
Date: Sun Oct  6 16:18:29 2013
New Revision: 329600
URL: http://svnweb.freebsd.org/changeset/ports/329600

Log:
  - Fix PCRE support [1]
  - Enable PCRE support by default
  - Enable stage support
  - Bump PORTREVISION
  
  PR:		ports/182266 [1]
  Submitted by:	amdmi3

Modified:
  head/textproc/gnugrep/Makefile
  head/textproc/gnugrep/pkg-plist

Modified: head/textproc/gnugrep/Makefile
==============================================================================
--- head/textproc/gnugrep/Makefile	Sun Oct  6 16:09:43 2013	(r329599)
+++ head/textproc/gnugrep/Makefile	Sun Oct  6 16:18:29 2013	(r329600)
@@ -3,6 +3,7 @@
 
 PORTNAME=	grep
 PORTVERSION=	2.14
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	GNU
 PKGNAMEPREFIX=	gnu
@@ -17,20 +18,19 @@ CONFLICTS=	bsd-grep-[0-9]*
 USES+=		charsetfix
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAN1=		egrep.1 \
-		fgrep.1 \
-		grep.1
 INFO=		grep
 
 OPTIONS_DEFINE=	PCRE NLS
+OPTIONS_DEFAULT=PCRE NLS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
-LDFLAGS+=	-lintl -L${LOCALBASE}/lib
+LDFLAGS+=	-lintl
 PLIST_SUB+=	NLS=
 .else
 CONFIGURE_ARGS+=	--disable-nls
@@ -38,7 +38,7 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPCRE}
-LIB_DEPENDS+=	pcre.3:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
 .else
 CONFIGURE_ARGS+=	--disable-perl-regexp
 .endif

Modified: head/textproc/gnugrep/pkg-plist
==============================================================================
--- head/textproc/gnugrep/pkg-plist	Sun Oct  6 16:09:43 2013	(r329599)
+++ head/textproc/gnugrep/pkg-plist	Sun Oct  6 16:18:29 2013	(r329600)
@@ -1,6 +1,9 @@
 bin/egrep
 bin/fgrep
 bin/grep
+man/man1/egrep.1.gz
+man/man1/fgrep.1.gz
+man/man1/grep.1.gz
 %%NLS%%share/locale/af/LC_MESSAGES/grep.mo
 %%NLS%%share/locale/be/LC_MESSAGES/grep.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/grep.mo