ngircd: fix pkglint errors & make use of CONF_FILES in the Makefile

[sxvghd <sxvghd%firemail.cc@localhost>]

Module Name:	pkgsrc-wip
Committed By:	sxvghd <sxvghd%firemail.cc@localhost>
Pushed By:	sxvghd
Date:		Mon Dec 16 22:06:19 2019 +0100
Changeset:	a09100ae483f2a9bd51421e8e7372241b735c7c3

Modified Files:
	ngircd/DESCR
	ngircd/Makefile
	ngircd/PLIST
	ngircd/options.mk

Log Message:
ngircd: fix pkglint errors & make use of CONF_FILES in the Makefile

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a09100ae483f2a9bd51421e8e7372241b735c7c3

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

diffstat:
 ngircd/DESCR      | 10 +++++-----
 ngircd/Makefile   | 35 +++++++++++++++++++++++++++++++++--
 ngircd/PLIST      |  5 -----
 ngircd/options.mk | 11 +++++++----
 4 files changed, 45 insertions(+), 16 deletions(-)

diffs:
diff --git a/ngircd/DESCR b/ngircd/DESCR
index d0de435532..70cfa23dd6 100644
--- a/ngircd/DESCR
+++ b/ngircd/DESCR
@@ -1,6 +1,6 @@
-ngIRCd is a free, portable and lightweight Internet Relay Chat 
-server for small or private networks, developed under the GNU 
-General Public License (GPL). It is easy to configure, can cope 
-with dynamic IP addresses, and supports IPv6, SSL-protected 
-connections as well as PAM for authentication. It is written from 
+ngIRCd is a free, portable and lightweight Internet Relay Chat
+server for small or private networks, developed under the GNU
+General Public License (GPL). It is easy to configure, can cope
+with dynamic IP addresses, and supports IPv6, SSL-protected
+connections as well as PAM for authentication. It is written from
 scratch and not based on the original IRCd.
diff --git a/ngircd/Makefile b/ngircd/Makefile
index 7fd6ae72ad..da85f247b2 100644
--- a/ngircd/Makefile
+++ b/ngircd/Makefile
@@ -4,9 +4,9 @@ DISTNAME=	ngircd-25
 CATEGORIES=	chat
 MASTER_SITES=	http://ngircd.barton.de/pub/ngircd/
 
-MAINTAINER=	pkgsrc-users%netbsd.org@localhost
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://ngircd.barton.de/pub/ngircd/
-COMMENT=	A free, portable and lightweight IRC server.
+COMMENT=	Free, portable and lightweight IRC server
 LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=	yes
@@ -14,5 +14,36 @@ USE_LANGUAGES=	c
 
 RCD_SCRIPTS+=	ngircd
 
+EGDIR=                  ${PREFIX}/share/doc/ngircd
+
+CONF_FILES+=            ${EGDIR}/AUTHORS ${PKG_SYSCONFDIR}/ngircd/AUTHORS
+CONF_FILES+=            ${EGDIR}/Bopm.txt ${PKG_SYSCONFDIR}/ngircd/Bopm.txt
+CONF_FILES+=            ${EGDIR}/Capabilities.txt ${PKG_SYSCONFDIR}/ngircd/Capabilities.txt
+CONF_FILES+=            ${EGDIR}/ChangeLog ${PKG_SYSCONFDIR}/ngircd/ChangeLog
+CONF_FILES+=            ${EGDIR}/Commands.txt ${PKG_SYSCONFDIR}/ngircd/Commands.txt
+CONF_FILES+=            ${EGDIR}/Contributing.txt ${PKG_SYSCONFDIR}/ngircd/Contributing.txt
+CONF_FILES+=            ${EGDIR}/FAQ.txt ${PKG_SYSCONFDIR}/ngircd/FAQ.txt
+CONF_FILES+=            ${EGDIR}/Modes.txt ${PKG_SYSCONFDIR}/ngircd/Modes.txt
+CONF_FILES+=            ${EGDIR}/NEWS ${PKG_SYSCONFDIR}/ngircd/NEWS
+CONF_FILES+=            ${EGDIR}/PAM.txt ${PKG_SYSCONFDIR}/ngircd/PAM.txt
+CONF_FILES+=            ${EGDIR}/Platforms.txt ${PKG_SYSCONFDIR}/ngircd/Platforms.txt
+CONF_FILES+=            ${EGDIR}/Protocol.txt ${PKG_SYSCONFDIR}/ngircd/Protocol.txt
+CONF_FILES+=            ${EGDIR}/README ${PKG_SYSCONFDIR}/ngircd/README
+CONF_FILES+=            ${EGDIR}/README-AUX.txt ${PKG_SYSCONFDIR}/ngircd/README-AUX.txt
+CONF_FILES+=            ${EGDIR}/README-BeOS.txt ${PKG_SYSCONFDIR}/ngircd/README-BeOS.txt
+CONF_FILES+=            ${EGDIR}/README-Interix.txt ${PKG_SYSCONFDIR}/ngircd/README-Interix.txt
+CONF_FILES+=            ${EGDIR}/RFC.txt ${PKG_SYSCONFDIR}/ngircd/RFC.txt
+CONF_FILES+=            ${EGDIR}/SSL.txt ${PKG_SYSCONFDIR}/ngircd/SSL.txt
+CONF_FILES+=            ${EGDIR}/Services.txt ${PKG_SYSCONFDIR}/ngircd/Services.txt
+CONF_FILES+=            ${EGDIR}/sample-ngircd.conf ${PKG_SYSCONFDIR}/ngircd/sample-ngircd.conf
+
 .include "options.mk"
