Framework: sync with upstream
Taken from: FreeBSD
This commit is contained in:
Franco Fichtner
parent
7835f17e92
commit
a05e875e8c
7 changed files with 61 additions and 6 deletions
2
MOVED
2
MOVED
|
|
@ -8680,3 +8680,5 @@ net/py-uritemplate.py|net/py-uritemplate|2016-10-12|Upstream has consolidated on
|
|||
misc/fortune_strfile||2016-10-14|Has expired: unmaintained and duplicated from base
|
||||
mail/elmo-devel|mail/elmo|2016-10-15|Has expired: Same version as mail/elmo, use it instead
|
||||
math/libR||2016-10-16|Has expired: math/R LIBR option is now on by default
|
||||
devel/gaphor||2016-10-18|Has expired: runtime failure uncorrected for 1 year after first report
|
||||
editors/winefish||2016-10-18|Has expired: upstream disappeared (project dead?), segfaults on multiple arches
|
||||
|
|
|
|||
|
|
@ -21,6 +21,8 @@ while getopts "mrw" FLAG; do
|
|||
w)
|
||||
# Only list dependencies that have a WRKDIR. Used for
|
||||
# 'make clean-depends'.
|
||||
# Without -r recurse when WRKDIR exists; with -r
|
||||
# always recurse.
|
||||
requires_wrkdir=1
|
||||
;;
|
||||
*)
|
||||
|
|
@ -80,13 +82,10 @@ check_dep() {
|
|||
|
||||
# Grab any needed vars from the port.
|
||||
|
||||
if [ ${requires_wrkdir} -eq 1 -a ${recursive} -eq 1 ]; then
|
||||
if [ ${requires_wrkdir} -eq 1 ]; then
|
||||
set -- $(${dp_MAKE} -C ${d} -VWRKDIR -V_UNIFIED_DEPENDS)
|
||||
wrkdir="$1"
|
||||
shift
|
||||
elif [ ${requires_wrkdir} -eq 1 -a ${recursive} -eq 0 ]; then
|
||||
set -- "$(${dp_MAKE} -C ${d} -VWRKDIR)"
|
||||
wrkdir="$1"
|
||||
elif [ ${recursive} -eq 1 ]; then
|
||||
set -- $(${dp_MAKE} -C ${d} -V_UNIFIED_DEPENDS)
|
||||
fi
|
||||
|
|
@ -97,7 +96,7 @@ check_dep() {
|
|||
show_dep=0
|
||||
fi
|
||||
[ ${show_dep} -eq 1 ] && echo ${d}
|
||||
if [ ${recursive} -eq 1 ]; then
|
||||
if [ ${recursive} -eq 1 -o ${requires_wrkdir} -eq 1 -a ${show_dep} -eq 1 ]; then
|
||||
check_dep $@
|
||||
fi
|
||||
done
|
||||
|
|
|
|||
|
|
@ -103,6 +103,7 @@ _CMAKE_MSG= "===> Performing out-of-source build"
|
|||
CONFIGURE_WRKSRC= ${WRKDIR}/.build
|
||||
BUILD_WRKSRC?= ${CONFIGURE_WRKSRC}
|
||||
INSTALL_WRKSRC?= ${CONFIGURE_WRKSRC}
|
||||
TEST_WRKSRC?= ${CONFIGURE_WRKSRC}
|
||||
.endif
|
||||
|
||||
.if !target(do-configure)
|
||||
|
|
|
|||
|
|
@ -16,6 +16,14 @@
|
|||
# * foo_run Add a run-time dependency (RUN_DEPENDS)
|
||||
# * foo (default) Add both dependencies on component <foo>
|
||||
#
|
||||
#
|
||||
# To simplify the ports, also:
|
||||
# CATEGORIES If the port is part of one of the KDE Software distribution,
|
||||
# it can add, in addition to 'kde' one of the following:
|
||||
# kde-kde4: part of kde4 release
|
||||
# this will then set default values for MASTER_SITES and DIST_SUBDIR
|
||||
# as well as CPE_VENDOR and LICENSE.
|
||||
#
|
||||
# MAINTAINER: kde@FreeBSD.org
|
||||
|
||||
.if !defined(_INCLUDE_USES_KDE_MK)
|
||||
|
|
@ -72,6 +80,38 @@ KTP_BRANCH?= stable
|
|||
KDE_PREFIX= ${LOCALBASE}
|
||||
# ==============================================================================
|
||||
|
||||
# === _KDE_DIST HANDLING -- SETTING DEFAULT VALUES =============================
|
||||
# Doing MASTER_SITES magic based on the category of the port
|
||||
_KDE_CATEGORIES_SUPPORTED= kde-kde4
|
||||
. for cat in ${_KDE_CATEGORIES_SUPPORTED}
|
||||
. if ${CATEGORIES:M${cat}}
|
||||
. if !defined(_KDE_CATEGORY)
|
||||
_KDE_CATEGORY= ${cat}
|
||||
. else
|
||||
IGNORE?= cannot be installed: multiple kde-<...> categories specified via CATEGORIES=${CATEGORIES} #'
|
||||
. endif
|
||||
. endif
|
||||
. endfor
|
||||
|
||||
. if defined(_KDE_CATEGORY)
|
||||
# KDE is normally licencensed LGPL 2.0.
|
||||
LICENSE?= LGPL20
|
||||
|
||||
# Set CPE Vendor Information
|
||||
# As KDE_DIST is set we can assume it is port release by KDE and the vendor
|
||||
# is therefore kde.
|
||||
CPE_VENDOR?= kde
|
||||
|
||||
. if ${_KDE_CATEGORY:Mkde-kde4}
|
||||
PORTVERSION?= ${KDE4_VERSION}
|
||||
MASTER_SITES?= KDE/${KDE4_BRANCH}/${KDE4_VERSION}/src
|
||||
DIST_SUBDIR?= KDE/${KDE4_VERSION}
|
||||
. else
|
||||
IGNORE?= unknown CATEGORY value '${_KDE_CATEGORY}' #'
|
||||
. endif
|
||||
. endif #defined(_KDE_CATEGORY)
|
||||
# ==============================================================================
|
||||
|
||||
# ==== SETUP CMAKE ENVIRONMENT =================================================
|
||||
# Help cmake to find files when testing ports with non-default PREFIX.
|
||||
CMAKE_ARGS+= -DCMAKE_PREFIX_PATH="${LOCALBASE}"
|
||||
|
|
|
|||
|
|
@ -90,6 +90,7 @@ _QMAKE_WRKSRC?= ${CONFIGURE_WRKSRC}
|
|||
CONFIGURE_WRKSRC= ${WRKDIR}/.build
|
||||
BUILD_WRKSRC= ${CONFIGURE_WRKSRC}
|
||||
INSTALL_WRKSRC= ${BUILD_WRKSRC}
|
||||
TEST_WRKSRC= ${BUILD_WRKSRC}
|
||||
QMAKE_SOURCE_PATH?= ${WRKSRC}
|
||||
.else
|
||||
QMAKE_SOURCE_PATH?= # empty
|
||||
|
|
|
|||
|
|
@ -2439,7 +2439,7 @@ VALID_CATEGORIES+= accessibility afterstep arabic archivers astro audio \
|
|||
benchmarks biology cad chinese comms converters databases \
|
||||
deskutils devel docs dns editors elisp emulators enlightenment finance french ftp \
|
||||
games geography german gnome gnustep graphics hamradio haskell hebrew hungarian \
|
||||
ipv6 irc japanese java kde kld korean lang linux lisp \
|
||||
ipv6 irc japanese java kde ${_KDE_CATEGORIES_SUPPORTED} kld korean lang linux lisp \
|
||||
mail mate math mbone misc multimedia net net-im net-mgmt net-p2p news \
|
||||
palm parallel pear perl5 plan9 polish portuguese ports-mgmt \
|
||||
print python ruby rubygems russian \
|
||||
|
|
|
|||
12
UPDATING
12
UPDATING
|
|
@ -5,6 +5,18 @@ 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.
|
||||
|
||||
20161018:
|
||||
AFFECTS: users of x11/xfce4-terminal
|
||||
AUTHOR: olivierd@FreeBSD.org
|
||||
|
||||
The port has been updated to the latest stable version 0.8.0.
|
||||
A warning appears each time we open new tab:
|
||||
|
||||
Gtk-WARNING **: gtk_widget_size_allocate(): attempt to allocate
|
||||
widget with...
|
||||
|
||||
This issue will disappear with Gtk > 3.21.
|
||||
|
||||
20161014:
|
||||
AFFECTS: users of lang/python3
|
||||
AUTHOR: antoine@FreeBSD.org
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue