Framework: partially sync with upstream

Taken from: HardenedBSD
This commit is contained in:
Franco Fichtner 2019-09-15 21:10:45 +02:00
parent 92132fd87c
commit ee046c9c2c
3 changed files with 53 additions and 15 deletions

2
MOVED
View File

@ -12799,7 +12799,6 @@ www/rubygem-lograge-rails50|www/rubygem-lograge-rails5|2019-06-21|Obsolete by gi
devel/rubygem-batch-loader12|devel/rubygem-batch-loader|2019-06-21|Obsolete by gitlab-ce upgrade, use devel/rubygem-batch-loader instead
security/easy-rsa2|security/easy-rsa|2019-06-23|Has expired: Use easy-rsa 3 instead
devel/py-robotframework-selenium2library|devel/py-robotframework-seleniumlibrary|2019-06-25|Renamed to match upstream
net-p2p/zetacoin-nox11|net-p2p/zetacoin|2019-06-26|Slave port folded back into now text-only master port
net/tigervnc||2019-06-29|Removed: Non-essential meta port
sysutils/cfengine33|sysutils/cfengine313|2019-06-30|Has expired: No longer supported upstream
sysutils/cfengine-masterfiles38|sysutils/cfengine-masterfiles313|2019-06-30|Has expired: No longer supported upstream
@ -12840,6 +12839,7 @@ misc/tcb||2019-07-13|Has expired: Abandonware that uses sys/dir.h
editors/xed||2019-07-13|Has expired: Abandonware using sys/dir.h
databases/gtksql||2019-07-13|Has expired: Abandonware using sys/dir.h
security/snortreport||2019-07-16|Has expired: Abandonware
net-p2p/zetacoin-nox11|net-p2p/zetacoin-daemon|2019-07-17|Renamed to better align with net-p2p/bitcoin port
databases/pecl-redis3|databases/pecl-redis|2019-07-19|No longer needed after PHP 5 removal
www/weblint||2019-07-20|Broken, uses nonexistant perl libraries, and upstream disappeared. Use www/p5-HTML-Lint instead
www/august||2019-07-20|Uses removed weblint

View File

@ -20,23 +20,27 @@
# You can set the following variables to control the process.
#
# GO_PKGNAME
# The name of the package. When building in GOPATH mode, this is
# the directory that will be created in GOPATH/src and seen by the
# `go` command. When building in modules-aware mode, no directories
# will be created and GO_PKGNAME value will be only used as a default
# for GO_TARGET. If not set explicitly and GH_SUBDIR is present,
# GO_PKGNAME will be inferred from GH_SUBDIR.
# The name of the package when building in GOPATH mode. This
# is the directory that will be created in GOPATH/src and seen
# by the `go` command. If not set explicitly and GH_SUBDIR or
# GL_SUBDIR is present, GO_PKGNAME will be inferred from it.
# It is not needed when building in modules-aware mode.
#
# GO_TARGET
# The names of the package(s) to build. If not set explicitly,
# defaults to GO_PKGNAME.
# The packages to build. If not set explicitly, defaults to
# GO_PKGNAME. GO_TARGET can also be a tuple in the form
# package:path where path can be either a simple filename or a
# full path starting with ${PREFIX}. Specifying a full path
# like ${PREFIX}/sbin/binary will install the resulting binary
# as ${PREFIX}/sbin/binary. Using just simple filename is a
# shortcut to installing it as ${PREFIX}/bin/filename.
#
# CGO_CFLAGS
# Addional CFLAGS variables to be passed to the C compiler by the `go`
# Additional CFLAGS variables to be passed to the C compiler by the `go`
# command
#
# CGO_LDFLAGS
# Addional LDFLAGS variables to be passed to the C compiler by the `go`
# Additional LDFLAGS variables to be passed to the C compiler by the `go`
# command
#
# GO_BUILDFLAGS
@ -61,6 +65,8 @@ IGNORE= USES=go has invalid arguments: ${go_ARGS:Nmodules:Nno_targets:Nrun}
.if empty(GO_PKGNAME)
. if !empty(GH_SUBDIR)
GO_PKGNAME= ${GH_SUBDIR:S|^src/||}
. elif !empty(GL_SUBDIR)
GO_PKGNAME= ${GL_SUBDIR:S|^src/||}
. else
GO_PKGNAME= ${PORTNAME}
. endif
@ -116,14 +122,31 @@ post-extract:
.if !target(do-build) && empty(go_ARGS:Mno_targets)
do-build:
(cd ${GO_WRKSRC}; \
${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} install ${GO_BUILDFLAGS} ${GO_TARGET:S/^${PORTNAME}$/./})
for t in ${GO_TARGET}; do \
out=$$(${BASENAME} $$(${ECHO_CMD} $${t} | \
${SED} -Ee 's/^[^:]*:([^:]+).*$$/\1/' -e 's/^\.$$/${PORTNAME}/')); \
pkg=$$(${ECHO_CMD} $${t} | \
${SED} -Ee 's/^([^:]*).*$$/\1/' -e 's/^${PORTNAME}$$/./'); \
${ECHO_MSG} "===> Building $${out} from $${pkg}"; \
${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} build ${GO_BUILDFLAGS} \
-o ${GO_WRKDIR_BIN}/$${out} \
$${pkg}; \
done)
.endif
.if !target(do-install) && empty(go_ARGS:Mno_targets)
do-install:
.for _TARGET in ${GO_TARGET}
${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/${_TARGET:T:S/^.$/${PORTNAME}/} ${STAGEDIR}${PREFIX}/bin
.endfor
for t in ${GO_TARGET}; do \
dst=$$(${ECHO_CMD} $${t} | \
${SED} -Ee 's/^[^:]*:([^:]+).*$$/\1/' -e 's/^\.$$/${PORTNAME}/'); \
src=$$(${BASENAME} $${dst}); \
case $${dst} in \
/*) dst=${STAGEDIR}$${dst}; ${MKDIR} $$(${DIRNAME} $${dst}) ;; \
*) dst=${STAGEDIR}${PREFIX}/bin/$${src} ;; \
esac; \
${ECHO_MSG} "===> Installing $${src} as $${dst}"; \
${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/$${src} $${dst}; \
done
.endif
# Helper targets for port maintainers

View File

@ -170,6 +170,21 @@ you update your ports collection, before attempting any port upgrades.
should switch to a newer Python version, e.g. 3.6, which is the default
Python version since April 2019.
20190717:
AFFECTS: users of net-p2p/zetacoin and net-p2p/zetacoin-nox11
AUTHOR: daniel@morante.net
Zetacoin will default to using modern versions of BDB (5.x or 6.x) when
the WALLET option is selected. See pkg-help for explanation.
The zetacoin-nox11 slave port was renamed to zetacoin-daemon to align
with the net-p2p/bitcoin format.
The zetacoin-cli and zetacoin-tx utilities have been re-packaged into
a separate port. If you require these programs, or use the zetacoin-cli
program to access the daemon or the GUI, install net-p2p/zetacoin-utils
to reinstall them.
20190717:
AFFECTS: users of sysutils/py-borgmatic
AUTHOR: egypcio@FreeBSD.org