From a5483fc63f264ed75dde3c90a9ad828ffe836e79 Mon Sep 17 00:00:00 2001
From: grant <grant@pkgsrc.org>
Date: Thu, 29 Jan 2004 12:55:35 +0000
Subject: bl3ify, don't override CC. fixes build with non-gcc.

---
 archivers/ha/Makefile         |  7 ++++---
 archivers/ha/distinfo         |  4 ++--
 archivers/ha/patches/patch-ab | 16 ++++++++++------
 3 files changed, 16 insertions(+), 11 deletions(-)

(limited to 'archivers')

diff --git a/archivers/ha/Makefile b/archivers/ha/Makefile
index f1ecf8a4d5e..5e3f6c44e7a 100644
--- a/archivers/ha/Makefile
+++ b/archivers/ha/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/01/22 07:18:43 grant Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/29 12:55:35 grant Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/08/10 22:31:19 fenner Exp
 #
 
@@ -11,11 +11,12 @@ EXTRACT_SUFX=   .tgz
 MAINTAINER=     tech-pkg@NetBSD.org
 COMMENT=	The HA archiver using the HSC compression method
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 WRKSRC=		${WRKDIR}
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
 MAKEFILE=       makefile.nix
-MAKE_FLAGS=     CC="${CC}"
 ALL_TARGET=     ha
 USE_GNU_TOOLS+=	make
 
diff --git a/archivers/ha/distinfo b/archivers/ha/distinfo
index c9ccb9fe406..3f795cd0a2e 100644
--- a/archivers/ha/distinfo
+++ b/archivers/ha/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2001/07/15 11:49:41 jlam Exp $
+$NetBSD: distinfo,v 1.4 2004/01/29 12:55:36 grant Exp $
 
 SHA1 (ha0999.tgz) = 8dd106748619772f988ee0bce59937a4de1677ed
 Size (ha0999.tgz) = 44271 bytes
 SHA1 (patch-aa) = 3cb453dd45de59331542a83328759d00b156a933
-SHA1 (patch-ab) = 52a11bd1e788b67e5f98a70f5edca79809191c75
+SHA1 (patch-ab) = 4dcf130fa23beab775fc4b11883d4a820f223016
 SHA1 (patch-ac) = 5504ba8f6070cd6ed984a4ad870ebc9eb58353c4
diff --git a/archivers/ha/patches/patch-ab b/archivers/ha/patches/patch-ab
index 5b59907a2f9..6fde962e31f 100644
--- a/archivers/ha/patches/patch-ab
+++ b/archivers/ha/patches/patch-ab
@@ -1,14 +1,18 @@
-$NetBSD: patch-ab,v 1.1 2001/07/15 11:49:42 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2004/01/29 12:55:36 grant Exp $
 
---- makefile.nix.orig	Thu Jan 12 02:26:26 1995
+--- makefile.nix.orig	1995-01-12 18:26:26.000000000 +1100
 +++ makefile.nix
-@@ -23,8 +23,7 @@
+@@ -21,10 +21,9 @@
  
- CC = gcc
- CPP = $(CC) -E
+ MCH = nix
+ 
+-CC = gcc
+-CPP = $(CC) -E
 -CFLAGS = -Wall -O2 -c -I../$(MCH) -I../include
 -LDFLAGS = -O2
-+CFLAGS += -Wall -c -I../$(MCH) -I../include
++#CC = gcc
++#CPP = $(CC) -E
++CFLAGS += -c -I../$(MCH) -I../include
  
  MDEFINES = "CC=$(CC)" "CPP=$(CPP)" "CFLAGS=$(CFLAGS)" "DEFS=$(DEFS)"
  SUBDIRS = c $(MCH) include
-- 
cgit v1.2.3