diff -urN /usr/ports/archivers/rvm/Makefile archivers/rvm/Makefile
--- /usr/ports/archivers/rvm/Makefile	Mon Mar 15 17:05:46 2004
+++ archivers/rvm/Makefile	Sat Apr  3 22:12:07 2004
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	rvm
-PORTVERSION=	0.80.a
+PORTVERSION=	0.80.2.a
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -23,8 +23,13 @@
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-default-config-file=${PREFIX}/etc/rvm.conf
 
+MAN1=		rvm.1
 PLIST_FILES=	bin/rvm
 
-MAN1=	rvm.1
+.include <bsd.port.pre.mk>
 
-.include <bsd.port.mk>
+.if ${OSVERSION} > 500034
+CXXFLAGS+=	-O0
+.endif
+
+.include <bsd.port.post.mk>
diff -urN /usr/ports/archivers/rvm/distinfo archivers/rvm/distinfo
--- /usr/ports/archivers/rvm/distinfo	Mon Mar 15 16:34:34 2004
+++ archivers/rvm/distinfo	Sat Apr  3 20:48:58 2004
@@ -1,2 +1,2 @@
-MD5 (rvm-0.80-alpha.tar.gz) = 60c97f5fe46423471317ae5e5cf26fd8
-SIZE (rvm-0.80-alpha.tar.gz) = 193520
+MD5 (rvm-0.80.2-alpha.tar.gz) = 7a58ee0f0b573673c2ebc1b832042428
+SIZE (rvm-0.80.2-alpha.tar.gz) = 207172
diff -urN /usr/ports/archivers/rvm/files/patch-Makefile.in archivers/rvm/files/patch-Makefile.in
--- /usr/ports/archivers/rvm/files/patch-Makefile.in	Thu Jan  1 09:00:00 1970
+++ archivers/rvm/files/patch-Makefile.in	Sat Apr  3 21:35:59 2004
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Thu Mar 25 00:19:43 2004
++++ Makefile.in	Sat Apr  3 21:35:46 2004
+@@ -75,7 +75,7 @@
+ install_sh = @install_sh@
+ local_rsync = @local_rsync@
+ 
+-CXXFLAGS = -g -Wall
++CXXFLAGS = @CXXFLAGS@
+ 
+ bin_PROGRAMS = rvm
+ 
diff -urN /usr/ports/archivers/rvm/files/patch-estring.cc archivers/rvm/files/patch-estring.cc
--- /usr/ports/archivers/rvm/files/patch-estring.cc	Thu Jan  1 09:00:00 1970
+++ archivers/rvm/files/patch-estring.cc	Sat Apr  3 21:20:32 2004
@@ -0,0 +1,10 @@
+--- estring.cc.orig	Thu Mar 25 00:36:48 2004
++++ estring.cc	Sat Apr  3 21:20:18 2004
+@@ -4,6 +4,7 @@
+ #include <string>
+ #include <cstdio>
+ #include <cctype>
++#include <cassert>
+ 
+ #include "debug.h"
+ #include "types.h"
diff -urN /usr/ports/archivers/rvm/files/patch-reporter.cc archivers/rvm/files/patch-reporter.cc
--- /usr/ports/archivers/rvm/files/patch-reporter.cc	Thu Jan  1 09:00:00 1970
+++ archivers/rvm/files/patch-reporter.cc	Sat Apr  3 21:27:02 2004
@@ -0,0 +1,10 @@
+--- reporter.cc.orig	Thu Mar 25 00:28:09 2004
++++ reporter.cc	Sat Apr  3 21:26:51 2004
+@@ -4,6 +4,7 @@
+ #include <string>
+ #include <vector>
+ #include <algorithm>
++#include <cassert>
+ 
+ #include "debug.h"
+ #include "error.h"
diff -urN /usr/ports/archivers/rvm/files/patch-vaulter.cpp archivers/rvm/files/patch-vaulter.cpp
--- /usr/ports/archivers/rvm/files/patch-vaulter.cpp	Thu Jan  1 09:00:00 1970
+++ archivers/rvm/files/patch-vaulter.cpp	Sat Apr  3 21:24:48 2004
@@ -0,0 +1,10 @@
+--- vaulter.cc.orig	Wed Mar 24 05:03:42 2004
++++ vaulter.cc	Sat Apr  3 21:24:37 2004
+@@ -4,6 +4,7 @@
+ #include <vector>
+ #include <map>
+ #include <string>
++#include <cassert>
+ 
+ #include "debug.h"
+ #include "error.h"