summaryrefslogtreecommitdiff
path: root/chat
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2016-07-10 09:44:56 +0000
committerrillig <rillig@pkgsrc.org>2016-07-10 09:44:56 +0000
commit89f392f96aaa97a8cd7822a5a8c47f0ca43cbbf8 (patch)
tree31408f8fd1404fb7ad817a375599fcf78202fe5f /chat
parent4177751f8e5f4f4954f8e233f704f9f74e3f623b (diff)
downloadpkgsrc-89f392f96aaa97a8cd7822a5a8c47f0ca43cbbf8.tar.gz
Fixed pkglint warnings. Bumped version.
Diffstat (limited to 'chat')
-rw-r--r--chat/inspircd/Makefile18
-rw-r--r--chat/inspircd/PLIST4
-rw-r--r--chat/inspircd/options.mk12
3 files changed, 17 insertions, 17 deletions
diff --git a/chat/inspircd/Makefile b/chat/inspircd/Makefile
index 8c1c09b4286..a3651701b6b 100644
--- a/chat/inspircd/Makefile
+++ b/chat/inspircd/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.46 2016/07/09 06:37:53 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2016/07/10 09:52:21 rillig Exp $
#
DISTNAME= InspIRCd-1.1.23
PKGNAME= ${DISTNAME:S/InspIRCd/inspircd/}
-PKGREVISION= 23
+PKGREVISION= 24
CATEGORIES= chat
MASTER_SITES= http://www.inspircd.org/downloads/
EXTRACT_SUFX= .tar.bz2
@@ -23,8 +23,8 @@ PLIST_SRC= ${WRKDIR}/.PLIST_SRC
RCD_SCRIPTS+= inspircd
PKG_SYSCONFSUBDIR= inspircd
-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"
@@ -34,13 +34,13 @@ MODULES?= # undef
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
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
@@ -83,7 +83,7 @@ BUILD_DEFS+= VARBASE
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
@@ -140,7 +140,7 @@ post-build:
INSTALLATION_DIRS+= bin ${EGDIR}/aliases ${EGDIR}/sql
-CONF_FILES_PERS+= /dev/null ${VARBASE}/log/inspircd.log \
+CONF_FILES_PERMS+= /dev/null ${VARBASE}/log/inspircd.log \
${INSPIRCD_USER}:${INSPIRCD_GROUP} 0640
post-install:
diff --git a/chat/inspircd/PLIST b/chat/inspircd/PLIST
index 4360ebcdca9..693890cebe3 100644
--- a/chat/inspircd/PLIST
+++ b/chat/inspircd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2014/03/11 14:04:58 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.9 2016/07/10 09:52:21 rillig Exp $
bin/inspircd
lib/inspircd/cmd_admin.so
lib/inspircd/cmd_away.so
@@ -131,8 +131,8 @@ share/inspircd/modules/m_lockserv.so
share/inspircd/modules/m_md5.so
share/inspircd/modules/m_messageflood.so
share/inspircd/modules/m_namesx.so
-share/inspircd/modules/m_nicklock.so
share/inspircd/modules/m_nickflood.so
+share/inspircd/modules/m_nicklock.so
share/inspircd/modules/m_noctcp.so
share/inspircd/modules/m_noinvite.so
share/inspircd/modules/m_nokicks.so
diff --git a/chat/inspircd/options.mk b/chat/inspircd/options.mk
index f1465f2195b..71809042ee2 100644
--- a/chat/inspircd/options.mk
+++ b/chat/inspircd/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2007/07/28 22:52:15 adrianp Exp $
+# $NetBSD: options.mk,v 1.3 2016/07/10 09:52:21 rillig Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.inspircd
@@ -97,8 +97,8 @@ MODULES+= m_filter_pcre.cpp
###
.if !empty(PKG_OPTIONS:Minspircd-sqlauth)
INSPIRCD_STORAGE_DRIVER?= mysql
-MODULES+= m_sqlauth.cpp m_sqlutils.cpp
-HEADERS+= m_sqlutils.h
+MODULES+= m_sqlauth.cpp m_sqlutils.cpp
+HEADERS+= m_sqlutils.h
.endif
###
@@ -106,7 +106,7 @@ HEADERS+= m_sqlutils.h
###
.if !empty(PKG_OPTIONS:Minspircd-sqllog)
INSPIRCD_STORAGE_DRIVER?= mysql
-MODULES+= m_sqllog.cpp
+MODULES+= m_sqllog.cpp
.endif
###
@@ -114,8 +114,8 @@ MODULES+= m_sqllog.cpp
###
.if !empty(PKG_OPTIONS:Minspircd-sqloper)
INSPIRCD_STORAGE_DRIVER?= mysql
-MODULES+= m_sqloper.cpp m_sqlutils.cpp
-HEADERS+= m_sqlutils.h
+MODULES+= m_sqloper.cpp m_sqlutils.cpp
+HEADERS+= m_sqlutils.h
.endif
###