diff options
| author | tijl <tijl@FreeBSD.org> | 2017-02-06 05:20:24 +0800 |
|---|---|---|
| committer | tijl <tijl@FreeBSD.org> | 2017-02-06 05:20:24 +0800 |
| commit | 766087b5ea83ecaaaffe737d90df248e9f40ef0d (patch) | |
| tree | 7c63a95968ed9b4eb610fca1b72ff17c7d9581c2 /Mk | |
| parent | d9d1054d95b1ce955b4ac3a668f60925fba13fac (diff) | |
| download | freebsd-ports-gnome-766087b5ea83ecaaaffe737d90df248e9f40ef0d.tar.gz freebsd-ports-gnome-766087b5ea83ecaaaffe737d90df248e9f40ef0d.tar.zst freebsd-ports-gnome-766087b5ea83ecaaaffe737d90df248e9f40ef0d.zip | |
- Remove inclusion of bsd.default-versions.mk from ftp/curl/Makefile so
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)
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.default-versions.mk | 2 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index dc952cb9b393..592ba2b447e4 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -41,7 +41,7 @@ FPC_DEFAULT?= 3.0.0 GCC_DEFAULT?= 4.9 # Possible values: 7, 8, 9, agpl GHOSTSCRIPT_DEFAULT?= agpl -.if defined(ARCH) && ${ARCH} == amd64 +.if ${ARCH} == amd64 # Possible values: c6, c6_64, c7 LINUX_DEFAULT?= c6_64 .else diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 51faba6d8d22..fd958063a0ba 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1266,8 +1266,6 @@ GROUPS_BLACKLIST= _dhcp _pflogd _ypldap audit authpf bin bind daemon dialer ftp LDCONFIG_DIR= libdata/ldconfig LDCONFIG32_DIR= libdata/ldconfig32 -.endif - # At least KDE needs TMPDIR for the package building, # so we're setting it to the known default value. .if defined(PACKAGE_BUILDING) @@ -1280,8 +1278,12 @@ WITH_DEBUG= yes .endif .endif +.include "${PORTSDIR}/Mk/bsd.default-versions.mk" .include "${PORTSDIR}/Mk/bsd.options.mk" +.endif +# End of options section. + # Start of pre-makefile section. .if !defined(AFTERPORTMK) && !defined(INOPTIONSMK) @@ -1291,8 +1293,6 @@ WITH_DEBUG= yes _PREMKINCLUDED= yes -.include "${PORTSDIR}/Mk/bsd.default-versions.mk" - .if defined(PORTVERSION) .if ${PORTVERSION:M*[-_,]*}x != x IGNORE= PORTVERSION ${PORTVERSION} may not contain '-' '_' or ',' |