svn commit: r357933 - head/shells/zsh

[Baptiste Daroussin]

Author: bapt
Date: Sun Jun 15 22:22:04 2014
New Revision: 357933
URL: http://svnweb.freebsd.org/changeset/ports/357933
QAT: https://qat.redports.org/buildarchive/r357933/

Log:
  Only pickup iconv from base even if libiconv is installed [1]
  While here do not leak stage path info zwc bytecode
  
  Reported & tested by:	dim [1]

Modified:
  head/shells/zsh/Makefile

Modified: head/shells/zsh/Makefile
==============================================================================
--- head/shells/zsh/Makefile	Sun Jun 15 22:13:02 2014	(r357932)
+++ head/shells/zsh/Makefile	Sun Jun 15 22:22:04 2014	(r357933)
@@ -66,6 +66,10 @@ MULTIBYTE_CONFIGURE_ENABLE=	multibyte
 
 .include <bsd.port.options.mk>
 
+.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000000
+CONFIGURE_ENV+=	ac_cv_lib_iconv_libiconv=no
+.endif
+
 .if ${PORT_OPTIONS:MDOCS}
 INFO=	zsh
 .endif
@@ -116,7 +120,8 @@ post-install:
 .endif
 	${STAGEDIR}${PREFIX}/bin/zsh -fc ' \
 		setopt extendedglob nomark_dirs; \
-		for i in ${STAGEDIR}${DATADIR}/${ZSH_VER}/functions/**/*(/) ; do \
+		cd ${STAGEDIR}/${DATADIR}/${ZSH_VER} ; \
+		for i in functions/**/*(/) ; do \
 			zcompile -U -M $$i.zwc $$i/*~*.zwc(^/) ; \
 			${CHMOD} 644 $$i.zwc ; \
 		done'