Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1715872466231850"
MIME-Version: 1.0
Date: Thu, 16 May 2024 15:14:26 +0000
From: "Kevin Bloom" <ktnb@netbsd.org>
Subject: CVS commit: pkgsrc/mail/aerc
To: pkgsrc-changes@NetBSD.org
Reply-To: ktnb@netbsd.org
Message-Id: <20240516151426.708B2FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	ktnb
Date:		Thu May 16 15:14:26 UTC 2024

Modified Files:
	pkgsrc/mail/aerc: Makefile
Added Files:
	pkgsrc/mail/aerc: options.mk

Log Message:
aerc: added option for notmuch


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/mail/aerc/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/aerc/options.mk

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


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

Modified files:

Index: pkgsrc/mail/aerc/Makefile
diff -u pkgsrc/mail/aerc/Makefile:1.8 pkgsrc/mail/aerc/Makefile:1.9
--- pkgsrc/mail/aerc/Makefile:1.8	Thu May 16 12:27:20 2024
+++ pkgsrc/mail/aerc/Makefile	Thu May 16 15:14:26 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2024/05/16 12:27:20 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2024/05/16 15:14:26 ktnb Exp $
 
 DISTNAME=	0.17.0
 PKGNAME=	aerc-${DISTNAME}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	https://git.sr.ht/~rjarry/aerc/archive/
 DIST_SUBDIR=	aerc
@@ -42,19 +42,19 @@ GO_LDFLAGS+=	-X main.Version=${PKGVERSIO
 GO_LDFLAGS+=	-X main.Date=2024-04-05
 GO_LDFLAGS+=	-X git.sr.ht/~rjarry/aerc/config.shareDir=${PREFIX}/share/aerc
 GO_LDFLAGS+=	-X git.sr.ht/~rjarry/aerc/config.libexecDir=${PREFIX}/libexec/aerc
-CGO_LDFLAGS+=	${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.notmuch}/lib -L${BUILDLINK_PREFIX.notmuch}/lib
 MAKE_ENV+=	CGO_LDFLAGS=${CGO_LDFLAGS:Q}
 
 do-build:
 	cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV}	\
-	    GOPATH=${WRKDIR}/.gopath ${GO} ${GOFLAGS} build -tags=notmuch -ldflags=${GO_LDFLAGS:Q} -o aerc
+	    GOPATH=${WRKDIR}/.gopath ${GO} ${GOFLAGS} build ${GO_BUILD_TAGS} -ldflags=${GO_LDFLAGS:Q} -o aerc
+
 
 do-install:
 	cd ${WRKSRC} && ${GMAKE} ${INSTALL_MAKE_FLAGS} install
 
+.include "options.mk"
 .include "go-modules.mk"
 
 .include "../../lang/python/application.mk"
 .include "../../lang/go/go-module.mk"
-.include "../../mail/notmuch/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/mail/aerc/options.mk
diff -u /dev/null pkgsrc/mail/aerc/options.mk:1.1
--- /dev/null	Thu May 16 15:14:26 2024
+++ pkgsrc/mail/aerc/options.mk	Thu May 16 15:14:26 2024
@@ -0,0 +1,16 @@
+# $NetBSD: options.mk,v 1.1 2024/05/16 15:14:26 ktnb Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.aerc
+PKG_SUPPORTED_OPTIONS=	notmuch
+PKG_SUGGESTED_OPTIONS=
+
+.include "../../mk/bsd.options.mk"
+
+###
+###  Include Notmuch Support
+###
+.if !empty(PKG_OPTIONS:Mnotmuch)
+.include "../../mail/notmuch/buildlink3.mk"
+CGO_LDFLAGS+=	${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.notmuch}/lib -L${BUILDLINK_PREFIX.notmuch}/lib
+GO_BUILD_TAGS=	-tags=notmuch
+.endif


--_----------=_1715872466231850--