Received: by mail.netbsd.org (Postfix, from userid 605) id 02A9484E68; Sat, 12 Oct 2019 21:14:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7EC9184DCB for ; Sat, 12 Oct 2019 21:14:23 +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 sCpf4nN57YCf for ; Sat, 12 Oct 2019 21:14:22 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id DF96084CE3 for ; Sat, 12 Oct 2019 21:14:22 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D99D1FBF4; Sat, 12 Oct 2019 21:14:22 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1570914862185200" MIME-Version: 1.0 Date: Sat, 12 Oct 2019 21:14:22 +0000 From: "Roland Illig" Subject: CVS commit: pkgsrc/textproc/isearch To: pkgsrc-changes@NetBSD.org Reply-To: rillig@netbsd.org X-Mailer: log_accum Message-Id: <20191012211422.D99D1FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1570914862185200 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: rillig Date: Sat Oct 12 21:14:22 UTC 2019 Modified Files: pkgsrc/textproc/isearch: Makefile PLIST distinfo pkgsrc/textproc/isearch/patches: patch-ad Log Message: textproc/isearch: fix location of HTML documentation To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 pkgsrc/textproc/isearch/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/isearch/PLIST cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/isearch/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/isearch/patches/patch-ad Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1570914862185200 Content-Disposition: inline Content-Length: 3900 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/isearch/Makefile diff -u pkgsrc/textproc/isearch/Makefile:1.16 pkgsrc/textproc/isearch/Makefile:1.17 --- pkgsrc/textproc/isearch/Makefile:1.16 Wed Aug 16 20:45:46 2017 +++ pkgsrc/textproc/isearch/Makefile Sat Oct 12 21:14:22 2019 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.16 2017/08/16 20:45:46 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2019/10/12 21:14:22 rillig Exp $ DISTNAME= Isearch-1.47.01 PKGNAME= isearch-1.47.01 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= textproc databases MASTER_SITES= # http://www.etymon.com/pub/Isearch/ @@ -10,16 +10,17 @@ MAINTAINER= pkgsrc-users@NetBSD.org #HOMEPAGE= http://www.etymon.com/Isearch/ COMMENT= Advanced text indexing and searching system +# isearch-1.47.01 doesn't declare the dependencies correctly MAKE_JOBS_SAFE= no GNU_CONFIGURE= yes USE_LANGUAGES= c c++ -INSTALLATION_DIRS= bin share/doc/isearch share/doc/html/isearch +INSTALLATION_DIRS= bin share/doc/isearch post-install: ${INSTALL_DATA} ${WRKSRC}/TUTORIAL ${DESTDIR}${PREFIX}/share/doc/isearch ${INSTALL_DATA} ${WRKSRC}/doc/DebugFirewall.doc ${DESTDIR}${PREFIX}/share/doc/isearch - ${INSTALL_DATA} ${WRKSRC}/html/*.html ${DESTDIR}${PREFIX}/share/doc/html/isearch/ + ${INSTALL_DATA} ${WRKSRC}/html/*.html ${DESTDIR}${PREFIX}/share/doc/isearch/ .include "../../mk/bsd.pkg.mk" Index: pkgsrc/textproc/isearch/PLIST diff -u pkgsrc/textproc/isearch/PLIST:1.4 pkgsrc/textproc/isearch/PLIST:1.5 --- pkgsrc/textproc/isearch/PLIST:1.4 Mon Jan 1 22:29:59 2018 +++ pkgsrc/textproc/isearch/PLIST Sat Oct 12 21:14:22 2019 @@ -1,13 +1,13 @@ -@comment $NetBSD: PLIST,v 1.4 2018/01/01 22:29:59 rillig Exp $ +@comment $NetBSD: PLIST,v 1.5 2019/10/12 21:14:22 rillig Exp $ bin/Iget bin/Iindex bin/Isearch bin/Iutil bin/zpresent bin/zsearch -share/doc/html/isearch/Isearch-cgi-tutorial.html -share/doc/html/isearch/IsearchFeatures.html -share/doc/html/isearch/IsearchTutorial.html -share/doc/html/isearch/QuickStart.html share/doc/isearch/DebugFirewall.doc +share/doc/isearch/Isearch-cgi-tutorial.html +share/doc/isearch/IsearchFeatures.html +share/doc/isearch/IsearchTutorial.html +share/doc/isearch/QuickStart.html share/doc/isearch/TUTORIAL Index: pkgsrc/textproc/isearch/distinfo diff -u pkgsrc/textproc/isearch/distinfo:1.10 pkgsrc/textproc/isearch/distinfo:1.11 --- pkgsrc/textproc/isearch/distinfo:1.10 Wed Nov 4 01:59:35 2015 +++ pkgsrc/textproc/isearch/distinfo Sat Oct 12 21:14:22 2019 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2015/11/04 01:59:35 agc Exp $ +$NetBSD: distinfo,v 1.11 2019/10/12 21:14:22 rillig Exp $ SHA1 (Isearch-1.47.01.tar.gz) = 86761d6055fdd7b954b7ac9d9fd3d0084d758e3f RMD160 (Isearch-1.47.01.tar.gz) = 2e7f4c21d8a2d3cb194823a881ee7315f88de66c @@ -13,7 +13,7 @@ SHA1 (patch-Isearch-cgi_search__form.cxx SHA1 (patch-aa) = 256004c217dfa107583784f7f7f1ab75280db4e1 SHA1 (patch-ab) = 2c03c3a208021d9a935c568f4062615d485aa260 SHA1 (patch-ac) = 57451c09eda372d70fae7ad7f9db8b31926e369b -SHA1 (patch-ad) = 7f53e7dfb6c5e37d2c4f6cb12e087c678d07df25 +SHA1 (patch-ad) = ea37eccec52ae6d62f55625a12805998c8e1fe40 SHA1 (patch-ae) = c74006de168ef0a653ae6a407ee8ee99b0c9f236 SHA1 (patch-doctype_anzlic.cxx) = d9ee2469a5870245238f525794bd6b4ca0f7c166 SHA1 (patch-doctype_anzmeta.cxx) = 673e181aebdd8cb1f207c04cfdd89ea040f7b418 Index: pkgsrc/textproc/isearch/patches/patch-ad diff -u pkgsrc/textproc/isearch/patches/patch-ad:1.1 pkgsrc/textproc/isearch/patches/patch-ad:1.2 --- pkgsrc/textproc/isearch/patches/patch-ad:1.1 Sat Dec 1 16:42:27 2007 +++ pkgsrc/textproc/isearch/patches/patch-ad Sat Oct 12 21:14:22 2019 @@ -1,4 +1,6 @@ -$NetBSD: patch-ad,v 1.1 2007/12/01 16:42:27 rillig Exp $ +$NetBSD: patch-ad,v 1.2 2019/10/12 21:14:22 rillig Exp $ + +Fix build with GCC 4. --- src/mergeunit.hxx.orig 1998-05-12 16:49:13.000000000 +0000 +++ src/mergeunit.hxx 2007-12-01 16:40:09.000000000 +0000 --_----------=_1570914862185200--