Date: Tue, 15 Dec 2015 08:40:34 +0100 From: Baptiste Daroussin <bapt@FreeBSD.org> To: Adam Weinberger <adamw@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r403755 - head/shells/zsh Message-ID: <20151215074034.GC80650@ivaldir.etoilebsd.net> In-Reply-To: <201512150402.tBF42Hjc076870@repo.freebsd.org> References: <201512150402.tBF42Hjc076870@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--JWEK1jqKZ6MHAcjA Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Dec 15, 2015 at 04:02:17AM +0000, Adam Weinberger wrote: > Author: adamw > Date: Tue Dec 15 04:02:17 2015 > New Revision: 403755 > URL: https://svnweb.freebsd.org/changeset/ports/403755 >=20 > Log: > Fix static build against devel/ncurses by correcting how zsh tries to l= ink > against the terminal libraries. No PORTREVISION bump as this shouldn't = really > change the generated packages. > =20 > PR: 181720 > Submitted by: wulf@mail.mipt.ru > =20 > While here, fix a spacing nit and wrap compound commands in parens. >=20 > Modified: > head/shells/zsh/Makefile >=20 > Modified: head/shells/zsh/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/shells/zsh/Makefile Tue Dec 15 03:34:36 2015 (r403754) > +++ head/shells/zsh/Makefile Tue Dec 15 04:02:17 2015 (r403755) > @@ -41,7 +41,7 @@ TEST_TARGET=3D test > CPPFLAGS+=3D -I${LOCALBASE}/include -DBOOL_DEFINED > LDFLAGS+=3D -L${LOCALBASE}/lib -Wl,--as-needed > CONFIGURE_ENV+=3D zsh_cv_sys_path_dev_fd=3Dno > -CONFIGURE_ARGS=3D --with-term-lib=3D"ncursesw ncurses" --with-tcsetpgrp \ > +CONFIGURE_ARGS=3D --with-term-lib=3D"tinfow tinfo" --with-tcsetpgrp \ > --enable-function-subdirs --enable-multibyte \ > --sysconfdir=3D${PREFIX}/etc > =20 > @@ -51,7 +51,7 @@ EXTRA_PATCHES=3D ${FILESDIR}/extra-patch-b > =20 > OPTIONS_DEFINE=3D GDBM MEM SECURE_FREE MAILDIR PCRE STATIC DOCS DEBUG \ > EXAMPLES > -OPTIONS_DEFAULT=3D SECURE_FREE MAILDIR > +OPTIONS_DEFAULT=3DSECURE_FREE MAILDIR > =20 > GDBM_DESC=3D Enable GDBM support (GPL) > MEM_DESC=3D Enable zsh-mem options > @@ -112,28 +112,28 @@ post-build: > # Fix ".so" macro problem by using "soelim" command. > ${LN} -sf ${WRKSRC}/Doc ${WRKSRC}/man1 > ${MV} ${WRKSRC}/Doc/zshall.1 ${WRKSRC}/Doc/zshall.1.source > - cd ${WRKSRC} && ${SOELIM} -r ${WRKSRC}/Doc/zshall.1.source > \ > - ${WRKSRC}/Doc/zshall.1 > + (cd ${WRKSRC} && ${SOELIM} -r ${WRKSRC}/Doc/zshall.1.source > \ > + ${WRKSRC}/Doc/zshall.1) > =20 > post-install: > ${LN} -f ${STAGEDIR}${PREFIX}/bin/zsh ${STAGEDIR}${PREFIX}/bin/rzsh > - ${STAGEDIR}${PREFIX}/bin/zsh -fc ' \ > + (${STAGEDIR}${PREFIX}/bin/zsh -fc ' \ > setopt extendedglob nomark_dirs; \ > cd ${STAGEDIR}/${DATADIR}/${ZSH_VER} ; \ > for i in functions/**/*(/) ; do \ > zcompile -U -M $$i.zwc $$i/*~*.zwc(^/) ; \ > ${CHMOD} 644 $$i.zwc ; \ > - done' > + done') > =20 > post-install-EXAMPLES-on: > @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} > - cd ${WRKSRC}/StartupFiles && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR= }${EXAMPLESDIR} > + (cd ${WRKSRC}/StartupFiles && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDI= R}${EXAMPLESDIR}) > =20 > post-install-DOCS-on: > @${MKDIR} ${STAGEDIR}${DOCSDIR} > - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} > + (cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}) > =20 > regression-test: > - @cd ${WRKSRC}; ${SETENV} -i ${MAKE} check > + @(cd ${WRKSRC}; ${SETENV} -i ${MAKE} check) Note that this target is now useless, I forgot to remove it after having integrated to the ports test framework Bapt --JWEK1jqKZ6MHAcjA Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWb8PyAAoJEGOJi9zxtz5a0uQP/1sjdiHbZPcp3U3P0famZZaE hVtKVfH33EhSfn8DB0EC8t8N9ZstSewBa6tib/ErT+81++Fb5GWy4svvTDe4iVWT puNlkQjVN9d23Hz1XtkyrIJRC5H6bniMInRXz+oVR4UL1tqFMCf+7DopohlGUv8v CI//GTTAabcz4enLLXWIY9UyCZ3iSe60MmYEUrpMWBcklL7hNmpAPmSgGssknhJz z2bCNhBqOFGSpjxw0tVIv8IABzlS68jMDeCDdWRTxmP/lhl5sC1NYX2GHvVy3a+E McV6x3kz6PYJ7z9sHS80C0o5iM554xVaaU5OmEFil97VoMsQq8UExO49MKr32/MJ gBPdes76VWEuxifyK8qDlIYFD2CFc5gwnHaJIplDzhcQw9F2v9/5XkV7oE8TLwnF /7Sx/b5RWYqaQbUowR42iAP5EoHILofrI+vYUjrEoHeY5XR2OpGhTwCLhcbSHbyJ OJ8Uk0ooYsyYZC19jSe0gg68PZmbvLKFHBjCYGqh3jlsU5qKvZIxMObkHw4K29Z5 drBgtNnsCfDWnjbIlmXRtE4FN1vzDGo/x1sW75w+Gs96uXsZK0QhVdE+H9pyIUXf 249c57BwKbmE/SonMtynNoHTuZYPo7lMsbap5O6hUjGnggqTL1y5W+fYUrBrnGbP g1smf6bCJmkukPBiKsLW =6wnU -----END PGP SIGNATURE----- --JWEK1jqKZ6MHAcjA--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20151215074034.GC80650>