Merge branch 'kde5-import' of https://github.com/freebsd/freebsd-port…

…s-kde into kde5-import

CHANGES

@@ -20,7 +20,7 @@ AUTHOR: mat@FreeBSD.org
   need FLAVORS to be set.  A USE_PYTHON=noflavors can be set if the port is
   using distutils but flavors are not wanted.
 
-  A new USE_PYTHON=optsuffix that will adds PYTHON_PKGNAMESUFFIX has been added
+  A new USE_PYTHON=optsuffix that will add PYTHON_PKGNAMESUFFIX has been added
   to cope with Python ports that did not have the Python PKGNAMEPREFIX but are
   flavored.
 

MOVED

@@ -9637,10 +9637,6 @@ devel/kdesdk4-kioslaves|devel/kdesdk-kioslaves-kde4|2017-11-11|Apply consistent
 devel/kdesdk4-strigi-analyzers|devel/kdesdk-strigi-analyzers-kde4|2017-11-11|Apply consistent name to KDE4
 devel/kdesdk4-thumbnailers|devel/kdesdk-thumbnailers-kde4|2017-11-11|Apply consistent name to KDE4
 devel/kdesdk4|devel/kdesdk-kde4|2017-11-11|Apply consistent name to KDE4
-devel/kdevelop-pg-qt|devel/kdevelop-pg-qt-kde4|2017-11-11|Apply consistent name to KDE4
-devel/kdevelop-php-docs|devel/kdevelop-php-docs-kde4|2017-11-11|Apply consistent name to KDE4
-devel/kdevelop-php|devel/kdevelop-php-kde4|2017-11-11|Apply consistent name to KDE4
-devel/kdevplatform|devel/kdevplatform-kde4|2017-11-11|Apply consistent name to KDE4
 devel/libkgapi|devel/libkgapi-kde4|2017-11-11|Apply consistent name to KDE4
 devel/p5-perlkde|devel/p5-perlkde-kde4|2017-11-11|Apply consistent name to KDE4
 devel/p5-perlqt|devel/p5-perlqt-kde4|2017-11-11|Apply consistent name to KDE4
@@ -9712,9 +9708,6 @@ x11/kgamma|x11/kgamma-kde4|2017-11-11|Apply consistent name to KDE4
 x11/libkonq|x11/libkonq-kde4|2017-11-11|Apply consistent name to KDE4
 x11/plasma-scriptengine-python|x11/plasma-scriptengine-python-kde4|2017-11-11|Apply consistent name to KDE4
 x11/plasma-scriptengine-ruby|x11/plasma-scriptengine-ruby-kde4|2017-11-11|Apply consistent name to KDE4
-devel/kdevelop-pg-qt-kde4|devel/kdevelop-kde4-pg-qt|2017-11-11|Apply consistent name to KDE4
-devel/kdevelop-php-kde4|devel/kdevelop-kde4-php|2017-11-11|Apply consistent name to KDE4
-devel/kdevelop-php-docs-kde4|devel/kdevelop-kde4-php-docs|2017-11-11|Apply consistent name to KDE4
 databases/grass6|databases/grass7|2017-11-18|Removed in favor of grass 7
 news/brag||2017-11-21|Has expired: Tcl/Tk 8.4 is no longer maintained, please use 8.5+
 textproc/srilm||2017-11-21|Has expired: Tcl/Tk 8.4 is no longer maintained, please use 8.5+
@@ -9898,3 +9891,8 @@ security/krb5-113|security/krb5-114|2017-12-03|Has expired: EOL twelve months af
 net/bird6|net/bird@ipv6|2017-12-06|Moved to a flavored version
 devel/kore-notls|devel/kore@notls|2017-12-06|Moved to a flavored version
 devel/llvm-cheri128|devel/llvm-cheri|2017-12-07|A single cheri compiler can now target 128-bit and 256-bit capabilities
+audio/cd-console||2017-12-13|Has expired: No public distfiles
+textproc/pecl-cld||2017-12-13|Has expired: Depends on expired devel/cld
+textproc/p5-Lingua-Identify-CLD||2017-12-13|Has expired: Depends on expired devel/cld
+devel/cld||2017-12-13|Has expired: Unfetchable for more than six months (google code has gone away)
+devel/py-ode|devel/py-PyODE|2017-12-14|Rename to reflect official Python modules naming scheme

Mk/Scripts/qa.sh

