Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_146814434198080"
MIME-Version: 1.0
Date: Sun, 10 Jul 2016 09:52:21 +0000
From: "Roland Illig" <rillig@netbsd.org>
Subject: CVS commit: pkgsrc/chat/inspircd
To: pkgsrc-changes@NetBSD.org
Reply-To: rillig@netbsd.org
Message-Id: <20160710095221.54099FBB5@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_146814434198080
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	rillig
Date:		Sun Jul 10 09:52:21 UTC 2016

Modified Files:
	pkgsrc/chat/inspircd: Makefile PLIST options.mk

Log Message:
Fixed pkglint warnings. Bumped version.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/chat/inspircd/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/chat/inspircd/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/chat/inspircd/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_146814434198080
Content-Disposition: inline
Content-Length: 3986
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/chat/inspircd/Makefile
diff -u pkgsrc/chat/inspircd/Makefile:1.46 pkgsrc/chat/inspircd/Makefile:1.47
--- pkgsrc/chat/inspircd/Makefile:1.46	Sat Jul  9 06:37:53 2016
+++ pkgsrc/chat/inspircd/Makefile	Sun Jul 10 09:52:21 2016
@@ -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:

Index: pkgsrc/chat/inspircd/PLIST
diff -u pkgsrc/chat/inspircd/PLIST:1.8 pkgsrc/chat/inspircd/PLIST:1.9
--- pkgsrc/chat/inspircd/PLIST:1.8	Tue Mar 11 14:04:58 2014
+++ pkgsrc/chat/inspircd/PLIST	Sun Jul 10 09:52:21 2016
@@ -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

Index: pkgsrc/chat/inspircd/options.mk
diff -u pkgsrc/chat/inspircd/options.mk:1.2 pkgsrc/chat/inspircd/options.mk:1.3
--- pkgsrc/chat/inspircd/options.mk:1.2	Sat Jul 28 22:52:15 2007
+++ pkgsrc/chat/inspircd/options.mk	Sun Jul 10 09:52:21 2016
@@ -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
 
 ###


--_----------=_146814434198080--