Merge packages from the buildlink2 branch back into the main trunk that

have been converted to USE_BUILDLINK2.

6 files changed, 12 insertions, 12 deletions

diff --git a/archivers/lha/Makefile b/archivers/lha/Makefile
index 7427db2f04e..a3633e7992e 100644
--- a/archivers/lha/Makefile
+++ b/archivers/lha/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/03/09 04:55:33 yyamano Exp $
+# $NetBSD: Makefile,v 1.13 2002/08/25 21:49:12 jlam Exp $
 
 DISTNAME=       lha-114i
 PKGNAME=	lha-114.9
@@ -9,9 +9,9 @@ MASTER_SITES=   http://www2m.biglobe.ne.jp/~dolphin/lha/prog/ \
 MAINTAINER=     packages@netbsd.org
 COMMENT=	Archive files using LZW compression (.lzh files)
 
-USE_BUILDLINK_ONLY=	# defined
+USE_BUILDLINK2=	# defined
 
-MAKE_FLAGS=	CC="${CC}" MAKE="${MAKE_PROGRAM}"
+MAKE_FLAGS=	MAKE="${MAKE_PROGRAM}"
 
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "Darwin"
diff --git a/archivers/lha/distinfo b/archivers/lha/distinfo
index 4befaf3e9c5..c33f85c6bab 100644
--- a/archivers/lha/distinfo
+++ b/archivers/lha/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2002/07/19 03:14:31 mycroft Exp $
+$NetBSD: distinfo,v 1.5 2002/08/25 21:49:12 jlam Exp $
 
 SHA1 (lha-114i.tar.gz) = 79e35271f2cf783f946db3f22e304fef72dbac99
 Size (lha-114i.tar.gz) = 64608 bytes
-SHA1 (patch-ae) = ad6040f318ecb2762618f210fbac35c03a17af66
+SHA1 (patch-ae) = a53647ccf72511ecd2b5306e23da1219fa5e7264
 SHA1 (patch-af) = 0c2f6d5bf23c3c98b102487abe3dd1190470f50c
 SHA1 (patch-ag) = 9ad3bc807a3cda4f71d8fbbbea19306f252f2489
 SHA1 (patch-ah) = cd44b40fa7e25a9996b2441d1b78a1a6570977b2
diff --git a/archivers/lha/patches/patch-ae b/archivers/lha/patches/patch-ae
index af5957ff7ba..1a8ebee6cb3 100644
--- a/archivers/lha/patches/patch-ae
+++ b/archivers/lha/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.3 2001/12/06 05:09:48 jlam Exp $
+$NetBSD: patch-ae,v 1.4 2002/08/25 21:49:13 jlam Exp $
 
 --- Makefile.orig	Mon Dec  3 14:32:27 2001
 +++ Makefile
@@ -8,12 +8,12 @@ $NetBSD: patch-ae,v 1.3 2001/12/06 05:09:48 jlam Exp $
  
 -SHELL=/bin/sh
 -MAKE = make
-+SHELL = ${SH}
-+MAKE = ${MAKE}
++#SHELL=/bin/sh
++#MAKE = make
  
 -#CC			= cc
 -CC			= gcc
-+CC			= ${CC}
++#CC			= gcc
  SWITCHES	= -DNEED_INCREMENTAL_INDICATOR \
   -DTMP_FILENAME_TEMPLATE="\"/tmp/lhXXXXXX\""
  
diff --git a/archivers/lha/patches/patch-ah b/archivers/lha/patches/patch-ah
index e80189ec8bf..734474dd48f 100644
--- a/archivers/lha/patches/patch-ah
+++ b/archivers/lha/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.1 2002/07/19 03:14:31 mycroft Exp $
+$NetBSD: patch-ah,v 1.2 2002/08/25 21:49:13 jlam Exp $
 
 --- src/lharc.c.orig	Thu Oct  5 17:33:34 2000
 +++ src/lharc.c	Fri Jul 19 03:11:24 2002
diff --git a/archivers/lha/patches/patch-ai b/archivers/lha/patches/patch-ai
index d9e46c5a702..fe8284846b4 100644
--- a/archivers/lha/patches/patch-ai
+++ b/archivers/lha/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1 2002/07/19 03:14:32 mycroft Exp $
+$NetBSD: patch-ai,v 1.2 2002/08/25 21:49:13 jlam Exp $
 
 --- src/slide.c.orig	Wed Oct  4 14:57:38 2000
 +++ src/slide.c	Fri Jul 19 03:11:39 2002
diff --git a/archivers/lha/patches/patch-aj b/archivers/lha/patches/patch-aj
index 13e72891b2b..2e3bb93c80f 100644
--- a/archivers/lha/patches/patch-aj
+++ b/archivers/lha/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1 2002/07/19 03:14:33 mycroft Exp $
+$NetBSD: patch-aj,v 1.2 2002/08/25 21:49:13 jlam Exp $
 
 --- src/util.c.orig	Wed Oct  4 14:57:38 2000
 +++ src/util.c	Fri Jul 19 03:11:46 2002