CVS commit: pkgsrc/archivers/lha

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/archivers/lha
From: "Olaf Seibert" <rhialto%netbsd.org@localhost>
Date: Sat, 19 Dec 2020 15:03:15 +0000

Module Name:    pkgsrc
Committed By:   rhialto
Date:           Sat Dec 19 15:03:15 UTC 2020

Modified Files:
        pkgsrc/archivers/lha: DESCR Makefile PLIST distinfo
Added Files:
        pkgsrc/archivers/lha/patches: patch-src_lhext.c
Removed Files:
        pkgsrc/archivers/lha/patches: patch-aa patch-ab patch-ac patch-ad
            patch-ae patch-af patch-ag patch-ah patch-ai patch-aj patch-ak
            patch-al

Log Message:
archivers/lha: distfile unavailable, so switch to maintained version elsewhere.

Documentation is mostly in Japanese (which I don't read) so no changelog
is available.
- Previous patches have ~all been integrated
- Configuration with autotools
- Is still maintained from time to time


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/archivers/lha/DESCR
cvs rdiff -u -r1.41 -r1.42 pkgsrc/archivers/lha/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/archivers/lha/PLIST
cvs rdiff -u -r1.11 -r1.12 pkgsrc/archivers/lha/distinfo
cvs rdiff -u -r1.4 -r0 pkgsrc/archivers/lha/patches/patch-aa \
    pkgsrc/archivers/lha/patches/patch-ad \
    pkgsrc/archivers/lha/patches/patch-ae
cvs rdiff -u -r1.6 -r0 pkgsrc/archivers/lha/patches/patch-ab
cvs rdiff -u -r1.3 -r0 pkgsrc/archivers/lha/patches/patch-ac
cvs rdiff -u -r1.1 -r0 pkgsrc/archivers/lha/patches/patch-af \
    pkgsrc/archivers/lha/patches/patch-ag \
    pkgsrc/archivers/lha/patches/patch-ak
cvs rdiff -u -r1.2 -r0 pkgsrc/archivers/lha/patches/patch-ah \
    pkgsrc/archivers/lha/patches/patch-ai \
    pkgsrc/archivers/lha/patches/patch-aj \
    pkgsrc/archivers/lha/patches/patch-al
cvs rdiff -u -r0 -r1.1 pkgsrc/archivers/lha/patches/patch-src_lhext.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/archivers/lha/DESCR
diff -u pkgsrc/archivers/lha/DESCR:1.2 pkgsrc/archivers/lha/DESCR:1.3
--- pkgsrc/archivers/lha/DESCR:1.2      Mon Jan  8 03:11:31 2007
+++ pkgsrc/archivers/lha/DESCR  Sat Dec 19 15:03:14 2020
@@ -1,11 +1,11 @@
-    LHa for UNIX version 1.14c Mar. 7 1996 by Tsugio Okamoto
+    LHa for UNIX version 1.14i-ac20081023 Dec. 13 2020 by Koji Arai
 
      This unofficial version of lha is based on Version 1.00.  This
 version supports extraction & archiving using -lh5- as well as
 extraction using -lh6- algorithm.
 
-     All the bug reports on this version should be directed to Tsuguo
-Okamoto <GBA02146%NIFTYSERVE.OR.JP@localhost>.
+     All the bug reports on this version should be directed to
+https://github.com/jca02266/lha/issues
 
 
      If this software is included in medium that may be obtained by

Index: pkgsrc/archivers/lha/Makefile
diff -u pkgsrc/archivers/lha/Makefile:1.41 pkgsrc/archivers/lha/Makefile:1.42
--- pkgsrc/archivers/lha/Makefile:1.41  Sat Nov  2 22:54:26 2019
+++ pkgsrc/archivers/lha/Makefile       Sat Dec 19 15:03:14 2020
@@ -1,34 +1,30 @@
-# $NetBSD: Makefile,v 1.41 2019/11/02 22:54:26 rillig Exp $
+# $NetBSD: Makefile,v 1.42 2020/12/19 15:03:14 rhialto Exp $
 
-DISTNAME=      lha-114i
-PKGNAME=       lha-114.9
-PKGREVISION=   4
+DISTNAME=      lha-1.14i-ac20081023
+PKGNAME=       lha-114.9.20081023
+PKGREVISION=   20201213
 CATEGORIES=    archivers
-MASTER_SITES=  http://www2m.biglobe.ne.jp/~dolphin/lha/prog/
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=jca02266/}
+GITHUB_PROJECT=        lha
+GITHUB_TAG=    dc524ca3c90ae701d939f23fdc672a90199e9d22
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://www2m.biglobe.ne.jp/~dolphin/lha/lha-unix.htm
-COMMENT=       Archive files using LZW compression (.lzh files)
+HOMEPAGE=      https://github.com/jca02266/lha
+COMMENT=       Archive files using LZW compression (.lzh, .lha files)
 LICENSE=       lha-license
 
