Version bump. No longer need the gcc3 patch as it is applied upstream

5 files changed, 87 insertions, 9 deletions

diff --git a/app-admin/fam-oss/ChangeLog b/app-admin/fam-oss/ChangeLog
index f754120c6679..549e837ad8e2 100644
--- a/app-admin/fam-oss/ChangeLog
+++ b/app-admin/fam-oss/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/fam-oss
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fam-oss/ChangeLog,v 1.22 2003/05/17 18:39:34 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam-oss/ChangeLog,v 1.23 2003/06/09 17:20:43 raker Exp $
+
+*fam-oss-2.6.10 (09 Jun 2003)
+
+  09 Jun 2003; Nick Hadaway <raker@gentoo.org> fam-oss-2.6.10.ebuild,
+  files/digest-fam-oss-2.6.10, files/fam-oss-2.6.10-largefile.patch:
+  Version bump.  No longer needs the gcc3 patch.
 
 *fam-oss-2.6.9-r3 (17 May 2003)
 
diff --git a/app-admin/fam-oss/Manifest b/app-admin/fam-oss/Manifest
index e9b0eff88518..0fce2d1e1b80 100644
--- a/app-admin/fam-oss/Manifest
+++ b/app-admin/fam-oss/Manifest
@@ -1,15 +1,17 @@
-MD5 6846e4da9cddbbc6f39c5c13b6bec866 ChangeLog 3223
 MD5 59354444afc34991d23bedf7013a6166 fam-oss-2.6.9-r1.ebuild 1305
 MD5 40981d28d4e6491863cd7b34110024bf fam-oss-2.6.9.ebuild 1199
-MD5 621c06ad0f7ce9f160b6d4ce81e7646f fam-oss-2.6.9-r2.ebuild 1448
 MD5 5c3d5425643411b751c3f039f0aa678d fam-oss-2.6.9-r3.ebuild 1489
-MD5 0bf8d935c21bfe80427c982dc3d41357 files/digest-fam-oss-2.6.9 118
-MD5 0bf8d935c21bfe80427c982dc3d41357 files/digest-fam-oss-2.6.9-r1 118
-MD5 3f8fee0b9f3239d2c92623af9a2c4844 files/dnotify.patch 28983
+MD5 5c3d5425643411b751c3f039f0aa678d fam-oss-2.6.10.ebuild 1489
+MD5 621c06ad0f7ce9f160b6d4ce81e7646f fam-oss-2.6.9-r2.ebuild 1448
+MD5 6846e4da9cddbbc6f39c5c13b6bec866 ChangeLog 3223
 MD5 179cf9d7c004f510debb9f40bb21c34e files/fam 504
 MD5 b03797e114f768833ab0291a940e9038 files/fam-oss-2.6.9-gcc3.patch 435
-MD5 cf2ec68df6ce23777000ce8b78c49df1 files/digest-fam-oss-2.6.9-r2 61
-MD5 3cbaa44382dadea506e93bf3a97e35cc files/dnotify.patch.new 29321
-MD5 6d8076ab39e8b5432cf36468abe505b9 files/fam-2.6.7-cleanup.patch 1868
 MD5 28ba151456fe1d493cdbafe08c3c0e5e files/fam-oss-2.6.9-largefile.patch 525
+MD5 6d8076ab39e8b5432cf36468abe505b9 files/fam-2.6.7-cleanup.patch 1868
+MD5 0bf8d935c21bfe80427c982dc3d41357 files/digest-fam-oss-2.6.9 118
+MD5 3cbaa44382dadea506e93bf3a97e35cc files/dnotify.patch.new 29321
+MD5 0dba17f68005aa92b3903797dcc7c625 files/digest-fam-oss-2.6.10 62
+MD5 0bf8d935c21bfe80427c982dc3d41357 files/digest-fam-oss-2.6.9-r1 118
+MD5 cf2ec68df6ce23777000ce8b78c49df1 files/digest-fam-oss-2.6.9-r2 61
 MD5 cf2ec68df6ce23777000ce8b78c49df1 files/digest-fam-oss-2.6.9-r3 61
