Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7344284E61 for ; Thu, 17 Aug 2023 21:26:50 +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 dlaGdxtDG5mC for ; Thu, 17 Aug 2023 21:26:49 +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 D325484D3B for ; Thu, 17 Aug 2023 21:26:49 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C6FF8FBDB; Thu, 17 Aug 2023 21:26:49 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1692307609129590" MIME-Version: 1.0 Date: Thu, 17 Aug 2023 21:26:49 +0000 From: "Hauke Fath" Subject: CVS commit: pkgsrc/www/viewvc To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: hauke@netbsd.org X-Mailer: log_accum Message-Id: <20230817212649.C6FF8FBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1692307609129590 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: hauke Date: Thu Aug 17 21:26:49 UTC 2023 Modified Files: pkgsrc/www/viewvc: Makefile distinfo pkgsrc/www/viewvc/patches: patch-ab Log Message: Use PKG_SYSCONFDIR instead of PREFIX/etc Construct the comment in the spirot of the example To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 pkgsrc/www/viewvc/Makefile cvs rdiff -u -r1.21 -r1.22 pkgsrc/www/viewvc/distinfo cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/viewvc/patches/patch-ab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1692307609129590 Content-Disposition: inline Content-Length: 2855 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/viewvc/Makefile diff -u pkgsrc/www/viewvc/Makefile:1.42 pkgsrc/www/viewvc/Makefile:1.43 --- pkgsrc/www/viewvc/Makefile:1.42 Thu Aug 17 19:59:00 2023 +++ pkgsrc/www/viewvc/Makefile Thu Aug 17 21:26:49 2023 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.42 2023/08/17 19:59:00 hauke Exp $ +# $NetBSD: Makefile,v 1.43 2023/08/17 21:26:49 hauke Exp $ DISTNAME= viewvc-1.2.3 +PKGREVISION= 1 CATEGORIES= devel www MASTER_SITES= ${MASTER_SITE_GITHUB:=viewvc/} @@ -35,7 +36,8 @@ SUBST_CLASSES+= conf SUBST_STAGE.conf= pre-configure SUBST_MESSAGE.conf= Fixing configuration files. SUBST_FILES.conf= conf/viewvc.conf.dist -SUBST_VARS.conf= VIEWVCDIR PREFIX PHP_OPT CVSGRAPH_OPT +SUBST_VARS.conf= PREFIX PKG_SYSCONFDIR +SUBST_VARS.conf+= VIEWVCDIR PHP_OPT CVSGRAPH_OPT .if defined(RCS_PKG) && ${RCS_PKG} == "YES" SUBST_SED.conf+= -e "s|@RCS_PREFIX@|${PREFIX}|g" .else Index: pkgsrc/www/viewvc/distinfo diff -u pkgsrc/www/viewvc/distinfo:1.21 pkgsrc/www/viewvc/distinfo:1.22 --- pkgsrc/www/viewvc/distinfo:1.21 Thu Aug 17 19:59:00 2023 +++ pkgsrc/www/viewvc/distinfo Thu Aug 17 21:26:49 2023 @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.21 2023/08/17 19:59:00 hauke Exp $ +$NetBSD: distinfo,v 1.22 2023/08/17 21:26:49 hauke Exp $ BLAKE2s (viewvc-1.2.3.tar.gz) = 4efe844e1fedca51c40245d61c96e951b30db0fb9081e54230459a508be19144 SHA512 (viewvc-1.2.3.tar.gz) = dd5fd1d01629e7e6894e3bd244579a3581883ffb18f66e4ca44b911a5bc41810fcdd1176bfdbf0b88c943780b61c1af2a35c4dd8d757b9e10ff00d560eee0a0f Size (viewvc-1.2.3.tar.gz) = 361272 bytes SHA1 (patch-aa) = ff0a6e52ea66c838ba3ab7b1d055c27bf561a376 -SHA1 (patch-ab) = 20a2c3c168914ce11b1580434c960e0d8e25f4ed +SHA1 (patch-ab) = 5be3c5eb60e58341510a96c5a2cab230beec956e Index: pkgsrc/www/viewvc/patches/patch-ab diff -u pkgsrc/www/viewvc/patches/patch-ab:1.4 pkgsrc/www/viewvc/patches/patch-ab:1.5 --- pkgsrc/www/viewvc/patches/patch-ab:1.4 Tue Mar 17 22:14:15 2020 +++ pkgsrc/www/viewvc/patches/patch-ab Thu Aug 17 21:26:49 2023 @@ -1,12 +1,16 @@ -$NetBSD: patch-ab,v 1.4 2020/03/17 22:14:15 wiz Exp $ +$NetBSD: patch-ab,v 1.5 2023/08/17 21:26:49 hauke Exp $ ---- conf/viewvc.conf.dist.orig 2020-03-17 18:04:41.000000000 +0000 +Make paths adaptable for pkgsrc installation. + +--- conf/viewvc.conf.dist.orig 2023-01-04 14:48:34.000000000 +0000 +++ conf/viewvc.conf.dist -@@ -219,6 +219,7 @@ +@@ -218,7 +218,8 @@ + ## /etc/mime.types, ## /usr/local/apache2/conf/mime.types ## - #mime_types_files = mimetypes.conf -+#mime_types_file = @PREFIX@/etc/httpd/mime.types +-#mime_types_files = mimetypes.conf ++#mime_types_files = mimetypes.conf, ++# @PKG_SYSCONFDIR@/httpd/mime.types ## address: The address of the local repository maintainer. (This ## option is provided only as a convenience for ViewVC installations --_----------=_1692307609129590--