Update devel/rvm to version 1.6. Changes from version 1.3 include:

* Fixed stray fsync calls when using partitions on BSD platforms.
* Fixed <sys/time.h> vs. <time.h> confusion.
* Fixed off by one bug in the RVM error table.

4 files changed, 134 insertions, 24 deletions

diff --git a/devel/rvm/Makefile b/devel/rvm/Makefile
index 6377e70e282..01b7ada8e05 100644
--- a/devel/rvm/Makefile
+++ b/devel/rvm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2001/06/19 03:32:40 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2002/06/20 19:28:14 jlam Exp $
 #
 
-DISTNAME=	rvm-1.3
+DISTNAME=	rvm-1.6
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/rvm/src/ \
 		ftp://ftp.wu-wien.ac.at/pub/systems/coda/src/
@@ -10,15 +10,19 @@ MAINTAINER=	phil@cs.wwu.edu
 HOMEPAGE=	http://www.coda.cs.cmu.edu/
 COMMENT=	Recoverable Virtual Memory
 
-#LICENSE=	GPL
-
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 USE_GMAKE=		YES
 USE_BUILDLINK_ONLY=	YES
 
 CONFIGURE_ARGS+=	--with-lwp-includes=${BUILDLINK_DIR}/include
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+
+pre-build:
+	cd ${WRKSRC}/rvm;						\
+	for file in *.c; do						\
+		${LN} -sf $${file} `${BASENAME} $${file} .c`_lwp.c;	\
+	done
 
 .include "../../devel/lwp/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/rvm/PLIST b/devel/rvm/PLIST
index 48bf8a6bf25..8f458615416 100644
--- a/devel/rvm/PLIST
+++ b/devel/rvm/PLIST
@@ -1,33 +1,33 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:26:38 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/06/20 19:28:14 jlam Exp $
 include/rvm/rds.h
 include/rvm/rvm.h
 include/rvm/rvm_segment.h
 include/rvm/rvm_statistics.h
-@dirrm include/rvm
 lib/librds.a
-lib/librvm.a
-lib/librdslwp.a
-lib/librvmlwp.a
 lib/librds.la
-lib/librvm.la
-lib/librdslwp.la
-lib/librvmlwp.la
 lib/librds.so
 lib/librds.so.2
-lib/librds.so.2.1
-lib/librvm.so
-lib/librvm.so.2
-lib/librvm.so.2.1
+lib/librds.so.2.3
+lib/librdslwp.a
+lib/librdslwp.la
 lib/librdslwp.so
 lib/librdslwp.so.2
-lib/librdslwp.so.2.1
+lib/librdslwp.so.2.3
+lib/librvm.a
+lib/librvm.la
+lib/librvm.so
+lib/librvm.so.2
+lib/librvm.so.2.3
+lib/librvmlwp.a
+lib/librvmlwp.la
 lib/librvmlwp.so
 lib/librvmlwp.so.2
-lib/librvmlwp.so.2.1
+lib/librvmlwp.so.2.3
 lib/libseg.a
 lib/libseg.la
 lib/libseg.so
 lib/libseg.so.2
-lib/libseg.so.2.1
-sbin/rvmutl
+lib/libseg.so.2.3
 sbin/rdsinit
+sbin/rvmutl
+@dirrm include/rvm
diff --git a/devel/rvm/distinfo b/devel/rvm/distinfo
index 00687512d46..b4745f4d839 100644
--- a/devel/rvm/distinfo
+++ b/devel/rvm/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.3 2001/04/27 19:01:55 phil Exp $
+$NetBSD: distinfo,v 1.4 2002/06/20 19:28:15 jlam Exp $
 
