- Add build flags missing from previous update.

- Remove again extraneous documentation that is of no interest to
  users of the compiled package.
- Prune inappropriate verbiage from description.
- Disallow CDROM distribution according to old description.
- Rename patches.
- General clean-up.

archivers/lha/Makefile

@@ -1,37 +1,34 @@
-# $OpenBSD: Makefile,v 1.17 2002/02/04 19:53:52 angelos Exp $
-## updated to lha-1.14i supporting -lh7- algorithm
-## -- yozo.  Sun Jan 13 14:36:49 JST 2002
+# $OpenBSD: Makefile,v 1.18 2002/02/04 22:16:17 naddy Exp $
 
-COMMENT=	"archive files using LZW compression (.LZH files)"
+COMMENT=	"archive files using LZW compression (.lzh files)"
 
-DISTNAME=	lha-114i
-PKGNAME=	lha-1.14i
-NEED_VERSION=	1.504
+VERSION=	1.14i
+DISTNAME=	lha-${VERSION:S/.//}
+PKGNAME=	lha-${VERSION}
 CATEGORIES=	archivers
-MASTER_SITES=	http://www2m.biglobe.ne.jp/~dolphin/lha/prog/ \
-		ftp://ftp.win.ne.jp/pub/misc/
-HOMEPAGE=       http://www2m.biglobe.ne.jp/~dolphin/lha/lha.htm
+NEED_VERSION=	1.504
 
-MAINTAINER=	[email protected]
+HOMEPAGE=       http://www2m.biglobe.ne.jp/~dolphin/lha/lha.htm
 
-PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_CDROM=	"requires advance notification"
 PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_CDROM=	"requires advance notification"
 PERMIT_DISTFILES_FTP=	Yes
 
-FAKE_FLAGS=	BINDIR='$${PREFIX}/bin' MANDIR='$${PREFIX}/man/ja_JP.EUC' \
-		MANSECT="1" INSTALL="" INSTALLBIN="${INSTALL_PROGRAM}" \
+MASTER_SITES=	http://www2m.biglobe.ne.jp/~dolphin/lha/prog/ \
+		ftp://ftp.win.ne.jp/pub/misc/
+
+MAKE_FLAGS=	CC="${CC}" OPTIMIZE="${CFLAGS}" \
+		MACHINE="-DSYSTIME_HAS_NO_TM -DSYSV_SYSTEM_DIR -DMKTIME \
+			 -DUSESTRCASECMP" \
+		SWITCHES="-DNEED_INCREMENTAL_INDICATOR -DEUC -DSUPPORT_LH7"
+
+FAKE_FLAGS=	BINDIR="${WRKINST}${PREFIX}/bin" \
+		MANDIR="${WRKINST}${PREFIX}/man/ja_JP.EUC" MANSECT="1" \
+		INSTALL="" INSTALLBIN="${INSTALL_PROGRAM}" \
 		INSTALLMAN="${INSTALL_MAN}"
 
 MANLANG=	ja_JP.EUC
 NO_REGRESS=	Yes
 
-DOCS= CHANGES.euc MACHINES.euc MACHINES2.euc PROBLEMS.euc README.euc \
-      change-114e.txt change-114g.txt change-114h.txt change-114i.txt \
-      config.eng config.jpn.euc header.doc.euc
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/lha
-	cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/lha
-
 .include <bsd.port.mk>

archivers/lha/patches/patch-ac → archivers/lha/patches/patch-src_lhadd_c

@@ -1,6 +1,7 @@
---- src/lhadd.c.orig	Sat Sep  4 18:10:14 1999
-+++ src/lhadd.c	Sat Sep  4 18:14:30 1999
-@@ -270,13 +270,35 @@
+$OpenBSD: patch-src_lhadd_c,v 1.1 2002/02/04 22:16:17 naddy Exp $
+--- src/lhadd.c.orig	Wed Oct  4 16:57:38 2000
++++ src/lhadd.c	Mon Feb  4 17:52:03 2002
+@@ -270,13 +270,35 @@ build_temporary_file()
  {
  	int             old_umask;
  	FILE           *afp;

archivers/lha/patches/patch-ab → archivers/lha/patches/patch-src_lharc_c

@@ -1,15 +1,16 @@
---- src/lharc.c.orig	Sat Sep  4 18:08:21 1999
-+++ src/lharc.c	Sat Sep  4 18:09:48 1999
-@@ -865,6 +865,7 @@
+$OpenBSD: patch-src_lharc_c,v 1.1 2002/02/04 22:16:17 naddy Exp $
+--- src/lharc.c.orig	Thu Oct  5 19:33:34 2000
++++ src/lharc.c	Mon Feb  4 17:52:03 2002
+@@ -894,6 +894,7 @@ free_files(filec, filev)
  /*																			*/
  /* ------------------------------------------------------------------------ */
  /* Build temporary file name and store to TEMPORARY_NAME */
-+#if !defined(__OpenBSD__)
++#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
  void
  build_temporary_name()
  {
-@@ -888,7 +889,7 @@
- 	mktemp(temporary_name);
+@@ -925,7 +926,7 @@ build_temporary_name()
+ #endif
  #endif
  }
 -

archivers/lha/pkg/DESCR

@@ -1,15 +1,5 @@
-     LHa for UNIX
+This unofficial version of lha is based on version 1.00.  This
+version supports extraction and archiving using the -lh5-, -lh6-,
+and -lh7- algorithms.
 
-     This unofficial version of lha is based on Version 1.00.  This
-version supports extraction & archiving using -lh5-, -lh6- and -lh7-
-algorithm.
-
-     All the bug reports on this version should be directed to Tsuguo
-Okamoto <[email protected]>.
-
-     If this software is included in medium that may be obtained by
-users without network connectivity, please notify Tsuguo Okamoto in
-advance.  Redistribution over networks is not restricted.
-
-     According to Masafumi NAKANE <[email protected]> the author gives
-permission to distribute this software on FreeBSD CDROM.
+WWW: ${HOMEPAGE}

archivers/lha/pkg/PLIST

@@ -1,16 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.3 2002/02/04 19:53:52 angelos Exp $
+@comment $OpenBSD: PLIST,v 1.4 2002/02/04 22:16:17 naddy Exp $
 bin/lha
 man/ja_JP.EUC/man1/lha.1
-share/doc/lha/CHANGES.euc
-share/doc/lha/MACHINES.euc
-share/doc/lha/MACHINES2.euc
-share/doc/lha/PROBLEMS.euc
-share/doc/lha/README.euc
-share/doc/lha/change-114e.txt
-share/doc/lha/change-114g.txt
-share/doc/lha/change-114h.txt
-share/doc/lha/change-114i.txt
-share/doc/lha/config.eng
-share/doc/lha/config.jpn.euc
-share/doc/lha/header.doc.euc
-@dirrm share/doc/lha