From owner-freebsd-ports Mon Jul 2 21:10:14 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6E43B37B403 for ; Mon, 2 Jul 2001 21:10:05 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.3/8.11.3) id f634A5412830; Mon, 2 Jul 2001 21:10:05 -0700 (PDT) (envelope-from gnats) Received: from electron.databits.net (electron.databits.net [207.29.204.16]) by hub.freebsd.org (Postfix) with ESMTP id 5790A37B401 for ; Mon, 2 Jul 2001 21:01:52 -0700 (PDT) (envelope-from petef@electron.databits.net) Received: (from petef@localhost) by electron.databits.net (8.11.4/8.11.4) id f6340h530401; Tue, 3 Jul 2001 00:00:43 -0400 (EDT) (envelope-from petef) Message-Id: <200107030400.f6340h530401@electron.databits.net> Date: Tue, 3 Jul 2001 00:00:43 -0400 (EDT) From: Pete Fritchman Reply-To: Pete Fritchman To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/28657: Update shells/zsh to 4.0.2 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 28657 >Category: ports >Synopsis: Update shells/zsh to 4.0.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Jul 02 21:10:01 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Pete Fritchman >Release: FreeBSD 4.3-STABLE i386 >Organization: Databits Network Services, Inc. >Environment: System: FreeBSD electron.databits.net 4.3-STABLE FreeBSD 4.3-STABLE #7: Mon Jun 11 10:15:45 EDT 2001 root@electron.databits.net:/usr/obj/usr/src/sys/ELECTRON i386 >Description: - update to version 4.0.2 - remove files/patch-ab - remove files/patch-ad (merged into distribution) - remove shells.bak after updating /etc/shells - we have all the .info files with the zsh-doc dist, adjust some things because of this - remove USE_AUTOCONF - install docs and examples >How-To-Repeat: >Fix: [ remember to cvs rm files/patch-a{b,d} ] Index: Makefile =================================================================== RCS file: /home/ncvs/ports/shells/zsh/Makefile,v retrieving revision 1.49 diff -u -r1.49 Makefile --- Makefile 2001/06/16 10:05:04 1.49 +++ Makefile 2001/07/03 03:58:54 @@ -6,7 +6,7 @@ # PORTNAME= zsh -PORTVERSION= 4.0.1 +PORTVERSION= 4.0.2 CATEGORIES= shells MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ ftp://ftp.zsh.org/%SUBDIR%/ \ @@ -16,29 +16,39 @@ ftp://ftp.ips.oz.au/pub/packages/%SUBDIR%/ \ ftp://ftp.uit.no/pub/unix/shells/%SUBDIR%/ MASTER_SITE_SUBDIR= ${PORTNAME} +.if !defined(NOPORTDOCS) +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} zsh-${PORTVERSION}-doc.tar.gz +.endif MAINTAINER= will@FreeBSD.org -USE_AUTOCONF= yes - ZSH_VER= ${PORTVERSION} ZSHFUNC_SUBDIR= share/zsh/${ZSH_VER}/functions GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-zsh-mem --enable-zsh-secure-free --enable-dynamic \ --enable-maildir-support -INSTALL_TARGET= install install.info + +.if !defined(NOPORTDOCS) +INSTALL_TARGET= install install.html +.endif + MAN1= zsh.1 zshbuiltins.1 zshcompctl.1 zshcompwid.1 zshcompsys.1 \ zshcontrib.1 zshexpn.1 zshmisc.1 zshmodules.1 zshoptions.1 \ zshparam.1 zshzftpsys.1 zshzle.1 zshall.1 + PLIST_SUB= ZSH_VER="${ZSH_VER}" ZSHFUNC_SUBDIR="${ZSHFUNC_SUBDIR}" .if defined(WANT_STATIC) -CONFIGURE_ENV+= "LDFLAGS=-static" +CONFIGURE_ENV+= "LDFLAGS=-static" PLIST_SUB+= NO_STATIC="@comment " .else PLIST_SUB+= NO_STATIC="" .endif +post-patch: + @${PERL} -pi -e 's!\$\(htmldir\)!\$\(prefix\)/share/doc/zsh!' \ + ${WRKSRC}/Doc/Makefile.in + post-build: # Fix ".so" macro problem by using "soelim" command. @(cd ${WRKSRC} ; \ @@ -49,13 +59,16 @@ ${RM} -f ./man1/zshall.1 ; \ /usr/bin/soelim ./man1/zshall.1.source > ./man1/zshall.1 ; \ ) - @cd ${WRKSRC}/Doc && ${MAKE} info -pre-install: - @${RM} -f ${WRKSRC}/Completion/Unix/Command/_mount.orig - post-install: - @${INSTALL_DATA} ${WRKSRC}/Doc/zsh.info ${PREFIX}/info +.if !defined(NOPORTDOCS) + @${INSTALL_DATA} ${WRKSRC}/Doc/zsh.info* ${PREFIX}/info +.endif + @${MKDIR} ${PREFIX}/share/examples/zsh +.for file in zlogin zshenv zshrc + ${INSTALL_DATA} ${WRKSRC}/StartupFiles/${file} \ + ${PREFIX}/share/examples/zsh +.endfor @install-info ${PREFIX}/info/zsh.info ${PREFIX}/info/dir @${ECHO} "Updating /etc/shells" @${CP} /etc/shells /etc/shells.bak Index: distinfo =================================================================== RCS file: /home/ncvs/ports/shells/zsh/distinfo,v retrieving revision 1.20 diff -u -r1.20 distinfo --- distinfo 2001/06/03 18:43:00 1.20 +++ distinfo 2001/07/03 03:58:54 @@ -1 +1,2 @@ -MD5 (zsh-4.0.1.tar.gz) = 9fc2c72ea3b6cd0449dd513510c9ca0d +MD5 (zsh-4.0.2.tar.gz) = 38611d4ddd2547668d48867772ce214e +MD5 (zsh-4.0.2-doc.tar.gz) = f9c24f483898d94d443aa4b536e2da72 Index: pkg-descr =================================================================== RCS file: /home/ncvs/ports/shells/zsh/pkg-descr,v retrieving revision 1.3 diff -u -r1.3 pkg-descr --- pkg-descr 2001/06/03 18:43:00 1.3 +++ pkg-descr 2001/07/03 03:58:54 @@ -11,6 +11,6 @@ $ autoload -U compinstall $ compinstall -See also zshcompsys(1) manpages. :) +See also zshcompsys(1) manpage. :) WWW: http://www.zsh.org/ Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/shells/zsh/pkg-plist,v retrieving revision 1.23 diff -u -r1.23 pkg-plist --- pkg-plist 2001/06/03 18:43:00 1.23 +++ pkg-plist 2001/07/03 03:58:56 @@ -1,10 +1,30 @@ bin/zsh -@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells -@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells +@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak +@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak bin/zsh-%%ZSH_VER%% -@unexec install-info --delete %D/info/zsh.info %D/info/dir -info/zsh.info -@exec install-info %D/info/zsh.info %D/info/dir +%%PORTDOCS%%@unexec install-info --delete %D/%%PORTDOCS%%info/zsh.info %D/info/dir +%%PORTDOCS%%info/zsh.info +%%PORTDOCS%%info/zsh.info-1 +%%PORTDOCS%%info/zsh.info-10 +%%PORTDOCS%%info/zsh.info-11 +%%PORTDOCS%%info/zsh.info-12 +%%PORTDOCS%%info/zsh.info-13 +%%PORTDOCS%%info/zsh.info-14 +%%PORTDOCS%%info/zsh.info-15 +%%PORTDOCS%%info/zsh.info-16 +%%PORTDOCS%%info/zsh.info-17 +%%PORTDOCS%%info/zsh.info-18 +%%PORTDOCS%%info/zsh.info-19 +%%PORTDOCS%%info/zsh.info-2 +%%PORTDOCS%%info/zsh.info-20 +%%PORTDOCS%%info/zsh.info-3 +%%PORTDOCS%%info/zsh.info-4 +%%PORTDOCS%%info/zsh.info-5 +%%PORTDOCS%%info/zsh.info-6 +%%PORTDOCS%%info/zsh.info-7 +%%PORTDOCS%%info/zsh.info-8 +%%PORTDOCS%%info/zsh.info-9 +%%PORTDOCS%%@exec install-info %D/%%PORTDOCS%%info/zsh.info %D/info/dir %%NO_STATIC%%lib/zsh/libzsh-%%ZSH_VER%%.so %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/cap.so %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/clone.so @@ -29,6 +49,39 @@ %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/zprof.so %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/zpty.so %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/zutil.so +%%PORTDOCS%%share/doc/zsh/zsh_1.html +%%PORTDOCS%%share/doc/zsh/zsh_10.html +%%PORTDOCS%%share/doc/zsh/zsh_11.html +%%PORTDOCS%%share/doc/zsh/zsh_12.html +%%PORTDOCS%%share/doc/zsh/zsh_13.html +%%PORTDOCS%%share/doc/zsh/zsh_14.html +%%PORTDOCS%%share/doc/zsh/zsh_15.html +%%PORTDOCS%%share/doc/zsh/zsh_16.html +%%PORTDOCS%%share/doc/zsh/zsh_17.html +%%PORTDOCS%%share/doc/zsh/zsh_18.html +%%PORTDOCS%%share/doc/zsh/zsh_19.html +%%PORTDOCS%%share/doc/zsh/zsh_2.html +%%PORTDOCS%%share/doc/zsh/zsh_20.html +%%PORTDOCS%%share/doc/zsh/zsh_21.html +%%PORTDOCS%%share/doc/zsh/zsh_22.html +%%PORTDOCS%%share/doc/zsh/zsh_23.html +%%PORTDOCS%%share/doc/zsh/zsh_24.html +%%PORTDOCS%%share/doc/zsh/zsh_25.html +%%PORTDOCS%%share/doc/zsh/zsh_26.html +%%PORTDOCS%%share/doc/zsh/zsh_27.html +%%PORTDOCS%%share/doc/zsh/zsh_28.html +%%PORTDOCS%%share/doc/zsh/zsh_29.html +%%PORTDOCS%%share/doc/zsh/zsh_3.html +%%PORTDOCS%%share/doc/zsh/zsh_4.html +%%PORTDOCS%%share/doc/zsh/zsh_5.html +%%PORTDOCS%%share/doc/zsh/zsh_6.html +%%PORTDOCS%%share/doc/zsh/zsh_7.html +%%PORTDOCS%%share/doc/zsh/zsh_8.html +%%PORTDOCS%%share/doc/zsh/zsh_9.html +%%PORTDOCS%%share/doc/zsh/zsh_toc.html +share/examples/zsh/zlogin +share/examples/zsh/zshenv +share/examples/zsh/zshrc %%ZSHFUNC_SUBDIR%%/_a2ps %%ZSHFUNC_SUBDIR%%/_alias %%ZSHFUNC_SUBDIR%%/_aliases @@ -44,6 +97,7 @@ %%ZSHFUNC_SUBDIR%%/_arguments %%ZSHFUNC_SUBDIR%%/_arp %%ZSHFUNC_SUBDIR%%/_arrays +%%ZSHFUNC_SUBDIR%%/_autocd %%ZSHFUNC_SUBDIR%%/_autoload %%ZSHFUNC_SUBDIR%%/_bash_completions %%ZSHFUNC_SUBDIR%%/_bindkey @@ -406,3 +460,5 @@ @dirrm share/zsh/%%ZSH_VER%% @dirrm share/zsh/site-functions @dirrm share/zsh +@dirrm share/examples/zsh +@dirrm share/doc/zsh >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message