@@ -677,7 +677,7 @@ proxydeps() {
 			fi
 			already="${already} ${dep_file}"
 		done <<-EOT
-		$(ldd -a "${STAGEDIR}${file}" | \
+		$(env LD_LIBMAP_DISABLE=1 ldd -a "${STAGEDIR}${file}" | \
 			awk '\
 			BEGIN {section=0}\
 			/^\// {section++}\

Mk/Uses/gnome.mk

@@ -390,13 +390,13 @@ pygobject_USE_GNOME_IMPL=	glib20
 
 # Have to keep two components because the _DETECT file is not the same.
 py3gobject3_DETECT=		${LOCALBASE}/share/py3gobject3/.keep
-py3gobject3_BUILD_DEPENDS=	py3?-gobject3>=0:devel/py-gobject3@${PY_FLAVOR}
-py3gobject3_RUN_DEPENDS=	py3?-gobject3>=0:devel/py-gobject3@${PY_FLAVOR}
+py3gobject3_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR}
+py3gobject3_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR}
 py3gobject3_USE_GNOME_IMPL=	glib20
 
 pygobject3_DETECT=		${LOCALBASE}/share/pygobject3/.keep
-pygobject3_BUILD_DEPENDS=	py2?-gobject3>=0:devel/py-gobject3@${PY_FLAVOR}
-pygobject3_RUN_DEPENDS=		py2?-gobject3>=0:devel/py-gobject3@${PY_FLAVOR}
+pygobject3_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR}
+pygobject3_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR}
 pygobject3_USE_GNOME_IMPL=	glib20
 
 pygtk2_DETECT=		${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc

Mk/Uses/kde.mk

@@ -70,7 +70,7 @@ KDE_PLASMA_VERSION?=		5.11.3
 KDE_PLASMA_BRANCH?=		stable
 
 # Current KDE desktop.
-KDE_FRAMEWORKS_VERSION?=	5.40.0
+KDE_FRAMEWORKS_VERSION?=	5.41.0
 KDE_FRAMEWORKS_BRANCH?= 	stable
 
 # Current KDE applications.

Mk/Uses/perl5.mk

@@ -97,11 +97,7 @@ SITE_ARCH_REL?=	${SITE_PERL_REL}/${PERL_ARCH}/${PERL_VER}
 SITE_ARCH?=	${LOCALBASE}/${SITE_ARCH_REL}
 SITE_MAN3_REL?=	${SITE_PERL_REL}/man/man3
 SITE_MAN3?=	${PREFIX}/${SITE_MAN3_REL}
-.  if defined(THIS_IS_OLD_PERL)
-SITE_MAN1_REL?=	share/man/man1
-.  else
 SITE_MAN1_REL?=	${SITE_PERL_REL}/man/man1
-.  endif
 SITE_MAN1?=	${PREFIX}/${SITE_MAN1_REL}
 
 PERL5?=		${LOCALBASE}/bin/perl${PERL_VERSION}
@@ -245,9 +241,7 @@ CONFIGURE_ARGS+=	CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}" \
 			INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib"
 CONFIGURE_SCRIPT?=	Makefile.PL
 MAN3PREFIX?=		${PREFIX}/${SITE_PERL_REL}
-.    if !defined(THIS_IS_OLD_PERL)
 MAN1PREFIX?=		${PREFIX}/${SITE_PERL_REL}
-.    endif
 .undef HAS_CONFIGURE
 
 .    if !target(do-configure)

Mk/Uses/python.mk

@@ -451,7 +451,7 @@ FLAVOR=	${FLAVORS:[1]}
 .  endif
 .endif
 
