Index: head/shells/zsh/Makefile =================================================================== --- head/shells/zsh/Makefile (revision 388380) +++ head/shells/zsh/Makefile (revision 388381) @@ -1,124 +1,125 @@ # Created by: torstenb # $FreeBSD$ PORTNAME= zsh -PORTVERSION= 5.0.7 -PORTREVISION= 4 +PORTVERSION= 5.0.8 CATEGORIES= shells -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \ +MASTER_SITES= http://www.zsh.org/pub/ \ + http://www.zsh.org/pub/:doc \ + SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \ SF/${PORTNAME}/${PORTNAME}-doc/${PORTVERSION}:doc DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= bapt@FreeBSD.org COMMENT= The Z shell LICENSE= ZSH LICENSE_NAME= ZSH license LICENSE_FILE= ${WRKSRC}/LICENCE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept MAKE_JOBS_UNSAFE= yes ZSH_VER= ${PORTVERSION} USES= iconv ncurses tar:bzip2 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -DBOOL_DEFINED LDFLAGS+= -L${LOCALBASE}/lib -Wl,--as-needed CONFIGURE_ENV+= zsh_cv_sys_path_dev_fd=no CONFIGURE_ARGS= --with-term-lib="ncursesw ncurses" --with-tcsetpgrp \ --enable-function-subdirs --enable-multibyte \ --sysconfdir=${PREFIX}/etc EXTRA_PATCHES= ${FILESDIR}/extra-patch-bsdtar #EXTRA_COMPLETION_FILES= _sockstat #EXTRA_COMPLETION_DIR= Completion/BSD/Command OPTIONS_DEFINE= GDBM MEM SECURE_FREE MAILDIR PCRE STATIC DOCS DEBUG \ EXAMPLES OPTIONS_DEFAULT= SECURE_FREE MAILDIR GDBM_DESC= Enable GDBM support (GPL) MEM_DESC= Enable zsh-mem options SECURE_FREE_DESC= Enable zsh-secure-free MAILDIR_DESC= Enable support for Maildirs in MAIL(PATH) PLIST_SUB+= ZSH_VER="${ZSH_VER}" 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 OPTIONS_SUB= yes DOCS_DISTFILES= ${DISTNAME}-doc${EXTRACT_SUFX}:doc GDBM_LIB_DEPENDS= libgdbm.so:${PORTSDIR}/databases/gdbm GDBM_CONFIGURE_ENABLE= gdbm PCRE_LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre PCRE_CONFIGURE_ENABLE= pcre MEM_CONFIGURE_ENABLE= zsh-mem SECURE_FREE_CONFIGURE_ENABLE= zsh-secure-free MAILDIR_CONFIGURE_ENABLE= maildir-support STATIC_LDFLAGS= -static STATIC_CONFIGURE_ON= --disable-dynamic STATIC_CONFIGURE_OFF= --enable-dynamic DEBUG_CONFIGURE_ENABLE= zsh-debug .include .if empty(ICONV_LIB) CONFIGURE_ENV+= ac_cv_lib_iconv_libiconv=no .endif post-patch: @${REINPLACE_CMD} -e '/LIBS/s/-lrt//' ${WRKSRC}/configure @${SED} -i "" -e "s,link=dynamic,link=either," \ ${WRKSRC}/Src/Modules/*.mdd @${SED} -i "" -e "s,/etc/,${LOCALBASE}/etc/," \ ${WRKSRC}/Functions/MIME/zsh-mime-setup .ifdef EXTRA_COMPLETION_FILES @${ECHO} "===> Installing extra completion files" .for COMPFILE in ${EXTRA_COMPLETION_FILES} @(if [ -f ${WRKSRC}/${EXTRA_COMPLETION_DIR}/${COMPFILE} ] ; then \ ${ECHO} "${EXTRA_COMPLETION_DIR}/${COMPFILE} already exists" ; \ exit 1 ; \ else \ ${ECHO} ${EXTRA_COMPLETION_DIR}/${COMPFILE} ; \ ${CP} ${FILESDIR}/${COMPFILE} \ ${WRKSRC}/${EXTRA_COMPLETION_DIR}/${COMPFILE} ; \ fi) .endfor .endif @${FIND} ${WRKSRC}/Completion -type f -iname '*.orig' -delete post-build: # Fix ".so" macro problem by using "soelim" command. ${LN} -sf ${WRKSRC}/Doc ${WRKSRC}/man1 ${MV} ${WRKSRC}/Doc/zshall.1 ${WRKSRC}/Doc/zshall.1.source cd ${WRKSRC} && ${SOELIM} -r ${WRKSRC}/Doc/zshall.1.source > \ ${WRKSRC}/Doc/zshall.1 post-install: ${LN} -f ${STAGEDIR}${PREFIX}/bin/zsh ${STAGEDIR}${PREFIX}/bin/rzsh .if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/StartupFiles && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR} .endif .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} .endif ${STAGEDIR}${PREFIX}/bin/zsh -fc ' \ setopt extendedglob nomark_dirs; \ cd ${STAGEDIR}/${DATADIR}/${ZSH_VER} ; \ for i in functions/**/*(/) ; do \ zcompile -U -M $$i.zwc $$i/*~*.zwc(^/) ; \ ${CHMOD} 644 $$i.zwc ; \ done' regression-test: @cd ${WRKSRC}; ${SETENV} -i ${MAKE} check .include Index: head/shells/zsh/distinfo =================================================================== --- head/shells/zsh/distinfo (revision 388380) +++ head/shells/zsh/distinfo (revision 388381) @@ -1,4 +1,4 @@ -SHA256 (zsh-5.0.7.tar.bz2) = 544e27de81740286b916d1d77c9f48ad7c26ad7943ed96d278abee67cf6704b3 -SIZE (zsh-5.0.7.tar.bz2) = 3181030 -SHA256 (zsh-5.0.7-doc.tar.bz2) = 43e8665ba9d9eca8370c64e2d4846e84f9111c628e5792f2aa639a7fb209fcf1 -SIZE (zsh-5.0.7-doc.tar.bz2) = 3005587 +SHA256 (zsh-5.0.8.tar.bz2) = 8079cf08cb8beff22f84b56bd72bb6e6962ff4718d816f3d83a633b4c9e17d23 +SIZE (zsh-5.0.8.tar.bz2) = 3250542 +SHA256 (zsh-5.0.8-doc.tar.bz2) = 0ee5088c47fa5ceac6e087c7e00f2ede3f5920a03d32220772342ce980339e40 +SIZE (zsh-5.0.8-doc.tar.bz2) = 3204865 Index: head/shells/zsh/files/patch-Completion_BSD_Command___kld =================================================================== --- head/shells/zsh/files/patch-Completion_BSD_Command___kld (revision 388380) +++ head/shells/zsh/files/patch-Completion_BSD_Command___kld (nonexistent) @@ -1,11 +0,0 @@ ---- Completion/BSD/Command/_kld.orig 2013-11-27 19:00:18 UTC -+++ Completion/BSD/Command/_kld -@@ -4,7 +4,7 @@ - _kld_module() { - local ret=1 - -- compadd "$@" - /boot/kernel/*.ko(-.:t) /modules/*.ko(-.:t) && ret=0 -+ compadd "$@" - /boot/{kernel,modules}/*.ko(-.:t) && ret=0 - _files "$@" -g '*.ko(-.)' && ret=0 - - return ret Property changes on: head/shells/zsh/files/patch-Completion_BSD_Command___kld ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/shells/zsh/files/patch-Src_zsh.mdd =================================================================== --- head/shells/zsh/files/patch-Src_zsh.mdd (revision 388380) +++ head/shells/zsh/files/patch-Src_zsh.mdd (nonexistent) @@ -1,22 +0,0 @@ ---- Src/zsh.mdd.orig 2014-09-20 19:01:46 UTC -+++ Src/zsh.mdd -@@ -21,9 +21,18 @@ hdrdeps="zshcurses.h zshterm.h" - :<<\Make - @CONFIG_MK@ - -+# If we're using gcc as the preprocessor, get rid of the additional -+# lines generated by the preprocessor as they can confuse the script. -+# We don't need these in other cases either, but can't necessarily rely -+# on the option to remove them being the same. - signames.c: signames1.awk signames2.awk ../config.h @SIGNAL_H@ - $(AWK) -f $(sdir)/signames1.awk @SIGNAL_H@ >sigtmp.c -- $(CPP) sigtmp.c >sigtmp.out -+ case "`$(CPP) --version &1`" in \ -+ *"Free Software Foundation"*) \ -+ $(CPP) -P sigtmp.c >sigtmp.out;; \ -+ *) \ -+ $(CPP) sigtmp.c >sigtmp.out;; \ -+ esac - $(AWK) -f $(sdir)/signames2.awk sigtmp.out > $@ - rm -f sigtmp.c sigtmp.out - Property changes on: head/shells/zsh/files/patch-Src_zsh.mdd ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/shells/zsh/files/patch-Src_Modules_zpty.c =================================================================== --- head/shells/zsh/files/patch-Src_Modules_zpty.c (nonexistent) +++ head/shells/zsh/files/patch-Src_Modules_zpty.c (revision 388381) @@ -0,0 +1,11 @@ +--- Src/Modules/zpty.c.orig 2015-06-02 06:51:05.604875000 +0200 ++++ Src/Modules/zpty.c 2015-06-02 00:07:36.672596000 +0200 +@@ -154,7 +154,7 @@ getptycmd(char *name) + return NULL; + } + +-#ifdef USE_DEV_PTMX ++#if defined(HAVE_POSIX_OPENPT) || defined(USE_DEV_PTMX) + + #ifdef HAVE_SYS_STROPTS_H + #include Property changes on: head/shells/zsh/files/patch-Src_Modules_zpty.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property