Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_171586244047300"
MIME-Version: 1.0
Date: Thu, 16 May 2024 12:27:20 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/mail/aerc
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20240516122720.87628FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	wiz
Date:		Thu May 16 12:27:20 UTC 2024

Modified Files:
	pkgsrc/mail/aerc: Makefile

Log Message:
aerc: enable notmuch support

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/mail/aerc/Makefile

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


--_----------=_171586244047300
Content-Disposition: inline
Content-Length: 1698
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.7 pkgsrc/mail/aerc/Makefile:1.8
--- pkgsrc/mail/aerc/Makefile:1.7	Sat May 11 18:43:26 2024
+++ pkgsrc/mail/aerc/Makefile	Thu May 16 12:27:20 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2024/05/11 18:43:26 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2024/05/16 12:27:20 wiz Exp $
 
 DISTNAME=	0.17.0
 PKGNAME=	aerc-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	https://git.sr.ht/~rjarry/aerc/archive/
 DIST_SUBDIR=	aerc
@@ -42,13 +42,12 @@ 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
-#GO_LDFLAGS+=	-L ${BUILDLINK_PREFIX.notmuch}/lib
-#GO_LDFLAGS+=	-r ${BUILDLINK_PREFIX.notmuch}/lib
+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 -ldflags=${GO_LDFLAGS:Q} -o aerc
-#	    GOPATH=${WRKDIR}/.gopath ${GO} ${GOFLAGS} build -tags=notmuch -ldflags=${GO_LDFLAGS:Q} -o aerc
+	    GOPATH=${WRKDIR}/.gopath ${GO} ${GOFLAGS} build -tags=notmuch -ldflags=${GO_LDFLAGS:Q} -o aerc
 
 do-install:
 	cd ${WRKSRC} && ${GMAKE} ${INSTALL_MAKE_FLAGS} install
@@ -57,5 +56,5 @@ do-install:
 
 .include "../../lang/python/application.mk"
 .include "../../lang/go/go-module.mk"
-#.include "../../mail/notmuch/buildlink3.mk"
+.include "../../mail/notmuch/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"


--_----------=_171586244047300--