[csw-devel] SF.net SVN: gar:[15000] csw/mgar/pkg/zsh/trunk

[opk at users.sourceforge.net]

Revision: 15000
          http://gar.svn.sourceforge.net/gar/?rev=15000&view=rev
Author:   opk
Date:     2011-07-07 08:06:39 +0000 (Thu, 07 Jul 2011)

Log Message:
-----------
Update to new CAS etcshells

Modified Paths:
--------------
    csw/mgar/pkg/zsh/trunk/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/zsh/trunk/files/CSWzsh.postinstall
    csw/mgar/pkg/zsh/trunk/files/CSWzsh.postremove

Modified: csw/mgar/pkg/zsh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zsh/trunk/Makefile	2011-07-06 14:58:17 UTC (rev 14999)
+++ csw/mgar/pkg/zsh/trunk/Makefile	2011-07-07 08:06:39 UTC (rev 15000)
@@ -12,14 +12,13 @@
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
 DISTFILES += _pkgutil _mgar
-DISTFILES += CSWzsh.postinstall CSWzsh.postremove
 
 PACKAGES = CSWzsh
 CATALOGNAME_CSWzsh = zsh
 
 LICENSE = LICENCE
 
-RUNTIME_DEP_PKGS = CSWiconv CSWlibncursesw5 CSWlibpcre0 CSWlibgdbm3
+RUNTIME_DEP_PKGS = CSWiconv CSWlibncursesw5 CSWlibpcre0 CSWlibgdbm3 CSWcas-etcshells
 BUILD_DEP_PKGS = CSWpcre
 
 SPKG_SOURCEURL = http://www.zsh.org
@@ -60,6 +59,9 @@
 CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/compaudit
 CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/mere
 
+SPKG_CLASSES = none cswetcshells
+ETCSHELLS = /opt/csw/bin/zsh
+
 include gar/category.mk
 
 # Use term.h from ncurses or we get compile errors

Deleted: csw/mgar/pkg/zsh/trunk/files/CSWzsh.postinstall
===================================================================
--- csw/mgar/pkg/zsh/trunk/files/CSWzsh.postinstall	2011-07-06 14:58:17 UTC (rev 14999)
+++ csw/mgar/pkg/zsh/trunk/files/CSWzsh.postinstall	2011-07-07 08:06:39 UTC (rev 15000)
@@ -1,41 +0,0 @@
-#!/bin/sh
-PATH=/usr/bin
-export PATH
-
-# $BASEDIR ignored because the package isn't relocatable
-
-if [ -f ${PKG_INSTALL_ROOT}/etc/shells ]; then
-	echo "${PKG_INSTALL_ROOT}/etc/shells already exists."
-else
-	cat > ${PKG_INSTALL_ROOT}/etc/shells <<EOF
-/bin/bash
-/bin/csh
-/bin/jsh
-/bin/ksh
-/bin/pfcsh
-/bin/pfksh
-/bin/pfsh
-/bin/sh
-/bin/tcsh
-/bin/zsh
-/sbin/jsh
-/sbin/sh
-/usr/bin/bash
-/usr/bin/csh
-/usr/bin/jsh
-/usr/bin/ksh
-/usr/bin/pfcsh
-/usr/bin/pfksh
-/usr/bin/pfsh
-/usr/bin/sh
-/usr/bin/tcsh
-/usr/bin/zsh
-EOF
-fi
-
-if /usr/bin/grep "^/opt/csw/bin/zsh$" ${PKG_INSTALL_ROOT}/etc/shells 2> /dev/null > /dev/null; then
-	echo "${PKG_INSTALL_ROOT}/etc/shells is UNCHANGED because entry /opt/csw/bin/zsh already exists."
-else
-	echo "/opt/csw/bin/zsh" >> ${PKG_INSTALL_ROOT}/etc/shells
-	echo "ADDED /opt/csw/bin/zsh to ${PKG_INSTALL_ROOT}/etc/shells."
-fi

Deleted: csw/mgar/pkg/zsh/trunk/files/CSWzsh.postremove
===================================================================
--- csw/mgar/pkg/zsh/trunk/files/CSWzsh.postremove	2011-07-06 14:58:17 UTC (rev 14999)
+++ csw/mgar/pkg/zsh/trunk/files/CSWzsh.postremove	2011-07-07 08:06:39 UTC (rev 15000)
@@ -1,10 +0,0 @@
-#!/bin/sh
-PATH=/usr/bin
-export PATH
-
-if /usr/bin/grep "^/opt/csw/bin/zsh$" ${PKG_INSTALL_ROOT}/etc/shells >/dev/null 2>&1; then
-	/usr/bin/perl -i -pwe '$_ = "" if /\/opt\/csw\/bin\/zsh$/' ${PKG_INSTALL_ROOT}/etc/shells
-	echo "REMOVED /opt/csw/bin/zsh from ${PKG_INSTALL_ROOT}/etc/shells."
-else
-	echo "${PKG_INSTALL_ROOT}/etc/shells is UNCHANGED because no entry for /opt/csw/bin/zsh was found."
-fi


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.