diff options
| author | jim-p <jimp@pfsense.org> | 2012-06-24 20:00:19 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2012-06-24 20:00:19 -0400 |
| commit | 175f4385290a3ec6f8f0148fe8fee44a666c7ab2 (patch) | |
| tree | 47e1bd7303369ed332e7d9eb5734a7b7754c29ba | |
| parent | ee1433b5d8582578a1a5aa8ad4d4b4ba1c8b813d (diff) | |
| download | pfsense-packages-175f4385290a3ec6f8f0148fe8fee44a666c7ab2.tar.gz pfsense-packages-175f4385290a3ec6f8f0148fe8fee44a666c7ab2.tar.bz2 pfsense-packages-175f4385290a3ec6f8f0148fe8fee44a666c7ab2.zip | |
Move squid3's build directive to .pbi since the old style would lead to a build conflict for 2.x packages.
| -rw-r--r-- | pkg_config.8.xml | 6 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/pkg_config.8.xml b/pkg_config.8.xml index e1088cf0..2259e216 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1197,7 +1197,11 @@ <depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url> <depends_on_package>squid-3.1.20.tbz</depends_on_package> <depends_on_package>libwww-5.4.0_4.tbz</depends_on_package> - <build_port_path>/usr/ports/www/squid31</build_port_path> + <build_pbi> + <ports_before>www/libwww</ports_before> + <port>www/squid31</port> + <ports_after>www/squid_radius_auth</ports_after> + </build_pbi> <build_options>WITH_SQUID_KERB_AUTH=true WITH_SQUID_LDAP_AUTH=true WITH_SQUID_NIS_AUTH=true WITH_SQUID_SASL_AUTH=true WITH_SQUID_IPV6=true WITH_SQUID_DELAY_POOLS=true WITH_SQUID_SNMP=true WITH_SQUID_SSL=true WITH_SQUID_SSL_CRTD=true WITH_SQUID_PINGER=true WITHOUT_SQUID_DNS_HELPER=true WITH_SQUID_HTCP=true WITH_SQUID_VIA_DB=true WITH_SQUID_CACHE_DIGESTS=true WITHOUT_SQUID_WCCP=true WITH_SQUID_WCCPV2=true WITHOUT_SQUID_STRICT_HTTP=true WITH_SQUID_IDENT=true WITH_SQUID_REFERER_LOG=true WITH_SQUID_USERAGENT_LOG=true WITH_SQUID_ARP_ACL=true WITH_SQUID_IPFW=true WITH_SQUID_PF=true WITHOUT_SQUID_IPFILTER=true WITH_SQUID_FOLLOW_XFF=true WITHOUT_SQUID_ECAP=true WITHOUT_SQUID_ICAP=true WITHOUT_SQUID_ESI=true WITH_SQUID_AUFS=true WITHOUT_SQUID_COSS=true WITHOUT_SQUID_KQUEUE=true WITH_SQUID_LARGEFILE=true WITHOUT_SQUID_STACKTRACES=true WITHOUT_SQUID_DEBUG=true</build_options> <config_file>http://www.pfsense.org/packages/config/squid-reverse/squid.xml</config_file> <configurationfile>squid.xml</configurationfile> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 31098c04..43ee29b4 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1184,7 +1184,11 @@ <depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url> <depends_on_package>squid-3.1.20.tbz</depends_on_package> <depends_on_package>libwww-5.4.0_4.tbz</depends_on_package> - <build_port_path>/usr/ports/www/squid31</build_port_path> + <build_pbi> + <ports_before>www/libwww</ports_before> + <port>www/squid31</port> + <ports_after>www/squid_radius_auth</ports_after> + </build_pbi> <build_options>WITH_SQUID_KERB_AUTH=true WITH_SQUID_LDAP_AUTH=true WITH_SQUID_NIS_AUTH=true WITH_SQUID_SASL_AUTH=true WITH_SQUID_IPV6=true WITH_SQUID_DELAY_POOLS=true WITH_SQUID_SNMP=true WITH_SQUID_SSL=true WITH_SQUID_SSL_CRTD=true WITH_SQUID_PINGER=true WITHOUT_SQUID_DNS_HELPER=true WITH_SQUID_HTCP=true WITH_SQUID_VIA_DB=true WITH_SQUID_CACHE_DIGESTS=true WITHOUT_SQUID_WCCP=true WITH_SQUID_WCCPV2=true WITHOUT_SQUID_STRICT_HTTP=true WITH_SQUID_IDENT=true WITH_SQUID_REFERER_LOG=true WITH_SQUID_USERAGENT_LOG=true WITH_SQUID_ARP_ACL=true WITH_SQUID_IPFW=true WITH_SQUID_PF=true WITHOUT_SQUID_IPFILTER=true WITH_SQUID_FOLLOW_XFF=true WITHOUT_SQUID_ECAP=true WITHOUT_SQUID_ICAP=true WITHOUT_SQUID_ESI=true WITH_SQUID_AUFS=true WITHOUT_SQUID_COSS=true WITHOUT_SQUID_KQUEUE=true WITH_SQUID_LARGEFILE=true WITHOUT_SQUID_STACKTRACES=true WITHOUT_SQUID_DEBUG=true</build_options> <config_file>http://www.pfsense.org/packages/config/squid-reverse/squid.xml</config_file> <configurationfile>squid.xml</configurationfile> |