Clean up a bit, and remove FreeBSD Id now that we're quite divergent.

4 files changed, 23 insertions, 98 deletions

diff --git a/archivers/lha/Makefile b/archivers/lha/Makefile
index 3a735b6b6ee..22707e6f544 100644
--- a/archivers/lha/Makefile
+++ b/archivers/lha/Makefile
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/06/18 16:06:37 agc Exp $
-# FreeBSD Id: Makefile,v 1.9 1996/12/15 02:05:58 max Exp 
-#
+# $NetBSD: Makefile,v 1.7 1999/05/22 20:11:32 tv Exp $
 
 DISTNAME=       lha-114c
 PKGNAME=        lha-1.14c
@@ -10,6 +8,11 @@ EXTRACT_SUFX=   .tgz
 
 MAINTAINER=     packages@netbsd.org
 
-MAKE_ENV+=	BINOWN=${BINOWN} BINGRP=${BINGRP} BINMODE=${BINMODE}
+MAKE_FLAGS=	MAKE="${MAKE}" CC="${CC}" OPTIMIZE="${CFLAGS}" \
+		MACHINE="-DSYSTIME_HAS_NO_TM -DTIMELOCAL -DUSESTRCASECMP -DSYSV_SYSTEM_DIR" \
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/src/lha ${PREFIX}/bin/
+	${INSTALL_DATA} ${WRKSRC}/man/lha.n ${PREFIX}/man/ja_JP.EUC/man1/lha.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/lha/patches/patch-aa b/archivers/lha/patches/patch-aa
deleted file mode 100644
index 68cd00e74ef..00000000000
--- a/archivers/lha/patches/patch-aa
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 10:35:50 agc Exp $
-
-*** Makefile.orig	Fri Mar  1 17:59:19 1996
---- Makefile	Sun Dec 15 11:00:17 1996
-***************
-*** 11,35 ****
-  #-----------------------------------------------------------------------
-  
-  SHELL=/bin/sh
-! MAKE = make
-  
-  #CC			= cc
-! CC			= gcc
-! SWITCHES	= -DNEED_INCREMENTAL_INDICATOR \
-!  -DTMP_FILENAME_TEMPLATE="\"/tmp/lhXXXXXX\""
-  #MACHINE     = -DSYSTIME_HAS_NO_TM -DFTIME -DEUC
-! MACHINE     = -DSYSTIME_HAS_NO_TM -DEUC -DFTIME
-  #OPTIMIZE	= -O2 -fstrength-reduce -fomit-frame-pointer -mv8
-  #OPTIMIZE	= -O2 -fstrength-reduce -fomit-frame-pointer
-! OPTIMIZE	= -O2 -fstrength-reduce -fomit-frame-pointer
-  
-! BINDIR = /usr/local/bin
-! MANDIR = /usr/local/man
-! MANSECT = n
-  
-! INSTALL = install
-! INSTALLBIN = -s -m 755
-! INSTALLMAN = -m 644
-  
-  SUBDIRS = src man
-  
---- 11,37 ----
-  #-----------------------------------------------------------------------
-  
-  SHELL=/bin/sh
-! #MAKE = make
-  
-  #CC			= cc
-! #CC                      = gcc
-! SWITCHES        = -DNEED_INCREMENTAL_INDICATOR
-  #MACHINE     = -DSYSTIME_HAS_NO_TM -DFTIME -DEUC
-! MACHINE     = -DSYSTIME_HAS_NO_TM -DTIMELOCAL -DUSESTRCASECMP \
-! 	      -DSYSV_SYSTEM_DIR
-  #OPTIMIZE	= -O2 -fstrength-reduce -fomit-frame-pointer -mv8
-  #OPTIMIZE	= -O2 -fstrength-reduce -fomit-frame-pointer
-! #OPTIMIZE        = -O2 -fstrength-reduce -fomit-frame-pointer
-! OPTIMIZE        = ${CFLAGS}
-  
-! PREFIX ?= /usr/local
-! BINDIR = ${PREFIX}/bin
-! MANDIR = ${PREFIX}/man/ja_JP.EUC
-! MANSECT = 1
-  
-! #INSTALL = install
-! INSTALLBIN = -c -s -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
-! INSTALLMAN = -m 444 -o bin -g bin -c
-  
-  SUBDIRS = src man
-  
diff --git a/archivers/lha/patches/patch-ab b/archivers/lha/patches/patch-ab
index 6f9a88f51cb..25118b0eda5 100644
--- a/archivers/lha/patches/patch-ab
+++ b/archivers/lha/patches/patch-ab
@@ -1,34 +1,15 @@
-$NetBSD: patch-ab,v 1.3 1998/08/07 10:35:50 agc Exp $
+$NetBSD: patch-ab,v 1.4 1999/05/22 20:11:33 tv Exp $
 
