Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_156432824685460"
MIME-Version: 1.0
Date: Sun, 28 Jul 2019 15:37:26 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/chat/bitlbee
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20190728153726.C2EC6FBF4@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	nia
Date:		Sun Jul 28 15:37:26 UTC 2019

Modified Files:
	pkgsrc/chat/bitlbee: Makefile
Added Files:
	pkgsrc/chat/bitlbee: options.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 pkgsrc/chat/bitlbee/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/chat/bitlbee/options.mk

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


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

Modified files:

Index: pkgsrc/chat/bitlbee/Makefile
diff -u pkgsrc/chat/bitlbee/Makefile:1.82 pkgsrc/chat/bitlbee/Makefile:1.83
--- pkgsrc/chat/bitlbee/Makefile:1.82	Sun Jul 28 15:16:35 2019
+++ pkgsrc/chat/bitlbee/Makefile	Sun Jul 28 15:37:26 2019
@@ -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 @@ DATADIR=		${PREFIX}/share/bitlbee
 DOCDIR=			${PREFIX}/share/doc/bitlbee
 STATEDIR=		${VARBASE}/db/bitlbee
 
+.include "../../mk/bsd.prefs.mk"
+
 BITLBEE_USER?=		bitlbee
 BITLBEE_GROUP?=		nobody
 
@@ -80,24 +82,13 @@ do-install:
 	${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

Added files:

Index: pkgsrc/chat/bitlbee/options.mk
diff -u /dev/null pkgsrc/chat/bitlbee/options.mk:1.1
--- /dev/null	Sun Jul 28 15:37:26 2019
+++ pkgsrc/chat/bitlbee/options.mk	Sun Jul 28 15:37:26 2019
@@ -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


--_----------=_156432824685460--