[pkgsrc/trunk]: pkgsrc/chat/anope chat/anope: fix hard-coded /usr/pkg in patch

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b14e0557141a
branches:  trunk
changeset: 414512:b14e0557141a
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Mar 29 06:56:48 2020 +0000

description:
chat/anope: fix hard-coded /usr/pkg in patch

diffstat:

 chat/anope/Makefile                        |  8 +++-----
 chat/anope/distinfo                        |  4 ++--
 chat/anope/patches/patch-data_example.conf |  6 +++---
 3 files changed, 8 insertions(+), 10 deletions(-)

diffs (66 lines):

diff -r 6c2242d66e0d -r b14e0557141a chat/anope/Makefile
--- a/chat/anope/Makefile       Sun Mar 29 06:49:25 2020 +0000
+++ b/chat/anope/Makefile       Sun Mar 29 06:56:48 2020 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2020/03/08 16:48:54 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2020/03/29 06:56:48 rillig Exp $
 
 DISTNAME=      anope-2.0.7-source
 PKGNAME=       ${DISTNAME:S/-source//1}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    chat
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=anope/}
 GITHUB_PROJECT=        anope
@@ -50,9 +50,7 @@
 SUBST_STAGE.conf=      pre-configure
 SUBST_MESSAGE.conf=    Set variables in configuration file.
 SUBST_FILES.conf+=     data/example.conf
-SUBST_VARS.conf=       PREFIX
-SUBST_VARS.conf+=      PKG_SYSCONFDIR
-SUBST_VARS.conf+=      PKGLOCALEDIR
+SUBST_VARS.conf=       PREFIX PKG_SYSCONFDIR
 
 RCD_SCRIPTS=   anope
 
diff -r 6c2242d66e0d -r b14e0557141a chat/anope/distinfo
--- a/chat/anope/distinfo       Sun Mar 29 06:49:25 2020 +0000
+++ b/chat/anope/distinfo       Sun Mar 29 06:56:48 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2020/01/10 15:27:25 nia Exp $
+$NetBSD: distinfo,v 1.13 2020/03/29 06:56:48 rillig Exp $
 
 SHA1 (anope-2.0.7-source.tar.gz) = 298c21edbff18a1d3cc711bf84b55ac06ae10d6b
 RMD160 (anope-2.0.7-source.tar.gz) = fdbc31d1bcd902eddc35efbae871af2b0dddc88b
@@ -6,4 +6,4 @@
 Size (anope-2.0.7-source.tar.gz) = 1817484 bytes
 SHA1 (patch-CMakeLists.txt) = 698034091457fb58de32a43fd701c7ce716f898e
 SHA1 (patch-data_CMakeLists.txt) = e0d762da4345ded9a080ea6cf216db510c4c1665
-SHA1 (patch-data_example.conf) = 5d239fdf2362561b860ffbd3b6dfe7a5dd177632
+SHA1 (patch-data_example.conf) = 6866b154f464ed6072b267f589ee67056bea73ac
diff -r 6c2242d66e0d -r b14e0557141a chat/anope/patches/patch-data_example.conf
--- a/chat/anope/patches/patch-data_example.conf        Sun Mar 29 06:49:25 2020 +0000
+++ b/chat/anope/patches/patch-data_example.conf        Sun Mar 29 06:56:48 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-data_example.conf,v 1.2 2019/12/08 03:55:05 nia Exp $
+$NetBSD: patch-data_example.conf,v 1.3 2020/03/29 06:56:48 rillig Exp $
 
 Fix config file filenames for pkgsrc's CONF_FILES system.
 
@@ -9,14 +9,14 @@
         * services root directory.
         */
 -      pid = "data/services.pid"
-+      pid = "/usr/pkg/anope/anope.pid"
++      pid = "@PREFIX@/anope/anope.pid"
  
        /*
         * The filename containing the Message of the Day. The path is relative to the
         * services root directory.
         */
 -      motd = "conf/services.motd"
-+      motd = "/usr/pkg/etc/anope/services.motd"
++      motd = "@PKG_SYSCONFDIR@/anope/services.motd"
  }
  
  /*