From owner-svn-ports-head@freebsd.org  Wed Dec 16 02:02:17 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id EC5E4A49F5A;
 Wed, 16 Dec 2015 02:02:17 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A2D1C1532;
 Wed, 16 Dec 2015 02:02:17 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBG22GUp095319;
 Wed, 16 Dec 2015 02:02:16 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBG22GcB095317;
 Wed, 16 Dec 2015 02:02:16 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201512160202.tBG22GcB095317@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Wed, 16 Dec 2015 02:02:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r403832 - in head/devel/cccc: . files
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.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Dec 2015 02:02:18 -0000

Author: amdmi3
Date: Wed Dec 16 02:02:16 2015
New Revision: 403832
URL: https://svnweb.freebsd.org/changeset/ports/403832

Log:
  - Switch to options helpers
  - Simplify installation
  - Regenerate patches with `make makepatch`

Modified:
  head/devel/cccc/Makefile
  head/devel/cccc/files/patch-cccc__cccc_tbl.cc

Modified: head/devel/cccc/Makefile
==============================================================================
--- head/devel/cccc/Makefile	Wed Dec 16 02:02:09 2015	(r403831)
+++ head/devel/cccc/Makefile	Wed Dec 16 02:02:16 2015	(r403832)
@@ -20,6 +20,8 @@ MAKE_JOBS_UNSAFE=	yes
 PORTDOCS=	readme.txt changes.txt
 PLIST_FILES=	bin/cccc
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/^all/s|install|| ; \
@@ -38,10 +40,12 @@ post-patch:
 .endfor
 
 do-install:
-	(cd ${WRKSRC}/cccc && ${INSTALL_PROGRAM} cccc ${STAGEDIR}${PREFIX}/bin)
+	${INSTALL_PROGRAM} ${WRKSRC}/cccc/cccc ${STAGEDIR}${PREFIX}/bin
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
-	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>

Modified: head/devel/cccc/files/patch-cccc__cccc_tbl.cc
==============================================================================
--- head/devel/cccc/files/patch-cccc__cccc_tbl.cc	Wed Dec 16 02:02:09 2015	(r403831)
+++ head/devel/cccc/files/patch-cccc__cccc_tbl.cc	Wed Dec 16 02:02:16 2015	(r403832)
@@ -1,6 +1,6 @@
---- ./cccc/cccc_tbl.cc.orig	2011-07-01 03:42:55.000000000 +0200
-+++ ./cccc/cccc_tbl.cc	2011-07-01 03:43:07.000000000 +0200
-@@ -96,7 +96,7 @@
+--- 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())
      {