From owner-svn-ports-all@FreeBSD.ORG  Wed Jun 18 08:37:31 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 42E0FDAA;
 Wed, 18 Jun 2014 08:37:31 +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 302E926F7;
 Wed, 18 Jun 2014 08:37:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5I8bVb9022051;
 Wed, 18 Jun 2014 08:37:31 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5I8bVuw022050;
 Wed, 18 Jun 2014 08:37:31 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201406180837.s5I8bVuw022050@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 18 Jun 2014 08:37:31 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r358233 - 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: Wed, 18 Jun 2014 08:37:31 -0000

Author: bapt
Date: Wed Jun 18 08:37:30 2014
New Revision: 358233
URL: http://svnweb.freebsd.org/changeset/ports/358233
QAT: https://qat.redports.org/buildarchive/r358233/

Log:
  Test ICONV_LIB instead of being dependant on an OSVERSION
  
  Submitted by:	tijl

Modified:
  head/shells/zsh/Makefile

Modified: head/shells/zsh/Makefile
==============================================================================
--- head/shells/zsh/Makefile	Wed Jun 18 08:35:53 2014	(r358232)
+++ head/shells/zsh/Makefile	Wed Jun 18 08:37:30 2014	(r358233)
@@ -64,9 +64,9 @@ STATIC_CONFIGURE_OFF=	--enable-dynamic
 DEBUG_CONFIGURE_ENABLE=	zsh-debug
 MULTIBYTE_CONFIGURE_ENABLE=	multibyte
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000000
+.if empty(ICONV_LIB)
 CONFIGURE_ENV+=	ac_cv_lib_iconv_libiconv=no
 .endif
 
@@ -129,6 +129,4 @@ post-install:
 regression-test:
 	@cd ${WRKSRC}; ${SETENV} -i ${MAKE} check
 
-
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>