diff --git a/net/cvsup-bin/Makefile b/net/cvsup-bin/Makefile
index 61a078de825..f7dba589ea7 100644
--- a/net/cvsup-bin/Makefile
+++ b/net/cvsup-bin/Makefile
@@ -1,19 +1,15 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2000/06/11 18:21:34 espie Exp $
+# $OpenBSD: Makefile,v 1.2 2000/07/11 01:07:53 naddy Exp $
 
-.if ${MACHINE_ARCH} == "i386"
 VER=		16.1
-.elif ${MACHINE_ARCH} == "sparc"
-VER=		16.0
-.endif
 DISTNAME=	cvsup-bin-${VER}
 CATEGORIES=    	net devel
-NEED_VERSION=1.300
+NEED_VERSION=	1.312
 
 HOMEPAGE=	http://www.polstra.com/projects/freeware/CVSup/
 
-ONLY_FOR_ARCHS=	i386 sparc
+ONLY_FOR_ARCHS=	i386
 
-MAINTAINER=	naddy@unix-ag.uni-kl.de
+MAINTAINER=	naddy@openbsd.org
 
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
@@ -30,21 +26,13 @@ GUI=
 
 MASTER_SITES=	ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/binaries/ \
 		ftp://ftp.cs.tu-berlin.de/pub/FreeBSD/development/CVSup/binaries
-.if ${MACHINE_ARCH} == "i386"
-DISTFILES=	cvsup${GUI}-freebsd-ix86-aout-${VER}${EXTRACT_SUFX}
-.elif ${MACHINE_ARCH} == "sparc"
-DISTFILES=	cvsup${GUI}-sunos4-${VER}${EXTRACT_SUFX}
-.endif
+DISTFILES=	cvsup${GUI}-freebsd-ix86-aout-${VER}.tar.gz
 
-SUPDISTFILES=	cvsup-freebsd-ix86-aout-16.1.tar.gz \
-		cvsup.nogui-freebsd-ix86-aout-16.1.tar.gz \
-		cvsup-sunos4-16.0.tar.gz \
-		cvsup.nogui-sunos4-16.0.tar.gz
+SUPDISTFILES=	cvsup-freebsd-ix86-aout-${VER}.tar.gz \
+		cvsup.nogui-freebsd-ix86-aout-${VER}.tar.gz
 
-.if ${MACHINE_ARCH} == "i386"
 MANCOMPRESSED=	Yes
 MAN1=		cvpasswd.1 cvsup.1
-.endif
 
 WRKSRC=		${WRKDIR}/cvsup${GUI}-bin-${VER}
 INSTALL_STRIP=
@@ -54,24 +42,16 @@ pre-fetch:
 	@sh ${PKGDIR}/REQ ${PKGNAME} INSTALL
 .endif
 
-NO_BUILD=Yes
+NO_BUILD=	Yes
 
-.if ${MACHINE_ARCH} == "i386"
 do-configure:
 	sed 's,@PREFIX@,${PREFIX},' ${FILESDIR}/cvsup.sh >${WRKSRC}/cvsup.sh
-.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cvpasswd ${PREFIX}/bin
-.if ${MACHINE_ARCH} == "i386"
 	${INSTALL_SCRIPT} ${WRKSRC}/cvsup.sh ${PREFIX}/bin/cvsup
 	${INSTALL_PROGRAM} ${WRKSRC}/cvsup ${PREFIX}/libexec
 	${INSTALL_MAN} ${WRKSRC}/cvpasswd.1.gz ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/cvsup.1.gz ${PREFIX}/man/man1
-.elif ${MACHINE_ARCH} == "sparc"
-	${INSTALL_PROGRAM} ${WRKSRC}/cvsup ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/cvpasswd.1 ${PREFIX}/man/cat1/cvpasswd.0
-	${INSTALL_MAN} ${WRKSRC}/cvsup.1 ${PREFIX}/man/cat1/cvsup.0
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/cvsup-bin/files/md5 b/net/cvsup-bin/files/md5
index 8b0b940b0e2..55f444bc757 100644
--- a/net/cvsup-bin/files/md5
+++ b/net/cvsup-bin/files/md5
@@ -1,12 +1,6 @@
 MD5 (cvsup-freebsd-ix86-aout-16.1.tar.gz) = f81c01faf7c5fbbfe4c871243d452871
