- Fix build with libc++, dropping hardcoded -lstdc++ from the right Makefile.

- Fix build with clang, casting a large constant to int in mntent_compat.c++.
- Fix a noisy clang warning in BTree.h by parenthesizing the 2nd for() expr.
- Fix a format string mismatch (%d/size_t -> %lu/unsigned long) in snprintf.
- Regenerate patches, and normalize their filenames, with make makepatch.
- Bump PORTREVISION.

18 files changed, 119 insertions, 40 deletions

diff --git a/devel/fam/Makefile b/devel/fam/Makefile
index 0ae86e77bc88..5045321876e4 100644
--- a/devel/fam/Makefile
+++ b/devel/fam/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fam
 PORTVERSION=	2.6.10
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	ftp://oss.sgi.com/projects/fam/download/
 DIST_SUBDIR=	${PORTNAME}
@@ -23,14 +23,14 @@ SUB_FILES=	pkg-message
 #CONFLICTS_INSTALL=	gamin-[0-9]*
 
 post-patch:
-	@${REINPLACE_CMD} -e "s/-lstdc++//g" ${WRKSRC}/Makefile.am
+	${REINPLACE_CMD} -e "s/-lstdc++//g" ${WRKSRC}/libfam/Makefile.am
 
 pre-configure:
-	@${RM} -fr ${WRKSRC}/util
-	@${MV} ${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.am.orig
-	@${SED} -e s/util// -e /SUBDIRS/q \
+	${RM} -fr ${WRKSRC}/util
+	${MV} ${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.am.orig
+	${SED} -e s/util// -e /SUBDIRS/q \
 		<${WRKSRC}/Makefile.am.orig >${WRKSRC}/Makefile.am
-	@${CP} ${FILESDIR}/mntent* ${WRKSRC}/fam
+	${CP} ${FILESDIR}/mntent* ${WRKSRC}/fam
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfam.so.0
diff --git a/devel/fam/files/mntent_compat.c++ b/devel/fam/files/mntent_compat.c++
index 6169936f2a46..f48f4e586232 100644
--- a/devel/fam/files/mntent_compat.c++
+++ b/devel/fam/files/mntent_compat.c++
@@ -61,7 +61,7 @@ struct {
 	{ MNT_SYNCHRONOUS,	"sync"},
 	{ MNT_UNION,		"union"},
 	{ MNT_NOCLUSTERR,	"noclusterr"},
-	{ MNT_NOCLUSTERW,	"noclusterw"},
+	{ static_cast<int>(MNT_NOCLUSTERW),	"noclusterw"},
 	{ MNT_SUIDDIR,		"suiddir"},
 #ifdef MNT_SNAPSHOT
 	{ MNT_SNAPSHOT,		"snapshot"},
diff --git a/devel/fam/files/patch-Makefile.am b/devel/fam/files/patch-Makefile.am
new file mode 100644
index 000000000000..4952fb5550c4
--- /dev/null
+++ b/devel/fam/files/patch-Makefile.am
@@ -0,0 +1,40 @@
+--- ./Makefile.am.orig	2003-04-15 06:20:33.000000000 +0200
++++ ./Makefile.am	2014-01-03 02:35:10.000000000 +0100
+@@ -1,36 +1,3 @@
+ include $(top_srcdir)/common.am
+ 
+-SUBDIRS = util include support libfam fam man test build
+-
+-EXTRA_DIST = common.am INSTALL.rpm
+-
+-rpm: dist
+-	@cd build && $(MAKE) $(AM_MAKEFLAGS) rpm
+-
+-#  We proceed even if these commands fail because this might be an install
+-#  into $DESTDIR by a non-root user.
+-install-exec-hook:
+-	-@if test "no$(LDCONFIG)" != "no"; then \
+-##	    echo "Adding $(libdir) to ld.so.conf..."; \
+-	    $(EDITCONF) ld.so.conf add $(DESTDIR)$(libdir) $(DESTDIR)$(libdir); \
+-	    exec $(LDCONFIG); \
+-	fi
+-##	@echo "Adding fam to rpc..."
+-	-@$(EDITCONF) rpc add 391002 "sgi_fam		391002"
+-##	@echo "Adding fam to inetd.conf..."
+-	-@$(EDITCONF) inetd.conf add '\b(fam|FAM)\b' \
+-	    "#  fam, the File Alteration Monitor, http://oss.sgi.com/projects/fam/" \
+-	    "sgi_fam/1-2 stream rpc/tcp wait root $(DESTDIR)$(bindir)/fam fam"
+-	@echo "Restarting inetd..."
+-	-@killall -HUP inetd
+-
+-#  We don't remove $(libdir) from ld.so.conf here because we don't have
+-#  a way to tell whether we're the ones who added it, and other things
+-#  probably use it as well.
+-uninstall-local:
+-##	@echo "Removing fam from rpc..."
+-	-@$(EDITCONF) rpc remove 391002
+-##	@echo "Removing fam from inetd.conf..."
+-	-@$(EDITCONF) inetd.conf remove '\b(fam|FAM)\b'
+-	@echo "Restarting inetd..."
+-	-@killall -HUP inetd
++SUBDIRS =  include support libfam fam man test build
diff --git a/devel/fam/files/patch-configure.in b/devel/fam/files/patch-configure.in
index 944540a97b85..0bf4262db4f7 100644
--- a/devel/fam/files/patch-configure.in
+++ b/devel/fam/files/patch-configure.in
@@ -1,5 +1,5 @@
---- configure.in.orig	Fri Aug 11 22:23:19 2006
-+++ configure.in	Fri Aug 11 22:24:34 2006
+--- ./configure.in.orig	2003-04-15 08:05:00.000000000 +0200
++++ ./configure.in	2014-01-03 02:35:10.000000000 +0100
 @@ -308,11 +308,6 @@
  dnl If we don't have MNTTYPE_NFS , we croak.
  dnl
diff --git a/devel/fam/files/patch-fam_DirectoryScanner.h b/devel/fam/files/patch-fam_DirectoryScanner.h
deleted file mode 100644
index 8bccdcdda9ff..000000000000
--- a/devel/fam/files/patch-fam_DirectoryScanner.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- fam/DirectoryScanner.h.orig	Tue Apr 15 10:21:30 2003
-+++ fam/DirectoryScanner.h	Sat Aug 12 00:10:29 2006
-@@ -27,7 +27,7 @@
- 
- #include <stddef.h>
- #include <sys/types.h>
--#include <sys/dir.h>
-+#include <dirent.h>
- 
- #include "Event.h"
- 
diff --git a/devel/fam/files/patch-fam_Directory.c++ b/devel/fam/files/patch-fam__Directory.c++
index 656b780d766a..e78d561e4ace 100644
--- a/devel/fam/files/patch-fam_Directory.c++
+++ b/devel/fam/files/patch-fam__Directory.c++
@@ -1,5 +1,5 @@
---- fam/Directory.c++.orig	Tue Apr 15 10:21:29 2003
-+++ fam/Directory.c++	Sat Aug 12 00:10:16 2006
+--- ./fam/Directory.c++.orig	2003-04-15 06:21:29.000000000 +0200
++++ ./fam/Directory.c++	2014-01-03 02:35:10.000000000 +0100
 @@ -26,7 +26,7 @@
  #include <errno.h>
  #include <string.h>
diff --git a/devel/fam/files/patch-fam_DirectoryScanner.c++ b/devel/fam/files/patch-fam__DirectoryScanner.c++
index f34a00b49327..aa39109a00f6 100644
--- a/devel/fam/files/patch-fam_DirectoryScanner.c++
+++ b/devel/fam/files/patch-fam__DirectoryScanner.c++
@@ -1,5 +1,5 @@
---- fam/DirectoryScanner.c++.orig	Sat Aug 12 00:12:06 2006
-+++ fam/DirectoryScanner.c++	Sat Aug 12 00:13:23 2006
+--- ./fam/DirectoryScanner.c++.orig	2003-04-15 06:21:30.000000000 +0200
++++ ./fam/DirectoryScanner.c++	2014-01-03 02:35:10.000000000 +0100
 @@ -100,7 +100,7 @@
      
      while (dir && ready)
diff --git a/devel/fam/files/patch-fam__DirectoryScanner.h b/devel/fam/files/patch-fam__DirectoryScanner.h
new file mode 100644
index 000000000000..d040f7d3c1fb
--- /dev/null
+++ b/devel/fam/files/patch-fam__DirectoryScanner.h
@@ -0,0 +1,11 @@
+--- ./fam/DirectoryScanner.h.orig	2003-04-15 06:21:30.000000000 +0200
++++ ./fam/DirectoryScanner.h	2014-01-03 02:35:10.000000000 +0100
+@@ -27,7 +27,7 @@
+ 
+ #include <stddef.h>
+ #include <sys/types.h>
+-#include <sys/dir.h>
++#include <dirent.h>
+ 
+ #include "Event.h"
+ 
diff --git a/devel/fam/files/patch-fam_FileSystem.c++ b/devel/fam/files/patch-fam__FileSystem.c++
index f1df752f19a3..0d459e2d230e 100644
--- a/devel/fam/files/patch-fam_FileSystem.c++
+++ b/devel/fam/files/patch-fam__FileSystem.c++
@@ -1,5 +1,5 @@
---- fam/FileSystem.c++.orig	Fri Aug 11 22:26:04 2006
-+++ fam/FileSystem.c++	Fri Aug 11 22:26:26 2006
+--- ./fam/FileSystem.c++.orig	2003-04-15 06:21:30.000000000 +0200
++++ ./fam/FileSystem.c++	2014-01-03 02:35:10.000000000 +0100
 @@ -22,7 +22,7 @@
  
  #include "FileSystem.h"
diff --git a/devel/fam/files/patch-fam_FileSystemTable.c++ b/devel/fam/files/patch-fam__FileSystemTable.c++
index 6759e9a32980..86d8baede64d 100644
--- a/devel/fam/files/patch-fam_FileSystemTable.c++
+++ b/devel/fam/files/patch-fam__FileSystemTable.c++
@@ -1,5 +1,5 @@
---- fam/FileSystemTable.c++.orig	Fri Aug 11 22:27:15 2006
-+++ fam/FileSystemTable.c++	Fri Aug 11 22:28:29 2006
+--- ./fam/FileSystemTable.c++.orig	2003-04-15 06:21:31.000000000 +0200
++++ ./fam/FileSystemTable.c++	2014-01-03 02:35:10.000000000 +0100
 @@ -255,7 +255,6 @@
      //  create_fs_by_name initializes our "root" member variable.
      if (!fs_by_name)
diff --git a/devel/fam/files/patch-fam__IMon.c++ b/devel/fam/files/patch-fam__IMon.c++
new file mode 100644
index 000000000000..d5e398da610d
--- /dev/null
+++ b/devel/fam/files/patch-fam__IMon.c++
@@ -0,0 +1,11 @@
+--- ./fam/IMon.c++.orig	2003-04-15 06:21:31.000000000 +0200
++++ ./fam/IMon.c++	2014-01-03 02:35:10.000000000 +0100
+@@ -42,7 +42,7 @@
+ #include "Interest.h"
+ #include "Log.h"
+ #include "Scheduler.h"
+-#include "alloc.h"
++// #include "alloc.h"
+ 
+ int		   IMon::imonfd = -2;
+ IMon::EventHandler IMon::ehandler = NULL;
diff --git a/devel/fam/files/patch-fam-Listener.c++ b/devel/fam/files/patch-fam__Listener.c++
index 623ecae98278..e940750a727e 100644
--- a/devel/fam/files/patch-fam-Listener.c++
+++ b/devel/fam/files/patch-fam__Listener.c++
@@ -1,5 +1,5 @@
---- fam/Listener.c++.orig	Tue Apr 15 13:52:40 2003
-+++ fam/Listener.c++	Thu Jan 11 05:28:45 2007
+--- ./fam/Listener.c++.orig	2003-04-15 06:52:40.000000000 +0200
++++ ./fam/Listener.c++	2014-01-03 02:35:10.000000000 +0100
 @@ -36,6 +36,10 @@
  #include <sys/stat.h>
  #include <sys/un.h>
diff --git a/devel/fam/files/patch-fam-Log.c++ b/devel/fam/files/patch-fam__Log.c++
index b1fd5e67844e..444cef6f6c20 100644
--- a/devel/fam/files/patch-fam-Log.c++
+++ b/devel/fam/files/patch-fam__Log.c++
@@ -1,5 +1,5 @@
---- fam/Log.c++~	Tue Jul 16 02:16:14 2002
-+++ fam/Log.c++	Tue Sep  3 19:56:25 2002
+--- ./fam/Log.c++.orig	2003-04-15 06:21:36.000000000 +0200
++++ ./fam/Log.c++	2014-01-03 02:35:10.000000000 +0100
 @@ -28,9 +28,9 @@
  #include <stdlib.h>
  #include <string.h>
diff --git a/devel/fam/files/patch-fam_Makefile.am b/devel/fam/files/patch-fam__Makefile.am
index a09277096b21..60acadef5cbc 100644
--- a/devel/fam/files/patch-fam_Makefile.am
+++ b/devel/fam/files/patch-fam__Makefile.am
@@ -1,5 +1,5 @@
---- fam/Makefile.am.orig	Fri Aug 11 22:29:03 2006
-+++ fam/Makefile.am	Fri Aug 11 22:29:18 2006
+--- ./fam/Makefile.am.orig	2003-04-15 06:21:26.000000000 +0200
++++ ./fam/Makefile.am	2014-01-03 02:35:10.000000000 +0100
 @@ -72,6 +72,7 @@
    main.c++ \
    timeval.c++ \
diff --git a/devel/fam/files/patch-fam::SmallTable.h b/devel/fam/files/patch-fam__SmallTable.h
index c03f87fc7e19..0849943c442a 100644
--- a/devel/fam/files/patch-fam::SmallTable.h
+++ b/devel/fam/files/patch-fam__SmallTable.h
@@ -1,5 +1,5 @@
---- fam/SmallTable.h.orig	Tue Jul 16 14:23:25 2002
-+++ fam/SmallTable.h	Sat Jul 31 13:14:09 2004
+--- ./fam/SmallTable.h.orig	2003-04-15 06:21:43.000000000 +0200
++++ ./fam/SmallTable.h	2014-01-03 02:35:10.000000000 +0100
 @@ -98,7 +98,7 @@
  }
  
diff --git a/devel/fam/files/patch-fam_StringTable.h b/devel/fam/files/patch-fam__StringTable.h
index b13f3b868cb6..5b88fc7edb76 100644
--- a/devel/fam/files/patch-fam_StringTable.h
+++ b/devel/fam/files/patch-fam__StringTable.h
@@ -1,5 +1,5 @@
---- fam/StringTable.h.orig	Fri Aug 11 22:29:55 2006
-+++ fam/StringTable.h	Fri Aug 11 22:30:12 2006
+--- ./fam/StringTable.h.orig	2003-04-15 06:21:43.000000000 +0200
++++ ./fam/StringTable.h	2014-01-03 02:35:10.000000000 +0100
 @@ -25,6 +25,7 @@
  
  #include <assert.h>
diff --git a/devel/fam/files/patch-include::BTree.h b/devel/fam/files/patch-include__BTree.h
index 4fdb2245dc79..628b52a463ac 100644
--- a/devel/fam/files/patch-include::BTree.h
+++ b/devel/fam/files/patch-include__BTree.h
@@ -1,5 +1,5 @@
---- include/BTree.h.orig	Tue Jul 16 14:23:25 2002
-+++ include/BTree.h	Sat Jul 31 13:13:24 2004
+--- ./include/BTree.h.orig	2003-04-15 06:21:19.000000000 +0200
++++ ./include/BTree.h	2014-01-03 02:35:37.000000000 +0100
 @@ -236,7 +236,7 @@
  //  to the right and returns them.
  
@@ -9,6 +9,15 @@
  BTree<Key, Value>::Node::remove(unsigned j)
  {
      Key k = key[j];
+@@ -318,7 +318,7 @@
+     assert(root->n);
+ 
+     Node *p, *q;
+-    for (p = root; q = p->link[0]; p = q)
++    for (p = root; (q = p->link[0]); p = q)
+ 	continue;
+     return p->key[0];
+ }
 @@ -348,7 +348,7 @@
  }
  
diff --git a/devel/fam/files/patch-libfam__Client.c++ b/devel/fam/files/patch-libfam__Client.c++
new file mode 100644
index 000000000000..701037e9f85c
--- /dev/null
+++ b/devel/fam/files/patch-libfam__Client.c++
@@ -0,0 +1,19 @@
+--- ./libfam/Client.c++.orig	2003-04-15 06:21:25.000000000 +0200
++++ ./libfam/Client.c++	2014-01-03 02:35:10.000000000 +0100
+@@ -34,7 +34,6 @@
+ #include <syslog.h>
+ #include <errno.h>
+ 
+-#include <iostream.h>
+ 
+ #include "fam.h"
+ #include "Client.h"
+@@ -264,7 +263,7 @@
+         {
+             char msg[100];
+             snprintf(msg, sizeof(msg),
+-                     "change info too long! (%d max)", sizeof(changeInfo));
++                     "change info too long! (%lu max)", (unsigned long)sizeof(changeInfo));
+             croakConnection(msg);
+             return -1;
+         }