From owner-svn-ports-all@FreeBSD.ORG Fri Jun 14 14:27:12 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 1C708F7E; Fri, 14 Jun 2013 14:27:12 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E953F1234; Fri, 14 Jun 2013 14:27:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5EERBhw047909; Fri, 14 Jun 2013 14:27:11 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5EERBtJ047908; Fri, 14 Jun 2013 14:27:11 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201306141427.r5EERBtJ047908@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 14 Jun 2013 14:27:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r320930 - head/shells/zsh X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Jun 2013 14:27:12 -0000 Author: bapt Date: Fri Jun 14 14:27:11 2013 New Revision: 320930 URL: http://svnweb.freebsd.org/changeset/ports/320930 Log: Use new helpers Modified: head/shells/zsh/Makefile Modified: head/shells/zsh/Makefile ============================================================================== --- head/shells/zsh/Makefile Fri Jun 14 14:27:03 2013 (r320929) +++ head/shells/zsh/Makefile Fri Jun 14 14:27:11 2013 (r320930) @@ -54,62 +54,30 @@ PORTDOCS= * PORTEXAMPLES= zlogin zshenv zshrc SHELLS= /etc/shells -.include - -.if ${PORT_OPTIONS:MDOCS} -DISTFILES+= ${DISTNAME}-doc${EXTRACT_SUFX}:doc -.endif +OPTIONS_SUB= yes -.if ${PORT_OPTIONS:MGDBM} -LIB_DEPENDS+= gdbm.4:${PORTSDIR}/databases/gdbm -PLIST_SUB+= GDBM="" -.else -CONFIGURE_ARGS+= --disable-gdbm -PLIST_SUB+= GDBM="@comment " -.endif - -.if ${PORT_OPTIONS:MPCRE} -CONFIGURE_ARGS+= --enable-pcre -LIB_DEPENDS+= pcre.3:${PORTSDIR}/devel/pcre -PLIST_SUB+= PCRE="" -.else -CONFIGURE_ARGS+= --disable-pcre -PLIST_SUB+= PCRE="@comment " -.endif - -.if ${PORT_OPTIONS:MMEM} -CONFIGURE_ARGS+= --enable-zsh-mem -.endif +DOCS_DISTFILES= ${DISTNAME}-doc${EXTRACT_SUFX}:doc +GDBM_LIB_DEPENDS= gdbm:${PORTSDIR}/databases/gdbm +GDBM_CONFIGURE_ENABLE= gdbm +PCRE_LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre +PCRE_CONFIGURE_ENABLE= pcre +MEM_CONFIGURE_ENABLE= zsh-mem +SECURE_FREE_CONFIGURE_ENABLE= zsh-secure-free +MAILDIR_CONFIGURE_ENABLE= maildit-support +STATIC_LDFLAGS= -static +STATIC_CONFIGURE_ON= --disable-dynamic +STATIC_CONFIGURE_OFF= --disable-dynamic +DEBUG_CONFIGURE_ENABLE= zsh-debug +MULTIBYTE_CONFIGURE_ENABLE= multibyte -.if ${PORT_OPTIONS:MSECURE_FREE} -CONFIGURE_ARGS+= --enable-zsh-secure-free -.endif - -.if ${PORT_OPTIONS:MMAILDIR} -CONFIGURE_ARGS+= --enable-maildir-support -.endif +.include .if ${PORT_OPTIONS:MSTATIC} -LDFLAGS+= -static -CONFIGURE_ARGS+= --disable-dynamic PLIST_SUB+= SHARED="@comment " .else -CONFIGURE_ARGS+= --enable-dynamic PLIST_SUB+= SHARED="" .endif -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+= --enable-zsh-debug -.else -CONFIGURE_ARGS+= --disable-zsh-debug -.endif - -.if ${PORT_OPTIONS:MMULTIBYTE} -CONFIGURE_ARGS+= --enable-multibyte -.else -CONFIGURE_ARGS+= --disable-multibyte -.endif - post-patch: @${REINPLACE_CMD} -e '/LIBS/s/-lrt//' ${WRKSRC}/configure @${SED} -i "" -e "s,link=dynamic,link=either," \