Index: head/devel/cccc/Makefile
===================================================================
--- head/devel/cccc/Makefile
+++ head/devel/cccc/Makefile
@@ -2,22 +2,24 @@
 # $FreeBSD$
 
 PORTNAME=	cccc
-PORTVERSION=	3.1.4
-PORTREVISION=	2
+DISTVERSION=	3.1.5
 CATEGORIES=	devel textproc www
-MASTER_SITES=	SF
 
 MAINTAINER=	pizzamig@FreeBSD.org
 COMMENT=	C and C++ Code Counter
 
 LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/cccc/COPYING
 
 USES=		gmake
+USE_GITHUB=	yes
+GH_ACCOUNT=	sarnold
+
 MAKEFILE=	makefile
 MAKE_ENV=	CCC="${CXX}" LD="${CXX}" CFLAGS_DEBUG="${CXXFLAGS}"
+ALL_TARGET=	cccc
 MAKE_JOBS_UNSAFE=	yes
-
-PORTDOCS=	readme.txt changes.txt
+PORTDOCS=	README.md CHANGELOG.md
 PLIST_FILES=	bin/cccc
 
 OPTIONS_DEFINE=	DOCS DEBUG
Index: head/devel/cccc/distinfo
===================================================================
--- head/devel/cccc/distinfo
+++ head/devel/cccc/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cccc-3.1.4.tar.gz) = 27b3eca9a83a66799332363a80cc4bcd6db9869eddbda1a59a25cdace3ff4dbf
-SIZE (cccc-3.1.4.tar.gz) = 632007
+TIMESTAMP = 1504624763
+SHA256 (sarnold-cccc-3.1.5_GH0.tar.gz) = 6fe91eae83ad0ff4c1fe4277aabb6e7554a4dec1bb266b5657c064ef48a23142
+SIZE (sarnold-cccc-3.1.5_GH0.tar.gz) = 662760
Index: head/devel/cccc/files/patch-cccc__cccc_tbl.cc
===================================================================
--- head/devel/cccc/files/patch-cccc__cccc_tbl.cc
+++ head/devel/cccc/files/patch-cccc__cccc_tbl.cc
@@ -1,11 +0,0 @@
---- cccc/cccc_tbl.cc.orig	2006-01-05 16:05:30 UTC
-+++ cccc/cccc_tbl.cc
-@@ -96,7 +96,7 @@ bool CCCC_Table<T>::remove(T* old_item_p
-   typename map_t::iterator value_iterator=map_t::find(old_item_ptr->key());
-   if(value_iterator!=map_t::end())
-     {
--      erase(value_iterator);
-+      map_t::erase(value_iterator);
-       retval=true;
-     }
-   return retval;