diff options
| author | Renato Botelho <renato@netgate.com> | 2015-10-10 10:03:38 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-10-10 10:03:38 -0300 |
| commit | 3bd5c2bd64800857ebd86b98668d9d499735c536 (patch) | |
| tree | 8f7063f4794581d1da2bcf5c9314ea9e7c564cd3 | |
| parent | f075e28fbb331d122ec41a99bfe9ade616a8b492 (diff) | |
| parent | df4e84f5e37668a8a6f78df201cc481321d23e7e (diff) | |
| download | pfsense-packages-3bd5c2bd64800857ebd86b98668d9d499735c536.tar.gz pfsense-packages-3bd5c2bd64800857ebd86b98668d9d499735c536.tar.bz2 pfsense-packages-3bd5c2bd64800857ebd86b98668d9d499735c536.zip | |
Merge pull request #1091 from doktornotor/patch-1
| -rw-r--r-- | pkg_config.10.xml | 1 | ||||
| -rw-r--r-- | pkg_config.8.xml | 1 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 224f9fa0..610b777f 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -1201,6 +1201,7 @@ <ports_after>security/clamav</ports_after> </build_pbi> <build_options>CLAMAVUSER=havp;CLAMAVGROUP=havp</build_options> + <conflicts>squid3</conflicts> <version>1.10.0</version> <status>BETA</status> <required_version>2.2</required_version> diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 6bf4dc6e..b5dfe9ec 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1377,6 +1377,7 @@ <depends_on_package_pbi>havp-0.91_1-i386.pbi</depends_on_package_pbi> <build_port_path>/usr/ports/www/havp</build_port_path> <build_options>CLAMAVUSER=havp;CLAMAVGROUP=havp</build_options> + <conflicts>squid3-dev</conflicts> <version>0.91_1 pkg v1.10.0</version> <status>BETA</status> <required_version>1.2.2</required_version> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 8c8b54e7..4a479f28 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1364,6 +1364,7 @@ <depends_on_package_pbi>havp-0.91_1-amd64.pbi</depends_on_package_pbi> <build_port_path>/usr/ports/www/havp</build_port_path> <build_options>CLAMAVUSER=havp;CLAMAVGROUP=havp</build_options> + <conflicts>squid3-dev</conflicts> <version>0.91_1 pkg v1.10.0</version> <status>BETA</status> <required_version>1.2.2</required_version> |