[pkgsrc/trunk]: pkgsrc/chat/bitlbee bitlbee: Add an otr option. Enable it by ...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f6715f94c9a2
branches:  trunk
changeset: 336905:f6715f94c9a2
user:      nia <nia%pkgsrc.org@localhost>
date:      Sun Jul 28 15:37:26 2019 +0000

description:
bitlbee: Add an otr option. Enable it by default.

This moves the inet6 option to an options.mk.

While here, silence some pkglint warnings.

Bump PKGREVISION.

diffstat:

 chat/bitlbee/Makefile   |  21 ++++++---------------
 chat/bitlbee/options.mk |  20 ++++++++++++++++++++
 2 files changed, 26 insertions(+), 15 deletions(-)

diffs (73 lines):

diff -r 8a73d59977da -r f6715f94c9a2 chat/bitlbee/Makefile
--- a/chat/bitlbee/Makefile     Sun Jul 28 15:23:15 2019 +0000
+++ b/chat/bitlbee/Makefile     Sun Jul 28 15:37:26 2019 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.82 2019/07/28 15:16:35 nia Exp $
+# $NetBSD: Makefile,v 1.83 2019/07/28 15:37:26 nia Exp $
 
 DISTNAME=              bitlbee-3.6
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            chat
 MASTER_SITES=          http://get.bitlbee.org/src/
 
@@ -41,6 +41,8 @@
 DOCDIR=                        ${PREFIX}/share/doc/bitlbee
 STATEDIR=              ${VARBASE}/db/bitlbee
 
+.include "../../mk/bsd.prefs.mk"
+
 BITLBEE_USER?=         bitlbee
 BITLBEE_GROUP?=                nobody
 
@@ -80,24 +82,13 @@
        ${INSTALL_DATA} ${WRKSRC}/lib/*.h ${DESTDIR}${PREFIX}/include/bitlbee
        ${INSTALL_DATA} ${WRKSRC}/protocols/*.h ${DESTDIR}${PREFIX}/include/bitlbee
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.bitlbee
-PKG_SUPPORTED_OPTIONS= inet6
-PKG_SUGGESTED_OPTIONS= inet6
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=       --ipv6=1
-.else
-CONFIGURE_ARGS+=       --ipv6=0
-.endif
-
 RCD_SCRIPTS=           bitlbee
 RCD_SCRIPT_SRC.bitlbee=        ${FILESDIR}/bitlbee.sh
 
 # see https://savannah.gnu.org/support/index.php?107660
-#BUILDLINK_ABI_DEPENDS.gnutls+= gnutls<2.12.0
+#BUILDLINK_ABI_DEPENDS.gnutls+=        gnutls<2.12.0
 
+.include "options.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 PYTHON_FOR_BUILD_ONLY= yes
diff -r 8a73d59977da -r f6715f94c9a2 chat/bitlbee/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/bitlbee/options.mk   Sun Jul 28 15:37:26 2019 +0000
@@ -0,0 +1,20 @@
+# $NetBSD: options.mk,v 1.1 2019/07/28 15:37:26 nia Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.bitlbee
+PKG_SUPPORTED_OPTIONS=         inet6 otr
+PKG_SUGGESTED_OPTIONS=         inet6 otr
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=       --ipv6=1
+.else
+CONFIGURE_ARGS+=       --ipv6=0
+.endif
+
+.if !empty(PKG_OPTIONS:Motr)
+CONFIGURE_ARGS+=       --otr=1
+.include "../../chat/libotr/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --otr=0
+.endif