-RESTRICTED=            Other than for-free distribution of the unmodified source \
-               over a network, redistribution terms are complex.
+CONFIGURE_ARGS+=       --disable-multibyte-filename
+
+RESTRICTED=            Other than for-free distribution of the unmodified \
+                       source over a network, redistribution terms are complex.
 NO_SRC_ON_CDROM=       ${RESTRICTED}
 NO_BIN_ON_FTP=         ${RESTRICTED}
 NO_BIN_ON_CDROM=       ${RESTRICTED}
 
-MAKE_FLAGS+=   MAKE=${MAKE_PROGRAM:Q}
+USE_TOOLS+=    autoconf automake autoreconf gmake
+GNU_CONFIGURE= yes
 
-OPSYSVARS+=            LHA_CPPFLAGS
-LHA_CPPFLAGS=          -DSYSTIME_HAS_NO_TM -DMKTIME -DUSESTRCASECMP -DSYSV_SYSTEM_DIR
-LHA_CPPFLAGS.Darwin+=  -DHAVE_NO_LCHOWN
-MAKE_FLAGS+=           MACHINE=${LHA_CPPFLAGS:Q}
-
-INSTALLATION_DIRS=     bin ${PKGMANDIR}/ja_JP.EUC/man1
-
-do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/src/lha ${DESTDIR}${PREFIX}/bin
-       ${INSTALL_MAN} ${WRKSRC}/man/lha.n \
-               ${DESTDIR}${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man1/lha.1
+pre-configure:
+       cd ${WRKSRC} && autoreconf --install --symlink
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/archivers/lha/PLIST
diff -u pkgsrc/archivers/lha/PLIST:1.1 pkgsrc/archivers/lha/PLIST:1.2
--- pkgsrc/archivers/lha/PLIST:1.1      Wed Oct 31 20:24:31 2001
+++ pkgsrc/archivers/lha/PLIST  Sat Dec 19 15:03:14 2020
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:24:31 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/12/19 15:03:14 rhialto Exp $
 bin/lha
-man/ja_JP.EUC/man1/lha.1
+man/man1/lha.1

Index: pkgsrc/archivers/lha/distinfo
diff -u pkgsrc/archivers/lha/distinfo:1.11 pkgsrc/archivers/lha/distinfo:1.12
--- pkgsrc/archivers/lha/distinfo:1.11  Tue Nov  3 00:56:22 2015
+++ pkgsrc/archivers/lha/distinfo       Sat Dec 19 15:03:14 2020
@@ -1,18 +1,7 @@
-$NetBSD: distinfo,v 1.11 2015/11/03 00:56:22 agc Exp $
+$NetBSD: distinfo,v 1.12 2020/12/19 15:03:14 rhialto Exp $
 
-SHA1 (lha-114i.tar.gz) = 79e35271f2cf783f946db3f22e304fef72dbac99
-RMD160 (lha-114i.tar.gz) = c561e0758b467a61f45d287582effc53df29f01d
-SHA512 (lha-114i.tar.gz) = fe91184a32800306277c74ce7bf7d3edacb3a93da319bd59fc25023fb5bab9e3169bca63d8b49a05fac68900cc0eb63d0f1b4f0234522a5ef64f90f407488f07
-Size (lha-114i.tar.gz) = 64608 bytes
-SHA1 (patch-aa) = 945856fde42c3e98bb2b00f8633babc2daf0437c
-SHA1 (patch-ab) = 4b5cce4fd83a5a65cb152183d23f430da1e5aa21
-SHA1 (patch-ac) = e7bf4b9b500bca2ccbe376fd560870b29c8c6af9
-SHA1 (patch-ad) = 62ac7c0637d981de6571b838d545fcb872851e05
-SHA1 (patch-ae) = a53647ccf72511ecd2b5306e23da1219fa5e7264
-SHA1 (patch-af) = 0c2f6d5bf23c3c98b102487abe3dd1190470f50c
-SHA1 (patch-ag) = 9ad3bc807a3cda4f71d8fbbbea19306f252f2489
-SHA1 (patch-ah) = cd44b40fa7e25a9996b2441d1b78a1a6570977b2
-SHA1 (patch-ai) = d988b7d048656080d14bfad1da89c9888c9ddf90
-SHA1 (patch-aj) = 6331fce7f55eef1c2003e693f165dd0565e7172e
-SHA1 (patch-ak) = fa6de630a7414b73dec8b75be0bfbb3493c4192f
-SHA1 (patch-al) = 836de0f424efbc8b803d7c542ec0e3103381d5c4
+SHA1 (lha-1.14i-ac20081023-dc524ca3c90ae701d939f23fdc672a90199e9d22.tar.gz) = 24aa105f20234d19d1f8dafe2a23b9d037553ba0
+RMD160 (lha-1.14i-ac20081023-dc524ca3c90ae701d939f23fdc672a90199e9d22.tar.gz) = 72463d1a76e900abefdf627b5de1ebbfbdc24d7f
+SHA512 (lha-1.14i-ac20081023-dc524ca3c90ae701d939f23fdc672a90199e9d22.tar.gz) = 
2c1f6e75363f5aa852d1b6a46e9ce90002aa480ee78a4d79a7fa041d20657d8ea7d46fea597bac8a773dd8c25775864d9e714db1750387631b39a49fd6c0e919
+Size (lha-1.14i-ac20081023-dc524ca3c90ae701d939f23fdc672a90199e9d22.tar.gz) = 220783 bytes
+SHA1 (patch-src_lhext.c) = 0703579f96b6c9e3969aee2c962b54b890fbf973

Added files:

Index: pkgsrc/archivers/lha/patches/patch-src_lhext.c
diff -u /dev/null pkgsrc/archivers/lha/patches/patch-src_lhext.c:1.1
--- /dev/null   Sat Dec 19 15:03:15 2020
+++ pkgsrc/archivers/lha/patches/patch-src_lhext.c      Sat Dec 19 15:03:14 2020
@@ -0,0 +1,27 @@
+$NetBSD: patch-src_lhext.c,v 1.1 2020/12/19 15:03:14 rhialto Exp $
+
+utimes() fixes for netbsd-6 time_t
+
+upstream: not reported, docs in .jp only, wakarimasen :(
+
+--- src/lhext.c.orig   2020-12-17 15:59:30.545844796 +0000
++++ src/lhext.c
+@@ -220,13 +220,15 @@ adjust_info(name, hdr)
+     char           *name;
+     LzHeader       *hdr;
+ {
+-    struct utimbuf utimebuf;
++    struct timeval utimebuf[2];
+ 
+     /* adjust file stamp */
+-    utimebuf.actime = utimebuf.modtime = hdr->unix_last_modified_stamp;
++    utimebuf[0].tv_sec = hdr->unix_last_modified_stamp;
++    utimebuf[0].tv_usec = 0;
++    utimebuf[1] = utimebuf[0];
+ 
+     if ((hdr->unix_mode & UNIX_FILE_TYPEMASK) != UNIX_FILE_SYMLINK)
+-        utime(name, &utimebuf);
++        utimes(name, &utimebuf[0]);
+ 
+     if (hdr->extend_type == EXTEND_UNIX
+         || hdr->extend_type == EXTEND_OS68K

Prev by Date: CVS commit: pkgsrc/math/py-photutils
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/math/py-photutils
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index