diff --git a/archivers/bzip/Makefile b/archivers/bzip/Makefile
index 139f170519b..44e04d7a648 100644
--- a/archivers/bzip/Makefile
+++ b/archivers/bzip/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.14 2000/03/26 21:28:47 brad Exp $
+# $OpenBSD: Makefile,v 1.15 2000/06/10 20:22:13 brad Exp $
 
 DISTNAME=	bzip-0.21
 CATEGORIES=	archivers
-NEED_VERSION=	1.218
+NEED_VERSION=	1.301
 MASTER_SITES=	${MASTER_SITE_BACKUP}
 
 MAINTAINER=	ports@openbsd.org
@@ -12,8 +12,6 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	No
 PERMIT_DISTFILES_FTP=	Yes
 
-FAKE=	Yes
-
 MAKE_FLAGS=	CC="${CC}" \
 		CFLAGS="${CFLAGS} -fomit-frame-pointer -funroll-loops \
 		-Wall -Winline -Wshadow -W"
diff --git a/archivers/bzip/pkg/PLIST b/archivers/bzip/pkg/PLIST
index 03754bf7ec6..e802ddc34a0 100644
--- a/archivers/bzip/pkg/PLIST
+++ b/archivers/bzip/pkg/PLIST
@@ -1,3 +1,4 @@
+@comment $OpenBSD: PLIST,v 1.3 2000/06/10 20:22:13 brad Exp $
 bin/bzip
 bin/bunzip
 man/man1/bzip.1
diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index 828f9e4d4ca..8b76650aa07 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -1,11 +1,13 @@
-# $OpenBSD: Makefile,v 1.14 2000/04/09 07:17:23 turan Exp $
+# $OpenBSD: Makefile,v 1.15 2000/06/10 20:22:13 brad Exp $
 
 DISTNAME=	tar-1.13
 CATEGORIES=	archivers
-NEED_VERSION=	1.230
+NEED_VERSION=	1.301
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR= tar
 
+BUILD_DEPENDS=	msgfmt::devel/gettext
+
 MAINTAINER=	niklas@openbsd.org
 
 PERMIT_PACKAGE_CDROM=	Yes
@@ -13,13 +15,9 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-FAKE=		Yes
-
 SEPARATE_BUILD=	simple
-GNU_CONFIGURE=	Yes
-CONFIGURE_ARGS=	--program-prefix="g"
-
-BUILD_DEPENDS=	msgfmt::devel/gettext
+CONFIGURE_STYLE= gnu
+CONFIGURE_ARGS+= --program-prefix="g"
 
 post-extract:
 	@rm -f ${WRKSRC}/doc/tar.info*
diff --git a/archivers/gtar/pkg/PLIST b/archivers/gtar/pkg/PLIST
index db0ef2094ce..a863593eabd 100644
--- a/archivers/gtar/pkg/PLIST
+++ b/archivers/gtar/pkg/PLIST
@@ -1,3 +1,4 @@
+@comment $OpenBSD: PLIST,v 1.8 2000/06/10 20:22:14 brad Exp $
 bin/gtar
 @unexec install-info --delete --info-dir=%D/info %D/info/tar.info
 info/tar.info
diff --git a/archivers/ha/Makefile b/archivers/ha/Makefile
index 9e253e2f789..bc606069862 100644
--- a/archivers/ha/Makefile
+++ b/archivers/ha/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2000/03/30 22:31:53 brad Exp $
+# $OpenBSD: Makefile,v 1.13 2000/06/10 20:22:14 brad Exp $
 
 DISTNAME=	ha0999
 PKGNAME=	ha-0.999b
 CATEGORIES=	archivers
-NEED_VERSION=	1.213
+NEED_VERSION=	1.301
 MASTER_SITES=	ftp://ftp.kiarchive.ru/pub/unix/arcers/
 EXTRACT_SUFX=	.tgz
 
@@ -14,16 +14,14 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-FAKE=	Yes
-
 USE_GMAKE=	Yes
