[Midnightbsd-cvs] CVS Commit: Makefile: Fix PLIST_SUB bug.

[ctriv at midnightbsd.org]

Log Message:
-----------
Fix PLIST_SUB bug.
Remove the modification of /etc/shells from post-install.  This is done in
the plist by pkg_add.
I wonder if ZSH_ETCDIR should be $PREFIX/etc by default.

Modified Files:
--------------
    mports/shells/zsh:
        Makefile (r1.7 -> r1.8)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/shells/zsh/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lshells/zsh/Makefile -Lshells/zsh/Makefile -u -r1.7 -r1.8
--- shells/zsh/Makefile
+++ shells/zsh/Makefile
@@ -11,7 +11,6 @@
 #			(default: use dynamically loadable modules)
 # ZSH_ETCDIR=<dir>	directory for zsh system-wide configuration files:
 #			zshenv, zlogin, zprofile, zshrc, zlogout.
-#			e.g. use this to put config files inside ${PREFIX}
 #			(default: /etc)
 #			NOTE: does NOT have to be inside ${PREFIX} tree
 # ZSH_FNDIR=<dir>	directory for zsh functions (part of distribution)
@@ -74,7 +73,7 @@
 ZSH_FNDIR?=	${DATADIR}/${ZSH_VER}/functions
 ZSH_SITEFNDIR?=	${DATADIR}/site-functions
 
-PLIST_SUB+=	ZSH_VER="${ZSH_VER}" ZSHETCDIR="${ZSH_ETCDIR}" \
+PLIST_SUB+=	ZSH_VER="${ZSH_VER}" ZSH_ETCDIR="${ZSH_ETCDIR}" \
 		ZSH_FNDIR="${ZSH_FNDIR:S!${PREFIX}/!!}" \
 		ZSH_SITEFNDIR="${ZSH_SITEFNDIR}"
 
@@ -85,7 +84,6 @@
 DOCS=		LICENCE META-FAQ README Etc/BUGS Etc/CONTRIBUTORS Etc/FAQ \
 		Etc/completion-style-guide Doc/zsh*.html Doc/zsh.dvi
 EXAMPLES=	zlogin zshenv zshrc
-SHELLS= 	/etc/shells
 
 .include <bsd.port.pre.mk>
 
@@ -152,10 +150,5 @@
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/Doc/zsh.info ${PREFIX}/info/zsh.info
 .endif
-	@${ECHO_MSG} "Updating ${SHELLS}"
-	@${CP} ${SHELLS} ${SHELLS}.bak
-	@(${GREP} -v ${PREFIX}/bin/zsh ${SHELLS}.bak; \
-	  ${ECHO_CMD} ${PREFIX}/bin/zsh) > ${SHELLS}
-	@${RM} ${SHELLS}.bak
 
 .include <bsd.port.post.mk>