build: switch to FreeBSD ports tree

This commit is contained in:
Franco Fichtner 2021-08-02 10:51:18 +02:00
parent faaf1e2c54
commit 6a04fbb4ca
3 changed files with 10 additions and 9 deletions

View File

@ -115,9 +115,9 @@ PORTSBRANCH?= master
PORTSDIR?= /usr/ports
PORTSENV?= # empty
PORTSREFURL?= https://git.hardenedbsd.org/hardenedbsd/ports.git
PORTSREFDIR?= /usr/hardenedbsd-ports
PORTSREFBRANCH?=hardenedbsd/main
PORTSREFURL?= https://git.FreeBSD.org/ports.git
PORTSREFDIR?= /usr/freebsd-ports
PORTSREFBRANCH?=main
SRCBRANCH?= stable/${ABI}
SRCDIR?= /usr/src

View File

@ -356,7 +356,7 @@ How the port tree is synced with its upstream repository
--------------------------------------------------------
The ports tree has a few of our modifications and is sometimes a
bit ahead of HardenedBSD. In order to keep the local changes, a
bit ahead of FreeBSD. In order to keep the local changes, a
skimming script is used to review and copy upstream changes:
# make skim[-<option>]

View File

@ -28,6 +28,7 @@
set -e
SELF=skim
FROM=FreeBSD
. ./common.sh
@ -172,7 +173,7 @@ if [ -n "${UNUSED}" ]; then
git commit -m \
"*/*: sync with upstream
Taken from: HardenedBSD"
Taken from: ${FROM}"
fi
)
fi
@ -212,7 +213,7 @@ if [ -n "${USED}" ]; then
git commit -m \
"${PORT}: partially sync with upstream
Taken from: HardenedBSD"
Taken from: ${FROM}"
fi)
;;
[cC])
@ -222,7 +223,7 @@ Taken from: HardenedBSD"
(cd ${PORTSDIR}; git commit -m \
"${PORT}: sync with upstream
Taken from: HardenedBSD")
Taken from: ${FROM}")
;;
esac
done < ${STAGEDIR}/used.changed
@ -261,7 +262,7 @@ Taken from: HardenedBSD")
git commit -m \
"Framework: partially sync with upstream
Taken from: HardenedBSD"
Taken from: ${FROM}"
fi)
;;
[cC])
@ -273,7 +274,7 @@ Taken from: HardenedBSD"
(cd ${PORTSDIR}; git commit -m \
"Framework: sync with upstream
Taken from: HardenedBSD")
Taken from: ${FROM}")
;;
esac
fi