- oops, re-add NO_CDROM, didn't mean to remove this

- remove part of patch and use MAKE_FLAGS instead

archivers/bzip/Makefile

@@ -1,9 +1,11 @@
-# $OpenBSD: Makefile,v 1.10 2000/02/17 17:59:54 brad Exp $
+# $OpenBSD: Makefile,v 1.11 2000/02/17 20:16:24 brad Exp $
 
 DISTNAME=	bzip-0.21
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_BACKUP}
 
+NO_CDROM=	"NOFEE: can not sell"
+
 MAINTAINER=	ports@openbsd.org
 
 LICENSE_TYPE=		NOFEE
@@ -12,6 +14,10 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	No
 PERMIT_DISTFILES_FTP=	Yes
 
+MAKE_FLAGS=	CC="${CC}" \
+		CFLAGS="${CFLAGS} -fomit-frame-pointer -funroll-loops \
+		-Wall -Winline -Wshadow -W"
+
 pre-install:
 	@cat ${FILESDIR}/COPYRIGHT
 

archivers/bzip/patches/patch-aa

@@ -1,14 +1,7 @@
---- Makefile.orig	Sat Aug 31 09:50:33 1996
-+++ Makefile	Fri Sep 27 13:57:55 1996
-@@ -1,29 +1,17 @@
--
--CC = gcc
--SH = /bin/sh
--
--CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -Wall -Winline -Wshadow -W
--
--
-+CFLAGS+= -fomit-frame-pointer
+--- Makefile.orig	Sat Aug 31 03:50:33 1996
++++ Makefile	Fri Feb 18 10:07:35 2000
+@@ -7,22 +7,17 @@
+ 
  
  all:
 -	cat words0
@@ -40,4 +33,3 @@
  
  clean:
  	rm -f bzip bunzip sample*.tst sample*.rbz
--