diff options
| author | nia <nia@pkgsrc.org> | 2019-07-28 15:37:26 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2019-07-28 15:37:26 +0000 |
| commit | 2a6c40f48d478d1b1f7c6681e30f55decdc3ed41 (patch) | |
| tree | a8feba5608ef610605914aa5d4d33630d1bbce35 /chat | |
| parent | d78f6aa6852584e963b3e11ff6cf24c7c46213a1 (diff) | |
| download | pkgsrc-2a6c40f48d478d1b1f7c6681e30f55decdc3ed41.tar.gz | |
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 (limited to 'chat')
| -rw-r--r-- | chat/bitlbee/Makefile | 21 | ||||
| -rw-r--r-- | chat/bitlbee/options.mk | 20 |
2 files changed, 26 insertions, 15 deletions
diff --git a/chat/bitlbee/Makefile b/chat/bitlbee/Makefile index f4798620961..540a90b0ef9 100644 --- a/chat/bitlbee/Makefile +++ b/chat/bitlbee/Makefile @@ -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 diff --git a/chat/bitlbee/options.mk b/chat/bitlbee/options.mk new file mode 100644 index 00000000000..d0b1b6cc99b --- /dev/null +++ b/chat/bitlbee/options.mk @@ -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 |