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 2016-12-19 07:45:02 +01:00
parent f52abe69c6
commit ebed948f26
8 changed files with 31 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGES
View file

@ -10,6 +10,11 @@ in the release notes and/or placed into UPDATING.
All ports committers are allowed to commit to this file.
20161218:
AUTHOR: tcberner@FreeBSD.org
QT_PREFIX has been dropped, in favour of using PREFIX directly.
20160911:
AUTHOR: amdmi3@FreeBSD.org

2
GIDs
View file

@ -138,7 +138,7 @@ cups:*:193:
saned:*:194:
radns:*:195:
nova:*:196:
# free: 197
dq:*:197:
# free: 198
mcserver:*:199:
sympa:*:200:

11
MOVED
View file

@ -8829,9 +8829,9 @@ graphics/ocrfeeder||2016-12-08|Has expired: Depends on broken and expired py-rep
devel/libcppformat|devel/libfmt|2016-12-08|Project was renamed
databases/py35-mysqlclient|databases/py3-mysqlclient|2016-12-10|Moved to match existing naming convention
databases/py35-psycopg2|databases/py3-psycopg2|2016-12-10|Moved to match existing naming convention
www/linux-f10-flashplugin11||2016-12-13|Deprecated
www/linux-c6-flashplugin11|www/linux-c6-flashplugin24|2016-12-13|Deprecated
www/linux-c7-flashplugin11|www/linux-c7-flashplugin24|2016-12-13|Deprecated
www/linux-f10-flashplugin11|www/linux-flashplayer|2016-12-13|Removed upstream
www/linux-c6-flashplugin11|www/linux-flashplayer|2016-12-13|Removed upstream
www/linux-c7-flashplugin11|www/linux-flashplayer|2016-12-13|Removed upstream
net/py-ceilometerclient|net/py-python-ceilometerclient|2016-12-17|Rename to match pypi name
net/py-cinderclient|net/py-python-cinderclient|2016-12-17|Rename to match pypi name
net/py-designateclient|net/py-python-designateclient|2016-12-17|Rename to match pypi name
@ -8842,3 +8842,8 @@ net/py-neutronclient|net/py-python-neutronclient|2016-12-17|Rename to match pypi
net/py-novaclient|net/py-python-novaclient|2016-12-17|Rename to match pypi name
net/py-openstackclient|net/py-python-openstackclient|2016-12-17|Rename to match pypi name
www/py-django-openstack-auth|www/py-django_openstack_auth|2016-12-18|Rename to match pypi name
www/linux-c6-flashplugin24|www/linux-flashplayer|2016-12-18|Renamed to match upstream
www/linux-c7-flashplugin24|www/linux-flashplayer|2016-12-18|Renamed to match upstream
biology/p5-bioperl|biology/p5-BioPerl|2016-12-18|Rename to match upstream naming
biology/p5-bioperl-run|biology/p5-BioPerl-Run|2016-12-18|Rename to match upstream naming
databases/py-swiftclient|databases/py-python-swiftclient|2016-12-18|Rename to match pypi name

2
Mk/Scripts/checksum.sh
View file

@ -88,6 +88,6 @@ if [ -f "${dp_DISTINFO_FILE}" ]; then
exit 1
fi
elif [ -n "${@}" ]; then
${dp_ECHO_MSG} "=> No checksum file (${DISTINFO_FILE})."
${dp_ECHO_MSG} "=> No checksum file (${dp_DISTINFO_FILE})."
exit 1
fi

1
Mk/bsd.options.desc.mk
View file

@ -438,6 +438,7 @@ SNMP_DESC?= SNMP network protocol support
SOCKS_DESC?= SOCKS proxy support
SOUND_DESC?= Sound (audio) support
SOUNDTOUCH_DESC?= Sound processing support via SoundTouch
SOXR_DESC?= SoX resampler support via libsoxr
SPANDSP_DESC?= SpanDSP faxing support
SPATIALITE_DESC?= SpatiaLite support
SPDY_DESC?= SPDY network protocol support

20
Mk/bsd.qt.mk
View file

