diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2016-01-30 18:30:40 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2016-01-30 18:30:40 +0000 |
| commit | a234e43dd77ae3344ffe2e57095d82fe9f2594f6 (patch) | |
| tree | 7a458fbf8f81914222a665e886c0821f631aa0c6 /Mk | |
| parent | d0bd7169f84108d5fe512ace0845064ec1bd77c5 (diff) | |
| download | ports-a234e43dd77ae3344ffe2e57095d82fe9f2594f6.tar.gz ports-a234e43dd77ae3344ffe2e57095d82fe9f2594f6.zip | |
Notes
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.linux-apps.mk | 5 | ||||
| -rw-r--r-- | Mk/bsd.linux-rpm.mk | 6 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 4 |
3 files changed, 7 insertions, 8 deletions
diff --git a/Mk/bsd.linux-apps.mk b/Mk/bsd.linux-apps.mk index 0b8f97acd909..a36daca8968e 100644 --- a/Mk/bsd.linux-apps.mk +++ b/Mk/bsd.linux-apps.mk @@ -321,6 +321,7 @@ libogg_DETECT= ${libogg${LINUX_DIST_SUFFIX:S/-/_/}_FILE} libogg_PORT= ${PORTSDIR}/audio/linux${LINUX_BASEPORT_NAME}-libogg libpciaccess_c6_FILE= ${LINUXBASE}/usr/lib/libpciaccess.so.0.11.1 +libpciaccess_c6_64_FILE= ${LINUXBASE}/usr/lib64/libpciaccess.so.0.11.1 libpciaccess_DETECT= ${libpciaccess${LINUX_DIST_SUFFIX:S/-/_/}_FILE} libpciaccess_PORT= ${PORTSDIR}/devel/linux${LINUX_BASEPORT_NAME}-libpciaccess @@ -387,8 +388,8 @@ naslibs_PORT= ${PORTSDIR}/audio/linux${LINUX_BASEPORT_NAME}-nas-libs naslibs_DEPENDS= xorglibs openldap_f10_FILE= ${LINUXBASE}/usr/lib/libldap-2.4.so.2.2.0 -openldap_c6_FILE= ${LINUXBASE}/lib/libldap-2.4.so.2.10.2 -openldap_c6_64_FILE= ${LINUXBASE}/lib64/libldap-2.4.so.2.10.2 +openldap_c6_FILE= ${LINUXBASE}/lib/libldap-2.4.so.2.10.3 +openldap_c6_64_FILE= ${LINUXBASE}/lib64/libldap-2.4.so.2.10.3 openldap_DETECT= ${openldap${LINUX_DIST_SUFFIX:S/-/_/}_FILE} openldap_PORT= ${PORTSDIR}/net/linux${LINUX_BASEPORT_NAME}-openldap diff --git a/Mk/bsd.linux-rpm.mk b/Mk/bsd.linux-rpm.mk index 789f3b881ceb..cbf0239bb2fa 100644 --- a/Mk/bsd.linux-rpm.mk +++ b/Mk/bsd.linux-rpm.mk @@ -11,7 +11,7 @@ # Valid values for "fedora": all version numbers # e.g. 10 for fedora 10 # Valid values for "centos": all version numbers -# e.g. 6.6 for centos 6.6 +# e.g. 6.7 for centos 6.7 # This is used to set MASTER_SITE_{,SRC_}SUBDIR # if it isn't already set. # MASTER_SITE_SRC_SUBDIR @@ -63,7 +63,7 @@ LINUX_DIST= fedora LINUX_DIST_VER= 10 .else # default to CentOS LINUX_DIST= centos -LINUX_DIST_VER= 6.6 +LINUX_DIST_VER= 6.7 .endif .if defined(LINUX_DIST) @@ -162,7 +162,7 @@ PLIST?= ${MASTERDIR}/pkg-plist.${LINUX_RPM_ARCH} _LINUX_BASE_SUFFIX= f10 . elif ${USE_LINUX} == "c6" || ${USE_LINUX} == "yes" _LINUX_BASE_SUFFIX= c6 -. elif ${USE_LINUX} == "c6_64 +. elif ${USE_LINUX} == "c6_64" _LINUX_BASE_SUFFIX= c6 . else # other linux_base ports do not provide a pkg-plist file diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index d67fbbbcafcd..6f199f71e6f3 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1742,9 +1742,7 @@ STRIP_CMD= ${TRUE} # Allow the user to specify another linux_base version. . if defined(OVERRIDE_LINUX_BASE_PORT) -. if ${USE_LINUX:tl} == yes -USE_LINUX= ${OVERRIDE_LINUX_BASE_PORT} -. elif ${USE_LINUX} == "c6" && ${OVERRIDE_LINUX_BASE_PORT} == "c6_64" +. if ${USE_LINUX:tl} == yes || (${USE_LINUX} == "c6" && ${OVERRIDE_LINUX_BASE_PORT} == "c6_64") USE_LINUX= ${OVERRIDE_LINUX_BASE_PORT} . endif . endif |