[csw-devel] SF.net SVN: gar:[6464] csw/mgar/pkg/gitosis/trunk/Makefile

[bdwalton at users.sourceforge.net]

Revision: 6464
          http://gar.svn.sourceforge.net/gar/?rev=6464&view=rev
Author:   bdwalton
Date:     2009-09-25 00:16:38 +0000 (Fri, 25 Sep 2009)

Log Message:
-----------
gitosis: set csw bash as shell for gitosis user; depend on csw bash again; rework spkg_classes handling so that ugfiles triggers _after_ cswusergroup (bug after moving to USERGROUP var)

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

Modified: csw/mgar/pkg/gitosis/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gitosis/trunk/Makefile	2009-09-24 23:40:39 UTC (rev 6463)
+++ csw/mgar/pkg/gitosis/trunk/Makefile	2009-09-25 00:16:38 UTC (rev 6464)
@@ -26,7 +26,7 @@
 
 PREREQUISITE_PKGS_CSWgitosis = CSWpython CSWpysetuptools
 
-REQUIRED_PKGS_CSWgitosis = CSWgit CSWpysetuptools
+REQUIRED_PKGS_CSWgitosis = CSWgit CSWpysetuptools CSWbash
 
 GIT_REPOS = git://eagain.net/gitosis.git
 GIT_USE_PROXY = 1
@@ -51,17 +51,18 @@
 INSTALL_ARGS = --root $(DESTDIR) --single-version-externally-managed
 
 GITOSISHOME = /var/opt/csw/gitosis
-CSWUG = gitosis:gitosis:Gitosis Host:$(GITOSISHOME):/bin/bash::
+CSWUG = gitosis:gitosis:Gitosis Host:$(GITOSISHOME):/opt/csw/bin/bash::
 CSWUGD = $(INSTALLISADIR)/opt/csw/etc/pkg/CSW$(GARNAME)
 
 USERGROUP = /opt/csw/etc/pkg/CSWgitosis/cswusergroup
 
 PROTOTYPE_FILTER  = awk '$$$$3 ~ /\/var\/opt\/csw\/gitosis/ { $$$$2 = "ugfiles"; $$$$5 = "gitosis"; $$$$6 = "gitosis" }; { print }'
 
-SPKG_CLASSES = none ugfiles
-
 include gar/category.mk
 
+# this has to be after cswusergroup is added automatically...
+SPKG_CLASSES += ugfiles
+
 # override the category exclusion
 _MERGE_EXCLUDE_CATEGORY =
 


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