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

[valholla at users.sourceforge.net]

Revision: 4321
          http://gar.svn.sourceforge.net/gar/?rev=4321&view=rev
Author:   valholla
Date:     2009-04-15 14:36:20 +0000 (Wed, 15 Apr 2009)

Log Message:
-----------
fix conflicting files

Modified Paths:
--------------
    csw/mgar/pkg/sudo-ldap/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/sudo-ldap/trunk/files/CSWsudoldap.postinstall
    csw/mgar/pkg/sudo-ldap/trunk/files/CSWsudoldap.postremove

Modified: csw/mgar/pkg/sudo-ldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo-ldap/trunk/Makefile	2009-04-15 14:26:57 UTC (rev 4320)
+++ csw/mgar/pkg/sudo-ldap/trunk/Makefile	2009-04-15 14:36:20 UTC (rev 4321)
@@ -12,33 +12,35 @@
 
 MASTER_SITES = ftp://ftp.sudo.ws/pub/sudo/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz 
+DISTFILES += CSWsudoldap.postinstall
+DISTFILES += CSWsudoldap.postremove
 PATCHFILES = install.diff
 
 # We define upstream file regex so we can be notifed of new 
 # upstream software release
 UFILES_REGEX = $(GARNAME)-((\d+(?:\.\d+)*)(p\d+)?).tar.gz
 
-PACKAGES = CSWsudo-ldap 
+PACKAGES = CSWsudoldap 
 
-CATALOGNAME_CSWsudo-ldap = sudo_ldap
-SPKG_DESC_CSWsudo-ldap = $(DESCRIPTION)
-SPKG_SOURCEURL_CSWsudo-ldap = http://www.sudo.ws
-INCOMPATIBLE_PKGS_CSWsudo-ldap = CSWsudo
-REQUIRED_PKGS_CSWsudo-ldap = CSWsudo-common CSWggettextrt CSWoldaprt
+CATALOGNAME_CSWsudoldap = sudo_ldap
+SPKG_DESC_CSWsudoldap = $(DESCRIPTION)
+SPKG_SOURCEURL_CSWsudoldap = http://www.sudo.ws
+INCOMPATIBLE_PKGS_CSWsudoldap = CSWsudo
+REQUIRED_PKGS_CSWsudoldap = CSWsudo-common CSWggettextrt CSWoldaprt
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-pam
 CONFIGURE_ARGS += --with-logging=both
 CONFIGURE_ARGS += --with-ignore-dot
 CONFIGURE_ARGS += --with-env-editor
-CONFIGURE_ARGS += --with-ldap=$(prefix)
-CONFIGURE_ARGS += --with-ldap-conf-file=$(sysconfdir)/ldap.conf
+CONFIGURE_ARGS += --withldap=$(prefix)
+CONFIGURE_ARGS += --withldap-conf-file=$(sysconfdir)/ldap.conf
 
 TEST_TARGET = check
 
 include gar/category.mk
 
-PKGFILES_CSWsudo-ldap = .*/bin/.*
+PKGFILES_CSWsudoldap = .*/bin/.*
 
 post-install-modulated:
 	@( cd $(DESTDIR)$(bindir) ; rm -f sudoedit )
@@ -46,4 +48,7 @@
 	@( cd $(DESTDIR)$(bindir) ; ln -f sudo.ldap sudo )
 	@( cd $(DESTDIR)$(bindir) ; ln -f sudo.ldap sudoedit )
 	@$(MAKECOOKIE)
-	$(DONADA)
+
+post-merge-modulated:
+	@( cd $(PKGROOT)$(bindir) ; gchmod 4755 sudo* )
+	@$(MAKECOOKIE)

Added: csw/mgar/pkg/sudo-ldap/trunk/files/CSWsudoldap.postinstall
===================================================================
--- csw/mgar/pkg/sudo-ldap/trunk/files/CSWsudoldap.postinstall	                        (rev 0)
+++ csw/mgar/pkg/sudo-ldap/trunk/files/CSWsudoldap.postinstall	2009-04-15 14:36:20 UTC (rev 4321)
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+BINDIR=$BASEDIR/opt/csw/bin
+
+rm -f ${BINDIR}/sudo
+rm -f ${BINDIR}/sudoedit
+ln -f ${BINDIR}/sudo.ldap ${BINDIR}/sudo
+ln -f ${BINDIR}/sudo.ldap ${BINDIR}/sudoedit
+
+exit 0
+

Added: csw/mgar/pkg/sudo-ldap/trunk/files/CSWsudoldap.postremove
===================================================================
--- csw/mgar/pkg/sudo-ldap/trunk/files/CSWsudoldap.postremove	                        (rev 0)
+++ csw/mgar/pkg/sudo-ldap/trunk/files/CSWsudoldap.postremove	2009-04-15 14:36:20 UTC (rev 4321)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+BINDIR=$BASEDIR/opt/csw/bin
+SUDO_MINIMAL=${BINDIR}/sudo.minimal
+
+if [ -f ${SUDO_MINIMAL} ]; then
+    rm -f sudo sudoedit
+    ln -f $SUDO_MINIMAL ${BINDIR}/sudo
+    ln -f $SUDO_MINIMAL ${BINDIR}/sudoedit
+fi
+
+exit 0
+


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