-NO_CONFIGURE=	Yes
-MAKE_FILE=	makefile.nix
 
 MAKE_FLAGS=	CC="${CC}" \
 		CFLAGS='${CFLAGS} -Wall -c -I../$$(MCH) -I../include' \
 		LDFLAGS=""
 
+MAKE_FILE=	makefile.nix
+
 WRKDIST=	${WRKDIR}
 
 ALL_TARGET=	ha
diff --git a/archivers/ha/pkg/PLIST b/archivers/ha/pkg/PLIST
index da4d162c3b5..d500ad76ef2 100644
--- a/archivers/ha/pkg/PLIST
+++ b/archivers/ha/pkg/PLIST
@@ -1 +1,2 @@
+@comment $OpenBSD: PLIST,v 1.2 2000/06/10 20:22:14 brad Exp $
 bin/ha
diff --git a/archivers/lha/Makefile b/archivers/lha/Makefile
index 69944349beb..3a0f9f8e925 100644
--- a/archivers/lha/Makefile
+++ b/archivers/lha/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.11 2000/03/30 22:28:48 brad Exp $
+# $OpenBSD: Makefile,v 1.12 2000/06/10 20:22:14 brad Exp $
 
 DISTNAME=	lha-114f
 PKGNAME=	lha-1.14f
-NEED_VERSION=	1.230
+NEED_VERSION=	1.301
 CATEGORIES=	archivers
 MASTER_SITES=	http://www2m.biglobe.ne.jp/~dolphin/lha/prog/ \
 		ftp://ftp.win.ne.jp/pub/misc/
@@ -14,8 +14,6 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-FAKE=	Yes
-
 MAKE_FLAGS=	CC="${CC}" OPTIMIZE="${CFLAGS}" \
 		MACHINE="-DSYSTIME_HAS_NO_TM -DSYSV_SYSTEM_DIR -DMKTIME -DUSESTRCASECMP" \
 		SWITCHES="-DNEED_INCREMENTAL_INDICATOR -DEUC -DSUPPORT_LH6"
diff --git a/archivers/lha/pkg/PLIST b/archivers/lha/pkg/PLIST
index a7667e86902..4479de6c462 100644
--- a/archivers/lha/pkg/PLIST
+++ b/archivers/lha/pkg/PLIST
@@ -1,2 +1,3 @@
+@comment $OpenBSD: PLIST,v 1.2 2000/06/10 20:22:15 brad Exp $
 bin/lha
 man/ja_JP.EUC/man1/lha.1
diff --git a/archivers/lzo/Makefile b/archivers/lzo/Makefile
index b71de3f0418..b29cafac31e 100644
--- a/archivers/lzo/Makefile
+++ b/archivers/lzo/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.13 2000/03/26 23:17:03 brad Exp $
+# $OpenBSD: Makefile,v 1.14 2000/06/10 20:22:15 brad Exp $
 
 DISTNAME=	lzo-1.06
 CATEGORIES=	archivers devel
-NEED_VERSION=	1.218
+NEED_VERSION=	1.301
 MASTER_SITES=	ftp://ftp.rhrz.uni-bonn.de/pub-koeln/util/arc/ \
 		ftp://ftp.fu-berlin.de/pub/unix/tools/archivers/lzo/ \
 		${MASTER_SITE_SUNSITE}
@@ -15,10 +15,8 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-FAKE=	Yes
-
 SEPARATE_BUILD=	concurrent
-GNU_CONFIGURE=	Yes
+CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
 CONFIGURE_ARGS+= --enable-static
 
