Index: head/textproc/gnugrep/Makefile
===================================================================
--- head/textproc/gnugrep/Makefile	(revision 297283)
+++ head/textproc/gnugrep/Makefile	(revision 297284)
@@ -1,58 +1,56 @@
 # New ports collection makefile for:    grep
 # Date created:                         5 February 2010
 # Whom:                                 Gabor Kovesdan <gabor@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	grep
-PORTVERSION=	2.9
-PORTREVISION=	1
+PORTVERSION=	2.12
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	GNU
 PKGNAMEPREFIX=	gnu
 
 MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	GNU grep
 
-CONFLICTS=	bsd-grep-*
-
 LICENSE=	GPLv3
 
+CONFLICTS=	bsd-grep-[0-9]*
+
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
 
 MAN1=		egrep.1 \
 		fgrep.1 \
 		grep.1
 INFO=		grep
 
 OPTIONS=	PCRE	"Compile with Perl-compatible regex support"	off
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
 LDFLAGS+=	-lintl -L${LOCALBASE}/lib
 PLIST_SUB+=	NLS=
 .else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
 .if defined(WITH_PCRE)
 LIB_DEPENDS+=	pcre.1:${PORTSDIR}/devel/pcre
 .else
 CONFIGURE_ARGS+=	--disable-perl-regexp
 .endif
 
 post-patch:
 .if defined(WITHOUT_NLS)
 	@${REINPLACE_CMD} '/install-exec-local:/s/install-exec-localcharset//' \
 		${WRKSRC}/lib/Makefile.in
 .endif
 	@${REINPLACE_CMD} 's|mkinstalldirs = .*|mkinstalldirs = ${MKDIR}|g' \
 		${WRKSRC}/po/Makefile.in.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Property changes on: head/textproc/gnugrep/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.12
\ No newline at end of property
+1.13
\ No newline at end of property
Index: head/textproc/gnugrep/distinfo
===================================================================
--- head/textproc/gnugrep/distinfo	(revision 297283)
+++ head/textproc/gnugrep/distinfo	(revision 297284)
@@ -1,2 +1,2 @@
-SHA256 (grep-2.9.tar.xz) = e60301c5e1acb171949dd62175adcdade95a06aa8b22e6192184b58cc34cae60
-SIZE (grep-2.9.tar.xz) = 1041396
+SHA256 (grep-2.12.tar.xz) = 4dce0a4fb83ddd0120df51e00b52fa760f2ed8675d4d4c0b0ae642ba692ead64
+SIZE (grep-2.12.tar.xz) = 1179436

Property changes on: head/textproc/gnugrep/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property