From owner-svn-ports-all@FreeBSD.ORG  Sun Jun 15 22:22:04 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E5067774;
 Sun, 15 Jun 2014 22:22:04 +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 D25F728AE;
 Sun, 15 Jun 2014 22:22:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5FMM41b091986;
 Sun, 15 Jun 2014 22:22:04 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5FMM4PI091985;
 Sun, 15 Jun 2014 22:22:04 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201406152222.s5FMM4PI091985@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 15 Jun 2014 22:22:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r357933 - 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
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Jun 2014 22:22:05 -0000

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'