diff options
| author | adamw <adamw@FreeBSD.org> | 2015-12-15 12:02:17 +0800 |
|---|---|---|
| committer | adamw <adamw@FreeBSD.org> | 2015-12-15 12:02:17 +0800 |
| commit | f74f6cccfd6856e51257079c8f3b35cafae79150 (patch) | |
| tree | 4705996cc8fbae7bb7170268e5fbd8f7354181e7 /shells | |
| parent | adbce31fdbb45d7e6f5efbdeabe88dc1ea0b6bdb (diff) | |
| download | freebsd-ports-gnome-f74f6cccfd6856e51257079c8f3b35cafae79150.tar.gz freebsd-ports-gnome-f74f6cccfd6856e51257079c8f3b35cafae79150.tar.zst freebsd-ports-gnome-f74f6cccfd6856e51257079c8f3b35cafae79150.zip | |
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.
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/zsh/Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile index 85e3c8dd52fb..bebc9657da26 100644 --- a/shells/zsh/Makefile +++ b/shells/zsh/Makefile @@ -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-bsdtar 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> |