From owner-svn-ports-all@FreeBSD.ORG Wed Mar 25 23:49:37 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 91254E7C; Wed, 25 Mar 2015 23:49:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6191B686; Wed, 25 Mar 2015 23:49:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2PNnbBn082501; Wed, 25 Mar 2015 23:49:37 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2PNnbE4082499; Wed, 25 Mar 2015 23:49:37 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201503252349.t2PNnbE4082499@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Wed, 25 Mar 2015 23:49:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382277 - head/shells/zsh X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Mar 2015 23:49:37 -0000 Author: bapt Date: Wed Mar 25 23:49:36 2015 New Revision: 382277 URL: https://svnweb.freebsd.org/changeset/ports/382277 QAT: https://qat.redports.org/buildarchive/r382277/ Log: Stop installing info files, the manpages already covers the full documentation Add --as-needed to LDFLAGS to avoid overlinking with some options Modified: head/shells/zsh/Makefile Modified: head/shells/zsh/Makefile ============================================================================== --- head/shells/zsh/Makefile Wed Mar 25 23:36:27 2015 (r382276) +++ head/shells/zsh/Makefile Wed Mar 25 23:49:36 2015 (r382277) @@ -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 @@ -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; \