From owner-svn-ports-all@freebsd.org Fri Jun 24 14:13:29 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AC040B734E8; Fri, 24 Jun 2016 14:13:29 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 838C62D3E; Fri, 24 Jun 2016 14:13:29 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5OEDScU027533; Fri, 24 Jun 2016 14:13:28 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5OEDS39027530; Fri, 24 Jun 2016 14:13:28 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201606241413.u5OEDS39027530@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Fri, 24 Jun 2016 14:13:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417423 - in head: . shells/zsh shells/zsh/files 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.22 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, 24 Jun 2016 14:13:29 -0000 Author: adamw Date: Fri Jun 24 14:13:28 2016 New Revision: 417423 URL: https://svnweb.freebsd.org/changeset/ports/417423 Log: Switch zsh back to looking for system-wide files under ${PREFIX}/etc, rather than /etc. Add an option, ETCDIR, to switch it back to /etc. Also includes a couple whitespace cleanups. PORTREVISION bump, and a note in UPDATING. PR: 201866 Added: head/shells/zsh/files/pkg-message.in (contents, props changed) Modified: head/UPDATING head/shells/zsh/Makefile Modified: head/UPDATING ============================================================================== --- head/UPDATING Fri Jun 24 14:03:43 2016 (r417422) +++ head/UPDATING Fri Jun 24 14:13:28 2016 (r417423) @@ -5,6 +5,18 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20160624 + AFFECTS: users of shells/zsh + AUTHOR: adamw@FreeBSD.org + + zsh now looks for system-wide conf files in ${PREFIX}/etc, instead of + /etc. If you have files like zshrc, zshenv, zprofile, zlogin, or zlogout + in /etc, either move them to /usr/local/etc or rebuild zsh with the + ETCDIR option on. + + Note that this change only affects system-wide conf files, which are not + installed or created by a default installation. + 20160621 AFFECTS: users of www/redmine AUTHOR: tz@FreeBSD.org Modified: head/shells/zsh/Makefile ============================================================================== --- head/shells/zsh/Makefile Fri Jun 24 14:03:43 2016 (r417422) +++ head/shells/zsh/Makefile Fri Jun 24 14:13:28 2016 (r417423) @@ -3,10 +3,9 @@ PORTNAME= zsh DISTVERSION= 5.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= shells -MASTER_SITES= \ - http://www.zsh.org/pub/:doc \ +MASTER_SITES= http://www.zsh.org/pub/:doc \ http://www.zsh.org/pub/ \ SF \ SF/${PORTNAME}/${PORTNAME}-doc/${PORTVERSION}:doc @@ -25,6 +24,7 @@ MAKE_JOBS_UNSAFE= yes EXTRA_PATCHES= ${FILESDIR}/extra-patch-bsdtar ZSH_VER= ${PORTVERSION} PLIST_SUB+= ZSH_VER="${ZSH_VER}" +SUB_FILES= pkg-message USES= iconv ncurses shebangfix tar:xz @@ -46,7 +46,8 @@ CPPFLAGS+= -I${LOCALBASE}/include -DBOOL LDFLAGS+= -L${LOCALBASE}/lib -Wl,--as-needed CONFIGURE_ENV+= zsh_cv_sys_path_dev_fd=no CONFIGURE_ARGS= --with-tcsetpgrp \ - --enable-function-subdirs --enable-multibyte \ + --enable-function-subdirs \ + --enable-multibyte \ --sysconfdir=${PREFIX}/etc DOCS= LICENCE META-FAQ README \ @@ -60,7 +61,7 @@ PORTEXAMPLES= zlogin zshenv zshrc #EXTRA_COMPLETION_FILES= _sockstat #EXTRA_COMPLETION_DIR= Completion/BSD/Command -OPTIONS_DEFINE= GDBM MEM SECURE_FREE MAILDIR PCRE STATIC DEBUG \ +OPTIONS_DEFINE= DEBUG ETCDIR GDBM MAILDIR MEM PCRE SECURE_FREE STATIC \ DOCS EXAMPLES OPTIONS_DEFAULT=SECURE_FREE MAILDIR OPTIONS_SUB= yes @@ -73,13 +74,16 @@ GDBM_DESC= Enable GDBM support (GPL) GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm GDBM_CONFIGURE_ENABLE= gdbm -MAILDIR_DESC= Enable support for Maildirs in MAIL(PATH) +ETCDIR_DESC= System-wide defaults in /etc (instead of ${PREFIX}/etc) +ETCDIR_CONFIGURE_OFF= --enable-etcdir=${PREFIX}/etc + +MAILDIR_DESC= Enable support for Maildirs in MAIL(PATH) MAILDIR_CONFIGURE_ENABLE= maildir-support MEM_DESC= Enable zsh-mem options MEM_CONFIGURE_ENABLE= zsh-mem -SECURE_FREE_DESC= Enable zsh-secure-free +SECURE_FREE_DESC= Enable zsh-secure-free SECURE_FREE_CONFIGURE_ENABLE= zsh-secure-free PCRE_LIB_DEPENDS= libpcre.so:devel/pcre Added: head/shells/zsh/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/shells/zsh/files/pkg-message.in Fri Jun 24 14:13:28 2016 (r417423) @@ -0,0 +1,10 @@ +========================================================== + +By default, zsh looks for system-wide defaults in +%%PREFIX%%/etc. + +If you previously set up /etc/zprofile, /etc/zshenv, etc., +either move them to %%PREFIX%%/etc or rebuild zsh with the +ETCDIR option enabled. + +==========================================================