[csw-devel] SF.net SVN: gar:[4369] csw/mgar/pkg/sudo/trunk

[valholla at users.sourceforge.net]

Revision: 4369
          http://gar.svn.sourceforge.net/gar/?rev=4369&view=rev
Author:   valholla
Date:     2009-04-17 19:08:40 +0000 (Fri, 17 Apr 2009)

Log Message:
-----------
fix postremove

Modified Paths:
--------------
    csw/mgar/pkg/sudo/trunk/Makefile
    csw/mgar/pkg/sudo/trunk/files/CSWsudo.postremove

Modified: csw/mgar/pkg/sudo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo/trunk/Makefile	2009-04-17 19:00:34 UTC (rev 4368)
+++ csw/mgar/pkg/sudo/trunk/Makefile	2009-04-17 19:08:40 UTC (rev 4369)
@@ -45,10 +45,11 @@
 
 include gar/category.mk
 
-PKGFILES_CSWsudo = .*/bin/sudo.minimal
+PKGFILES_CSWsudo = .*$(bindir)/sudo.minimal
 
 post-merge-modulated:
-	@( cd $(PKGROOT)$(bindir) ; mv sudo sudo.minimal )
-	@( cd $(PKGROOT)$(sysconfdir) ; mv sudoers sudoers.CSW )
+	@( cd $(PKGROOT)$(bindir) ; gmv sudo sudo.minimal )
+	@( cd $(PKGROOT)$(bindir) ; grm sudoedit )
+	@( cd $(PKGROOT)$(sysconfdir) ; gmv sudoers sudoers.CSW )
 	@( cd $(PKGROOT)$(bindir) ; gchmod 4755 sudo* )
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/sudo/trunk/files/CSWsudo.postremove
===================================================================
--- csw/mgar/pkg/sudo/trunk/files/CSWsudo.postremove	2009-04-17 19:00:34 UTC (rev 4368)
+++ csw/mgar/pkg/sudo/trunk/files/CSWsudo.postremove	2009-04-17 19:08:40 UTC (rev 4369)
@@ -2,10 +2,11 @@
 
 BINDIR=$BASEDIR/opt/csw/bin
 
+rm -f ${BINDIR}/sudo 
+rm -f ${BINDIR}/sudoedit
+
 if [ -f ${BINDIR}/sudo.ldap ]; then
     chmod 4755 ${BINDIR}/sudo.ldap
-    rm -f ${BINDIR}/sudo 
-    rm -f ${BINDIR}/sudoedit
     ln -f ${BINDIR}/sudo.ldap ${BINDIR}/sudo
     ln -f ${BINDIR}/sudo.ldap ${BINDIR}/sudoedit
 fi


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