Lainports/opnsense-ports
3
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Framework: partially sync with upstream

Browse source 
Taken from: FreeBSD
This commit is contained in:
Franco Fichtner 2017-01-04 07:29:56 +01:00
parent e133f2c926
commit ffd9b7dedc
10 changed files with 34 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mk/Scripts/do-users-groups.sh
View file

@ -28,7 +28,7 @@ error() {
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}"

5
Mk/Uses/7z.mk
View file

@ -23,11 +23,6 @@ P7ZIP_WRKDIR?= ${EXTRACT_WRKDIR}
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

6
Mk/Uses/compiler.mk
View file

@ -241,18 +241,12 @@ CXX= ${LOCALBASE}/bin/clang++34
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

4
Mk/Uses/iconv.mk
View file

@ -41,8 +41,8 @@ ICONV_CONFIGURE_BASE=
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

2
Mk/Uses/kde.mk
View file

@ -79,7 +79,7 @@ _KDE_APPLICATIONS_ATTIC_VERSION= 15.12.3
CALLIGRA_VERSION?= 2.9.11
CALLIGRA_BRANCH?= stable
KDEVELOP_VERSION?= 4.7.3
KDEVELOP_VERSION?= 4.7.4
KDEVELOP_BRANCH?= stable
KTP_VERSION?= 0.9.0

4
Mk/Uses/linux.mk
View file

@ -40,9 +40,9 @@ IGNORE= Invalid Linux distribution: ${linux_ARGS}
.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

2
Mk/bsd.gecko.mk
View file

@ -144,7 +144,7 @@ LDFLAGS+= -L${LOCALBASE}/lib \
.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

6
Mk/bsd.port.mk
View file

@ -1633,9 +1633,7 @@ MAKE_ENV+= NO_PIE=yes
# 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 @@ do-patch:
.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 \

13
Mk/bsd.ssp.mk
View file

@ -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

37
Tools/scripts/mfh
View file

@ -55,18 +55,6 @@ ask() {
return 1
}
[ $# -lt 2 ] && err "$(basename $0) requires at least 2 arguments: <branch> <revnumber> [<revnumber>...]"
branch=$1
shift
revs=""
for rev in $@
do
rev=${rev##r} # remove a leading "r"
case ${rev} in
''|*[!-0-9]*) err "revision \"${rev}\" should be a number" ;;
esac
done
: ${svnserver:="svn+ssh://repo.FreeBSD.org"}
if [ -n "$(type svn 2>/dev/null)" ]; then
@ -77,6 +65,31 @@ else
err "Neither svn(1) nor svnlite(1) found. Please install devel/subversion."
fi
latest_branch=$("${svn}" ls ${svnserver}/ports/branches/|sed -ne '/^2.*Q./s|/$||p'|tail -1)
[ $# -lt 1 ] && err "$(basename $0) requires at least 1 arguments: [<branch>] <revnumber> [<revnumber>...]"
branch=$1
# I sure hope by 2030 we'll be doing something else. Yes, famous last words.
if expr ${branch} : '20[12][0-9]Q[1-4]' > /dev/null; then
shift
if [ ${latest_branch} != ${branch} ]; then
ask "/!\\ The latest branch is ${latest_branch}, do you really want to commit to ${branch}?" || exit 1
fi
else
branch=${latest_branch}
fi
revs=""
for rev in $@
do
rev=${rev##r} # remove a leading "r"
case ${rev} in
''|*[!-0-9]*) err "revision \"${rev}\" should be a number" ;;
esac
done
trap "rc=\$? ; rm -rf \"\${dir}\" ; exit \$rc" EXIT
dir=$(mktemp -d /tmp/merge.XXXXXX)
cd "${dir}"