Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 25 Mar 2015 23:49:37 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r382277 - head/shells/zsh
Message-ID:  <201503252349.t2PNnbE4082499@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <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; \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503252349.t2PNnbE4082499>