svn commit: r404747 - head/sysutils/cdrtools

Marius Strobl marius at FreeBSD.org
Tue Dec 29 14:55:26 UTC 2015


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


More information about the svn-ports-head mailing list