[pkgsrc/trunk]: pkgsrc/shells Add {BA,Z}SH_STATIC to BUILD_DEFS.

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/98622f5f7fda
branches:  trunk
changeset: 477903:98622f5f7fda
user:      salo <salo%pkgsrc.org@localhost>
date:      Sun Jul 11 01:23:29 2004 +0000

description:
Add {BA,Z}SH_STATIC to BUILD_DEFS.
Addresses request on tech-pkg@ by Georg Schwarz.

diffstat:

 shells/bash2/Makefile      |   8 ++++----
 shells/zsh/Makefile.common |   6 ++++--
 shells/zsh3/Makefile       |  12 ++++++++----
 3 files changed, 16 insertions(+), 10 deletions(-)

diffs (74 lines):

diff -r 326d647a7e9b -r 98622f5f7fda shells/bash2/Makefile
--- a/shells/bash2/Makefile     Sun Jul 11 00:55:19 2004 +0000
+++ b/shells/bash2/Makefile     Sun Jul 11 01:23:29 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2004/06/22 14:05:39 minskim Exp $
+# $NetBSD: Makefile,v 1.54 2004/07/11 01:23:29 salo Exp $
 #
 
 DISTNAME=      bash-2.05b
@@ -30,10 +30,10 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(BASH_STATIC)
-.  if !empty(BASH_STATIC:M[yY][eE][sS])
+BUILD_DEFS+=   BASH_STATIC
+
+.if defined(BASH_STATIC) && !empty(BASH_STATIC:M[yY][eE][sS])
 CONFIGURE_ARGS+=       --enable-static-link
-.  endif
 .endif
 
 post-install:
diff -r 326d647a7e9b -r 98622f5f7fda shells/zsh/Makefile.common
--- a/shells/zsh/Makefile.common        Sun Jul 11 00:55:19 2004 +0000
+++ b/shells/zsh/Makefile.common        Sun Jul 11 01:23:29 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2004/05/06 22:29:36 cube Exp $
+# $NetBSD: Makefile.common,v 1.12 2004/07/11 01:23:29 salo Exp $
 
 DISTNAME=       zsh-${ZSH_VERSION}
 PKGREVISION=   1
@@ -26,7 +26,9 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(ZSH_STATIC)
+BUILD_DEFS+=   ZSH_STATIC
+
+.if defined(ZSH_STATIC) && !empty(ZSH_STATIC:M[Yy][Ee][Ss])
 CONFIGURE_ARGS+=--disable-dynamic
 LDFLAGS+=      -static
 .else
diff -r 326d647a7e9b -r 98622f5f7fda shells/zsh3/Makefile
--- a/shells/zsh3/Makefile      Sun Jul 11 00:55:19 2004 +0000
+++ b/shells/zsh3/Makefile      Sun Jul 11 01:23:29 2004 +0000
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile,v 1.11 2004/04/18 04:36:42 snj Exp $
+# $NetBSD: Makefile,v 1.12 2004/07/11 01:23:29 salo Exp $
+#
 
 DISTNAME=       zsh-3.0.8
 CATEGORIES=    shells
@@ -13,14 +14,17 @@
 COMMENT=       The Z shell
 
 GNU_CONFIGURE= yes
+USE_BUILDLINK3=        YES
 USE_MAKEINFO=  YES
+USE_PKGINSTALL=        YES
+
 INFO_FILES=    zsh.info
-USE_BUILDLINK3=                YES
-USE_PKGINSTALL=                YES
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(ZSH_STATIC)
+BUILD_DEFS+=   ZSH_STATIC
+
+.if defined(ZSH_STATIC) && !empty(ZSH_STATIC:M[Yy][Ee][Ss])
 LDFLAGS+=      -static
 .endif