ngircd: fix options names and don't remove the license file

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

Module Name:	pkgsrc-wip
Committed By:	sxvghd <sxvghd%firemail.cc@localhost>
Pushed By:	sxvghd
Date:		Tue Jan 14 19:32:27 2020 +0100
Changeset:	57780ff5be92f5cca4883fdf2a40ec8c3edb6711

Modified Files:
	ngircd/Makefile
	ngircd/options.mk

Log Message:
ngircd: fix options names and don't remove the license file

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

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

diffstat:
 ngircd/Makefile   |  1 -
 ngircd/options.mk | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diffs:
diff --git a/ngircd/Makefile b/ngircd/Makefile
index 45eede3a35..38a0a54730 100644
--- a/ngircd/Makefile
+++ b/ngircd/Makefile
@@ -21,7 +21,6 @@ INSTALLATION_DIRS+=	share/examples/ngircd
 
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/share/doc/ngircd/sample-ngircd.conf ${DESTDIR}${PREFIX}/share/examples/ngircd/
-	${RM} ${DESTDIR}${PREFIX}/share/doc/ngircd/COPYING
 	${RM} ${DESTDIR}${PREFIX}/share/doc/ngircd/HowToRelease.txt
 	${RM} ${DESTDIR}${PREFIX}/share/doc/ngircd/INSTALL
 	${RM} ${DESTDIR}${PREFIX}/etc/ngircd.conf
diff --git a/ngircd/options.mk b/ngircd/options.mk
index 7119742459..21d5946dbd 100644
--- a/ngircd/options.mk
+++ b/ngircd/options.mk
@@ -1,6 +1,6 @@
 # $NetBSD$
 PKG_OPTIONS_VAR=		PKG_OPTIONS.ngircd
-PKG_SUPPORTED_OPTIONS=		zlib tcpwrap ident pam iconv inet6 sniffer irc+ strictrfc
+PKG_SUPPORTED_OPTIONS=		zlib tcpwrappers ident pam iconv inet6 ngircd-sniffer ngircd-irc+ ngircd-strictrfc
 PKG_OPTIONS_OPTIONAL_GROUPS=	ssl
 PKG_OPTIONS_GROUP.ssl=		gnutls openssl
 PKG_SUGGESTED_OPTIONS=		zlib ident inet6 gnutls
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+=	--with-gnutls
 .  include "../../security/gnutls/buildlink3.mk"
 .endif
 
-.if !empty(PKG_OPTIONS:Mtcpwrap)
+.if !empty(PKG_OPTIONS:Mtcpwrappers)
 CONFIGURE_ARGS+=	--with-tcp-wrappers
 .endif
 
@@ -45,14 +45,14 @@ CONFIGURE_ARGS+=	--with-iconv
 CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
-.if !empty(PKG_OPTIONS:Msniffer)
+.if !empty(PKG_OPTIONS:Mngircd-sniffer)
 CONFIGURE_ARGS+=	--enable-sniffer
 .endif
 
-.if !empty(PKG_OPTIONS:Mirc+)
+.if !empty(PKG_OPTIONS:Mngircd-irc+)
 CONFIGURE_ARGS+=	--enable-ircplus
 .endif
 
-.if !empty(PKG_OPTIONS:Mstrictrfc)
+.if !empty(PKG_OPTIONS:Mngircd-strictrfc)
 CONFIGURE_ARGS+=	--enable-strict-rfc
 .endif