Upgrade to 1.14C

5 files changed, 51 insertions, 124 deletions

diff --git a/archivers/lha/Makefile b/archivers/lha/Makefile
index bf4b89bb5703..c505ea2e2a62 100644
--- a/archivers/lha/Makefile
+++ b/archivers/lha/Makefile
@@ -1,19 +1,17 @@
 # New ports collection makefile for:    lha
-# Version required:     1.01u
+# Version required:     1.14C
 # Date created:         26 Dec 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.2 1995/04/01 12:43:26 jkh Exp $
+# $Id: Makefile,v 1.3 1995/04/12 04:54:01 asami Exp $
 #
 
-DISTNAME=       lha101u
-PKGNAME=        lha-1.01u
+DISTNAME=       lha-114c
+PKGNAME=        lha-1.14c
 CATEGORIES+=	archivers
-MASTER_SITES=	ftp://garbo.uwasa.fi/unix/arcers/
-EXTRACT_SUFX=   .tar.Z
+MASTER_SITES=   ftp://ftp.leo.chubu.ac.jp/pub/tools/
+EXTRACT_SUFX=   .tgz
 
 MAINTAINER=     ache@FreeBSD.ORG
 
-NO_WRKSUBDIR=	yes
-
 .include <bsd.port.mk>
diff --git a/archivers/lha/distinfo b/archivers/lha/distinfo
index f1e2c7ce7a94..71db78aa80e4 100644
--- a/archivers/lha/distinfo
+++ b/archivers/lha/distinfo
@@ -1 +1 @@
-MD5 (lha101u.tar.Z) = 9382c787fec1298d6b6cc78b2630f37c
+MD5 (lha-114c.tgz) = b626a5af259773dfb2b12c3876bdfd46
diff --git a/archivers/lha/files/patch-aa b/archivers/lha/files/patch-aa
index 489fbf6f072d..a6a7d7ccb2a1 100644
--- a/archivers/lha/files/patch-aa
+++ b/archivers/lha/files/patch-aa
@@ -1,131 +1,61 @@
-*** ./src/lharc.h.old	Fri Apr 24 20:01:24 1992
---- ./src/lharc.h	Mon Dec 26 11:39:42 1994
+*** Makefile.orig	Fri Mar  1 11:59:19 1996
+--- Makefile	Wed Aug 28 21:26:21 1996
 ***************
