Fix stripping of binaries (caused by fixing PR4884)

3 files changed, 46 insertions, 73 deletions

diff --git a/archivers/ha/Makefile b/archivers/ha/Makefile
index f0b000b3add..5cbb3c070e4 100644
--- a/archivers/ha/Makefile
+++ b/archivers/ha/Makefile
@@ -3,7 +3,7 @@
 # Date created:         24 Jan 1995
 # Whom:                 ache
 #
-# $NetBSD: Makefile,v 1.2 1997/10/27 03:22:10 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/02/09 00:34:17 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/08/10 22:31:19 fenner Exp 
 #
 
@@ -22,6 +22,6 @@ ALL_TARGET=     ha
 USE_GMAKE=      yes
 
 do-install:
-	cd ${WRKSRC}; ${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ha ${PREFIX}/bin
+	cd ${WRKSRC}; ${INSTALL_PROGRAM} ha ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/archivers/zoo/Makefile b/archivers/zoo/Makefile
index 47e9a164840..ba9c2bc15d4 100644
--- a/archivers/zoo/Makefile
+++ b/archivers/zoo/Makefile
@@ -3,7 +3,7 @@
 # Date created:         18 October 1994
 # Whom:                 jmz
 #
-# $NetBSD: Makefile,v 1.3 1997/11/18 13:10:49 agc Exp $
+# $NetBSD: Makefile,v 1.4 1998/02/09 00:33:12 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/08/10 22:31:36 fenner Exp 
 #
 
@@ -17,8 +17,8 @@ MAINTAINER=	jmz@FreeBSD.org
 NO_WRKSUBDIR=	yes
 ALL_TARGET=     bsdansi
 MAKEFILE=       makefile
-MAKE_ENV+=	COPY=${COPY} STRIP=${STRIP} \
-		BINOWN=${BINOWN} BINGRP=${BINGRP} BINMODE=${BINMODE}
+MAKE_ENV+=	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+		INSTALL_DATA="${INSTALL_DATA}"
 MAN1=		fiz.1 zoo.1
 
 .include <bsd.port.mk>
diff --git a/archivers/zoo/patches/patch-ab b/archivers/zoo/patches/patch-ab
index 6613d11bc3e..02383f93036 100644
--- a/archivers/zoo/patches/patch-ab
+++ b/archivers/zoo/patches/patch-ab
@@ -1,68 +1,41 @@
-*** makefile.old	Thu Aug  8 09:34:44 1991
---- makefile	Thu Jan  5 05:07:23 1995
-***************
-*** 18,30 ****
-  
-  MAKE = make	      # needed for some systems e.g. older BSD
-  
-! CC = cc
-! CFLAGS =
-  MODEL =
-  EXTRA = -DBIG_MEM -DNDEBUG
-  LINTFLAGS = -DLINT
-! OPTIM = -O
-! DESTDIR = /usr/local/bin
-  
-  #List of all object files created for Zoo
-  ZOOOBJS = addbfcrc.o addfname.o basename.o comment.o crcdefs.o \
---- 18,30 ----
-  
-  MAKE = make	      # needed for some systems e.g. older BSD
-  
-! #CC = cc
-! #CFLAGS =
-  MODEL =
-  EXTRA = -DBIG_MEM -DNDEBUG
-  LINTFLAGS = -DLINT
-! OPTIM = $(CFLAGS)
-! DESTDIR = $(PREFIX)/bin
-  
-  #List of all object files created for Zoo
-  ZOOOBJS = addbfcrc.o addfname.o basename.o comment.o crcdefs.o \
-***************
-*** 67,73 ****
-  	@echo "lint_turboc:  Run lint under **IX for checking Turbo C/MSDOS code"
-  
-  # install alpha zoo as "tzoo"
-! install:
-  	mv zoo $(DESTDIR)/tzoo
-  
-  # install beta zoo as "bzoo"
---- 67,73 ----
-  	@echo "lint_turboc:  Run lint under **IX for checking Turbo C/MSDOS code"
-  
-  # install alpha zoo as "tzoo"
-! inst_test:
-  	mv zoo $(DESTDIR)/tzoo
-  
-  # install beta zoo as "bzoo"
-***************
-*** 75,82 ****
-  	mv zoo $(DESTDIR)/bzoo
-  
-  # install production zoo as "zoo"
-! inst_prod:
-! 	mv zoo $(DESTDIR)/zoo
-  
-  # executable targets
-  TARGETS = zoo fiz
---- 75,83 ----
-  	mv zoo $(DESTDIR)/bzoo
-  
-  # install production zoo as "zoo"
-! install:
-! 	$(INSTALL) $(COPY) $(STRIP) -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) $(TARGETS) $(DESTDIR)
-! 	$(INSTALL) -c -o $(BINOWN) -g $(BINGRP) -m 444 zoo.1 fiz.1 $(PREFIX)/man/man1
-  
-  # executable targets
-  TARGETS = zoo fiz
+--- makefile.orig	Tue Jul 16 17:52:08 1991
++++ makefile	Sat Feb  7 18:20:15 1998
+@@ -18,13 +18,13 @@
+ 
+ MAKE = make	      # needed for some systems e.g. older BSD
+ 
+-CC = cc
+-CFLAGS =
++#CC = cc
++#CFLAGS =
+ MODEL =
+ EXTRA = -DBIG_MEM -DNDEBUG
+ LINTFLAGS = -DLINT
+-OPTIM = -O
+-DESTDIR = /usr/local/bin
++OPTIM = $(CFLAGS)
++DESTDIR = $(PREFIX)/bin
+ 
+ #List of all object files created for Zoo
+ ZOOOBJS = addbfcrc.o addfname.o basename.o comment.o crcdefs.o \
+@@ -67,7 +67,7 @@
+ 	@echo "lint_turboc:  Run lint under **IX for checking Turbo C/MSDOS code"
+ 
+ # install alpha zoo as "tzoo"
+-install:
++inst_test:
+ 	mv zoo $(DESTDIR)/tzoo
+ 
+ # install beta zoo as "bzoo"
+@@ -75,8 +75,9 @@
+ 	mv zoo $(DESTDIR)/bzoo
+ 
+ # install production zoo as "zoo"
+-inst_prod:
+-	mv zoo $(DESTDIR)/zoo
++install:
++	$(INSTALL_PROGRAM) $(TARGETS) $(DESTDIR)
++	$(INSTALL_DATA) zoo.1 fiz.1 $(PREFIX)/man/man1
+ 
+ # executable targets
+ TARGETS = zoo fiz