Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv27745
Modified Files: postfix.info Log Message: New upstream version (2.3.2). Added -ldap variant. Index: postfix.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/postfix.info,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- postfix.info 27 Jul 2006 00:26:43 -0000 1.7 +++ postfix.info 10 Aug 2006 03:41:49 -0000 1.8 @@ -1,8 +1,8 @@ Info2: << -Package: postfix%type_pkg[-mysql] -Version: 2.3.1 +Package: postfix%type_pkg[-mysql]%type_pkg[-ldap] +Version: 2.3.2 Revision: 1011 -Type: -mysql (boolean) +Type: -mysql (boolean), -ldap (boolean) Homepage: http://www.postfix.org/ Description: Mail transfer agent that's fast and secure @@ -54,19 +54,23 @@ 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, db44-aes-shlibs (>= 4.4.16-1001) | db44-shlibs (>= 4.4.16-1001), pcre-shlibs, cyrus-sasl2-shlibs, (%type_raw[-mysql] = -mysql) mysql14-shlibs (>= 4.1.10-1002) -BuildDepends: db44-aes (>= 4.4.16-1001) | db44 (>= 4.4.16-1001), pcre, cyrus-sasl2-dev, system-openssl-dev, (%type_raw[-mysql] = -mysql) mysql14-dev (>= 4.1.10-1002) -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: daemonic, db44-aes-shlibs (>= 4.4.16-1001) | db44-shlibs (>= 4.4.16-1001), pcre-shlibs, cyrus-sasl2-shlibs, (%type_raw[-mysql] = -mysql) mysql14-shlibs (>= 4.1.10-1002), (%type_raw[-ldap] = -ldap) openldap23-shlibs +BuildDepends: db44-aes (>= 4.4.16-1001) | db44 (>= 4.4.16-1001), pcre, cyrus-sasl2-dev, system-openssl-dev, (%type_raw[-mysql] = -mysql) mysql14-dev (>= 4.1.10-1002), (%type_raw[-ldap] = -ldap) openldap23-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: c4969321233186f6fc386a10b858c63b +Source-MD5: b1e482eea6a340041b8a637e62b15e3c PatchScript: << sed 's|@FINKPREFIX@|%p|g ' <%a/%{ni}.patch | patch -p1 @@ -77,22 +81,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 -DUSE_CYRUS_SASL -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\" \ @@ -103,9 +93,26 @@ -DDEF_QUEUE_DIR=\"%p/var/spool/postfix\" \ -DDEF_SENDMAIL_PATH=\"%p/sbin/sendmail\" \ -DUSE_TLS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL \ - -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" + -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,14 +165,14 @@ fi << SplitOff: << - Package: postfix%type_pkg[-mysql]-tls - Description: Upgrade package for postfix%type_pkg[-mysql]-tls + Package: postfix%type_pkg[-mysql]%type_pkg[-ldap]-tls + Description: Upgrade package for postfix%type_pkg[-mysql]%type_pkg[-ldap]-tls Depends: %N (= %v-%r) DocFiles: LICENSE << SplitOff2: << - Package: postfix%type_pkg[-mysql]-unified - Description: Upgrade package for postfix%type_pkg[-mysql]-unified + Package: postfix%type_pkg[-mysql]%type_pkg[-ldap]-unified + Description: Upgrade package for postfix%type_pkg[-mysql]%type_pkg[-ldap]-unified Depends: %N (= %v-%r) DocFiles: LICENSE << ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits