For paths that are configurable, default to pkgsrc-compatible values.

Bump PKGREVISION.

4 files changed, 73 insertions, 6 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index a59adb12f68..459c9d4c05c 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.174 2021/05/24 19:55:15 wiz Exp $
+# $NetBSD: Makefile,v 1.175 2021/11/02 09:44:48 schmonz Exp $
 
 DISTNAME=		ikiwiki_3.20200202.3.orig
 PKGNAME=		${DISTNAME:S/_/-/:S/.orig//}
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		www textproc
 MASTER_SITES=		${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
 EXTRACT_SUFX=		.tar.xz
@@ -50,6 +50,11 @@ SUBST_STAGE.buildonce=	post-configure
 SUBST_FILES.buildonce=	Makefile
 SUBST_SED.buildonce=	-e 's|_vendor_install :: all|_vendor_install ::|'
 
+SUBST_CLASSES+=		paths
+SUBST_STAGE.paths=	post-configure
+SUBST_FILES.paths=	IkiWiki/Plugin/highlight.pm IkiWiki/Plugin/polygen.pm
+SUBST_VARS.paths=	PREFIX PKG_SYSCONFBASEDIR
+
 PKG_SYSCONFSUBDIR=	${PKGBASE}
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 .for f in auto.setup auto-blog.setup wikilist
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index 5e90f5dad5f..d57834a14c1 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.140 2021/10/26 11:29:34 nia Exp $
+$NetBSD: distinfo,v 1.141 2021/11/02 09:44:48 schmonz Exp $
 
 BLAKE2s (ikiwiki_3.20200202.3.orig.tar.xz) = 2a29fcde488ca19f3977450b73e423808568cb65938a4ad7ffd4ff5abd64a5b5
 SHA512 (ikiwiki_3.20200202.3.orig.tar.xz) = a1d89ccc0d02cddb3ef53c4c4a4a3349139d558fd4eb418263551a48cb635ed29ef430f8276ef6b42486a9232706908752e15e88590e919db6665e1a8844a4e5
 Size (ikiwiki_3.20200202.3.orig.tar.xz) = 2689636 bytes
-SHA1 (patch-IkiWiki_Plugin_highlight.pm) = 703510899170218bf72af6794fdb10f7f29727cb
+SHA1 (patch-IkiWiki_Plugin_highlight.pm) = a2b1d84472f9b452d60b781f9a9951f5741673f3
+SHA1 (patch-IkiWiki_Plugin_polygen.pm) = 232c48aac1c0ab538b380def2b8a4b42373a3582
 SHA1 (patch-Makefile.PL) = 44324917c22ec3cd2aa216439e2ae5a3dc2f9787
 SHA1 (patch-ikiwiki-mass-rebuild) = eb03ac0ec83078be593f76968f5a1f9080ea50b9
 SHA1 (patch-po_Makefile) = 468b500da41c606c6af6b65c8080d692acb69336
diff --git a/www/ikiwiki/patches/patch-IkiWiki_Plugin_highlight.pm b/www/ikiwiki/patches/patch-IkiWiki_Plugin_highlight.pm
index 62299c4fd02..1980f10cb18 100644
--- a/www/ikiwiki/patches/patch-IkiWiki_Plugin_highlight.pm
+++ b/www/ikiwiki/patches/patch-IkiWiki_Plugin_highlight.pm
@@ -1,10 +1,28 @@
-$NetBSD: patch-IkiWiki_Plugin_highlight.pm,v 1.3 2021/05/14 06:50:16 schmonz Exp $
+$NetBSD: patch-IkiWiki_Plugin_highlight.pm,v 1.4 2021/11/02 09:44:48 schmonz Exp $
 
 Apply upstream patch 9ea3f9d to catch up to highlight 4.0 API change.
+Use pkgsrc paths.
 
 --- IkiWiki/Plugin/highlight.pm.orig	2020-02-02 20:23:50.000000000 +0000
 +++ IkiWiki/Plugin/highlight.pm
-@@ -54,7 +54,13 @@ sub checkconfig () {
+@@ -36,14 +36,14 @@ sub getsetup () {
+ 		},
+ 		filetypes_conf => {
+ 			type => "string",
+-			example => "/etc/highlight/filetypes.conf",
++			example => "@PKG_SYSCONFBASEDIR@/highlight/filetypes.conf",
+ 			description => "location of highlight's filetypes.conf",
+ 			safe => 0,
+ 			rebuild => undef,
+ 		},
+ 		langdefdir => {
+ 			type => "string",
+-			example => "/usr/share/highlight/langDefs",
++			example => "@PREFIX@/share/highlight/langDefs",
+ 			description => "location of highlight's langDefs directory",
+ 			safe => 0,
+ 			rebuild => undef,
+@@ -54,14 +54,20 @@ sub checkconfig () {
  	eval q{use highlight};
  	if (highlight::DataDir->can('new')) {
  		$data_dir=new highlight::DataDir();
@@ -19,3 +37,20 @@ Apply upstream patch 9ea3f9d to catch up to highlight 4.0 API change.
  	} else {
  		$data_dir=undef;
  	}
+ 
+ 	if (! exists $config{filetypes_conf}) {
+ 	  if (! $data_dir ) {
+-		$config{filetypes_conf}= "/etc/highlight/filetypes.conf";
++		$config{filetypes_conf}= "@PKG_SYSCONFBASEDIR@/highlight/filetypes.conf";
+ 	      } elsif ( $data_dir -> can('getFiletypesConfPath') ) {
+ 		# 3.14 +
+ 		$config{filetypes_conf}=
+@@ -75,7 +81,7 @@ sub checkconfig () {
+ 	# note that this is only used for old versions of highlight
+ 	# where $data_dir will not be defined.
+ 	if (! exists $config{langdefdir}) {
+-		$config{langdefdir}= "/usr/share/highlight/langDefs";
++		$config{langdefdir}= "@PREFIX@/share/highlight/langDefs";
+ 
+ 	}
+ 	if (exists $config{tohighlight} && read_filetypes()) {
diff --git a/www/ikiwiki/patches/patch-IkiWiki_Plugin_polygen.pm b/www/ikiwiki/patches/patch-IkiWiki_Plugin_polygen.pm
new file mode 100644
index 00000000000..0487d45ee2d
--- /dev/null
+++ b/www/ikiwiki/patches/patch-IkiWiki_Plugin_polygen.pm
@@ -0,0 +1,26 @@
+$NetBSD: patch-IkiWiki_Plugin_polygen.pm,v 1.1 2021/11/02 09:44:48 schmonz Exp $
+
+Use pkgsrc paths.
+
+--- IkiWiki/Plugin/polygen.pm.orig	2020-02-02 20:23:50.000000000 +0000
++++ IkiWiki/Plugin/polygen.pm
+@@ -38,8 +38,8 @@ sub preprocess (@) {
+ 	$symbol =~ s/[^A-Za-z0-9]//g if defined $symbol;
+ 	$symbol = IkiWiki::possibly_foolish_untaint($symbol) if defined $symbol;
+ 
+-	my $grmfile = '/usr/share/polygen/ita/polygen.grm';
+-	if (! -d '/usr/share/polygen') {
++	my $grmfile = '@PREFIX@/share/polygen/ita/polygen.grm';
++	if (! -d '@PREFIX@/share/polygen') {
+ 		error gettext("polygen not installed");
+ 	}
+ 	find({wanted => sub {
+@@ -48,7 +48,7 @@ sub preprocess (@) {
+ 			}
+ 		},
+ 		no_chdir => 1,
+-	}, '/usr/share/polygen');
++	}, '@PREFIX@/share/polygen');
+ 	
+ 	my $res;
+ 	if (defined $symbol) {