[csw-devel] SF.net SVN: gar:[19703] csw/mgar/pkg/smbldap-tools/trunk

[cgrzemba at users.sourceforge.net]

Revision: 19703
          http://gar.svn.sourceforge.net/gar/?rev=19703&view=rev
Author:   cgrzemba
Date:     2012-11-16 12:10:50 +0000 (Fri, 16 Nov 2012)
Log Message:
-----------
smbldap-tools/trunk: update recipe and version

Modified Paths:
--------------
    csw/mgar/pkg/smbldap-tools/trunk/Makefile
    csw/mgar/pkg/smbldap-tools/trunk/checksums
    csw/mgar/pkg/smbldap-tools/trunk/files/header-confdir-fix.diff

Modified: csw/mgar/pkg/smbldap-tools/trunk/Makefile
===================================================================
--- csw/mgar/pkg/smbldap-tools/trunk/Makefile	2012-11-16 10:46:51 UTC (rev 19702)
+++ csw/mgar/pkg/smbldap-tools/trunk/Makefile	2012-11-16 12:10:50 UTC (rev 19703)
@@ -1,35 +1,35 @@
 NAME = smbldap-tools
-VERSION = 0.9.4
-GARTYPE = v1
+VERSION = 0.9.9
+GARTYPE = v2
 
-DESCRIPTION = smbldap-tools 
+DESCRIPTION = Samba LDAP Tools
 define BLURB
 	smbldap-tools is a set of scripts designed to help integrate Samba 
 	and a LDAP directory. They target both users and administrators of Unix systems.
 endef
 
-MASTER_SITES = http://download.gna.org/smbldap-tools/packages/
-DISTFILES  = $(NAME)-$(VERSION).tgz
-DISTFILES += $(call admfiles,CSWsmbldap-tools,depend)
+MASTER_SITES = http://download.gna.org/smbldap-tools/sources/$(VERSION)/
+DISTFILES  = $(NAME)-$(VERSION).tar.gz
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
 #BUILD_DEP_PKGS = CSWpmldap CSWpmdigestsha1 CSWpmunicodemap
+ARCHALL_CSWsmbldap-tools = 1
+RUNTIME_DEP_PKGS_CSWsmbldap-tools += CSWperl
 
-PATCHFILES = header-confdir-fix.diff
+REINPLACE_USRLOCAL += smbldap_tools.pm
 
-CONFIGURE_SCRIPTS =
-BUILD_SCRIPTS =
-TEST_SCRIPTS =
-INSTALL_SCRIPTS = custom
+REINPLACEMENTS += etc
+REINPLACE_MATCH_etc = /etc/smbldap-tools
+REINPLACE_WITH_etc = /etc/opt/csw/smbldap-tools
+REINPLACE_FILES_etc += smbldap-* smbldap_tools.pm
 
+# no check target
+SKIPTEST = 1
+
 include gar/category.mk
 
-install-custom:
-	@mkdir -p $(DESTDIR)$(sbindir)
-	@mkdir -p $(DESTDIR)$(sysconfdir)/smbldap-tools/
-	@ginstall -m0755  $(WORKSRC)/smbldap-*  $(WORKSRC)/smbldap_tools.pm $(DESTDIR)$(sbindir)
+post-install-modulated:
+	@ginstall -d -m755 $(DESTDIR)$(sysconfdir)/smbldap-tools/
 	@ginstall -m0644  $(WORKSRC)/smbldap.conf $(DESTDIR)$(sysconfdir)/smbldap-tools/
 	@ginstall -m0600  $(WORKSRC)/smbldap_bind.conf $(DESTDIR)$(sysconfdir)/smbldap-tools/
-
+	@$(MAKECOOKIES)

Modified: csw/mgar/pkg/smbldap-tools/trunk/checksums
===================================================================
--- csw/mgar/pkg/smbldap-tools/trunk/checksums	2012-11-16 10:46:51 UTC (rev 19702)
+++ csw/mgar/pkg/smbldap-tools/trunk/checksums	2012-11-16 12:10:50 UTC (rev 19703)
@@ -1,4 +1 @@
-5c9a71336fcb1af06c5766ab88e50a03  download/smbldap-tools-0.9.4.tgz
-063c988bdecd04fd3b2540672caf027b  download/CSWsmbldap-tools.gspec
-d92ad349366c537be19077a5a62994a9  download/CSWsmbldap-tools.depend
-a7ff2372d3a2586cfde15efdd6576fa6  download/header-confdir-fix.diff
+5084011003239a60ebe209c5fb570397  smbldap-tools-0.9.9.tar.gz

Modified: csw/mgar/pkg/smbldap-tools/trunk/files/header-confdir-fix.diff
===================================================================
--- csw/mgar/pkg/smbldap-tools/trunk/files/header-confdir-fix.diff	2012-11-16 10:46:51 UTC (rev 19702)
+++ csw/mgar/pkg/smbldap-tools/trunk/files/header-confdir-fix.diff	2012-11-16 12:10:50 UTC (rev 19703)
@@ -121,8 +121,8 @@
  my $smbldap_conf;
 -if (-e "/etc/smbldap-tools/smbldap.conf") {
 -    $smbldap_conf="/etc/smbldap-tools/smbldap.conf";
-+if (-e "/opt/csw/etc/smbldap-tools/smbldap.conf") {
-+    $smbldap_conf="/opt/csw/etc/smbldap-tools/smbldap.conf";
++if (-e "/etc/opt/csw/smbldap-tools/smbldap.conf") {
++    $smbldap_conf="/etc/opt/csw/smbldap-tools/smbldap.conf";
  } else {
      $smbldap_conf="/etc/opt/IDEALX/smbldap-tools/smbldap.conf";
  }
@@ -130,8 +130,8 @@
  my $smbldap_bind_conf;
 -if (-e "/etc/smbldap-tools/smbldap_bind.conf") {
 -    $smbldap_bind_conf="/etc/smbldap-tools/smbldap_bind.conf";
-+if (-e "/opt/csw/etc/smbldap-tools/smbldap_bind.conf") {
-+    $smbldap_bind_conf="/opt/csw/etc/smbldap-tools/smbldap_bind.conf";
++if (-e "/etc/opt/csw/smbldap-tools/smbldap_bind.conf") {
++    $smbldap_bind_conf="/etc/opt/csw/smbldap-tools/smbldap_bind.conf";
  } else {
      $smbldap_bind_conf="/etc/opt/IDEALX/smbldap-tools/smbldap_bind.conf";
  }
@@ -140,7 +140,7 @@
      $samba_conf="/etc/samba/smb.conf";
  } else {
 -    $samba_conf="/usr/local/samba/lib/smb.conf";
-+    $samba_conf="/opt/csw/etc/samba/smb.conf";
++    $samba_conf="/etc/opt/csw/samba/smb.conf";
  }
  
  use vars       qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);

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