-MD5 (cvsup-sunos4-16.0.tar.gz) = 5d7e661a5926e22db1296056fba6a237
 MD5 (cvsup.nogui-freebsd-ix86-aout-16.1.tar.gz) = 3dee1e37a723909b9909fd4c8b3e25e7
-MD5 (cvsup.nogui-sunos4-16.0.tar.gz) = 083684fe82019c228e301834cdb44a3a
 RMD160 (cvsup-freebsd-ix86-aout-16.1.tar.gz) = 316a67a367a456cee84498d5706f88faeca5c776
-RMD160 (cvsup-sunos4-16.0.tar.gz) = 9e9f3b1385082bcf1a3c802848e85be1f8c74b55
 RMD160 (cvsup.nogui-freebsd-ix86-aout-16.1.tar.gz) = 78f83e71f2bf2e2f0207c3c63f5d257e35b10335
-RMD160 (cvsup.nogui-sunos4-16.0.tar.gz) = c8ac4a0747cc282095115558ea0e9968786845fb
 SHA1 (cvsup-freebsd-ix86-aout-16.1.tar.gz) = 140ac2434ca2883de5a9aaf8a9f5894bb90e0aa8
-SHA1 (cvsup-sunos4-16.0.tar.gz) = 8d8baa005ea6c45aa55eaa61139b439d3d69344b
 SHA1 (cvsup.nogui-freebsd-ix86-aout-16.1.tar.gz) = 786175a43c68f294745e77f2226668c88de76c2f
-SHA1 (cvsup.nogui-sunos4-16.0.tar.gz) = da8561508491944b5e8c20f7af53604198050d75
diff --git a/net/cvsup-bin/pkg/PLIST.i386 b/net/cvsup-bin/pkg/PLIST
similarity index 50%
rename from net/cvsup-bin/pkg/PLIST.i386
rename to net/cvsup-bin/pkg/PLIST
index f957833cd7b..62e0722616c 100644
--- a/net/cvsup-bin/pkg/PLIST.i386
+++ b/net/cvsup-bin/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.i386,v 1.1.1.1 2000/06/11 18:21:34 espie Exp $
+@comment $OpenBSD: PLIST,v 1.1 2000/07/11 01:07:53 naddy Exp $
 bin/cvpasswd
 bin/cvsup
 libexec/cvsup
diff --git a/net/cvsup-bin/pkg/PLIST.sparc b/net/cvsup-bin/pkg/PLIST.sparc
deleted file mode 100644
index 4dbcb2d932d..00000000000
--- a/net/cvsup-bin/pkg/PLIST.sparc
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $OpenBSD: PLIST.sparc,v 1.1.1.1 2000/06/11 18:21:34 espie Exp $
-bin/cvpasswd
-bin/cvsup
-man/cat1/cvpasswd.0
-man/cat1/cvsup.0
diff --git a/net/cvsup-bin/pkg/REQ b/net/cvsup-bin/pkg/REQ
index 4746d8af29b..efb55d01c25 100644
--- a/net/cvsup-bin/pkg/REQ
+++ b/net/cvsup-bin/pkg/REQ
@@ -14,22 +14,6 @@ do_notice()
 	    echo "+---------------"
 	    echo
 	    ;;
-	sparc)
-	    echo
-	    echo "+---------------"
-	    echo "| This application requires a kernel compiled with"
-	    echo "| 'option COMPAT_SUNOS' and SunOS shared libraries"
-	    echo "| for proper operation; see compat_sunos(8) for"
-	    echo "| further details. The GENERIC kernel contains this"
-	    echo "| option."
-	    echo "+---------------"
-	    echo
-	    if [ ! -f /emul/sunos/usr/lib/ld.so ]; then
-		echo "  You have no SunOS shared libraries installed."
-		echo
-		exit 1
-	    fi
-	    ;;
     esac
 }