- Update to 1.80

4 files changed, 5 insertions, 46 deletions

diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile
index 5a5d08ae56c1..4efd9bee1e4a 100644
--- a/devel/cppcheck/Makefile
+++ b/devel/cppcheck/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cppcheck
-PORTVERSION=	1.79
+PORTVERSION=	1.80
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
diff --git a/devel/cppcheck/distinfo b/devel/cppcheck/distinfo
index 63456e02d4fb..79ea468063c8 100644
--- a/devel/cppcheck/distinfo
+++ b/devel/cppcheck/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495198335
-SHA256 (cppcheck-1.79.tar.bz2) = 2b85b693de54f15048f1841e7aef74574f99da6270d2182baba78514fa27f06d
-SIZE (cppcheck-1.79.tar.bz2) = 1206623
+TIMESTAMP = 1503163510
+SHA256 (cppcheck-1.80.tar.bz2) = 0841d248df8da239fff60787c2fa91a9be04643de91e6d134169533ca137a0fb
+SIZE (cppcheck-1.80.tar.bz2) = 1223503
diff --git a/devel/cppcheck/files/patch-tools_matchcompiler.py b/devel/cppcheck/files/patch-tools_matchcompiler.py
deleted file mode 100644
index bd40e5c65a92..000000000000
--- a/devel/cppcheck/files/patch-tools_matchcompiler.py
+++ /dev/null
@@ -1,42 +0,0 @@
-commit 9d64e9a5577877dd9608823fb42fbef8d13af085
-Author: Dmitry Marakasov <amdmi3@amdmi3.ru>
-Date:   Fri May 19 21:36:54 2017 +0300
-
-    Fix matchcompiler failure in case of parallel build
-    
-    During parallel build, multiple processes will try to create build_dir
-    in parallel, so the build will fail. Fix that by calling makedirs
-    unconditionally and ignoring errors from it. If there's actual
-    problem with directory creation, it'll be caught later by isdir()
-    check.
-
-diff --git tools/matchcompiler.py tools/matchcompiler.py
-index 71f176d59..2ba36b29f 100755
---- tools/matchcompiler.py
-+++ tools/matchcompiler.py
-@@ -22,6 +22,7 @@ import sys
- import re
- import glob
- import argparse
-+import errno
- 
- 
- class MatchCompiler:
-@@ -667,8 +668,16 @@ def main():
-         sys.exit(-1)
- 
-     # Create build directory if needed
--    if not os.path.exists(build_dir):
-+    try:
-         os.makedirs(build_dir)
-+    except OSError as e:
-+        # due to race condition in case of parallel build,
-+        # makedirs may fail. Ignore that; if there's actual
-+        # problem with directory creation, it'll be caught
-+        # by the following isdir check
-+        if e.errno != errno.EEXIST:
-+            raise
-+
-     if not os.path.isdir(build_dir):
-         raise Exception(build_dir + ' is not a directory')
- 
diff --git a/devel/cppcheck/pkg-plist b/devel/cppcheck/pkg-plist
index fa06047489c1..958a992698cc 100644
--- a/devel/cppcheck/pkg-plist
+++ b/devel/cppcheck/pkg-plist
@@ -3,6 +3,7 @@ bin/cppcheck
 %%DATADIR%%/gnu.cfg
 %%DATADIR%%/gtk.cfg
 %%DATADIR%%/microsoft_sal.cfg
+%%DATADIR%%/motif.cfg
 %%DATADIR%%/posix.cfg
 %%DATADIR%%/qt.cfg
 %%DATADIR%%/sdl.cfg