Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 08 Nov 2018 09:14:29 +0100
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        Kirill Ponomarev <krion@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   Re: svn commit: r484432 - in head/mail: notmuch notmuch-emacs notmuch-emacs/files notmuch-mutt notmuch/files
Message-ID:  <1541664869.3287869.1569754128.711E0713@webmail.messagingengine.com>
In-Reply-To: <201811080735.wA87ZUDF049812@repo.freebsd.org>
References:  <201811080735.wA87ZUDF049812@repo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help


On Thu, Nov 8, 2018, at 08:35, Kirill Ponomarev wrote:
> Author: krion
> Date: Thu Nov  8 07:35:30 2018
> New Revision: 484432
> URL: https://svnweb.freebsd.org/changeset/ports/484432
> 
> Log:
>   Update to 0.28
>   
>   PR:		232310
>   Submitted by:	maintainer
> 
> Added:
>   head/mail/notmuch/files/patch-configure   (contents, props changed)
>   head/mail/notmuch/files/patch-contrib_notmuch-mutt_Makefile   
> (contents, props changed)
> Deleted:
>   head/mail/notmuch-emacs/files/
> Modified:
>   head/mail/notmuch-emacs/Makefile
>   head/mail/notmuch-mutt/Makefile
>   head/mail/notmuch/Makefile
>   head/mail/notmuch/distinfo
>   head/mail/notmuch/pkg-plist
> 
> Modified: head/mail/notmuch-mutt/Makefile
> ==============================================================================
> --- head/mail/notmuch-mutt/Makefile	Thu Nov  8 07:18:42 2018	(r484431)
> +++ head/mail/notmuch-mutt/Makefile	Thu Nov  8 07:35:30 2018	(r484432)
> @@ -14,6 +14,7 @@ RUN_DEPENDS=	mutt:mail/mutt \
>  
>  USES=		gmake perl5
>  
> +MAKE_ARGS+=	mandir=${MANPREFIX}/man prefix=${PREFIX}
>  MASTERDIR=	${.CURDIR}/../notmuch
>  NO_ARCH=	yes
>  WRKSRC_SUBDIR=	contrib/notmuch-mutt
> @@ -22,14 +23,15 @@ OPTIONS_DEFINE=	EXAMPLES MANPAGES
>  OPTIONS_DEFAULT=	MANPAGES
>  OPTIONS_SUB=	yes
>  
> -do-install:
> -	${INSTALL_SCRIPT} ${WRKSRC}/notmuch-mutt ${STAGEDIR}${PREFIX}/bin
> +post-install-EXAMPLES-on:
> +	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
> +	@${MV} ${STAGEDIR}${LOCALBASE}/etc/Muttrc.d/notmuch-mutt.rc ${STAGEDIR}
> ${EXAMPLESDIR}/notmuch-mutt.rc
> +	@${RMDIR} ${STAGEDIR}${LOCALBASE}/etc/Muttrc.d
>  
> -do-install-EXAMPLES-on:
> -	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
> -	${INSTALL_DATA} ${WRKSRC}/notmuch-mutt.rc ${STAGEDIR}${EXAMPLESDIR}/
> notmuch-mutt.rc
> +post-install-EXAMPLES-off:
> +	@${RM} -r ${STAGEDIR}${LOCALBASE}/etc/Muttrc.d

This should be PREFIX not LOCALBASE. The build breaks with
PREFIX != LOCALBASE.

===>   Generating temporary packing list
[...]
mkdir -p /wrkdirs/usr/ports/mail/notmuch-mutt/work/stage/prefix/notmuch-mutt-0.28/etc/Muttrc.d
install -m 644 notmuch-mutt.rc /wrkdirs/usr/ports/mail/notmuch-mutt/work/stage/prefix/notmuch-mutt-0.28/etc/Muttrc.d/notmuch-mutt.rc
mv: rename /wrkdirs/usr/ports/mail/notmuch-mutt/work/stage/usr/local/etc/Muttrc.d/notmuch-mutt.rc to /wrkdirs/usr/ports/mail/notmuch-mutt/work/stage/prefix/notmuch-mutt-0.28/share/examples/notmuch/notmuch-mutt.rc: No such file or directory



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1541664869.3287869.1569754128.711E0713>