- make use of MAKE_FLAGS

- bump NEED_VERSION

archivers/unzip/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.16 2000/03/24 22:11:34 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2000/03/26 22:34:28 brad Exp $
 
 DISTNAME=	unzip540
 PKGNAME=	unzip-5.40
 CATEGORIES=	archivers
-NEED_VERSION=	1.210
+NEED_VERSION=	1.218
 MASTER_SITES=	ftp://ftp.freesoftware.com/pub/infozip/src/
 
 MAINTAINER=	ports@openbsd.org
@@ -14,14 +14,18 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 FAKE=		Yes
-ALL_TARGET=	bsd
+
 MAKE_FILE=	unix/Makefile
+MAKE_FLAGS=	CC="${CC}" LD="${CC}" LOC="${CFLAGS} -DUSE_UNSHRINK" \
+		CF='-I. $$(LOC)'
+FAKE_FLAGS=	prefix="${WRKINST}${PREFIX}"
+
+ALL_TARGET=	bsd
 
 WRKDIST=	${WRKDIR}/${PKGNAME}
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/unzip
-	@cd ${WRKSRC};  ${INSTALL_DATA} README COPYING WHERE \
+	cd ${WRKSRC}; ${INSTALL_DATA} README COPYING WHERE ${PREFIX}/share/doc/unzip
-		${PREFIX}/share/doc/unzip
 
 .include <bsd.port.mk>

archivers/unzip/patches/patch-aa

@@ -1,31 +1,6 @@
 --- unix/Makefile.orig	Thu Nov 19 16:59:08 1998
-+++ unix/Makefile	Fri Dec 24 04:11:38 1999
++++ unix/Makefile	Sun Mar 26 17:25:48 2000
-@@ -42,12 +42,11 @@
+@@ -412,18 +412,16 @@
- # such as -DDOSWILD).
- 
- # UnZip flags
--CC = cc#	try using "gcc" target rather than changing this (CC and LD
--LD = $(CC)#	must match, else "unresolved symbol:  ___main" is possible)
-+LD = $(CC)
- AS = as
--LOC = $(LOCAL_UNZIP)
-+LOC = $(CFLAGS) -DUSE_UNSHRINK
- AF = $(LOC)
--CF = -O -I. $(LOC)
-+CF = -I. $(LOC)
- LF = -o unzip
- LF2 = -s
- 
-@@ -98,7 +97,7 @@
- INSTALL_D = mkdir -p
- # on some systems, manext=l and MANDIR=/usr/man/man$(manext) may be appropriate
- manext = 1
--prefix = /usr/local
-+prefix = $(PREFIX)
- BINDIR = $(prefix)/bin#			where to install executables
- MANDIR = $(prefix)/man/man$(manext)#	where to install man pages
- INSTALLEDBIN = $(BINDIR)/funzip$E $(BINDIR)/unzip$E $(BINDIR)/unzipsfx$E \
-@@ -412,18 +411,16 @@
  
  install:	$(MANS)
  	-$(INSTALL_D) $(BINDIR)