diff --git a/archivers/lzo/pkg/PFRAG.shared b/archivers/lzo/pkg/PFRAG.shared
new file mode 100644
index 00000000000..1ad645bef95
--- /dev/null
+++ b/archivers/lzo/pkg/PFRAG.shared
@@ -0,0 +1,3 @@
+@comment $OpenBSD: PFRAG.shared,v 1.1 2000/06/10 20:22:15 brad Exp $
+lib/liblzo.so.1.0
+@exec /sbin/ldconfig -m %B
diff --git a/archivers/lzo/pkg/PLIST b/archivers/lzo/pkg/PLIST
index eac478e218e..8c9bda59423 100644
--- a/archivers/lzo/pkg/PLIST
+++ b/archivers/lzo/pkg/PLIST
@@ -1,3 +1,4 @@
+@comment $OpenBSD: PLIST,v 1.4 2000/06/10 20:22:15 brad Exp $
 include/lzo1.h
 include/lzo16bit.h
 include/lzo1a.h
@@ -12,8 +13,7 @@ include/lzoconf.h
 include/lzoutil.h
 lib/liblzo.a
 lib/liblzo.la
-lib/liblzo.so.1.0
-@exec /sbin/ldconfig -m %B
+%%SHARED%%
 share/doc/lzo/LZO.FAQ
 share/doc/lzo/LZO.TXT
 share/doc/lzo/LZOAPI.TXT
diff --git a/archivers/lzo/pkg/PLIST.noshared b/archivers/lzo/pkg/PLIST.noshared
deleted file mode 100644
index 06cc034e721..00000000000
--- a/archivers/lzo/pkg/PLIST.noshared
+++ /dev/null
@@ -1,19 +0,0 @@
-include/lzo1.h
-include/lzo16bit.h
-include/lzo1a.h
-include/lzo1b.h
-include/lzo1c.h
-include/lzo1f.h
-include/lzo1x.h
-include/lzo1y.h
-include/lzo1z.h
-include/lzo2a.h
-include/lzoconf.h
-include/lzoutil.h
-lib/liblzo.a
-lib/liblzo.la
-share/doc/lzo/LZO.FAQ
-share/doc/lzo/LZO.TXT
-share/doc/lzo/LZOAPI.TXT
-share/doc/lzo/LTEST.TXT
-@dirrm share/doc/lzo
diff --git a/archivers/nulib/Makefile b/archivers/nulib/Makefile
index 7edf6f4cd80..6f896b2d00e 100644
--- a/archivers/nulib/Makefile
+++ b/archivers/nulib/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2000/03/31 19:07:47 brad Exp $
+# $OpenBSD: Makefile,v 1.14 2000/06/10 20:22:16 brad Exp $
 
 DISTNAME=	nulib325
 PKGNAME=	nulib-3.25
 CATEGORIES=	archivers
-NEED_VERSION=	1.218
+NEED_VERSION=	1.301
 MASTER_SITES=	http://people.freebsd.org/~jseger/
 EXTRACT_SUFX=	.tar.Z
 
@@ -14,10 +14,6 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	"May not sell"
 PERMIT_DISTFILES_FTP=	Yes
 
-FAKE=	Yes
-
-NO_CONFIGURE=	Yes
-
 MAKE_FLAGS=	CC="${CC}" OPTIMIZE="${CFLAGS}"
 
 WRKDIST=	${WRKDIR}/nulib
diff --git a/archivers/nulib/pkg/PLIST b/archivers/nulib/pkg/PLIST
index d4bb8ab0cf9..b23ab89c4f8 100644
--- a/archivers/nulib/pkg/PLIST
+++ b/archivers/nulib/pkg/PLIST
@@ -1,2 +1,3 @@
+@comment $OpenBSD: PLIST,v 1.2 2000/06/10 20:22:16 brad Exp $
 bin/nulib
 man/man1/nulib.1
diff --git a/archivers/p5-Compress-Zlib/Makefile b/archivers/p5-Compress-Zlib/Makefile
index 5bb5bf99a02..3ef417a049c 100644
--- a/archivers/p5-Compress-Zlib/Makefile
+++ b/archivers/p5-Compress-Zlib/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2000/06/02 11:56:22 espie Exp $
+# $OpenBSD: Makefile,v 1.14 2000/06/10 20:22:16 brad Exp $
 
 DISTNAME=	Compress-Zlib-1.08
 PKGNAME=	p5-Cmprs-Zlib-1.08
 CATEGORIES=	archivers perl5
