Index: head/textproc/cgrep/Makefile
===================================================================
--- head/textproc/cgrep/Makefile	(revision 447721)
+++ head/textproc/cgrep/Makefile	(revision 447722)
@@ -1,39 +1,40 @@
 # Created by: Li-Wen Hsu <lwhsu@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	cgrep
 PORTVERSION=	6.4.3
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	textproc
 
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Context-aware grep for source codes
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	ghc:lang/ghc \
 		hs-ansi-terminal>=0.5:devel/hs-ansi-terminal \
 		hs-cmdargs>=0.10:devel/hs-cmdargs \
 		hs-dlist>=0.3:devel/hs-dlist \
 		hs-regex-posix>=0.90:textproc/hs-regex-posix \
 		hs-safe>=0.3:devel/hs-safe \
 		hs-split>=0.2:devel/hs-split \
 		hs-stm>=2.1:devel/hs-stm \
 		hs-stringsearch>=0.3:textproc/hs-stringsearch \
 		hs-unordered-containers>=0.1:devel/hs-unordered-containers
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	awgn
 
 USES=	gmake
 
 do-build:
 	cd ${WRKSRC}/src && ${GMAKE} cgrep
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/cgrep ${STAGEDIR}${PREFIX}/bin/
 
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/cgreprc ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
Index: head/textproc/cgrep/files/patch-src_Main.hs
===================================================================
--- head/textproc/cgrep/files/patch-src_Main.hs	(nonexistent)
+++ head/textproc/cgrep/files/patch-src_Main.hs	(revision 447722)
@@ -0,0 +1,32 @@
+Backport of:
+From 2f787c5c1ba42ccee2f1ced759b3a4570afa9b28 Mon Sep 17 00:00:00 2001
+From: ilovezfs <ilovezfs@icloud.com>
+Date: Mon, 23 May 2016 03:53:52 -0700
+Subject: [PATCH] cgrep: fix isSymbolicLink collision
+
+System.Directory.isSymbolicLink collides with
+System.PosixCompat.Files.isSymbolicLink (and with
+System.Posix.Files.isSymbolicLink)
+
+This applies the solution proposed here:
+https://github.com/haskell/directory/issues/52#issuecomment-220879392
+--- src/Main.hs.orig	2014-06-21 09:27:05 UTC
++++ src/Main.hs
+@@ -37,7 +37,7 @@ import System.Console.CmdArgs
+ import System.Directory
+ import System.FilePath ((</>), takeFileName)
+ import System.Environment
+-import System.Posix.Files
++import System.Posix.Files as PosixFiles
+ import System.IO
+ import System.Exit
+ 
+@@ -67,7 +67,7 @@ putRecursiveContents opts inchan topdir langs prunedir
+                 status  <- getFileStatus path
+                 lstatus <- getSymbolicLinkStatus path
+                 unless (cpath `Set.member` visited) $
+-                    if isDirectory status && (not (isSymbolicLink lstatus) || deference_recursive opts)
++                    if isDirectory status && (not (PosixFiles.isSymbolicLink lstatus) || deference_recursive opts)
+                        then unless (filename `elem` prunedir)  $
+                            putRecursiveContents opts inchan path langs prunedir (Set.insert cpath visited)
+                        else case getLang opts filename >>= (\f -> f `elemIndex` langs <|> toMaybe 0 (null langs) ) of

Property changes on: head/textproc/cgrep/files/patch-src_Main.hs
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property