svn commit: r430714 - in branches/2017Q1/devel/fam: . files

Antoine Brodin antoine at FreeBSD.org
Fri Jan 6 16:42:12 UTC 2017


Author: antoine
Date: Fri Jan  6 16:42:11 2017
New Revision: 430714
URL: https://svnweb.freebsd.org/changeset/ports/430714

Log:
  MFH: r430520
  
  devel/fam: unbreak with libc++ 3.9
  
  NFSFileSystem.c++:105:12: error: assigning to 'char *' from incompatible type 'const char *'
      if ((p = strstr(opt, "actimeo")))
             ^ ~~~~~~~~~~~~~~~~~~~~~~
  NFSFileSystem.c++:112:12: error: assigning to 'char *' from incompatible type 'const char *'
      if ((p = strstr(opt, "acregmin"))) {
             ^ ~~~~~~~~~~~~~~~~~~~~~~~
  NFSFileSystem.c++:118:12: error: assigning to 'char *' from incompatible type 'const char *'
      if ((p = strstr(opt, "acregmax"))) {
             ^ ~~~~~~~~~~~~~~~~~~~~~~~
  
  PR:		212343
  Regressed by:	https://github.com/llvm-mirror/libcxx/commit/b4aa97130b8b

Added:
  branches/2017Q1/devel/fam/files/patch-fam_NFSFileSystem.c++
     - copied unchanged from r430520, head/devel/fam/files/patch-fam_NFSFileSystem.c++
Modified:
  branches/2017Q1/devel/fam/Makefile
Directory Properties:
  branches/2017Q1/   (props changed)

Modified: branches/2017Q1/devel/fam/Makefile
==============================================================================
--- branches/2017Q1/devel/fam/Makefile	Fri Jan  6 15:43:13 2017	(r430713)
+++ branches/2017Q1/devel/fam/Makefile	Fri Jan  6 16:42:11 2017	(r430714)
@@ -3,7 +3,7 @@
 
 PORTNAME=	fam
 PORTVERSION=	2.6.10
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	devel
 MASTER_SITES=	ftp://oss.sgi.com/projects/fam/download/
 DIST_SUBDIR=	${PORTNAME}

Copied: branches/2017Q1/devel/fam/files/patch-fam_NFSFileSystem.c++ (from r430520, head/devel/fam/files/patch-fam_NFSFileSystem.c++)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q1/devel/fam/files/patch-fam_NFSFileSystem.c++	Fri Jan  6 16:42:11 2017	(r430714, copy of r430520, head/devel/fam/files/patch-fam_NFSFileSystem.c++)
@@ -0,0 +1,11 @@
+--- fam/NFSFileSystem.c++.orig	2003-04-15 04:21:38 UTC
++++ fam/NFSFileSystem.c++
+@@ -97,7 +97,7 @@ NFSFileSystem::NFSFileSystem(const mnten
+ 
+     attr_cache_timeout = ACREGMAX;
+ 
+-    char * p;
++    const char * p;
+         
+     if (strstr(opt, "noac")) {
+         f_noac = true;


More information about the svn-ports-branches mailing list