-SHA1 (rvm-1.3.tar.gz) = 4d8302d808aa9b5a7118c06eb0d4d106b87a2237
-Size (rvm-1.3.tar.gz) = 340508 bytes
+SHA1 (rvm-1.6.tar.gz) = d6b27b37601d5d1666f3956feb6582c3cb6b1d99
+Size (rvm-1.6.tar.gz) = 374944 bytes
+SHA1 (patch-aa) = c8faef5459fd5ab06293b8131ec9f41451e63bc5
diff --git a/devel/rvm/patches/patch-aa b/devel/rvm/patches/patch-aa
new file mode 100644
index 00000000000..a87b914109d
--- /dev/null
+++ b/devel/rvm/patches/patch-aa
@@ -0,0 +1,105 @@
+$NetBSD: patch-aa,v 1.1 2002/06/20 19:28:15 jlam Exp $
+
+--- rvm/Makefile.in.orig	Tue Jun 12 12:24:35 2001
++++ rvm/Makefile.in
+@@ -444,76 +444,52 @@
+ 
+ 
+ rvm_init.lo: rvm_init.c rvm_init_lwp.lo
+-rvm_init_lwp.lo: rvm_init.c
+-	$(LTCOMPILE) $(LWPFLAGS) -c $< && \
+-	mv rvm_init.lo rvm_init_lwp.lo && \
+-	mv rvm_init.o rvm_init_lwp.o
++rvm_init_lwp.lo: rvm_init_lwp.c
++	$(LTCOMPILE) $(LWPFLAGS) -c $<
+ 
+ rvm_map.lo: rvm_map.c rvm_map_lwp.lo
+-rvm_map_lwp.lo: rvm_map.c
+-	$(LTCOMPILE) $(LWPFLAGS) -c $< && \
+-	mv rvm_map.lo rvm_map_lwp.lo && \
+-	mv rvm_map.o rvm_map_lwp.o
++rvm_map_lwp.lo: rvm_map_lwp.c
++	$(LTCOMPILE) $(LWPFLAGS) -c $<
+ 
+ rvm_unmap.lo: rvm_unmap.c rvm_unmap_lwp.lo
+-rvm_unmap_lwp.lo: rvm_unmap.c
+-	$(LTCOMPILE) $(LWPFLAGS) -c $< && \
+-	mv rvm_unmap.lo rvm_unmap_lwp.lo && \
+-	mv rvm_unmap.o rvm_unmap_lwp.o
++rvm_unmap_lwp.lo: rvm_unmap_lwp.c
++	$(LTCOMPILE) $(LWPFLAGS) -c $<
+ 
+ rvm_trans.lo: rvm_trans.c rvm_trans_lwp.lo
+-rvm_trans_lwp.lo: rvm_trans.c
+-	$(LTCOMPILE) $(LWPFLAGS) -c $< && \
+-	mv rvm_trans.lo rvm_trans_lwp.lo && \
+-	mv rvm_trans.o rvm_trans_lwp.o
++rvm_trans_lwp.lo: rvm_trans_lwp.c
++	$(LTCOMPILE) $(LWPFLAGS) -c $<
+ 
+ rvm_logstatus.lo: rvm_logstatus.c rvm_logstatus_lwp.lo
+-rvm_logstatus_lwp.lo: rvm_logstatus.c
+-	$(LTCOMPILE) $(LWPFLAGS) -c $< && \
+-	mv rvm_logstatus.lo rvm_logstatus_lwp.lo && \
+-	mv rvm_logstatus.o rvm_logstatus_lwp.o
++rvm_logstatus_lwp.lo: rvm_logstatus_lwp.c
++	$(LTCOMPILE) $(LWPFLAGS) -c $<
+ 
+ rvm_logflush.lo: rvm_logflush.c rvm_logflush_lwp.lo
+-rvm_logflush_lwp.lo: rvm_logflush.c
+-	$(LTCOMPILE) $(LWPFLAGS) -c $< && \
+-	mv rvm_logflush.lo rvm_logflush_lwp.lo && \
+-	mv rvm_logflush.o rvm_logflush_lwp.o
++rvm_logflush_lwp.lo: rvm_logflush_lwp.c
++	$(LTCOMPILE) $(LWPFLAGS) -c $<
+ 
+ rvm_logrecovr.lo: rvm_logrecovr.c rvm_logrecovr_lwp.lo
+-rvm_logrecovr_lwp.lo: rvm_logrecovr.c
+-	$(LTCOMPILE) $(LWPFLAGS) -c $< && \
+-	mv rvm_logrecovr.lo rvm_logrecovr_lwp.lo && \
+-	mv rvm_logrecovr.o rvm_logrecovr_lwp.o
++rvm_logrecovr_lwp.lo: rvm_logrecovr_lwp.c
++	$(LTCOMPILE) $(LWPFLAGS) -c $<
+ 
+ rvm_utils.lo: rvm_utils.c rvm_utils_lwp.lo
+-rvm_utils_lwp.lo: rvm_utils.c
+-	$(LTCOMPILE) $(LWPFLAGS) -c $< && \
+-	mv rvm_utils.lo rvm_utils_lwp.lo && \
+-	mv rvm_utils.o rvm_utils_lwp.o
++rvm_utils_lwp.lo: rvm_utils_lwp.c
++	$(LTCOMPILE) $(LWPFLAGS) -c $<
+ 
+ rvm_io.lo: rvm_io.c rvm_io_lwp.lo
+-rvm_io_lwp.lo: rvm_io.c
+-	$(LTCOMPILE) $(LWPFLAGS) -c $< && \
+-	mv rvm_io.lo rvm_io_lwp.lo && \
+-	mv rvm_io.o rvm_io_lwp.o
++rvm_io_lwp.lo: rvm_io_lwp.c
++	$(LTCOMPILE) $(LWPFLAGS) -c $<
+ 
+ rvm_status.lo: rvm_status.c rvm_status_lwp.lo
+-rvm_status_lwp.lo: rvm_status.c
+-	$(LTCOMPILE) $(LWPFLAGS) -c $< && \
+-	mv rvm_status.lo rvm_status_lwp.lo && \
+-	mv rvm_status.o rvm_status_lwp.o
++rvm_status_lwp.lo: rvm_status_lwp.c
++	$(LTCOMPILE) $(LWPFLAGS) -c $<
+ 
+ rvm_debug.lo: rvm_debug.c rvm_debug_lwp.lo
+-rvm_debug_lwp.lo: rvm_debug.c
+-	$(LTCOMPILE) $(LWPFLAGS) -c $< && \
+-	mv rvm_debug.lo rvm_debug_lwp.lo && \
+-	mv rvm_debug.o rvm_debug_lwp.o
++rvm_debug_lwp.lo: rvm_debug_lwp.c
++	$(LTCOMPILE) $(LWPFLAGS) -c $<
+ 
+ rvm_printers.lo: rvm_printers.c rvm_printers_lwp.lo
+-rvm_printers_lwp.lo: rvm_printers.c
+-	$(LTCOMPILE) $(LWPFLAGS) -c $< && \
+-	mv rvm_printers.lo rvm_printers_lwp.lo && \
+-	mv rvm_printers.o rvm_printers_lwp.o
++rvm_printers_lwp.lo: rvm_printers_lwp.c
++	$(LTCOMPILE) $(LWPFLAGS) -c $<
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.