Date: Tue, 15 Dec 2015 04:02:17 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r403755 - head/shells/zsh Message-ID: <201512150402.tBF42Hjc076870@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Tue Dec 15 04:02:17 2015 New Revision: 403755 URL: https://svnweb.freebsd.org/changeset/ports/403755 Log: Fix static build against devel/ncurses by correcting how zsh tries to link against the terminal libraries. No PORTREVISION bump as this shouldn't really change the generated packages. PR: 181720 Submitted by: wulf@mail.mipt.ru While here, fix a spacing nit and wrap compound commands in parens. Modified: head/shells/zsh/Makefile Modified: head/shells/zsh/Makefile ============================================================================== --- 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= test CPPFLAGS+= -I${LOCALBASE}/include -DBOOL_DEFINED LDFLAGS+= -L${LOCALBASE}/lib -Wl,--as-needed CONFIGURE_ENV+= zsh_cv_sys_path_dev_fd=no -CONFIGURE_ARGS= --with-term-lib="ncursesw ncurses" --with-tcsetpgrp \ +CONFIGURE_ARGS= --with-term-lib="tinfow tinfo" --with-tcsetpgrp \ --enable-function-subdirs --enable-multibyte \ --sysconfdir=${PREFIX}/etc @@ -51,7 +51,7 @@ EXTRA_PATCHES= ${FILESDIR}/extra-patch-b OPTIONS_DEFINE= GDBM MEM SECURE_FREE MAILDIR PCRE STATIC DOCS DEBUG \ EXAMPLES -OPTIONS_DEFAULT= SECURE_FREE MAILDIR +OPTIONS_DEFAULT=SECURE_FREE MAILDIR GDBM_DESC= Enable GDBM support (GPL) MEM_DESC= 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) 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') post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - cd ${WRKSRC}/StartupFiles && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR} + (cd ${WRKSRC}/StartupFiles && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}) post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}) regression-test: - @cd ${WRKSRC}; ${SETENV} -i ${MAKE} check + @(cd ${WRKSRC}; ${SETENV} -i ${MAKE} check) .include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512150402.tBF42Hjc076870>