-*** src/lharc.c.bak	Fri Mar  8 09:09:06 1996
---- src/lharc.c	Wed Aug 28 21:13:02 1996
-***************
-*** 318,324 ****
-  		cmd_filec = 0;
-  		if ((xfilev = (char **) malloc(sizeof(char *) * xfilec)) == NULL)
-  			fatal_error("Virtual memory exhausted\n");
-! 		while (gets(inpbuf)) {
-  			if (cmd_filec >= xfilec) {
-  				xfilec += 256;
-  				cmd_filev = (char **) realloc(xfilev,
---- 318,326 ----
-  		cmd_filec = 0;
-  		if ((xfilev = (char **) malloc(sizeof(char *) * xfilec)) == NULL)
-  			fatal_error("Virtual memory exhausted\n");
-! 		while (fgets(inpbuf, sizeof(inpbuf), stdin)) {
-! 			if ((p = strchr(inpbuf, '\n')))
-! 				*p = '\0';
-  			if (cmd_filec >= xfilec) {
-  				xfilec += 256;
-  				cmd_filev = (char **) realloc(xfilev,
---- man/Makefile	1997/11/14 16:39:56	1.1
-+++ man/Makefile	1997/11/14 16:42:32
-@@ -8,7 +8,7 @@
- 	nroff -man lha.n > lha.man
- 
- install:
--	$(INSTALL) $(INSTALLMAN) lha.n $(MANDIR)/man$(MANSECT)/lha.$(MANSECT)
-+	${INSTALL} -c -m 0444 -o ${BINOWN} -g ${BINGRP} lha.n ${MANDIR}/man${MANSECT}/lha.${MANSECT}
- 
- clean:
- 	rm -f *~
+--- src/lharc.c.orig	Fri Mar  8 01:09:06 1996
++++ src/lharc.c	Sat May 22 15:55:50 1999
+@@ -318,7 +318,9 @@
+ 		cmd_filec = 0;
+ 		if ((xfilev = (char **) malloc(sizeof(char *) * xfilec)) == NULL)
+ 			fatal_error("Virtual memory exhausted\n");
+-		while (gets(inpbuf)) {
++		while (fgets(inpbuf, sizeof(inpbuf), stdin)) {
++			if ((p = strchr(inpbuf, '\n')))
++				*p = '\0';
+ 			if (cmd_filec >= xfilec) {
+ 				xfilec += 256;
+ 				cmd_filev = (char **) realloc(xfilev,
diff --git a/archivers/lha/pkg/PLIST b/archivers/lha/pkg/PLIST
index 4cb516d11d4..78925c833e7 100644
--- a/archivers/lha/pkg/PLIST
+++ b/archivers/lha/pkg/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 1997/11/06 09:57:24 agc Exp $
+@comment $NetBSD: PLIST,v 1.3 1999/05/22 20:11:33 tv Exp $
 bin/lha
-man/ja_JP.EUC/man1/lha.1.gz
+man/ja_JP.EUC/man1/lha.1