+MD5 3f8fee0b9f3239d2c92623af9a2c4844 files/dnotify.patch 28983
diff --git a/app-admin/fam-oss/fam-oss-2.6.10.ebuild b/app-admin/fam-oss/fam-oss-2.6.10.ebuild
new file mode 100644
index 000000000000..1b09b199df1f
--- /dev/null
+++ b/app-admin/fam-oss/fam-oss-2.6.10.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam-oss/fam-oss-2.6.10.ebuild,v 1.1 2003/06/09 17:20:43 raker Exp $
+
+inherit libtool eutils
+
+MY_P="${P/-oss/}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="FAM, the File Alteration Monitor"
+SRC_URI="ftp://oss.sgi.com/projects/fam/download/${MY_P}.tar.gz"
+HOMEPAGE="http://oss.sgi.com/projects/fam/"
+
+KEYWORDS="~x86 ~ppc ~alpha ~sparc"
+SLOT="0"
+LICENSE="GPL-2 LGPL-2.1"
+
+DEPEND=">=dev-lang/perl-5.6.1"
+RDEPEND=">=net-nds/portmap-5b-r6"
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+
+	cd ${S}
+	epatch ${FILESDIR}/dnotify.patch.new
+	epatch ${FILESDIR}/fam-2.6.7-cleanup.patch
+	epatch ${FILESDIR}/${P}-largefile.patch
+
+# Now in dnotify patch.  Should fix the sigqueue overflow problems
+#	cd ${S}/fam
+#	mv Makefile.am Makefile.am.old
+#	sed -e "s:fam_LDADD =:fam_LDADD = -lrt -lpthread:" Makefile.am.old > Makefile.am
+
+	elibtoolize
+
+	# This one is old, and automake will install new one
+	rm -rf ${S}/missing
+	
+	export WANT_AUTOCONF_2_5=1
+	export WANT_AUTOMAKE_1_5=1
+	aclocal
+	autoconf
+#	autoheader
+	automake --add-missing
+}
+
+src_install() {
+	cp fam/fam.conf fam/fam.conf.old
+	sed s:"local_only = false":"local_only = true":g fam/fam.conf.old >fam/fam.conf
+			
+	make DESTDIR=${D} install || die
+	     
+	exeinto /etc/init.d
+	doexe ${FILESDIR}/fam
+	
+	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS TODO README*
+}
diff --git a/app-admin/fam-oss/files/digest-fam-oss-2.6.10 b/app-admin/fam-oss/files/digest-fam-oss-2.6.10
new file mode 100644
index 000000000000..ef684e7ab983
--- /dev/null
+++ b/app-admin/fam-oss/files/digest-fam-oss-2.6.10
@@ -0,0 +1 @@
+MD5 1c5a2ea659680bdd1e238d7828a857a7 fam-2.6.10.tar.gz 321189
diff --git a/app-admin/fam-oss/files/fam-oss-2.6.10-largefile.patch b/app-admin/fam-oss/files/fam-oss-2.6.10-largefile.patch
new file mode 100644
index 000000000000..d3312a0879af
--- /dev/null
+++ b/app-admin/fam-oss/files/fam-oss-2.6.10-largefile.patch
@@ -0,0 +1,13 @@
+--- fam-2.6.9/common.am	Tue Jul 16 01:23:24 2002
++++ fam-2.6.9-largefile/common.am	Mon Oct 28 16:21:55 2002
+@@ -4,7 +4,9 @@
+ AUTOMAKE_OPTIONS=no-dependencies
+ 
+ #  why couldn't CONFIG_ETC_CONFIG_PATH be defined in config.h???
+-INCLUDES = @FAMPROTOINC@ -DCONFIG_ETC_CONFIG_PATH=\"@FAM_CONF@\"
++INCLUDES = @FAMPROTOINC@ -DCONFIG_ETC_CONFIG_PATH=\"@FAM_CONF@\"	\
++	-D_FILE_OFFSET_BITS=64						\
++	-D_LARGEFILE64_SOURCE
+ 
+ #  should this be set by the configure script?
+ EDITCONF = perl $(top_srcdir)/util/editconf/editconf.perl