[csw-devel] SF.net SVN: gar:[5783] csw/mgar/pkg/sendmail/trunk

[valholla at users.sourceforge.net]

Revision: 5783
          http://gar.svn.sourceforge.net/gar/?rev=5783&view=rev
Author:   valholla
Date:     2009-07-31 17:43:04 +0000 (Fri, 31 Jul 2009)

Log Message:
-----------
merge Benny and Mike

Modified Paths:
--------------
    csw/mgar/pkg/sendmail/trunk/Makefile
    csw/mgar/pkg/sendmail/trunk/checksums

Modified: csw/mgar/pkg/sendmail/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sendmail/trunk/Makefile	2009-07-31 17:11:27 UTC (rev 5782)
+++ csw/mgar/pkg/sendmail/trunk/Makefile	2009-07-31 17:43:04 UTC (rev 5783)
@@ -13,18 +13,18 @@
 
 MASTER_SITES = ftp://ftp.sendmail.org/pub/sendmail/
 DISTFILES  = $(GARNAME).$(GARVERSION).tar.gz
+DISTFILES += README.CSW sendmail.schema
+DISTFILES += Sun-sendmail-deactivate.sh Sun-sendmail-reactivate.sh
+DISTFILES += i.sol8 i.sol9 i.sol10
 DISTFILES += cswsendmail site.config.m4
 DISTFILES += $(foreach FILE,$(shell cd $(FILEDIR) && ls *.CSW),$(FILE))
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-# If the url used to check for software update is different of MASTER_SITES, then 
-# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
-# UPSTREAM_MASTER_SITES = 
-
 # we require
 PACKAGES = CSWsendmail CSWsendmailcommon
+SPKG_SOURCEURL = http://www.sendmail.org/
 SPKG_DESC_CSWsendmail = $(DESCRIPTION)
 SPKG_DESC_CSWsendmailcommon = $(DESCRIPTION) common files
 CATALOGNAME_CSWsendmail = sendmail
@@ -34,13 +34,19 @@
 REQUIRED_PKGS_CSWsendmailcommon = CSWbdb CSWoldaprt CSWosslrt CSWsasl CSWtcpwrap CSWcswclassutils
 ARCHALL_CSWsendmail_common = 1
 SPKG_CLASSES_CSWsendmail = none cswinitsmf
-PROTOTYPE_FILTER = awk '$$$$3 ~/\/init\.d\/cswsendmail$$$$/ { $$$$2 = "cswinitsmf" } { print }'
+PROTOTYPE_FILTER = awk \
+				   '$$$$3 ~/\/init\.d\/cswsendmail$$$$/ {$$$$2 = "cswinitsmf"} \
+					$$$$3 ~/sol8\./ { $$$$2 = "sol8" } \
+					$$$$3 ~/sol9\./ { $$$$2 = "sol9" } \
+					$$$$3 ~/sol10\./ { $$$$2 = "sol10" } \
+					$$$$3 ~/\/sendmail$$$$/ { $$$$4 = "2755" } \
+					{ print }'
 
-PKGFILES_CSWsendmail_common = .*$(sharedstatedir)/.*
-PKGFILES_CSWsendmail_common = .*$(mandir)/.*
-PKGFILES_CSWsendmail_common = .*$(sysconfdir)/.*
-PKGFILES_CSWsendmail_common = .*/clientmqueue/.*
-PKGFILES_CSWsendmail_common = .*/csw/init\.d/.*
+PKGFILES_CSWsendmailcommon  = .*$(sharedstatedir)/.*
+PKGFILES_CSWsendmailcommon += .*$(mandir)/.*
+PKGFILES_CSWsendmailcommon += .*$(sysconfdir)/.*
+PKGFILES_CSWsendmailcommon += .*/clientmqueue/.*
+PKGFILES_CSWsendmailcommon += .*/csw\/init\.d/.*
 
 ENABLE_CHECK = 0
 
