diff --git a/net/cvsup/Makefile b/net/cvsup/Makefile
index bf24a1aea99..5e09ad89a06 100644
--- a/net/cvsup/Makefile
+++ b/net/cvsup/Makefile
@@ -1,15 +1,15 @@
-# $OpenBSD: Makefile,v 1.8 2001/11/10 15:00:49 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2002/02/23 12:35:22 naddy Exp $
 
 ONLY_FOR_ARCHS=	i386
 COMMENT=	"network file distribution system"
 COMMENT-server=	"network file distribution server"
 
-VERSION=	16.1e
+VERSION=	16.1f
 DISTNAME=	cvsup-snap-${VERSION}
 PKGNAME=	cvsup-${VERSION}
 PKGNAME-server=	cvsupd-${VERSION}
 CATEGORIES=	net devel
-NEED_VERSION=	1.489
+NEED_VERSION=	1.504
 HOMEPAGE=	http://www.polstra.com/projects/freeware/CVSup/
 
 MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>
@@ -20,33 +20,33 @@ PERMIT_DISTFILES_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 
-MASTER_SITES= \
-	ftp://ftp3.freebsd.org/pub/FreeBSD/development/CVSup/snapshots/ \
-	ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/snapshots/ \
-	ftp://ftp.cs.tu-berlin.de/pub/FreeBSD/development/CVSup/snapshots/
+MASTER_SITES= 	ftp://ftp.FreeBSD.org/pub/FreeBSD/%SUBDIR%/ \
+		ftp://ftp.se.FreeBSD.org/pub/FreeBSD/%SUBDIR%/ \
+		ftp://ftp.jp.FreeBSD.org/pub/FreeBSD/%SUBDIR%/ \
+		ftp://ftp.uk.FreeBSD.org/pub/FreeBSD/%SUBDIR%/ \
+		ftp://ftp.ru.FreeBSD.org/pub/FreeBSD/%SUBDIR%/ \
+		ftp://ftp.nectec.or.th/pub/FreeBSD/%SUBDIR%/ \
+		ftp://ftp.dnsbalance.ring.gr.jp/pub/FreeBSD/%SUBDIR%/
+MASTER_SITE_SUBDIR=	development/CVSup/snapshots
 
 MULTI_PACKAGES=	-server
 
-FLAVORS=	no_x11 static
+BUILD_DEPENDS=	::lang/ezm3
+
+FLAVORS=	no_x11
 FLAVOR?=
 
+M3FLAGS=	 -DPREFIX=${PREFIX} -DX11BASE=${X11BASE}
+
 .if ${FLAVOR:L:Mno_x11}
 M3FLAGS+=	-DNOGUI
-.endif
-.if ${FLAVOR:L:Mstatic}
-M3FLAGS+=	-DSTATIC
 .else
-# XXX this is a false depend, but we can't depend on lib in a weird path now
-RUN_DEPENDS=	::lang/pm3
+USE_X11=	Yes
 .endif
 
-BUILD_DEPENDS=	::lang/pm3
-
 MAKE_FLAGS=	M3FLAGS="${M3FLAGS}"
 FAKE_FLAGS=	PREFIX=${WRKINST}${TRUEPREFIX}
 
 NO_REGRESS=	Yes
 
 .include <bsd.port.mk>
-
-PORTPATH:=	${LOCALBASE}/pm3/bin:${PORTPATH}
diff --git a/net/cvsup/distinfo b/net/cvsup/distinfo
new file mode 100644
index 00000000000..5466f51b29c
--- /dev/null
+++ b/net/cvsup/distinfo
@@ -0,0 +1,3 @@
+MD5 (cvsup-snap-16.1f.tar.gz) = 57f318a41ddd7fd9cbe11b5c2ab4a53c
+RMD160 (cvsup-snap-16.1f.tar.gz) = a10c91c6d83a1374c481dc1a6d34e77aec1b1708
+SHA1 (cvsup-snap-16.1f.tar.gz) = 6df145bd4e7b90cad5c0618f43e0ff1df0881181
diff --git a/net/cvsup/files/md5 b/net/cvsup/files/md5
deleted file mode 100644
index 582f376a3a1..00000000000
--- a/net/cvsup/files/md5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (cvsup-snap-16.1e.tar.gz) = 1fc0ce8660b7fdc350893d4ea2458ceb
-RMD160 (cvsup-snap-16.1e.tar.gz) = 45663b048f85553ca14f0f2f87e330cd2360041d
-SHA1 (cvsup-snap-16.1e.tar.gz) = d33202f35095d8b09533b630cafb5f26535b32c3
diff --git a/net/cvsup/pkg/DESCR b/net/cvsup/pkg/DESCR
index 28939d56721..9edc00692a7 100644
--- a/net/cvsup/pkg/DESCR
+++ b/net/cvsup/pkg/DESCR
@@ -13,4 +13,3 @@ WWW: ${HOMEPAGE}
 
 Available flavors: 
 	no_x11	text-only
-	static	no Modula-3 dependency at run-time
diff --git a/net/cvsup/pkg/DESCR-server b/net/cvsup/pkg/DESCR-server
index bf21e863d95..31360e0426d 100644
--- a/net/cvsup/pkg/DESCR-server
+++ b/net/cvsup/pkg/DESCR-server
@@ -13,4 +13,3 @@ WWW: ${HOMEPAGE}
 
 Available flavors: 
 	no_x11	text-only
-	static	no Modula-3 dependency at run-time
diff --git a/net/cvsup/pkg/PLIST b/net/cvsup/pkg/PLIST
index 127f7c583e5..d41a3372dde 100644
--- a/net/cvsup/pkg/PLIST
+++ b/net/cvsup/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2001/05/05 22:15:19 espie Exp $
-@pkgcfl cvsup-bin-*
+@comment $OpenBSD: PLIST,v 1.2 2002/02/23 12:35:22 naddy Exp $
 bin/cvsup
 man/man1/cvsup.1
diff --git a/net/cvsup/pkg/PLIST-server b/net/cvsup/pkg/PLIST-server
index 89949d86337..cc92dc2b5b5 100644
--- a/net/cvsup/pkg/PLIST-server
+++ b/net/cvsup/pkg/PLIST-server
@@ -1,5 +1,4 @@
-@comment $OpenBSD: PLIST-server,v 1.1.1.1 2001/05/05 22:15:19 espie Exp $
-@pkgcfl cvsupd-bin-*
+@comment $OpenBSD: PLIST-server,v 1.2 2002/02/23 12:35:22 naddy Exp $
 bin/cvpasswd
 man/man1/cvpasswd.1
 man/man8/cvsupd.8