Update of /cvsroot/fink/dists/10.3/stable/main/finkinfo/net In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv2329
Modified Files: postfix.info Log Message: Moved to stable. Index: postfix.info =================================================================== RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/net/postfix.info,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- postfix.info 15 Jul 2006 22:15:40 -0000 1.6 +++ postfix.info 4 Apr 2007 00:51:49 -0000 1.7 @@ -1,8 +1,8 @@ Info2: << -Package: postfix%type_pkg[-mysql] -Version: 2.2.10 +Package: postfix%type_pkg[-mysql]%type_pkg[-ldap] +Version: 2.3.8 Revision: 1 -Type: -mysql (boolean) +Type: -mysql (boolean), -ldap (boolean) Homepage: http://www.postfix.org/ Description: Mail transfer agent that's fast and secure @@ -54,22 +54,63 @@ Now uses system's OpenSSL (via system-openssl-dev) and removed from crypto tree. Yay! +Added -ldap variant. (Previously added -mysql variant). +Refactored CompileScript to allow easy adding of new variants. +Note to self: must add new variants to the upgrade SplitOffs and Replaces. :/ + Original maintainer: Daniel Parks <[EMAIL PROTECTED]> << License: OSI-Approved Maintainer: Daniel Johnson <[EMAIL PROTECTED]> -Depends: daemonic, db43-ssl-shlibs | db43-shlibs, pcre-shlibs, cyrus-sasl2-shlibs, (%type_raw[-mysql] = -mysql) mysql14-shlibs -BuildDepends: db43-ssl | db43, pcre, cyrus-sasl2-dev, system-openssl-dev, (%type_raw[-mysql] = -mysql) mysql14-dev -Conflicts: postfix-release, postfix, postfix-mysql -Replaces: postfix-release, postfix, postfix-mysql, postfix-tls (<< %v-%r), postfix-mysql-tls (<< %v-%r), postfix-unified (<< %v-%r), postfix-mysql-unified (<< %v-%r) +Depends: << + cyrus-sasl2-shlibs, + daemonic, + db43-ssl-shlibs | db43-shlibs, + (%type_raw[-mysql] = -mysql) mysql14-shlibs, + (%type_raw[-ldap] = -ldap) openldap23-shlibs, + pcre-shlibs +<< +BuildDepends: << + cyrus-sasl2-dev, + db43-ssl | db43, + fink (>= 0.24.12), + (%type_raw[-mysql] = -mysql) mysql14-dev, + (%type_raw[-ldap] = -ldap) openldap23-dev, + pcre, + system-openssl-dev +<< +Conflicts: << + postfix-release, + postfix, + postfix-mysql, + postfix-ldap, + postfix-mysql-ldap +<< +Replaces: << + postfix-release, + postfix, + postfix-mysql, + postfix-ldap, + postfix-mysql-ldap, + postfix-tls (<< %v-%r), + postfix-mysql-tls (<< %v-%r), + postfix-unified (<< %v-%r), + postfix-mysql-unified (<< %v-%r), + postfix-ldap-tls (<< %v-%r), + postfix-mysql-ldap-tls (<< %v-%r), + postfix-ldap-unified (<< %v-%r), + postfix-mysql-ldap-unified (<< %v-%r) +<< Recommends: cyrus-sasl2 Source: ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-%v.tar.gz -Source-MD5: 440a4702182a79ac2f51e8974fb742c9 +Source-MD5: a6c560657788fc7a5444fa9ea32f5513 +PatchFile: %{ni}.patch +PatchFile-MD5: 57bab4ac93a4f9561fbed212ba696885 PatchScript: << -sed 's|@FINKPREFIX@|%p|g ' <%a/%{ni}.patch | patch -p1 +sed 's|@FINKPREFIX@|%p|g ' <%{PatchFile} | patch -p1 perl -pi.bak -e's,/(etc|var/spool)/postfix,%p/\1/postfix,g; s,/etc/aliases,%p/etc/postfix/aliases,g' man/man1/* man/man5/* man/man8/* conf/* html/*.html README_FILES/* << @@ -77,22 +118,8 @@ NoSetLDFLAGS: true CompileScript: << #!/bin/sh -ev -if [ "%type_raw[-mysql]" == "-mysql" ]; then - make makefiles CCARGS='-DDEF_COMMAND_DIR=\"%p/sbin\" \ - -DDEF_CONFIG_DIR=\"%p/etc/postfix\" \ - -DDEF_DAEMON_DIR=\"%p/lib/postfix\" \ - -DDEF_MAILQ_PATH=\"%p/bin/mailq\" \ - -DDEF_MANPAGE_DIR=\"%p/share/man\" \ - -DDEF_NEWALIAS_PATH=\"%p/bin/newaliases\" \ - -DDEF_README_DIR=\"%p/share/doc/%n/README_FILES\" \ - -DDEF_HTML_DIR=\"%p/share/doc/%n/html\" \ - -DDEF_QUEUE_DIR=\"%p/var/spool/postfix\" \ - -DDEF_SENDMAIL_PATH=\"%p/sbin/sendmail\" \ - -DUSE_TLS -DUSE_SASL_AUTH -DHAS_MYSQL \ - -I. -I../../include -I%p/include/mysql -I%p/lib/system-openssl/include -I%p/include/db4 -I%p/include/sasl -I%p/include' \ - AUXLIBS="-L%p/lib/system-openssl/lib -L%p/lib -lssl -lcrypto -ldb -lsasl2 -lmysqlclient" -else - make makefiles CCARGS='-DDEF_COMMAND_DIR=\"%p/sbin\" \ +#General build settings +export build_args='-DDEF_COMMAND_DIR=\"%p/sbin\" \ -DDEF_CONFIG_DIR=\"%p/etc/postfix\" \ -DDEF_DAEMON_DIR=\"%p/lib/postfix\" \ -DDEF_MAILQ_PATH=\"%p/bin/mailq\" \ @@ -102,10 +129,27 @@ -DDEF_HTML_DIR=\"%p/share/doc/%n/html\" \ -DDEF_QUEUE_DIR=\"%p/var/spool/postfix\" \ -DDEF_SENDMAIL_PATH=\"%p/sbin/sendmail\" \ - -DUSE_TLS -DUSE_SASL_AUTH \ - -I. -I../../include -I%p/lib/system-openssl/include -I%p/include/db4 -I%p/include/sasl -I%p/include' \ - AUXLIBS="-L%p/lib/system-openssl/lib -L%p/lib -lssl -lcrypto -ldb -lsasl2" + -DUSE_TLS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL \ + -I. -I../../include' +#General libraries +export lib_args="-L%p/lib/system-openssl/lib -L%p/lib -lssl -lcrypto -ldb -lsasl2" + +#MySQL build settings +if [ "%type_raw[-mysql]" == "-mysql" ]; then + export build_args="$build_args -DHAS_MYSQL -I%p/include/mysql" + export lib_args="$lib_args -lmysqlclient" +fi + +#More general build settings +export build_args="$build_args -I%p/lib/system-openssl/include -I%p/include/db4 -I%p/include/sasl -I%p/include" + +#LDAP build settings +if [ "%type_raw[-ldap]" == "-ldap" ]; then + export build_args="$build_args -DHAS_LDAP" + export lib_args="$lib_args -lldap -llber" fi + +make makefiles CCARGS="$build_args" AUXLIBS="$lib_args" make << @@ -158,15 +202,15 @@ fi << SplitOff: << - Package: postfix%type_pkg[-mysql]-tls - Description: Upgrade package for postfix%type_pkg[-mysql]-tls - Depends: %N (= %v-%r) + Package: postfix%type_pkg[-mysql]%type_pkg[-ldap]-tls + Description: OBSOLETE use postfix%type_pkg[-mysql]%type_pkg[-ldap] instead + Depends: %N (= %v-%r), fink-obsolete-packages DocFiles: LICENSE << SplitOff2: << - Package: postfix%type_pkg[-mysql]-unified - Description: Upgrade package for postfix%type_pkg[-mysql]-unified - Depends: %N (= %v-%r) + Package: postfix%type_pkg[-mysql]%type_pkg[-ldap]-unified + Description: OBSOLETE use postfix%type_pkg[-mysql]%type_pkg[-ldap] instead + Depends: %N (= %v-%r), fink-obsolete-packages DocFiles: LICENSE << << ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits