svn commit: r358233 - head/shells/zsh

[Baptiste Daroussin]

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>