From a7305c009c5a54e3bdc2c4e9a990164c36cc6f4b Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Wed, 9 Feb 2000 03:40:54 +0000
Subject: [PATCH] - remove NO_WRKSUBDIR and replace with the use of WRKDIST -
 revert part of the patch and use MAKE_FLAGS to override a few variables in
 the Makefile - use BSD_INSTALL_ macros inside arc's Makefile

---
 archivers/arc/Makefile         |  6 ++++--
 archivers/arc/patches/patch-aa | 26 ++++++++------------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/archivers/arc/Makefile b/archivers/arc/Makefile
index a8668eaf8fe..049e7f9b373 100644
--- a/archivers/arc/Makefile
+++ b/archivers/arc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 1999/09/24 13:04:45 brad Exp $
+# $OpenBSD: Makefile,v 1.8 2000/02/09 03:40:54 brad Exp $
 
 DISTNAME=       arc521e.pl8
 PKGNAME=        arc-5.21e
@@ -11,6 +11,8 @@ NO_CDROM=	"NOFEE: can not sell"
 
 MAINTAINER=     ports@openbsd.org
 
-NO_WRKSUBDIR=	yes
+MAKE_FLAGS=	CC="${CC}" OPT="${CFLAGS}"
+
+WRKDIST=	${WRKDIR}
 
 .include <bsd.port.mk>
diff --git a/archivers/arc/patches/patch-aa b/archivers/arc/patches/patch-aa
index 4232d85d77f..884c670837e 100644
--- a/archivers/arc/patches/patch-aa
+++ b/archivers/arc/patches/patch-aa
@@ -1,17 +1,7 @@
 --- Makefile.orig	Tue Apr 14 18:57:58 1992
-+++ Makefile	Mon Aug  9 19:32:28 1999
-@@ -32,14 +32,15 @@
- OPT = -O
- # For MWC 3.0 on the Atari ST, use:
- #CFLAGS = -VCOMPAC -VPEEP
--CFLAGS = $(OPT) $(SYSTEM)
-+#CFLAGS = $(OPT) $(SYSTEM)
-+CFLAGS += $(SYSTEM)
- 
- # GNU's gcc is very nice, if you've got it. Otherwise just cc.
- #CC = cgcc -mshort
--CC = cc
-+#CC = cc
++++ Makefile	Tue Feb  8 22:23:59 2000
+@@ -39,7 +39,7 @@
+ CC = cc
  
  # tmclock is only needed on Unix systems...
 -TMCLOCK = tmclock.o
@@ -19,16 +9,16 @@
  
  # Files needed for System V 
  #SYSVOBJ =	getwd.o rename.o scandir.o utimes.o
-@@ -61,6 +62,12 @@
+@@ -61,6 +61,12 @@
  
  clean:
  	-rm *.o arc$(PROG) marc$(PROG)
 +
 +install:
-+	install -cs -o root -g wheel arc marc ${PREFIX}/bin
-+	install -c -o root -g wheel arc.1 ${PREFIX}/man/man1
-+	install -d -o root -g wheel ${PREFIX}/share/doc/arc
-+	install -c -o root -g wheel Arc521.doc Arcinfo ${PREFIX}/share/doc/arc
++	$(BSD_INSTALL_DATA_DIR) ${PREFIX}/share/doc/arc
++	$(BSD_INSTALL_PROGRAM) arc marc ${PREFIX}/bin
++	$(BSD_INSTALL_MAN) arc.1 ${PREFIX}/man/man1
++	$(BSD_INSTALL_DATA) Arc521.doc Arcinfo ${PREFIX}/share/doc/arc
  
  arc.o:	$(SRCDIR)arc.c	$(HEADER)
  	$(CC) $(CFLAGS) -c $(SRCDIR)arc.c