svn commit: r338514 - in head/devel/fam: . files
Matthias Andree
mandree at FreeBSD.org
Fri Jan 3 01:45:49 UTC 2014
Author: mandree
Date: Fri Jan 3 01:45:45 2014
New Revision: 338514
URL: http://svnweb.freebsd.org/changeset/ports/338514
Log:
- 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.
Added:
head/devel/fam/files/patch-Makefile.am (contents, props changed)
head/devel/fam/files/patch-fam__Directory.c++ (contents, props changed)
head/devel/fam/files/patch-fam__DirectoryScanner.c++ (contents, props changed)
head/devel/fam/files/patch-fam__DirectoryScanner.h (contents, props changed)
head/devel/fam/files/patch-fam__FileSystem.c++ (contents, props changed)
head/devel/fam/files/patch-fam__FileSystemTable.c++ (contents, props changed)
head/devel/fam/files/patch-fam__IMon.c++ (contents, props changed)
head/devel/fam/files/patch-fam__Listener.c++ (contents, props changed)
head/devel/fam/files/patch-fam__Log.c++ (contents, props changed)
head/devel/fam/files/patch-fam__Makefile.am (contents, props changed)
head/devel/fam/files/patch-fam__SmallTable.h (contents, props changed)
head/devel/fam/files/patch-fam__StringTable.h (contents, props changed)
head/devel/fam/files/patch-include__BTree.h (contents, props changed)
head/devel/fam/files/patch-libfam__Client.c++ (contents, props changed)
Deleted:
head/devel/fam/files/patch-fam-Listener.c++
head/devel/fam/files/patch-fam-Log.c++
head/devel/fam/files/patch-fam::SmallTable.h
head/devel/fam/files/patch-fam_Directory.c++
head/devel/fam/files/patch-fam_DirectoryScanner.c++
head/devel/fam/files/patch-fam_DirectoryScanner.h
head/devel/fam/files/patch-fam_FileSystem.c++
head/devel/fam/files/patch-fam_FileSystemTable.c++
head/devel/fam/files/patch-fam_Makefile.am
head/devel/fam/files/patch-fam_StringTable.h
head/devel/fam/files/patch-include::BTree.h
Modified:
head/devel/fam/Makefile (contents, props changed)
head/devel/fam/files/mntent_compat.c++ (contents, props changed)
head/devel/fam/files/patch-configure.in (contents, props changed)
Modified: head/devel/fam/Makefile
==============================================================================
--- head/devel/fam/Makefile Fri Jan 3 01:12:59 2014 (r338513)
+++ head/devel/fam/Makefile Fri Jan 3 01:45:45 2014 (r338514)
@@ -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
Modified: head/devel/fam/files/mntent_compat.c++
==============================================================================
--- head/devel/fam/files/mntent_compat.c++ Fri Jan 3 01:12:59 2014 (r338513)
+++ head/devel/fam/files/mntent_compat.c++ Fri Jan 3 01:45:45 2014 (r338514)
@@ -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"},
Added: head/devel/fam/files/patch-Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/fam/files/patch-Makefile.am Fri Jan 3 01:45:45 2014 (r338514)
@@ -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:
+- - at 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..."
+- - at 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..."
+- - at killall -HUP inetd
++SUBDIRS = include support libfam fam man test build
Modified: head/devel/fam/files/patch-configure.in
==============================================================================
--- head/devel/fam/files/patch-configure.in Fri Jan 3 01:12:59 2014 (r338513)
+++ head/devel/fam/files/patch-configure.in Fri Jan 3 01:45:45 2014 (r338514)
@@ -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
Added: head/devel/fam/files/patch-fam__Directory.c++
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/fam/files/patch-fam__Directory.c++ Fri Jan 3 01:45:45 2014 (r338514)
@@ -0,0 +1,11 @@
+--- ./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>
+ #include <stdio.h>
+-#include <sys/dir.h>
++#include <dirent.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+ #include <unistd.h>
Added: head/devel/fam/files/patch-fam__DirectoryScanner.c++
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/fam/files/patch-fam__DirectoryScanner.c++ Fri Jan 3 01:45:45 2014 (r338514)
@@ -0,0 +1,11 @@
+--- ./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)
+ {
+- struct direct *dp = readdir(dir);
++ struct dirent *dp = readdir(dir);
+ if (dp == NULL)
+ { closedir(dir);
+ dir = NULL;
Added: head/devel/fam/files/patch-fam__DirectoryScanner.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/fam/files/patch-fam__DirectoryScanner.h Fri Jan 3 01:45:45 2014 (r338514)
@@ -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"
+
Added: head/devel/fam/files/patch-fam__FileSystem.c++
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/fam/files/patch-fam__FileSystem.c++ Fri Jan 3 01:45:45 2014 (r338514)
@@ -0,0 +1,11 @@
+--- ./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"
+
+-#include <mntent.h>
++#include "mntent.h"
+ #include <string.h>
+
+ #include "Event.h"
Added: head/devel/fam/files/patch-fam__FileSystemTable.c++
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/fam/files/patch-fam__FileSystemTable.c++ Fri Jan 3 01:45:45 2014 (r338514)
@@ -0,0 +1,10 @@
+--- ./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)
+ { create_fs_by_name();
+- mtab_watcher = new InternalClient(mtab_name, mtab_event_handler, NULL);
+ }
+
+ cr.become_user();
Added: head/devel/fam/files/patch-fam__IMon.c++
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/fam/files/patch-fam__IMon.c++ Fri Jan 3 01:45:45 2014 (r338514)
@@ -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;
Added: head/devel/fam/files/patch-fam__Listener.c++
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/fam/files/patch-fam__Listener.c++ Fri Jan 3 01:45:45 2014 (r338514)
@@ -0,0 +1,22 @@
+--- ./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>
+ #include <unistd.h>
++#ifdef __FreeBSD__
++#include <stdio.h>
++#include <stdlib.h>
++#endif // __FreeBSD__
+
+ #include <errno.h>
+
+@@ -203,7 +207,7 @@
+ // requested user and pass the name back to the client.
+
+ // Unset TMPDIR to ensure that tempnam() works as desired
+- putenv("TMPDIR=");
++ unsetenv("TMPDIR");
+
+ char *tmpfile = tempnam("/tmp", ".fam");
+ #if defined(__FreeBSD__)
Added: head/devel/fam/files/patch-fam__Log.c++
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/fam/files/patch-fam__Log.c++ Fri Jan 3 01:45:45 2014 (r338514)
@@ -0,0 +1,13 @@
+--- ./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>
+ #include <syslog.h>
++#include <sys/time.h>
+ #include <sys/resource.h>
+ #include <sys/stat.h>
+-#include <sys/time.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+ #ifdef HAVE_AUDIT
Added: head/devel/fam/files/patch-fam__Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/fam/files/patch-fam__Makefile.am Fri Jan 3 01:45:45 2014 (r338514)
@@ -0,0 +1,10 @@
+--- ./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++ \
+ timeval.h \
++ mntent_compat.c++ \
+ @IMON_FUNCS at .c++
+
+ EXTRA_fam_SOURCES = IMonIrix.c++ IMonLinux.c++ IMonNone.c++
Added: head/devel/fam/files/patch-fam__SmallTable.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/fam/files/patch-fam__SmallTable.h Fri Jan 3 01:45:45 2014 (r338514)
@@ -0,0 +1,11 @@
+--- ./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 @@
+ }
+
+ template <class Tkey, class Tvalue>
+-SmallTable<Tkey, Tvalue>::Closure
++typename SmallTable<Tkey, Tvalue>::Closure
+ SmallTable<Tkey, Tvalue>::position(const Tkey& key) const
+ {
+ unsigned l = 0, r = n;
Added: head/devel/fam/files/patch-fam__StringTable.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/fam/files/patch-fam__StringTable.h Fri Jan 3 01:45:45 2014 (r338514)
@@ -0,0 +1,10 @@
+--- ./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>
+ #include <string.h>
++#include "mntent.h"
+
+ // A StringTable maps C strings onto values. It is a cheap O(n)
+ // implementation, suitable only for small tables that are
Added: head/devel/fam/files/patch-include__BTree.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/fam/files/patch-include__BTree.h Fri Jan 3 01:45:45 2014 (r338514)
@@ -0,0 +1,65 @@
+--- ./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.
+
+ template <class Key, class Value>
+-BTree<Key, Value>::Closure
++typename BTree<Key, Value>::Closure
+ 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 @@
+ }
+
+ template <class Key, class Value>
+-BTree<Key, Value>::Closure
++typename BTree<Key, Value>::Closure
+ BTree<Key, Value>::Node::next(const Key& pred) const
+ {
+ if (!this)
+@@ -404,7 +404,7 @@
+ // nodes as necessary on the way back.
+
+ template <class Key, class Value>
+-BTree<Key, Value>::Closure
++typename BTree<Key, Value>::Closure
+ BTree<Key, Value>::insert(Node *p, const Key& key, const Value& value)
+ {
+ if (!p) return Closure(key, value, NULL);
+@@ -499,7 +499,7 @@
+ // Returns UNDER if node p is too small afterward, OK otherwise.
+
+ template <class Key, class Value>
+-BTree<Key, Value>::Status
++typename BTree<Key, Value>::Status
+ BTree<Key, Value>::underflow(Node *p, unsigned i)
+ {
+ assert(p);
+@@ -557,7 +557,7 @@
+
+
+ template <class Key, class Value>
+-BTree<Key, Value>::Closure
++typename BTree<Key, Value>::Closure
+ BTree<Key, Value>::remove_rightmost(Node *p)
+ {
+ int i = p->n;
+@@ -587,7 +587,7 @@
+ // back up.
+
+ template <class Key, class Value>
+-BTree<Key, Value>::Status
++typename BTree<Key, Value>::Status
+ BTree<Key, Value>::remove(Node *p, const Key& key)
+ {
+ if (!p)
Added: head/devel/fam/files/patch-libfam__Client.c++
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/fam/files/patch-libfam__Client.c++ Fri Jan 3 01:45:45 2014 (r338514)
@@ -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;
+ }
More information about the svn-ports-all
mailing list