Date: Mon, 23 Sep 2013 16:40:48 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328020 - head/shells/zsh Message-ID: <201309231640.r8NGemqJ023702@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Mon Sep 23 16:40:47 2013 New Revision: 328020 URL: http://svnweb.freebsd.org/changeset/ports/328020 Log: Convert to stage, while here, cleanup a bit Modified: head/shells/zsh/Makefile head/shells/zsh/pkg-plist Modified: head/shells/zsh/Makefile ============================================================================== --- head/shells/zsh/Makefile Mon Sep 23 16:40:00 2013 (r328019) +++ head/shells/zsh/Makefile Mon Sep 23 16:40:47 2013 (r328020) @@ -45,22 +45,17 @@ MAILDIR_DESC= Enable support for Maildir PLIST_SUB+= ZSH_VER="${ZSH_VER}" -MAN1= zsh.1 zshbuiltins.1 zshcompctl.1 zshcompwid.1 zshcompsys.1 \ - zshcontrib.1 zshexpn.1 zshmisc.1 zshmodules.1 zshoptions.1 \ - zshparam.1 zshroadmap.1 zshtcpsys.1 zshzftpsys.1 zshzle.1 \ - zshall.1 zshcalsys.1 DOCS= LICENCE META-FAQ README Etc/BUGS Etc/CONTRIBUTORS Etc/FAQ \ Etc/completion-style-guide Doc/zsh*.html Doc/zsh.dvi PORTDOCS= * PORTEXAMPLES= zlogin zshenv zshrc -SHELLS= /etc/shells OPTIONS_SUB= yes DOCS_DISTFILES= ${DISTNAME}-doc${EXTRACT_SUFX}:doc -GDBM_LIB_DEPENDS= gdbm:${PORTSDIR}/databases/gdbm +GDBM_LIB_DEPENDS= libgdbm.so:${PORTSDIR}/databases/gdbm GDBM_CONFIGURE_ENABLE= gdbm -PCRE_LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre +PCRE_LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre PCRE_CONFIGURE_ENABLE= pcre MEM_CONFIGURE_ENABLE= zsh-mem SECURE_FREE_CONFIGURE_ENABLE= zsh-secure-free @@ -71,7 +66,6 @@ STATIC_CONFIGURE_OFF= --enable-dynamic DEBUG_CONFIGURE_ENABLE= zsh-debug MULTIBYTE_CONFIGURE_ENABLE= multibyte -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MSTATIC} @@ -80,6 +74,10 @@ PLIST_SUB+= SHARED="@comment " PLIST_SUB+= SHARED="" .endif +.if ${PORT_OPTIONS:MDOCS} +INFO= zsh +.endif + post-patch: @${REINPLACE_CMD} -e '/LIBS/s/-lrt//' ${WRKSRC}/configure @${SED} -i "" -e "s,link=dynamic,link=either," \ @@ -111,30 +109,22 @@ post-build: @${MKDIR} ${PREFIX}/info makeinfo --no-split --output=${WRKSRC}/Doc/zsh.info \ ${WRKSRC}/Doc/zsh.texi -INFO= zsh .endif post-install: - ${LN} -f ${PREFIX}/bin/zsh ${PREFIX}/bin/rzsh - ${TEST} -d ${ZSH_ETCDIR} || ${MKDIR} ${ZSH_ETCDIR} - ${TEST} -d ${ZSH_SITEFNDIR} || ${MKDIR} ${ZSH_SITEFNDIR} + ${LN} -f ${STAGEDIR}${PREFIX}/bin/zsh ${STAGEDIR}${PREFIX}/bin/rzsh .if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} - cd ${WRKSRC}/StartupFiles && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + cd ${WRKSRC}/StartupFiles && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR} .endif .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/Doc/zsh.info ${PREFIX}/info/zsh.info -.endif - @${ECHO_MSG} "Updating ${SHELLS}" - @${GREP} -v ${PREFIX}/bin/r?zsh ${SHELLS} > ${SHELLS}.new - @${ECHO_CMD} ${PREFIX}/bin/zsh >> ${SHELLS}.new - @${ECHO_CMD} ${PREFIX}/bin/rzsh >> ${SHELLS}.new - @${MV} ${SHELLS}.new ${SHELLS} - @${PREFIX}/bin/zsh -fc ' \ + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/Doc/zsh.info ${STAGEDIR}${PREFIX}/info/zsh.info +.endif + ${STAGEDIR}${PREFIX}/bin/zsh -fc ' \ setopt extendedglob nomark_dirs; \ - for i in ${DATADIR}/${ZSH_VER}/functions/**/*(/) ; do \ + for i in ${STAGEDIR}${DATADIR}/${ZSH_VER}/functions/**/*(/) ; do \ zcompile -U -M $$i.zwc $$i/*~*.zwc(^/) ; \ ${CHMOD} 644 $$i.zwc ; \ done' Modified: head/shells/zsh/pkg-plist ============================================================================== --- head/shells/zsh/pkg-plist Mon Sep 23 16:40:00 2013 (r328019) +++ head/shells/zsh/pkg-plist Mon Sep 23 16:40:47 2013 (r328020) @@ -980,6 +980,23 @@ bin/zsh-%%ZSH_VER%% %%DATADIR%%/%%ZSH_VER%%/functions/Zle/which-command %%DATADIR%%/%%ZSH_VER%%/functions/Zle/zed-set-file-name %%DATADIR%%/%%ZSH_VER%%/scripts/newuser +man/man1/zsh.1.gz +man/man1/zshall.1.gz +man/man1/zshbuiltins.1.gz +man/man1/zshcalsys.1.gz +man/man1/zshcompctl.1.gz +man/man1/zshcompsys.1.gz +man/man1/zshcompwid.1.gz +man/man1/zshcontrib.1.gz +man/man1/zshexpn.1.gz +man/man1/zshmisc.1.gz +man/man1/zshmodules.1.gz +man/man1/zshoptions.1.gz +man/man1/zshparam.1.gz +man/man1/zshroadmap.1.gz +man/man1/zshtcpsys.1.gz +man/man1/zshzftpsys.1.gz +man/man1/zshzle.1.gz @dirrm %%DATADIR%%/%%ZSH_VER%%/functions/Zle @dirrm %%DATADIR%%/%%ZSH_VER%%/functions/Zftp @dirrm %%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/Backends
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309231640.r8NGemqJ023702>