Page MenuHomeFreeBSD
Files F148559807

D9016.id.diff
No OneTemporary
Actions

D9016.id.diff
View Options

Index: head/Mk/Scripts/do-users-groups.sh
===================================================================
--- head/Mk/Scripts/do-users-groups.sh
+++ head/Mk/Scripts/do-users-groups.sh
@@ -28,7 +28,7 @@
rm -f "${dp_UG_INSTALL}" "${dp_UG_DEINSTALL}" || :
# Before FreeBSD 10.2, PW did not have -R support.
-if [ "${dp_OPSYS}" = FreeBSD ] && [ "${dp_OSVERSION}" -ge 1002000 ]; then
+if [ "${dp_OPSYS}" = FreeBSD ] ; then
cat >> "${dp_UG_INSTALL}" <<-eot
if [ -n "\${PKG_ROOTDIR}" ] && [ "\${PKG_ROOTDIR}" != "/" ]; then
PW="${dp_PW} -R \${PKG_ROOTDIR}"
Index: head/Mk/Uses/7z.mk
===================================================================
--- head/Mk/Uses/7z.mk
+++ head/Mk/Uses/7z.mk
@@ -23,11 +23,6 @@
IGNORE= USES=7z has invalid arguments: ${7z_ARGS:Np7zip:Npartial}
.endif
-.if ! ${7z_ARGS:Mp7zip} && (${OPSYS} == FreeBSD && ${OSVERSION} < 1000009)
-# libarchive lacks 7zip reader, fallback to P7ZIP_CMD
-7z_ARGS+= p7zip
-.endif
-
.if ${7z_ARGS:Mp7zip}
EXTRACT_DEPENDS+= ${P7ZIP_CMD}:archivers/p7zip
.endif
Index: head/Mk/Uses/compiler.mk
===================================================================
--- head/Mk/Uses/compiler.mk
+++ head/Mk/Uses/compiler.mk
@@ -241,18 +241,12 @@
USE_GCC= yes
CHOSEN_COMPILER_TYPE= gcc
.if ${COMPILER_FEATURES:Mlibc++}
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1001508
-LDFLAGS+= -L${LOCALBASE}/lib/c++
-CXXFLAGS+= -nostdinc++ -isystem ${LOCALBASE}/include/c++/v1
-BUILD_DEPENDS+= ${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++
-.else
CXXFLAGS+= -nostdinc++ -isystem /usr/include/c++/v1
LDFLAGS+= -L${WRKDIR}
_USES_configure+= 200:gcc-libc++-configure
gcc-libc++-configure:
@${LN} -fs /usr/lib/libc++.so ${WRKDIR}/libstdc++.so
-.endif # OSVERSION < 1001508
.endif
.endif
Index: head/Mk/Uses/iconv.mk
===================================================================
--- head/Mk/Uses/iconv.mk
+++ head/Mk/Uses/iconv.mk
@@ -41,8 +41,8 @@
ICONV_INCLUDE_PATH= /usr/include
ICONV_LIB_PATH= /usr/lib/libc.so
-.if (${OPSYS} == FreeBSD && (${OSVERSION} < 1001514 \
- || (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100069))) \
+.if (${OPSYS} == FreeBSD && \
+ (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100069)) \
|| exists(${LOCALBASE}/include/iconv.h)
BUILD_DEPENDS+= libiconv>=1.14_9:converters/libiconv
ICONV_INCLUDE_PATH= ${LOCALBASE}/include
Index: head/Mk/Uses/linux.mk
===================================================================
--- head/Mk/Uses/linux.mk
+++ head/Mk/Uses/linux.mk
@@ -40,9 +40,9 @@
.if ${LINUX_DEFAULT:M*_64}
LINUX_ARCH= x86_64
LINUX_ARCH32= i386
-.if ${ARCH} != amd64 || ${OPSYS} != FreeBSD || ${OSVERSION} < 1002507 \
+.if ${ARCH} != amd64 || ${OPSYS} != FreeBSD \
|| ( ${OSVERSION} >= 1100000 && ${OSVERSION} < 1100105 )
-IGNORE= Linux ${LINUX_DEFAULT} is only supported on FreeBSD/amd64 10.3 or higher
+IGNORE= Linux ${LINUX_DEFAULT} is unsupported on pre-release versions of FreeBSD 11. Update to 11.0-RELEASE or higher.
.endif
.else
LINUX_ARCH= i386
Index: head/Mk/bsd.gecko.mk
===================================================================
--- head/Mk/bsd.gecko.mk
+++ head/Mk/bsd.gecko.mk
@@ -144,7 +144,7 @@
.if ${OPSYS} != DragonFly # XXX xpcshell crash during install
# use jemalloc 3.0.0 (4.0 for firefox 43+) API for stats/tuning
MOZ_EXPORT+= MOZ_JEMALLOC3=1 MOZ_JEMALLOC4=1
-.if ${OPSYS} != FreeBSD || ${OSVERSION} < 1000012 || ${MOZILLA_VER:R:R} >= 37
+.if ${OPSYS} != FreeBSD || ${MOZILLA_VER:R:R} >= 37
. if ${MOZILLA_VER:R:R} >= 48
MOZ_OPTIONS+= --enable-jemalloc=4
.else
Index: head/Mk/bsd.port.mk
===================================================================
--- head/Mk/bsd.port.mk
+++ head/Mk/bsd.port.mk
@@ -1633,9 +1633,7 @@
# We prefer to pass MK_*=no but it was only supported after a certain
# revision. Passing WITHOUT_* may conflict with a make.conf or src.conf's
# WITH_* value. Note that ports *do* pull in src.conf.
-.if (${OSVERSION} >= 903510 && ${OSVERSION} < 1000000) || \
- (${OSVERSION} >= 1003503 && ${OSVERSION} < 1100000) || \
- ${OSVERSION} >= 1100000
+.if ${OSVERSION} >= 1003503
# We will control debug files. Don't let builds that use /usr/share/mk
# split out debug symbols since the plist won't know to expect it.
MAKE_ENV+= MK_DEBUG_FILES=no
@@ -3150,7 +3148,7 @@
.if !target(run-autotools-fixup)
run-autotools-fixup:
# Work around an issue where FreeBSD 10.0 is detected as FreeBSD 1.x.
-.if ${OSVERSION} >= 1000000 && !defined(WITHOUT_FBSD10_FIX)
+.if !defined(WITHOUT_FBSD10_FIX)
-@for f in `${FIND} ${WRKDIR} -type f \( -name config.libpath -o \
-name config.rpath -o -name configure -o -name libtool.m4 -o \
-name ltconfig -o -name libtool -o -name aclocal.m4 -o \
Index: head/Mk/bsd.ssp.mk
===================================================================
--- head/Mk/bsd.ssp.mk
+++ head/Mk/bsd.ssp.mk
@@ -3,19 +3,6 @@
SSP_Include_MAINTAINER= portmgr@FreeBSD.org
-# See: http://svnweb.freebsd.org/base/head/lib/libc/libc.ldscript?revision=251668&view=markup
-.if ${OSVERSION} < 1000036 && ${ARCH} == i386
-
-# Disabled on i386 for now on releases without the ldscript as too many ports
-# do not respect LDFLAGS and fail to build due to not adding in -lssp_nonshared when needed
-# despite dependencies working fine, which breaks a lot. Can enable once LDFLAGS is more
-# supported. XXX
-SSP_UNSAFE= yes
-
-# i386 needs -lssp_nonshared, see svn link above for more information
-SSP_NEED_NONSHARED= yes
-.endif
-
.if !defined(SSP_UNSAFE) && \
(${ARCH} == i386 || ${ARCH} == amd64)
# Overridable as a user may want to use -fstack-protector-all

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 19, 6:16 PM (5 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29973314
Default Alt Text
D9016.id.diff (5 KB)

Event Timeline