Framework: partially sync with upstream

Taken from: HardenedBSD
This commit is contained in:
Franco Fichtner 2019-05-02 07:24:59 +02:00
parent 049ed3b44c
commit 70b007b2ee
4 changed files with 18 additions and 67 deletions

1
LEGAL
View File

@ -184,7 +184,6 @@ sharefonts-* x11-fonts/sharefonts Shareware: cannot be distributed without prio
shorten-* audio/shorten May not be sold. May not be distributed if modified
sid-milter-* mail/sid-milter May incorporate intellectual property, possible patent issues
simian-* devel/simian Have to agree to license before download
skype4* net-im/skype4 Redistribution prohibited
STonX-* emulators/stonx Contains ROM (C) by Atari
stuffit* archivers/stuffit Only unmodified original package can be distributed
susv2.tar.bz2 misc/susv2 Redistribution of the documents is not permitted

9
MOVED
View File

@ -12204,3 +12204,12 @@ databases/zabbix32-libzbxpgsql||2019-04-28|Removed, depends on expired net-mgmt/
databases/zabbix34-libzbxpgsql||2019-04-28|Removed, depends on expired net-mgmt/zabbix34-agent
games/lianliankan||2019-04-30|Has expired: Depends on expired esound
audio/extace||2019-04-30|Has expired: Depends on expired esound
audio/openal||2019-04-30|Has expired: Abandonware. Use audio/openal-soft instead
devel/poco-ssl||2019-04-30|Has expired: Newer version available; use devel/poco instead
audio/linux-skype_oss_wrapper||2019-04-30|Has expired: Only useful for net-im/skype4
net-im/skype4||2019-04-30|Has expired: Unsupported upstream
devel/llvm50|devel/llvm80|2019-04-30|Has expired: Use a modern version instead
russian/ircd-hybrid|irc/ircd-hybrid|2019-05-01|Has expired: The project is inactive since 2009 and the code is outdated
devel/py-jsonschema2|devel/py-jsonschema|2019-05-01|Has expired: Use devel/py-jsonschema instead
devel/rubygem-msgpack1|devel/rubygem-msgpack|2019-05-01|Has expired: Use devel/rubygem-msgpack instead
www/p5-CGI.pm|www/p5-CGI|2019-05-01|Has expired: Use www/p5-CGI instead

View File

@ -69,7 +69,6 @@ cran-auto-plist:
_USES_install+= 755:cran-strip
cran-strip:
${FIND} ${STAGEDIR}${PREFIX}/${R_MOD_DIR} -name '*.so' -exec ${STRIP_CMD} {} +
.include "${PORTSDIR}/math/R/compiler.mk"
.include "${USESDIR}/fortran.mk"
.else
NO_ARCH= yes

View File

@ -4,83 +4,27 @@
#
# Feature: openal
# Usage: USES=openal or USES=openal:ARGS
# Valid ARGS: al, soft (default), si, alut
#
# User-specified OpenAL wish:
# Usage: WANT_OPENAL=ARG
# Valid ARG: soft (default), si
# Valid ARGS: al, soft (default), alut
#
# MAINTAINER: portmgr@FreeBSD.org
.if !defined(_INCLUDE_USES_OPENAL_MK)
_INCLUDE_USES_OPENAL_MK= yes
_valid_ARGS= al si soft alut
_si_DEPENDS= libopenal.so.0:audio/openal
_soft_DEPENDS= libopenal.so.1:audio/openal-soft
_alut_DEPENDS= libalut.so.0:audio/freealut
_OPENAL_LIBS= si soft
_DEFAULT_OPENAL= soft
.if exists(${LOCALBASE}/lib/libopenal.a)
_HAVE_OPENAL= si
.elif exists(${LOCALBASE}/bin/openal-info)
_HAVE_OPENAL= soft
.endif
# Be friendly
.if empty(openal_ARGS)
openal_ARGS= ${_DEFAULT_OPENAL}
openal_ARGS= soft
.endif
# Sanity checks
.if defined(WANT_OPENAL) && defined(_HAVE_OPENAL) && ${_HAVE_OPENAL} != ${WANT_OPENAL}
IGNORE= OpenAL mismatch: ${_HAVE_OPENAL} is installed, but ${WANT_OPENAL} desired
.if !empty(openal_ARGS:Nal:Nsoft:Nalut)
IGNORE= has unknown USES=openal arguments: ${openal_ARGS:Nal:Nsoft:Nalut}
.endif
_OPENAL_al_DEPENDS= libopenal.so.1:audio/openal-soft
_OPENAL_soft_DEPENDS= libopenal.so.1:audio/openal-soft
_OPENAL_alut_DEPENDS= libalut.so.0:audio/freealut
.for _arg in ${openal_ARGS}
. if ! ${_valid_ARGS:M${_arg}}
IGNORE= Incorrect 'USES+= openal:${openal_ARGS}' usage: argument [${_arg}] is not recognized
. endif
. if ${_OPENAL_LIBS:M${_arg}} && ${openal_ARGS:Mal}
IGNORE= Incorrect 'USES+= openal:${openal_ARGS}' usage: argument [${_arg}] cannot be used together with al
. endif
. if ${_OPENAL_LIBS:M${_arg}} && defined(_HAVE_OPENAL) && ${_HAVE_OPENAL} != ${_arg}
IGNORE= OpenAL mismatch: port wants to use ${_arg} while you have ${_HAVE_OPENAL}
. endif
. if ${_OPENAL_LIBS:M${_arg}} && defined(WANT_OPENAL) && ${WANT_OPENAL} != ${_arg}
IGNORE= OpenAL mismatch: port wants to use ${_arg} while you wish to use ${WANT_OPENAL}
. endif
. if ${_OPENAL_LIBS:M${_arg}}
. for _carg in ${_OPENAL_LIBS:N${_arg}}
. if ${openal_ARGS:M${_carg}}
IGNORE= Incorrect 'USES+= openal:${openal_ARGS}' usage: arguments [${_arg}] and [${_carg}] cannot be used together
. endif
. endfor
. endif
.endfor
# Proceed
_USE_OPENAL=
.if ${openal_ARGS:Mal}
.if defined(_HAVE_OPENAL)
_USE_OPENAL= ${_HAVE_OPENAL}
.elif defined(WANT_OPENAL)
_USE_OPENAL= ${WANT_OPENAL}
.else
_USE_OPENAL= ${_DEFAULT_OPENAL}
.endif
.endif
.for _arg in ${openal_ARGS:Nal}
_USE_OPENAL+= ${_arg}
.endfor
.for _arg in ${_USE_OPENAL}
LIB_DEPENDS+= ${_${_arg}_DEPENDS}
LIB_DEPENDS+= ${_OPENAL_${_arg}_DEPENDS}
.endfor
.endif