pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/chat chat/*: remove unnecessary :Q modifiers
details: https://anonhg.NetBSD.org/pkgsrc/rev/676860928e5b
branches: trunk
changeset: 374001:676860928e5b
user: rillig <rillig%pkgsrc.org@localhost>
date: Sat Jan 13 23:18:25 2018 +0000
description:
chat/*: remove unnecessary :Q modifiers
diffstat:
chat/anope/Makefile | 14 +++++++-------
chat/ctrlproxy/Makefile | 4 ++--
chat/dircproxy/Makefile | 8 ++++----
chat/eggdrop/Makefile | 4 ++--
chat/gale/Makefile | 4 ++--
chat/gnomeicu/Makefile | 4 ++--
chat/gossip/Makefile | 4 ++--
chat/inspircd12/Makefile | 16 ++++++++--------
chat/ircd-hybrid/Makefile | 10 +++++-----
chat/ircservices/Makefile | 4 ++--
chat/ircu/Makefile | 4 ++--
chat/jabberd/Makefile | 10 +++++-----
chat/psi/Makefile | 6 +++---
chat/riece/Makefile | 6 +++---
chat/silc-client-icb/Makefile | 4 ++--
chat/xchat-systray-integration/Makefile | 4 ++--
chat/zenirc/Makefile | 4 ++--
chat/zircon/Makefile | 4 ++--
18 files changed, 57 insertions(+), 57 deletions(-)
diffs (truncated from 413 to 300 lines):
diff -r 848d2d81cfc8 -r 676860928e5b chat/anope/Makefile
--- a/chat/anope/Makefile Sat Jan 13 22:32:53 2018 +0000
+++ b/chat/anope/Makefile Sat Jan 13 23:18:25 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2016/07/09 06:37:52 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2018/01/13 23:18:25 rillig Exp $
DISTNAME= anope-1.7.21
PKGREVISION= 8
@@ -17,8 +17,8 @@
ANOPE_USER= anope
ANOPE_GROUP= anope
RCD_SCRIPTS= anope
-FILES_SUBST+= ANOPE_USER=${ANOPE_USER:Q}
-FILES_SUBST+= ANOPE_GROUP=${ANOPE_GROUP:Q}
+FILES_SUBST+= ANOPE_USER=${ANOPE_USER}
+FILES_SUBST+= ANOPE_GROUP=${ANOPE_GROUP}
USERGROUP_PHASE= pre-install
PKG_USERS_VARS+= ANOPE_USER
@@ -29,11 +29,11 @@
PKG_USERS= ${ANOPE_USER}:${ANOPE_GROUP}
PKG_HOME.${ANOPE_USER}= ${PREFIX}/lib/anope
PKG_GROUPS= ${ANOPE_GROUP}
-MAKE_ENV+= RUNGROUP=${ANOPE_GROUP:Q}
+MAKE_ENV+= RUNGROUP=${ANOPE_GROUP}
OWN_DIRS_PERMS+= ${PREFIX}/lib/anope/logs \
- ${ANOPE_USER:Q} ${ANOPE_GROUP:Q} 2755
+ ${ANOPE_USER} ${ANOPE_GROUP} 2755
OWN_DIRS_PERMS+= ${PREFIX}/lib/anope/modules/runtime \
- ${ANOPE_USER:Q} ${ANOPE_GROUP:Q} 2755
+ ${ANOPE_USER} ${ANOPE_GROUP} 2755
CONF_FILES_PERMS+= ${PREFIX}/share/examples/anope/example.conf \
${PREFIX}/lib/anope/services.conf \
@@ -42,7 +42,7 @@
CONFIGURE_ARGS+= --with-permissions=077
CONFIGURE_ARGS+= --with-bindir=${PREFIX}/lib/anope
CONFIGURE_ARGS+= --with-datadir=${PREFIX}/lib/anope
-CONFIGURE_ARGS+= --with-rungroup=${ANOPE_GROUP:Q}
+CONFIGURE_ARGS+= --with-rungroup=${ANOPE_GROUP}
.include "options.mk"
diff -r 848d2d81cfc8 -r 676860928e5b chat/ctrlproxy/Makefile
--- a/chat/ctrlproxy/Makefile Sat Jan 13 22:32:53 2018 +0000
+++ b/chat/ctrlproxy/Makefile Sat Jan 13 23:18:25 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/09/19 13:04:19 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2018/01/13 23:18:25 rillig Exp $
#
DISTNAME= ctrlproxy-3.0.8
@@ -26,7 +26,7 @@
.include "options.mk"
post-install:
- cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} DESTDIR=${DESTDIR:Q} ${MAKE} install
+ cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} DESTDIR=${DESTDIR} ${MAKE} install
${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/ctrlproxy/README
${INSTALL_DATA} ${WRKSRC}/motd \
${DESTDIR}${PREFIX}/share/examples/ctrlproxy/motd
diff -r 848d2d81cfc8 -r 676860928e5b chat/dircproxy/Makefile
--- a/chat/dircproxy/Makefile Sat Jan 13 22:32:53 2018 +0000
+++ b/chat/dircproxy/Makefile Sat Jan 13 23:18:25 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2017/08/01 16:58:17 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2018/01/13 23:18:25 rillig Exp $
DISTNAME= dircproxy-1.2.0-beta2
PKGNAME= ${DISTNAME:S/-beta/beta/}
@@ -20,11 +20,11 @@
REPLACE_PERL+= contrib/log.pl contrib/privmsg-log.pl
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
EGDIR= ${PREFIX}/share/examples/dircproxy
-CONF_FILES= ${EGDIR:Q}/dircproxyrc.sample \
- ${PKG_SYSCONFDIR:Q}/dircproxyrc
+CONF_FILES= ${EGDIR}/dircproxyrc.sample \
+ ${PKG_SYSCONFDIR}/dircproxyrc
RCD_SCRIPTS= dircproxy
.include "../../mk/bsd.pkg.mk"
diff -r 848d2d81cfc8 -r 676860928e5b chat/eggdrop/Makefile
--- a/chat/eggdrop/Makefile Sat Jan 13 22:32:53 2018 +0000
+++ b/chat/eggdrop/Makefile Sat Jan 13 23:18:25 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2014/01/11 14:42:01 adam Exp $
+# $NetBSD: Makefile,v 1.37 2018/01/13 23:18:25 rillig Exp $
DISTNAME= eggdrop1.6.21
PKGNAME= eggdrop-1.6.21
@@ -16,7 +16,7 @@
PLIST_VARS= dynamic
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ENV+= TCLLIB="${PREFIX}/lib" TCLINC="${PREFIX}/include"
.include "../../mk/bsd.prefs.mk"
diff -r 848d2d81cfc8 -r 676860928e5b chat/gale/Makefile
--- a/chat/gale/Makefile Sat Jan 13 22:32:53 2018 +0000
+++ b/chat/gale/Makefile Sat Jan 13 23:18:25 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2017/08/07 07:56:58 jlam Exp $
+# $NetBSD: Makefile,v 1.55 2018/01/13 23:18:25 rillig Exp $
DISTNAME= gale-0.99fruit
PKGNAME= gale-0.99f
@@ -15,7 +15,7 @@
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ENV+= PROG_GLIB_CONFIG=${GLIB_CONFIG:Q}
CPPFLAGS+= -I${BUILDLINK_PREFIX.boehm-gc}/include/gc
diff -r 848d2d81cfc8 -r 676860928e5b chat/gnomeicu/Makefile
--- a/chat/gnomeicu/Makefile Sat Jan 13 22:32:53 2018 +0000
+++ b/chat/gnomeicu/Makefile Sat Jan 13 23:18:25 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.117 2017/11/30 16:45:15 adam Exp $
+# $NetBSD: Makefile,v 1.118 2018/01/13 23:18:26 rillig Exp $
DISTNAME= gnomeicu-0.99.12
PKGREVISION= 62
@@ -18,7 +18,7 @@
LIBS.SunOS+= -lsocket
-CONFIGURE_ARGS+= --sysconfdir=${EGDIR:Q}
+CONFIGURE_ARGS+= --sysconfdir=${EGDIR}
EGDIR= ${PREFIX}/share/examples/gnomeicu
CONF_FILES= ${EGDIR}/sound/events/GnomeICU.soundlist \
diff -r 848d2d81cfc8 -r 676860928e5b chat/gossip/Makefile
--- a/chat/gossip/Makefile Sat Jan 13 22:32:53 2018 +0000
+++ b/chat/gossip/Makefile Sat Jan 13 23:18:25 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.104 2017/11/23 17:19:49 wiz Exp $
+# $NetBSD: Makefile,v 1.105 2018/01/13 23:18:26 rillig Exp $
#
DISTNAME= gossip-0.10.2
@@ -18,7 +18,7 @@
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
GCONF_SCHEMAS= gossip.schemas
diff -r 848d2d81cfc8 -r 676860928e5b chat/inspircd12/Makefile
--- a/chat/inspircd12/Makefile Sat Jan 13 22:32:53 2018 +0000
+++ b/chat/inspircd12/Makefile Sat Jan 13 23:18:25 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2017/11/30 16:45:16 adam Exp $
+# $NetBSD: Makefile,v 1.39 2018/01/13 23:18:26 rillig Exp $
#
DISTNAME= InspIRCd-1.2.0
@@ -26,8 +26,8 @@
PKG_SYSCONFSUBDIR= inspircd
MAKE_FILE= GNUmakefile
-FILES_SUBST+= INSPIRCD_USER=${INSPIRCD_USER:Q}
-FILES_SUBST+= INSPIRCD_GROUP=${INSPIRCD_GROUP:Q}
+FILES_SUBST+= INSPIRCD_USER=${INSPIRCD_USER}
+FILES_SUBST+= INSPIRCD_GROUP=${INSPIRCD_GROUP}
.include "../../mk/bsd.prefs.mk"
@@ -37,16 +37,16 @@
HEADERS?= # undef
CONF_FILES_PERMS= ${EGDIR}/inspircd.conf.example \
${PKG_SYSCONFDIR}/inspircd.conf \
- ${INSPIRCD_USER:Q} ${INSPIRCD_GROUP:Q} 0400
+ ${INSPIRCD_USER} ${INSPIRCD_GROUP} 0400
CONF_FILES_PERMS+= ${EGDIR}/modules.conf.example \
${PKG_SYSCONFDIR}/modules.conf \
- ${INSPIRCD_USER:Q} ${INSPIRCD_GROUP:Q} 0400
+ ${INSPIRCD_USER} ${INSPIRCD_GROUP} 0400
PKG_USERS_VARS= INSPIRCD_USER
PKG_GROUPS_VARS= INSPIRCD_GROUP
-PKG_GROUPS= ${INSPIRCD_GROUP:Q}
-PKG_USERS= ${INSPIRCD_USER:Q}:${INSPIRCD_GROUP:Q}
+PKG_GROUPS= ${INSPIRCD_GROUP}
+PKG_USERS= ${INSPIRCD_USER}:${INSPIRCD_GROUP}
PKG_GECOS.${INSPIRCD_USER}= InspIRCd user
@@ -75,7 +75,7 @@
MAKE_DIRS+= ${VARBASE}/log
OWN_DIRS_PERMS+= ${VARBASE}/run/inspircd \
- ${INSPIRCD_USER:Q} ${INSPIRCD_GROUP:Q} 750
+ ${INSPIRCD_USER} ${INSPIRCD_GROUP} 750
INSPIRCD_USER?= inspircd
INSPIRCD_GROUP?= inspircd
diff -r 848d2d81cfc8 -r 676860928e5b chat/ircd-hybrid/Makefile
--- a/chat/ircd-hybrid/Makefile Sat Jan 13 22:32:53 2018 +0000
+++ b/chat/ircd-hybrid/Makefile Sat Jan 13 23:18:25 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2016/07/09 06:37:53 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2018/01/13 23:18:26 rillig Exp $
DISTNAME= ircd-hybrid-7.2.3
PKGREVISION= 11
@@ -42,9 +42,9 @@
OWN_DIRS_PERMS+= ${VARBASE}/run/ircd-hybrid \
${IRCD_HYBRID_IRC_USER} ${IRCD_HYBRID_IRC_GROUP} 0770
-FILES_SUBST+= IRCD_HYBRID_IRC_USER=${IRCD_HYBRID_IRC_USER:Q}
-FILES_SUBST+= IRCD_HYBRID_IRC_GROUP=${IRCD_HYBRID_IRC_GROUP:Q}
-FILES_SUBST+= VARBASE=${VARBASE:Q}
+FILES_SUBST+= IRCD_HYBRID_IRC_USER=${IRCD_HYBRID_IRC_USER}
+FILES_SUBST+= IRCD_HYBRID_IRC_GROUP=${IRCD_HYBRID_IRC_GROUP}
+FILES_SUBST+= VARBASE=${VARBASE}
PKG_GROUPS= ${IRCD_HYBRID_IRC_GROUP}
PKG_USERS= ${IRCD_HYBRID_IRC_USER}:${IRCD_HYBRID_IRC_GROUP}
@@ -76,7 +76,7 @@
CONFIGURE_ARGS+= --with-nicklen=${IRCD_HYBRID_NICLEN:Q}
CONFIGURE_ARGS+= --with-topiclen=${IRCD_HYBRID_TOPICLEN:Q}
CONFIGURE_ARGS+= --enable-syslog=${IRCD_HYBRID_SYSLOG_EVENTS:Q}
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --localstatedir=${VARBASE}/log/ircd-hybrid
CONFIGURE_ARGS+= --enable-clobber
diff -r 848d2d81cfc8 -r 676860928e5b chat/ircservices/Makefile
--- a/chat/ircservices/Makefile Sat Jan 13 22:32:53 2018 +0000
+++ b/chat/ircservices/Makefile Sat Jan 13 23:18:25 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2018/01/07 19:57:48 rillig Exp $
+# $NetBSD: Makefile,v 1.51 2018/01/13 23:18:26 rillig Exp $
#
DISTNAME= ircservices-5.0.64
@@ -25,7 +25,7 @@
PKG_GROUPS= services
BUILD_DEFS= VARBASE
-CONFIGURE_ARGS+= -prefix ${PREFIX:Q}
+CONFIGURE_ARGS+= -prefix ${PREFIX}
CONFIGURE_ARGS+= -cc ${CC:Q}
CONFIGURE_ARGS+= ${empty(CFLAGS):?:-cflags ${CFLAGS:Q}}
CONFIGURE_ARGS+= ${empty(LDFLAGS):?:-lflags ${LDFLAGS:Q}}
diff -r 848d2d81cfc8 -r 676860928e5b chat/ircu/Makefile
--- a/chat/ircu/Makefile Sat Jan 13 22:32:53 2018 +0000
+++ b/chat/ircu/Makefile Sat Jan 13 23:18:25 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2013/07/12 10:44:53 jperkin Exp $
+# $NetBSD: Makefile,v 1.37 2018/01/13 23:18:26 rillig Exp $
#
DISTNAME= ircu2.10.12.12
@@ -47,7 +47,7 @@
RCD_SCRIPTS= ircd
-FILES_SUBST+= IRCD_USER=${IRCD_USER:Q}
+FILES_SUBST+= IRCD_USER=${IRCD_USER}
MESSAGE_SUBST+= IRCD_USER=${IRCD_USER}
MESSAGE_SUBST+= IRCD_GROUP=${IRCD_GROUP}
diff -r 848d2d81cfc8 -r 676860928e5b chat/jabberd/Makefile
--- a/chat/jabberd/Makefile Sat Jan 13 22:32:53 2018 +0000
+++ b/chat/jabberd/Makefile Sat Jan 13 23:18:25 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2017/08/16 20:45:32 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2018/01/13 23:18:26 rillig Exp $
#
DISTNAME= jabber-1.4.2
@@ -43,10 +43,10 @@
PKG_USERS_VARS+= JABBERD_USER
PKG_GROUPS_VARS+= JABBERD_GROUP
-FILES_SUBST+= JABBERD_USER=${JABBERD_USER:Q}
-FILES_SUBST+= JABBERD_GROUP=${JABBERD_GROUP:Q}
-FILES_SUBST+= JABBERD_SPOOLDIR=${JABBERD_SPOOLDIR:Q}
-FILES_SUBST+= JABBERD_PIDDIR=${JABBERD_PIDDIR:Q}
+FILES_SUBST+= JABBERD_USER=${JABBERD_USER}
+FILES_SUBST+= JABBERD_GROUP=${JABBERD_GROUP}
+FILES_SUBST+= JABBERD_SPOOLDIR=${JABBERD_SPOOLDIR}
+FILES_SUBST+= JABBERD_PIDDIR=${JABBERD_PIDDIR}
.for f in ${JABBERD_LOGDIR} ${JABBERD_SPOOLDIR} ${JABBERD_PIDDIR}
OWN_DIRS_PERMS+= ${f} ${JABBERD_USER} ${JABBERD_GROUP} 750
diff -r 848d2d81cfc8 -r 676860928e5b chat/psi/Makefile
Home |
Main Index |
Thread Index |
Old Index