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

[opk at users.sourceforge.net]

Revision: 10599
          http://gar.svn.sourceforge.net/gar/?rev=10599&view=rev
Author:   opk
Date:     2010-07-27 12:14:17 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
minor updates

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

Modified: csw/mgar/pkg/zsh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zsh/trunk/Makefile	2010-07-27 12:04:50 UTC (rev 10598)
+++ csw/mgar/pkg/zsh/trunk/Makefile	2010-07-27 12:14:17 UTC (rev 10599)
@@ -13,7 +13,10 @@
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
 DISTFILES += $(call admfiles,CSWzsh,postinstall postremove)
 
+LICENSE = LICENCE
+
 RUNTIME_DEP_PKGS = CSWiconv CSWncurses CSWpcrert CSWgdbm
+BUILD_DEP_PKGS = CSWpcre
 
 SPKG_SOURCEURL = http://www.zsh.org
 
@@ -32,3 +35,6 @@
 # Use term.h from ncurses or we get compile errors
 #   http://www.zsh.org/mla/workers/2007/msg01236.html
 CPPFLAGS := -I$(includedir)/ncursesw $(CPPFLAGS)
+
+post-install:
+	cp -p files/_pkgutil $(DESTDIR)$(sharedstatedir)/$(GARNAME)/functions

Modified: csw/mgar/pkg/zsh/trunk/files/_pkgutil
===================================================================
--- csw/mgar/pkg/zsh/trunk/files/_pkgutil	2010-07-27 12:04:50 UTC (rev 10598)
+++ csw/mgar/pkg/zsh/trunk/files/_pkgutil	2010-07-27 12:14:17 UTC (rev 10599)
@@ -7,7 +7,7 @@
 local catalog
 catalog=( /var/opt/csw/pkgutil/catalog.*_`uname -p`_`uname -r`(N[1]) )
 
-_arguments \
+_arguments -S \
   "$opts"{-i,--install}'[install package]' \
   "$opts"{-u,--upgrade}'[upgrade package]' \
   "$opts"{-r,--remove}'[remove package]' \
@@ -39,7 +39,7 @@
     typeset -A pkgs
     pkgs=( ${(s: :)${${${${(f)"$(<$catalog)"[3,-1]}/(#b) [^ ]## ([^ ]##) */ ${match[1]}}:#\#*}[3,(i)-----BEGIN*]}[1,-2]} )
     if (( $+opt_args[-r] + $+opt_args[--remove] + $+opt_args[-u] + $+opt_args[--upgrade])); then
-      local old=\(${(j.|.)${${${${(f)"$(pkginfo)"}#[^ ]## ##}%% *}}}\)
+      local old=\(${(j.|.)${${${${(f)"$(_call_program commands pkginfo)"}#[^ ]## ##}%% *}}}\)
       _wanted packages expl package compadd ${(k)pkgs[(R)$~old]} && ret=0
     else
       _wanted packages expl package compadd -k pkgs && ret=0


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