From afce395e781c57b941338e0c8edf2ce37823c943 Mon Sep 17 00:00:00 2001 From: jlam Date: Thu, 6 Dec 2001 05:09:46 +0000 Subject: Update lha to 114.9 (114i). Package update provided by Masao Uebayashi in pkg/14824. Relevant changes from version 114f include: * dewey-ized package version number * fixed header Level 2 handling bug * fixed level 2 file append bug. * fixed symbolic link file append bug. * lh7 archive support. * fixed lh7 archive bug. --- archivers/lha/Makefile | 7 +++--- archivers/lha/distinfo | 11 +++++----- archivers/lha/patches/patch-ad | 11 ---------- archivers/lha/patches/patch-ae | 48 ++++++++++++++++++++++-------------------- archivers/lha/patches/patch-af | 13 ++++++++++++ archivers/lha/patches/patch-ag | 10 +++++++++ 6 files changed, 58 insertions(+), 42 deletions(-) delete mode 100644 archivers/lha/patches/patch-ad create mode 100644 archivers/lha/patches/patch-af create mode 100644 archivers/lha/patches/patch-ag (limited to 'archivers/lha') diff --git a/archivers/lha/Makefile b/archivers/lha/Makefile index 1129c1b46aa..12bc6394d2f 100644 --- a/archivers/lha/Makefile +++ b/archivers/lha/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2001/07/16 10:29:50 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2001/12/06 05:09:46 jlam Exp $ -DISTNAME= lha-114f +DISTNAME= lha-114i +PKGNAME= lha-114.9 CATEGORIES= archivers MASTER_SITES= http://www2m.biglobe.ne.jp/~dolphin/lha/prog/ \ ftp://ftp.win.ne.jp/pub/misc/ @@ -10,7 +11,7 @@ COMMENT= Archive files using LZW compression (.lzh files) USE_BUILDLINK_ONLY= # defined -MAKE_FLAGS= CC="${CC}" +MAKE_FLAGS= CC="${CC}" MAKE="${MAKE_PROGRAM}" MAKE_FLAGS+= MACHINE="-DSYSTIME_HAS_NO_TM -DTIMELOCAL -DUSESTRCASECMP -DSYSV_SYSTEM_DIR" do-install: diff --git a/archivers/lha/distinfo b/archivers/lha/distinfo index 8ab4ae86650..f5112f9603f 100644 --- a/archivers/lha/distinfo +++ b/archivers/lha/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.2 2001/04/18 11:21:06 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/12/06 05:09:47 jlam Exp $ -SHA1 (lha-114f.tar.gz) = 379168bc8c96b3a8b9401426e5360aa8978ba9fc -Size (lha-114f.tar.gz) = 63668 bytes -SHA1 (patch-ad) = 952365147b6e4b493ccbf230e8f2df476e15ffc3 -SHA1 (patch-ae) = b073e65ab6089bb4ad258e01973ec90756c7d3d8 +SHA1 (lha-114i.tar.gz) = 79e35271f2cf783f946db3f22e304fef72dbac99 +Size (lha-114i.tar.gz) = 64608 bytes +SHA1 (patch-ae) = ad6040f318ecb2762618f210fbac35c03a17af66 +SHA1 (patch-af) = 0c2f6d5bf23c3c98b102487abe3dd1190470f50c +SHA1 (patch-ag) = 9ad3bc807a3cda4f71d8fbbbea19306f252f2489 diff --git a/archivers/lha/patches/patch-ad b/archivers/lha/patches/patch-ad deleted file mode 100644 index edda54db88f..00000000000 --- a/archivers/lha/patches/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ -$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 index d4bb3e1f34e..af5957ff7ba 100644 --- a/archivers/lha/patches/patch-ae +++ b/archivers/lha/patches/patch-ae @@ -1,37 +1,39 @@ -$NetBSD: patch-ae,v 1.2 2000/03/11 15:03:39 fredb Exp $ +$NetBSD: patch-ae,v 1.3 2001/12/06 05:09:48 jlam Exp $ ---- ./Makefile.orig Sun Aug 29 01:36:34 1999 -+++ ./Makefile Tue Nov 30 10:33:28 1999 -@@ -11,23 +11,21 @@ +--- Makefile.orig Mon Dec 3 14:32:27 2001 ++++ Makefile +@@ -10,11 +10,10 @@ + # SWITCHES macro definitions ... see config.eng or config.jpn. #----------------------------------------------------------------------- -SHELL=/bin/sh -MAKE = make -+SHELL=${SH} -+#MAKE = make ++SHELL = ${SH} ++MAKE = ${MAKE} - #CC = cc +-#CC = cc -CC = gcc --SWITCHES = -DNEED_INCREMENTAL_INDICATOR \ -- -DTMP_FILENAME_TEMPLATE="\"/tmp/lhXXXXXX\"" -+#CC = gcc -+SWITCHES = -DNEED_INCREMENTAL_INDICATOR -DEUC -DSUPPORT_LH6 ++CC = ${CC} + SWITCHES = -DNEED_INCREMENTAL_INDICATOR \ + -DTMP_FILENAME_TEMPLATE="\"/tmp/lhXXXXXX\"" - #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} +@@ -25,8 +24,8 @@ + #OPTIMIZE = -O2 -fstrength-reduce -fomit-frame-pointer + OPTIMIZE = -O2 -DSUPPORT_LH7 -DMKSTEMP -BINDIR = /usr/local/bin -MANDIR = /usr/local/man --MANSECT = n +BINDIR = ${PREFIX}/bin -+MANDIR = ${PREFIX}/man/ja_JP.EUC -+MANSECT = 1 ++MANDIR = ${PREFIX}/man + MANSECT = n INSTALL = install - INSTALLBIN = -s -m 755 +@@ -42,7 +41,7 @@ + LIBRARYOBJS = patmatch$(O) + + MYMAKEFLAGS = 'BINDIR=$(BINDIR)' 'MANDIR=$(MANDIR)' 'MANSECT=$(MANSECT)'\ +- 'INSTALL=$(INSTALL)' 'INSTALLBIN=$(INSTALLBIN)' 'INSTALLMAN=$(INSTALLMAN)'\ ++ 'BSD_INSTALL_BIN=$(BSD_INSTALL_BIN)' 'BSD_INSTALL_MAN=$(BSD_INSTALL_MAN)'\ + 'CC=$(CC)' 'SWITCHES=$(SWITCHES)' 'O=$(O)' 'LIBRARYOBJS=$(LIBRARYOBJS)' \ + 'OPTIMIZE=$(OPTIMIZE)' 'MACHINE=$(MACHINE)' + diff --git a/archivers/lha/patches/patch-af b/archivers/lha/patches/patch-af new file mode 100644 index 00000000000..b04c7ab81a4 --- /dev/null +++ b/archivers/lha/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1 2001/12/06 05:09:48 jlam Exp $ + +--- man/Makefile.orig Fri Dec 15 21:13:16 2000 ++++ man/Makefile +@@ -11,7 +11,7 @@ + $(NROFF) -man lha.n > lha.man + + install: +- $(INSTALL) $(INSTALLMAN) lha.n $(MANDIR)/man$(MANSECT)/lha.$(MANSECT) ++ $(BSD_INSTALL_MAN) lha.n $(MANDIR)/man$(MANSECT)/lha.$(MANSECT) + + clean: + rm -f *~ diff --git a/archivers/lha/patches/patch-ag b/archivers/lha/patches/patch-ag new file mode 100644 index 00000000000..43afaca0048 --- /dev/null +++ b/archivers/lha/patches/patch-ag @@ -0,0 +1,10 @@ +$NetBSD: patch-ag,v 1.1 2001/12/06 05:09:48 jlam Exp $ + +--- src/Makefile.orig Fri Dec 15 21:13:15 2000 ++++ src/Makefile +@@ -49,4 +49,4 @@ + rm -f core *.o lha.tar lha.tar.Z *~ \#* *.orig + + install: +- $(INSTALL) $(INSTALLBIN) lha $(BINDIR)/lha ++ $(BSD_INSTALL_BIN) lha $(BINDIR)/lha -- cgit v1.2.3