Thu Aug 17 21:26:49 2023 UTC ()
Use PKG_SYSCONFDIR instead of PREFIX/etc

Construct the comment in the spirot of the example


(hauke)
diff -r1.42 -r1.43 pkgsrc/www/viewvc/Makefile
diff -r1.21 -r1.22 pkgsrc/www/viewvc/distinfo
diff -r1.4 -r1.5 pkgsrc/www/viewvc/patches/patch-ab
Fri Aug 18 06:26:49 2023
Mon Jun 26 19:41:19 2023
pkgsrc/www/viewvc/patches/patch-ab,v
anoncvs not yet been updated
cvs diff -r1.42 -r1.43 pkgsrc/www/viewvc/Makefile (expand / switch to unified diff)

--- pkgsrc/www/viewvc/Makefile 2023/08/17 19:59:00 1.42
+++ pkgsrc/www/viewvc/Makefile 2023/08/17 21:26:49 1.43
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.42 2023/08/17 19:59:00 hauke Exp $ 1# $NetBSD: Makefile,v 1.43 2023/08/17 21:26:49 hauke Exp $
2 2
3DISTNAME= viewvc-1.2.3 3DISTNAME= viewvc-1.2.3
 4PKGREVISION= 1
4CATEGORIES= devel www 5CATEGORIES= devel www
5MASTER_SITES= ${MASTER_SITE_GITHUB:=viewvc/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=viewvc/}
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://www.viewvc.org/ 9HOMEPAGE= http://www.viewvc.org/
9COMMENT= Viewing the content of CVS/SVN repositories with a Webbrowser 10COMMENT= Viewing the content of CVS/SVN repositories with a Webbrowser
10LICENSE= 2-clause-bsd 11LICENSE= 2-clause-bsd
11 12
12REPLACE_PYTHON= viewvc-install bin/* bin/cgi/*.cgi lib/*.py 13REPLACE_PYTHON= viewvc-install bin/* bin/cgi/*.cgi lib/*.py
13# https://github.com/viewvc/viewvc/issues/138 14# https://github.com/viewvc/viewvc/issues/138
14PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 1.1.27 15PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 1.1.27
15 16
16.if !exists(/usr/bin/rlog) 17.if !exists(/usr/bin/rlog)
@@ -25,27 +26,28 @@ VIEWVCDIR= share/viewvc @@ -25,27 +26,28 @@ VIEWVCDIR= share/viewvc
25PLIST_SUBST+= VIEWVCDIR=${VIEWVCDIR:Q} 26PLIST_SUBST+= VIEWVCDIR=${VIEWVCDIR:Q}
26 27
27CONF_FILES= ${PREFIX}/share/examples/viewvc/viewvc.conf \ 28CONF_FILES= ${PREFIX}/share/examples/viewvc/viewvc.conf \
28 ${PREFIX}/${VIEWVCDIR:Q}/viewvc.conf 29 ${PREFIX}/${VIEWVCDIR:Q}/viewvc.conf
29CONF_FILES+= ${PREFIX}/share/examples/viewvc/cvsgraph.conf \ 30CONF_FILES+= ${PREFIX}/share/examples/viewvc/cvsgraph.conf \
30 ${PREFIX}/${VIEWVCDIR:Q}/cvsgraph.conf 31 ${PREFIX}/${VIEWVCDIR:Q}/cvsgraph.conf
31 32
32.include "options.mk" 33.include "options.mk"
33 34
34SUBST_CLASSES+= conf 35SUBST_CLASSES+= conf
35SUBST_STAGE.conf= pre-configure 36SUBST_STAGE.conf= pre-configure
36SUBST_MESSAGE.conf= Fixing configuration files. 37SUBST_MESSAGE.conf= Fixing configuration files.
37SUBST_FILES.conf= conf/viewvc.conf.dist 38SUBST_FILES.conf= conf/viewvc.conf.dist
38SUBST_VARS.conf= VIEWVCDIR PREFIX PHP_OPT CVSGRAPH_OPT 39SUBST_VARS.conf= PREFIX PKG_SYSCONFDIR
 40SUBST_VARS.conf+= VIEWVCDIR PHP_OPT CVSGRAPH_OPT
39.if defined(RCS_PKG) && ${RCS_PKG} == "YES" 41.if defined(RCS_PKG) && ${RCS_PKG} == "YES"
40SUBST_SED.conf+= -e "s|@RCS_PREFIX@|${PREFIX}|g" 42SUBST_SED.conf+= -e "s|@RCS_PREFIX@|${PREFIX}|g"
41.else 43.else
42SUBST_SED.conf+= -e "s|@RCS_PREFIX@|/usr|g" 44SUBST_SED.conf+= -e "s|@RCS_PREFIX@|/usr|g"
43.endif 45.endif
44 46
45CHECK_PORTABILITY_SKIP= tools/make-release 47CHECK_PORTABILITY_SKIP= tools/make-release
46 48
47INSTALLATION_DIRS= share/examples/viewvc 49INSTALLATION_DIRS= share/examples/viewvc
48 50
49do-install: 51do-install:
50 (cd ${WRKSRC} && \ 52 (cd ${WRKSRC} && \
51 ${PYTHONBIN} \ 53 ${PYTHONBIN} \
cvs diff -r1.21 -r1.22 pkgsrc/www/viewvc/distinfo (expand / switch to unified diff)

--- pkgsrc/www/viewvc/distinfo 2023/08/17 19:59:00 1.21
+++ pkgsrc/www/viewvc/distinfo 2023/08/17 21:26:49 1.22
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.21 2023/08/17 19:59:00 hauke Exp $ 1$NetBSD: distinfo,v 1.22 2023/08/17 21:26:49 hauke Exp $
2 2
3BLAKE2s (viewvc-1.2.3.tar.gz) = 4efe844e1fedca51c40245d61c96e951b30db0fb9081e54230459a508be19144 3BLAKE2s (viewvc-1.2.3.tar.gz) = 4efe844e1fedca51c40245d61c96e951b30db0fb9081e54230459a508be19144
4SHA512 (viewvc-1.2.3.tar.gz) = dd5fd1d01629e7e6894e3bd244579a3581883ffb18f66e4ca44b911a5bc41810fcdd1176bfdbf0b88c943780b61c1af2a35c4dd8d757b9e10ff00d560eee0a0f 4SHA512 (viewvc-1.2.3.tar.gz) = dd5fd1d01629e7e6894e3bd244579a3581883ffb18f66e4ca44b911a5bc41810fcdd1176bfdbf0b88c943780b61c1af2a35c4dd8d757b9e10ff00d560eee0a0f
5Size (viewvc-1.2.3.tar.gz) = 361272 bytes 5Size (viewvc-1.2.3.tar.gz) = 361272 bytes
6SHA1 (patch-aa) = ff0a6e52ea66c838ba3ab7b1d055c27bf561a376 6SHA1 (patch-aa) = ff0a6e52ea66c838ba3ab7b1d055c27bf561a376
7SHA1 (patch-ab) = 20a2c3c168914ce11b1580434c960e0d8e25f4ed 7SHA1 (patch-ab) = 5be3c5eb60e58341510a96c5a2cab230beec956e
cvs diff -r1.4 -r1.5 pkgsrc/www/viewvc/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/www/viewvc/patches/patch-ab 2020/03/17 22:14:15 1.4
+++ pkgsrc/www/viewvc/patches/patch-ab 1.5
@@ -1,52 +0,0 @@ @@ -1,52 +0,0 @@
1$NetBSD: patch-ab,v 1.4 2020/03/17 22:14:15 wiz Exp $ 
2 
3--- conf/viewvc.conf.dist.orig 2020-03-17 18:04:41.000000000 +0000 
4+++ conf/viewvc.conf.dist 
5@@ -219,6 +219,7 @@ 
6 ## /usr/local/apache2/conf/mime.types 
7 ## 
8 #mime_types_files = mimetypes.conf 
9+#mime_types_file = @PREFIX@/etc/httpd/mime.types 
10  
11 ## address: The address of the local repository maintainer. (This 
12 ## option is provided only as a convenience for ViewVC installations 
13@@ -313,6 +314,7 @@ 
14 ## rcs_dir = /usr/bin/ 
15 ## 
16 #rcs_dir = 
17+rcs_dir = @RCS_PREFIX@/bin/ 
18  
19 ## cvsnt: Location of cvsnt program. ViewVC can use CVSNT (www.cvsnt.org) 
20 ## instead of the RCS utilities to retrieve information from CVS 
21@@ -335,6 +337,7 @@ 
22 ## diff = /usr/bin/diff 
23 ## 
24 #diff =  
25+svn = @PREFIX@/bin/ 
26  
27 ## cvsgraph: Location of the CvsGraph program, a graphical CVS version 
28 ## graph generator (see options.use_cvsgraph). 
29@@ -342,7 +345,7 @@ 
30 ## Example: 
31 ## cvsgraph = /usr/local/bin/cvsgraph 
32 ## 
33-#cvsgraph = 
34+cvsgraph = @PREFIX@/bin/ 
35  
36  
37 ##--------------------------------------------------------------------------- 
38@@ -754,12 +757,14 @@ 
39 ## use_cvsgraph: Use CvsGraph to offer visual graphs of CVS revision history. 
40 ## 
41 #use_cvsgraph = 0 
42+use_cvsgraph = @CVSGRAPH_OPT@ 
43  
44 ## cvsgraph_conf: Location of the customized cvsgraph configuration file. 
45 ## May be specified as an absolute path or as a path relative to this 
46 ## configuration file. 
47 ## 
48 #cvsgraph_conf = cvsgraph.conf 
49+cvsgraph_conf = @PREFIX@/@VIEWVCDIR@/cvsgraph.conf 
50  
51 ## allowed_cvsgraph_useropts: A list of settings used for cvsgraph's 
52 ## user-modifiable behavior which can be changed in the graph display.