From 4809ea04ef1597945bb26f1a418b3a428ef3a430 Mon Sep 17 00:00:00 2001 From: sakamoto Date: Tue, 30 Nov 1999 01:54:05 +0000 Subject: Update lha to 114f. Change MASTER_SITES. Changes 114c to 114f: some bugfix. support -lh6-. --- archivers/lha/Makefile | 9 ++++----- archivers/lha/files/md5 | 4 ++-- archivers/lha/files/patch-sum | 4 ---- archivers/lha/patches/patch-ab | 15 --------------- archivers/lha/patches/patch-ac | 12 ------------ archivers/lha/patches/patch-ad | 11 +++++++++++ archivers/lha/patches/patch-ae | 36 ++++++++++++++++++++++++++++++++++++ 7 files changed, 53 insertions(+), 38 deletions(-) delete mode 100644 archivers/lha/files/patch-sum delete mode 100644 archivers/lha/patches/patch-ab delete mode 100644 archivers/lha/patches/patch-ac create mode 100644 archivers/lha/patches/patch-ad create mode 100644 archivers/lha/patches/patch-ae (limited to 'archivers/lha') diff --git a/archivers/lha/Makefile b/archivers/lha/Makefile index 22707e6f544..71af9c4f75b 100644 --- a/archivers/lha/Makefile +++ b/archivers/lha/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.7 1999/05/22 20:11:32 tv Exp $ +# $NetBSD: Makefile,v 1.8 1999/11/30 01:54:05 sakamoto Exp $ -DISTNAME= lha-114c -PKGNAME= lha-1.14c +DISTNAME= lha-114f CATEGORIES= archivers -MASTER_SITES= ftp://ftp.leo.chubu.ac.jp/pub/tools/ -EXTRACT_SUFX= .tgz +MASTER_SITES= http://www2m.biglobe.ne.jp/~dolphin/lha/prog/ \ + ftp://ftp.win.ne.jp/pub/misc/ MAINTAINER= packages@netbsd.org diff --git a/archivers/lha/files/md5 b/archivers/lha/files/md5 index 01c432ff991..c4708edd370 100644 --- a/archivers/lha/files/md5 +++ b/archivers/lha/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.2 1998/08/07 13:16:51 agc Exp $ +$NetBSD: md5,v 1.3 1999/11/30 01:54:07 sakamoto Exp $ -MD5 (lha-114c.tgz) = b626a5af259773dfb2b12c3876bdfd46 +MD5 (lha-114f.tar.gz) = db86f414e08c39e190763f8b0c190ff6 diff --git a/archivers/lha/files/patch-sum b/archivers/lha/files/patch-sum deleted file mode 100644 index c943bb00924..00000000000 --- a/archivers/lha/files/patch-sum +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:08 agc Exp $ - -MD5 (patch-ab) = 45e5a4a448224fb32498990160d8137e -MD5 (patch-ac) = acbcf95b68cd9095bdca4a6fa356c6f1 diff --git a/archivers/lha/patches/patch-ab b/archivers/lha/patches/patch-ab deleted file mode 100644 index 25118b0eda5..00000000000 --- a/archivers/lha/patches/patch-ab +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ab,v 1.4 1999/05/22 20:11:33 tv Exp $ - ---- 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/patches/patch-ac b/archivers/lha/patches/patch-ac deleted file mode 100644 index 819e2a11db3..00000000000 --- a/archivers/lha/patches/patch-ac +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ac,v 1.1 1998/12/01 04:19:00 tv Exp $ - ---- src/lha.h.orig Mon Nov 30 23:13:56 1998 -+++ src/lha.h Mon Nov 30 23:14:25 1998 -@@ -10,6 +10,7 @@ - lharc.h interface.h slidehuf.h - */ - #include -+#include - #include - #include - #include diff --git a/archivers/lha/patches/patch-ad b/archivers/lha/patches/patch-ad new file mode 100644 index 00000000000..edda54db88f --- /dev/null +++ b/archivers/lha/patches/patch-ad @@ -0,0 +1,11 @@ +$NetBSD: patch-ad,v 1.1 1999/11/30 01:54:16 sakamoto Exp $ + +--- ./src/lhext.c.orig Sun Aug 29 01:36:16 1999 ++++ ./src/lhext.c Tue Nov 30 10:31:41 1999 +@@ -163,5 +163,5 @@ + if (!getuid()) { + #ifndef HAVE_NO_LCHOWN +- if ((hdr->unix_mode & UNIX_FILE_TYPEMASK) != UNIX_FILE_SYMLINK) ++ if ((hdr->unix_mode & UNIX_FILE_TYPEMASK) == UNIX_FILE_SYMLINK) + lchown(name, hdr->unix_uid, hdr->unix_gid); + else diff --git a/archivers/lha/patches/patch-ae b/archivers/lha/patches/patch-ae new file mode 100644 index 00000000000..2600f3c88c9 --- /dev/null +++ b/archivers/lha/patches/patch-ae @@ -0,0 +1,36 @@ +$NetBSD: patch-ae,v 1.1 1999/11/30 01:54:16 sakamoto Exp $ + +--- ./Makefile.orig Sun Aug 29 01:36:34 1999 ++++ ./Makefile Tue Nov 30 10:33:28 1999 +@@ -11,23 +11,21 @@ + #----------------------------------------------------------------------- + +-SHELL=/bin/sh +-MAKE = make ++SHELL=${SH} ++#MAKE = make + + #CC = cc +-CC = gcc +-SWITCHES = -DNEED_INCREMENTAL_INDICATOR \ +- -DTMP_FILENAME_TEMPLATE="\"/tmp/lhXXXXXX\"" ++#CC = gcc ++SWITCHES = -DNEED_INCREMENTAL_INDICATOR -DEUC -DSUPPORT_LH6 + + #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 + +-#OPTIMIZE = -O2 -fstrength-reduce -fomit-frame-pointer +-OPTIMIZE = -O2 -DSUPPORT_LH6 ++OPTIMIZE = ${CFLAGS} + +-BINDIR = /usr/local/bin +-MANDIR = /usr/local/man +-MANSECT = n ++BINDIR = ${PREFIX}/bin ++MANDIR = ${PREFIX}/man/ja_JP.EUC ++MANSECT = 1 + + INSTALL = install -- cgit v1.2.3