-NEED_VERSION=	1.290
+NEED_VERSION=	1.301
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR= Compress
 
@@ -13,6 +13,7 @@ PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
-CONFIGURE_STYLE=	perl
+
+CONFIGURE_STYLE= perl
 
 .include <bsd.port.mk>
diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
index 330198e809f..9030ef56239 100644
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.21 2000/03/31 20:26:16 brad Exp $
+# $OpenBSD: Makefile,v 1.22 2000/06/10 20:22:16 brad Exp $
 
 DISTNAME=	rarbsd
 PKGNAME=	rar-2.02
 CATEGORIES=	archivers
-NEED_VERSION=	1.234
+NEED_VERSION=	1.301
 MASTER_SITES=	ftp://rarsoft.ti.sk/pub/rar/
 EXTRACT_SUFX=	.sfx
 
@@ -20,10 +20,6 @@ PERMIT_PACKAGE_FTP=	"Shareware.  Requires registration."
 PERMIT_DISTFILES_CDROM=	"Shareware.  Requires registration."
 PERMIT_DISTFILES_FTP=	Yes
 
-FAKE=	Yes
-
-NO_CONFIGURE=	Yes
-NO_PATCH=	Yes
 NO_BUILD=	Yes
 
 WRKDIST=	${WRKDIR}
diff --git a/archivers/rar/pkg/PLIST b/archivers/rar/pkg/PLIST
index 4ae9af7f8fd..5a8ed936ddf 100644
--- a/archivers/rar/pkg/PLIST
+++ b/archivers/rar/pkg/PLIST
@@ -1,3 +1,4 @@
+@comment $OpenBSD: PLIST,v 1.5 2000/06/10 20:22:16 brad Exp $
 bin/rar
 man/cat1/rar.1
 share/rar/dos.sfx
diff --git a/archivers/unace/Makefile b/archivers/unace/Makefile
index ab4ce1818a7..66c9445a449 100644
--- a/archivers/unace/Makefile
+++ b/archivers/unace/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2000/03/26 22:52:16 brad Exp $
+# $OpenBSD: Makefile,v 1.14 2000/06/10 20:22:17 brad Exp $
 # $FreeBSD: Makefile,v 1.1.1.1 1999/04/02 04:19:20 steve Exp $
 
 DISTNAME=	unacepub
 PKGNAME=	unace-1.2b
 CATEGORIES=	archivers
-NEED_VERSION=	1.218
+NEED_VERSION=	1.301
 MASTER_SITES=	http://members.aol.com/mlemke6413/
 
 MAINTAINER=	brad@openbsd.org
@@ -14,8 +14,6 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-FAKE=	Yes
-
 USE_ZIP=	Yes
 
 MAKE_FILE=	unix/makefile
diff --git a/archivers/unace/pkg/PLIST b/archivers/unace/pkg/PLIST
index 44e6c4e98f8..3d7667d74ef 100644
--- a/archivers/unace/pkg/PLIST
+++ b/archivers/unace/pkg/PLIST
@@ -1 +1,2 @@
+@comment $OpenBSD: PLIST,v 1.2 2000/06/10 20:22:17 brad Exp $
 bin/unace
diff --git a/archivers/unarj/Makefile b/archivers/unarj/Makefile
index c9fab4ecdee..4f8f798917e 100644
--- a/archivers/unarj/Makefile
+++ b/archivers/unarj/Makefile
@@ -1,21 +1,19 @@
-# $OpenBSD: Makefile,v 1.8 2000/03/26 22:50:03 brad Exp $
+# $OpenBSD: Makefile,v 1.9 2000/06/10 20:22:17 brad Exp $
 # $FreeBSD: Makefile,v 1.12 1999/02/17 22:25:36 ache Exp $
 
-DISTNAME=       unarj-2.43
+DISTNAME=	unarj-2.43
 CATEGORIES=	archivers
-NEED_VERSION=	1.218
+NEED_VERSION=	1.301
 MASTER_SITES=	ftp://ftp.kiarchive.ru/pub/unix/arcers/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=     ports@openbsd.org