+
+post-install:
+	${MKDIR} ${PKG_SYSCONFDIR}/ngircd
+	${RM} ${DESTDIR}${EGDIR}/COPYING
+	${RM} ${DESTDIR}${EGDIR}/HowToRelease.txt
+	${RM} ${DESTDIR}${EGDIR}/INSTALL
+	${RM} ${DESTDIR}${PREFIX}/etc/ngircd.conf
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/ngircd/PLIST b/ngircd/PLIST
index ff3a8e1753..ce89d63e22 100644
--- a/ngircd/PLIST
+++ b/ngircd/PLIST
@@ -1,19 +1,14 @@
 @comment $NetBSD$
-etc/ngircd.conf
 man/man5/ngircd.conf.5
 man/man8/ngircd.8
 sbin/ngircd
-share/examples/rc.d/ngircd
 share/doc/ngircd/AUTHORS
 share/doc/ngircd/Bopm.txt
-share/doc/ngircd/COPYING
 share/doc/ngircd/Capabilities.txt
 share/doc/ngircd/ChangeLog
 share/doc/ngircd/Commands.txt
 share/doc/ngircd/Contributing.txt
 share/doc/ngircd/FAQ.txt
-share/doc/ngircd/HowToRelease.txt
-share/doc/ngircd/INSTALL
 share/doc/ngircd/Modes.txt
 share/doc/ngircd/NEWS
 share/doc/ngircd/PAM.txt
diff --git a/ngircd/options.mk b/ngircd/options.mk
index 206ea450fb..7119742459 100644
--- a/ngircd/options.mk
+++ b/ngircd/options.mk
@@ -1,6 +1,9 @@
-PKG_OPTIONS_VAR=	PKG_OPTIONS.ngircd
-PKG_SUPPORTED_OPTIONS=	zlib openssl gnutls tcpwrap ident pam iconv ipv6 sniffer irc+ strictrfc
-PKG_SUGGESTED_OPTIONS=	zlib ident ipv6
+# $NetBSD$
+PKG_OPTIONS_VAR=		PKG_OPTIONS.ngircd
+PKG_SUPPORTED_OPTIONS=		zlib tcpwrap ident pam iconv inet6 sniffer irc+ strictrfc
+PKG_OPTIONS_OPTIONAL_GROUPS=	ssl
+PKG_OPTIONS_GROUP.ssl=		gnutls openssl
+PKG_SUGGESTED_OPTIONS=		zlib ident inet6 gnutls
 
 .include "../../mk/bsd.options.mk"
 
@@ -38,7 +41,7 @@ CONFIGURE_ARGS+=	--with-iconv
 .  include "../../converters/libiconv/buildlink3.mk"
 .endif
 
-.if !empty(PKG_OPTIONS:Mipv6)
+.if !empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+=	--enable-ipv6
 .endif