svn commit: r403832 - in head/devel/cccc: . files

[Dmitry Marakasov]

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())
      {