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

bonivart at users.sourceforge.net bonivart at users.sourceforge.net
Wed Jun 15 22:03:34 CEST 2011 

Revision: 14821
          http://gar.svn.sourceforge.net/gar/?rev=14821&view=rev
Author:   bonivart
Date:     2011-06-15 20:03:34 +0000 (Wed, 15 Jun 2011)

Log Message:
-----------
sendmail/trunk: change sysconfdir to /etc/opt/csw/mail

Modified Paths:
--------------
    csw/mgar/pkg/sendmail/trunk/Makefile
    csw/mgar/pkg/sendmail/trunk/files/site.config.m4

Modified: csw/mgar/pkg/sendmail/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sendmail/trunk/Makefile	2011-06-15 12:53:56 UTC (rev 14820)
+++ csw/mgar/pkg/sendmail/trunk/Makefile	2011-06-15 20:03:34 UTC (rev 14821)
@@ -1,7 +1,14 @@
 # $Id$
 
+# TODO
+# - migrate conf from /opt/csw/etc/mail
 # - post message
 # - libmilter
+# - try to fix bugs
+#   - 2915 Must stop built-in sendmail manually
+#   - 3864 Sendmail must be relinked with new berekeley db
+#   - 4150 Sendmail 8.14.4 released
+#   - 4486 Provide sendmail's contrib/ tools as a separate package?
 
 # + cpsample conf files
 # + remove COPYING file
@@ -36,7 +43,6 @@
 #DISTFILES += CSWsendmail.preremove CSWsendmail.preinstall CSWsendmail.space
 #DISTFILES += cswsendmail site.config.m4 $(MY_CLASSES) CSWsendmail.checkinstall
 #DISTFILES += README.CSW sendmail.schema CSWsendmail.postinstall
-#DISTFILES += COPYING
 
 LICENSE = LICENSE
 
@@ -44,22 +50,16 @@
 CATALOGNAME_CSWsendmail = sendmail
 SPKG_DESC_CSWsendmail = $(DESCRIPTION)
 
-RUNTIME_DEP_PKGS_CSWsendmail  = CSWbdb48
-RUNTIME_DEP_PKGS_CSWsendmail += CSWoldaprt
+RUNTIME_DEP_PKGS_CSWsendmail  = CSWoldaprt
 RUNTIME_DEP_PKGS_CSWsendmail += CSWosslrt
 RUNTIME_DEP_PKGS_CSWsendmail += CSWsasl
 RUNTIME_DEP_PKGS_CSWsendmail += CSWtcpwrap 
+#RUNTIME_DEP_PKGS_CSWsendmail += CSWbdb48 # not needed? makemap not compiled with hash support?
 
-INITSMF = /etc/opt/csw/init.d/cswsendmail
-SAMPLECONF  = /etc/opt/csw/mail/aliases
-SAMPLECONF += /etc/opt/csw/mail/helpfile
-SAMPLECONF += /etc/opt/csw/mail/local-host-names
-SAMPLECONF += /etc/opt/csw/mail/sendmail.cf
-SAMPLECONF += /etc/opt/csw/mail/sm-client.st
-SAMPLECONF += /etc/opt/csw/mail/statistics
-SAMPLECONF += /etc/opt/csw/mail/submit.cf
-SAMPLECONF += /etc/opt/csw/mail/trusted-users
-USERGROUP = /etc/opt/csw/pkg/CSWsendmail/cswusergroup
+INITSMF     = /etc/opt/csw/init.d/cswsendmail
+SAMPLECONF += $(addprefix /etc/opt/csw/mail/,$(CONFFILES))
+SAMPLECONF += /var/opt/csw/spool/clientmqueue/sm-client.st
+USERGROUP   = /etc/opt/csw/pkg/CSWsendmail/cswusergroup
 
 # Enable support for files > 2GB in size.
 EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
@@ -76,7 +76,7 @@
 
 #ENABLE_CHECK = 0
 
-# patch away GNUism
+# Patch away GNUism
 PATCHFILES = patch-CC-M.m4
 
 CONFIGURE_SCRIPTS   = custom
