- make use of MAKE_FLAGS

- bump NEED_VERSION
This commit is contained in:
brad 2000-03-26 22:12:27 +00:00
parent 5253b2253a
commit b3a38f3e2f
2 changed files with 11 additions and 34 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.15 2000/03/24 22:11:34 espie Exp $
# $OpenBSD: Makefile,v 1.16 2000/03/26 22:12:27 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.210
NEED_VERSION= 1.218
MASTER_SITES= ftp://ftp.freesoftware.com/pub/infozip/src/
MAINTAINER= ports@openbsd.org
@ -15,14 +15,17 @@ PERMIT_DISTFILES_CDROM= "no fee"
PERMIT_DISTFILES_FTP= Yes
FAKE= Yes
ALL_TARGET= generic
MAKE_FILE= unix/Makefile
MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS} -I. -DUNIX"
FAKE_FLAGS= prefix="${WRKINST}${PREFIX}"
ALL_TARGET= generic
WRKDIST= ${WRKDIR}/${PKGNAME}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/zip
@cd ${WRKSRC} && \
${INSTALL_DATA} README WHERE ${PREFIX}/share/doc/zip
cd ${WRKSRC}; ${INSTALL_DATA} README WHERE ${PREFIX}/share/doc/zip
.include <bsd.port.mk>

View File

@ -1,32 +1,6 @@
--- unix/Makefile.orig Mon Nov 29 13:22:42 1999
+++ unix/Makefile Thu Mar 16 19:23:06 2000
@@ -17,7 +17,6 @@
LN = ln -s
# (to use the Gnu compiler, change cc to gcc in CC)
-CC = cc
BIND = $(CC)
AS = $(CC) -c
E =
@@ -33,7 +32,7 @@
MANFLAGS = 444
# target directories - where to install executables and man pages to
-prefix = /usr/local
+prefix = ${PREFIX}
BINDIR = $(prefix)/bin
manext=1
MANDIR = $(prefix)/man/man$(manext)
@@ -45,7 +44,7 @@
# CFLAGS flags for C compile
# LFLAGS1 flags after output file spec, before obj file list
# LFLAGS2 flags after obj file list (libraries, etc)
-CFLAGS = -O2 -I. -DUNIX $(LOCAL_ZIP)
+CFLAGS += -I. -DUNIX
LFLAGS1 =
LFLAGS2 = -s
@@ -125,10 +124,10 @@
--- unix/Makefile.orig Mon Nov 29 00:22:42 1999
+++ unix/Makefile Sun Mar 26 17:07:23 2000
@@ -125,10 +125,10 @@
# install
install: $(ZIPS)
-$(INSTALL_D) $(BINDIR)