Explode one big patch into several unidiff patches, honor CFLAGS passed

in from enviroment during build, and mark as USE_BUILDLINK_ONLY.

5 files changed, 37 insertions, 25 deletions

diff --git a/archivers/ha/Makefile b/archivers/ha/Makefile
index f8dbb432cd0..fc6dad5d81b 100644
--- a/archivers/ha/Makefile
+++ b/archivers/ha/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/03/11 03:35:48 tv Exp $
+# $NetBSD: Makefile,v 1.9 2001/07/15 11:49:41 jlam Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/08/10 22:31:19 fenner Exp 
 #
 
@@ -11,6 +11,8 @@ EXTRACT_SUFX=   .tgz
 MAINTAINER=     packages@netbsd.org
 COMMENT=	The HA archiver using the HSC compression method
 
+USE_BUILDLINK_ONLY=	yes
+
 NO_WRKSUBDIR=   yes
 MAKEFILE=       makefile.nix
 MAKE_FLAGS=     CC="${CC}"
diff --git a/archivers/ha/distinfo b/archivers/ha/distinfo
index a23496e5a64..c9ccb9fe406 100644
--- a/archivers/ha/distinfo
+++ b/archivers/ha/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 11:21:05 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/07/15 11:49:41 jlam Exp $
 
 SHA1 (ha0999.tgz) = 8dd106748619772f988ee0bce59937a4de1677ed
 Size (ha0999.tgz) = 44271 bytes
-SHA1 (patch-aa) = 0d25173f4c8236157cb8784826ba681ae8e13f64
+SHA1 (patch-aa) = 3cb453dd45de59331542a83328759d00b156a933
+SHA1 (patch-ab) = 52a11bd1e788b67e5f98a70f5edca79809191c75
+SHA1 (patch-ac) = 5504ba8f6070cd6ed984a4ad870ebc9eb58353c4
diff --git a/archivers/ha/patches/patch-aa b/archivers/ha/patches/patch-aa
index 063cff1d780..f1be61e133e 100644
--- a/archivers/ha/patches/patch-aa
+++ b/archivers/ha/patches/patch-aa
@@ -1,26 +1,7 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 10:35:49 agc Exp $
+$NetBSD: patch-aa,v 1.4 2001/07/15 11:49:42 jlam Exp $
 
-*** nix/machine.c.bak	Thu Jan 12 09:53:00 1995
---- nix/machine.c	Tue Jan 24 19:38:07 1995
-***************
-*** 417,423 ****
-      if (plainname!=NULL) free(plainname),plainname=NULL;
-      if ((plainname=malloc(strlen(mdfullpath)+1))==NULL) 
-        error(1,ERR_MEM,"md_stripname()");
-!     for (i=strlen(mdfullpath)-1;i>0;i--) {
-  	if (mdfullpath[i]=='/') {
-  	    i++;
-  	    break;
---- 417,423 ----
-      if (plainname!=NULL) free(plainname),plainname=NULL;
-      if ((plainname=malloc(strlen(mdfullpath)+1))==NULL) 
-        error(1,ERR_MEM,"md_stripname()");
-!     for (i=strlen(mdfullpath)-1;i>=0;i--) {
-  	if (mdfullpath[i]=='/') {
-  	    i++;
-  	    break;
---- c/hsc.c	1997/11/18 12:32:02	1.1
-+++ c/hsc.c	1997/11/18 12:33:06
+--- c/hsc.c.orig	Thu Jan 12 01:51:16 1995
++++ c/hsc.c
 @@ -491,6 +491,7 @@
  
      esc=adj_escape_prob(fe[cp],cp);
diff --git a/archivers/ha/patches/patch-ab b/archivers/ha/patches/patch-ab
new file mode 100644
index 00000000000..5b59907a2f9
--- /dev/null
+++ b/archivers/ha/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.1 2001/07/15 11:49:42 jlam Exp $
+
+--- makefile.nix.orig	Thu Jan 12 02:26:26 1995
++++ makefile.nix
+@@ -23,8 +23,7 @@
+ 
+ CC = gcc
+ CPP = $(CC) -E
+-CFLAGS = -Wall -O2 -c -I../$(MCH) -I../include
+-LDFLAGS = -O2
++CFLAGS += -Wall -c -I../$(MCH) -I../include
+ 
+ MDEFINES = "CC=$(CC)" "CPP=$(CPP)" "CFLAGS=$(CFLAGS)" "DEFS=$(DEFS)"
+ SUBDIRS = c $(MCH) include
diff --git a/archivers/ha/patches/patch-ac b/archivers/ha/patches/patch-ac
new file mode 100644
index 00000000000..882c1d0fff2
--- /dev/null
+++ b/archivers/ha/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2001/07/15 11:49:42 jlam Exp $
+
+--- nix/machine.c.orig	Thu Jan 12 01:53:00 1995
++++ nix/machine.c
+@@ -417,7 +417,7 @@
+     if (plainname!=NULL) free(plainname),plainname=NULL;
+     if ((plainname=malloc(strlen(mdfullpath)+1))==NULL) 
+       error(1,ERR_MEM,"md_stripname()");
+-    for (i=strlen(mdfullpath)-1;i>0;i--) {
++    for (i=strlen(mdfullpath)-1;i>=0;i--) {
+ 	if (mdfullpath[i]=='/') {
+ 	    i++;
+ 	    break;