From owner-svn-ports-all@FreeBSD.ORG Mon Sep 2 16:38:57 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 0D746892; Mon, 2 Sep 2013 16:38:57 +0000 (UTC) (envelope-from bsam@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EDF542077; Mon, 2 Sep 2013 16:38:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r82GcurX080765; Mon, 2 Sep 2013 16:38:56 GMT (envelope-from bsam@svn.freebsd.org) Received: (from bsam@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r82Gcu5K080764; Mon, 2 Sep 2013 16:38:56 GMT (envelope-from bsam@svn.freebsd.org) Message-Id: <201309021638.r82Gcu5K080764@svn.freebsd.org> From: Boris Samorodov Date: Mon, 2 Sep 2013 16:38:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r326029 - head/sysutils/jfbterm 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.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Sep 2013 16:38:57 -0000 Author: bsam Date: Mon Sep 2 16:38:56 2013 New Revision: 326029 URL: http://svnweb.freebsd.org/changeset/ports/326029 Log: Just use USES+=iconv (delete non-functional if-then-else code). Modified: head/sysutils/jfbterm/Makefile Modified: head/sysutils/jfbterm/Makefile ============================================================================== --- head/sysutils/jfbterm/Makefile Mon Sep 2 16:34:22 2013 (r326028) +++ head/sysutils/jfbterm/Makefile Mon Sep 2 16:38:56 2013 (r326029) @@ -54,20 +54,10 @@ MAN1= ${PORTNAME}.1 MAN5= ${PORTNAME}.conf.5 .endif -.if !${PORT_OPTIONS:MICONV} -MAKE_ENV+= WITHOUT_ICONV= -.endif - -.if !exists(/usr/include/iconv.h) -. if ${PORT_OPTIONS:MICONV} -. if !defined(NO_SHARED) +.if ${PORT_OPTIONS:MICONV} USES+= iconv -. else -BUILD_DEPENDS+= ${LOCALBASE}/lib/libiconv.a:${PORTSDIR}/converters/libiconv -. endif -. else -BUILD_DEPENDS+= ${LOCALBASE}/include/iconv.h:${PORTSDIR}/converters/libiconv -. endif +.else +MAKE_ENV+= WITHOUT_ICONV= .endif .if ${PORT_OPTIONS:MPNG}