@ -29,8 +29,6 @@ _QT_SUPPORTED?= 4 5
QT4_VERSION?= 4.8.7
QT5_VERSION?= 5.6.2
QT_PREFIX?= ${LOCALBASE}
_QT_RELNAME= qt${_QT_VERSION:R:R}
_QT_VERSION= # empty
.for ver in ${_QT_SUPPORTED}
@ -52,10 +50,6 @@ IGNORE?= can't be installed: bsd.qt.mk may only be included via USE_QT[${_QT_SU
.if defined(QT_DIST)
QT_NONSTANDARD= yes
. if ! ${.MAKEFLAGS:MPREFIX=*}
PREFIX= ${QT_PREFIX}
. endif
MASTER_SITES= ${MASTER_SITE_QT}
# Useless, as it must be defined before including bsd.port.pre.mk (at least
# because of bsd.options.mk).
@ -269,16 +263,14 @@ QMAKE_COMPILER= $$(ccver="$$(${CXX} --version)"; case "$$ccver" in *clang*) echo
# Import QMAKE_ENV and QMAKE_ARGS definitions.
USES+= qmake:_env
PLIST_SUB+= QT_PREFIX="${QT_PREFIX}"
.for dir in INC ARCH PLUGIN LIBEXEC IMPORT \
QML DATA DOC L10N ETC EXAMPLE TEST MKSPEC
QT_${dir}DIR= ${QT_PREFIX}/${QT_${dir}DIR_REL}
QT_${dir}DIR= ${PREFIX}/${QT_${dir}DIR_REL}
PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}"
.endfor
.for dir in BIN LIB
QT_${dir}DIR= ${QT_PREFIX}/${QT_${dir}DIR_REL}
QT_${dir}DIR= ${PREFIX}/${QT_${dir}DIR_REL}
. if defined(QT_DIST)
PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}"
. endif
@ -291,7 +283,7 @@ PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}"
Qt_Post_Include= bsd.qt.mk
.if !defined(QT_NONSTANDARD)
CONFIGURE_ENV+= QTDIR="${QT_PREFIX}" QMAKE="${QMAKE}" \
CONFIGURE_ENV+= QTDIR="${PREFIX}" QMAKE="${QMAKE}" \
MOC="${MOC}" RCC="${RCC}" UIC="${UIC}" \
QMAKESPEC="${QMAKESPEC}"
CONFIGURE_ARGS+=--with-qt-includes=${QT_INCDIR} \
@ -722,16 +714,16 @@ qt-post-install:
@${ECHO_CMD} \
>> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h
. endfor
@${ECHO_CMD} "${QT_PREFIX}/${QT_INCDIR_REL}/QtCore/modules/qconfig-${QT_MODNAME}.h" \
@${ECHO_CMD} "${PREFIX}/${QT_INCDIR_REL}/QtCore/modules/qconfig-${QT_MODNAME}.h" \
>> ${TMPPLIST}
@${ECHO_CMD} "@exec echo '#include <QtCore/modules/qconfig-${QT_MODNAME}.h>' >> ${QT_PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig-modules.h" \
@${ECHO_CMD} "@exec echo '#include <QtCore/modules/qconfig-${QT_MODNAME}.h>' >> ${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig-modules.h" \
>> ${TMPPLIST}
. endif # ${QT_DEFINES:N-*}
. if ${QT_CONFIG:N-*}
@${MKDIR} ${STAGEDIR}${QT_MKSPECDIR}/modules
${ECHO_CMD} "QT_CONFIG += ${QT_CONFIG:N-*:O:u}" \
> ${STAGEDIR}${QT_MKSPECDIR}/modules/qt_config_${QT_MODNAME}.pri
@${ECHO_CMD} "${QT_PREFIX}/${QT_MKSPECDIR_REL}/modules/qt_config_${QT_MODNAME}.pri" \
@${ECHO_CMD} "${PREFIX}/${QT_MKSPECDIR_REL}/modules/qt_config_${QT_MODNAME}.pri" \
>> ${TMPPLIST}
. endif # ${QT_CONFIG:N-*}
.endif # defined(QT_DIST) && ! ${_QT_VERSION:M4*}

2
UIDs
View file

@ -143,7 +143,7 @@ cups:*:193:193::0:0:Cups Owner:/nonexistent:/usr/sbin/nologin
saned:*:194:194::0:0:SANE Scanner Daemon:/nonexistent:/bin/sh
radns:*:195:195::0:0:radns user:/nonexistent:/usr/sbin/nologin
nova:*:196:196::0:0:Nova daemon pseudo-user:/var/lib/nova:/usr/sbin/nologin
# free: 197
dq:*:197:197::0:0:dqcache user:/nonexistent:/usr/sbin/nologin
# free: 198
mcserver:*:199:199::0:0:Minecraft Server:/nonexistent:/bin/sh
sympa:*:200:200::0:0:Sympa Owner:/nonexistent:/usr/sbin/nologin

8
UPDATING
View file

@ -5,6 +5,14 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
20161218:
AFFECTS: users of www/nghttp2
AUTHOR: sunpoet@FreeBSD.org
nghttp2 has been split into 2 ports: www/libnghttp2 for core library and
www/nghttp2 for the rest. Please uninstall nghttp2 before you update
this port.
20161216:
AFFECTS: mail/thunderbird, www/seamonkey
AUTHOR: gecko@FreeBSD.org