[Lunar-commits] r19876 - moonbase/trunk/mail/postfix

[Auke Kok]

Author: sofar
Date: 2006-04-27 18:22:45 +0000 (Thu, 27 Apr 2006)
New Revision: 19876

Removed:
   moonbase/trunk/mail/postfix/POST_INSTALL
Modified:
   moonbase/trunk/mail/postfix/BUILD
   moonbase/trunk/mail/postfix/DEPENDS
Log:
o Remove POST_ISNTALL which we can do in BUILD better
o Insert bogus --without-* flags to properly track in_depends and disable
  installed dependencies
o minor cosmetic cleanups


Modified: moonbase/trunk/mail/postfix/BUILD
===================================================================
--- moonbase/trunk/mail/postfix/BUILD	2006-04-27 13:27:16 UTC (rev 19875)
+++ moonbase/trunk/mail/postfix/BUILD	2006-04-27 18:22:45 UTC (rev 19876)
@@ -1,5 +1,7 @@
 (
 
+  sedit "s:#mail_spool_directory = .*:mail_spool_directory = /var/spool/mail:" conf/main.cf
+
   add_priv_user postdrop:postdrop    &&
   add_priv_user postfix:postfix      &&
   add_priv_user mail:mail            &&
@@ -9,27 +11,27 @@
   chmod  1777       /var/spool/mail  &&
   chown  mail:mail  /var/spool/mail  &&
 
-  if module_installed openldap ; then
+  if in_depends $MODULE openldap ; then
     AUXLIBS="-lldap -llber"
     CCARGS="-DHAS_LDAP"
   fi  &&
 
-  if module_installed Linux-PAM ; then
+  if in_depends $MODULE Linux-PAM ; then
     AUXLIBS=$AUXLIBS" -lpam -lpam_misc"
     CCARGS=$CCARGS" -DHAS_PAM"
   fi  &&
 
-  if module_installed mysql ; then
+  if in_depends $MODULE mysql ; then
     AUXLIBS=$AUXLIBS" -lmysqlclient -lz -lm"
     CCARGS=$CCARGS" -DHAS_MYSQL -I/usr/include/mysql"
   fi  &&
 
-  if module_installed postgresql ; then
+  if in_depends $MODULE postgresql ; then
     AUXLIBS=$AUXLIBS" -lpq"
     CCARGS=$CCARGS" -DHAS_PGSQL -I/usr/include/pgsql"
   fi  &&
 
-  if module_installed cyrus-sasl ; then
+  if in_depends $MODULE cyrus-sasl ; then
     AUXLIBS=$AUXLIBS" -lsasl2 -lssl -lcrypto"
     CCARGS=$CCARGS" -DUSE_SASL_AUTH -I/usr/include/sasl -DUSE_TLS -I/usr/include/openssl"
   fi  &&
@@ -37,11 +39,8 @@
   AUXLIBS=$AUXLIBS" -lpthread"
   echo CCARGS=$CCARGS      &&
   echo AUXLIBS=$AUXLIBS    &&
-  
-  make  "OPT=$CFLAGS"       \
-        "AUXLIBS=$AUXLIBS"  \
-        "CCARGS=$CCARGS"   &&
 
+  make "OPT=$CFLAGS" "AUXLIBS=$AUXLIBS" "CCARGS=$CCARGS"   &&
   prepare_install          &&
 
   sh postfix-install -non-interactive                   \
@@ -58,15 +57,7 @@
        sample_directory=/usr/share/doc/postfix/samples  \
        readme_directory=/usr/share/doc/postfix         &&
 
-  ln  -sf   ../sbin/sendmail   \
-           /usr/lib/sendmail  &&
+  ln -sf ../sbin/sendmail /usr/lib/sendmail  &&
+  ln -sf postfix/aliases /etc/aliases
 
-  ln  -sf  postfix/aliases  \
-              /etc/aliases
-
-  if [ -e "/etc/init.d/postfix.sh" ]; then
-     rm -f /etc/init.d/postfix.sh
-     rm -f /etc/rc?.d/???postfix.sh
-  fi
-
 ) > $C_FIFO 2>&1

Modified: moonbase/trunk/mail/postfix/DEPENDS
===================================================================
--- moonbase/trunk/mail/postfix/DEPENDS	2006-04-27 13:27:16 UTC (rev 19875)
+++ moonbase/trunk/mail/postfix/DEPENDS	2006-04-27 18:22:45 UTC (rev 19876)
@@ -2,10 +2,19 @@
 depends  db         &&
 depends  perl       &&
 
-optional_depends  "pcre"         "" ""  "for improved regexp support"        &&
-optional_depends  "openldap"     "" ""  "for ldap support"                   &&
-optional_depends  "mysql"        "" ""  "for mysql support"                  &&
-optional_depends  "postgresql"   "" ""  "for postgresqul support"            &&
-optional_depends  "cyrus-sasl"   "" ""  "for SMTP authentication and TSL"    &&
-optional_depends  "courier-imap" "" ""  "if you intend to run with Maildir"  &&
-optional_depends  "smtpclient"   "" ""  "useful with spamassassin & Maildir"
+# the --without-* options are fake but will trigger in_depends to
+# correctly disable *installed* optional dependencies --sofar
+optional_depends  "pcre"         "" "--without-pcre" \
+			"for improved regexp support"        &&
+optional_depends  "openldap"     "" "--without-openldap" \
+			"for ldap support"                   &&
+optional_depends  "mysql"        "" "--without-mysql" \
+			"for mysql support"                  &&
+optional_depends  "postgresql"   "" "--without-postgresql" \
+			"for postgresqul support"            &&
+optional_depends  "cyrus-sasl"   "" "--without-cyrus-sasl" \
+			"for SMTP authentication and TSL"    &&
+optional_depends  "courier-imap" "" "--without-courier-imap" \
+			"if you intend to run with Maildir"  &&
+optional_depends  "smtpclient"   "" "--without-smtpclient" \
+			"useful with spamassassin & Maildir"

Deleted: moonbase/trunk/mail/postfix/POST_INSTALL