-*** 12,17 ****
---- 12,23 ----
-  #include <sys/types.h>
-  #include <sys/file.h>
-  #include <sys/stat.h>
-+ #ifdef __FreeBSD__
-+ #include <stdlib.h>
-+ #include <unistd.h>
-+ #include <utime.h>
-+ #include <memory.h>
-+ #endif
-  
-  #include <signal.h>
-  
-*** ./src/header.c.old	Fri Apr 24 20:01:18 1992
---- ./src/header.c	Mon Dec 26 11:27:48 1994
-***************
-*** 302,308 ****
-    dostm.tm_mday	 =  t >> 16   & 0x1f;
-    dostm.tm_mon	 = (t >> 16+5 & 0x0f) - 1;	/* 0..11 */
-    dostm.tm_year	 = (t >> 16+9 & 0x7f) + 80;
-!   dostm.tm_isdst = 0;				/* correct? */
-  #ifdef MKTIME
-    return (time_t)mktime(&dostm);
-  #else /* maybe defined(TIMELOCAL) */
---- 302,308 ----
-    dostm.tm_mday	 =  t >> 16   & 0x1f;
-    dostm.tm_mon	 = (t >> 16+5 & 0x0f) - 1;	/* 0..11 */
-    dostm.tm_year	 = (t >> 16+9 & 0x7f) + 80;
-!   dostm.tm_isdst = -1;  /* mktime try to guess for negative value */
-  #ifdef MKTIME
-    return (time_t)mktime(&dostm);
-  #else /* maybe defined(TIMELOCAL) */
-*** ./src/lhext.c.old	Wed Sep 23 18:51:48 1992
---- ./src/lhext.c	Mon Dec 26 11:10:11 1994
-***************
-*** 130,141 ****
---- 130,151 ----
-  char *name;
-  LzHeader *hdr;
-  {
-+ #ifdef __FreeBSD__
-+   struct utimbuf utimebuf;
-+   uid_t myuid;
-+ #else
-    time_t utimebuf[2];
-    unsigned myuid;
-+ #endif
-  
-    /* adjust file stamp */
-+ #ifdef __FreeBSD__
-+   utimebuf.actime = utimebuf.modtime = hdr->unix_last_modified_stamp;
-+   utime (name, &utimebuf);
-+ #else
-    utimebuf[0] = utimebuf[1] = hdr->unix_last_modified_stamp;
-    utime (name, utimebuf);
-+ #endif
-  
-    if (hdr->extend_type == EXTEND_UNIX
-        || hdr->extend_type == EXTEND_OS68K
-*** ./src/lhlist.c.old	Sun May  3 01:27:32 1992
---- ./src/lhlist.c	Mon Dec 26 10:59:33 1994
-***************
-*** 25,33 ****
-       long packed_size, original_size;
-  {
-    if (verbose_listing)
-!     printf ("%7d ", packed_size);
-  
-!   printf ("%7d ", original_size);
-  
-    if (original_size == 0L)
-      printf ("******");
---- 25,33 ----
-       long packed_size, original_size;
-  {
-    if (verbose_listing)
-!     printf ("%7ld ", packed_size);
-  
-!   printf ("%7ld ", original_size);
-  
-    if (original_size == 0L)
-      printf ("******");
-*** Makefile.orig	Wed Sep 23 21:29:48 1992
---- Makefile	Thu Sep 28 21:20:09 1995
-***************
-*** 13,31 ****
-  CC = cc
-  
-  # For Sun/SunOS 4.x:
-! SWITCHES	= -DUSESTRCASECMP # -DEUC
-  # For Amdahl/UTS:
-  #SWITCHES	= -DUSG -DSYSTIME_HAS_NO_TM -DNOBSTRING -DNOINDEX -DNOSTRDUP\
-  #		  -DFTIME -DTZSET -DSYSV_SYSTEM_DIR -DNOFTRUNCATE -DNOMKDIR
-  
-  #OPTIMIZE	= -g # -O -fstrength-reduce -fomit-frame-pointer
-! OPTIMIZE	= -O
+*** 11,37 ****
+  #-----------------------------------------------------------------------
+  
+  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
+! INSTALLBIN = -s -m 755
   INSTALLMAN = -m 644
   
---- 13,33 ----
-  CC = cc
+! SUBDIRS = src man
   
-  # For Sun/SunOS 4.x:
-! #SWITCHES        = -DUSESTRCASECMP # -DEUC
-  # For Amdahl/UTS:
-  #SWITCHES	= -DUSG -DSYSTIME_HAS_NO_TM -DNOBSTRING -DNOINDEX -DNOSTRDUP\
-  #		  -DFTIME -DTZSET -DSYSV_SYSTEM_DIR -DNOFTRUNCATE -DNOMKDIR
-+ # For FreeBSD
-+ SWITCHES        = -DUSESTRCASECMP -DMKTIME -DSYSV_SYSTEM_DIR
+  O		= .o
   
-  #OPTIMIZE	= -g # -O -fstrength-reduce -fomit-frame-pointer
-! OPTIMIZE        = -O2
+--- 11,39 ----
+  #-----------------------------------------------------------------------
   
+  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
 ! MANSECT = 1
   
-! INSTALL = install -c -o bin -g bin
-  INSTALLBIN = -s -m 755
+! #INSTALL = install
+! INSTALLBIN = -c -s -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
   INSTALLMAN = -m 644
   
+! SUBDIRS = src #man
+  
+  O		= .o
+  
diff --git a/archivers/lha/pkg-comment b/archivers/lha/pkg-comment
index b0765cd33010..f752a26251c7 100644
--- a/archivers/lha/pkg-comment
+++ b/archivers/lha/pkg-comment
@@ -1 +1 @@
-LHA - version 101u. Compress/uncompress files using LZW compression (.lzh files)
+LHA - archive files using LZW compression (.lzh files)
diff --git a/archivers/lha/pkg-plist b/archivers/lha/pkg-plist
index 884c7d17ef39..781bfb89eb69 100644
--- a/archivers/lha/pkg-plist
+++ b/archivers/lha/pkg-plist
@@ -1,2 +1 @@
-@cwd /usr/local
 bin/lha