@@ -85,14 +85,14 @@
 INSTALL_SCRIPTS     = custom
 EXTRA_MERGE_SCRIPTS = OS
 
-# Temporary overrides
-CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/README
+# Collisions with Postfix naming it's files after the Sendmail de facto standard
 CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/share/man/man1/mailq.1|CSWpostfix|CSWsendmail
-CHECKPKG_OVERRIDES_CSWsendmail += surplus-dependency|CSWbdb48
 CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/bin/newaliases|CSWpostfix|CSWsendmail
 CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/share/man/man5/aliases.5|CSWpostfix|CSWsendmail
 CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/bin/mailq|CSWpostfix|CSWsendmail
 CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/share/man/man1/newaliases.1|CSWpostfix|CSWsendmail
+# Look thru these to see if they are harmless, e.g. examples
+CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/README
 CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/share|root/opt/csw/share/mail/cf/README
 CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/smrsh.8
 CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/sendmail.8
@@ -125,8 +125,8 @@
 MANFILES8 = sendmail/sendmail.8 mailstats/mailstats.8 makemap/makemap.8 \
             praliases/praliases.8 smrsh/smrsh.8 mail.local/mail.local.8 \
             rmail/rmail.8 editmap/editmap.8
-CONFFILES = aliases helpfile local-host-names README.CSW sendmail.cf \
-            sm-client.st statistics submit.cf trusted-users
+CONFFILES = aliases helpfile local-host-names sendmail.cf \
+            statistics submit.cf trusted-users
 
 configure-custom:
 	@echo " ==> Configuring $(NAME) (custom)"
@@ -204,13 +204,17 @@
 		ginstall -m 644 $(DOWNLOADDIR)/$$file \
 		$(DESTDIR)$(sysconfdir)/mail/$$file; \
 		done )
-	( mv $(DESTDIR)$(sysconfdir)/mail/sm-client.st \
+	( mv $(DOWNLOADDIR)/sm-client.st \
 		$(DESTDIR)/var/opt/csw/spool/clientmqueue/ )
 
 	@# usergroup
 	@ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWsendmail
 	@ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWsendmail/
 
+	@# README
+	@ginstall -m 755 -d $(DESTDIR)$(docdir)/$(NAME)
+	@ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)$(docdir)/$(NAME)/
+
 	@$(MAKECOOKIE)
 
 merge-OS:

Modified: csw/mgar/pkg/sendmail/trunk/files/site.config.m4
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/site.config.m4	2011-06-15 12:53:56 UTC (rev 14820)
+++ csw/mgar/pkg/sendmail/trunk/files/site.config.m4	2011-06-15 20:03:34 UTC (rev 14821)
@@ -10,7 +10,7 @@
 define(`confEBINDIR',`/opt/csw/lib')
 define(`confUBINDIR',`/opt/csw/bin')
 define(`confSBINDIR',`/opt/csw/sbin')
-define(`confSTDIR', `/opt/csw/etc/mail')
+define(`confSTDIR', `/etc/opt/csw/mail')
 define(`confSHAREDLIBDIR', `/opt/csw/lib')
 define(`confMANROOT', `/opt/csw/share/man/cat')
 define(`confMANROOTMAN', `/opt/csw/share/man/man')
@@ -22,6 +22,13 @@
 APPENDDEF(`confINCDIRS', `-I/opt/csw/include')
 APPENDDEF(`conf_sendmail_ENVDEF', `-I/opt/csw/include')
 
+dnl ### add BerkeleyDB hash support
+dnl APPENDDEF(`confLIBDIRS', `-L/opt/csw/bdb48/lib')
+dnl APPENDDEF(`confINCDIRS', `-I/opt/csw/bdb48/include')
+dnl APPENDDEF(`confLIBDIRS', `-L/opt/csw/lib')
+dnl APPENDDEF(`confINCDIRS', `-I/opt/csw/include')
+dnl APPENDDEF(`confENVDEF', `-DNEWDB')
+
 dnl ### add NIS/NIS+ support
 APPENDDEF(`confENVDEF', `-DNIS')
 APPENDDEF(`confENVDEF', `-DNISPLUS')


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

More information about the devel mailing list