From 39b78b5308a55952076c1ecdcf4c76323f71fd91 Mon Sep 17 00:00:00 2001 From: bjs Date: Wed, 7 Nov 2007 09:59:27 +0000 Subject: Add support for pcre to options.mk if ZSH_STATIC is undefined. Bump rev. --- shells/zsh-current/Makefile | 4 +++- shells/zsh-current/options.mk | 13 ++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) (limited to 'shells') diff --git a/shells/zsh-current/Makefile b/shells/zsh-current/Makefile index 9c8c07dfa26..9a7b1529286 100644 --- a/shells/zsh-current/Makefile +++ b/shells/zsh-current/Makefile @@ -1,7 +1,9 @@ -# $NetBSD: Makefile,v 1.12 2007/10/01 04:16:07 uebayasi Exp $ +# $NetBSD: Makefile,v 1.13 2007/11/07 09:59:27 bjs Exp $ .include "../../shells/zsh/Makefile.common" +PKGREVISION= 1 + ZSH_VERSION= 4.3.4 ZSH_MAINTAINER= uebayasi@NetBSD.org diff --git a/shells/zsh-current/options.mk b/shells/zsh-current/options.mk index db8222a85e9..9aedd214664 100644 --- a/shells/zsh-current/options.mk +++ b/shells/zsh-current/options.mk @@ -1,11 +1,22 @@ -# $NetBSD: options.mk,v 1.1 2006/03/11 13:20:15 uebayasi Exp $ +# $NetBSD: options.mk,v 1.2 2007/11/07 09:59:27 bjs Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.zsh PKG_SUPPORTED_OPTIONS= zsh-multibyte PKG_SUGGESTED_OPTIONS= +.if !defined(ZSH_STATIC) +PKG_SUPPORTED_OPTIONS+= pcre +.endif + .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mzsh-multibyte) CONFIGURE_ARGS+= --enable-multibyte .endif + +.if !empty(PKG_OPTIONS:Mpcre) +PCRE_CONFIG= ${BUILDLINK_PREFIX.pcre}/bin/pcre-config +CONFIGURE_ARGS+= --with-pcre +CONFIGURE_ENV+= PCRE_CONFIG=${PCRE_CONFIG:Q} +. include "../../devel/pcre/buildlink3.mk" +.endif -- cgit v1.2.3