+MAINTAINER=	ports@openbsd.org
 
-PERMIT_PACKAGE_CDROM=	May not charge
+PERMIT_PACKAGE_CDROM=	"May not charge"
 PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	May not charge
+PERMIT_DISTFILES_CDROM=	"May not charge"
 PERMIT_DISTFILES_FTP=	Yes
 
-FAKE=	Yes
-
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/unarj
 	cd ${WRKSRC}; ${INSTALL_PROGRAM} unarj ${PREFIX}/bin
diff --git a/archivers/unarj/pkg/PLIST b/archivers/unarj/pkg/PLIST
index a75726ff71a..6594dad6fd7 100644
--- a/archivers/unarj/pkg/PLIST
+++ b/archivers/unarj/pkg/PLIST
@@ -1,3 +1,4 @@
+@comment $OpenBSD: PLIST,v 1.3 2000/06/10 20:22:17 brad Exp $
 bin/unarj
 share/doc/unarj/unarj.doc
 share/doc/unarj/technote.doc
diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile
index 8b5f6870a97..84d73900881 100644
--- a/archivers/unrar/Makefile
+++ b/archivers/unrar/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.11 2000/03/26 22:40:24 brad Exp $
+# $OpenBSD: Makefile,v 1.12 2000/06/10 20:22:17 brad Exp $
 
 DISTNAME=	unrar-2.50
 CATEGORIES=	archivers
-NEED_VERSION=	1.218
+NEED_VERSION=	1.301
 MASTER_SITES=	ftp://ftp.kiarchive.ru/pub/unix/arcers/
 
 MAINTAINER=	ports@openbsd.org
@@ -12,8 +12,6 @@ PERMIT_PACKAGE_FTP=	"may not modify"
 PERMIT_DISTFILES_CDROM=	"no fee"
 PERMIT_DISTFILES_FTP=	Yes
 
-FAKE=	Yes
-
 WRKDIST=	${WRKDIR}
 
 do-build:
diff --git a/archivers/unrar/pkg/PLIST b/archivers/unrar/pkg/PLIST
index bf054ae38a7..b365ad7126a 100644
--- a/archivers/unrar/pkg/PLIST
+++ b/archivers/unrar/pkg/PLIST
@@ -1,3 +1,4 @@
+@comment $OpenBSD: PLIST,v 1.3 2000/06/10 20:22:18 brad Exp $
 bin/unrar
 share/doc/unrar/license.txt
 share/doc/unrar/readme.txt
diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile
index 15a22ddc07e..37a6362f465 100644
--- a/archivers/unzip/Makefile
+++ b/archivers/unzip/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.17 2000/03/26 22:34:28 brad Exp $
+# $OpenBSD: Makefile,v 1.18 2000/06/10 20:22:18 brad Exp $
 
 DISTNAME=	unzip540
 PKGNAME=	unzip-5.40
 CATEGORIES=	archivers
-NEED_VERSION=	1.218
+NEED_VERSION=	1.301
 MASTER_SITES=	ftp://ftp.freesoftware.com/pub/infozip/src/
 
 MAINTAINER=	ports@openbsd.org
@@ -13,13 +13,12 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-FAKE=		Yes
-
-MAKE_FILE=	unix/Makefile
 MAKE_FLAGS=	CC="${CC}" LD="${CC}" LOC="${CFLAGS} -DUSE_UNSHRINK" \
 		CF='-I. $$(LOC)'
 FAKE_FLAGS=	prefix="${WRKINST}${PREFIX}"
 
+MAKE_FILE=	unix/Makefile
+
 ALL_TARGET=	bsd
 
 WRKDIST=	${WRKDIR}/${PKGNAME}
diff --git a/archivers/unzip/pkg/PLIST b/archivers/unzip/pkg/PLIST
index a9222958a57..10924d21441 100644
--- a/archivers/unzip/pkg/PLIST
+++ b/archivers/unzip/pkg/PLIST
@@ -1,3 +1,4 @@
+@comment $OpenBSD: PLIST,v 1.6 2000/06/10 20:22:18 brad Exp $
 bin/funzip
 bin/unzip
 bin/unzipsfx
diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile
index df01357b6de..c0055f985b9 100644
--- a/archivers/zip/Makefile
+++ b/archivers/zip/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.16 2000/03/26 22:12:27 brad Exp $
+# $OpenBSD: Makefile,v 1.17 2000/06/10 20:22:18 brad Exp $
 # $FreeBSD: Makefile,v 1.11 1997/11/25 20:45:45 ache Exp $
 
 DISTNAME=	zip23
 PKGNAME=	zip-2.3
 CATEGORIES=	archivers
-NEED_VERSION=	1.218
+NEED_VERSION=	1.301
 MASTER_SITES=	ftp://ftp.freesoftware.com/pub/infozip/src/
 
 MAINTAINER=	ports@openbsd.org
@@ -14,12 +14,11 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	"no fee"
 PERMIT_DISTFILES_FTP=	Yes
 
-FAKE=		Yes
-
-MAKE_FILE=	unix/Makefile
 MAKE_FLAGS=	CC="${CC}" CFLAGS="${CFLAGS} -I. -DUNIX"
 FAKE_FLAGS=	prefix="${WRKINST}${PREFIX}"
 
+MAKE_FILE=	unix/Makefile
+
 ALL_TARGET=	generic
 
 WRKDIST=	${WRKDIR}/${PKGNAME}
diff --git a/archivers/zip/pkg/PLIST b/archivers/zip/pkg/PLIST
index cb7540d068a..24a093a0435 100644
--- a/archivers/zip/pkg/PLIST
+++ b/archivers/zip/pkg/PLIST
@@ -1,3 +1,4 @@
+@comment $OpenBSD: PLIST,v 1.6 2000/06/10 20:22:18 brad Exp $
 bin/zip
 bin/zipnote
 bin/zipsplit
diff --git a/archivers/zoo/Makefile b/archivers/zoo/Makefile
index f939fd170e3..a77ab32cfa7 100644
--- a/archivers/zoo/Makefile
+++ b/archivers/zoo/Makefile
@@ -1,24 +1,23 @@
-# $OpenBSD: Makefile,v 1.7 2000/03/26 22:02:28 brad Exp $
+# $OpenBSD: Makefile,v 1.8 2000/06/10 20:22:19 brad Exp $
 
-DISTNAME=       zoo-2.10pl1
+DISTNAME=	zoo-2.10pl1
 PKGNAME=	zoo-2.10.1
 CATEGORIES=	archivers
-NEED_VERSION=	1.218
-MASTER_SITES=   ftp://ftp.kiarchive.ru/pub/unix/arcers/
+NEED_VERSION=	1.301
+MASTER_SITES=	ftp://ftp.kiarchive.ru/pub/unix/arcers/
 
 MAINTAINER=	angelos@openbsd.org
 
-PERMIT_PACKAGE_CDROM=   Yes
-PERMIT_PACKAGE_FTP=     Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP=   Yes
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
 
-FAKE=	Yes
-
-MAKE_FILE=	makefile
 MAKE_FLAGS=	CC="${CC}" OPTIM="${CFLAGS}"
 FAKE_FLAGS=	PREFIX="${WRKINST}${PREFIX}"
 
+MAKE_FILE=	makefile
+
 ALL_TARGET=	bsdansi
 
 WRKDIST=	${WRKDIR}
diff --git a/archivers/zoo/pkg/PLIST b/archivers/zoo/pkg/PLIST
index e92b873603d..eb0757b1589 100644
--- a/archivers/zoo/pkg/PLIST
+++ b/archivers/zoo/pkg/PLIST
@@ -1,3 +1,4 @@
+@comment $OpenBSD: PLIST,v 1.2 2000/06/10 20:22:19 brad Exp $
 bin/fiz
 bin/zoo
 man/man1/fiz.1