Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 29 Dec 2015 14:55:25 +0000 (UTC)
From:      Marius Strobl <marius@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r404747 - head/sysutils/cdrtools
Message-ID:  <201512291455.tBTEtPGG065603@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marius
Date: Tue Dec 29 14:55:24 2015
New Revision: 404747
URL: https://svnweb.freebsd.org/changeset/ports/404747

Log:
  Don't depend on gettext if libiconv is part of base and cdrtools is built
  without NLS support.

Modified:
  head/sysutils/cdrtools/Makefile

Modified: head/sysutils/cdrtools/Makefile
==============================================================================
--- head/sysutils/cdrtools/Makefile	Tue Dec 29 14:54:53 2015	(r404746)
+++ head/sysutils/cdrtools/Makefile	Tue Dec 29 14:55:24 2015	(r404747)
@@ -87,7 +87,10 @@ MAKE_ENV=	CCOM=cc GMAKE_NOWARN=true INS_
 CDRTLSTARGET=	${ARCH}-${OPSYS:tl}-cc
 CDRTLSXARCH!=	${UNAME} -m
 
-.if exists(/usr/include/iconv.h) || exists(${LOCALBASE}/lib/libiconv.a) || \
+.if exists(/usr/include/iconv.h)
+USES+=		iconv
+.endif
+.if exists(${LOCALBASE}/lib/libiconv.a) || \
 	exists(${LOCALBASE}/lib/libintl.a) || ${PORT_OPTIONS:MNLS}
 MAKE_ENV+=	DEFOSINCDIRS=${LOCALBASE}/include LDPATH=-L${LOCALBASE}/lib
 USES+=		gettext iconv



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512291455.tBTEtPGG065603>