svn commit: r329600 - head/textproc/gnugrep

[Johan van Selst]

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