Changeset 14445 for trunk/dports


Ignore:
Timestamp:
Oct 6, 2005, 7:26:32 PM (14 years ago)
Author:
mww
Message:

update to 2.5.STABLE11, some cleaning up

Location:
trunk/dports/net/squid
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/net/squid/Portfile

    r13471 r14445  
    1 # $Id: Portfile,v 1.12 2005/08/11 21:33:24 rshaw Exp $
     1# $Id: Portfile,v 1.13 2005/10/06 19:26:31 mww Exp $
    22
    33PortSystem 1.0
    44
    55name                    squid
    6 version                 2.5.STABLE10
    7 revision                1
     6version                 2.5.STABLE11
    87categories              net
    98platforms               darwin
     
    2120homepage                http://www.squid-cache.org/
    2221master_sites    ${homepage}/Versions/v2/2.5/
    23 checksums               md5 e6db8bdfc783b3baed7de803c9a39e55
     22checksums               md5 5e7f13ad95b64b60ddd6cdc2ab800d67
    2423use_bzip2               yes
    2524patchfiles              patch-cf.data.pre.diff
     
    3635build.args              DEFAULT_PID_FILE=${prefix}/var/run/squid/squid.pid
    3736
     37startupitem.create              yes
     38startupitem.name                Squid
     39startupitem.start \
     40        "cd ${prefix}/var/squid" \
     41        "if \[ ! -d \"${prefix}/var/squid/cache/00\" \]; then" \
     42        "\tsu -fm squid -c \"exec ${prefix}/sbin/squid -s -z\"" \
     43        "fi" \
     44        "su -fm squid -c \"exec ${prefix}/sbin/squid -s\""
     45startupitem.stop \
     46        "cd ${prefix}/var/squid" \
     47        "su -fm squid -c \"exec ${prefix}/sbin/squid -k kill\""
     48
    3849pre-destroot {
    3950        addgroup squid
     
    4152        adduser squid gid=${gid} realname=Squid\ Proxy home=${prefix}/var/squid
    4253}
    43 destroot.keepdirs       ${destroot}${prefix}/var/run/squid \
    44                                 ${destroot}${prefix}/var/squid/cache \
    45                                 ${destroot}${prefix}/var/squid/logs
    4654post-destroot   {
    47         cd ${destroot}${prefix}
    48         reinplace "s|/etc/squid|${prefix}/etc/squid|g" share/man/man8/squid.8
     55        reinplace "s|/etc/squid|${prefix}/etc/squid|g" \
     56                ${destroot}${prefix}/share/man/man8/squid.8
    4957        xinstall -o squid -g squid -m 755 -d \
    5058                var/run/squid var/squid var/squid/cache var/squid/logs
    5159        cd ${destroot}${prefix}/etc/squid
    5260        file delete -force squid.conf mime.conf
    53         file rename squid.conf.default squid.conf-dist
    54         file rename mime.conf.default mime.conf-dist
    55         # squid start/stop rc script (if non-Darwin)
    56         if {![variant_isset darwin]} {
    57                 xinstall -d -m 0755 etc/rc.d
    58                 xinstall -m 0755 ${filespath}/squid.sh.in etc/rc.d/squid.sh
    59                 reinplace "s|__PREFIX|${prefix}|g" etc/rc.d/squid.sh
    60                 reinplace "s|__UID|squid|g" etc/rc.d/squid.sh
     61}
     62destroot.keepdirs       ${destroot}${prefix}/var/run/squid \
     63                                ${destroot}${prefix}/var/squid/cache \
     64                                ${destroot}${prefix}/var/squid/logs
     65
     66post-activate {
     67        # Make sure initial conf files are present and setup correctly
     68        foreach f { squid.conf mime.conf } {
     69                if {![file exists ${prefix}/etc/squid/${f}]} {
     70                        file copy ${prefix}/etc/squid/${f}.default \
     71                                ${prefix}/etc/squid/${f}
     72                }
    6173        }
    6274}
    6375
    64 pre-install {
    65         addgroup squid
    66         set gid [existsgroup squid]
    67         adduser squid gid=${gid} realname=Squid\ Proxy home=${prefix}/var/squid
     76platform darwin 8 {
     77        configure.env   CC=/usr/bin/gcc-4.0 CPP=/usr/bin/cpp-4.0 CXX=/usr/bin/g++-4.0
    6878}
    69 
    70 post-activate {
    71         # Make sure initial conf files are present and setup correctly
    72         if {![file exists ${prefix}/etc/squid/squid.conf]} {
    73                 xinstall -m 0644 ${prefix}/etc/squid/squid.conf-dist \
    74                         ${prefix}/etc/squid/squid.conf
    75         }
    76         if {![file exists ${prefix}/etc/squid/mime.conf]} {
    77                 xinstall -m 0644 ${prefix}/etc/squid/mime.conf-dist \
    78                         ${prefix}/etc/squid/mime.conf
    79         }
    80 }
    81 
    82 platform darwin {
    83         startupitem.create              yes
    84         startupitem.name                Squid
    85         startupitem.start \
    86                 "cd ${prefix}/var/squid" \
    87                 "if \[ ! -d \"${prefix}/var/squid/cache/00\" \]; then" \
    88                 "\tsu -fm squid -c \"exec ${prefix}/sbin/squid -s -z\"" \
    89                 "fi" \
    90                 "su -fm squid -c \"exec ${prefix}/sbin/squid -s\""
    91         startupitem.stop \
    92                 "cd ${prefix}/var/squid" \
    93                 "su -fm squid -c \"exec ${prefix}/sbin/squid -k kill\""
    94 }
  • trunk/dports/net/squid/files/patch-cf.data.pre.diff

    r12412 r14445  
    1 --- src/cf.data.pre.orig        2005-05-11 01:08:40.000000000 +0200
    2 +++ src/cf.data.pre     2005-05-25 17:58:35.000000000 +0200
     1--- src/cf.data.pre     2005-09-13 15:44:35.000000000 +0200
     2+++ src/cf.data.pre     2005-10-06 21:10:41.000000000 +0200
    33@@ -2199,10 +2199,10 @@
    44 # We strongly recommend the following be uncommented to protect innocent
     
    1414 # to list your (internal) IP networks from where browsing should
    1515 # be allowed
    16 @@ -2446,12 +2446,12 @@
     16@@ -2471,12 +2471,12 @@
    1717 
    1818 NAME: cache_effective_user
Note: See TracChangeset for help on using the changeset viewer.