CVS commit: pkgsrc/archivers/xz

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Jan 12 11:35:28 UTC 2018

Modified Files:
        pkgsrc/archivers/xz: options.mk

Log Message:
xz: Only enable nls by default if msgfmt is builtin.

Avoids circular dependency issues as xz with nls depends on gettext-tools if
msgfmt comes from pkgsrc, which in turn depends on xz.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/archivers/xz/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/archivers/xz/options.mk
diff -u pkgsrc/archivers/xz/options.mk:1.4 pkgsrc/archivers/xz/options.mk:1.5
--- pkgsrc/archivers/xz/options.mk:1.4  Wed Sep 20 12:05:46 2017
+++ pkgsrc/archivers/xz/options.mk      Fri Jan 12 11:35:28 2018
@@ -1,8 +1,14 @@
-# $NetBSD: options.mk,v 1.4 2017/09/20 12:05:46 jperkin Exp $
+# $NetBSD: options.mk,v 1.5 2018/01/12 11:35:28 jperkin Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.xz
 PKG_SUPPORTED_OPTIONS= nls
+
+# Only add nls as a default option if msgfmt is builtin, otherwise there
+# are circular dependency issues with xz -> gettext-tools -> xz.
+.include "../../mk/bsd.prefs.mk"
+.if exists(${TOOLS_PLATFORM.msgfmt})
 PKG_SUGGESTED_OPTIONS= nls
+.endif
 
 .include "../../mk/bsd.options.mk"
 
@@ -10,6 +16,7 @@ PLIST_VARS+=          nls
 
 .if !empty(PKG_OPTIONS:Mnls)
 USE_PKGLOCALEDIR=      yes
+USE_TOOLS+=            msgfmt
 PLIST.nls=             yes
 CONFIGURE_ARGS+=       --enable-nls
 .include "../../devel/gettext-lib/buildlink3.mk"