Received: by mail.netbsd.org (Postfix, from userid 605) id 0AAB984E5F; Mon, 13 Mar 2023 10:18:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3C2D284D54 for ; Mon, 13 Mar 2023 10:18:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id o40UKxZd_2EU for ; Mon, 13 Mar 2023 10:18:47 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 633FE84C86 for ; Mon, 13 Mar 2023 10:18:47 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 5C53FFA90; Mon, 13 Mar 2023 10:18:47 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_167870272776560" MIME-Version: 1.0 Date: Mon, 13 Mar 2023 10:18:47 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/textproc To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20230313101847.5C53FFA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_167870272776560 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Mon Mar 13 10:18:47 UTC 2023 Modified Files: pkgsrc/textproc/catdoc: Makefile Makefile.common PLIST distinfo pkgsrc/textproc/catdoc-tk: Makefile Log Message: catdoc*: update to 0.95 0.95 May 25 2016 Replaced charset tables with new ones, published by Unicode Consortium with more permissive license. Fixed some incompatibilities with CLang Fixed lot of segfaults on incorrect or corrupted data Use stdint int types throughout the code, add configure check for stdint.h To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 pkgsrc/textproc/catdoc/Makefile cvs rdiff -u -r1.22 -r1.23 pkgsrc/textproc/catdoc/Makefile.common cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/catdoc/PLIST cvs rdiff -u -r1.15 -r1.16 pkgsrc/textproc/catdoc/distinfo cvs rdiff -u -r1.21 -r1.22 pkgsrc/textproc/catdoc-tk/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_167870272776560 Content-Disposition: inline Content-Length: 5588 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/catdoc/Makefile diff -u pkgsrc/textproc/catdoc/Makefile:1.32 pkgsrc/textproc/catdoc/Makefile:1.33 --- pkgsrc/textproc/catdoc/Makefile:1.32 Thu Apr 8 08:31:04 2021 +++ pkgsrc/textproc/catdoc/Makefile Mon Mar 13 10:18:47 2023 @@ -1,12 +1,9 @@ -# $NetBSD: Makefile,v 1.32 2021/04/08 08:31:04 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2023/03/13 10:18:47 wiz Exp $ .include "Makefile.common" -PKGREVISION= 1 - CONFIGURE_ARGS+= --disable-wordview -CONFIGURE_ENV+= enable_wordview=no CONFIGURE_ENV+= man1dir=${PREFIX}/${PKGMANDIR}/man1 +INSTALLATION_DIRS= ${PKGMANDIR}/man1 -.include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/textproc/catdoc/Makefile.common diff -u pkgsrc/textproc/catdoc/Makefile.common:1.22 pkgsrc/textproc/catdoc/Makefile.common:1.23 --- pkgsrc/textproc/catdoc/Makefile.common:1.22 Wed Jul 10 11:12:16 2019 +++ pkgsrc/textproc/catdoc/Makefile.common Mon Mar 13 10:18:47 2023 @@ -1,22 +1,19 @@ -# $NetBSD: Makefile.common,v 1.22 2019/07/10 11:12:16 markd Exp $ +# $NetBSD: Makefile.common,v 1.23 2023/03/13 10:18:47 wiz Exp $ # # used by textproc/catdoc-tk/Makefile -DISTNAME= catdoc_0.94.4.orig -PKGNAME= ${DISTNAME:S/_/-/:S/.orig//} +DISTNAME= catdoc-0.95 CATEGORIES= textproc -MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/c/catdoc/} +MASTER_SITES= http://ftp.wagner.pp.ru/pub/catdoc/ MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= https://alioth.debian.org/projects/catdoc/ -COMMENT= Converts MS Word, Excel and Powerpoint files to plain text +HOMEPAGE= https://www.wagner.pp.ru/~vitus/software/catdoc/ +COMMENT= Converts MS Word, Excel, and Powerpoint files to plain text LICENSE= gnu-gpl-v2 DISTINFO_FILE= ${.CURDIR}/../../textproc/catdoc/distinfo PATCHDIR= ${.CURDIR}/../../textproc/catdoc/patches -WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/:S/.orig//} - USE_FEATURES= glob GNU_CONFIGURE= yes Index: pkgsrc/textproc/catdoc/PLIST diff -u pkgsrc/textproc/catdoc/PLIST:1.5 pkgsrc/textproc/catdoc/PLIST:1.6 --- pkgsrc/textproc/catdoc/PLIST:1.5 Sun Jun 16 09:08:52 2013 +++ pkgsrc/textproc/catdoc/PLIST Mon Mar 13 10:18:47 2023 @@ -1,11 +1,10 @@ -@comment $NetBSD: PLIST,v 1.5 2013/06/16 09:08:52 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.6 2023/03/13 10:18:47 wiz Exp $ bin/catdoc bin/catppt bin/xls2csv man/man1/catdoc.1 man/man1/catppt.1 man/man1/xls2csv.1 -share/applications/wordview.desktop share/catdoc/8859-1.txt share/catdoc/8859-10.txt share/catdoc/8859-11.txt @@ -22,8 +21,6 @@ share/catdoc/8859-8.txt share/catdoc/8859-9.txt share/catdoc/ascii.replchars share/catdoc/ascii.specchars -share/catdoc/big5.txt -share/catdoc/cns11643.txt share/catdoc/cp1250.txt share/catdoc/cp1251.txt share/catdoc/cp1252.txt @@ -47,10 +44,6 @@ share/catdoc/cp865.txt share/catdoc/cp866.txt share/catdoc/cp869.txt share/catdoc/cp874.txt -share/catdoc/hangul.txt -share/catdoc/jis0201.txt -share/catdoc/jis0208.txt -share/catdoc/jis0212.txt share/catdoc/koi8-r.txt share/catdoc/koi8-u.txt share/catdoc/mac-arabic.txt @@ -59,8 +52,6 @@ share/catdoc/mac-cyrillic.txt share/catdoc/mac-greek.txt share/catdoc/mac-hebrew.txt share/catdoc/mac-roman.txt -share/catdoc/shiftjis.txt share/catdoc/tex.replchars share/catdoc/tex.specchars share/catdoc/us-ascii.txt -share/pixmaps/wordview.xpm Index: pkgsrc/textproc/catdoc/distinfo diff -u pkgsrc/textproc/catdoc/distinfo:1.15 pkgsrc/textproc/catdoc/distinfo:1.16 --- pkgsrc/textproc/catdoc/distinfo:1.15 Tue Oct 26 11:21:46 2021 +++ pkgsrc/textproc/catdoc/distinfo Mon Mar 13 10:18:47 2023 @@ -1,10 +1,5 @@ -$NetBSD: distinfo,v 1.15 2021/10/26 11:21:46 nia Exp $ +$NetBSD: distinfo,v 1.16 2023/03/13 10:18:47 wiz Exp $ -BLAKE2s (catdoc_0.94.4.orig.tar.gz) = b88462079ee9c2e9697d9cdfe33aab0ae301b84a948805faf3e77850cd606d4d -SHA512 (catdoc_0.94.4.orig.tar.gz) = 63e492c40e0abb82df0c93c43d1bd63f15d0c8b60579cf3858f26a0814731920ff621b3384035c9a85da5c448b699801ff3376e7a02cf8e7a413195bd9847ba9 -Size (catdoc_0.94.4.orig.tar.gz) = 679156 bytes -SHA1 (patch-Makefile.in) = 68860b5f8f48471bfddc66803ac027d56d8ae78a -SHA1 (patch-ac) = 1cd8b1f5966ca1e2805c845fb682efeee73d15b5 -SHA1 (patch-desktop_Makefile.in) = da1d4903d0b236af684f97f72b8d6f16b7c925a3 -SHA1 (patch-doc_Makefile.in) = dfe11be92aa209e2d282719678eeb63928088747 -SHA1 (patch-src_xlsparse.c) = 34a735b6d5db833d06c4d6a994d7ea9d1c18ef70 +BLAKE2s (catdoc-0.95.tar.gz) = 9cd7de410d2e9efa70208a086d678e9a7bcad4dcec835409b8ea48d1925d3fa8 +SHA512 (catdoc-0.95.tar.gz) = dd6bded4b6b70749c007256b182b063ff266f86d53024d8582001678821e8096c5b980bc8f43015d9c82bbe022d71d4ba5fe68aff31b2ff6db3688595e651b2c +Size (catdoc-0.95.tar.gz) = 217779 bytes Index: pkgsrc/textproc/catdoc-tk/Makefile diff -u pkgsrc/textproc/catdoc-tk/Makefile:1.21 pkgsrc/textproc/catdoc-tk/Makefile:1.22 --- pkgsrc/textproc/catdoc-tk/Makefile:1.21 Sun Jan 29 21:17:54 2023 +++ pkgsrc/textproc/catdoc-tk/Makefile Mon Mar 13 10:18:47 2023 @@ -1,16 +1,14 @@ -# $NetBSD: Makefile,v 1.21 2023/01/29 21:17:54 ryoon Exp $ +# $NetBSD: Makefile,v 1.22 2023/03/13 10:18:47 wiz Exp $ .include "../../textproc/catdoc/Makefile.common" -PKGNAME= ${DISTNAME:S/catdoc_/catdoc-tk-/:S/.orig//} -PKGREVISION= 4 +PKGNAME= ${DISTNAME:S/catdoc-/catdoc-tk-/} COMMENT= Tk interface for MS-Word to plain text converter -DEPENDS+= catdoc>=0.94.4:../../textproc/catdoc +DEPENDS+= catdoc>=0.95:../../textproc/catdoc CONFIGURE_ARGS+= --enable-wordview CONFIGURE_ENV+= WISH="${BUILDLINK_PREFIX.tk}/bin/wish" -CONFIGURE_ENV+= enable_wordview=yes INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 --_----------=_167870272776560--