CVS commit: pkgsrc/mail/aerc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat May 11 18:43:26 UTC 2024

Modified Files:
        pkgsrc/mail/aerc: Makefile

Log Message:
aerc: fix a few hardcoded paths, pass in more information from build env

Mirrors what GNUMakefile does and improves first-start behaviour.

Bump PKGREVISION.


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

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

Modified files:

Index: pkgsrc/mail/aerc/Makefile
diff -u pkgsrc/mail/aerc/Makefile:1.6 pkgsrc/mail/aerc/Makefile:1.7
--- pkgsrc/mail/aerc/Makefile:1.6       Fri Apr  5 19:14:01 2024
+++ pkgsrc/mail/aerc/Makefile   Sat May 11 18:43:26 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2024/04/05 19:14:01 bsiegert Exp $
+# $NetBSD: Makefile,v 1.7 2024/05/11 18:43:26 wiz Exp $
 
 DISTNAME=      0.17.0
 PKGNAME=       aerc-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    mail
 MASTER_SITES=  https://git.sr.ht/~rjarry/aerc/archive/
 DIST_SUBDIR=   aerc
@@ -24,14 +24,31 @@ INSTALL_MAKE_FLAGS+=        MANDIR=${PREFIX:Q}/
 MKPIE_SUPPORTED=       no
 RELRO_SUPPORTED=       no
 
+SUBST_CLASSES+=                prefix
+SUBST_SED.prefix+=     -e "s,/usr/local,${PREFIX},"
+SUBST_SED.prefix+=     -e "s,/usr/share,${PREFIX}/share,"
+SUBST_FILES.prefix+=   config/aerc.conf
+SUBST_FILES.prefix+=   config/config.go
+SUBST_FILES.prefix+=   doc/aerc-config.5.scd
+SUBST_STAGE.prefix=    pre-configure
+SUBST_MESSAGE.prefix=  Adapt hardcoded prefix for pkgsrc.
+
 REPLACE_PYTHON+=       contrib/carddav-query
 REPLACE_PYTHON+=       filters/show-ics-details.py
 
 GO_BUILD_PATTERN=      .
 
+GO_LDFLAGS+=   -X main.Version=${PKGVERSION_NOREV}
+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
+
 do-build:
        cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV}    \
-           GOPATH=${WRKDIR}/.gopath ${GO} build -o aerc
+           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
 
 do-install:
        cd ${WRKSRC} && ${GMAKE} ${INSTALL_MAKE_FLAGS} install
@@ -40,4 +57,5 @@ do-install:
 
 .include "../../lang/python/application.mk"
 .include "../../lang/go/go-module.mk"
+#.include "../../mail/notmuch/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"