Sun Mar 29 06:56:49 2020 UTC ()
chat/anope: fix hard-coded /usr/pkg in patch


(rillig)
diff -r1.30 -r1.31 pkgsrc/chat/anope/Makefile
diff -r1.12 -r1.13 pkgsrc/chat/anope/distinfo
diff -r1.2 -r1.3 pkgsrc/chat/anope/patches/patch-data_example.conf
cvs diff -r1.30 -r1.31 pkgsrc/chat/anope/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/anope/Makefile 2020/03/08 16:48:54 1.30
+++ pkgsrc/chat/anope/Makefile 2020/03/29 06:56:48 1.31
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.30 2020/03/08 16:48:54 wiz Exp $ 1# $NetBSD: Makefile,v 1.31 2020/03/29 06:56:48 rillig Exp $
2 2
3DISTNAME= anope-2.0.7-source 3DISTNAME= anope-2.0.7-source
4PKGNAME= ${DISTNAME:S/-source//1} 4PKGNAME= ${DISTNAME:S/-source//1}
5PKGREVISION= 2 5PKGREVISION= 3
6CATEGORIES= chat 6CATEGORIES= chat
7MASTER_SITES= ${MASTER_SITE_GITHUB:=anope/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=anope/}
8GITHUB_PROJECT= anope 8GITHUB_PROJECT= anope
9GITHUB_RELEASE= ${PKGVERSION_NOREV} 9GITHUB_RELEASE= ${PKGVERSION_NOREV}
10 10
11MAINTAINER= nia@NetBSD.org 11MAINTAINER= nia@NetBSD.org
12HOMEPAGE= https://www.anope.org/ 12HOMEPAGE= https://www.anope.org/
13COMMENT= Modular set of IRC services 13COMMENT= Modular set of IRC services
14LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
15 15
16USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
17USE_TOOLS+= msgfmt 17USE_TOOLS+= msgfmt
18USE_CMAKE= yes 18USE_CMAKE= yes
@@ -40,29 +40,27 @@ PKG_USERS_VARS= ANOPE_GROUP @@ -40,29 +40,27 @@ PKG_USERS_VARS= ANOPE_GROUP
40 40
41OWN_DIRS_PERMS+= ${PREFIX}/anope ${ANOPE_USER} ${ANOPE_GROUP} 0755 41OWN_DIRS_PERMS+= ${PREFIX}/anope ${ANOPE_USER} ${ANOPE_GROUP} 0755
42OWN_DIRS_PERMS+= ${PREFIX}/anope/data ${ANOPE_USER} ${ANOPE_GROUP} 0755 42OWN_DIRS_PERMS+= ${PREFIX}/anope/data ${ANOPE_USER} ${ANOPE_GROUP} 0755
43OWN_DIRS_PERMS+= ${PREFIX}/anope/logs ${ANOPE_USER} ${ANOPE_GROUP} 0755 43OWN_DIRS_PERMS+= ${PREFIX}/anope/logs ${ANOPE_USER} ${ANOPE_GROUP} 0755
44 44
45FILES_SUBST+= ANOPE_GROUP=${ANOPE_GROUP:Q} 45FILES_SUBST+= ANOPE_GROUP=${ANOPE_GROUP:Q}
46FILES_SUBST+= ANOPE_USER=${ANOPE_USER:Q} 46FILES_SUBST+= ANOPE_USER=${ANOPE_USER:Q}
47FILES_SUBST+= PKGLOCALEDIR=${PKGLOCALEDIR} 47FILES_SUBST+= PKGLOCALEDIR=${PKGLOCALEDIR}
48 48
49SUBST_CLASSES+= conf 49SUBST_CLASSES+= conf
50SUBST_STAGE.conf= pre-configure 50SUBST_STAGE.conf= pre-configure
51SUBST_MESSAGE.conf= Set variables in configuration file. 51SUBST_MESSAGE.conf= Set variables in configuration file.
52SUBST_FILES.conf+= data/example.conf 52SUBST_FILES.conf+= data/example.conf
53SUBST_VARS.conf= PREFIX 53SUBST_VARS.conf= PREFIX PKG_SYSCONFDIR
54SUBST_VARS.conf+= PKG_SYSCONFDIR 
55SUBST_VARS.conf+= PKGLOCALEDIR 
56 54
57RCD_SCRIPTS= anope 55RCD_SCRIPTS= anope
58 56
59EGDIR= ${PREFIX}/share/examples/anope 57EGDIR= ${PREFIX}/share/examples/anope
60DOCDIR= ${PREFIX}/share/doc/anope 58DOCDIR= ${PREFIX}/share/doc/anope
61 59
62USE_PKGLOCALEDIR= yes 60USE_PKGLOCALEDIR= yes
63 61
64INSTALLATION_DIRS+= ${EGDIR} 62INSTALLATION_DIRS+= ${EGDIR}
65INSTALLATION_DIRS+= ${DOCDIR} 63INSTALLATION_DIRS+= ${DOCDIR}
66 64
67CONF_FILES+= ${EGDIR}/botserv.conf ${PKG_SYSCONFDIR}/botserv.conf 65CONF_FILES+= ${EGDIR}/botserv.conf ${PKG_SYSCONFDIR}/botserv.conf
68CONF_FILES+= ${EGDIR}/chanserv.conf ${PKG_SYSCONFDIR}/chanserv.conf 66CONF_FILES+= ${EGDIR}/chanserv.conf ${PKG_SYSCONFDIR}/chanserv.conf
cvs diff -r1.12 -r1.13 pkgsrc/chat/anope/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/anope/distinfo 2020/01/10 15:27:25 1.12
+++ pkgsrc/chat/anope/distinfo 2020/03/29 06:56:48 1.13
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.12 2020/01/10 15:27:25 nia Exp $ 1$NetBSD: distinfo,v 1.13 2020/03/29 06:56:48 rillig Exp $
2 2
3SHA1 (anope-2.0.7-source.tar.gz) = 298c21edbff18a1d3cc711bf84b55ac06ae10d6b 3SHA1 (anope-2.0.7-source.tar.gz) = 298c21edbff18a1d3cc711bf84b55ac06ae10d6b
4RMD160 (anope-2.0.7-source.tar.gz) = fdbc31d1bcd902eddc35efbae871af2b0dddc88b 4RMD160 (anope-2.0.7-source.tar.gz) = fdbc31d1bcd902eddc35efbae871af2b0dddc88b
5SHA512 (anope-2.0.7-source.tar.gz) = 22a9f3e0d9fe7f68304062829a19b693a3414f94c90f8da601ab98995cbff7310dc22ca40749d50d6722dfb4649817d2f4b1dbe4afa3254b28980f03a491de65 5SHA512 (anope-2.0.7-source.tar.gz) = 22a9f3e0d9fe7f68304062829a19b693a3414f94c90f8da601ab98995cbff7310dc22ca40749d50d6722dfb4649817d2f4b1dbe4afa3254b28980f03a491de65
6Size (anope-2.0.7-source.tar.gz) = 1817484 bytes 6Size (anope-2.0.7-source.tar.gz) = 1817484 bytes
7SHA1 (patch-CMakeLists.txt) = 698034091457fb58de32a43fd701c7ce716f898e 7SHA1 (patch-CMakeLists.txt) = 698034091457fb58de32a43fd701c7ce716f898e
8SHA1 (patch-data_CMakeLists.txt) = e0d762da4345ded9a080ea6cf216db510c4c1665 8SHA1 (patch-data_CMakeLists.txt) = e0d762da4345ded9a080ea6cf216db510c4c1665
9SHA1 (patch-data_example.conf) = 5d239fdf2362561b860ffbd3b6dfe7a5dd177632 9SHA1 (patch-data_example.conf) = 6866b154f464ed6072b267f589ee67056bea73ac
cvs diff -r1.2 -r1.3 pkgsrc/chat/anope/patches/patch-data_example.conf (expand / switch to unified diff)

--- pkgsrc/chat/anope/patches/patch-data_example.conf 2019/12/08 03:55:05 1.2
+++ pkgsrc/chat/anope/patches/patch-data_example.conf 2020/03/29 06:56:48 1.3
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1$NetBSD: patch-data_example.conf,v 1.2 2019/12/08 03:55:05 nia Exp $ 1$NetBSD: patch-data_example.conf,v 1.3 2020/03/29 06:56:48 rillig Exp $
2 2
3Fix config file filenames for pkgsrc's CONF_FILES system. 3Fix config file filenames for pkgsrc's CONF_FILES system.
4 4
5--- data/example.conf.orig 2019-10-14 14:51:20.000000000 +0000 5--- data/example.conf.orig 2019-10-14 14:51:20.000000000 +0000
6+++ data/example.conf 6+++ data/example.conf
7@@ -235,13 +235,13 @@ serverinfo 7@@ -235,13 +235,13 @@ serverinfo
8 * The filename containing the Services process ID. The path is relative to the 8 * The filename containing the Services process ID. The path is relative to the
9 * services root directory. 9 * services root directory.
10 */ 10 */
11- pid = "data/services.pid" 11- pid = "data/services.pid"
12+ pid = "/usr/pkg/anope/anope.pid" 12+ pid = "@PREFIX@/anope/anope.pid"
13  13
14 /* 14 /*
15 * The filename containing the Message of the Day. The path is relative to the 15 * The filename containing the Message of the Day. The path is relative to the
16 * services root directory. 16 * services root directory.
17 */ 17 */
18- motd = "conf/services.motd" 18- motd = "conf/services.motd"
19+ motd = "/usr/pkg/etc/anope/services.motd" 19+ motd = "@PKG_SYSCONFDIR@/anope/services.motd"
20 } 20 }
21  21
22 /* 22 /*
23@@ -565,7 +565,7 @@ options 23@@ -565,7 +565,7 @@ options
24 include 24 include
25 { 25 {
26 type = "file" 26 type = "file"
27- name = "botserv.example.conf" 27- name = "botserv.example.conf"
28+ name = "botserv.conf" 28+ name = "botserv.conf"
29 } 29 }
30  30
31 /* 31 /*
32@@ -578,7 +578,7 @@ include 32@@ -578,7 +578,7 @@ include