diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-03-25 23:49:36 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-03-25 23:49:36 +0000 |
| commit | 2241654c185e68c779f116506f10ed1832feb79e (patch) | |
| tree | 75db7f6ccbf25da3030f518f983488e4c70b2448 /shells | |
| parent | Fix build with recent opensslv.h. (diff) | |
Stop installing info files, the manpages already covers the full documentation
Add --as-needed to LDFLAGS to avoid overlinking with some options
Notes
Notes:
svn path=/head/; revision=382277
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/zsh/Makefile | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile index 10ffcaad30d8..b454df7ddb68 100644 --- a/shells/zsh/Makefile +++ b/shells/zsh/Makefile @@ -3,7 +3,7 @@ PORTNAME= zsh PORTVERSION= 5.0.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= shells MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \ SF/${PORTNAME}/${PORTNAME}-doc/${PORTVERSION}:doc @@ -25,7 +25,7 @@ USES= iconv ncurses tar:bzip2 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -DBOOL_DEFINED -LDFLAGS+= -L${LOCALBASE}/lib +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 \ --enable-function-subdirs --enable-multibyte \ @@ -65,7 +65,6 @@ STATIC_LDFLAGS= -static STATIC_CONFIGURE_ON= --disable-dynamic STATIC_CONFIGURE_OFF= --enable-dynamic DEBUG_CONFIGURE_ENABLE= zsh-debug -DOCS_USES= makeinfo .include <bsd.port.pre.mk> @@ -73,10 +72,6 @@ DOCS_USES= makeinfo CONFIGURE_ENV+= ac_cv_lib_iconv_libiconv=no .endif -.if ${PORT_OPTIONS:MDOCS} -INFO= zsh -.endif - post-patch: @${REINPLACE_CMD} -e '/LIBS/s/-lrt//' ${WRKSRC}/configure @${SED} -i "" -e "s,link=dynamic,link=either," \ @@ -104,11 +99,6 @@ post-build: ${MV} ${WRKSRC}/Doc/zshall.1 ${WRKSRC}/Doc/zshall.1.source cd ${WRKSRC} && ${SOELIM} -r ${WRKSRC}/Doc/zshall.1.source > \ ${WRKSRC}/Doc/zshall.1 -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${PREFIX}/info - makeinfo --no-split --output=${WRKSRC}/Doc/zsh.info \ - ${WRKSRC}/Doc/zsh.texi -.endif post-install: ${LN} -f ${STAGEDIR}${PREFIX}/bin/zsh ${STAGEDIR}${PREFIX}/bin/rzsh @@ -119,7 +109,6 @@ post-install: .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/Doc/zsh.info ${STAGEDIR}${PREFIX}/info/zsh.info .endif ${STAGEDIR}${PREFIX}/bin/zsh -fc ' \ setopt extendedglob nomark_dirs; \ |