diff options
| author | Jim P <jim@pingle.org> | 2013-04-09 10:28:34 -0700 |
|---|---|---|
| committer | Jim P <jim@pingle.org> | 2013-04-09 10:28:34 -0700 |
| commit | 54a1f4b25572b7590a99ab2c1fd3e08dc46ecbbe (patch) | |
| tree | ed29d833a7afe45198c2ee63a63a261d01d23120 | |
| parent | 3bd317a7e0009072fa27b555fc07866d0003269a (diff) | |
| parent | 9e8aef5dd920e25b8d0ffa808fbaa43979d8d76a (diff) | |
| download | pfsense-packages-54a1f4b25572b7590a99ab2c1fd3e08dc46ecbbe.tar.gz pfsense-packages-54a1f4b25572b7590a99ab2c1fd3e08dc46ecbbe.tar.bz2 pfsense-packages-54a1f4b25572b7590a99ab2c1fd3e08dc46ecbbe.zip | |
Merge pull request #422 from PiBa-NL/haproxy-devel-2.1
haproxy-devel, compile against the newer version of OpenSSL 1.0.1
| -rw-r--r-- | pkg_config.8.xml | 3 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 57dcb948..39338211 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -193,10 +193,11 @@ <depends_on_package_pbi>haproxy-devel-1.5-dev17-i386.pbi</depends_on_package_pbi> <build_port_path>/usr/ports/net/haproxy-devel</build_port_path> <build_pbi> + <ports_before>security/openssl/</ports_before> <custom_name>haproxy-devel</custom_name> <port>/usr/ports/net/haproxy-devel</port> </build_pbi> - <build_options>OPTIONS_UNSET=PCRE DPCRE;OPTIONS_SET=OPENSSL SPCRE</build_options> + <build_options>WITH_PORTS_OPENSSL=yes;OPTIONS_UNSET=PCRE DPCRE;OPTIONS_SET=OPENSSL SPCRE</build_options> </package> <package> <name>Apache with mod_security-dev</name> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index b3425663..242ed93d 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -180,10 +180,11 @@ <depends_on_package_pbi>haproxy-devel-1.5-dev17-amd64.pbi</depends_on_package_pbi> <build_port_path>/usr/ports/net/haproxy-devel</build_port_path> <build_pbi> + <ports_before>security/openssl/</ports_before> <custom_name>haproxy-devel</custom_name> <port>/usr/ports/net/haproxy-devel</port> </build_pbi> - <build_options>OPTIONS_UNSET=PCRE DPCRE;OPTIONS_SET=OPENSSL SPCRE</build_options> + <build_options>WITH_PORTS_OPENSSL=yes;OPTIONS_UNSET=PCRE DPCRE;OPTIONS_SET=OPENSSL SPCRE</build_options> </package> <package> <name>Apache with mod_security-dev</name> |