Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1679348132219390"
MIME-Version: 1.0
Date: Mon, 20 Mar 2023 21:35:32 +0000
From: "Nikita" <nikita@netbsd.org>
Subject: CVS commit: pkgsrc/mail/cone
To: pkgsrc-changes@NetBSD.org
Reply-To: nikita@netbsd.org
Message-Id: <20230320213532.1D28CFA90@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	nikita
Date:		Mon Mar 20 21:35:32 UTC 2023

Modified Files:
	pkgsrc/mail/cone: Makefile options.mk

Log Message:
mail/cone: fix a couple pkglint warnings. move to use mk/curses.buildlink3.mk.

builds on NetBSD 10.99.2 without buildtime failure.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/mail/cone/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/mail/cone/options.mk

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


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

Modified files:

Index: pkgsrc/mail/cone/Makefile
diff -u pkgsrc/mail/cone/Makefile:1.48 pkgsrc/mail/cone/Makefile:1.49
--- pkgsrc/mail/cone/Makefile:1.48	Wed Nov 23 16:20:32 2022
+++ pkgsrc/mail/cone/Makefile	Mon Mar 20 21:35:31 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2022/11/23 16:20:32 adam Exp $
+# $NetBSD: Makefile,v 1.49 2023/03/20 21:35:31 nikita Exp $
 
 DISTNAME=	cone-0.90
-PKGREVISION=	34
+PKGREVISION=	35
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
@@ -30,11 +30,13 @@ CONFIGURE_ENV+=		ac_cv_path_OPENSSL=${TO
 CONFIGURE_ENV+=		ac_cv_path_REHASH=${TOOLS_TRUE}
 
 EGDIR=			${PREFIX}/share/examples/cone
-INSTALL_AM_MAKEFLAGS+=	sysconfdir=${EGDIR:Q}
+INSTALL_AM_MAKEFLAGS+=	sysconfdir=${EGDIR}
 INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} AM_MAKEFLAGS=${INSTALL_AM_MAKEFLAGS:Q}
 
 CONF_FILES=		${EGDIR}/cone.dist ${PKG_SYSCONFDIR}/cone
 
+# curses: termattrs()
+.include "../../mk/curses.buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"

Index: pkgsrc/mail/cone/options.mk
diff -u pkgsrc/mail/cone/options.mk:1.8 pkgsrc/mail/cone/options.mk:1.9
--- pkgsrc/mail/cone/options.mk:1.8	Sun Sep 16 00:51:32 2012
+++ pkgsrc/mail/cone/options.mk	Mon Mar 20 21:35:31 2023
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.8 2012/09/16 00:51:32 dholland Exp $
+# $NetBSD: options.mk,v 1.9 2023/03/20 21:35:31 nikita Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.cone
-PKG_SUPPORTED_OPTIONS=		aspell ldap wide-curses
+PKG_SUPPORTED_OPTIONS=		aspell ldap fam
 PKG_OPTIONS_REQUIRED_GROUPS=	tls
 PKG_OPTIONS_GROUP.tls=		gnutls ssl
-PKG_SUGGESTED_OPTIONS=		aspell ldap ssl wide-curses
+PKG_SUGGESTED_OPTIONS=		aspell ldap ssl
 
 .include "../../mk/bsd.options.mk"
 
@@ -46,14 +46,3 @@ CONFIGURE_ARGS+=	--with-gnutls
 .if !empty(PKG_OPTIONS:Mssl)
 .  include "../../security/openssl/buildlink3.mk"
 .endif
-
-###
-### Wide curses display
-###
-.if !empty(PKG_OPTIONS:Mwide-curses)
-USE_NCURSES=	yes	# termattrs()
-.  include "../../devel/ncursesw/buildlink3.mk"
-.else
-USE_NCURSES=	yes	# termattrs()
-.  include "../../devel/ncurses/buildlink3.mk"
-.endif


--_----------=_1679348132219390--