Ticket #18219: Portfile-qmail-spamcontrol.diff

File Portfile-qmail-spamcontrol.diff, 6.1 KB (added by compconsultant@…, 16 years ago)

Portfile patch file to go to new version

  • Portfile

    old new  
    1 # $Id: Portfile 40682 2008-10-10 17:19:39Z nox@macports.org $
     1# $Id$
    22
    33PortSystem      1.0
    44
    55name                            qmail-spamcontrol
    6 version                         2.4.18
    7 revision                        5
     6version                         2.5.19
     7revision                        0
    88categories                      mail
    99maintainers                     yahoo.com:compconsultant
    1010platforms                       darwin
     
    1717
    1818universal_variant               no
    1919
    20 variant relaymailfrom {}
    21 variant noreqbrackets {}
    22 variant noverp {}
    23 variant moreipme {}
    24 variant bigtodo {}
     20variant relaymailfrom description {Relay based on sender email, not a good idea} {}
     21variant noreqbrackets description {Do not require brackets in SMTP addresses} {}
     22variant noverp description {Do not alow VERP addresses for recipients} {}
     23variant moreipme description {Patch to account for certain NAT or load balance situations} {}
     24variant bigtodo description {May make very large installations more efficient} {}
    2525
    2626homepage                        http://www.fehcom.de/qmail/spamcontrol.html
    2727
     
    3232                                http://www.qmail.org/:qmail \
    3333
    3434distfiles                       qmail-1.03.tar.gz:qmail \
    35                                 spamcontrol-2418_tgz.bin:spamcontrol \
     35                                spamcontrol-2519_tgz.bin:spamcontrol \
    3636
    3737checksums                       qmail-1.03.tar.gz \
    3838                                        md5 622f65f982e380dbe86e6574f3abcb7c \
    3939                                        sha1 18fb960481291a0503e93a94df3f6094edb7f27a \
    4040                                        rmd160 b851f273f1d365d38efd949b1efcf35768ffa30f \
    41                                 spamcontrol-2418_tgz.bin \
    42                                         md5 a5502cd69e573a2753e532bce8fb6c3a \
    43                                         sha1 b2329b412a88ca2072cfb5e430efd1dd8a410b64 \
    44                                         rmd160 4306ff09148332f5ad4cb1a3ff3b5da74b888d79 \
     41                                spamcontrol-2519_tgz.bin \
     42                                        md5 acca46cc48d8b5cfa9eb3de4d3fc90ad \
     43                                        sha1 b259183cb9afd7a574ad598cb2399af5002226ec \
     44                                        rmd160 8374835ade0656145ba15eded23c6f8ce0a1b936 \
    4545
    4646worksrcdir              qmail-1.03
    4747
    4848patchfiles              patch-dns.c.diff \
    49                         patch-strerr_sys.c.diff
     49                        patch-strerr_sys.c.diff \
     50                        patch-qmail-lspawn.c.diff \
     51                        patch-qmail-rspawn.c.diff \
     52                        patch-qmail.c.diff \
     53                        patch-Makefile.diff
    5054
    5155configure.cflags        -O2 -include /usr/include/errno.h -c
    5256build.target            setup-patch
    5357destroot.cmd            ./install-destroot
    5458
     59pre-fetch {
     60        if {${os.platform} == "darwin" && ${os.major} == "6"} {
     61                return -code error "${name} requires Mac OS X 10.3 or newer."
     62        }
     63}
     64
    5565post-extract {
    5666
    5767        # Merge Spamcontrol source with Qmail source
     
    7282                ${worksrcpath}/conf-qmail
    7383}
    7484
    75 post-patch {
     85pre-patch {
    7686                # Apply Spamcontrol patches
    7787                foreach file [glob ${worksrcpath}/*.patch] {
    78                         system "patch -p2 <${file}"
     88                        system "patch -d ${worksrcpath} -p2 <${file}"
    7989                }
     90}
    8091
    81                 # Append our commands for making a destroot installer
    82                 # This is because Spamcontrol and us needs to patch Makefile
    83                 system "cat ${filespath}/append-Makefile >>${worksrcpath}/Makefile"
     92post-patch {
    8493
    8594                # Handle the variants, disable via source code define change
    8695                foreach file [glob ${worksrcpath}/*c] {
     
    168177       
    169178        # Additional Spamcontrol files
    170179        xinstall -d ${destroot}${prefix}/var/qmail/scripts
    171         xinstall -W ${worksrcpath} \
    172                 qmail-alias2recipients \
    173                 qmail-users2recipients \
    174                 qmail-pwd2recipients \
    175                 qmail-vpopmail2recipients \
    176                 ${destroot}${prefix}/var/qmail/scripts
    177         xinstall -m 644 -W ${worksrcpath} \
    178                 conf-spamcontrol \
    179                 ucspi-ssl-0.70_ucspitls-0.4.patch_ \
    180                 clamav-0.90.1_output.patch_ \
    181                 Makefile.djbdns \
    182                 badmailfrom \
    183                 badmimetypes \
    184                 badloadertypes \
    185                 badrcptto \
    186                 tarpitcount \
    187                 README_spamcontrol.html \
    188                 README.wildmat \
    189                 README.moreipme \
    190                 README.bigtodo \
    191                 README.qmailqueue \
    192                 README.bouncemaxbytes \
    193                 README.doublebouncetrim \
    194                 README.recipients \
    195                 README.djbdns \
    196                 INSTALL.spamcontrol \
    197                 HISTORY.spamcontrol \
    198                 FILES.spamcontrol \
    199                 LICENSE.spamcontrol \
    200                 TODO.spamcontrol \
    201                 RELEASE_22.spamcontrol \
    202                 RELEASE_23.spamcontrol \
    203                 RELEASE_24.spamcontrol \
    204                 LOGGING.spamcontrol \
    205                 SMTPREPLY.spamcontrol \
    206                 README.mav \
    207                 PROPOSAL.mav \
    208                 README.clamav \
    209                 ${destroot}${prefix}/var/qmail/doc
    210         xinstall -W ${worksrcpath} \
    211                 install_spamcontrol.sh \
    212                 ${destroot}${prefix}/var/qmail/doc
     180        foreach file {qmail-alias2recipients qmail-users2recipients qmail-pwd2recipients qmail-vpopmail2recipients} {
     181                xinstall -W ${worksrcpath} ${file} ${destroot}${prefix}/var/qmail/scripts
     182        }
     183        foreach file {conf-spamcontrol ucspi-ssl-0.70_ucspitls-0.4.patch_ clamav-0.90.1_output.patch_ Makefile.djbdns badmailfrom badmimetypes badloadertypes badrcptto INSTALL.spamcontrol HISTORY.spamcontrol FILES.spamcontrol LICENSE.spamcontrol TODO.spamcontrol LOGGING.spamcontrol SMTPREPLY.spamcontrol PROPOSAL.mav install_spamcontrol.sh} {
     184                xinstall -m 644 -W ${worksrcpath} ${file} ${destroot}${prefix}/var/qmail/doc
     185        }
     186        foreach file [glob -directory ${worksrcpath} README* RELEASE*] {
     187                xinstall -m 644 ${file} ${destroot}${prefix}/var/qmail/doc
     188        }
    213189
    214190        # User must run this
    215191        xinstall -W ${worksrcpath} config-fast ${destroot}${prefix}/var/qmail/scripts/config-fast
    216192
    217193        # Per Qmail install doc
    218         xinstall ${destroot}${prefix}/var/qmail/boot/home ${destroot}${prefix}/var/qmail/rc
     194        xinstall ${destroot}${prefix}/var/qmail/boot/home ${destroot}${prefix}/var/qmail/rc.sample
    219195}
    220196
    221197post-install {
     
    228204The fehcom site has docs for all the stuff added to the base qmail software.
    229205There are numerous configuration options to qmail. Please read all the docs!
    230206******************************
     207NEW INSTALLS ONLY
    231208For now, you must run ${prefix}/var/qmail/scripts/config-fast your.domain.name
    232209to set up some files for your mail server. your.domain.name should point
    233210to this machine you are installing qmail on.
     
    237214
    238215post-activate {
    239216
    240         # Remove the turd files
     217        # Remove the turd files, it is not know if they cause a problem but
     218        # people have recommended not having them there.
    241219        system "cd ${prefix}/var/qmail; find . -name .turd_${name} -delete"
    242         system "rm ${destroot}${prefix}/var/log/qmail/smtpd/.turd_${name}"
    243 }
    244 
    245 platform darwin 6 {
    246         pre-fetch {
    247                 error "${name} requires Mac OS X 10.3 or newer."
    248         }
    249220}
    250221
    251222livecheck.check                 regex
    252 livecheck.regex                 {Version\s+([0-9.]+)<}
     223livecheck.regex                 {SPAMCONTROL\sVersion\s([0-9.]+)}