cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- remove do-install target

Browse Source 
- cleanup Makefile
- make this port respect CC and CFLAGS
- use zip's own install target and use BSD_INSTALL macros instead of just
copying the files
This commit is contained in:
brad 1999-12-18 01:48:51 +00:00
parent 2f78cf50cf
commit e9c2f4301f
2 changed files with 47 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
archivers/zip/Makefile
View File

@ -1,22 +1,16 @@
# $OpenBSD: Makefile,v 1.8 1999/09/06 17:43:10 brad Exp $
# $OpenBSD: Makefile,v 1.9 1999/12/18 01:48:51 brad Exp $
# $FreeBSD: Makefile,v 1.11 1997/11/25 20:45:45 ache Exp $
DISTNAME= zip22
PKGNAME= zip-2.2
DISTNAME= zip22
PKGNAME= zip-2.2
CATEGORIES= archivers
MASTER_SITES= ftp://ftp.cdrom.com/pub/infozip/src/
MASTER_SITES= ftp://ftp.cdrom.com/pub/infozip/src/
MAINTAINER= ports@openbsd.org
WRKSRC= ${WRKDIR}/${PKGNAME}
MAKEFILE= unix/Makefile
MAKE_FLAGS= LOCAL_ZIP="${CFLAGS}" -f
ALL_TARGET= generic
ALL_TARGET= generic
MAKEFILE= unix/Makefile
do-install:
@cd ${WRKSRC} && \
${INSTALL_PROGRAM} zip zipnote zipsplit zipcloak ${PREFIX}/bin
@cd ${WRKSRC}/man && \
${INSTALL_MAN} zip.1 ${PREFIX}/man/man1
WRKSRC= ${WRKDIR}/${PKGNAME}
.include <bsd.port.mk>

40
archivers/zip/patches/patch-aa Normal file
View File

@ -0,0 +1,40 @@
--- unix/Makefile.orig Fri Oct 24 14:38:04 1997
+++ unix/Makefile Fri Dec 17 20:40:11 1999
@@ -16,7 +16,6 @@
LN = ln -s
# (to use the Gnu compiler, change cc to gcc in CC)
-CC = cc
BIND = $(CC)
AS = $(CC) -c
E =
@@ -28,7 +27,7 @@
INSTALL_D = mkdir -p
# 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)
@@ -40,7 +39,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 = -O -I. -DUNIX $(LOCAL_ZIP)
+CFLAGS += -I. -DUNIX
LFLAGS1 =
LFLAGS2 = -s
@@ -120,9 +119,9 @@
# install
install: $(ZIPS)
-$(INSTALL_D) $(BINDIR)
- $(INSTALL) $(ZIPS) $(BINDIR)
+ $(BSD_INSTALL_PROGRAM) $(ZIPS) $(BINDIR)
-$(INSTALL_D) $(MANDIR)
- $(INSTALL) man/zip.1 $(MANDIR)/zip.$(manext)
+ $(BSD_INSTALL_MAN) man/zip.1 $(MANDIR)/zip.$(manext)
uninstall:
-cd $(BINDIR); rm -f $(ZIPS)