ials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#if defined(HAVE_MNTENT_H) -#include -#else -#ifndef _MNTENT_H -#define _MNTENT_H -#include - -#define MOUNTED "dummy" - -#define MNTTYPE_NFS "nfs" - -struct mntent { - char *mnt_fsname; - char *mnt_dir; - char *mnt_type; - char *mnt_opts; - int mnt_freq; - int mnt_passno; -}; - -#define setmntent(x,y) ((FILE *)0x1) -struct mntent *getmntent __P ((FILE *fp)); -char *hasmntopt __P ((const struct mntent *mnt, const char *option)); -#define endmntent(x) ((int)1) - -#endif /* _MNTENT_H */ -#endif /* HAVE_MNTENT_H */ diff --git a/devel/fam/files/mntent_compat.c++ b/devel/fam/files/mntent_compat.c++ deleted file mode 100644 index f48f4e586232..000000000000 --- a/devel/fam/files/mntent_compat.c++ +++ /dev/null @@ -1,174 +0,0 @@ -/* - * Copyright (c) 1980, 1989, 1993, 1994 - * The Regents of the University of California. All rights reserved. - * Copyright (c) 2001 - * David Rufino - * Copyright (c) 2006 - * Stanislav Sedov - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* most of this was ripped from the mount(3) source */ - -#include "config.h" -#include "mntent.h" -#include -#include -#include -#include -#include - -static int pos = -1; -static int mntsize = -1; -static struct mntent _mntent; - -struct { - int m_flag; - const char *m_option; -} mntoptions[] = { - { MNT_ASYNC, "async" }, - { MNT_NOATIME, "noatime"}, - { MNT_NOEXEC, "noexec"}, - { MNT_NOSUID, "nosuid"}, - { MNT_NOSYMFOLLOW, "nosymfollow"}, - { MNT_SYNCHRONOUS, "sync"}, - { MNT_UNION, "union"}, - { MNT_NOCLUSTERR, "noclusterr"}, - { static_cast(MNT_NOCLUSTERW), "noclusterw"}, - { MNT_SUIDDIR, "suiddir"}, -#ifdef MNT_SNAPSHOT - { MNT_SNAPSHOT, "snapshot"}, -#endif -#ifdef MNT_MULTILABEL - { MNT_MULTILABEL, "multilabel"}, -#endif -#ifdef MNT_ACLS - { MNT_ACLS, "acls"}, -#endif -#ifdef MNT_NODEV - { MNT_NODEV, "nodev"}, -#endif -}; - -#define N_OPTS (sizeof(mntoptions) / sizeof(*mntoptions)) - -char * -hasmntopt (const struct mntent *mnt, const char *option) -{ - int found; - char *opt, *optbuf; - - optbuf = strdup(mnt->mnt_opts); - found = 0; - for (opt = optbuf; (opt = strtok(opt, " ")) != NULL; opt = NULL) { - if (!strcasecmp(opt, option)) { - opt = opt - optbuf + mnt->mnt_opts; - free (optbuf); - return (opt); - } - } - free (optbuf); - return (NULL); -} - -static char * -catopt (char *s0, const char *s1) -{ - size_t newlen; - char *cp; - - if (s1 == NULL || *s1 == '\0') - return s0; - - if (s0 != NULL) { - newlen = strlen(s0) + strlen(s1) + 1 + 1; - if ((cp = (char *)realloc(s0, newlen)) == NULL) - return (NULL); - - (void)strcat(cp, " "); - (void)strcat(cp, s1); - } else - cp = strdup(s1); - - return (cp); -} - - -static char * -flags2opts (int flags) -{ - char *res = NULL; - int i; - - res = catopt(res, (flags & MNT_RDONLY) ? "ro" : "rw"); - - for (i = 0; i < N_OPTS; i++) - if (flags & mntoptions[i].m_flag) - res = catopt(res, mntoptions[i].m_option); - return res; -} - -static struct mntent * -statfs_to_mntent (struct statfs *mntbuf) -{ - static char opts_buf[40], *tmp; - - _mntent.mnt_fsname = mntbuf->f_mntfromname; - _mntent.mnt_dir = mntbuf->f_mntonname; - _mntent.mnt_type = mntbuf->f_fstypename; - tmp = flags2opts (mntbuf->f_flags); - if (tmp) { - opts_buf[sizeof(opts_buf) - 1] = '\0'; - strncpy (opts_buf, tmp, sizeof(opts_buf)-1); - free (tmp); - } else { - *opts_buf = '\0'; - } - _mntent.mnt_opts = opts_buf; - _mntent.mnt_freq = _mntent.mnt_passno = 0; - return (&_mntent); -} - -struct mntent * -getmntent (FILE *fp) -{ - struct statfs *mntbuf; - - if (pos == -1 || mntsize == -1) - mntsize = getmntinfo (&mntbuf, MNT_NOWAIT); - - ++pos; - if (pos == mntsize) { - pos = mntsize = -1; - return (NULL); - } - - return (statfs_to_mntent (&mntbuf[pos])); -} diff --git a/devel/fam/files/patch-Makefile.am b/devel/fam/files/patch-Makefile.am deleted file mode 100644 index 4952fb5550c4..000000000000 --- a/devel/fam/files/patch-Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ ---- ./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 deleted file mode 100644 index 0bf4262db4f7..000000000000 --- a/devel/fam/files/patch-configure.in +++ /dev/null @@ -1,23 +0,0 @@ ---- ./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 - --FAM_DECL_IN_MNTENT(MNTTYPE_NFS, ,AC_MSG_ERROR(Didn't find MNTTYPE_NFS in mntent.h)) --FAM_DECL_IN_MNTENT(MNTTYPE_NFS2, AC_DEFINE(HAVE_MNTTYPE_NFS2)) --FAM_DECL_IN_MNTENT(MNTTYPE_NFS3, AC_DEFINE(HAVE_MNTTYPE_NFS3)) --FAM_DECL_IN_MNTENT(MNTTYPE_CACHEFS, AC_DEFINE(HAVE_MNTTYPE_CACHEFS)) -- - dnl - dnl Test for bindresvport() prototype. - dnl -@@ -563,8 +558,6 @@ - man/fam.1m - support/Makefile - test/Makefile -- util/Makefile -- util/editconf/Makefile - ) - - dnl diff --git a/devel/fam/files/patch-fam_NFSFileSystem.c++ b/devel/fam/files/patch-fam_NFSFileSystem.c++ deleted file mode 100644 index a500b3fecfbc..000000000000 --- a/devel/fam/files/patch-fam_NFSFileSystem.c++ +++ /dev/null @@ -1,11 +0,0 @@ ---- 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; diff --git a/devel/fam/files/patch-fam__Directory.c++ b/devel/fam/files/patch-fam__Directory.c++ deleted file mode 100644 index e78d561e4ace..000000000000 --- a/devel/fam/files/patch-fam__Directory.c++ +++ /dev/null @@ -1,11 +0,0 @@ ---- ./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 - #include - #include --#include -+#include - #include - #include - #include diff --git a/devel/fam/files/patch-fam__DirectoryScanner.c++ b/devel/fam/files/patch-fam__DirectoryScanner.c++ deleted file mode 100644 index aa39109a00f6..000000000000 --- a/devel/fam/files/patch-fam__DirectoryScanner.c++ +++ /dev/null @@ -1,11 +0,0 @@ ---- ./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; diff --git a/devel/fam/files/patch-fam__DirectoryScanner.h b/devel/fam/files/patch-fam__DirectoryScanner.h deleted file mode 100644 index d040f7d3c1fb..000000000000 --- a/devel/fam/files/patch-fam__DirectoryScanner.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ./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 - #include --#include -+#include - - #include "Event.h" - diff --git a/devel/fam/files/patch-fam__FileSystem.c++ b/devel/fam/files/patch-fam__FileSystem.c++ deleted file mode 100644 index 0d459e2d230e..000000000000 --- a/devel/fam/files/patch-fam__FileSystem.c++ +++ /dev/null @@ -1,11 +0,0 @@ ---- ./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 -+#include "mntent.h" - #include - - #include "Event.h" diff --git a/devel/fam/files/patch-fam__FileSystemTable.c++ b/devel/fam/files/patch-fam__FileSystemTable.c++ deleted file mode 100644 index 86d8baede64d..000000000000 --- a/devel/fam/files/patch-fam__FileSystemTable.c++ +++ /dev/null @@ -1,10 +0,0 @@ ---- ./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(); diff --git a/devel/fam/files/patch-fam__IMon.c++ b/devel/fam/files/patch-fam__IMon.c++ deleted file mode 100644 index d5e398da610d..000000000000 --- a/devel/fam/files/patch-fam__IMon.c++ +++ /dev/null @@ -1,11 +0,0 @@ ---- ./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++ deleted file mode 100644 index e940750a727e..000000000000 --- a/devel/fam/files/patch-fam__Listener.c++ +++ /dev/null @@ -1,22 +0,0 @@ ---- ./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 - #include - #include -+#ifdef __FreeBSD__ -+#include -+#include -+#endif // __FreeBSD__ - - #include - -@@ -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__) diff --git a/devel/fam/files/patch-fam__Log.c++ b/devel/fam/files/patch-fam__Log.c++ deleted file mode 100644 index 444cef6f6c20..000000000000 --- a/devel/fam/files/patch-fam__Log.c++ +++ /dev/null @@ -1,13 +0,0 @@ ---- ./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 - #include - #include -+#include - #include - #include --#include - #include - #include - #ifdef HAVE_AUDIT diff --git a/devel/fam/files/patch-fam__Makefile.am b/devel/fam/files/patch-fam__Makefile.am deleted file mode 100644 index 60acadef5cbc..000000000000 --- a/devel/fam/files/patch-fam__Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ ---- ./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@.c++ - - EXTRA_fam_SOURCES = IMonIrix.c++ IMonLinux.c++ IMonNone.c++ diff --git a/devel/fam/files/patch-fam__SmallTable.h b/devel/fam/files/patch-fam__SmallTable.h deleted file mode 100644 index 0849943c442a..000000000000 --- a/devel/fam/files/patch-fam__SmallTable.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ./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 --SmallTable::Closure -+typename SmallTable::Closure - SmallTable::position(const Tkey& key) const - { - unsigned l = 0, r = n; diff --git a/devel/fam/files/patch-fam__StringTable.h b/devel/fam/files/patch-fam__StringTable.h deleted file mode 100644 index 5b88fc7edb76..000000000000 --- a/devel/fam/files/patch-fam__StringTable.h +++ /dev/null @@ -1,10 +0,0 @@ ---- ./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 - #include -+#include "mntent.h" - - // A StringTable maps C strings onto values. It is a cheap O(n) - // implementation, suitable only for small tables that are diff --git a/devel/fam/files/patch-include__BTree.h b/devel/fam/files/patch-include__BTree.h deleted file mode 100644 index 628b52a463ac..000000000000 --- a/devel/fam/files/patch-include__BTree.h +++ /dev/null @@ -1,65 +0,0 @@ ---- ./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 --BTree::Closure -+typename BTree::Closure - BTree::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 --BTree::Closure -+typename BTree::Closure - BTree::Node::next(const Key& pred) const - { - if (!this) -@@ -404,7 +404,7 @@ - // nodes as necessary on the way back. - - template --BTree::Closure -+typename BTree::Closure - BTree::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 --BTree::Status -+typename BTree::Status - BTree::underflow(Node *p, unsigned i) - { - assert(p); -@@ -557,7 +557,7 @@ - - - template --BTree::Closure -+typename BTree::Closure - BTree::remove_rightmost(Node *p) - { - int i = p->n; -@@ -587,7 +587,7 @@ - // back up. - - template --BTree::Status -+typename BTree::Status - BTree::remove(Node *p, const Key& key) - { - if (!p) diff --git a/devel/fam/files/patch-libfam__Client.c++ b/devel/fam/files/patch-libfam__Client.c++ deleted file mode 100644 index 701037e9f85c..000000000000 --- a/devel/fam/files/patch-libfam__Client.c++ +++ /dev/null @@ -1,19 +0,0 @@ ---- ./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 - #include - --#include - - #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; - } diff --git a/devel/fam/files/pkg-message.in b/devel/fam/files/pkg-message.in deleted file mode 100644 index 6932f510e4af..000000000000 --- a/devel/fam/files/pkg-message.in +++ /dev/null @@ -1,29 +0,0 @@ -[ -{ type: install - message: <