mirror of
https://git.freebsd.org/ports.git
synced 2025-06-29 08:30:37 -04:00
bsd.default-versions.mk can rely on ARCH being defined. - In bsd.port.mk move inclusion of bsd.default-versions.mk from the pre-makefile section to the options section so the variables can be used earlier. Also put the bit of code sitting between the options section and the pre-makefile section into the options section. - Remove last few cases where ports set WITH_OPENSSL_PORT. This variable is handled in bsd.default-versions.mk and some ports were setting it after including bsd.port.options.mk. After FreeBSD 9 EoL all but a few ports, and then only when setting non-default options, work without setting that variable. PR: 215996 Exp-run by: antoine Approved by: portmgr (antoine)
18 lines
530 B
Text
18 lines
530 B
Text
--- SConstruct.orig 2014-01-17 06:40:03 UTC
|
|
+++ SConstruct
|
|
@@ -302,15 +302,6 @@ if (env["WITH_MDNS"]) and (sys.platform
|
|
print 'Please install libdns_sd'
|
|
Exit(1)
|
|
|
|
-if env["HAS_PKGCONFIG"]:
|
|
- if not conf.CheckPkg("openssl"):
|
|
- print 'openssl is not registered in pkg-config'
|
|
- Exit(1)
|
|
- if not conf.CheckPkgMinVersion("openssl", "1.0.0"):
|
|
- print 'openssl version 1.0.0 or above required'
|
|
- Exit(1)
|
|
- env.ParseConfig('pkg-config --libs --cflags openssl')
|
|
-
|
|
conf.Finish()
|
|
|
|
Export('env')
|