-.if ${FLAVOR:Mpy[23]*}
+.if ${FLAVOR:Mpy[23][0-9]}
 _PYTHON_VERSION=	${FLAVOR:S/py//:C/(.)/\1./}
 .endif
 
@@ -463,11 +463,12 @@ PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
 .endif
 
 # To avoid having dependencies with @ and empty flavor:
-.if empty(FLAVOR)
-PY_FLAVOR=	${PYTHON_VERSION:S/^python/py/:S/.//}
-.else
-PY_FLAVOR=	${FLAVOR}
-.endif
+# _PYTHON_VERSION is either set by (first that matches):
+# - If using Python flavors, from the current Python flavor
+# - If using a version restriction (USES=python:3.4+), from the first
+#   acceptable default Python version.
+# - From PYTHON_DEFAULT
+PY_FLAVOR=	py${_PYTHON_VERSION:S/.//}
 
 # Pass PYTHON_VERSION down the dependency chain. This ensures that
 # port A -> B -> C all will use the same python version and do not
@@ -566,8 +567,13 @@ RUN_DEPENDS+=	cython-${PYTHON_VER}:lang/cython@${PY_FLAVOR}
 .endif
 
 .if defined(_PYTHON_FEATURE_CONCURRENT)
+.if !defined(_PYTHON_FEATURE_FLAVORS) && (${_PYTHON_VERSION_MINIMUM:M3*} || ${_PYTHON_VERSION_MAXIMUM:M2*})
+DEV_WARNING+=	"USE_PYTHON=concurrent when only one of Python 2 or 3 is supported AND not using flavors does not make any sense"
+.endif
 _USES_POST+=		uniquefiles:dirs
-.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
+.if defined(_PYTHON_FEATURE_FLAVORS) && ${FLAVOR} == ${FLAVORS:[1]}
+UNIQUE_DEFAULT_LINKS=	yes
+.elif !defined(_PYTHON_FEATURE_FLAVORS) && ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
 UNIQUE_DEFAULT_LINKS=	yes
 .else
 UNIQUE_DEFAULT_LINKS=	no

UPDATING

@@ -5,6 +5,41 @@ 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.
 
+20171215:
+  AFFECTS: users of finance/gnucash
+  AUTHOR: madpilot@FreeBSD.org
+
+  The gnucash port has been converted too use flavors, the GUILE1
+  and GUILE2 options have been converted to flavors so that two
+  separate packages can be provided.
+
+  Since the next major release of gnucash will drop guile1 support,
+  the default flavor package is compiled against guile2, switching
+  the previous default.
+
+  Users who intend to stay on the guile1 version should deinstall
+  the default gnucash package and install the gnucash-guile1 package.
+
+20171214:
+  AFFECTS: all ports users
+  AUTHOR: adamw@FreeBSD.org
+
+  Support for some deprecated variables is going to be removed soon. If
+  you use any of the following constructs (usually in /etc/make.conf),
+  you must switch to the new incantations:
+
+               OLD                                 NEW
+  -------------------------------    ------------------------------
+  WITH_[...]                         OPTIONS_SET= [...]
+  WITHOUT_[...]                      OPTIONS_UNSET= [...]
+  WITHOUT_NLS                        OPTIONS_UNSET= NLS
+  NOPORTDOCS                         OPTIONS_UNSET= DOCS
+  NOPORTEXAMPLES                     OPTIONS_UNSET= EXAMPLES
+  WITH_BDB_VER=[...]                 DEFAULT_VERSIONS+= bdb=[...]
+  OVERRIDE_LINUX_BASE_PORT=[...]     DEFAULT_VERSIONS+= linux=[...]
+  WITH_OPENSSL_BASE                  DEFAULT_VERSIONS+= ssl=base
+  WITH_OPENSSL_PORT                  DEFAULT_VERSIONS+= ssl=port
+
 20171205:
   AFFECTS: users of dns/powerdns
   AUTHOR: krion@FreeBSD.org

arabic/libitl/Makefile

@@ -2,26 +2,30 @@
 # $FreeBSD$
 
 PORTNAME=	libitl
-PORTVERSION=	0.7.0
-PORTREVISION=	1
+PORTVERSION=	0.8.0
+DISTVERSIONPREFIX=	v
 CATEGORIES=	arabic
-MASTER_SITES=	SF/arabeyes/ITL%20Library%20%28${PORTNAME}%29/${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	cpm@FreeBSD.org
 COMMENT=	API abstraction to common Islamic calculations
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	${PREFIX}/lib/itl
-MAKE_JOBS_UNSAFE=	yes
+USES=		cmake pkgconfig
+USE_LDCONFIG=	yes
 
-post-install:
-.for f in libitl.so libitl.so.0
-	${RM} ${STAGEDIR}${PREFIX}/lib/itl/$f
-	${LN} -s libitl.so.0.0.7 ${STAGEDIR}${PREFIX}/lib/itl/$f
-.endfor
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/itl/libitl.so
+USE_GITHUB=	yes
+GH_ACCOUNT=	arabeyes-org
+GH_PROJECT=	ITL
+GH_TAGNAME=	f8f41cc
+
+PORTDOCS=	*
+
+OPTIONS_DEFINE=	DOCS
+
+post-install-DOCS-on:
+	(cd ${WRKSRC}/new_method/references && ${COPYTREE_SHARE} \
+		"${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>

arabic/libitl/distinfo

@@ -1,2 +1,3 @@
-SHA256 (libitl-0.7.0.tar.gz) = 351a280bebe69b0aa4681c32288a48574407ac3e3a8f273c2be330ac20edce00
-SIZE (libitl-0.7.0.tar.gz) = 135700
+TIMESTAMP = 1509667607
+SHA256 (arabeyes-org-ITL-v0.8.0-f8f41cc_GH0.tar.gz) = cf113a7b963469e2cf56d3b9e9d7cae18c79ac55ab1faa8b4464aad3dc1a4234
+SIZE (arabeyes-org-ITL-v0.8.0-f8f41cc_GH0.tar.gz) = 1233648

arabic/libitl/files/patch-CMakeLists.txt

@@ -0,0 +1,24 @@
+--- CMakeLists.txt.orig	2017-10-31 20:26:09 UTC
++++ CMakeLists.txt
+@@ -12,7 +12,7 @@ set(LIBRARY_VERSION_FULL "${LIBRARY_VERS
+ message( "Installation target directory is: " ${CMAKE_INSTALL_PREFIX} )
+ message( "To override this value, use 'make -DCMAKE_INSTALL_PREFIX=$DIR'" )
+
+-set( COMPILE_FLAGS "-ansi -pedantic -Wall -O2" )
++set( COMPILE_FLAGS "-pedantic -Wall -O2" )
+ set( CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} ${COMPILE_FLAGS}" )
+
+ # Specify header files
+@@ -43,9 +43,9 @@ set(VERSION "${LIBRARY_VERSION_FULL}")
+ configure_file("libitl.pc.in" "libitl.pc" @ONLY)
+
+ install( FILES ${HEADER_FILES} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/itl" )
+-install( TARGETS itl DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+-install( TARGETS itlShared DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+-install(FILES "libitl.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/)
++install( TARGETS itl DESTINATION ${CMAKE_INSTALL_LIBDIR}/itl )
++install( TARGETS itlShared DESTINATION ${CMAKE_INSTALL_LIBDIR}/itl )
++install(FILES "libitl.pc" DESTINATION ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig/)
+
+ # Specify executables
+ add_executable( demo_hijri hijri/demo_hijri.c )

arabic/libitl/pkg-descr

@@ -1,5 +1,10 @@
-The Islamic Tools and Libraries (ITL) is a project to provide a
-plethora of useful Islamic tools and applications as well as a
-comprehensive feature-full Islam-centric library. The ITL
-project currently includes full lunar-centric time measurement
-routines.
+The Islamic Tools and Libraries (ITL) project provides a fully
+featured library for performing common Islamic calculations.
+
+ITL is currently composed of two library-modules:
+
+* prayertime: Geographically-aware prayer time and Qibla calculation
+  routines.
+* hijri: Hijri date generation/calculation and conversion routines.
+
+WWW: https://github.com/arabeyes-org/ITL

arabic/libitl/pkg-plist

@@ -1,6 +1,8 @@
+include/itl/astro.h
 include/itl/hijri.h
 include/itl/prayer.h
 lib/itl/libitl.a
 lib/itl/libitl.so
 lib/itl/libitl.so.0
-lib/itl/libitl.so.0.0.7
+lib/itl/libitl.so.0.1.8
+libdata/pkgconfig/libitl.pc

archivers/brotli/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	brotli
-PORTVERSION=	0.6.0
-PORTREVISION=	1
+PORTVERSION=	1.0.2
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	archivers devel
@@ -17,14 +16,14 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
 
-USES=		cmake compiler:c++0x pkgconfig
+USES=		autoreconf:build compiler:c++0x gmake libtool pkgconfig
 USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
 
-CMAKE_ARGS=		-DBUILD_TESTING:BOOL=OFF
+INSTALL_TARGET=	install-strip
+PLIST_SUB=	SHLIBVER=${PORTVERSION}
 
-post-install:
-	${LN} -s libbrotlicommon.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libbrotlicommon.so.0
-	${LN} -s libbrotlidec.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libbrotlidec.so.0
-	${LN} -s libbrotlienc.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libbrotlienc.so.0
+pre-configure:
+	(cd ${WRKSRC} && ./bootstrap)
 
 .include <bsd.port.mk>

archivers/brotli/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1498054439
-SHA256 (google-brotli-v0.6.0_GH0.tar.gz) = 69cdbdf5709051dd086a2f020f5abf9e32519eafe0ad6be820c667c3a9c9ee0f
-SIZE (google-brotli-v0.6.0_GH0.tar.gz) = 19838761
+TIMESTAMP = 1511961437
+SHA256 (google-brotli-v1.0.2_GH0.tar.gz) = c2cf2a16646b44771a4109bb21218c8e2d952babb827796eb8a800c1f94b7422
+SIZE (google-brotli-v1.0.2_GH0.tar.gz) = 23736359