5 files changed, 70 insertions, 11 deletions

diff --git a/archivers/lha/Makefile b/archivers/lha/Makefile
index 7d92233bc1aa..04db10b8c114 100644
--- a/archivers/lha/Makefile
+++ b/archivers/lha/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	lha
-PORTVERSION=	1.14f
+PORTVERSION=	1.14g
 CATEGORIES=	archivers
 MASTER_SITES=	http://www2m.biglobe.ne.jp/~dolphin/lha/prog/ \
 		ftp://ftp.win.ne.jp/pub/misc/
-DISTNAME=	lha-114f
+DISTNAME=      	${PORTNAME}-${PORTVERSION:S/.//}
 
 MAINTAINER=	ache@FreeBSD.org
 
diff --git a/archivers/lha/distinfo b/archivers/lha/distinfo
index 386d785a1005..727b16eabe79 100644
--- a/archivers/lha/distinfo
+++ b/archivers/lha/distinfo
@@ -1 +1 @@
-MD5 (lha-114f.tar.gz) = db86f414e08c39e190763f8b0c190ff6
+MD5 (lha-114g.tar.gz) = 6e99dd9be599e60decebea97f62a0448
diff --git a/archivers/lha/files/patch-aa b/archivers/lha/files/patch-aa
index d070624a8908..9b9ae5bd2dd8 100644
--- a/archivers/lha/files/patch-aa
+++ b/archivers/lha/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.orig	Sun Aug 29 01:36:34 1999
-+++ Makefile	Thu Sep  2 03:33:33 1999
-@@ -11,27 +11,26 @@
+--- Makefile.orig	Sat May  6 22:55:15 2000
++++ Makefile	Mon Jul 31 18:08:14 2000
+@@ -11,27 +11,27 @@
  #-----------------------------------------------------------------------
  
  SHELL=/bin/sh
@@ -12,16 +12,16 @@
 -SWITCHES	= -DNEED_INCREMENTAL_INDICATOR \
 - -DTMP_FILENAME_TEMPLATE="\"/tmp/lhXXXXXX\""
 +#CC			= gcc
-+SWITCHES	= -DNEED_INCREMENTAL_INDICATOR -DEUC -DSUPPORT_LH6
++#SWITCHES	= -DNEED_INCREMENTAL_INDICATOR \
  
  #MACHINE     = -DSYSTIME_HAS_NO_TM -DFTIME -DEUC
  #MACHINE     = -DSYSTIME_HAS_NO_TM -DEUC -DHAVE_TM_ZONE -DSYSV_SYSTEM_DIR
 -MACHINE     = -DSYSTIME_HAS_NO_TM -DEUC -DSYSV_SYSTEM_DIR -DMKTIME
-+MACHINE	= -DSYSTIME_HAS_NO_TM -DSYSV_SYSTEM_DIR -DMKTIME -DUSESTRCASECMP
++MACHINE     = -DSYSTIME_HAS_NO_TM -DSYSV_SYSTEM_DIR -DMKTIME -DUSESTRCASECMP
  
--#OPTIMIZE	= -O2 -fstrength-reduce -fomit-frame-pointer
--OPTIMIZE	= -O2 -DSUPPORT_LH6
-+OPTIMIZE	= ${CFLAGS}
+ #OPTIMIZE	= -O2 -fstrength-reduce -fomit-frame-pointer
+-OPTIMIZE	= -O2 -DSUPPORT_LH7
++OPTIMIZE       	= ${CFLAGS}
  
 -BINDIR = /usr/local/bin
 -MANDIR = /usr/local/man
diff --git a/archivers/lha/files/patch-ad b/archivers/lha/files/patch-ad
new file mode 100644
index 000000000000..41c40de01872
--- /dev/null
+++ b/archivers/lha/files/patch-ad
@@ -0,0 +1,19 @@
+--- src/lharc.c.orig   Sun May  7 00:05:29 2000
++++ src/lharc.c        Fri Jul 28 19:35:31 2000
+@@ -889,6 +889,7 @@
+ /*                                                                                                                                                    */
+ /* ------------------------------------------------------------------------ */
+ /* Build temporary file name and store to TEMPORARY_NAME */
++#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
+ void
+ build_temporary_name()
+ {
+@@ -912,7 +913,7 @@
+       mktemp(temporary_name);
+ #endif
+ }
+-
++#endif
+ /* ------------------------------------------------------------------------ */
+ static void
+ modify_filename_extention(buffer, ext)
diff --git a/archivers/lha/files/patch-ae b/archivers/lha/files/patch-ae
new file mode 100644
index 000000000000..225ac6e50993
--- /dev/null
+++ b/archivers/lha/files/patch-ae
@@ -0,0 +1,40 @@
+--- src/lhadd.c.orig	Mon Jul 31 18:09:53 2000
++++ src/lhadd.c	Mon Jul 31 18:14:20 2000
+@@ -270,13 +270,35 @@
+ {
+ 	int             old_umask;
+ 	FILE           *afp;
++        int             tempfd;
++
++    #ifdef TMP_FILENAME_TEMPLATE
++          if (extract_directory == NULL) {
++                  strcpy(temporary_name, TMP_FILENAME_TEMPLATE);
++          }
++          else {
++                  sprintf(temporary_name, "%s/lhXXXXXX", extract_directory);
++          }
++          tempfd = mkstemp(temporary_name);
++    #else
++    char           *p, *s;
++   
++          strcpy(temporary_name, archive_name);
++          for (p = temporary_name, s = (char *) 0; *p; p++)
++                  if (*p == '/')
++                          s = p;
++	  strcpy((s ? s + 1 : temporary_name), "lhXXXXXX");
++          tempfd = mkstemp(temporary_name);
++    #endif
++        if (tempfd == -1)
++          return NULL;
+ 
+-	build_temporary_name();
+ 	signal(SIGINT, interrupt);
+ 	signal(SIGHUP, interrupt);
+ 
+ 	old_umask = umask(077);
+-	afp = xfopen(temporary_name, WRITE_BINARY);
++	/*afp = xfopen(temporary_name, WRITE_BINARY);*/
++	afp = fdopen(tempfd, "w+");
+ 	remove_temporary_at_error = TRUE;
+ 	temporary_fp = afp;
+ 	umask(old_umask);