Fix Fam after recent gcc 3.4 import.

Submitted by:	Alexander Nedotsukov <bland@FreeBSD.org>

4 files changed, 71 insertions, 5 deletions

diff --git a/devel/fam/Makefile b/devel/fam/Makefile
index b33ecddb54f4..3e32fcb47821 100644
--- a/devel/fam/Makefile
+++ b/devel/fam/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		fam
 PORTVERSION=		2.6.9
-PORTREVISION=		4
+PORTREVISION=		5
 CATEGORIES=		devel
 MASTER_SITES=		ftp://oss.sgi.com/projects/fam/download/
 PATCH_SITES=		ftp://oss.sgi.com/projects/fam/download/patches/
@@ -22,7 +22,7 @@ CFLAGS+=		-Wno-deprecated
 
 USE_AUTOMAKE_VER=15
 USE_AUTOCONF_VER=253
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
@@ -36,8 +36,8 @@ pre-configure:
 	@${SED} -e s/util// -e /SUBDIRS/q \
 		<${WRKSRC}/Makefile.am.orig >${WRKSRC}/Makefile.am
 	@${RM} -f ${WRKSRC}/Makefile.am.orig
-	${RM} -fv ${WRKSRC}/fam/mntent*
-	${CP} ${FILESDIR}/mntent* ${WRKSRC}/fam
+	@${RM} -f ${WRKSRC}/fam/mntent*
+	@${CP} ${FILESDIR}/mntent* ${WRKSRC}/fam
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/devel/fam/files/patch-fam::SmallTable.h b/devel/fam/files/patch-fam::SmallTable.h
new file mode 100644
index 000000000000..c03f87fc7e19
--- /dev/null
+++ b/devel/fam/files/patch-fam::SmallTable.h
@@ -0,0 +1,11 @@
+--- fam/SmallTable.h.orig	Tue Jul 16 14:23:25 2002
++++ fam/SmallTable.h	Sat Jul 31 13:14:09 2004
+@@ -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;
diff --git a/devel/fam/files/patch-include::BTree.h b/devel/fam/files/patch-include::BTree.h
new file mode 100644
index 000000000000..4fdb2245dc79
--- /dev/null
+++ b/devel/fam/files/patch-include::BTree.h
@@ -0,0 +1,56 @@
+--- include/BTree.h.orig	Tue Jul 16 14:23:25 2002
++++ include/BTree.h	Sat Jul 31 13:13:24 2004
+@@ -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];
+@@ -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)
diff --git a/devel/fam/pkg-plist b/devel/fam/pkg-plist
index dd261a6553e8..40c648d693df 100644
--- a/devel/fam/pkg-plist
+++ b/devel/fam/pkg-plist
@@ -2,7 +2,6 @@ bin/fam
 etc/fam.conf
 include/fam.h
 lib/libfam.a
-lib/libfam.la
 lib/libfam.so
 lib/libfam.so.0
 @unexec rm -f %D/etc/rc.d/fam.sh || true