pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/shells/zsh Convert ZSH_STATIC to PKG_OPTIONS.zsh=static.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/17f796309842
branches:  trunk
changeset: 652568:17f796309842
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Thu Jun 04 15:08:14 2015 +0000

description:
Convert ZSH_STATIC to PKG_OPTIONS.zsh=static.

diffstat:

 shells/zsh/Makefile.common |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (43 lines):

diff -r 966987febd20 -r 17f796309842 shells/zsh/Makefile.common
--- a/shells/zsh/Makefile.common        Thu Jun 04 14:45:28 2015 +0000
+++ b/shells/zsh/Makefile.common        Thu Jun 04 15:08:14 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.74 2015/02/02 13:54:59 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.75 2015/06/04 15:08:14 ryoon Exp $
 # used by shells/zsh/Makefile
 # used by shells/zsh-current/Makefile
 
@@ -16,7 +16,7 @@
 CONFIGURE_ARGS+=       --enable-etcdir=${PKG_SYSCONFDIR:Q}
 
 USE_LANGUAGES=         c c99
-USE_TOOLS+=            makeinfo
+USE_TOOLS+=            awk makeinfo
 INFO_FILES=            yes
 TEXINFO_REQD=          4.0
 
@@ -40,10 +40,11 @@
 PLIST.xattr=   yes
 .endif
 
-# Handle any PKG_OPTIONS that this package might have.
-.sinclude "options.mk"
+PKG_OPTIONS_VAR=               PKG_OPTIONS.zsh
+PKG_SUPPORTED_OPTIONS=         static
 
-BUILD_DEFS+=   ZSH_STATIC
+.include "../../mk/bsd.options.mk"
+
 MAKE_JOBS_SAFE=        no
 INSTALL_TARGET=        install install.info
 PKG_SHELL=     bin/zsh
@@ -107,8 +108,7 @@
 
 # XXXUEBAYASI old make(1) has problems to handle :?true_str:false_str
 #_ZSH_LINKAGE= ${ZSH_STATIC:M[Yy][Ee][Ss]:?static:dynamic}     # static / dynamic
-ZSH_STATIC?=   no
-.if !empty(ZSH_STATIC:M[Yy][Ee][Ss])
+.if !empty(PKG_OPTIONS:Mstatic)
 _ZSH_LINKAGE=  static
 .else
 _ZSH_LINKAGE=  dynamic



Home | Main Index | Thread Index | Old Index