@@ -52,15 +58,9 @@
 TEST_SCRIPTS      = custom
 INSTALL_SCRIPTS   = custom
 
-PRESERVECONF  = $(sysconfdir)/mail/aliases.CSW
-PRESERVECONF += $(sysconfdir)/mail/sendmail.cf.CSW
-PRESERVECONF += $(sysconfdir)/mail/submit.cf.CSW
-PRESERVECONF += $(sysconfdir)/mail/local-host-names.CSW
-PRESERVECONF += $(sysconfdir)/mail/trusted-users.CSW
-PRESERVECONF += $(sysconfdir)/mail/statistics.CSW
-
 include gar/category.mk
 
+SOLVER = sol$(shell uname -r |sed 's/5\.//')
 PLATFORM  = $(shell if [ `uname -i` = "i86pc" ] ; then echo i86pc ; else echo sun4 ; fi )
 OBJDIR    = $(WORKDIR)/$(DISTNAME)/obj.SunOS.$(GAROSREL).$(PLATFORM)
 LIBFILES  = sendmail/sendmail mail.local/mail.local smrsh/smrsh rmail/rmail
@@ -111,6 +111,17 @@
 		ginstall -m 755 $(OBJDIR)/$$file $(DESTDIR)$(sbindir) ; \
 		done )
 
+	@# rename libraries and binaries os-specific
+	( for file in `ls $(DESTDIR)$(libdir)` ; do  \ 
+	mv $(DESTDIR)$(libdir)/$$file $(DESTDIR)$(libdir)/$(SOLVER).$$file ; \ 
+	done )
+	( for file in `ls $(DESTDIR)$(bindir)` ; do  \ 
+	mv $(DESTDIR)$(bindir)/$$file $(DESTDIR)$(bindir)/$(SOLVER).$$file ; \ 
+	done )
+	( for file in `ls $(DESTDIR)$(sbindir)` ; do  \ 
+	mv $(DESTDIR)$(sbindir)/$$file $(DESTDIR)$(sbindir)/$(SOLVER).$$file ; \ 
+	done )
+
 	@# install manpages
 	( for file in $(MANFILES1) ; do \
 		ginstall -m 644 $(OBJDIR)/$$file $(DESTDIR)$(mandir)/man1 ; \

Modified: csw/mgar/pkg/sendmail/trunk/checksums
===================================================================
--- csw/mgar/pkg/sendmail/trunk/checksums	2009-07-31 17:11:27 UTC (rev 5782)
+++ csw/mgar/pkg/sendmail/trunk/checksums	2009-07-31 17:43:04 UTC (rev 5783)
@@ -1,3 +1,6 @@
+6c030e7a797209ddfa4f6dbc531d753c  download/README.CSW
+e89e68f3e0ae84d665c4ab898a8f3325  download/Sun-sendmail-deactivate.sh
+1c3a63f98171aa28a2714995ee938a2c  download/Sun-sendmail-reactivate.sh
 2bfc78e0f774b7168e29628b6a18570a  download/aliases.CSW
 2592f7d191867c1d1c63ff16d818dcb5  download/cswsendmail
 c816378b3028cbab410f72168b571775  download/helpfile.CSW
@@ -5,6 +8,7 @@
 95c787a371c63caebc5d76faddba08e4  download/patch-CC-M.m4
 a5ee5d26e1f546a2da5fb9a513bd6bce  download/sendmail.8.14.3.tar.gz
 3c970e5b4e9831a8774906ed36e11f52  download/sendmail.cf.CSW
+48851e45dca2a65a77f64f738bbf8d20  download/sendmail.schema
 ae82c974452cfdc7b4c5be2576154cdf  download/site.config.m4
 d41d8cd98f00b204e9800998ecf8427e  download/sm-client.st.CSW
 d41d8cd98f00b204e9800998ecf8427e  download/statistics.CSW


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