diff --git a/CHANGES b/CHANGES index b13b1fdbade5c..920bfd75ddb48 100644 --- a/CHANGES +++ b/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. diff --git a/MOVED b/MOVED index effe770d81da8..5f74f3a99ec91 100644 --- a/MOVED +++ b/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 diff --git a/Mk/Scripts/qa.sh b/Mk/Scripts/qa.sh index 868043601a924..87f2b23d689bf 100644 --- a/Mk/Scripts/qa.sh +++ b/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++}\ diff --git a/Mk/Uses/gnome.mk b/Mk/Uses/gnome.mk index 7bab1fdb636b9..a7eee66058f99 100644 --- a/Mk/Uses/gnome.mk +++ b/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 diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk index c85ee51037db9..aae43a168264c 100644 --- a/Mk/Uses/kde.mk +++ b/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. diff --git a/Mk/Uses/perl5.mk b/Mk/Uses/perl5.mk index 1b22c9602a492..ebb420ac94e42 100644 --- a/Mk/Uses/perl5.mk +++ b/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) diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index 74def686480f2..4ee1915810880 100644 --- a/Mk/Uses/python.mk +++ b/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 diff --git a/UPDATING b/UPDATING index fc578e8d18577..e1c248da09c48 100644 --- a/UPDATING +++ b/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 diff --git a/arabic/libitl/Makefile b/arabic/libitl/Makefile index a49d3b9ecb6e4..5ce34db75ce80 100644 --- a/arabic/libitl/Makefile +++ b/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 diff --git a/arabic/libitl/distinfo b/arabic/libitl/distinfo index 9fd16278a1da7..d80007db6bc38 100644 --- a/arabic/libitl/distinfo +++ b/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 diff --git a/arabic/libitl/files/patch-CMakeLists.txt b/arabic/libitl/files/patch-CMakeLists.txt new file mode 100644 index 0000000000000..d29157f0faa31 --- /dev/null +++ b/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 ) diff --git a/arabic/libitl/files/patch-Makefile.in b/arabic/libitl/files/patch-Makefile.in deleted file mode 100644 index 511fc45c615af..0000000000000 --- a/arabic/libitl/files/patch-Makefile.in +++ /dev/null @@ -1,24 +0,0 @@ ---- Makefile.in.orig 2009-03-17 16:26:28 UTC -+++ Makefile.in -@@ -83,15 +83,15 @@ debinstall: components - - install: build/libitl.so build/libitl.a - @echo "==> Installing libitl library..." -- test -d $(PREFIX)/lib/itl \ -- || install -d $(PREFIX)/lib/itl \ -+ test -d $(DESTDIR)$(PREFIX)/lib/itl \ -+ || install -d $(DESTDIR)$(PREFIX)/lib/itl \ - || exit 1; -- install build/$(FULLNAME) $(PREFIX)/lib/itl -- install build/libitl.a $(PREFIX)/lib/itl -+ install build/$(FULLNAME) $(DESTDIR)$(PREFIX)/lib/itl -+ install build/libitl.a $(DESTDIR)$(PREFIX)/lib/itl - # Using cp -P as cp --no-dereference is not POSIX - # or use --preserve=link instead. -- cp -P build/$(SONAME) $(PREFIX)/lib/itl -- cp -P build/libitl.so $(PREFIX)/lib/itl -+ cp -P build/$(SONAME) $(DESTDIR)$(PREFIX)/lib/itl -+ cp -P build/libitl.so $(DESTDIR)$(PREFIX)/lib/itl - @echo "==> Installing ITL components..." - for i in $(COMPONENTS); do \ - $(MAKE) -C $$i install || exit 1; \ diff --git a/arabic/libitl/files/patch-hijri_Makefile b/arabic/libitl/files/patch-hijri_Makefile deleted file mode 100644 index 4a41aa88c0359..0000000000000 --- a/arabic/libitl/files/patch-hijri_Makefile +++ /dev/null @@ -1,16 +0,0 @@ ---- hijri/Makefile.orig 2006-09-21 16:34:31 UTC -+++ hijri/Makefile -@@ -10,10 +10,10 @@ demo_hijri: - - install: all - @echo "==> Installing hijri component..." -- test -d $(PREFIX)/include/itl \ -- || install -d $(PREFIX)/include/itl \ -+ test -d $(DESTDIR)$(PREFIX)/include/itl \ -+ || install -d $(DESTDIR)$(PREFIX)/include/itl \ - || exit 1; -- install src/hijri.h $(PREFIX)/include/itl -+ install src/hijri.h $(DESTDIR)$(PREFIX)/include/itl - - uninstall: - @echo "==> Uninstalling hijri component..." diff --git a/arabic/libitl/files/patch-prayertime_Makefile b/arabic/libitl/files/patch-prayertime_Makefile deleted file mode 100644 index 632f656f50fbc..0000000000000 --- a/arabic/libitl/files/patch-prayertime_Makefile +++ /dev/null @@ -1,16 +0,0 @@ ---- prayertime/Makefile.orig 2006-09-21 16:37:51 UTC -+++ prayertime/Makefile -@@ -10,10 +10,10 @@ demo_prayer: - - install: all - @echo "==> Installing prayertime component..." -- test -d $(PREFIX)/include/itl \ -- || install $(PREFIX)/include/itl \ -+ test -d $(DESTDIR)$(PREFIX)/include/itl \ -+ || install $(DESTDIR)$(PREFIX)/include/itl \ - || exit 1; -- install src/prayer.h $(PREFIX)/include/itl -+ install src/prayer.h $(DESTDIR)$(PREFIX)/include/itl - - uninstall: - @echo "==> Uninstalling prayertime component..." diff --git a/arabic/libitl/pkg-descr b/arabic/libitl/pkg-descr index e57cd3eaebf42..3c03777922ed2 100644 --- a/arabic/libitl/pkg-descr +++ b/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 diff --git a/arabic/libitl/pkg-plist b/arabic/libitl/pkg-plist index c5c6ba39fc7e6..7ce6426336c8f 100644 --- a/arabic/libitl/pkg-plist +++ b/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 diff --git a/archivers/brotli/Makefile b/archivers/brotli/Makefile index 99f6bd5b674b4..f770ffb243ee0 100644 --- a/archivers/brotli/Makefile +++ b/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 diff --git a/archivers/brotli/distinfo b/archivers/brotli/distinfo index 00fc327fa7978..307190e48eb12 100644 --- a/archivers/brotli/distinfo +++ b/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 diff --git a/archivers/brotli/files/patch-freebsd-upstream b/archivers/brotli/files/patch-freebsd-upstream new file mode 100644 index 0000000000000..54bfb94cc20a3 --- /dev/null +++ b/archivers/brotli/files/patch-freebsd-upstream @@ -0,0 +1,121 @@ +From 1ca15159d6a7d4b202de17a94abf52c6c1d5988a Mon Sep 17 00:00:00 2001 +From: Bernard Spil +Date: Wed, 29 Nov 2017 22:38:16 +0100 +Subject: [PATCH 1/4] Fix missing symbols errors in libbrotlienc and dec (#623) + +When using autotools to build the binary and libraries, the resulting libraries don't link `brotlicommon` or `m`. +This was detected when building cURL 7.57.0 which has now has brotli support. During configure it was failing +``` +checking run-time libs availability... failed +configure: error: one or more libs available at link-time are not available run-time. Libs used at link-time: -lbrotlidec -lz -L/usr/local/lib +``` +inspection of config.log showed missing symbols from libbrotlicommon as the cause. + +This patch results in the encryption and decryption libs to be properly linked against libbrotlicommon and libm. +See also https://bugs.freebsd.org/223966 +--- + Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index c4ced6da..ace7a850 100644 +--- Makefile.am.orig ++++ Makefile.am +@@ -23,8 +23,10 @@ libbrotlicommon_la_SOURCES = $(BROTLI_COMMON_C) $(BROTLI_COMMON_H) + libbrotlicommon_la_LDFLAGS = $(AM_LDFLAGS) $(LIBBROTLI_VERSION_INFO) $(LDFLAGS) + libbrotlidec_la_SOURCES = $(BROTLI_DEC_C) $(BROTLI_DEC_H) + libbrotlidec_la_LDFLAGS = $(AM_LDFLAGS) $(LIBBROTLI_VERSION_INFO) $(LDFLAGS) ++libbrotlidec_la_LIBADD = libbrotlicommon.la -lm + libbrotlienc_la_SOURCES = $(BROTLI_ENC_C) $(BROTLI_ENC_H) + libbrotlienc_la_LDFLAGS = $(AM_LDFLAGS) $(LIBBROTLI_VERSION_INFO) $(LDFLAGS) ++libbrotlienc_la_LIBADD = libbrotlicommon.la -lm + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = \ + +From c8c8389ed3101279b79d93210b33f63dca8af74c Mon Sep 17 00:00:00 2001 +From: Eugene Kliuchnikov +Date: Thu, 30 Nov 2017 11:02:54 +0100 +Subject: [PATCH 2/4] Do not rely on bash arithmetic in `bootstrap` (#625) + +--- + bootstrap | 21 +++++++++++++-------- + 1 file changed, 13 insertions(+), 8 deletions(-) + +diff --git a/bootstrap b/bootstrap +index 2f43f50e..7c7020d3 100755 +--- bootstrap.orig ++++ bootstrap +@@ -1,19 +1,24 @@ + # !/bin/sh -e + ++REQUIRED='is required, but not installed.' ++bc -v >/dev/null 2>&1 || { echo >&2 "'bc' $REQUIRED"; exit 1; } ++sed --version >/dev/null 2>&1 || { echo >&2 "'sed' $REQUIRED"; exit 1; } ++autoreconf --version >/dev/null 2>&1 || { echo >&2 "'autoconf' $REQUIRED"; exit 1; } ++ + mkdir m4 2>/dev/null + + BROTLI_ABI_HEX=`sed -n 's/#define BROTLI_ABI_VERSION 0x//p' c/common/version.h` +-BROTLI_ABI_INT=`echo $((16#$BROTLI_ABI_HEX))` +-BROTLI_ABI_CURRENT=$(($BROTLI_ABI_INT >> 24)) +-BROTLI_ABI_REVISION=$((($BROTLI_ABI_INT >> 12) & 4095)) +-BROTLI_ABI_AGE=$(($BROTLI_ABI_INT & 4095)) ++BROTLI_ABI_INT=`echo "ibase=16;$BROTLI_ABI_HEX" | bc` ++BROTLI_ABI_CURRENT=`expr $BROTLI_ABI_INT / 16777216` ++BROTLI_ABI_REVISION=`expr $BROTLI_ABI_INT / 4096 % 4096` ++BROTLI_ABI_AGE=`expr $BROTLI_ABI_INT % 4096` + BROTLI_ABI_INFO="$BROTLI_ABI_CURRENT:$BROTLI_ABI_REVISION:$BROTLI_ABI_AGE" + + BROTLI_VERSION_HEX=`sed -n 's/#define BROTLI_VERSION 0x//p' c/common/version.h` +-BROTLI_VERSION_INT=`echo $((16#$BROTLI_VERSION_HEX))` +-BROTLI_VERSION_MAJOR=$(($BROTLI_VERSION_INT >> 24)) +-BROTLI_VERSION_MINOR=$((($BROTLI_VERSION_INT >> 12) & 4095)) +-BROTLI_VERSION_PATCH=$(($BROTLI_VERSION_INT & 4095)) ++BROTLI_VERSION_INT=`echo "ibase=16;$BROTLI_VERSION_HEX" | bc` ++BROTLI_VERSION_MAJOR=`expr $BROTLI_VERSION_INT / 16777216` ++BROTLI_VERSION_MINOR=`expr $BROTLI_VERSION_INT / 4096 % 4096` ++BROTLI_VERSION_PATCH=`expr $BROTLI_VERSION_INT % 4096` + BROTLI_VERSION="$BROTLI_VERSION_MAJOR.$BROTLI_VERSION_MINOR.$BROTLI_VERSION_PATCH" + + sed -r "s/[0-9]+:[0-9]+:[0-9]+/$BROTLI_ABI_INFO/" Makefile.am -i + +From 62194f204d90a5a95310a6949f00a0c6c5ca07bd Mon Sep 17 00:00:00 2001 +From: Bernard Spil +Date: Mon, 4 Dec 2017 15:17:49 +0100 +Subject: [PATCH 4/4] Work around Linuxisms (#627) + +Missed this in my previous tests. Sorry for that. + +On BSDs, both bc and sed are part of the base operating system. For sed this results in an error as the check construct (--version) is a GNU-ism and only works for GNU sed, not for bsd sed. +Similarly, BSD sed does not take parameters after the filename(s) operated on. Moving `-i` to the front fixes that. `-r` is provided for GNU compat in BSD sed as an alias of `-E`. The `-i` option in BSD sed requires an extension to work in-place. + +(thank you for picking up the nginx module too!) +--- + bootstrap | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/bootstrap b/bootstrap +index 7c7020d3..dbaea15d 100755 +--- bootstrap.orig ++++ bootstrap +@@ -2,7 +2,9 @@ + + REQUIRED='is required, but not installed.' + bc -v >/dev/null 2>&1 || { echo >&2 "'bc' $REQUIRED"; exit 1; } ++if [ `uname -s` != "FreeBSD" ]; then + sed --version >/dev/null 2>&1 || { echo >&2 "'sed' $REQUIRED"; exit 1; } ++fi + autoreconf --version >/dev/null 2>&1 || { echo >&2 "'autoconf' $REQUIRED"; exit 1; } + + mkdir m4 2>/dev/null +@@ -21,7 +23,7 @@ BROTLI_VERSION_MINOR=`expr $BROTLI_VERSION_INT / 4096 % 4096` + BROTLI_VERSION_PATCH=`expr $BROTLI_VERSION_INT % 4096` + BROTLI_VERSION="$BROTLI_VERSION_MAJOR.$BROTLI_VERSION_MINOR.$BROTLI_VERSION_PATCH" + +-sed -r "s/[0-9]+:[0-9]+:[0-9]+/$BROTLI_ABI_INFO/" Makefile.am -i +-sed -r "s/\[[0-9]+\.[0-9]+\.[0-9]+\]/[$BROTLI_VERSION]/" configure.ac -i ++sed -i.bak -r "s/[0-9]+:[0-9]+:[0-9]+/$BROTLI_ABI_INFO/" Makefile.am ++sed -i.bak -r "s/\[[0-9]+\.[0-9]+\.[0-9]+\]/[$BROTLI_VERSION]/" configure.ac + + autoreconf --install --force --symlink || exit $ diff --git a/archivers/brotli/pkg-plist b/archivers/brotli/pkg-plist index 383f6df505b26..e68bff66af138 100644 --- a/archivers/brotli/pkg-plist +++ b/archivers/brotli/pkg-plist @@ -1,17 +1,21 @@ -bin/bro +bin/brotli include/brotli/decode.h include/brotli/encode.h include/brotli/port.h include/brotli/types.h +lib/libbrotlicommon.a lib/libbrotlicommon.so -lib/libbrotlicommon.so.0 -lib/libbrotlicommon.so.0.6.0 +lib/libbrotlicommon.so.1 +lib/libbrotlicommon.so.%%SHLIBVER%% +lib/libbrotlidec.a lib/libbrotlidec.so -lib/libbrotlidec.so.0 -lib/libbrotlidec.so.0.6.0 +lib/libbrotlidec.so.1 +lib/libbrotlidec.so.%%SHLIBVER%% +lib/libbrotlienc.a lib/libbrotlienc.so -lib/libbrotlienc.so.0 -lib/libbrotlienc.so.0.6.0 +lib/libbrotlienc.so.1 +lib/libbrotlienc.so.%%SHLIBVER%% libdata/pkgconfig/libbrotlicommon.pc libdata/pkgconfig/libbrotlidec.pc libdata/pkgconfig/libbrotlienc.pc +%%PORTDOCS%%%%PORTDOCS%%%%DOCSDIR%%/README diff --git a/archivers/jzlib/Makefile b/archivers/jzlib/Makefile index 15ee33f4c0bbf..8e3b77c2a6d36 100644 --- a/archivers/jzlib/Makefile +++ b/archivers/jzlib/Makefile @@ -9,9 +9,13 @@ MASTER_SITES= http://www.jcraft.com/jzlib/ MAINTAINER= danilo@FreeBSD.org COMMENT= Reimplementation of zlib in pure Java +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + USES= zip USE_JAVA= yes JAVA_VERSION= 1.6+ +NO_ARCH= yes JAR_FILE= ${WRKSRC}/src/main/java/${PORTNAME}.jar @@ -26,12 +30,16 @@ do-build: ${JAR} -cf ${PORTNAME}.jar do-install: + ${INSTALL_DATA} ${JAR_FILE} ${STAGEDIR}/${JAVAJARDIR}/${PORTNAME}.jar + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}/${DOCSDIR} .for file in ChangeLog LICENSE.txt README - @${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}/${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}/${DOCSDIR} .endfor + +do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}/${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/example/* ${STAGEDIR}/${EXAMPLESDIR} - ${INSTALL_DATA} ${JAR_FILE} ${STAGEDIR}/${JAVAJARDIR}/${PORTNAME}.jar .include diff --git a/archivers/kf5-karchive/distinfo b/archivers/kf5-karchive/distinfo index 93140f3a5886b..de33491123455 100644 --- a/archivers/kf5-karchive/distinfo +++ b/archivers/kf5-karchive/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1509877816 -SHA256 (KDE/frameworks/5.40.0/karchive-5.40.0.tar.xz) = 1e181495390ba730f2b1aa9354da2122e2aa592aaffdbce4164fd9dcb2d97bb1 -SIZE (KDE/frameworks/5.40.0/karchive-5.40.0.tar.xz) = 113576 +TIMESTAMP = 1512366801 +SHA256 (KDE/frameworks/5.41.0/karchive-5.41.0.tar.xz) = 43c40f06e8a5e3198e5363a82748b3a7cb79526489e6bb651ca59e509297a741 +SIZE (KDE/frameworks/5.41.0/karchive-5.41.0.tar.xz) = 113596 diff --git a/archivers/pecl-phk/Makefile b/archivers/pecl-phk/Makefile index f1ac96cbd2973..8ae4aed3be53e 100644 --- a/archivers/pecl-phk/Makefile +++ b/archivers/pecl-phk/Makefile @@ -13,7 +13,7 @@ LICENSE= PHP301 USES= php:pecl USE_PHP= hash:build -IGNORE_WITH_PHP= 70 71 +IGNORE_WITH_PHP= 70 71 72 CONFIGURE_ARGS= --enable-phk diff --git a/archivers/py-brotli/Makefile b/archivers/py-brotli/Makefile index 212b50001c3e2..72c23e54a8b83 100644 --- a/archivers/py-brotli/Makefile +++ b/archivers/py-brotli/Makefile @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= brotli -PORTVERSION= 1.0.1 +PORTVERSION= 1.0.2 +DISTVERSIONPREFIX= v CATEGORIES= archivers -MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= Brotli-${PORTVERSION} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Generic-purpose lossless compression algorithm @@ -15,10 +14,13 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE USE_PYTHON= autoplist concurrent distutils -USES= compiler:c++0x python shebangfix zip +USES= compiler:c++0x python shebangfix PLIST_FILES= bin/brotli +GH_ACCOUNT= google +USE_GITHUB= yes + SHEBANG_FILES= python/bro.py post-install: diff --git a/archivers/py-brotli/distinfo b/archivers/py-brotli/distinfo index d71e1a5a8a5ca..90dacb6d68839 100644 --- a/archivers/py-brotli/distinfo +++ b/archivers/py-brotli/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1510696052 -SHA256 (Brotli-1.0.1.zip) = 36c5d56f4f20c952ed998b0d2f9839a282081fd1f18e82bc3b3e9348b27fbe6d -SIZE (Brotli-1.0.1.zip) = 482833 +TIMESTAMP = 1512857770 +SHA256 (google-brotli-v1.0.2_GH0.tar.gz) = c2cf2a16646b44771a4109bb21218c8e2d952babb827796eb8a800c1f94b7422 +SIZE (google-brotli-v1.0.2_GH0.tar.gz) = 23736359 diff --git a/archivers/rox-archive/Makefile b/archivers/rox-archive/Makefile index 655dcfea2dd13..70bc8b0e74ff9 100644 --- a/archivers/rox-archive/Makefile +++ b/archivers/rox-archive/Makefile @@ -11,9 +11,9 @@ MAINTAINER= olgeni@FreeBSD.org COMMENT= Archive management tool for the ROX desktop RUN_DEPENDS= ${LOCALBASE}/bin/rox:x11-fm/rox-filer \ - ${LOCALBASE}/lib/ROX-Lib2/python/rox/__init__.py:devel/py-roxlib + ${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib -USES= python shebangfix tar:bzip2 +USES= python:2.7 shebangfix tar:bzip2 NO_ARCH= yes SHEBANG_FILES= Archive/AppRun diff --git a/astro/astrometry/Makefile b/astro/astrometry/Makefile index b93a4f0475ba4..26663d6b14a95 100644 --- a/astro/astrometry/Makefile +++ b/astro/astrometry/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= libcairo.so:graphics/cairo \ libnetpbm.so:graphics/netpbm RUN_DEPENDS= ${PYNUMPY} -USES= gmake jpeg pkgconfig python shebangfix tar:bzip2 +USES= gmake jpeg pkgconfig python:2.7 shebangfix tar:bzip2 SHEBANG_FILES= blind/*.py sdss/*.py util/[!c]*.py util/casjobs.py USE_LDCONFIG= ${PREFIX}/${PORTNAME}/lib ALL_TARGET= all extra diff --git a/astro/josm/Makefile b/astro/josm/Makefile index eafc5ecbd7589..62142dfe8d8d8 100644 --- a/astro/josm/Makefile +++ b/astro/josm/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= josm -PORTVERSION= 13053 +PORTVERSION= 13170 CATEGORIES= astro java MASTER_SITES= http://josm.openstreetmap.de/download/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/astro/josm/distinfo b/astro/josm/distinfo index f8098a8ace586..6ed045662e338 100644 --- a/astro/josm/distinfo +++ b/astro/josm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1511262726 -SHA256 (josm-snapshot-13053.jar) = e6fbff5274641e124803bcf9eb5b3401d6db05978024d33fde8356fd40affa33 -SIZE (josm-snapshot-13053.jar) = 12349613 +TIMESTAMP = 1512996045 +SHA256 (josm-snapshot-13170.jar) = 105366a22081c47680acb813d4b972e6e98a3a8253e4b219bc422d149a896558 +SIZE (josm-snapshot-13170.jar) = 12495613 diff --git a/astro/libosmpbf/Makefile b/astro/libosmpbf/Makefile index 872ffb5703eff..340de01e3595d 100644 --- a/astro/libosmpbf/Makefile +++ b/astro/libosmpbf/Makefile @@ -4,7 +4,7 @@ PORTNAME= libosmpbf PORTVERSION= 1.3.3 DISTVERSIONPREFIX= v -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= astro geography devel MAINTAINER= amdmi3@FreeBSD.org diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile index d593d0f72fbcf..d4a8fd6e48484 100644 --- a/astro/merkaartor/Makefile +++ b/astro/merkaartor/Makefile @@ -3,7 +3,7 @@ PORTNAME= merkaartor PORTVERSION= 0.18.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= astro MAINTAINER= dev2@heesakkers.info diff --git a/astro/p5-Astro-SpaceTrack/Makefile b/astro/p5-Astro-SpaceTrack/Makefile index 4a548b6d49155..6414bd3b1e03a 100644 --- a/astro/p5-Astro-SpaceTrack/Makefile +++ b/astro/p5-Astro-SpaceTrack/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Astro-SpaceTrack -PORTVERSION= 0.100 +PORTVERSION= 0.101 CATEGORIES= astro perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/astro/p5-Astro-SpaceTrack/distinfo b/astro/p5-Astro-SpaceTrack/distinfo index b6fb97337658e..f7258dfc1f6eb 100644 --- a/astro/p5-Astro-SpaceTrack/distinfo +++ b/astro/p5-Astro-SpaceTrack/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1507913210 -SHA256 (Astro-SpaceTrack-0.100.tar.gz) = 981baa6db3943b00ebb0c2d490b21530a40788d03ef197352180e5c9fa8c9f54 -SIZE (Astro-SpaceTrack-0.100.tar.gz) = 168954 +TIMESTAMP = 1512745137 +SHA256 (Astro-SpaceTrack-0.101.tar.gz) = af8547b149db9e3116f695cac334a9f6ec11d790847330dd10c898fba5822846 +SIZE (Astro-SpaceTrack-0.101.tar.gz) = 170201 diff --git a/astro/p5-Astro-satpass/Makefile b/astro/p5-Astro-satpass/Makefile index 824978c71a88a..5fed43747cf00 100644 --- a/astro/p5-Astro-satpass/Makefile +++ b/astro/p5-Astro-satpass/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Astro-satpass -PORTVERSION= 0.085 +PORTVERSION= 0.086 CATEGORIES= astro perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/astro/p5-Astro-satpass/distinfo b/astro/p5-Astro-satpass/distinfo index 28905a4202e14..3c695d3c95273 100644 --- a/astro/p5-Astro-satpass/distinfo +++ b/astro/p5-Astro-satpass/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1512165298 -SHA256 (Astro-satpass-0.085.tar.gz) = 91b064aba9ce6e3ead69fdbf3483026365f02a225659613df43eb70457e4c9e6 -SIZE (Astro-satpass-0.085.tar.gz) = 542206 +TIMESTAMP = 1512745150 +SHA256 (Astro-satpass-0.086.tar.gz) = 756ee20a58e29ff711adda5c1928f28fec0acaa2ed5f496ee48fc3e33a41bb6d +SIZE (Astro-satpass-0.086.tar.gz) = 542154 diff --git a/astro/xearth/files/freebsd.committers.markers b/astro/xearth/files/freebsd.committers.markers index e34c7c3f19163..0e122a1014286 100644 --- a/astro/xearth/files/freebsd.committers.markers +++ b/astro/xearth/files/freebsd.committers.markers @@ -293,6 +293,7 @@ 30.715833 -95.5525, "ade" # Huntsville, TX, USA 37.0625, -95.677068, "kmacy" # Palo Alto, CA, USA 29.7925, -95.8225, "dwcjr" # Katy, TX, USA + 39.168, -96.620, "kevans" # Manhattan, KS, USA 28.898118, -97.037111, "xride" # Victoria, TX, USA 30.47702408 -97.64801025 "ler" # Pflugerville, TX, USA 30.343, -97.881, " ,linimon" # Austin, TX, USA diff --git a/audio/GxSwitchlessWah-lv2/Makefile b/audio/GxSwitchlessWah-lv2/Makefile new file mode 100644 index 0000000000000..24118fde5de84 --- /dev/null +++ b/audio/GxSwitchlessWah-lv2/Makefile @@ -0,0 +1,35 @@ +# $FreeBSD$ + +PORTNAME= GxSwitchlessWah +DISTVERSION= g20171206 +CATEGORIES= audio +PKGNAMESUFFIX= -lv2 + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Analog wah emulation with switchless activation + +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/LICENSE + +BUILD_DEPENDS= lv2>0:audio/lv2 + +USES= gmake localbase +USE_GITHUB= yes +GH_ACCOUNT= brummer10 +GH_PROJECT= ${PORTNAME}.lv2 +GH_TAGNAME= 6977568 + +SSE_FLAGS_i386= "-msse -mfpmath=sse" +SSE_FLAGS_amd64= "-msse2 -mfpmath=sse" +SSE_FLAGS_armv7= "-march=armv7 -mfpu=vfpv3" + +MAKE_ARGS= SSE_CFLAGS=${SSE_FLAGS_${ARCH}} + +PLIST_FILES= lib/lv2/GxSwitchlessWah.lv2/gx_switchless_wah.so \ + lib/lv2/GxSwitchlessWah.lv2/gx_switchless_wah.ttl \ + lib/lv2/GxSwitchlessWah.lv2/manifest.ttl + +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lv2/GxSwitchlessWah.lv2/gx_switchless_wah.so + +.include diff --git a/audio/GxSwitchlessWah-lv2/distinfo b/audio/GxSwitchlessWah-lv2/distinfo new file mode 100644 index 0000000000000..8017d277e29cd --- /dev/null +++ b/audio/GxSwitchlessWah-lv2/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1512578914 +SHA256 (brummer10-GxSwitchlessWah.lv2-g20171206-6977568_GH0.tar.gz) = 5d7a67c58fd44848e317a55496a1421183ac1654eb703ebd8618d2b03ce0a831 +SIZE (brummer10-GxSwitchlessWah.lv2-g20171206-6977568_GH0.tar.gz) = 17415 diff --git a/audio/GxSwitchlessWah-lv2/files/patch-Makefile b/audio/GxSwitchlessWah-lv2/files/patch-Makefile new file mode 100644 index 0000000000000..532fbcbca68d6 --- /dev/null +++ b/audio/GxSwitchlessWah-lv2/files/patch-Makefile @@ -0,0 +1,47 @@ +--- Makefile.orig 2017-12-08 06:25:07 UTC ++++ Makefile +@@ -8,25 +8,25 @@ + endif + + # check CPU and supported optimization flags +- ifneq ($(shell cat /proc/cpuinfo | grep sse3 ) , ) +- SSE_CFLAGS = -msse3 -mfpmath=sse +- else ifneq ($(shell cat /proc/cpuinfo | grep sse2 ) , ) +- SSE_CFLAGS = -msse2 -mfpmath=sse +- else ifneq ($(shell cat /proc/cpuinfo | grep sse ) , ) +- SSE_CFLAGS = -msse -mfpmath=sse +- else ifneq ($(shell cat /proc/cpuinfo | grep ARM ) , ) +- ifneq ($(shell cat /proc/cpuinfo | grep ARMv7 ) , ) +- ifneq ($(shell cat /proc/cpuinfo | grep vfpd32 ) , ) +- SSE_CFLAGS = -march=armv7 -mfpu=vfpv3 +- else ifneq ($(shell cat /proc/cpuinfo | grep vfpv3 ) , ) +- SSE_CFLAGS = -march=armv7 -mfpu=vfpv3 +- endif +- else +- ARMCPU = "YES" +- endif +- else +- SSE_CFLAGS = +- endif ++ #ifneq ($(shell cat /proc/cpuinfo | grep sse3 ) , ) ++ # SSE_CFLAGS = -msse3 -mfpmath=sse ++ #else ifneq ($(shell cat /proc/cpuinfo | grep sse2 ) , ) ++ # SSE_CFLAGS = -msse2 -mfpmath=sse ++ #else ifneq ($(shell cat /proc/cpuinfo | grep sse ) , ) ++ # SSE_CFLAGS = -msse -mfpmath=sse ++ # else ifneq ($(shell cat /proc/cpuinfo | grep ARM ) , ) ++ # ifneq ($(shell cat /proc/cpuinfo | grep ARMv7 ) , ) ++ # ifneq ($(shell cat /proc/cpuinfo | grep vfpd32 ) , ) ++ # SSE_CFLAGS = -march=armv7 -mfpu=vfpv3 ++ # else ifneq ($(shell cat /proc/cpuinfo | grep vfpv3 ) , ) ++ # SSE_CFLAGS = -march=armv7 -mfpu=vfpv3 ++ # endif ++ # else ++ # ARMCPU = "YES" ++ # endif ++ #else ++ # SSE_CFLAGS = ++ #endif + + # set bundle name + NAME = gx_switchless_wah diff --git a/audio/GxSwitchlessWah-lv2/pkg-descr b/audio/GxSwitchlessWah-lv2/pkg-descr new file mode 100644 index 0000000000000..18d93850cbeb8 --- /dev/null +++ b/audio/GxSwitchlessWah-lv2/pkg-descr @@ -0,0 +1,7 @@ +Analog wah emulator allowing to alter sound in a way to create a distinctive +sound, mimicking the human voice saying the onomatopoeic name "wah-wah". + +See the corresponding article on Wikipedia: +https://en.wikipedia.org/wiki/Wah-wah_pedal + +WWW: https://github.com/brummer10/GxSwitchlessWah.lv2 diff --git a/audio/Makefile b/audio/Makefile index 1346612c2eb98..37c98b24da27b 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -3,6 +3,7 @@ COMMENT = Audio tools + SUBDIR += GxSwitchlessWah-lv2 SUBDIR += HVSC-Update SUBDIR += Maaate SUBDIR += aacgain @@ -69,7 +70,6 @@ SUBDIR += carla SUBDIR += cava SUBDIR += ccaudio2 - SUBDIR += cd-console SUBDIR += cd-discid SUBDIR += cd2mp3 SUBDIR += cddb-bundle diff --git a/audio/ardour5/Makefile b/audio/ardour5/Makefile index 83b5a86f3b567..67b1f40b4fc1f 100644 --- a/audio/ardour5/Makefile +++ b/audio/ardour5/Makefile @@ -39,7 +39,7 @@ LIB_DEPENDS= libserd-0.so:devel/serd \ libFLAC.so:audio/flac USES= compiler:c++11-lang desktop-file-utils gettext libarchive \ - pkgconfig python:build readline:port tar:bzip2 waf + pkgconfig python:2.7,build readline:port tar:bzip2 waf USE_CXXSTD= c++11 USE_XORG= x11 USE_GNOME= atk cairo cairomm gdkpixbuf2 glib20 glibmm gtk20 gtkmm24 pango diff --git a/audio/beets/Makefile b/audio/beets/Makefile index 9c56f8bdb1933..3033c65db1594 100644 --- a/audio/beets/Makefile +++ b/audio/beets/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= beets -PORTVERSION= 1.4.2 -PORTREVISION= 1 +PORTVERSION= 1.4.5 CATEGORIES= audio python MASTER_SITES= CHEESESHOP @@ -13,25 +12,27 @@ COMMENT= Media library management system for obsessive-compulsive music geeks LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>=1.33:audio/py-mutagen@${FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode@${FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}musicbrainzngs>=0.4:audio/py-musicbrainzngs@${FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jellyfish>=0:devel/py-jellyfish@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}munkres>=0:math/py-munkres@${FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${FLAVOR} \ - ${PY_ENUM34} \ - ${PYTHON_PKGNAMEPREFIX}jellyfish>=0:devel/py-jellyfish@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}musicbrainzngs>=0.4:audio/py-musicbrainzngs@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mutagen>=1.33:audio/py-mutagen@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${FLAVOR} + ${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${FLAVOR} \ + ${PY_ENUM34} USES= python USE_PYTHON= autoplist distutils optsuffix PLIST_FILES= man/man1/beet.1.gz man/man5/beetsconfig.5.gz +NO_ARCH= yes + OPTIONS_DEFINE= ACOUSTICBRAINZ BADFILES BEATPORT BPD CHROMA DISCOGS EMBYUPDATE \ - FETCHART FFMPEG IMAGEMAGICK IPFS LASTFM LASTIMPORT LYRICS \ - LYRICS_GOOGLE MPDSTATS METASYNC_DBUS PLEXUPDATE REPLAYGAIN \ - SPOTIFY THUMBNAILS WEB WEB_CORS + FETCHART FFMPEG GMUSIC IMAGEMAGICK IPFS KODIUPDATE LASTFM \ + LASTIMPORT LYRICS LYRICS_GOOGLE MPDSTATS METASYNC_DBUS \ + PLEXUPDATE REPLAYGAIN SPOTIFY THUMBNAILS WEB WEB_CORS OPTIONS_DEFAULT= ACOUSTICBRAINZ_DESC= AcousticBrainz Plugin @@ -42,8 +43,10 @@ CHROMA_DESC= Audio Fingerprinting Plugin DISCOGS_DESC= Discogs Search Plugin EMBYUPDATE_DESC= Emby Update Plugin FETCHART_DESC= Cover Art Fetch Plugin -IPFS_DESC= IPFS Plugin +GMUSIC_DESC= Google Play Music Plugin IMAGEMAGICK_DESC= Cover Art Resizing and Comparison +IPFS_DESC= IPFS Plugin +KODIUPDATE_DESC= Kodi Update Plugin LASTFM_DESC= LastGenre Plugin LASTIMPORT_DESC= Last.fm Import Plugin LYRICS_DESC= Lyrics Plugin @@ -65,18 +68,20 @@ BEATPORT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVO BPD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gstreamer1>=0:multimedia/py-gstreamer1@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gobject>=0:devel/py-gobject@${FLAVOR} CHROMA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyacoustid>=0:audio/py-pyacoustid@${FLAVOR} -DISCOGS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}discogs-client>=2.1.0:audio/py-discogs-client@${FLAVOR} +DISCOGS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}discogs-client>=2.2.1:audio/py-discogs-client@${FLAVOR} EMBYUPDATE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} FETCHART_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} FFMPEG_RUN_DEPENDS= ffmpeg>=2:multimedia/ffmpeg +GMUSIC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gmusicapi>=0:audio/py-gmusicapi@${FLAVOR} IMAGEMAGICK_RUN_DEPENDS= convert:graphics/ImageMagick IPFS_RUN_DEPENDS= ipfs-go:sysutils/ipfs-go +KODIUPDATE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} LASTFM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pylast>=0:audio/py-pylast@${FLAVOR} LASTIMPORT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} LYRICS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} LYRICS_GOOGLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup@${FLAVOR} METASYNC_DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${FLAVOR} -MPDSTATS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpd2>=0:audio/py-mpd2@${FLAVOR} +MPDSTATS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpd2>=0.4.2:audio/py-mpd2@${FLAVOR} PLEXUPDATE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} REPLAYGAIN_RUN_DEPENDS= mp3gain>=0:audio/mp3gain REPLAYGAIN_RUN_DEPENDS+= aacgain>=0:audio/aacgain diff --git a/audio/beets/distinfo b/audio/beets/distinfo index 758e8f8ebf3ba..1de7ec0844ce0 100644 --- a/audio/beets/distinfo +++ b/audio/beets/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1481980458 -SHA256 (beets-1.4.2.tar.gz) = b54c72e220d7696740823d0a4e4f38d57d1e463daaf06da5194a358d3a14ca6a -SIZE (beets-1.4.2.tar.gz) = 1418185 +TIMESTAMP = 1512262180 +SHA256 (beets-1.4.5.tar.gz) = 1bea88c5c23137a36d09590856df8c2f4e857ef29890d16c4d14b1170e9202fc +SIZE (beets-1.4.5.tar.gz) = 1445173 diff --git a/audio/cd-console/Makefile b/audio/cd-console/Makefile deleted file mode 100644 index 07fb930d6a379..0000000000000 --- a/audio/cd-console/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# Created by: jdunn@aquezada.com -# $FreeBSD$ - -PORTNAME= cd-console -PORTVERSION= 2.4 -CATEGORIES= audio -MASTER_SITES= http://www.oskusoft.com/osku/cd-console/ - -MAINTAINER= jdunn@aquezada.com -COMMENT= Curses-based console CD player - -DEPRECATED= No public distfiles -EXPIRATION_DATE= 2017-12-12 - -USES= ncurses -MAKE_ARGS= BINPATH=${STAGEDIR}${PREFIX}/bin LIBS="${LDFLAGS} -lncurses" - -PLIST_FILES= bin/cd-console - -.include diff --git a/audio/cd-console/distinfo b/audio/cd-console/distinfo deleted file mode 100644 index 441be5dd6d43e..0000000000000 --- a/audio/cd-console/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (cd-console-2.4.tar.gz) = 39cb8af256d2bbd8eed23a4e2543c987af1adc668ce0b894bd206879b01966b5 -SIZE (cd-console-2.4.tar.gz) = 16981 diff --git a/audio/cd-console/files/patch-Makefile b/audio/cd-console/files/patch-Makefile deleted file mode 100644 index 69e3d88e18ef7..0000000000000 --- a/audio/cd-console/files/patch-Makefile +++ /dev/null @@ -1,62 +0,0 @@ ---- Makefile.orig 2001-08-25 18:09:00 UTC -+++ Makefile -@@ -5,43 +5,46 @@ - # very welcome). - - # for linux --DEFS = -DOS_LINUX --EXTRA_OBJS = cd_ll_linux.o -+#DEFS = -DOS_LINUX -+#EXTRA_OBJS = cd_ll_linux.o - - # for bsd. only tested on freebsd --#DEFS = -DOS_BSD --#EXTRA_OBJS = cd_ll_bsd.o -- -+DEFS = -DOS_BSD -+EXTRA_OBJS = cd_ll_bsd.o -+CDDEVICE=\"/dev/cdrom\" - - # you shouldn't have to change anything below this line - -- -+BINPATH=${PREFIX}/bin/ - OBJS=cd-console.o cd.o $(EXTRA_OBJS) - LIBS = -lncurses - - # common --CFLAGS=-O2 -Wall $(DEFS) -+CFLAGS+= $(DEFS) - #CFLAGS=-g -Wall $(DEFS) --CC = gcc -+#CC = gcc - - all: - make cd-console - strip cd-console - - cd-console: $(OBJS) -- $(CC) $(OBJS) $(LIBS) -o cd-console $(CFLAGS) -+ $(CXX) $(OBJS) $(LIBS) -o cd-console $(CFLAGS) - - cd-console.o: cd.h cd-console.cpp -- $(CC) -c cd-console.cpp $(CFLAGS) -+ $(CXX) -c cd-console.cpp $(CFLAGS) - - cd_ll_linux.o: cd_ll.h cd_ll_linux.h cd_ll_linux.cpp -- $(CC) -c cd_ll_linux.cpp $(CFLAGS) -+ $(CXX) -c cd_ll_linux.cpp $(CFLAGS) - - cd_ll_bsd.o: cd_ll.h cd_ll_bsd.h cd_ll_bsd.cpp -- $(CC) -c cd_ll_bsd.cpp $(CFLAGS) -+ $(CXX) -c -DDEVICE=$(CDDEVICE) cd_ll_bsd.cpp $(CFLAGS) - - cd.o: cd.h cd.cpp -- $(CC) -c cd.cpp $(CFLAGS) -+ $(CXX) -c cd.cpp $(CFLAGS) - - clean: - rm -f $(OBJS) cd-console -+ -+install: -+ @$(BSD_INSTALL_PROGRAM) cd-console $(BINPATH) diff --git a/audio/cd-console/files/patch-cd-console.cpp b/audio/cd-console/files/patch-cd-console.cpp deleted file mode 100644 index b46674dadcc3e..0000000000000 --- a/audio/cd-console/files/patch-cd-console.cpp +++ /dev/null @@ -1,8 +0,0 @@ ---- cd-console.cpp.orig 2001-08-25 18:09:00 UTC -+++ cd-console.cpp -@@ -1,4 +1,5 @@ - #include -+#include - #include - - #ifdef OS_BSD diff --git a/audio/cd-console/files/patch-cd__ll__bsd.cpp b/audio/cd-console/files/patch-cd__ll__bsd.cpp deleted file mode 100644 index 1f97601cc42a6..0000000000000 --- a/audio/cd-console/files/patch-cd__ll__bsd.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- cd_ll_bsd.cpp.orig 2001-08-25 18:09:00 UTC -+++ cd_ll_bsd.cpp -@@ -10,7 +10,9 @@ - #include "cd_ll_bsd.h" - - // the cd-rom device file --#define DEVICE "/dev/acd0c" -+#ifndef DEVICE -+#define DEVICE "/dev/cdrom" -+#endif - - cd_ll_bsd::cd_ll_bsd() - : m_fd(-1) diff --git a/audio/cd-console/pkg-descr b/audio/cd-console/pkg-descr deleted file mode 100644 index 02ac3d2bbc958..0000000000000 --- a/audio/cd-console/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -A curses-based console CD player, with two viewing modes, -one suitable for a 7x41 xterm. - -WWW: http://www.oskusoft.com/osku/cd-console/ diff --git a/audio/clementine-player/Makefile b/audio/clementine-player/Makefile index e6b1dcafbc641..c8c0366127b00 100644 --- a/audio/clementine-player/Makefile +++ b/audio/clementine-player/Makefile @@ -3,7 +3,7 @@ PORTNAME= clementine PORTVERSION= 1.3.1 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= audio PKGNAMESUFFIX= -player diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile index 2ee569fdda6eb..21ab4336bd63a 100644 --- a/audio/cmus/Makefile +++ b/audio/cmus/Makefile @@ -46,6 +46,7 @@ _CMUS_CONFIGURE_OPTS= AAC ALSA AO ARTS CDDB CDIO COREAUDIO CUE DISCID \ CONFIGURE_ARGS+= CONFIG_${opt}=n .endfor +OPTIONS_DEFINE= EXAMPLES OPTIONS_DEFAULT= AAC FFMPEG FLAC MAD MODPLUG MP4 OPUS OSS SNDIO VORBIS WAV OPTIONS_SUB= yes diff --git a/audio/decibel-audio-player/Makefile b/audio/decibel-audio-player/Makefile index d1f9a330848a8..6a00a57ae756f 100644 --- a/audio/decibel-audio-player/Makefile +++ b/audio/decibel-audio-player/Makefile @@ -10,15 +10,14 @@ MASTER_SITES= http://decibel.silent-blade.org/uploads/Main/ MAINTAINER= somicide@gmail.com COMMENT= Fast GTK+ audio player with an clean and user friendly interface -RUN_DEPENDS= py*-dbus>=0.80:devel/py-dbus \ - py*-mutagen>=1.11:audio/py-mutagen +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.80:devel/py-dbus@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mutagen>=1.11:audio/py-mutagen@${PY_FLAVOR} LICENSE= GPLv2 -USES= python USE_GNOME= pygnome2 pygtk2 USE_GSTREAMER= python good bad -USES= gmake gettext desktop-file-utils +USES= gmake gettext desktop-file-utils python:2.7 NO_BUILD= yes #Audio gstreamer plugins @@ -31,10 +30,10 @@ MPEG4IP_DESC= AAC/MP4P support EXTRAS_DESC= Extra dependencies for plugins AUDIOCD_RUN_DEPENDS= cd-discid>=0.9:audio/cd-discid \ - py*-cddb>=1.4:audio/py-cddb \ + ${PYTHON_PKGNAMEPREFIX}cddb>=1.4:audio/py-cddb@${PY_FLAVOR} \ gstreamer-plugins-cdio>=0.10.16:sysutils/gstreamer-plugins-cdio -EXTRAS_RUN_DEPENDS= py*-pillow>0:graphics/py-pillow \ - py*-notify>=0.1.1:devel/py-notify +EXTRAS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:devel/py-notify@${PY_FLAVOR} FLAC_USE= GSTREAMER=flac MP3_USE= GSTREAMER=mp3 MPEG4IP_LIB_DEPENDS= libmp4v2.so:multimedia/mp4v2 diff --git a/audio/dir2ogg/Makefile b/audio/dir2ogg/Makefile index 706d5fc2f0aa8..7f89dabe4ec89 100644 --- a/audio/dir2ogg/Makefile +++ b/audio/dir2ogg/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= faad:audio/faad \ - mutagen-inspect:audio/py-mutagen \ + ${PYTHON_PKGNAMEPREFIX}mutagen>=0:audio/py-mutagen@${PY_FLAVOR} \ mplayer:multimedia/mplayer \ oggenc:audio/vorbis-tools diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile index 7f636807eef73..743aed5b05551 100644 --- a/audio/easytag/Makefile +++ b/audio/easytag/Makefile @@ -3,6 +3,7 @@ PORTNAME= easytag PORTVERSION= 2.4.3 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= GNOME @@ -19,10 +20,11 @@ LIB_DEPENDS= libid3.so:audio/id3lib \ libid3tag.so:audio/libid3tag \ libvorbis.so:audio/libvorbis \ libFLAC.so:audio/flac \ - libtag.so:audio/taglib + libtag.so:audio/taglib \ + libogg.so:audio/libogg USES= desktop-file-utils gettext-tools gmake pkgconfig tar:xz -USE_GNOME= gtk30 intlhack libxslt +USE_GNOME= cairo dconf:run gtk30 intlhack libxslt GLIB_SCHEMAS= org.gnome.EasyTAG.gschema.xml org.gnome.EasyTAG.enums.xml INSTALLS_ICONS= yes GNU_CONFIGURE= yes @@ -36,12 +38,14 @@ CONFIGURE_ARGS= --disable-appdata-validate \ PORTDOCS= HACKING THANKS TODO OPTIONS_DEFINE= WAVPACK NLS OPUS SPEEX DOCS +OPTIONS_DEFAULT= WAVPACK OPUS SPEEX OPTIONS_SUB= yes WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack WAVPACK_CONFIGURE_ENABLE= wavpack NLS_CONFIGURE_ENABLE= nls -OPUS_LIB_DEPENDS= libopusfile.so:audio/opusfile +OPUS_LIB_DEPENDS= libopusfile.so:audio/opusfile \ + libopus.so:audio/opus OPUS_CONFIGURE_ENABLE= opus SPEEX_LIB_DEPENDS= libspeex.so:audio/speex SPEEX_CONFIGURE_ENABLE= speex diff --git a/audio/jack_mixer/Makefile b/audio/jack_mixer/Makefile index e3a2a191fdcae..7cfb0c671895c 100644 --- a/audio/jack_mixer/Makefile +++ b/audio/jack_mixer/Makefile @@ -14,13 +14,12 @@ LICENSE= GPLv2 # only LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libjack.so:audio/jack -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/fpconst.py:math/py-fpconst \ - ${LOCALBASE}/include/pygtk-2.0/pygtk/pygtk.h:x11-toolkits/py-gtk2 -RUN_DEPENDS:= ${BUILD_DEPENDS} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fpconst>=0:math/py-fpconst@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fpconst>=0:math/py-fpconst@${PY_FLAVOR} -USES= libtool pkgconfig python shebangfix +USES= libtool pkgconfig python:2.7 shebangfix SHEBANG_FILES= jack_mixer.py -USE_GNOME= gconf2 +USE_GNOME= gconf2 pygtk2 GCONF_SCHEMAS= jack_mixer.schemas INSTALLS_ICONS= yes diff --git a/audio/lastfm-desktop/Makefile b/audio/lastfm-desktop/Makefile index ab81b36d30b8f..8863c5e894785 100644 --- a/audio/lastfm-desktop/Makefile +++ b/audio/lastfm-desktop/Makefile @@ -9,7 +9,8 @@ CATEGORIES= audio MAINTAINER= vg@FreeBSD.org COMMENT= Official Last.fm desktop application suite -LICENSE= GPLv3 +LICENSE= GPLv3+ +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= liblastfm.so:audio/liblastfm \ libavcodec.so:multimedia/ffmpeg \ @@ -40,8 +41,14 @@ GSTREAMER_USE= QT4=dbus,phonon-gst_run GNOME=gdkpixbuf2,glib20 VLC_DESC= Multimedia via Phonon-VLC VLC_RUN_DEPENDS= phonon-vlc>=0.6.1:multimedia/phonon-vlc +.include + +.if ${OSVERSION} >= 1100000 +BROKEN= does not buld: Application.cpp:433:25: error: ordered comparison between pointer and zero ('void *' and 'int') +.endif + do-install: - ${MKDIR} ${STAGEDIR}${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_SCRIPT} ${WRKDIR}/lastfm-desktop.sh ${STAGEDIR}${PREFIX}/bin/lastfm-desktop ${INSTALL_PROGRAM} ${WRKSRC}/_bin/fingerprinter ${STAGEDIR}${DATADIR} ${INSTALL_PROGRAM} ${WRKSRC}/_bin/lastfm-scrobbler ${STAGEDIR}${DATADIR} @@ -49,4 +56,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/app/client/audioscrobbler.ico ${STAGEDIR}${PREFIX}/share/pixmaps/ (cd ${WRKSRC}/app/client && ${COPYTREE_SHARE} qrc ${STAGEDIR}${DATADIR}) -.include +.include diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile index 7eb443a5fe337..a02ae9b807a59 100644 --- a/audio/mixxx/Makefile +++ b/audio/mixxx/Makefile @@ -4,7 +4,7 @@ PORTNAME= mixxx PORTVERSION= 2.0.0 DISTVERSIONSUFFIX= -src -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= audio MASTER_SITES= http://downloads.mixxx.org/${PORTNAME}-${PORTVERSION}/ diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile index 0bb6600861c66..80d20517f1002 100644 --- a/audio/mumble/Makefile +++ b/audio/mumble/Makefile @@ -3,7 +3,7 @@ PORTNAME= mumble PORTVERSION= 1.2.19 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MAINTAINER= feld@FreeBSD.org diff --git a/audio/murmur/Makefile b/audio/murmur/Makefile index aabc6c6bcc408..e00d08e76c81b 100644 --- a/audio/murmur/Makefile +++ b/audio/murmur/Makefile @@ -3,7 +3,7 @@ PORTNAME= murmur PORTVERSION= 1.2.19 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= audio net MAINTAINER= feld@FreeBSD.org diff --git a/audio/ruby-xmms2/Makefile b/audio/ruby-xmms2/Makefile index 5e3b10820f1b2..74576b4587f89 100644 --- a/audio/ruby-xmms2/Makefile +++ b/audio/ruby-xmms2/Makefile @@ -18,6 +18,10 @@ USE_GNOME= glib20 BROKEN_RUBY22= yes BROKEN_RUBY23= yes +BROKEN_RUBY24= yes + +DEPRECATED= Does not build with current versions of ruby +EXPIRATION_DATE= 2018-01-12 PLIST= ${.CURDIR}/pkg-plist diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile index a8580673d0437..eef199a8986a3 100644 --- a/audio/solfege/Makefile +++ b/audio/solfege/Makefile @@ -18,7 +18,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= docbook-xsl>0:textproc/docbook-xsl \ txt2man:textproc/txt2man -USES= gettext gmake makeinfo pathfix pkgconfig python shebangfix +USES= gettext gmake makeinfo pathfix pkgconfig python:2.7 shebangfix SHEBANG_FILES= exercises/standard/lesson-files/bin/csound-play-harmonic-interval.sh USE_GNOME= pygtk2 GNU_CONFIGURE= yes diff --git a/audio/trommler/Makefile b/audio/trommler/Makefile index 9986e370e5bee..678ba28031b5c 100644 --- a/audio/trommler/Makefile +++ b/audio/trommler/Makefile @@ -13,7 +13,7 @@ COMMENT= GTK+2 based drum machine LICENSE= GPLv2 -USES= gmake pkgconfig python:build shebangfix +USES= gmake pkgconfig python:2.7,build shebangfix SHEBANG_FILES= genexport.py USE_GNOME= gtk20 diff --git a/audio/umodplayer/Makefile b/audio/umodplayer/Makefile index fff4a4afceca7..6c213a4f0db22 100644 --- a/audio/umodplayer/Makefile +++ b/audio/umodplayer/Makefile @@ -11,19 +11,19 @@ DISTNAME= ${PORTNAME}_${PORTVERSION:S/^0.//:tu} MAINTAINER= ports@FreeBSD.org COMMENT= Console module player +LICENSE= PD + LIB_DEPENDS= libmodplug.so:audio/libmodplug \ libao.so:audio/libao BUILD_DEPENDS= ${LOCALBASE}/lib/libaiff.a:audio/libaiff +USES= localbase:ldflags HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} PLIST_FILES= bin/${PORTNAME} \ man/man1/${PORTNAME}.1.gz -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - post-patch: @${REINPLACE_CMD} -e \ '/CFLAGS/s| =| +=| ; \ @@ -31,7 +31,7 @@ post-patch: /^@/d' ${WRKSRC}/${MAKEFILE}.in do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ - @${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/ + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/ .include diff --git a/audio/volumeicon/Makefile b/audio/volumeicon/Makefile index d504f4f827db1..465a354ca0cb4 100644 --- a/audio/volumeicon/Makefile +++ b/audio/volumeicon/Makefile @@ -1,9 +1,8 @@ # $FreeBSD$ PORTNAME= volumeicon -PORTVERSION= 0.5.0 +PORTVERSION= 0.5.1 CATEGORIES= audio -MASTER_SITES= http://softwarebakery.com/maato/files/volumeicon/ MAINTAINER= lme@FreeBSD.org COMMENT= Lightweight volume control for the systray @@ -16,14 +15,22 @@ CONFIGURE_ARGS= --enable-oss \ CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -USES= gmake gettext pkgconfig -USE_GNOME= gtk30 intltool +USES= autoreconf gmake gettext pkgconfig +USE_GNOME= gtk30 intltool cairo gdkpixbuf2 +USE_XORG= x11 +USE_GITHUB= yes +GH_ACCOUNT= Maato OPTIONS_DEFINE= NLS NOTIFY OPTIONS_DEFAULT= NOTIFY OPTIONS_SUB= yes +NLS_USES= gettext + NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify NOTIFY_CONFIGURE_ENABLE=notify +pre-configure: + cd ${WRKSRC} && ./autogen.sh + .include diff --git a/audio/volumeicon/distinfo b/audio/volumeicon/distinfo index 99b20f834e6eb..f341c33885eb4 100644 --- a/audio/volumeicon/distinfo +++ b/audio/volumeicon/distinfo @@ -1,2 +1,3 @@ -SHA256 (volumeicon-0.5.0.tar.gz) = e5f1179f9ec5ab25e3740e4f6bbe0baa75368f0ae87d370197b3fbefb61bd782 -SIZE (volumeicon-0.5.0.tar.gz) = 160089 +TIMESTAMP = 1513090597 +SHA256 (Maato-volumeicon-0.5.1_GH0.tar.gz) = 607979f316e6837eb7c65837c71b213a7dc6a2091153504f7b177a1d67f3da71 +SIZE (Maato-volumeicon-0.5.1_GH0.tar.gz) = 60651 diff --git a/audio/volumeicon/files/patch-data_gui_preferences.ui b/audio/volumeicon/files/patch-data_gui_preferences.ui new file mode 100644 index 0000000000000..81f95baa330d5 --- /dev/null +++ b/audio/volumeicon/files/patch-data_gui_preferences.ui @@ -0,0 +1,11 @@ +--- data/gui/preferences.ui.orig 2017-12-12 18:43:30 UTC ++++ data/gui/preferences.ui +@@ -197,7 +197,7 @@ + + True + False +- <b>Alsa</b> ++ <b>OSS</b> + True + + diff --git a/audio/volumeicon/files/patch-src_oss__backend.c b/audio/volumeicon/files/patch-src_oss__backend.c index 86cf02c355ed8..68fe9c091b84f 100644 --- a/audio/volumeicon/files/patch-src_oss__backend.c +++ b/audio/volumeicon/files/patch-src_oss__backend.c @@ -1,4 +1,4 @@ ---- src/oss_backend.c.orig 2013-02-25 15:52:49 UTC +--- src/oss_backend.c.orig 2015-03-02 22:54:36 UTC +++ src/oss_backend.c @@ -22,7 +22,7 @@ //############################################################################## @@ -154,13 +154,13 @@ { @@ -251,6 +277,7 @@ void oss_set_volume(int volume) assert(m_mixer_fd != -1); - assert(volume >= 0 && volume <= 100); + volume = (volume < 0 ? 0 : (volume > 100 ? 100 : volume)); +#if 0 oss_mixer_value vr; vr.dev = m_ext.dev; vr.ctrl = m_ext.ctrl; -@@ -286,9 +313,14 @@ void oss_set_volume(int volume) +@@ -286,9 +313,24 @@ void oss_set_volume(int volume) default: return; } @@ -177,4 +177,14 @@ if(volume == 100) m_actual_maxvalue = get_raw_value(); +#endif ++} ++ ++const gchar * oss_get_device() ++{ ++ return NULL; ++} ++ ++const GList * oss_get_device_names() ++{ ++ return NULL; } diff --git a/audio/volumeicon/files/patch-src_oss__backend.h b/audio/volumeicon/files/patch-src_oss__backend.h new file mode 100644 index 0000000000000..fee1081e8579d --- /dev/null +++ b/audio/volumeicon/files/patch-src_oss__backend.h @@ -0,0 +1,10 @@ +--- src/oss_backend.h.orig 2015-03-02 22:54:36 UTC ++++ src/oss_backend.h +@@ -35,5 +35,7 @@ int oss_get_volume(); + gboolean oss_get_mute(); + const gchar * oss_get_channel(); + const GList * oss_get_channel_names(); ++const gchar * oss_get_device(); ++const GList * oss_get_device_names(); + + #endif diff --git a/audio/volumeicon/files/patch-src_volumeicon.c b/audio/volumeicon/files/patch-src_volumeicon.c new file mode 100644 index 0000000000000..6bac43da14fec --- /dev/null +++ b/audio/volumeicon/files/patch-src_volumeicon.c @@ -0,0 +1,11 @@ +--- src/volumeicon.c.orig 2015-03-02 22:54:36 UTC ++++ src/volumeicon.c +@@ -1295,6 +1295,8 @@ int main(int argc, char * argv[]) + backend_get_mute = &oss_get_mute; + backend_get_channel = &oss_get_channel; + backend_get_channel_names = &oss_get_channel_names; ++ backend_get_device = &oss_get_device; ++ backend_get_device_names = &oss_get_device_names; + #else + backend_setup = &asound_setup; + backend_set_channel = &asound_set_channel; diff --git a/audio/volumeicon/pkg-descr b/audio/volumeicon/pkg-descr index 761a6f6c9f6c3..2c0755acfa185 100644 --- a/audio/volumeicon/pkg-descr +++ b/audio/volumeicon/pkg-descr @@ -10,4 +10,4 @@ Features - Volume Slider - Hotkey support -WWW: http://softwarebakery.com/maato/volumeicon.html +WWW: https://github.com/Maato/volumeicon/ diff --git a/audio/volumeicon/pkg-plist b/audio/volumeicon/pkg-plist index 87a2db1fa5394..f3aa480db9701 100644 --- a/audio/volumeicon/pkg-plist +++ b/audio/volumeicon/pkg-plist @@ -1,5 +1,7 @@ bin/volumeicon +%%NLS%%share/locale/de/LC_MESSAGES/volumeicon.mo %%NLS%%share/locale/fr/LC_MESSAGES/volumeicon.mo +%%NLS%%share/locale/pl/LC_MESSAGES/volumeicon.mo %%DATADIR%%/gui/appicon.svg %%DATADIR%%/gui/preferences.ui %%DATADIR%%/icons/Black Gnome/1.png diff --git a/audio/yoshimi/Makefile b/audio/yoshimi/Makefile index 0e1640c844254..b3fc73a0b8e26 100644 --- a/audio/yoshimi/Makefile +++ b/audio/yoshimi/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= yoshimi -DISTVERSION= 1.5.4.1-28 -DISTVERSIONSUFFIX= -g31291f0d +DISTVERSION= 1.5.5 CATEGORIES= audio MAINTAINER= hello@blubee.me diff --git a/audio/yoshimi/distinfo b/audio/yoshimi/distinfo index 362971e626d72..0a28abad746dc 100644 --- a/audio/yoshimi/distinfo +++ b/audio/yoshimi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1510142446 -SHA256 (yoshimi-yoshimi-1.5.4.1-28-g31291f0d_GH0.tar.gz) = 7b32c8072e0f942e3e1db56dc4e624ca7067401b7118120175b1969886d1637a -SIZE (yoshimi-yoshimi-1.5.4.1-28-g31291f0d_GH0.tar.gz) = 7699083 +TIMESTAMP = 1513079012 +SHA256 (yoshimi-yoshimi-1.5.5_GH0.tar.gz) = 03bd7018f55e568c0207793e08c3b9a17a346ea5f472184f9824103ad8494d56 +SIZE (yoshimi-yoshimi-1.5.5_GH0.tar.gz) = 7728066 diff --git a/audio/yoshimi/pkg-plist b/audio/yoshimi/pkg-plist index 2455ae3940563..01a86548a423f 100644 --- a/audio/yoshimi/pkg-plist +++ b/audio/yoshimi/pkg-plist @@ -27,6 +27,7 @@ share/applications/yoshimi.desktop %%PORTDOCS%%%%DOCSDIR%%/Histories/Yoshimi_1.5.1-features.txt %%PORTDOCS%%%%DOCSDIR%%/Histories/Yoshimi_1.5.2-features.txt %%PORTDOCS%%%%DOCSDIR%%/Histories/Yoshimi_1.5.3-features.txt +%%PORTDOCS%%%%DOCSDIR%%/Histories/Yoshimi_1.5.4_features.txt %%PORTDOCS%%%%DOCSDIR%%/Histories/Yoshimi_License_History.txt %%PORTDOCS%%%%DOCSDIR%%/Histories/Zyn_ChangeLog %%PORTDOCS%%%%DOCSDIR%%/Histories/Zyn_HISTORY.txt @@ -47,7 +48,7 @@ share/applications/yoshimi.desktop %%PORTDOCS%%%%DOCSDIR%%/Vector_Control.txt %%PORTDOCS%%%%DOCSDIR%%/Yoshi-Zyn_Sound_Differences.txt %%PORTDOCS%%%%DOCSDIR%%/Yoshi_Zyn_NRPNs.txt -%%PORTDOCS%%%%DOCSDIR%%/Yoshimi_1.5.4_features.txt +%%PORTDOCS%%%%DOCSDIR%%/Yoshimi_1.5.5_features.txt %%PORTDOCS%%%%DOCSDIR%%/Yoshimi_Only_NRPNs.txt %%PORTDOCS%%%%DOCSDIR%%/Yoshimi_Quote.txt %%PORTDOCS%%%%DOCSDIR%%/yoshimi-user-manual.pdf diff --git a/audio/zita-convolver/Makefile b/audio/zita-convolver/Makefile index 9c4d84de45237..16beee125d40e 100644 --- a/audio/zita-convolver/Makefile +++ b/audio/zita-convolver/Makefile @@ -16,6 +16,10 @@ LICENSE_FILE= ${WRKSRC}/../COPYING BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:math/fftw3 LIB_DEPENDS= libfftw3f.so:math/fftw3-float +BROKEN_aarch64= fails to compile: c++: the clang compiler does not support '-march=native' +BROKEN_armv6= fails to compile: c++: the clang compiler does not support '-march=native' +BROKEN_armv7= fails to compile: c++: the clang compiler does not support '-march=native' + USES= compiler:c++11-lib gmake localbase:ldflags tar:bz2 USE_LDCONFIG= yes WRKSRC_SUBDIR= libs diff --git a/benchmarks/nosqlbench/Makefile b/benchmarks/nosqlbench/Makefile index 7e472f6d0bf65..cb10b5fc6a4e4 100644 --- a/benchmarks/nosqlbench/Makefile +++ b/benchmarks/nosqlbench/Makefile @@ -3,6 +3,7 @@ PORTNAME= nosqlbench PORTVERSION= 0.0.${DATE} +PORTREVISION= 1 CATEGORIES= benchmarks databases MASTER_SITES= LOCAL/vg @@ -10,6 +11,7 @@ MAINTAINER= vg@FreeBSD.org COMMENT= Micro-benchmarking NoSQL storage LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libleveldb.so:databases/leveldb @@ -18,8 +20,10 @@ USES= cmake tar:bzip2 CONFLICTS= tarantool-c -BROKEN_aarch64= Does not build: clang does not support -march=native -BROKEN_powerpc64= Does not build: clang does not support -march=native +post-patch: + @${REINPLACE_CMD} -e 's|-O3 -march=native||' ${WRKSRC}/CMakeLists.txt \ + ${WRKSRC}/third_party/memcached/CMakeLists.txt \ + ${WRKSRC}/third_party/tarantool-c/CMakeLists.txt post-install: ${INSTALL_DATA} ${WRKSRC}/sources/nosqlbench.conf \ diff --git a/benchmarks/pybench/Makefile b/benchmarks/pybench/Makefile index fe154672080ee..a405d1c4c7953 100644 --- a/benchmarks/pybench/Makefile +++ b/benchmarks/pybench/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE WRKSRC= ${WRKDIR}/${PORTNAME} -USES= python shebangfix zip +USES= python:2.7 shebangfix zip SHEBANG_FILES= platform.py NO_ARCH= yes diff --git a/benchmarks/sysbench/Makefile b/benchmarks/sysbench/Makefile index 8f2b7e318d9b0..a3bd649ec47d7 100644 --- a/benchmarks/sysbench/Makefile +++ b/benchmarks/sysbench/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sysbench -PORTVERSION= 1.0.10 +PORTVERSION= 1.0.11 CATEGORIES= benchmarks databases MAINTAINER= sunpoet@FreeBSD.org diff --git a/benchmarks/sysbench/distinfo b/benchmarks/sysbench/distinfo index 08001323865f2..26cb61015be42 100644 --- a/benchmarks/sysbench/distinfo +++ b/benchmarks/sysbench/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1509131764 -SHA256 (akopytov-sysbench-1.0.10_GH0.tar.gz) = 34cfe9989a4610c15359a2d88b59a09f5c18846f42ce49175953c3e600deebbe -SIZE (akopytov-sysbench-1.0.10_GH0.tar.gz) = 1496937 +TIMESTAMP = 1512927021 +SHA256 (akopytov-sysbench-1.0.11_GH0.tar.gz) = 2621d274d9103496e22c57863faec11f855f25db838fae0248be6e825a426dbe +SIZE (akopytov-sysbench-1.0.11_GH0.tar.gz) = 1498802 diff --git a/biology/Makefile b/biology/Makefile index e72db4dfe68ba..3f03d6c4c0de9 100644 --- a/biology/Makefile +++ b/biology/Makefile @@ -73,6 +73,7 @@ SUBDIR += p5-Bio-SCF SUBDIR += p5-BioPerl SUBDIR += p5-BioPerl-Run + SUBDIR += p5-TrimGalore SUBDIR += p5-transdecoder SUBDIR += paml SUBDIR += phrap diff --git a/biology/diamond/Makefile b/biology/diamond/Makefile index 79b2780d1e4aa..0865ea1cc4f39 100644 --- a/biology/diamond/Makefile +++ b/biology/diamond/Makefile @@ -2,7 +2,7 @@ PORTNAME= diamond DISTVERSIONPREFIX= v -DISTVERSION= 0.9.13 +DISTVERSION= 0.9.14 CATEGORIES= biology MAINTAINER= jrm@FreeBSD.org diff --git a/biology/diamond/distinfo b/biology/diamond/distinfo index 83f7278612710..6292b5bd7e284 100644 --- a/biology/diamond/distinfo +++ b/biology/diamond/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1510945726 -SHA256 (bbuchfink-diamond-v0.9.13_GH0.tar.gz) = 066d2744ef9e8f3d6f7eba5e6eb226434299b18574c8716bbdd8faca31b325de -SIZE (bbuchfink-diamond-v0.9.13_GH0.tar.gz) = 394907 +TIMESTAMP = 1513181932 +SHA256 (bbuchfink-diamond-v0.9.14_GH0.tar.gz) = de870a7806ac0aa47b97c9b784dd7201e2c8e11a122003bde440d926211b911e +SIZE (bbuchfink-diamond-v0.9.14_GH0.tar.gz) = 389604 diff --git a/biology/iqtree/Makefile b/biology/iqtree/Makefile index 35bf00c452008..9b6e6e9b04dab 100644 --- a/biology/iqtree/Makefile +++ b/biology/iqtree/Makefile @@ -15,6 +15,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/eigen3.pc:math/eigen3 RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/eigen3.pc:math/eigen3 +BROKEN_aarch64= fails to compile: unrecognized command line option '-msse3' +BROKEN_armv6= fails to compile: unrecognized command line options '-m32' and '-msse3' +BROKEN_armv7= fails to compile: unrecognized command line options '-m32' and '-msse3' + USES= cmake compiler:openmp USE_GITHUB= yes GH_ACCOUNT= Cibiv diff --git a/biology/p5-TrimGalore/Makefile b/biology/p5-TrimGalore/Makefile new file mode 100644 index 0000000000000..2121137a66a4b --- /dev/null +++ b/biology/p5-TrimGalore/Makefile @@ -0,0 +1,31 @@ +# $FreeBSD$ + +PORTNAME= TrimGalore +DISTVERSION= 0.4.5 +CATEGORIES= biology perl5 +PKGNAMEPREFIX= p5- + +MAINTAINER= jwb@FreeBSD.org +COMMENT= Wrapper around Cutadapt and FastQC for adapter and quality trimming + +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cutadapt>0:biology/py-cutadapt@${PY_FLAVOR} \ + fastqc>0:biology/fastqc + +NO_ARCH= yes +NO_BUILD= yes + +USES= perl5 python:env shebangfix +SHEBANG_FILES= trim_galore +USE_PERL5= run + +USE_GITHUB= yes +GH_ACCOUNT= FelixKrueger + +do-install: + ${INSTALL_SCRIPT} ${WRKSRC}/trim_galore ${STAGEDIR}${PREFIX}/bin + cd ${WRKSRC} && ${COPYTREE_SHARE} test_files ${STAGEDIR}${DATADIR} + +.include diff --git a/biology/p5-TrimGalore/distinfo b/biology/p5-TrimGalore/distinfo new file mode 100644 index 0000000000000..2b718e79b72d2 --- /dev/null +++ b/biology/p5-TrimGalore/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1512570215 +SHA256 (FelixKrueger-TrimGalore-0.4.5_GH0.tar.gz) = a6b97e554944ddc6ecd50e78df486521f17225d415aad84e9911163faafe1f3c +SIZE (FelixKrueger-TrimGalore-0.4.5_GH0.tar.gz) = 21983909 diff --git a/biology/p5-TrimGalore/pkg-descr b/biology/p5-TrimGalore/pkg-descr new file mode 100644 index 0000000000000..8494486848459 --- /dev/null +++ b/biology/p5-TrimGalore/pkg-descr @@ -0,0 +1,4 @@ +Wrapper around Cutadapt and FastQC to consistently apply adapter and quality +trimming to FastQ files, with extra functionality for RRBS data. + +WWW: https://github.com/FelixKrueger/TrimGalore diff --git a/biology/p5-TrimGalore/pkg-plist b/biology/p5-TrimGalore/pkg-plist new file mode 100644 index 0000000000000..a9fa63919c1fa --- /dev/null +++ b/biology/p5-TrimGalore/pkg-plist @@ -0,0 +1,8 @@ +bin/trim_galore +%%DATADIR%%/test_files/4_seqs_with_Ns.fastq.gz +%%DATADIR%%/test_files/colorspace_file.fastq +%%DATADIR%%/test_files/empty_file.fastq +%%DATADIR%%/test_files/illumina_100K.fastq.gz +%%DATADIR%%/test_files/nextera_100K.fastq.gz +%%DATADIR%%/test_files/smallRNA_100K.fastq.gz +%%DATADIR%%/test_files/truncated.fq.gz diff --git a/biology/phyml/Makefile b/biology/phyml/Makefile index 14aca86b45b73..652db021400ed 100644 --- a/biology/phyml/Makefile +++ b/biology/phyml/Makefile @@ -13,6 +13,10 @@ COMMENT= Simple, fast, and accurate algorithm to estimate large phylogenies LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +BROKEN_aarch64= fails to compile: c++: the clang compiler does not support '-march=native' +BROKEN_armv6= fails to compile: c++: the clang compiler does not support '-march=native' +BROKEN_armv7= fails to compile: c++: the clang compiler does not support '-march=native' + USE_GITHUB= yes GH_ACCOUNT= stephaneguindon diff --git a/biology/py-biom-format/Makefile b/biology/py-biom-format/Makefile index 0c7c567cdafe5..9b94f91c9b4dc 100644 --- a/biology/py-biom-format/Makefile +++ b/biology/py-biom-format/Makefile @@ -2,7 +2,7 @@ PORTNAME= biom-format PORTVERSION= 2.1.6 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= biology python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,9 +13,10 @@ LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${PYNUMPY} RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}h5py>=2.6.0:science/py-h5py@${FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}click>=6.6:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}click>=6.6:devel/py-click@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}h5py>=2.6.0:science/py-h5py@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.16.1:science/py-scipy@${FLAVOR} USE_GITHUB= yes @@ -30,6 +31,9 @@ USE_PYTHON= autoplist distutils RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pyqi>=0.2.0:devel/py-pyqi@${FLAVOR} .endif +post-extract: + ${RM} -r ${WRKSRC}/tests + post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/biom/*.so diff --git a/biology/pycogent/Makefile b/biology/pycogent/Makefile index a70e2e31f00c4..73dde351e4719 100644 --- a/biology/pycogent/Makefile +++ b/biology/pycogent/Makefile @@ -11,7 +11,7 @@ COMMENT= Toolkit for statistical analysis of biological sequences LICENSE= GPLv2 BUILD_DEPENDS= ${PYNUMPY} \ - ${LOCALBASE}/bin/sphinx-build:textproc/py-sphinx@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.13:databases/py-sqlalchemy10@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} diff --git a/biology/seqan-apps/Makefile b/biology/seqan-apps/Makefile index edb9458557c5c..55211a5b5da57 100644 --- a/biology/seqan-apps/Makefile +++ b/biology/seqan-apps/Makefile @@ -15,6 +15,11 @@ LICENSE_COMB= multi BUILD_DEPENDS= boost-libs>0:devel/boost-libs +BROKEN_aarch64= fails to compile: Error: unknown mnemonic rep -- rep +BROKEN_armv6= fails to compile: Error: bad instruction rep +BROKEN_armv7= fails to compile: Error: bad instruction rep +BROKEN_powerpc64= fails to compile: Error: unrecognized opcode: rep + USE_GITHUB= yes GH_ACCOUNT= seqan GH_PROJECT= seqan @@ -26,9 +31,6 @@ CMAKE_ARGS= -DSEQAN_BUILD_SYSTEM="SEQAN_RELEASE_APPS" USE_GCC= yes -BROKEN_aarch64= fails to compile: Error: unknown mnemonic rep -- rep -BROKEN_powerpc64= fails to compile: Error: unrecognized opcode: rep - .include .if ${ARCH} == "i386" diff --git a/biology/seqtools/Makefile b/biology/seqtools/Makefile index b2e82e2ae59b0..3e0be761bbaec 100644 --- a/biology/seqtools/Makefile +++ b/biology/seqtools/Makefile @@ -16,8 +16,6 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 -BROKEN_powerpc64= fails to compile: jsoncpp.cpp: 'snprintf' is not a member of 'std' - USES= compiler:c++14-lang gettext libtool pkgconfig GNU_CONFIGURE= yes USE_GNOME= cairo gdkpixbuf2 gtk20 diff --git a/cad/astk-serveur/Makefile b/cad/astk-serveur/Makefile index 5ce76a23af629..123d959554486 100644 --- a/cad/astk-serveur/Makefile +++ b/cad/astk-serveur/Makefile @@ -31,7 +31,7 @@ LICENSE= GPLv2 RUN_DEPENDS+= ${SHELL_INSTALL_ASTER}:shells/${SHIADEP} .if !defined(CLIENT_SEUL) -USES+= gettext python shebangfix tk:build +USES+= gettext python:2.7 shebangfix tk:build SHEBANG_FILES= unittest/run_test.py .else USES+= tk diff --git a/cad/freecad/Makefile b/cad/freecad/Makefile index a917dd1eec88e..9a14e90f3269b 100644 --- a/cad/freecad/Makefile +++ b/cad/freecad/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= pyside-rcc:devel/pyside-tools \ LIB_DEPENDS= libexpat.so:textproc/expat2 \ libfreetype.so:print/freetype2 \ libboost_python.so:devel/boost-python-libs \ - libpyside-python2.7.so:devel/pyside \ + libpyside-python2.7.so:devel/pyside@${PY_FLAVOR} \ libCoin.so:graphics/Coin \ libpng.so:graphics/png \ libtiff.so:graphics/tiff \ @@ -29,10 +29,10 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \ libmed.so:french/med \ libshiboken-${PYTHON_VERSION}.so:devel/shiboken \ libhdf5.so:science/hdf5 -RUN_DEPENDS= pivy>0:graphics/py-pivy +RUN_DEPENDS= pivy>0:graphics/py-pivy@${PY_FLAVOR} USES= dos2unix compiler:c++11-lib cmake:outsource fortran jpeg \ - python localbase + python:2.7 localbase USE_XORG= ice sm x11 xext xt USE_GL= gl glu USE_QT4= qmake_build corelib gui moc_build network opengl rcc_build \ @@ -58,7 +58,7 @@ GH_TAGNAME= f27617e OPTIONS_DEFINE= COLLADA COLLADA_DESC= Install pycollada for Collada files import -COLLADA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycollada>0:graphics/py-pycollada +COLLADA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycollada>0:graphics/py-pycollada@${PY_FLAVOR} DESKTOP_ENTRIES=${PORTNAME} "" "${PREFIX}/FreeCAD/data/freecad.svg" \ ${PORTNAME} "Engineering;" false diff --git a/cad/libopencad/Makefile b/cad/libopencad/Makefile index a5254780232e2..60b067bd174fc 100644 --- a/cad/libopencad/Makefile +++ b/cad/libopencad/Makefile @@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_armv6= fails to compile: cadheader.cpp: ambiguous conversion for functional-style cast from 'time_t' to 'CADVariant' BROKEN_armv7= fails to compile: cadheader.cpp: ambiguous conversion for functional-style cast from 'time_t' to 'CADVariant' -BROKEN_powerpc64= fails to compile: r2000.cpp: 'to_string' was not declared in this scope USE_GITHUB= yes GH_ACCOUNT= sandyre diff --git a/cad/openvsp/Makefile b/cad/openvsp/Makefile index bce8b5e041272..a4d9931f49260 100644 --- a/cad/openvsp/Makefile +++ b/cad/openvsp/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= openvsp -PORTVERSION= 3.13.3 -PORTREVISION= 1 +PORTVERSION= 3.14.1 DISTVERSIONPREFIX= ${GH_PROJECT}_ CATEGORIES= cad diff --git a/cad/openvsp/distinfo b/cad/openvsp/distinfo index 3cb8fb0ea61ec..a9077cc2dce86 100644 --- a/cad/openvsp/distinfo +++ b/cad/openvsp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1505644117 -SHA256 (OpenVSP-OpenVSP-OpenVSP_3.13.3_GH0.tar.gz) = 28966c5936098d4073510d3601db3663320cf76fa490ede10cf533f5d29b5596 -SIZE (OpenVSP-OpenVSP-OpenVSP_3.13.3_GH0.tar.gz) = 34161751 +TIMESTAMP = 1512752802 +SHA256 (OpenVSP-OpenVSP-OpenVSP_3.14.1_GH0.tar.gz) = d97a6487adf7c9501686688cbb03cb20e7a368c2b2bc284fd10a3ed682f3ecca +SIZE (OpenVSP-OpenVSP-OpenVSP_3.14.1_GH0.tar.gz) = 34369839 diff --git a/cad/openvsp/pkg-plist b/cad/openvsp/pkg-plist index 219d152d750b7..b96043cf4de64 100644 --- a/cad/openvsp/pkg-plist +++ b/cad/openvsp/pkg-plist @@ -13,6 +13,8 @@ README.md airfoil/23015.af airfoil/N0012_VSP.af airfoil/N0012_VSP_sym.af +airfoil/VKT_e0.1_k0.1_t10.dat +airfoil/XFoil_VKT_CpDist.txt airfoil/b737a.af airfoil/b737b.af airfoil/b737c.af @@ -31,11 +33,15 @@ matlab/plotDegenPlate.m matlab/plotDegenStick.m matlab/plotDegenSurf.m scripts/CFDMesh.vspscript +scripts/CpSlicer.vspscript scripts/CreateEditGeom.vspscript scripts/DegenGeom.vspscript scripts/DumpResults.vspscript +scripts/FEAMesh.vspscript scripts/Fuselage.vspscript +scripts/Master_VSP_VV_Script.vspscript scripts/ParasiteDragScriptTest.vspscript +scripts/SeligAirfoilExport.vspscript scripts/SnapToDemo.vspscript scripts/Stack.vspscript scripts/SubSurface.vspscript @@ -46,21 +52,26 @@ scripts/TestAreaProj.vspscript scripts/TestDXF.vspscript scripts/TestFacet.vspscript scripts/TestMassProperties.vspscript +scripts/TestMeasure.vspscript scripts/TestSVG.vspscript scripts/TestSaveLoad.vspscript +scripts/TestSurfQuery.vspscript scripts/Wing.vspscript %%DATADIR%%/23015.af %%DATADIR%%/Box.vsppart %%DATADIR%%/BoxGroup.vsppart %%DATADIR%%/CFDMesh.vspscript %%DATADIR%%/Cone.vsppart +%%DATADIR%%/CpSlicer.vspscript %%DATADIR%%/CreateEditGeom.vspscript %%DATADIR%%/DegenGeom.vspscript %%DATADIR%%/Disk.vsppart %%DATADIR%%/Duct.vsppart %%DATADIR%%/DumpResults.vspscript +%%DATADIR%%/FEAMesh.vspscript %%DATADIR%%/Fuselage.vspscript %%DATADIR%%/LICENSE +%%DATADIR%%/Master_VSP_VV_Script.vspscript %%DATADIR%%/N0012_VSP.af %%DATADIR%%/N0012_VSP_sym.af %%DATADIR%%/OnOffExample.vsppart @@ -69,6 +80,7 @@ scripts/Wing.vspscript %%DATADIR%%/PodMan.vsppart %%DATADIR%%/Seat.vsppart %%DATADIR%%/SeatGroup.vsppart +%%DATADIR%%/SeligAirfoilExport.vspscript %%DATADIR%%/SharkTeeth.tga %%DATADIR%%/SnapToDemo.vspscript %%DATADIR%%/Stack.vspscript @@ -80,10 +92,19 @@ scripts/Wing.vspscript %%DATADIR%%/TestDXF.vspscript %%DATADIR%%/TestFacet.vspscript %%DATADIR%%/TestMassProperties.vspscript +%%DATADIR%%/TestMeasure.vspscript %%DATADIR%%/TestSVG.vspscript %%DATADIR%%/TestSaveLoad.vspscript +%%DATADIR%%/TestSurfQuery.vspscript %%DATADIR%%/TransportFuse.vsppart +%%DATADIR%%/VKT_e0.1_k0.1_t10.dat +%%DATADIR%%/VSPBoxXSec.PNG +%%DATADIR%%/VSPCircXSec.PNG +%%DATADIR%%/VSPIXSec.PNG +%%DATADIR%%/VSPPipeXSec.PNG +%%DATADIR%%/VSPRectXSec.PNG %%DATADIR%%/Wing.vspscript +%%DATADIR%%/XFoil_VKT_CpDist.txt %%DATADIR%%/b737a.af %%DATADIR%%/b737b.af %%DATADIR%%/b737c.af @@ -99,6 +120,11 @@ scripts/Wing.vspscript %%DATADIR%%/sc2_0404.af %%DATADIR%%/window.tga textures/SharkTeeth.tga +textures/VSPBoxXSec.PNG +textures/VSPCircXSec.PNG +textures/VSPIXSec.PNG +textures/VSPPipeXSec.PNG +textures/VSPRectXSec.PNG textures/nasa-logo.tga textures/redbluearrow.tga textures/window.tga diff --git a/chinese/ibus-libpinyin/Makefile b/chinese/ibus-libpinyin/Makefile index d1bae508ca837..2137785d45248 100644 --- a/chinese/ibus-libpinyin/Makefile +++ b/chinese/ibus-libpinyin/Makefile @@ -18,6 +18,7 @@ LIB_DEPENDS= libsqlite3.so:databases/sqlite3 \ USES= compiler:c++11-lib gmake python pkgconfig gettext USE_GNOME= glib20 +USE_PYTHON= py3kplist WRKSRC= ${WRKDIR}/${DISTNAME} diff --git a/chinese/ibus-pinyin/Makefile b/chinese/ibus-pinyin/Makefile index c43b2c7450ab7..75252fe4d9f3c 100644 --- a/chinese/ibus-pinyin/Makefile +++ b/chinese/ibus-pinyin/Makefile @@ -11,7 +11,7 @@ COMMENT= PinYin engine for IBus LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR} \ ${LOCALBASE}/share/gir-1.0/IBus-1.0.gir:textproc/ibus LIB_DEPENDS= libpyzy-1.0.so:chinese/pyzy \ libibus-1.0.so:textproc/ibus \ @@ -19,6 +19,7 @@ LIB_DEPENDS= libpyzy-1.0.so:chinese/pyzy \ USES= compiler:c++11-lib gmake pkgconfig python autoreconf libtool USE_GNOME= glib20 +USE_PYTHON= py3kplist GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-dependency-tracking --disable-lua-extension diff --git a/chinese/pyzy/Makefile b/chinese/pyzy/Makefile index fda0e8ca63d2b..f2c943055862c 100644 --- a/chinese/pyzy/Makefile +++ b/chinese/pyzy/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= libsqlite3.so:databases/sqlite3 USE_GITHUB= yes GH_TAGNAME= 6d9c3cd -USES= compiler:c++11-lib gmake libtool pkgconfig python:build shebangfix autoreconf gettext-runtime pathfix +USES= compiler:c++11-lib gmake libtool pkgconfig python:2.7,build shebangfix autoreconf gettext-runtime pathfix SHEBANG_FILES= data/db/android/create_db.py USE_GNOME= glib20 USE_LDCONFIG= yes diff --git a/chinese/sunpinyin/Makefile b/chinese/sunpinyin/Makefile index 6d77f3a39ffaa..b5621f6c4e3b4 100644 --- a/chinese/sunpinyin/Makefile +++ b/chinese/sunpinyin/Makefile @@ -21,7 +21,7 @@ GH_TAGNAME= a8bd811 MAKE_ARGS+= --prefix=${PREFIX} USE_LDCONFIG= yes -USES= gmake iconv perl5 pkgconfig python scons shebangfix +USES= gmake iconv perl5 pkgconfig python:2.7 scons shebangfix USE_PERL5= build SHEBANG_FILES= python/*.py LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} diff --git a/comms/gr-osmosdr/Makefile b/comms/gr-osmosdr/Makefile index a5f756221d6d4..edec723e77fe9 100644 --- a/comms/gr-osmosdr/Makefile +++ b/comms/gr-osmosdr/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= libgnuradio-runtime.so:comms/gnuradio \ libboost_system.so:devel/boost-libs \ libboost_thread.so:devel/boost-libs -USES= cmake fortran pkgconfig python tar:tgz +USES= cmake fortran pkgconfig python:2.7 tar:tgz USE_LDCONFIG= yes # See lib/CMakeLists.txt to enable more components diff --git a/comms/pear-Horde_ActiveSync/Makefile b/comms/pear-Horde_ActiveSync/Makefile index 4c9b9c83a6b28..b76fee213928c 100644 --- a/comms/pear-Horde_ActiveSync/Makefile +++ b/comms/pear-Horde_ActiveSync/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= Horde_ActiveSync -PORTVERSION= 2.38.8 +DISTVERSION= 2.39.0 CATEGORIES= comms www pear MAINTAINER= horde@FreeBSD.org diff --git a/comms/pear-Horde_ActiveSync/distinfo b/comms/pear-Horde_ActiveSync/distinfo index 7d1d886a87684..bdc976a3cba71 100644 --- a/comms/pear-Horde_ActiveSync/distinfo +++ b/comms/pear-Horde_ActiveSync/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1504391758 -SHA256 (Horde/Horde_ActiveSync-2.38.8.tgz) = 5059851a35e2c17d54e73aa1562dda36c633e5c17be173705f4da0ecc12019cb -SIZE (Horde/Horde_ActiveSync-2.38.8.tgz) = 386632 +TIMESTAMP = 1512587603 +SHA256 (Horde/Horde_ActiveSync-2.39.0.tgz) = 7b33cd03a9cc0b0afea35acc297416a8a3df377c2f42b0c0573f2cb4ac0b8a53 +SIZE (Horde/Horde_ActiveSync-2.39.0.tgz) = 397080 diff --git a/comms/py-libimobiledevice/Makefile b/comms/py-libimobiledevice/Makefile index ba1d40cd263ac..6e0aa46f0bd14 100644 --- a/comms/py-libimobiledevice/Makefile +++ b/comms/py-libimobiledevice/Makefile @@ -15,6 +15,7 @@ PORTSCOUT= ignore:1 USES= python:2.7 USE_PYTHON= flavors cython +BINARY_ALIAS= cython=cython-${PYTHON_VER} CONFIGURE_ENV= PYTHON_LDFLAGS="`pkg-config --libs python-${PYTHON_VER}`" SLAVE_PORT= yes MASTERDIR= ${.CURDIR:H:H}/comms/libimobiledevice diff --git a/comms/tio/Makefile b/comms/tio/Makefile index 0e789f931a327..bbbcbe43759b6 100644 --- a/comms/tio/Makefile +++ b/comms/tio/Makefile @@ -2,7 +2,7 @@ PORTNAME= tio DISTVERSIONPREFIX= v -DISTVERSION= 1.27 +DISTVERSION= 1.28 CATEGORIES= comms MAINTAINER= dg@syrec.org diff --git a/comms/tio/distinfo b/comms/tio/distinfo index 89ac0b4b1b270..1f0cf7e58df63 100644 --- a/comms/tio/distinfo +++ b/comms/tio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1510671946 -SHA256 (tio-tio-v1.27_GH0.tar.gz) = 48400820de974d5e7425c4bc69e2a19f6a0f91807e38b41fbdc834a9fb3b72cf -SIZE (tio-tio-v1.27_GH0.tar.gz) = 28707 +TIMESTAMP = 1513257375 +SHA256 (tio-tio-v1.28_GH0.tar.gz) = b48774e8af7cee8c3032e9ec40668afbb7afbf705cbed4a148a4358eed767ad0 +SIZE (tio-tio-v1.28_GH0.tar.gz) = 29379 diff --git a/comms/wsjt/Makefile b/comms/wsjt/Makefile index 7e97b8a6c6b03..6f8fc9ed76418 100644 --- a/comms/wsjt/Makefile +++ b/comms/wsjt/Makefile @@ -14,8 +14,7 @@ LICENSE= GPLv3 RUN_DEPENDS= ${LOCALBASE}/bin/kvasd:comms/kvasd \ ${WSJT_DEPENDS} -BUILD_DEPENDS= python:lang/python \ - ${WSJT_DEPENDS} +BUILD_DEPENDS= ${WSJT_DEPENDS} LIB_DEPENDS= libfftw3.so:math/fftw3 \ libfftw3f.so:math/fftw3-float \ libsamplerate.so:audio/libsamplerate \ diff --git a/converters/cl-babel-sbcl/Makefile b/converters/cl-babel-sbcl/Makefile index bf7cc6d82ebf8..6dd400d442c60 100644 --- a/converters/cl-babel-sbcl/Makefile +++ b/converters/cl-babel-sbcl/Makefile @@ -2,7 +2,7 @@ PORTNAME= babel PORTVERSION= 2010.01.16 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= converters lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/converters/p5-JSON-PP/Makefile b/converters/p5-JSON-PP/Makefile index d892c98e02d10..2f4ca7d00671b 100644 --- a/converters/p5-JSON-PP/Makefile +++ b/converters/p5-JSON-PP/Makefile @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= JSON-PP -PORTVERSION= 2.94000 +PORTVERSION= 2.97000 CATEGORIES= converters perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:MAKAMAKA PKGNAMEPREFIX= p5- -DISTNAME= ${PORTNAME}-${PORTVERSION:S|000$||} MAINTAINER= sunpoet@FreeBSD.org COMMENT= JSON::XS compatible pure-Perl module diff --git a/converters/p5-JSON-PP/distinfo b/converters/p5-JSON-PP/distinfo index 4a0438b1cc98a..131c2070904aa 100644 --- a/converters/p5-JSON-PP/distinfo +++ b/converters/p5-JSON-PP/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1498577998 -SHA256 (JSON-PP-2.94.tar.gz) = 0bb2449743a06100674426da81a3d8eeff36da812d020861c6202227300b1831 -SIZE (JSON-PP-2.94.tar.gz) = 46646 +TIMESTAMP = 1512856842 +SHA256 (JSON-PP-2.97000.tar.gz) = 1183231135ab6c5e2c2fcd24492c78b17adcf9a0012c3e3123004babc04eb46b +SIZE (JSON-PP-2.97000.tar.gz) = 46856 diff --git a/converters/pecl-fribidi/Makefile b/converters/pecl-fribidi/Makefile index 43f41f3b573aa..136917f592c29 100644 --- a/converters/pecl-fribidi/Makefile +++ b/converters/pecl-fribidi/Makefile @@ -12,7 +12,7 @@ COMMENT= PECL extension for the Unicode Bidi algorithm LIB_DEPENDS= libfribidi.so:converters/fribidi USES= php:pecl pkgconfig -IGNORE_WITH_PHP= 70 71 +IGNORE_WITH_PHP= 70 71 72 CONFIGURE_ARGS= --with-fribidi=${LOCALBASE} diff --git a/converters/rubygem-json-ld-preloaded/Makefile b/converters/rubygem-json-ld-preloaded/Makefile index 033301bacea09..43507e6b0287f 100644 --- a/converters/rubygem-json-ld-preloaded/Makefile +++ b/converters/rubygem-json-ld-preloaded/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= json-ld-preloaded -PORTVERSION= 2.2.2 +PORTVERSION= 2.2.3 CATEGORIES= converters rubygems MASTER_SITES= RG @@ -10,7 +10,7 @@ COMMENT= JSON-LD with preloaded contexts LICENSE= UNLICENSE -RUN_DEPENDS= rubygem-json-ld>=2.1.5:converters/rubygem-json-ld \ +RUN_DEPENDS= rubygem-json-ld>=2.2:converters/rubygem-json-ld \ rubygem-multi_json>=1.12:devel/rubygem-multi_json \ rubygem-rdf>=2.2:www/rubygem-rdf diff --git a/converters/rubygem-json-ld-preloaded/distinfo b/converters/rubygem-json-ld-preloaded/distinfo index dd56ac5a8b80f..c6a4c36af7410 100644 --- a/converters/rubygem-json-ld-preloaded/distinfo +++ b/converters/rubygem-json-ld-preloaded/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1504482864 -SHA256 (rubygem/json-ld-preloaded-2.2.2.gem) = e70de25c81b49742a182b1c8b547d0fc4670bb411ac0651b66dcc9f6a9cf7887 -SIZE (rubygem/json-ld-preloaded-2.2.2.gem) = 99328 +TIMESTAMP = 1513266097 +SHA256 (rubygem/json-ld-preloaded-2.2.3.gem) = cfae3f8fca31e089348510a30ba456676149e005b114ed543b7081f556627223 +SIZE (rubygem/json-ld-preloaded-2.2.3.gem) = 100352 diff --git a/converters/rubygem-json-ld/Makefile b/converters/rubygem-json-ld/Makefile index b0e8a922e0f21..bcb13bccf94fe 100644 --- a/converters/rubygem-json-ld/Makefile +++ b/converters/rubygem-json-ld/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= json-ld -DISTVERSION= 2.1.7 +DISTVERSION= 2.2.0 CATEGORIES= converters rubygems MASTER_SITES= RG diff --git a/converters/rubygem-json-ld/distinfo b/converters/rubygem-json-ld/distinfo index 376b8b4a870a8..b5ad451c827ad 100644 --- a/converters/rubygem-json-ld/distinfo +++ b/converters/rubygem-json-ld/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1507282148 -SHA256 (rubygem/json-ld-2.1.7.gem) = 6a0ab08ad4d5619b0d5dce96f7dd1af85dc21a3795440ee5a3991c2e9b9f77f4 -SIZE (rubygem/json-ld-2.1.7.gem) = 109568 +TIMESTAMP = 1513266087 +SHA256 (rubygem/json-ld-2.2.0.gem) = 6ec57462934a09e0492d14511554197e7a0f194e4074999984623a5880abda42 +SIZE (rubygem/json-ld-2.2.0.gem) = 113152 diff --git a/converters/rubygem-json-ld/pkg-descr b/converters/rubygem-json-ld/pkg-descr index 902f4b112da2a..68484db4d81c5 100644 --- a/converters/rubygem-json-ld/pkg-descr +++ b/converters/rubygem-json-ld/pkg-descr @@ -3,4 +3,4 @@ compaction and framing API interfaces. It can now be used to create a context from an RDFS/OWL definition, and optionally include a JSON-LD representation of the ontology itself. -WWW: http://github.com/ruby-rdf/json-ld +WWW: https://github.com/ruby-rdf/json-ld diff --git a/databases/Makefile b/databases/Makefile index be330f6c29fb7..61b79ca1cbc65 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -846,6 +846,7 @@ SUBDIR += py-sqlobject SUBDIR += py-sqlparse SUBDIR += py-sqlparse01 + SUBDIR += py-sqlparse020 SUBDIR += py-sqlrelay SUBDIR += py-swift SUBDIR += py-sybase diff --git a/databases/arangodb32/Makefile b/databases/arangodb32/Makefile index 94bc4b71fe52f..b9d7cf613f29a 100644 --- a/databases/arangodb32/Makefile +++ b/databases/arangodb32/Makefile @@ -3,7 +3,7 @@ PORTNAME= arangodb DISTVERSIONPREFIX= v -DISTVERSION= 3.2.8 +DISTVERSION= 3.2.9 CATEGORIES= databases net PKGNAMESUFFIX= 32 @@ -14,6 +14,7 @@ LICENSE= APACHE20 ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= "Only builds on amd64" +BROKEN_FreeBSD_10= libc++ is too old USES= gmake ssl cmake:outsource,noninja python:2.7 compiler USE_GITHUB= yes @@ -25,15 +26,6 @@ USERS= arangodb GROUPS= arangodb USE_RC_SUBR= arangod -.include - -.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 40 -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang40:devel/llvm40 -CPP= ${LOCALBASE}/bin/clang-cpp40 -CC= ${LOCALBASE}/bin/clang40 -CXX= ${LOCALBASE}/bin/clang++40 -.endif - post-install: .for section in 1 8 ${MV} ${STAGEDIR}${PREFIX}/share/man/man${section}/* ${STAGEDIR}${PREFIX}/man/man${section}/ @@ -50,4 +42,4 @@ post-install: ${RMDIR} ${STAGEDIR}${PREFIX}/var/log ${RMDIR} ${STAGEDIR}${PREFIX}/var -.include +.include diff --git a/databases/arangodb32/distinfo b/databases/arangodb32/distinfo index 60b2418103675..8c41467fb4535 100644 --- a/databases/arangodb32/distinfo +++ b/databases/arangodb32/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1511171687 -SHA256 (arangodb-arangodb-v3.2.8_GH0.tar.gz) = 100e903711f07219e988fb7ae7f59b5eecd39f15b04eb6b8a91eb529a75a6d2b -SIZE (arangodb-arangodb-v3.2.8_GH0.tar.gz) = 144173495 +TIMESTAMP = 1512759306 +SHA256 (arangodb-arangodb-v3.2.9_GH0.tar.gz) = d327b6ca1b192ad83c75b526a89f8a7528a9502d277ae2798f72b55363e22b7b +SIZE (arangodb-arangodb-v3.2.9_GH0.tar.gz) = 144185432 diff --git a/databases/cego/Makefile b/databases/cego/Makefile index f8004ea315fe5..69d915b66becc 100644 --- a/databases/cego/Makefile +++ b/databases/cego/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= cego -PORTVERSION= 2.38.7 +PORTVERSION= 2.38.12 CATEGORIES= databases MASTER_SITES= http://www.lemke-it.com/ diff --git a/databases/cego/distinfo b/databases/cego/distinfo index c89f2eeef0035..b32dac686926a 100644 --- a/databases/cego/distinfo +++ b/databases/cego/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1512210652 -SHA256 (cego-2.38.7.tar.gz) = 9c096e002dafc582c6c0356f942a77eceb88a76b7a39f699e758a15e8c9da5e7 -SIZE (cego-2.38.7.tar.gz) = 1443534 +TIMESTAMP = 1513268626 +SHA256 (cego-2.38.12.tar.gz) = 7b88956a59ef04b291501ec5e797dcf7f9d7b3706e670f17ccc8f0aeb430b291 +SIZE (cego-2.38.12.tar.gz) = 1453966 diff --git a/databases/galera/Makefile b/databases/galera/Makefile index 4c7ffd1c69a84..c8ce7ee5a9d12 100644 --- a/databases/galera/Makefile +++ b/databases/galera/Makefile @@ -56,27 +56,9 @@ OPTIONS_DEFINE= BOOSTPOOL BPOSTATIC DEBUG BOOSTPOOL_DESC= Use boost pool allocator BPOSTATIC_DESC= Use static boost_program_options -.include - -# Clang is available on FreeBSD 9.x but the default -# compiler (e.g. /usr/bin/cc) is GCC. Force the usage of Clang. -.if ${OSVERSION} < 1000024 -CC= clang -CXX= clang++ -CPP= clang-cpp -.endif - -.if ${PORT_OPTIONS:MBOOSTPOOL} -MAKE_ARGS+= boost_pool=1 -.endif - -.if ${PORT_OPTIONS:MBPOSTATIC} -MAKE_ARGS+= bpostatic=${LOCALBASE}/lib/libboost_program_options.a -.endif - -.if ${PORT_OPTIONS:MDEBUG} -MAKE_ARGS+= debug=0 -.endif +BOOSTPOOL_MAKE_ARGS= boost_pool=1 +BPOSTATIC_MAKE_ARGS= bpostatic=${LOCALBASE}/lib/libboost_program_options.a +DEBUG_MAKE_ARGS= debug=0 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/garb/garbd ${STAGEDIR}${PREFIX}/bin/ @@ -84,4 +66,4 @@ do-install: @(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libgalera_smm.so \ libgalera.so) -.include +.include diff --git a/databases/galera/pkg-descr b/databases/galera/pkg-descr index c66b2f42f3635..4cf15e8d108e8 100644 --- a/databases/galera/pkg-descr +++ b/databases/galera/pkg-descr @@ -2,4 +2,4 @@ Galera wsrep provider library for Galera Cluster for MySQL, an easy-to-use high-availability solution with high system up-time, no data loss, and scalability for future growth. -WWW: http://galeracluster.com +WWW: http://galeracluster.com/ diff --git a/databases/mrtg-mysql-load/Makefile b/databases/mrtg-mysql-load/Makefile index 5056dbab9d5b9..b71e7b5b695f6 100644 --- a/databases/mrtg-mysql-load/Makefile +++ b/databases/mrtg-mysql-load/Makefile @@ -11,10 +11,15 @@ MASTER_SITES= http://www.bitbybit.dk/mysql/mrtg-mysql-load/ \ MAINTAINER= ports@FreeBSD.org COMMENT= MySQL load analysis fetcher for MRTG +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING + RUN_DEPENDS= mrtg:net-mgmt/mrtg -USES= perl5 +USES= perl5 shebangfix +SHEBANG_FILES= ${PORTNAME} NO_BUILD= yes +NO_ARCH= yes NO_WRKSUBDIR= yes USE_PERL5= run USE_MYSQL= yes @@ -22,14 +27,11 @@ USE_MYSQL= yes PLIST_FILES= bin/mrtg-mysql-load etc/mrtg/mrtg.cfg-mysql-load.example \ etc/mrtg/mysql-load-cfg.example man/man1/${PORTNAME}.1.gz -post-patch: - @${REINPLACE_CMD} -e 's|%%PERL%%|${PERL}|' ${WRKSRC}/${PORTNAME} - do-install: - @${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${PREFIX}/etc/mrtg - @${INSTALL_DATA} ${WRKSRC}/mrtg-cfg.example ${STAGEDIR}${PREFIX}/etc/mrtg/mrtg.cfg-mysql-load.example - @${INSTALL_DATA} ${WRKSRC}/mysql-load-cfg.example ${STAGEDIR}${PREFIX}/etc/mrtg/mysql-load-cfg.example - @${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/mrtg-cfg.example ${STAGEDIR}${PREFIX}/etc/mrtg/mrtg.cfg-mysql-load.example + ${INSTALL_DATA} ${WRKSRC}/mysql-load-cfg.example ${STAGEDIR}${PREFIX}/etc/mrtg/mysql-load-cfg.example + ${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 .include diff --git a/databases/mrtg-mysql-load/files/patch-mrtg-mysql-load b/databases/mrtg-mysql-load/files/patch-mrtg-mysql-load deleted file mode 100644 index ebb461b426d15..0000000000000 --- a/databases/mrtg-mysql-load/files/patch-mrtg-mysql-load +++ /dev/null @@ -1,5 +0,0 @@ ---- mrtg-mysql-load.orig Mon Feb 18 11:03:52 2002 -+++ mrtg-mysql-load Thu Apr 8 14:24:57 2004 -@@ -1 +1 @@ --#!/usr/local/bin/perl -w -+#!%%PERL%% -w diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile index 93368005752b5..3a8a9279347b5 100644 --- a/databases/mysql57-server/Makefile +++ b/databases/mysql57-server/Makefile @@ -3,7 +3,7 @@ PORTNAME?= mysql PORTVERSION= 5.7.20 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.7 PKGNAMESUFFIX?= 57-server diff --git a/databases/p5-DBIx-Simple/Makefile b/databases/p5-DBIx-Simple/Makefile index 2000c9fb517f2..ac4fd65e25c18 100644 --- a/databases/p5-DBIx-Simple/Makefile +++ b/databases/p5-DBIx-Simple/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= DBIx-Simple -PORTVERSION= 1.35 -PORTREVISION= 1 +PORTVERSION= 1.37 CATEGORIES= databases perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -21,6 +20,7 @@ SQL_ABSTRACT_DESC= Generate SQL from Perl data structures DBIX_XHTML_TABLE_DESC= Create XHTML tables from SQL queries TEXT_TABLE_DESC= Create plain text table from data +NO_ARCH= yes USES= perl5 USE_PERL5= configure diff --git a/databases/p5-DBIx-Simple/distinfo b/databases/p5-DBIx-Simple/distinfo index 0a7fe3bd2ff3f..b0eaf10e76257 100644 --- a/databases/p5-DBIx-Simple/distinfo +++ b/databases/p5-DBIx-Simple/distinfo @@ -1,2 +1,3 @@ -SHA256 (DBIx-Simple-1.35.tar.gz) = 445535b3dfab88140c7a0d2776b1e78f254dc7e9c81072d5a01afc95a5db499a -SIZE (DBIx-Simple-1.35.tar.gz) = 19316 +TIMESTAMP = 1513077482 +SHA256 (DBIx-Simple-1.37.tar.gz) = 46d311aa2ce08907401c56119658426dbb044c5a40de73d9a7b79bf50390cae3 +SIZE (DBIx-Simple-1.37.tar.gz) = 20397 diff --git a/databases/pear-Horde_Imsp/Makefile b/databases/pear-Horde_Imsp/Makefile index 88871c297f547..bb7e4d8ef4c9e 100644 --- a/databases/pear-Horde_Imsp/Makefile +++ b/databases/pear-Horde_Imsp/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Horde_Imsp -PORTVERSION= 2.0.5 +DISTVERSION= 2.0.10 CATEGORIES= databases www pear MAINTAINER= horde@FreeBSD.org diff --git a/databases/pear-Horde_Imsp/distinfo b/databases/pear-Horde_Imsp/distinfo index f90dee928b53c..6861368bec25c 100644 --- a/databases/pear-Horde_Imsp/distinfo +++ b/databases/pear-Horde_Imsp/distinfo @@ -1,2 +1,3 @@ -SHA256 (Horde/Horde_Imsp-2.0.5.tgz) = 495f52ebb97a6d162589a9bb70346dbeadf209507c16a834cb12cf4bcd3ea6da -SIZE (Horde/Horde_Imsp-2.0.5.tgz) = 33269 +TIMESTAMP = 1512589684 +SHA256 (Horde/Horde_Imsp-2.0.10.tgz) = 583ed442701aba4d954397fe40e2ffc92d855bea42258e4df493949beb3b3bed +SIZE (Horde/Horde_Imsp-2.0.10.tgz) = 33324 diff --git a/databases/pear-Horde_Memcache/Makefile b/databases/pear-Horde_Memcache/Makefile index 10cbbd6cb941b..d719443629042 100644 --- a/databases/pear-Horde_Memcache/Makefile +++ b/databases/pear-Horde_Memcache/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= Horde_Memcache -PORTVERSION= 2.0.3 +DISTVERSION= 2.1.1 CATEGORIES= databases www pear MAINTAINER= horde@FreeBSD.org diff --git a/databases/pear-Horde_Memcache/distinfo b/databases/pear-Horde_Memcache/distinfo index 9bac547baae6a..d6af43d0f2c71 100644 --- a/databases/pear-Horde_Memcache/distinfo +++ b/databases/pear-Horde_Memcache/distinfo @@ -1,2 +1,3 @@ -SHA256 (Horde/Horde_Memcache-2.0.3.tgz) = 897623947175010f45f7f30f348d23272f0d9f08cb18b7e67f97c5f09cb947bf -SIZE (Horde/Horde_Memcache-2.0.3.tgz) = 13866 +TIMESTAMP = 1512587713 +SHA256 (Horde/Horde_Memcache-2.1.1.tgz) = 2862e8373737a43137d1a97be7fa982c656eee4f83629bd5a9f3ec21adb60497 +SIZE (Horde/Horde_Memcache-2.1.1.tgz) = 15009 diff --git a/databases/pecl-chdb/Makefile b/databases/pecl-chdb/Makefile index b4a82aee78478..bbe84bb9e63ac 100644 --- a/databases/pecl-chdb/Makefile +++ b/databases/pecl-chdb/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libcmph.so:devel/cmph RUN_DEPENDS= ${LOCALBASE}/lib/libcmph.so:devel/cmph USES= php:ext -IGNORE_WITH_PHP= 70 +IGNORE_WITH_PHP= 70 71 72 CFLAGS+= -L${LOCALBASE}/lib diff --git a/databases/pecl-drizzle/Makefile b/databases/pecl-drizzle/Makefile index b122f47c8cbdb..e0c1b9f00b5de 100644 --- a/databases/pecl-drizzle/Makefile +++ b/databases/pecl-drizzle/Makefile @@ -14,7 +14,7 @@ LICENSE= PHP301 LIB_DEPENDS= libdrizzle.so:databases/libdrizzle USES= php:pecl -IGNORE_WITH_PHP= 70 +IGNORE_WITH_PHP= 70 71 72 OPTIONS_DEFINE= DOCS EXAMPLES diff --git a/databases/pecl-leveldb/Makefile b/databases/pecl-leveldb/Makefile index c546ca9e95814..047489212c3f6 100644 --- a/databases/pecl-leveldb/Makefile +++ b/databases/pecl-leveldb/Makefile @@ -14,6 +14,6 @@ LICENSE= PHP301 LIB_DEPENDS= libleveldb.so:databases/leveldb USES= php:pecl -IGNORE_WITH_PHP= 70 +IGNORE_WITH_PHP= 70 71 72 .include diff --git a/databases/pecl-mongo/Makefile b/databases/pecl-mongo/Makefile index 7a33640c47771..f684752acce7d 100644 --- a/databases/pecl-mongo/Makefile +++ b/databases/pecl-mongo/Makefile @@ -16,6 +16,6 @@ USES= php:pecl USE_PHP= spl:build CONFIGURE_ARGS= --enable-mongo SUB_FILES= pkg-message -IGNORE_WITH_PHP= 70 71 +IGNORE_WITH_PHP= 70 71 72 .include diff --git a/databases/pecl-pdo_user/Makefile b/databases/pecl-pdo_user/Makefile index 1a277f0516ed2..26826e2a3c123 100644 --- a/databases/pecl-pdo_user/Makefile +++ b/databases/pecl-pdo_user/Makefile @@ -14,6 +14,6 @@ WRKSRC= ${WRKDIR}/PDO_USER-${PORTVERSION} USES= php:pecl USE_PHP= pdo:build -IGNORE_WITH_PHP= 70 71 +IGNORE_WITH_PHP= 70 71 72 .include diff --git a/databases/pecl-rrd1/Makefile b/databases/pecl-rrd1/Makefile index 92c4c1f7252b5..6e46c2c27170b 100644 --- a/databases/pecl-rrd1/Makefile +++ b/databases/pecl-rrd1/Makefile @@ -10,7 +10,7 @@ COMMENT= PHP bindings to rrd tool system LICENSE= PHP301 -IGNORE_WITH_PHP=70 71 +IGNORE_WITH_PHP=70 71 72 LIB_DEPENDS= librrd.so:databases/rrdtool USES= php:pecl localbase pkgconfig diff --git a/databases/pecl-tokyo_tyrant/Makefile b/databases/pecl-tokyo_tyrant/Makefile index 5733c0768d124..d05afd5aface6 100644 --- a/databases/pecl-tokyo_tyrant/Makefile +++ b/databases/pecl-tokyo_tyrant/Makefile @@ -16,6 +16,6 @@ LIB_DEPENDS= libtokyotyrant.so:databases/tokyotyrant USES= php:pecl pkgconfig USE_PHP= session:build -IGNORE_WITH_PHP= 70 +IGNORE_WITH_PHP= 70 71 72 .include diff --git a/databases/percona56-server/Makefile b/databases/percona56-server/Makefile index 1719d526a2ce6..f7c36fb6d3e7c 100644 --- a/databases/percona56-server/Makefile +++ b/databases/percona56-server/Makefile @@ -12,6 +12,8 @@ DISTNAME= percona-server-${DISTVERSION} MAINTAINER= flo@FreeBSD.org COMMENT?= Multithreaded SQL database (server) +BROKEN_armv6= fails to compile: sql/mysqld.cc:198:19: error: cannot combine with previous 'type-name' declaration specifier +BROKEN_armv7= fails to compile: sql/mysqld.cc:198:19: error: cannot combine with previous 'type-name' declaration specifier NOT_FOR_ARCHS= powerpc64 NOT_FOR_ARCHS_REASON= unsupported platform diff --git a/databases/pg_citus/Makefile b/databases/pg_citus/Makefile index 75f56167eadcc..0e1c6ed897150 100644 --- a/databases/pg_citus/Makefile +++ b/databases/pg_citus/Makefile @@ -12,6 +12,10 @@ COMMENT= Horizontally scale Postgresql using sharding and replication LICENSE= AGPLv3 +BROKEN_aarch64= fails to compile: transaction/backend_data.c:53:2: error: unknown type name 'pg_atomic_uint64'; did you mean 'pg_atomic_uint32'? +BROKEN_armv6= fails to compile: transaction/backend_data.c:53:2: error: unknown type name 'pg_atomic_uint64'; did you mean 'pg_atomic_uint32'? +BROKEN_armv7= fails to compile: transaction/backend_data.c:53:2: error: unknown type name 'pg_atomic_uint64'; did you mean 'pg_atomic_uint32'? + USES= gmake pgsql:9.6+ autoreconf readline WANT_PGSQL= lib server GNU_CONFIGURE= yes diff --git a/databases/php70-memcache/Makefile b/databases/php70-memcache/Makefile index 9bbcf8735adcb..b3135f45cb032 100644 --- a/databases/php70-memcache/Makefile +++ b/databases/php70-memcache/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= memcache -PORTVERSION= 3.0.8 -PORTREVISION= 1 +PORTVERSION= 3.0.9 CATEGORIES= databases PKGNAMEPREFIX= php70- @@ -26,7 +25,7 @@ USES= dos2unix php:ext GH_ACCOUNT= websupport-sk GH_PROJECT= pecl-${PORTNAME} -GH_TAGNAME= 5041d2f +GH_TAGNAME= e702b5f USE_GITHUB= yes post-install-EXAMPLES-on: diff --git a/databases/php70-memcache/distinfo b/databases/php70-memcache/distinfo index 4602941d9c6f6..f4f854a98d929 100644 --- a/databases/php70-memcache/distinfo +++ b/databases/php70-memcache/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1481566704 -SHA256 (websupport-sk-pecl-memcache-3.0.8-5041d2f_GH0.tar.gz) = b441255305e962cecfbb6e88501374a317aeb4dec706e3c2e7c780bb26bf5a96 -SIZE (websupport-sk-pecl-memcache-3.0.8-5041d2f_GH0.tar.gz) = 110448 +TIMESTAMP = 1512806606 +SHA256 (websupport-sk-pecl-memcache-3.0.9-e702b5f_GH0.tar.gz) = a7be1b96f4a57acb5808644c6e4b16bb03097ab46a97a576f02750627fcdf854 +SIZE (websupport-sk-pecl-memcache-3.0.9-e702b5f_GH0.tar.gz) = 110689 diff --git a/databases/php70-memcache/pkg-descr b/databases/php70-memcache/pkg-descr index 92a3b7bbd5a67..51e485441a51a 100644 --- a/databases/php70-memcache/pkg-descr +++ b/databases/php70-memcache/pkg-descr @@ -5,4 +5,4 @@ you to work with memcached through handy OO and procedural interfaces. Note that this port uses unofficial development from https://github.com/websupport-sk/pecl-memcache (NON_BLOCKING_IO_php7 branch). -WWW: https://pecl.php.net/package/memcache +WWW: https://github.com/websupport-sk/pecl-memcache diff --git a/databases/php71-memcache/Makefile b/databases/php71-memcache/Makefile index 3f1640910a287..90772fa5f8ac0 100644 --- a/databases/php71-memcache/Makefile +++ b/databases/php71-memcache/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= memcache -PORTVERSION= 3.0.8 -PORTREVISION= 1 +PORTVERSION= 3.0.9 CATEGORIES= databases PKGNAMEPREFIX= php71- @@ -26,7 +25,7 @@ USES= dos2unix php:ext GH_ACCOUNT= websupport-sk GH_PROJECT= pecl-${PORTNAME} -GH_TAGNAME= 5041d2f +GH_TAGNAME= e702b5f USE_GITHUB= yes post-install-EXAMPLES-on: diff --git a/databases/php71-memcache/distinfo b/databases/php71-memcache/distinfo index 4602941d9c6f6..f4f854a98d929 100644 --- a/databases/php71-memcache/distinfo +++ b/databases/php71-memcache/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1481566704 -SHA256 (websupport-sk-pecl-memcache-3.0.8-5041d2f_GH0.tar.gz) = b441255305e962cecfbb6e88501374a317aeb4dec706e3c2e7c780bb26bf5a96 -SIZE (websupport-sk-pecl-memcache-3.0.8-5041d2f_GH0.tar.gz) = 110448 +TIMESTAMP = 1512806606 +SHA256 (websupport-sk-pecl-memcache-3.0.9-e702b5f_GH0.tar.gz) = a7be1b96f4a57acb5808644c6e4b16bb03097ab46a97a576f02750627fcdf854 +SIZE (websupport-sk-pecl-memcache-3.0.9-e702b5f_GH0.tar.gz) = 110689 diff --git a/databases/php71-memcache/pkg-descr b/databases/php71-memcache/pkg-descr index 92a3b7bbd5a67..51e485441a51a 100644 --- a/databases/php71-memcache/pkg-descr +++ b/databases/php71-memcache/pkg-descr @@ -5,4 +5,4 @@ you to work with memcached through handy OO and procedural interfaces. Note that this port uses unofficial development from https://github.com/websupport-sk/pecl-memcache (NON_BLOCKING_IO_php7 branch). -WWW: https://pecl.php.net/package/memcache +WWW: https://github.com/websupport-sk/pecl-memcache diff --git a/databases/php72-memcache/Makefile b/databases/php72-memcache/Makefile index ba3b046dbfb5f..f5d65f455afd1 100644 --- a/databases/php72-memcache/Makefile +++ b/databases/php72-memcache/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= memcache -PORTVERSION= 3.0.8 -PORTREVISION= 1 +PORTVERSION= 3.0.9 CATEGORIES= databases PKGNAMEPREFIX= php72- @@ -26,7 +25,7 @@ USES= dos2unix php:ext GH_ACCOUNT= websupport-sk GH_PROJECT= pecl-${PORTNAME} -GH_TAGNAME= 5041d2f +GH_TAGNAME= e702b5f USE_GITHUB= yes post-install-EXAMPLES-on: diff --git a/databases/php72-memcache/distinfo b/databases/php72-memcache/distinfo index 4602941d9c6f6..f4f854a98d929 100644 --- a/databases/php72-memcache/distinfo +++ b/databases/php72-memcache/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1481566704 -SHA256 (websupport-sk-pecl-memcache-3.0.8-5041d2f_GH0.tar.gz) = b441255305e962cecfbb6e88501374a317aeb4dec706e3c2e7c780bb26bf5a96 -SIZE (websupport-sk-pecl-memcache-3.0.8-5041d2f_GH0.tar.gz) = 110448 +TIMESTAMP = 1512806606 +SHA256 (websupport-sk-pecl-memcache-3.0.9-e702b5f_GH0.tar.gz) = a7be1b96f4a57acb5808644c6e4b16bb03097ab46a97a576f02750627fcdf854 +SIZE (websupport-sk-pecl-memcache-3.0.9-e702b5f_GH0.tar.gz) = 110689 diff --git a/databases/php72-memcache/pkg-descr b/databases/php72-memcache/pkg-descr index 92a3b7bbd5a67..51e485441a51a 100644 --- a/databases/php72-memcache/pkg-descr +++ b/databases/php72-memcache/pkg-descr @@ -5,4 +5,4 @@ you to work with memcached through handy OO and procedural interfaces. Note that this port uses unofficial development from https://github.com/websupport-sk/pecl-memcache (NON_BLOCKING_IO_php7 branch). -WWW: https://pecl.php.net/package/memcache +WWW: https://github.com/websupport-sk/pecl-memcache diff --git a/databases/postgis22/Makefile b/databases/postgis22/Makefile index b140552a7d333..ba87496dd9010 100644 --- a/databases/postgis22/Makefile +++ b/databases/postgis22/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= libproj.so:graphics/proj \ libgeos.so:graphics/geos \ libjson-c.so:devel/json-c -CONFLICTS= postgis20-2.0.* postgis-2.1.* postgis23-2.3.* +CONFLICTS_INSTALL= postgis20 postgis postgis23 USES= gettext gmake iconv:wchar_t libtool:keepla perl5 pgsql pkgconfig shebangfix GNU_CONFIGURE= yes diff --git a/databases/postgresql-libpqxx/Makefile b/databases/postgresql-libpqxx/Makefile index 89228c5c54a62..0cca69f5b2f7a 100644 --- a/databases/postgresql-libpqxx/Makefile +++ b/databases/postgresql-libpqxx/Makefile @@ -17,7 +17,7 @@ LICENSE= BSD3CLAUSE CONFLICTS= postgresql-libpqxx-3.* postgresql-libpqxx3-3.* PORTSCOUT= limit:^2\. -USES+= gmake libtool pathfix pgsql python:build shebangfix +USES+= gmake libtool pathfix pgsql python:2.7,build shebangfix GNU_CONFIGURE= yes USE_LDCONFIG= yes PLIST_SUB= PORTVERSION=${PORTVERSION:R} diff --git a/databases/postgresql-libpqxx3/Makefile b/databases/postgresql-libpqxx3/Makefile index 591a12c426588..7f56b7fdf5967 100644 --- a/databases/postgresql-libpqxx3/Makefile +++ b/databases/postgresql-libpqxx3/Makefile @@ -16,7 +16,7 @@ COMMENT= New C++ interface for PostgreSQL CONFLICTS= postgresql-libpqxx-[2-4].* PORTSCOUT= limit:^2\. -USES+= gmake libtool pathfix pgsql pkgconfig python:build shebangfix +USES+= gmake libtool pathfix pgsql pkgconfig python:2.7,build shebangfix GNU_CONFIGURE= yes USE_LDCONFIG= yes PLIST_SUB= PORTVERSION=${PORTVERSION} diff --git a/databases/py-alembic/Makefile b/databases/py-alembic/Makefile index 01a0f0fdd7179..b2ac15fe016b9 100644 --- a/databases/py-alembic/Makefile +++ b/databases/py-alembic/Makefile @@ -2,6 +2,7 @@ PORTNAME= alembic PORTVERSION= 0.9.6 +PORTREVISION= 1 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,8 +12,10 @@ COMMENT= Database migration tool for SQLAlchemy LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mako>=0:textproc/py-mako@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mako>=0:textproc/py-mako@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-editor>=0:devel/py-python-editor@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${FLAVOR} USES= python USE_PYTHON= distutils autoplist diff --git a/databases/py-sqlparse/Makefile b/databases/py-sqlparse/Makefile index 255df7a1a9c34..3cd44aaf57300 100644 --- a/databases/py-sqlparse/Makefile +++ b/databases/py-sqlparse/Makefile @@ -13,6 +13,8 @@ COMMENT= Non-validating SQL parser for Python LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}sqlparse01 ${PYTHON_PKGNAMEPREFIX}sqlparse020 + NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils USES= python diff --git a/databases/py-sqlparse01/Makefile b/databases/py-sqlparse01/Makefile index 934be5bd9fe71..60ae312336c95 100644 --- a/databases/py-sqlparse01/Makefile +++ b/databases/py-sqlparse01/Makefile @@ -17,6 +17,6 @@ NO_ARCH= yes USE_PYTHON= autoplist distutils USES= python -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}sqlparse +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}sqlparse ${PYTHON_PKGNAMEPREFIX}sqlparse020 .include diff --git a/databases/py-sqlparse020/Makefile b/databases/py-sqlparse020/Makefile new file mode 100644 index 0000000000000..2a095fa04ad64 --- /dev/null +++ b/databases/py-sqlparse020/Makefile @@ -0,0 +1,21 @@ +# $FreeBSD$ + +PORTNAME= sqlparse020 +PORTVERSION= 0.2.0 +CATEGORIES= databases python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +DISTNAME= sqlparse-${DISTVERSION} + +MAINTAINER= axel.rau@chaos1.de +COMMENT= Non-validating SQL parser for Python (version 0.2.0) + +LICENSE= BSD3CLAUSE + +NO_ARCH= yes +USES= python +USE_PYTHON= autoplist concurrent distutils + +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}sqlparse ${PYTHON_PKGNAMEPREFIX}sqlparse01 + +.include diff --git a/databases/py-sqlparse020/distinfo b/databases/py-sqlparse020/distinfo new file mode 100644 index 0000000000000..f3d09d602d370 --- /dev/null +++ b/databases/py-sqlparse020/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1503863532 +SHA256 (sqlparse-0.2.0.tar.gz) = 7fac8d39ac543499b191be19e811ff275f2df0d45c4ba5fc24850aa883ac2060 +SIZE (sqlparse-0.2.0.tar.gz) = 52554 diff --git a/databases/py-sqlparse020/pkg-descr b/databases/py-sqlparse020/pkg-descr new file mode 100644 index 0000000000000..c14e6918626d2 --- /dev/null +++ b/databases/py-sqlparse020/pkg-descr @@ -0,0 +1,7 @@ +sqlparse is a non-validating SQL parser module. +It provides support for parsing, splitting and formatting SQL statements. + +This is version 0.2.0 which is needed by calendarserver. + +WWW: https://pypi.python.org/pypi/sqlparse +WWW: https://github.com/andialbrecht/sqlparse diff --git a/databases/rocksdb/Makefile b/databases/rocksdb/Makefile index bdeeff3b0bcc9..d6b3296db08b4 100644 --- a/databases/rocksdb/Makefile +++ b/databases/rocksdb/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= rocksdb -PORTVERSION= 5.8.7 -DISTVERSIONPREFIX= ${PORTNAME}- +PORTVERSION= 5.8.8 +DISTVERSIONPREFIX= v CATEGORIES= databases MAINTAINER?= sunpoet@FreeBSD.org diff --git a/databases/rocksdb/distinfo b/databases/rocksdb/distinfo index f43c8fdb24384..86d8120cb663e 100644 --- a/databases/rocksdb/distinfo +++ b/databases/rocksdb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1512230449 -SHA256 (facebook-rocksdb-rocksdb-5.8.7_GH0.tar.gz) = 1d2bc77df5f9ea5aa565c8e2286892d01f6dda4395c0aa4f9271a69d01adf1cf -SIZE (facebook-rocksdb-rocksdb-5.8.7_GH0.tar.gz) = 3856247 +TIMESTAMP = 1512841997 +SHA256 (facebook-rocksdb-v5.8.8_GH0.tar.gz) = 16d6de983fe6f1649356975c0a1f74feb994f2fc1de1961e4d6998c8d61e3ef9 +SIZE (facebook-rocksdb-v5.8.8_GH0.tar.gz) = 3857028 diff --git a/databases/ruby-gdbm/Makefile b/databases/ruby-gdbm/Makefile index 546009ac77208..ad5d4f74e1161 100644 --- a/databases/ruby-gdbm/Makefile +++ b/databases/ruby-gdbm/Makefile @@ -28,8 +28,15 @@ MAKE_ARGS= sitelibdir='$$(rubylibdir)' \ INSTALL_PROG="${INSTALL_PROGRAM}" \ INSTALL_DATA="${INSTALL_DATA}" +.include + +.if ${RUBY_VER} >= 2.4 +post-patch: + @${REINPLACE_CMD} -e '/\/include\/ruby.h/d' ${WRKSRC}/depend +.endif + do-extract: ${MKDIR} ${WRKDIR} ${LN} -sf `cd ${PORTSDIR}/${RUBY_PORT}; ${MAKE} -V WRKDIR`/${PORTNAME} ${WRKDIR}/ -.include +.include diff --git a/databases/ruby-odbc/Makefile b/databases/ruby-odbc/Makefile index 662db56b1d573..2286341125d9c 100644 --- a/databases/ruby-odbc/Makefile +++ b/databases/ruby-odbc/Makefile @@ -13,6 +13,8 @@ DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org COMMENT= Ruby extension library to use ODBC data sources +BROKEN_ruby24= yes + OPTIONS_DEFINe= DOCS EXAMPLES LIB_DEPENDS= libodbc.so:databases/unixODBC diff --git a/databases/rubygem-amalgalite/Makefile b/databases/rubygem-amalgalite/Makefile index 68508a34f349e..3dc4f1f14e4f2 100644 --- a/databases/rubygem-amalgalite/Makefile +++ b/databases/rubygem-amalgalite/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= amalgalite -PORTVERSION= 1.5.0 +PORTVERSION= 1.6.0 CATEGORIES= databases rubygems MASTER_SITES= RG diff --git a/databases/rubygem-amalgalite/distinfo b/databases/rubygem-amalgalite/distinfo index 4ea55baa99a1c..c730b6e81339c 100644 --- a/databases/rubygem-amalgalite/distinfo +++ b/databases/rubygem-amalgalite/distinfo @@ -1,2 +1,3 @@ -SHA256 (rubygem/amalgalite-1.5.0.gem) = c31d3dc841df7a3a8bd65371b61431332cfd99cb8bfea4aa2060b1360a1a79a0 -SIZE (rubygem/amalgalite-1.5.0.gem) = 1913856 +TIMESTAMP = 1513266108 +SHA256 (rubygem/amalgalite-1.6.0.gem) = b911e89b9ca7905c74b97a15c77a8dac8d6e5433550154e8cec3b06a84f1f9dc +SIZE (rubygem/amalgalite-1.6.0.gem) = 2134528 diff --git a/databases/rubygem-mysql/Makefile b/databases/rubygem-mysql/Makefile index f04e48a1a0ea5..9e048a6a81950 100644 --- a/databases/rubygem-mysql/Makefile +++ b/databases/rubygem-mysql/Makefile @@ -12,6 +12,8 @@ COMMENT= MySQL API module for Ruby LICENSE= GPLv2 RUBY LICENSE_COMB= dual +BROKEN_RUBY24= yes + USE_RUBY= yes USES= gem mysql diff --git a/databases/rubygem-pghero-rails5/Makefile b/databases/rubygem-pghero-rails5/Makefile index 26d9556195868..be39fa406cffb 100644 --- a/databases/rubygem-pghero-rails5/Makefile +++ b/databases/rubygem-pghero-rails5/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pghero -DISTVERSION= 2.0.8 +DISTVERSION= 2.1.0 CATEGORIES= databases rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails5 diff --git a/databases/rubygem-pghero-rails5/distinfo b/databases/rubygem-pghero-rails5/distinfo index 7279714a84b43..413ab1751f7df 100644 --- a/databases/rubygem-pghero-rails5/distinfo +++ b/databases/rubygem-pghero-rails5/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1510587457 -SHA256 (rubygem/pghero-2.0.8.gem) = 6b86cb2ebda4b02c202288f6bfbe645cbb1fdaca58a498becfdf675265ed641e -SIZE (rubygem/pghero-2.0.8.gem) = 289792 +TIMESTAMP = 1512841085 +SHA256 (rubygem/pghero-2.1.0.gem) = 887193a204de2d0fa9ff5e8f63e777111cc6d3ac33ff5bc68676f92c0b66768c +SIZE (rubygem/pghero-2.1.0.gem) = 290304 diff --git a/databases/rubygem-pghero-rails50/Makefile b/databases/rubygem-pghero-rails50/Makefile index 701f21cd45493..d4766888b6c2c 100644 --- a/databases/rubygem-pghero-rails50/Makefile +++ b/databases/rubygem-pghero-rails50/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pghero -PORTVERSION= 2.0.8 +PORTVERSION= 2.1.0 CATEGORIES= databases rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails50 diff --git a/databases/rubygem-pghero-rails50/distinfo b/databases/rubygem-pghero-rails50/distinfo index 7279714a84b43..413ab1751f7df 100644 --- a/databases/rubygem-pghero-rails50/distinfo +++ b/databases/rubygem-pghero-rails50/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1510587457 -SHA256 (rubygem/pghero-2.0.8.gem) = 6b86cb2ebda4b02c202288f6bfbe645cbb1fdaca58a498becfdf675265ed641e -SIZE (rubygem/pghero-2.0.8.gem) = 289792 +TIMESTAMP = 1512841085 +SHA256 (rubygem/pghero-2.1.0.gem) = 887193a204de2d0fa9ff5e8f63e777111cc6d3ac33ff5bc68676f92c0b66768c +SIZE (rubygem/pghero-2.1.0.gem) = 290304 diff --git a/databases/rubygem-pghero/Makefile b/databases/rubygem-pghero/Makefile index ac1fdd7b646cb..9ffc5e20067f2 100644 --- a/databases/rubygem-pghero/Makefile +++ b/databases/rubygem-pghero/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pghero -PORTVERSION= 2.0.8 +PORTVERSION= 2.1.0 CATEGORIES= databases rubygems MASTER_SITES= RG diff --git a/databases/rubygem-pghero/distinfo b/databases/rubygem-pghero/distinfo index 7279714a84b43..413ab1751f7df 100644 --- a/databases/rubygem-pghero/distinfo +++ b/databases/rubygem-pghero/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1510587457 -SHA256 (rubygem/pghero-2.0.8.gem) = 6b86cb2ebda4b02c202288f6bfbe645cbb1fdaca58a498becfdf675265ed641e -SIZE (rubygem/pghero-2.0.8.gem) = 289792 +TIMESTAMP = 1512841085 +SHA256 (rubygem/pghero-2.1.0.gem) = 887193a204de2d0fa9ff5e8f63e777111cc6d3ac33ff5bc68676f92c0b66768c +SIZE (rubygem/pghero-2.1.0.gem) = 290304 diff --git a/databases/soci/Makefile b/databases/soci/Makefile index 36ed4a6ab6587..d3cf8d4a39b81 100644 --- a/databases/soci/Makefile +++ b/databases/soci/Makefile @@ -13,6 +13,9 @@ COMMENT= The C++ Database Access Library LICENSE= BSL LICENSE_FILE= ${WRKSRC}/LICENSE_1_0.txt +BROKEN_armv6= fails to compile: backends/mysql/session.cpp:202:22: error: ordered comparison between pointer and zero ('int *' and 'int') +BROKEN_armv7= fails to compile: backends/mysql/session.cpp:202:22: error: ordered comparison between pointer and zero ('int *' and 'int') + USES= cmake zip CMAKE_ARGS+= -DWITH_ORACLE:BOOL=OFF USE_LDCONFIG= yes diff --git a/databases/tarantool-c/Makefile b/databases/tarantool-c/Makefile index 1275fc5c640cf..a8f1a59eaccd3 100644 --- a/databases/tarantool-c/Makefile +++ b/databases/tarantool-c/Makefile @@ -17,11 +17,6 @@ GH_TAGNAME= a251965 USES= cmake CMAKE_ARGS= -DENABLE_BUNDLED_MSGPUCK=false -BROKEN_aarch64= Fails to compile: clang compiler does not support -march=native -BROKEN_mips64= Fails to compile: clang compiler does not support -march=native -BROKEN_powerpc64= Fails to compile: clang compiler does not support -march=native -BROKEN_sparc64= Fails to compile: clang compiler does not support -march=native - post-patch: @${REINPLACE_CMD} -e '/-O3 -march=native/d' ${WRKSRC}/CMakeLists.txt diff --git a/databases/timescaledb/Makefile b/databases/timescaledb/Makefile index 18a3c11497549..05ff2b5d8c411 100644 --- a/databases/timescaledb/Makefile +++ b/databases/timescaledb/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= timescaledb -PORTVERSION= 0.7.0 +PORTVERSION= 0.7.1 CATEGORIES= databases MAINTAINER= kbowling@FreeBSD.org @@ -32,7 +32,9 @@ PLIST_FILES= lib/postgresql/timescaledb.so \ share/postgresql/extension/timescaledb--0.5.0--0.6.0.sql \ share/postgresql/extension/timescaledb--0.6.0--0.6.1.sql \ share/postgresql/extension/timescaledb--0.6.1--0.7.0.sql \ - share/postgresql/extension/timescaledb--0.7.0.sql \ + share/postgresql/extension/timescaledb--0.6.1--0.7.1.sql \ + share/postgresql/extension/timescaledb--0.7.0--0.7.1.sql \ + share/postgresql/extension/timescaledb--0.7.1.sql \ share/postgresql/extension/timescaledb.control post-install: diff --git a/databases/timescaledb/distinfo b/databases/timescaledb/distinfo index e5d90c8d0b473..d6915b8bdf8a6 100644 --- a/databases/timescaledb/distinfo +++ b/databases/timescaledb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1511336203 -SHA256 (timescale-timescaledb-0.7.0_GH0.tar.gz) = 11087c59f2b91c035376ffdf64161be45789244c377260c1bef2f8fceebfd9d7 -SIZE (timescale-timescaledb-0.7.0_GH0.tar.gz) = 374746 +TIMESTAMP = 1512807641 +SHA256 (timescale-timescaledb-0.7.1_GH0.tar.gz) = f1aa897d733dcf04a131ac82ba977c39f0a1373b07fb85a377140ef63d054509 +SIZE (timescale-timescaledb-0.7.1_GH0.tar.gz) = 429747 diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile index 82eab4a3bf675..df195c3cd3006 100644 --- a/deskutils/calibre/Makefile +++ b/deskutils/calibre/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= calibre -PORTVERSION= 3.13.0 +PORTVERSION= 3.14.0 CATEGORIES= deskutils python MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/ diff --git a/deskutils/calibre/distinfo b/deskutils/calibre/distinfo index 41275774ff2fd..81020d8ee8e81 100644 --- a/deskutils/calibre/distinfo +++ b/deskutils/calibre/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1512115660 -SHA256 (calibre-3.13.0.tar.xz) = 84c980e80b61d12797c91bfa0b6ba81926e2fef49ca3082c3e5ea80d161e13a9 -SIZE (calibre-3.13.0.tar.xz) = 37996660 +TIMESTAMP = 1513325134 +SHA256 (calibre-3.14.0.tar.xz) = a14c37514850e5b9eedf53d5f80005e631cdf1f8ae82d1fca652c22a1094c78c +SIZE (calibre-3.14.0.tar.xz) = 38059200 diff --git a/deskutils/calibre/pkg-plist b/deskutils/calibre/pkg-plist index cc6d750f9c7f9..86f1fc994f427 100644 --- a/deskutils/calibre/pkg-plist +++ b/deskutils/calibre/pkg-plist @@ -1012,7 +1012,6 @@ lib/calibre/calibre/gui2/store/stores/feedbooks_plugin.py lib/calibre/calibre/gui2/store/stores/google_books_plugin.py lib/calibre/calibre/gui2/store/stores/gutenberg_plugin.py lib/calibre/calibre/gui2/store/stores/kobo_plugin.py -lib/calibre/calibre/gui2/store/stores/koobe_plugin.py lib/calibre/calibre/gui2/store/stores/legimi_plugin.py lib/calibre/calibre/gui2/store/stores/libri_de_plugin.py lib/calibre/calibre/gui2/store/stores/litres_plugin.py @@ -1035,6 +1034,7 @@ lib/calibre/calibre/gui2/store/stores/pragmatic_bookshelf_plugin.py lib/calibre/calibre/gui2/store/stores/publio_plugin.py lib/calibre/calibre/gui2/store/stores/rw2010_plugin.py lib/calibre/calibre/gui2/store/stores/smashwords_plugin.py +lib/calibre/calibre/gui2/store/stores/swiatebookow_plugin.py lib/calibre/calibre/gui2/store/stores/virtualo_plugin.py lib/calibre/calibre/gui2/store/stores/weightless_books_plugin.py lib/calibre/calibre/gui2/store/stores/whsmith_uk_plugin.py diff --git a/deskutils/deforaos-todo/Makefile b/deskutils/deforaos-todo/Makefile index 5ada09f808ad4..9a7cef8adf9a0 100644 --- a/deskutils/deforaos-todo/Makefile +++ b/deskutils/deforaos-todo/Makefile @@ -24,6 +24,8 @@ MAKE_ARGS+= PREFIX=${PREFIX} MAKE_ENV= MANDIR=${STAGEDIR}${MANPREFIX}/man +CONFLICTS_INSTALL= devtodo todo + OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes NLS_USES= gettext diff --git a/deskutils/ganyremote/Makefile b/deskutils/ganyremote/Makefile index 62995d224b2b8..c7649dacc6bd6 100644 --- a/deskutils/ganyremote/Makefile +++ b/deskutils/ganyremote/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= anyremote:comms/anyremote -USES= gettext python shebangfix +USES= gettext python:2.7 shebangfix SHEBANG_FILES= ganyremote USE_GNOME= pygtk2 GNU_CONFIGURE= yes diff --git a/deskutils/gnome-documents/Makefile b/deskutils/gnome-documents/Makefile index 2c73575ebcc87..82ac70ee2aff2 100644 --- a/deskutils/gnome-documents/Makefile +++ b/deskutils/gnome-documents/Makefile @@ -25,14 +25,14 @@ LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ libgjs.so:lang/gjs \ libtracker-sparql-1.0.so:sysutils/tracker \ libzapojit-0.0.so:net/libzapojit -RUN_DEPENDS= py2?-dbus>0:devel/py-dbus \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \ ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss \ unoconv:textproc/unoconv PORTSCOUT= limitw:1,even USES= compiler:c++11-lib gettext gmake gnome libtool pathfix \ - pkgconfig tar:xz + pkgconfig python:2.7 tar:xz USE_GNOME= gnomedesktop3 gtk30 intlhack \ introspection:build librsvg2 libxml2 GNU_CONFIGURE= yes diff --git a/deskutils/gruler/Makefile b/deskutils/gruler/Makefile index d5d57584d2922..7d0b434229192 100644 --- a/deskutils/gruler/Makefile +++ b/deskutils/gruler/Makefile @@ -11,6 +11,8 @@ MASTER_SITES= http://BSDforge.com/projects/source/deskutils/gruler/ \ MAINTAINER= ps.ports@smyrak.com COMMENT= Simple customizable GTK screen ruler +BROKEN= No public distfiles + USES= pkgconfig pathfix libtool GNU_CONFIGURE= yes USE_GNOME= gnomeprefix libgnomeui libglade2 diff --git a/deskutils/osmo/Makefile b/deskutils/osmo/Makefile index f4f8a5abbf947..6952a34277889 100644 --- a/deskutils/osmo/Makefile +++ b/deskutils/osmo/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= osmo -PORTVERSION= 0.2.14 -PORTREVISION= 3 +PORTVERSION= 0.4.2 CATEGORIES= deskutils MASTER_SITES= SF/${PORTNAME}-pim/${PORTNAME}-pim/${PORTNAME}-${PORTVERSION} @@ -16,11 +15,13 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libical.so:devel/libical \ libnotify.so:devel/libnotify \ libgringotts.so:security/libgringotts \ - libgtkspell.so:textproc/gtkspell \ - libwebkitgtk-1.0.so:www/webkit-gtk2 + libwebkit2gtk-4.0.so:www/webkit2-gtk3 \ + libgspell-1.so:textproc/gspell \ + libicui18n.so:devel/icu \ + libsoup-2.4.so:devel/libsoup USES= gettext gmake libarchive pkgconfig sqlite -USE_GNOME= gtk20 libxml2 +USE_GNOME= cairo gtk30 libxml2 GNU_CONFIGURE= yes INSTALLS_ICONS= yes diff --git a/deskutils/osmo/distinfo b/deskutils/osmo/distinfo index 090f40a4ddaa3..509a39a2366ce 100644 --- a/deskutils/osmo/distinfo +++ b/deskutils/osmo/distinfo @@ -1,2 +1,3 @@ -SHA256 (osmo-0.2.14.tar.gz) = 052c3509e9e5ee3f7692fc0d456bebd3a13727acb985901f08c0e2e86bf64a6d -SIZE (osmo-0.2.14.tar.gz) = 946243 +TIMESTAMP = 1513125909 +SHA256 (osmo-0.4.2.tar.gz) = 5b50e5b98daea986e18034ee1ef8f70ee2018be0802f6053c6d74d2613274dbe +SIZE (osmo-0.4.2.tar.gz) = 1367417 diff --git a/deskutils/owncloudclient/Makefile b/deskutils/owncloudclient/Makefile index b73d017f0690a..f10b9d57eda96 100644 --- a/deskutils/owncloudclient/Makefile +++ b/deskutils/owncloudclient/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= owncloudclient -PORTVERSION= 2.3.3 +PORTVERSION= 2.3.4 DISTVERSIONPREFIX= v CATEGORIES= deskutils diff --git a/deskutils/owncloudclient/distinfo b/deskutils/owncloudclient/distinfo index a25eaa43bb5e0..f007313aee74e 100644 --- a/deskutils/owncloudclient/distinfo +++ b/deskutils/owncloudclient/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1507911800 -SHA256 (owncloud-client-v2.3.3_GH0.tar.gz) = 6f37de32ad3992fe3f7a6c2ff5675612506cf768e945a2568a9c105773246d77 -SIZE (owncloud-client-v2.3.3_GH0.tar.gz) = 14481883 +TIMESTAMP = 1512670982 +SHA256 (owncloud-client-v2.3.4_GH0.tar.gz) = 17dd5bb7afb996ee155b8fe68a4fd4b75a8d46563226da470c4e598d6f990bc6 +SIZE (owncloud-client-v2.3.4_GH0.tar.gz) = 14482919 diff --git a/deskutils/pypanel/Makefile b/deskutils/pypanel/Makefile index d5340386b9e20..867d3c44717af 100644 --- a/deskutils/pypanel/Makefile +++ b/deskutils/pypanel/Makefile @@ -33,8 +33,9 @@ post-patch: s|/usr/bin/imlib2-config|${LOCALBASE}/bin/imlib2-config|; \ s|/usr/X11R6/include|${LOCALBASE}/include|; \ s|"COPYING", "README", ||' ${WRKSRC}/setup.py - @${REINPLACE_CMD} -e 's|sysconfig\.get_python_lib()|"${PREFIX}/share"|' \ - ${WRKSRC}/setup.py ${WRKSRC}/pypanel + @${REINPLACE_CMD} -e \ + 's|sysconfig\.get_python_lib()|"${PREFIX}/share"|' \ + ${WRKSRC}/setup.py ${WRKSRC}/pypanel @${REINPLACE_CMD} -e \ 's|/usr/lib/libImlib2.so.1|${LOCALBASE}/lib/libImlib2.so|' \ ${WRKSRC}/setup.py ${WRKSRC}/ppmodule.c diff --git a/deskutils/rox-memo/Makefile b/deskutils/rox-memo/Makefile index 815d4f6b111fd..e82131ef96d4f 100644 --- a/deskutils/rox-memo/Makefile +++ b/deskutils/rox-memo/Makefile @@ -11,9 +11,9 @@ MAINTAINER= olgeni@FreeBSD.org COMMENT= Appointment/TODO management for the ROX desktop RUN_DEPENDS= ${LOCALBASE}/bin/rox:x11-fm/rox-filer \ - ${LOCALBASE}/lib/ROX-Lib2/python/rox/__init__.py:devel/py-roxlib + ${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib -USES= python shebangfix tar:bzip2 +USES= python:2.7 shebangfix tar:bzip2 SHEBANG_FILES= Memo/AppRun Memo/AppletRun do-build: diff --git a/deskutils/spice-gtk/Makefile b/deskutils/spice-gtk/Makefile index 7de50c6a148d5..34985f8ff973d 100644 --- a/deskutils/spice-gtk/Makefile +++ b/deskutils/spice-gtk/Makefile @@ -19,13 +19,14 @@ USES= autoreconf cpe gmake jpeg libtool pkgconfig tar:bzip2 \ CPE_VENDOR= redhat BUILD_DEPENDS= spice-protocol>=0.12.10:devel/spice-protocol \ - ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/py-pyparsing + ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/py-pyparsing@${PY_FLAVOR} RUN_DEPENDS= spice-protocol>=0.12.10:devel/spice-protocol .if defined(SPICE_SLAVE) PORTREVISION= 1 CATEGORIES+= python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +USES:= ${USES:Npython} python:2.7 BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}gtk2>=0:x11-toolkits/py-gtk2 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}gtk2>=0:x11-toolkits/py-gtk2 CONFIGURE_ARGS+= --with-python diff --git a/deskutils/todo/Makefile b/deskutils/todo/Makefile index 95a3606bc80a0..e83894628c0a7 100644 --- a/deskutils/todo/Makefile +++ b/deskutils/todo/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= bash:shells/bash # bin/todo -CONFLICTS_INSTALL= devtodo +CONFLICTS_INSTALL= deforaos-todo devtodo NO_ARCH= yes NO_BUILD= yes diff --git a/deskutils/xfce4-notifyd/Makefile b/deskutils/xfce4-notifyd/Makefile index 1854191021f6f..bacd02aaa05c5 100644 --- a/deskutils/xfce4-notifyd/Makefile +++ b/deskutils/xfce4-notifyd/Makefile @@ -6,7 +6,7 @@ # Support of GTK+ is checked at compile time and themes directories too. PORTNAME= xfce4-notifyd -PORTVERSION= 0.4.0 +PORTVERSION= 0.4.1 CATEGORIES= deskutils xfce MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 diff --git a/deskutils/xfce4-notifyd/distinfo b/deskutils/xfce4-notifyd/distinfo index 4350f35e0f31e..8de891991daca 100644 --- a/deskutils/xfce4-notifyd/distinfo +++ b/deskutils/xfce4-notifyd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1508306244 -SHA256 (xfce4/xfce4-notifyd-0.4.0.tar.bz2) = 2771871f67effc0bb80f656cf4aa3cd71fe0ea0f4c04b5d8e97bb1752faf36c9 -SIZE (xfce4/xfce4-notifyd-0.4.0.tar.bz2) = 519355 +TIMESTAMP = 1513173389 +SHA256 (xfce4/xfce4-notifyd-0.4.1.tar.bz2) = 70fa9faa6e3fe0adb0d20e98316649056040a0a47ca9388a21733911284a3e81 +SIZE (xfce4/xfce4-notifyd-0.4.1.tar.bz2) = 524411 diff --git a/devel/Makefile b/devel/Makefile index ee9abc6a106fc..cfba63bd8f9d2 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -309,7 +309,6 @@ SUBDIR += clanlib SUBDIR += clanlib1 SUBDIR += clanlib22 - SUBDIR += cld SUBDIR += cld2 SUBDIR += clewn SUBDIR += clig @@ -822,6 +821,7 @@ SUBDIR += go-glide SUBDIR += go-go.uuid SUBDIR += go-gocode + SUBDIR += go-godef SUBDIR += go-goregen SUBDIR += go-hashicorp-logutils SUBDIR += go-json-rest @@ -1264,6 +1264,10 @@ SUBDIR += kdesdk-thumbnailers SUBDIR += kdesdk-thumbnailers-kde4 SUBDIR += kdesvn-kde4 + SUBDIR += kdev-php + SUBDIR += kdev-python + SUBDIR += kdevelop-pg-qt + SUBDIR += kdevelop SUBDIR += kdevelop-kde4 SUBDIR += kdevelop-kde4-pg-qt SUBDIR += kdevelop-kde4-php @@ -1834,6 +1838,7 @@ SUBDIR += omniNotify SUBDIR += omniORB SUBDIR += omniORB-4.1 + SUBDIR += omnisharp-server SUBDIR += oniguruma SUBDIR += onscripter SUBDIR += onscripter-1byte @@ -3105,7 +3110,6 @@ SUBDIR += p5-POSIX-strftime-Compiler SUBDIR += p5-POSIX-strptime SUBDIR += p5-PPerl - SUBDIR += p5-Pthread-GetThreadId SUBDIR += p5-PV SUBDIR += p5-Package-Constants SUBDIR += p5-Package-DeprecationManager @@ -3218,6 +3222,7 @@ SUBDIR += p5-Proc-WaitStat SUBDIR += p5-Project-Gantt SUBDIR += p5-Project-Libs + SUBDIR += p5-Pthread-GetThreadId SUBDIR += p5-Qudo SUBDIR += p5-RPSL-Parser SUBDIR += p5-RRDTool-OO @@ -4155,6 +4160,7 @@ SUBDIR += py-DateTime SUBDIR += py-DocumentTemplate SUBDIR += py-ExtensionClass + SUBDIR += py-IBMQuantumExperience SUBDIR += py-InlineEgg SUBDIR += py-Jinja2 SUBDIR += py-Jinja2-doc @@ -4208,6 +4214,7 @@ SUBDIR += py-Products.validation SUBDIR += py-PyExecJS SUBDIR += py-PyLD + SUBDIR += py-PyODE SUBDIR += py-RPyC SUBDIR += py-Record SUBDIR += py-SymbolType @@ -4282,9 +4289,9 @@ SUBDIR += py-backports.csv SUBDIR += py-backports.functools_lru_cache SUBDIR += py-backports.shutil_get_terminal_size + SUBDIR += py-backports.tempfile SUBDIR += py-backports.weakref SUBDIR += py-backports_abc - SUBDIR += py-backports.tempfile SUBDIR += py-bandit SUBDIR += py-bcdoc SUBDIR += py-billiard @@ -4307,6 +4314,7 @@ SUBDIR += py-buildbot-waterfall-view SUBDIR += py-buildbot-worker SUBDIR += py-buildbot-www + SUBDIR += py-bullet3 SUBDIR += py-cached-property SUBDIR += py-cachetools SUBDIR += py-calendar @@ -4630,7 +4638,6 @@ SUBDIR += py-notify SUBDIR += py-numba SUBDIR += py-ocempgui - SUBDIR += py-ode SUBDIR += py-odfpy SUBDIR += py-offtrac SUBDIR += py-olefile @@ -5197,6 +5204,7 @@ SUBDIR += quickcheck++ SUBDIR += quilt SUBDIR += racer + SUBDIR += racerd SUBDIR += radare2 SUBDIR += ragel SUBDIR += raknet @@ -5551,6 +5559,7 @@ SUBDIR += rubygem-metasm SUBDIR += rubygem-method_source SUBDIR += rubygem-micromachine + SUBDIR += rubygem-micromachine2 SUBDIR += rubygem-minitest SUBDIR += rubygem-mixlib-archive SUBDIR += rubygem-mixlib-authentication @@ -5655,6 +5664,7 @@ SUBDIR += rubygem-rails-i18n-rails50 SUBDIR += rubygem-rails-observers SUBDIR += rubygem-rainbow + SUBDIR += rubygem-rainbow2 SUBDIR += rubygem-rake SUBDIR += rubygem-rake-compiler SUBDIR += rubygem-rake-compiler-dock @@ -5683,8 +5693,8 @@ SUBDIR += rubygem-ref SUBDIR += rubygem-request_store SUBDIR += rubygem-require_all - SUBDIR += rubygem-retriable SUBDIR += rubygem-resque + SUBDIR += rubygem-retriable SUBDIR += rubygem-retryable SUBDIR += rubygem-rgl SUBDIR += rubygem-rice @@ -6072,6 +6082,7 @@ SUBDIR += yaml2argdata SUBDIR += yasm SUBDIR += yasm-devel + SUBDIR += youcompleteme SUBDIR += z80-asm SUBDIR += z80asm SUBDIR += z80ex diff --git a/devel/aap/Makefile b/devel/aap/Makefile index 5390f79ba3fcf..872d10e7af67d 100644 --- a/devel/aap/Makefile +++ b/devel/aap/Makefile @@ -17,7 +17,7 @@ OPTIONS_DEFINE= DOCS NO_WRKSUBDIR= yes NO_BUILD= yes -USES= python zip +USES= python:2.7 zip PLIST_SUB= PORTVERSION="${PORTVERSION}" NO_ARCH= yes diff --git a/devel/alf/Makefile b/devel/alf/Makefile index 0737ac0a2371c..fcf587cb8e384 100644 --- a/devel/alf/Makefile +++ b/devel/alf/Makefile @@ -10,7 +10,7 @@ MASTER_SITES= SF/largefiles/largefiles/${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Abstract Large File -USES= libtool python +USES= libtool python:2.7 GNU_CONFIGURE= yes USE_LDCONFIG= yes INSTALL_TARGET= install-strip diff --git a/devel/amd64-gcc/Makefile b/devel/amd64-gcc/Makefile index ab37c3d2c8670..daf3fad9de73f 100644 --- a/devel/amd64-gcc/Makefile +++ b/devel/amd64-gcc/Makefile @@ -9,8 +9,8 @@ BU_PREFIX= x86_64-${OPSYS:tl} FREEBSD_EXTENSION= yes BROKEN_aarch64= error: invalid output constraint '=a' in asm -BROKEN_armv6= fails to package -BROKEN_armv7= fails to package +BROKEN_armv6= error: invalid output constraint '=a' in asm +BROKEN_armv7= error: invalid output constraint '=a' in asm BROKEN_mips= configure: error: cannot compute suffix of object files: cannot compile BROKEN_mips64= configure: error: cannot compute suffix of object files: cannot compile BROKEN_powerpc64= error: invalid output constraint in asm diff --git a/devel/arpc/Makefile b/devel/arpc/Makefile index 1943fa23d6c60..f8d19f696e1f2 100644 --- a/devel/arpc/Makefile +++ b/devel/arpc/Makefile @@ -19,6 +19,9 @@ LIB_DEPENDS= libargdata.so:devel/argdata RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyPEG2>=2.15.2:textproc/py-pyPEG2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}toposort>=1.5:devel/py-toposort@${PY_FLAVOR} +BROKEN_armv6= fails to build: *** Signal 11 +BROKEN_armv7= fails to build: *** Signal 11 + USES= cmake localbase:ldflags python:3.4+ shebangfix tar:xz python_OLD_CMD= "/usr/bin/env python3" SHEBANG_FILES= scripts/aprotoc.py diff --git a/devel/autogen/Makefile b/devel/autogen/Makefile index dfdab2d4b2c4f..5268299dc5d16 100644 --- a/devel/autogen/Makefile +++ b/devel/autogen/Makefile @@ -15,6 +15,9 @@ BUILD_DEPENDS= bash:shells/bash LIB_DEPENDS= libguile-2.0.so:lang/guile2 RUN_DEPENDS:= ${BUILD_DEPENDS} +# bin/columns +CONFLICTS_INSTALL= columns + CONFIGURE_ARGS= --datadir=${PREFIX}/share --with-libguile=yes --with-libxml2=yes CONFIGURE_ENV= CONFIG_SHELL=${LOCALBASE}/bin/bash GNU_CONFIGURE= yes diff --git a/devel/blitz/Makefile b/devel/blitz/Makefile index 73e9a8fd62fcc..afb38a52e5f22 100644 --- a/devel/blitz/Makefile +++ b/devel/blitz/Makefile @@ -10,7 +10,7 @@ COMMENT= Blitz++ Multi-Dimensional Array Library for C++ LICENSE= ART20 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= gmake libtool localbase python:build +USES= gmake libtool localbase python:2.7,build USE_GITHUB= yes GH_ACCOUNT= blitzpp GNU_CONFIGURE= yes diff --git a/devel/boost-libs/Makefile b/devel/boost-libs/Makefile index ba89ddc4371d5..89e22a965592b 100644 --- a/devel/boost-libs/Makefile +++ b/devel/boost-libs/Makefile @@ -32,6 +32,8 @@ ICU_MAKE_ARGS_OFF= boost.locale.icu=off .include "${.CURDIR}/../boost-all/compiled.mk" MAKE_ARGS+= --without-python +MAKE_ARGS+= ${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}} +MAKE_ARGS_gcc= xdll-path=${_GCC_RUNTIME} ALL_TARGET= stage do-install: diff --git a/devel/bpython/Makefile b/devel/bpython/Makefile index 49cd6f12a7c57..e3cb1cdd28bb5 100644 --- a/devel/bpython/Makefile +++ b/devel/bpython/Makefile @@ -6,6 +6,7 @@ PORTVERSION= 0.17 CATEGORIES= devel python MASTER_SITES= CHEESESHOP \ https://bpython-interpreter.org/releases/ +PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Fancy interface to the Python interpreter @@ -24,7 +25,7 @@ OPTIONS_DEFINE= EXAMPLES NLS OPTIONS_SUB= yes NO_ARCH= yes -USE_PYTHON= autoplist concurrent distutils optsuffix +USE_PYTHON= autoplist concurrent distutils USES= python PORTEXAMPLES= light.theme sample.theme diff --git a/devel/breakpad/Makefile b/devel/breakpad/Makefile index 0ce43eabfd524..40879e3ecbb3f 100644 --- a/devel/breakpad/Makefile +++ b/devel/breakpad/Makefile @@ -11,7 +11,7 @@ COMMENT= Client/server based crash-reporting system LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -USES= autoreconf +USES= autoreconf compiler:c++11-lib GNU_CONFIGURE= yes USE_GITHUB= yes diff --git a/devel/caf/Makefile b/devel/caf/Makefile index aa2c25baef145..38227cd16c150 100644 --- a/devel/caf/Makefile +++ b/devel/caf/Makefile @@ -12,8 +12,6 @@ COMMENT= C++ actor framework LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_powerpc64= does not build: error: to_string is not a member of std - CXXFLAGS+= -std=c++11 -Wextra -Wall -pedantic LDFLAGS+= -pthread USES= cmake:outsource compiler:c++11-lang diff --git a/devel/cl-alexandria-sbcl/Makefile b/devel/cl-alexandria-sbcl/Makefile index 5e52f001cdd3f..217085d408aed 100644 --- a/devel/cl-alexandria-sbcl/Makefile +++ b/devel/cl-alexandria-sbcl/Makefile @@ -2,7 +2,7 @@ PORTNAME= alexandria PORTVERSION= 2010.01.16 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/cl-infix-sbcl/Makefile b/devel/cl-infix-sbcl/Makefile index f082dbdfe70f0..1e3264c606036 100644 --- a/devel/cl-infix-sbcl/Makefile +++ b/devel/cl-infix-sbcl/Makefile @@ -3,7 +3,7 @@ PORTNAME= infix PORTVERSION= 19960628 -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/cl-port-sbcl/Makefile b/devel/cl-port-sbcl/Makefile index bb781f41a21bc..57970ad529b58 100644 --- a/devel/cl-port-sbcl/Makefile +++ b/devel/cl-port-sbcl/Makefile @@ -3,7 +3,7 @@ PORTNAME= port PORTVERSION= 2002.10.02.1 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/cl-split-sequence-sbcl/Makefile b/devel/cl-split-sequence-sbcl/Makefile index dbfd6cfe101a1..2188a943e9667 100644 --- a/devel/cl-split-sequence-sbcl/Makefile +++ b/devel/cl-split-sequence-sbcl/Makefile @@ -3,7 +3,7 @@ PORTNAME= split-sequence PORTVERSION= 20011114.1 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/cl-trivial-features-sbcl/Makefile b/devel/cl-trivial-features-sbcl/Makefile index 8887edc20626d..6452b6e8a6a3f 100644 --- a/devel/cl-trivial-features-sbcl/Makefile +++ b/devel/cl-trivial-features-sbcl/Makefile @@ -2,7 +2,7 @@ PORTNAME= trivial-features PORTVERSION= 2010.01.16 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/cl-trivial-gray-streams-sbcl/Makefile b/devel/cl-trivial-gray-streams-sbcl/Makefile index e52f2e66b2aac..97d78352ccefc 100644 --- a/devel/cl-trivial-gray-streams-sbcl/Makefile +++ b/devel/cl-trivial-gray-streams-sbcl/Makefile @@ -2,7 +2,7 @@ PORTNAME= trivial-gray-streams PORTVERSION= 2008.11.02 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/cld/Makefile b/devel/cld/Makefile deleted file mode 100644 index 67e0bc5f2a7b1..0000000000000 --- a/devel/cld/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# Created by: Dmitry Sivachenko -# $FreeBSD$ - -PORTNAME= cld -PORTVERSION= 0.1 -PORTREVISION= 1 -CATEGORIES= devel -MASTER_SITES= GOOGLE_CODE -PROJECTHOST= chromium-compact-language-detector -DISTNAME= compact-language-detector-${PORTVERSION} - -MAINTAINER= demon@FreeBSD.org -COMMENT= Chromium compact language detector library - -BROKEN= Unfetchable (google code has gone away) -DEPRECATED= Unfetchable for more than six months (google code has gone away) -EXPIRATION_DATE= 2017-04-30 - -USES= libtool pathfix -GNU_CONFIGURE= yes -USE_LDCONFIG= yes - -ONLY_FOR_ARCHS= i386 amd64 armv6 armv7 powerpc -ONLY_FOR_ARCHS_REASON= hardcoded set of supported archs - -.include diff --git a/devel/cld/distinfo b/devel/cld/distinfo deleted file mode 100644 index dca0815b48487..0000000000000 --- a/devel/cld/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (compact-language-detector-0.1.tar.gz) = b1a3b430c0d39c8a8731d7291c30d896dd0f63c3fd093ec6ceb275bb760d1d5c -SIZE (compact-language-detector-0.1.tar.gz) = 2498722 diff --git a/devel/cld/pkg-descr b/devel/cld/pkg-descr deleted file mode 100644 index c6062fbb703b2..0000000000000 --- a/devel/cld/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -A port from the CLD (Compact Language Detector) library embedded in -Google's Chromium browser. The library detects the language from -provided UTF-8 text (plain text or HTML). It is implemented in C++, -with very basic Python bindings. - -You most likely need devel/cld2 port: version 2 of CLD. This port is here -only to for pecl-cld until it support CLD version 2. - -WWW: https://code.google.com/p/chromium-compact-language-detector/ diff --git a/devel/cld/pkg-plist b/devel/cld/pkg-plist deleted file mode 100644 index c903660b8b8d6..0000000000000 --- a/devel/cld/pkg-plist +++ /dev/null @@ -1,18 +0,0 @@ -include/cld/base/basictypes.h -include/cld/base/build_config.h -include/cld/base/port.h -include/cld/base/string_util.h -include/cld/compact_lang_det.h -include/cld/encodings/compact_lang_det/letterscript_enum.h -include/cld/encodings/compact_lang_det/win/cld_basictypes.h -include/cld/encodings/compact_lang_det/win/cld_utf8statetable.h -include/cld/encodings/proto/encodings.pb.h -include/cld/encodings/public/encodings.h -include/cld/ext_lang_enc.h -include/cld/lang_enc.h -include/cld/languages/proto/languages.pb.h -include/cld/languages/public/languages.h -lib/libcld.so -lib/libcld.so.0 -lib/libcld.so.0.0.0 -libdata/pkgconfig/cld.pc diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile index 80150a1fbb578..081147e813d8d 100644 --- a/devel/cppcheck/Makefile +++ b/devel/cppcheck/Makefile @@ -12,8 +12,6 @@ COMMENT?= Static analysis of C/C++ code LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_powerpc64= fails to compile: analyzerinfo.cpp: 'to_string' is not a member of 'std' - USES= compiler:c++11-lib cmake tar:bzip2 .if defined(GUI_ONLY) @@ -46,7 +44,7 @@ RULES_USES= localbase:ldflags TEST_CMAKE_BOOL= BUILD_TESTS HTMLREPORT_DESC= Install cppcheck-htmlreport -HTMLREPORT_USES= python:2,${PYUSE:C/ /,/W} +HTMLREPORT_USES= python:${PYUSE:C/ /,/W} HTMLREPORT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} HTMLREPORT_PLIST_FILES= bin/cppcheck-htmlreport HTMLREPORT_VARS= PYUSE+=run @@ -56,7 +54,7 @@ MANPAGES_BUILD_DEPENDS= xsltproc:textproc/libxslt \ MATCHCOMPILER_DESC= Build-time optimizations via Python MATCHCOMPILER_CMAKE_BOOL= USE_MATCHCOMPILER -MATCHCOMPILER_USES= python:2,${PYUSE:C/ /,/W} +MATCHCOMPILER_USES= python:${PYUSE:C/ /,/W} MATCHCOMPILER_VARS= PYUSE+=build post-install-HTMLREPORT-on: diff --git a/devel/critcl/Makefile b/devel/critcl/Makefile index 30fbf9296b80b..6a64a6dda7a34 100644 --- a/devel/critcl/Makefile +++ b/devel/critcl/Makefile @@ -24,7 +24,7 @@ GH_ACCOUNT= andreas-kupries TEST_TARGET= test PLIST_SUB+= VER=${PORTVERSION} \ - ARCH=${ARCH:S/i386/ix86/} + ARCH=${ARCH:C/arm.*/arm/:S/i386/ix86/} PORTDOCS= * NO_BUILD= yes diff --git a/devel/cxxtools/Makefile b/devel/cxxtools/Makefile index 55e8b227f7eaa..3f020f6b4f0f4 100644 --- a/devel/cxxtools/Makefile +++ b/devel/cxxtools/Makefile @@ -14,6 +14,8 @@ LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_aarch64= does not configure: error: check for atomictype failed +BROKEN_armv6= does not compile: string_view:204:5: error: static_assert failed "Character type of basic_string_view must be a POD" +BROKEN_armv7= does not compile: string_view:204:5: error: static_assert failed "Character type of basic_string_view must be a POD" BROKEN_mips= does not configure: in section .data.rel.ro of csvdeserializer-test.o: defined in discarded section BROKEN_mips64= does not configure: in section .data.rel.ro of csvdeserializer-test.o: defined in discarded section BROKEN_sparc64= does not configure diff --git a/devel/d-feet/Makefile b/devel/d-feet/Makefile index 84dc8a95a0528..a008795ae88ed 100644 --- a/devel/d-feet/Makefile +++ b/devel/d-feet/Makefile @@ -15,8 +15,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= itstool:textproc/itstool NO_ARCH= yes -USES= gettext gmake gnome perl5 pkgconfig python:2.7+ tar:xz +USES= gettext gmake gnome perl5 pkgconfig python tar:xz USE_GNOME= gtk30 intlhack introspection:build libxml2:build libwnck3 +USE_PYTHON= py3kplist GNU_CONFIGURE= yes USE_PERL5= build INSTALLS_ICONS= yes diff --git a/devel/devtodo/Makefile b/devel/devtodo/Makefile index 9e5d15902f032..4c91633f8036c 100644 --- a/devel/devtodo/Makefile +++ b/devel/devtodo/Makefile @@ -10,7 +10,7 @@ MASTER_SITES= http://swapoff.org/files/devtodo/ MAINTAINER= ports@FreeBSD.org COMMENT= Tool to effectively maintain todo lists aimed at developers -CONFLICTS= tdl-[0-9]* todo-[0-9]* +CONFLICTS_INSTALL= deforaos-todo tdl todo GNU_CONFIGURE= yes USES= ncurses readline diff --git a/devel/elixir-gettext/Makefile b/devel/elixir-gettext/Makefile index dfc3864c281fc..e55d0c3ed7359 100644 --- a/devel/elixir-gettext/Makefile +++ b/devel/elixir-gettext/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gettext -PORTVERSION= 0.13.1 +PORTVERSION= 0.14.0 DISTVERSIONPREFIX= v CATEGORIES= devel PKGNAMEPREFIX= elixir- diff --git a/devel/elixir-gettext/distinfo b/devel/elixir-gettext/distinfo index dd382d6334a41..a5bd88982ba2e 100644 --- a/devel/elixir-gettext/distinfo +++ b/devel/elixir-gettext/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1485794497 -SHA256 (elixir-lang-gettext-v0.13.1_GH0.tar.gz) = c9e47f3f0ee0e0fef25eddccf7b6d3a7796343e0744a5d43acb50f071b1ab426 -SIZE (elixir-lang-gettext-v0.13.1_GH0.tar.gz) = 56840 +TIMESTAMP = 1512981695 +SHA256 (elixir-lang-gettext-v0.14.0_GH0.tar.gz) = 5ba7d911eeced48617d515404b2bb382d453cf6f1a0fffa4a0a2f112850e8883 +SIZE (elixir-lang-gettext-v0.14.0_GH0.tar.gz) = 60791 diff --git a/devel/evolution-gconf-tools/Makefile b/devel/evolution-gconf-tools/Makefile index 4c36394d0169a..abd8f97711f2a 100644 --- a/devel/evolution-gconf-tools/Makefile +++ b/devel/evolution-gconf-tools/Makefile @@ -14,7 +14,7 @@ COMMENT= Scripts to make it easier to work with Evolution's configuration RUN_DEPENDS= evolution:mail/evolution GNU_CONFIGURE= yes -USES= python +USES= python:2.7 USE_GNOME= gnomeprefix NO_ARCH= yes diff --git a/devel/fb303/Makefile b/devel/fb303/Makefile index 9ae476dd730e7..3ba50287559f7 100644 --- a/devel/fb303/Makefile +++ b/devel/fb303/Makefile @@ -22,7 +22,7 @@ AUTOMAKE_ARGS= -a CONFIGURE_ARGS= PY_PREFIX="${PREFIX}" USE_AUTOTOOLS= autoconf autoheader:env aclocal automake -USES= compiler gmake perl5 python +USES= compiler gmake perl5 python:2.7 USE_PERL5= run WRKSRC= ${WRKDIR}/${DISTNAME}/contrib/fb303 diff --git a/devel/flang/Makefile b/devel/flang/Makefile index d0654d5c3ac3c..3f27ff8738f05 100644 --- a/devel/flang/Makefile +++ b/devel/flang/Makefile @@ -3,7 +3,7 @@ PORTNAME= flang DISTVERSION= 5.0-20171019 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= jmd@FreeBSD.org diff --git a/devel/flang/files/flang.in b/devel/flang/files/flang.in index a1428ef64fbac..39d67e8c85ffd 100644 --- a/devel/flang/files/flang.in +++ b/devel/flang/files/flang.in @@ -1,2 +1,10 @@ #!/bin/sh -%%PREFIX%%/flang/bin/flang -L%%PREFIX%%/flang/lib -lflang -lflangmain -lflangrti -lompstub -lexecinfo -I%%PREFIX%%/flang/include $@ +FLANG_CFS="-I%%PREFIX%%/flang/include" +FLANG_LFS="-L%%PREFIX%%/flang/lib -lflang -lflangmain -lflangrti -lompstub -lexecinfo" +for arg in $@; do + case "$arg" in + -c|-E) FLANG_LFS="";; + esac +done + +exec %%PREFIX%%/flang/bin/flang $FLANG_LFS $FLANG_CFS $@ diff --git a/devel/geany-plugin-geanypy/Makefile b/devel/geany-plugin-geanypy/Makefile index c49da08161ae6..7519e9fddffb6 100644 --- a/devel/geany-plugin-geanypy/Makefile +++ b/devel/geany-plugin-geanypy/Makefile @@ -7,7 +7,7 @@ CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -USES= python +USES= python:2.7 USE_GNOME= pygtk2 .include "${.CURDIR}/../geany-plugins/files/Makefile.common" diff --git a/devel/git-bzr-ng/Makefile b/devel/git-bzr-ng/Makefile index 6174f6438ba4c..1f773596d9808 100644 --- a/devel/git-bzr-ng/Makefile +++ b/devel/git-bzr-ng/Makefile @@ -20,7 +20,7 @@ USE_GITHUB= yes GH_ACCOUNT= termie GH_TAGNAME= 9878a30 -USES= python:2,run shebangfix +USES= python:2.7,run shebangfix SHEBANG_FILES= git-bzr NO_BUILD= yes NO_ARCH= yes diff --git a/devel/git/Makefile b/devel/git/Makefile index 92bf97a571dea..805ab5baeae31 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -15,6 +15,7 @@ MAINTAINER= garga@FreeBSD.org COMMENT?= Distributed source code management tool LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING CONFLICTS_INSTALL?= git-gui-[0-9]* git-subversion-[0-9]* git-lite-[0-9]* diff --git a/devel/git/pkg-descr b/devel/git/pkg-descr index 72f52b9f5e102..66cae1bd93e50 100644 --- a/devel/git/pkg-descr +++ b/devel/git/pkg-descr @@ -1,4 +1,4 @@ Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency. -WWW: http://git-scm.com/ +WWW: https://git-scm.com/ diff --git a/devel/gitinspector/Makefile b/devel/gitinspector/Makefile index b24d1e4c67f55..405582d6e1dbb 100644 --- a/devel/gitinspector/Makefile +++ b/devel/gitinspector/Makefile @@ -5,6 +5,7 @@ PORTVERSION= 0.4.4 DISTVERSIONPREFIX= v PORTREVISION= 1 CATEGORIES= devel python +PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Statistical analysis tool for git repositories @@ -15,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= git:devel/git NO_ARCH= yes -USE_PYTHON= autoplist distutils concurrent optsuffix +USE_PYTHON= autoplist concurrent distutils USES= python GH_ACCOUNT= ejwa diff --git a/devel/global/Makefile b/devel/global/Makefile index d8e3e170d877c..16c1398f26c2e 100644 --- a/devel/global/Makefile +++ b/devel/global/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= global -PORTVERSION= 6.5.7 +PORTVERSION= 6.6 CATEGORIES= devel MASTER_SITES= GNU @@ -17,10 +17,12 @@ OPTIONS_DEFINE= DOCS GNU_CONFIGURE= yes INSTALL_TARGET= install-strip TEST_TARGET= check -USES= libtool ncurses perl5 +USES= libtool ncurses perl5 shebangfix INFO= global -PORTDOCS= AUTHORS COPYING ChangeLog FAQ INSTALL LICENSE NEWS README THANKS +PORTDOCS= AUTHORS ChangeLog FAQ INSTALL LICENSE NEWS README THANKS + +SHEBANG_GLOB= *.pl post-patch: @${REINPLACE_CMD} -e '/^gtags_DATA = / s|AUTHOR.*THANKS||' ${WRKSRC}/Makefile.in diff --git a/devel/global/distinfo b/devel/global/distinfo index f905bdae2bfe0..69cfd954a81fb 100644 --- a/devel/global/distinfo +++ b/devel/global/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1495546317 -SHA256 (global-6.5.7.tar.gz) = d9c08fa524f9499b54241cb2d72f8a7df01453b6d5e012a63784ded08e3acd32 -SIZE (global-6.5.7.tar.gz) = 2940567 +TIMESTAMP = 1513175151 +SHA256 (global-6.6.tar.gz) = 87a86ea972429e2c983f8359e91ce64facccdc76215ef5225c0baf3f6f087527 +SIZE (global-6.6.tar.gz) = 2961446 diff --git a/devel/global/pkg-plist b/devel/global/pkg-plist index dd8cf34aa0dea..b6fc1ab522bf6 100644 --- a/devel/global/pkg-plist +++ b/devel/global/pkg-plist @@ -85,6 +85,7 @@ share/gtags/script/global-client share/gtags/script/gtags-client share/gtags/script/htags-client share/gtags/script/less-global +share/gtags/script/maps2conf.pl share/gtags/script/pygments_parser.py share/gtags/style.css share/gtags/vim74-gtags-cscope.patch diff --git a/devel/go-godef/Makefile b/devel/go-godef/Makefile new file mode 100644 index 0000000000000..0152dacf6a8c3 --- /dev/null +++ b/devel/go-godef/Makefile @@ -0,0 +1,24 @@ +# Created by: Richard Gallamore +# $FreeBSD$ + +PORTNAME= godef +PORTVERSION= g20170920 +CATEGORIES= devel +PKGNAMEPREFIX= go- + +MAINTAINER= ultima@FreeBSD.org +COMMENT= Print where symbols are defined in Go source code + +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE + +USES= go +USE_GITHUB= yes +GH_ACCOUNT= rogpeppe +GH_TAGNAME= b692db1de + +GO_PKGNAME= github.com/rogpeppe/godef + +PLIST_FILES= bin/${PORTNAME} + +.include diff --git a/devel/go-godef/distinfo b/devel/go-godef/distinfo new file mode 100644 index 0000000000000..966c047b9fe51 --- /dev/null +++ b/devel/go-godef/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1513067461 +SHA256 (rogpeppe-godef-g20170920-b692db1de_GH0.tar.gz) = d92fd71707e3192f2bc31dc5275e32fda37ce69695cb9b29c0c061e8d5f3781a +SIZE (rogpeppe-godef-g20170920-b692db1de_GH0.tar.gz) = 132179 diff --git a/devel/go-godef/pkg-descr b/devel/go-godef/pkg-descr new file mode 100644 index 0000000000000..a067c43086f2e --- /dev/null +++ b/devel/go-godef/pkg-descr @@ -0,0 +1,11 @@ +Godef - find symbol information in Go source + +Godef, given an expression or a location in a source file, prints +the location of the definition of the symbol referred to. + +Known limitations: + +- it does not understand about "." imports +- it does not deal well with definitions in tests. + +WWW: https://github.com/rogpeppe/godef diff --git a/devel/grpc/Makefile b/devel/grpc/Makefile index 44fa4e824f36d..5e6b3d53ddfca 100644 --- a/devel/grpc/Makefile +++ b/devel/grpc/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= grpc -PORTVERSION= 1.7.3 +PORTVERSION= 1.8.1 DISTVERSIONPREFIX= v CATEGORIES= devel diff --git a/devel/grpc/distinfo b/devel/grpc/distinfo index 92af2ee551f12..363c01704bec9 100644 --- a/devel/grpc/distinfo +++ b/devel/grpc/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1512612110 -SHA256 (grpc-grpc-v1.7.3_GH0.tar.gz) = e31107f5ee6970525a2b48dd6392613a32d7eeb69c6151cde8f64272c179c866 -SIZE (grpc-grpc-v1.7.3_GH0.tar.gz) = 4728599 +TIMESTAMP = 1513345089 +SHA256 (grpc-grpc-v1.8.1_GH0.tar.gz) = ae34c8255ea0aa4f893b9b2cb9f02d8e13bd9d7f2a90d1c39d56a5d6143a9f44 +SIZE (grpc-grpc-v1.8.1_GH0.tar.gz) = 4636161 SHA256 (google-benchmark-v1.3.0_GH0.tar.gz) = f19559475a592cbd5ac48b61f6b9cedf87f0b6775d1443de54cfe8f53940b28d SIZE (google-benchmark-v1.3.0_GH0.tar.gz) = 105485 diff --git a/devel/grpc/files/patch-CMakeLists.txt b/devel/grpc/files/patch-CMakeLists.txt index 7339903003032..d5781d250739b 100644 --- a/devel/grpc/files/patch-CMakeLists.txt +++ b/devel/grpc/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2017-10-26 19:11:22 UTC +--- CMakeLists.txt.orig 2017-12-13 01:39:01 UTC +++ CMakeLists.txt @@ -144,7 +144,8 @@ if("${gRPC_CARES_PROVIDER}" STREQUAL "mo set(gRPC_INSTALL FALSE) @@ -10,39 +10,39 @@ if(TARGET c-ares::cares) set(_gRPC_CARES_LIBRARIES c-ares::cares) endif() -@@ -828,6 +829,7 @@ add_library(gpr - src/core/lib/support/tmpfile_windows.c - src/core/lib/support/wrap_memcpy.c +@@ -829,6 +830,7 @@ add_library(gpr + src/core/lib/support/tmpfile_windows.cc + src/core/lib/support/wrap_memcpy.cc ) +set_target_properties(gpr PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) if(WIN32 AND MSVC) set_target_properties(gpr PROPERTIES COMPILE_PDB_NAME "gpr" -@@ -1220,6 +1222,7 @@ add_library(grpc - src/core/ext/filters/workarounds/workaround_utils.c - src/core/plugin_registry/grpc_plugin_registry.c +@@ -1209,6 +1211,7 @@ add_library(grpc + src/core/ext/filters/workarounds/workaround_utils.cc + src/core/plugin_registry/grpc_plugin_registry.cc ) +set_target_properties(grpc PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) if(WIN32 AND MSVC) set_target_properties(grpc PROPERTIES COMPILE_PDB_NAME "grpc" -@@ -1533,6 +1536,7 @@ add_library(grpc_cronet - src/core/ext/filters/load_reporting/server_load_reporting_plugin.c - src/core/plugin_registry/grpc_cronet_plugin_registry.c +@@ -1523,6 +1526,7 @@ add_library(grpc_cronet + src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc + src/core/plugin_registry/grpc_cronet_plugin_registry.cc ) +set_target_properties(grpc_cronet PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) if(WIN32 AND MSVC) set_target_properties(grpc_cronet PROPERTIES COMPILE_PDB_NAME "grpc_cronet" -@@ -2383,6 +2387,7 @@ add_library(grpc_unsecure - src/core/ext/filters/workarounds/workaround_utils.c - src/core/plugin_registry/grpc_unsecure_plugin_registry.c +@@ -2390,6 +2394,7 @@ target_include_directories(grpc_unsecure + PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/third_party/cares/cares + PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/third_party/gflags/include ) +set_target_properties(grpc_unsecure PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - if(WIN32 AND MSVC) - set_target_properties(grpc_unsecure PROPERTIES COMPILE_PDB_NAME "grpc_unsecure" -@@ -2598,6 +2603,7 @@ add_library(grpc++ + target_link_libraries(grpc_unsecure + ${_gRPC_BASELIB_LIBRARIES} +@@ -2580,6 +2585,7 @@ add_library(grpc++ src/cpp/util/time_cc.cc src/cpp/codegen/codegen_init.cc ) @@ -50,7 +50,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc++ PROPERTIES COMPILE_PDB_NAME "grpc++" -@@ -3097,6 +3103,7 @@ add_library(grpc++_cronet +@@ -3066,6 +3072,7 @@ add_library(grpc++_cronet third_party/nanopb/pb_decode.c third_party/nanopb/pb_encode.c ) @@ -58,7 +58,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc++_cronet PROPERTIES COMPILE_PDB_NAME "grpc++_cronet" -@@ -3297,6 +3304,7 @@ add_library(grpc++_error_details +@@ -3266,6 +3273,7 @@ add_library(grpc++_error_details ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/status/status.grpc.pb.h src/cpp/util/error_details.cc ) @@ -66,7 +66,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc++_error_details PROPERTIES COMPILE_PDB_NAME "grpc++_error_details" -@@ -3423,6 +3431,7 @@ add_library(grpc++_reflection +@@ -3392,6 +3400,7 @@ add_library(grpc++_reflection ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/reflection/v1alpha/reflection.pb.h ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h ) @@ -74,7 +74,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc++_reflection PROPERTIES COMPILE_PDB_NAME "grpc++_reflection" -@@ -3846,6 +3855,7 @@ add_library(grpc++_unsecure +@@ -3815,6 +3824,7 @@ add_library(grpc++_unsecure src/cpp/util/time_cc.cc src/cpp/codegen/codegen_init.cc ) @@ -82,7 +82,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc++_unsecure PROPERTIES COMPILE_PDB_NAME "grpc++_unsecure" -@@ -4159,6 +4169,7 @@ add_library(grpc_plugin_support +@@ -4128,6 +4138,7 @@ add_library(grpc_plugin_support src/compiler/python_generator.cc src/compiler/ruby_generator.cc ) @@ -90,7 +90,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc_plugin_support PROPERTIES COMPILE_PDB_NAME "grpc_plugin_support" -@@ -4668,6 +4679,7 @@ endif (gRPC_BUILD_TESTS) +@@ -4637,6 +4648,7 @@ endif (gRPC_BUILD_TESTS) add_library(grpc_csharp_ext SHARED src/csharp/ext/grpc_csharp_ext.c ) @@ -98,7 +98,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc_csharp_ext PROPERTIES COMPILE_PDB_NAME "grpc_csharp_ext" -@@ -10740,7 +10752,6 @@ add_executable(grpc_cpp_plugin +@@ -10696,7 +10708,6 @@ add_executable(grpc_cpp_plugin src/compiler/cpp_plugin.cc ) diff --git a/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.c b/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.c deleted file mode 100644 index e48772d04b33e..0000000000000 --- a/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/core/lib/security/credentials/jwt/jwt_verifier.c.orig 2017-10-26 19:11:22 UTC -+++ src/core/lib/security/credentials/jwt/jwt_verifier.c -@@ -462,7 +462,7 @@ static BIGNUM *bignum_from_base64(grpc_e - return result; - } - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - - // Provide compatibility across OpenSSL 1.02 and 1.1. - static int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) { diff --git a/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.cc b/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.cc new file mode 100644 index 0000000000000..e99c3f8f4a7e4 --- /dev/null +++ b/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.cc @@ -0,0 +1,11 @@ +--- src/core/lib/security/credentials/jwt/jwt_verifier.cc.orig 2017-12-13 01:39:01 UTC ++++ src/core/lib/security/credentials/jwt/jwt_verifier.cc +@@ -466,7 +466,7 @@ static BIGNUM* bignum_from_base64(grpc_e + return result; + } + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + + // Provide compatibility across OpenSSL 1.02 and 1.1. + static int RSA_set0_key(RSA* r, BIGNUM* n, BIGNUM* e, BIGNUM* d) { diff --git a/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.c b/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.cc similarity index 74% rename from devel/grpc/files/patch-src_core_tsi_ssl__transport__security.c rename to devel/grpc/files/patch-src_core_tsi_ssl__transport__security.cc index 7374bdbe0bbff..e97fe356d668d 100644 --- a/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.c +++ b/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.cc @@ -1,14 +1,15 @@ ---- src/core/tsi/ssl_transport_security.c.orig 2017-10-26 19:11:22 UTC -+++ src/core/tsi/ssl_transport_security.c -@@ -20,6 +20,7 @@ +--- src/core/tsi/ssl_transport_security.cc.orig 2017-12-13 01:39:01 UTC ++++ src/core/tsi/ssl_transport_security.cc +@@ -19,7 +19,7 @@ + #include "src/core/tsi/ssl_transport_security.h" #include - +- +#include #include #include -@@ -54,11 +55,10 @@ +@@ -56,11 +56,10 @@ extern "C" { #define TSI_SSL_MAX_PROTECTED_FRAME_SIZE_UPPER_BOUND 16384 #define TSI_SSL_MAX_PROTECTED_FRAME_SIZE_LOWER_BOUND 1024 diff --git a/devel/gtkparasite/Makefile b/devel/gtkparasite/Makefile index bb6b6c2ef95ca..a7007bae44ad4 100644 --- a/devel/gtkparasite/Makefile +++ b/devel/gtkparasite/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-static INSTALL_TARGET= install-strip -USES= autoreconf libtool pkgconfig python +USES= autoreconf libtool pkgconfig python:2.7 USE_GNOME= gtk20 pygtk2 WRKSRC= ${WRKDIR}/chipx86-gtkparasite-a3d862d4a91ea27222e4273a6797f3e47efe6e83 PORTDOCS= USAGE diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile index 9aa74363635f4..f18c7669f2e48 100644 --- a/devel/gtranslator/Makefile +++ b/devel/gtranslator/Makefile @@ -24,6 +24,7 @@ USE_GNOME= intlhack gnomeprefix gtk30 libgda5 gtksourceview3 libxml2 \ introspection:build USES= desktop-file-utils gettext gmake libtool pathfix \ pkgconfig python tar:xz +USE_PYTHON= py3kplist GNU_CONFIGURE= yes USE_LDCONFIG= yes INSTALLS_ICONS= yes diff --git a/devel/horde-whups/Makefile b/devel/horde-whups/Makefile index 44190bb9a72a1..b230ff0a2a597 100644 --- a/devel/horde-whups/Makefile +++ b/devel/horde-whups/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= whups -PORTVERSION= 3.0.11 +DISTVERSION= 3.0.12 CATEGORIES= devel www pear PKGNAMEPREFIX= horde- diff --git a/devel/horde-whups/distinfo b/devel/horde-whups/distinfo index f08b41a0d5248..870d1170bc69b 100644 --- a/devel/horde-whups/distinfo +++ b/devel/horde-whups/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1501701715 -SHA256 (Horde/whups-3.0.11.tgz) = e60078cf5d0fe4d882d5660e88446fb6fc89ac85f1b81fd24ddf4a17d7071413 -SIZE (Horde/whups-3.0.11.tgz) = 1309919 +TIMESTAMP = 1512587773 +SHA256 (Horde/whups-3.0.12.tgz) = a941d61606aba0a6cd3a735b3faba1dcdd364bef82c14b317e02df7f2fa82cf9 +SIZE (Horde/whups-3.0.12.tgz) = 1309833 diff --git a/devel/icu/Makefile b/devel/icu/Makefile index 183be04da624d..30b0f76bebee2 100644 --- a/devel/icu/Makefile +++ b/devel/icu/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= icu -DISTVERSION= 60_1 +DISTVERSION= 60_2 PORTREVISION?= 1 # keep for icu-lx PORTEPOCH?= 1 CATEGORIES?= devel diff --git a/devel/icu/distinfo b/devel/icu/distinfo index addd07e70fda7..cc7ff738cbc4b 100644 --- a/devel/icu/distinfo +++ b/devel/icu/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1509477637 -SHA256 (icu4c-60_1-src.tgz) = f8f5a6c8fbf32c015a467972bdb1477dc5f5d5dfea908b6ed218715eeb5ee225 -SIZE (icu4c-60_1-src.tgz) = 23296064 +TIMESTAMP = 1513196484 +SHA256 (icu4c-60_2-src.tgz) = f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418 +SIZE (icu4c-60_2-src.tgz) = 23317835 diff --git a/devel/icu/files/patch-r40667 b/devel/icu/files/patch-r40667 deleted file mode 100644 index 9bc9b6b837a6d..0000000000000 --- a/devel/icu/files/patch-r40667 +++ /dev/null @@ -1,385 +0,0 @@ -https://ssl.icu-project.org/trac/ticket/13462 - ---- common/uchar_props_data.h.orig 2017-10-11 16:24:34 UTC -+++ common/uchar_props_data.h -@@ -1362,7 +1362,7 @@ static const uint16_t propsVectorsTrie_index[29236]={ - 0x79f,0x7a5,0x7ad,0x7b5,0x7bd,0x7c3,0x7cb,0x7d3,0x7db,0x7e1,0x7e9,0x7f1,0x7f9,0x801,0x809,0x810, - 0x818,0x81e,0x826,0x82e,0x836,0x83c,0x844,0x84c,0x854,0x122d,0x85c,0x864,0x86c,0x873,0x87b,0x883, - 0x88b,0x88f,0x897,0x89e,0x8a6,0x8ae,0x8b6,0x8be,0x153d,0x1545,0x8c6,0x8ce,0x8d6,0x8de,0x8e6,0x8ed, --0x15a3,0x1593,0x159b,0x1879,0x1881,0x123d,0x8f5,0x1235,0x147f,0x147f,0x1481,0x1251,0x1252,0x1245,0x1247,0x1249, -+0x15a3,0x1593,0x159b,0x1879,0x1881,0x123d,0x8f5,0x1235,0x1487,0x1487,0x1489,0x1251,0x1252,0x1245,0x1247,0x1249, - 0x15ab,0x15ad,0x8fd,0x15ad,0x905,0x90a,0x912,0x15b2,0x918,0x15ad,0x91e,0x926,0xc18,0x15ba,0x15ba,0x92e, - 0x15ca,0x15cb,0x15cb,0x15cb,0x15cb,0x15cb,0x15cb,0x15cb,0x15cb,0x15cb,0x15cb,0x15cb,0x15cb,0x15cb,0x15cb,0x15cb, - 0x15cb,0x15cb,0x15cb,0x15c2,0x936,0x15d3,0x15d3,0x93e,0xb25,0xb2d,0xb35,0xb3d,0x15e3,0x15db,0x946,0x94e, -@@ -1378,7 +1378,7 @@ static const uint16_t propsVectorsTrie_index[29236]={ - 0x172a,0x172e,0x172e,0x1731,0x172e,0x172e,0x1737,0x172e,0x1777,0x1837,0x1891,0xb62,0xb68,0xb6e,0xb76,0xb7b, - 0x17d7,0xc28,0xc2c,0x184c,0x17c7,0x17c7,0x17c7,0xc00,0x17cf,0xc20,0x1817,0xc75,0xc08,0xc10,0xc10,0x18d5, - 0x1807,0x1899,0xc62,0xc65,0x9d2,0x160d,0x160d,0x9da,0x1615,0x1615,0x1615,0x1615,0x1615,0x1615,0x9e2,0x6d4, --0x1489,0x1491,0x9ea,0x1499,0x9f2,0x14a1,0x14a9,0x14b1,0x9fa,0x9ff,0x14b9,0x14c0,0xa04,0xa0c,0x1827,0xbf0, -+0x146f,0x1491,0x9ea,0x1499,0x9f2,0x14a1,0x14a9,0x14b1,0x9fa,0x9ff,0x14b9,0x14c0,0xa04,0xa0c,0x1827,0xbf0, - 0xa14,0x1517,0x151e,0x14c8,0x1526,0x152d,0x14d0,0xa1c,0x14e9,0x14e9,0x14eb,0x14d8,0x14e0,0x14e0,0x14e1,0x1535, - 0x161d,0x161d,0x161d,0x161d,0x161d,0x161d,0x161d,0x161d,0x161d,0x161d,0x161d,0x161d,0x161d,0x161d,0x161d,0x161d, - 0x161d,0x161d,0x161d,0x161d,0x161d,0x161d,0x161d,0x161d,0x161d,0x161d,0x161d,0x161d,0x161d,0x161d,0x161d,0x161d, -@@ -1481,7 +1481,7 @@ static const uint16_t propsVectorsTrie_index[29236]={ - 0x145a,0x145a,0x145a,0x145a,0x145a,0x145a,0x145a,0x145a,0x1502,0x1502,0x1502,0x1502,0x1502,0x1502,0x1502,0x1502, - 0x1507,0x150f,0x173f,0x11d2,0x181f,0x181f,0x11d6,0x11dd,0xa3c,0xa44,0xa4c,0x13c7,0x13ce,0x13d6,0xa54,0x13de, - 0x140f,0x140f,0x13b7,0x13bf,0x13e6,0x1406,0x1407,0x1417,0x13ee,0x13af,0xa5c,0x13f6,0xa64,0x13fe,0xa6c,0xa70, --0xc7d,0x141f,0xa78,0xa80,0x1427,0x142d,0x1432,0xa88,0xa98,0x146f,0x1477,0x1462,0x1467,0xaa0,0xaa8,0xa90, -+0xc7d,0x141f,0xa78,0xa80,0x1427,0x142d,0x1432,0xa88,0xa98,0x1477,0x147f,0x1462,0x1467,0xaa0,0xaa8,0xa90, - 0x154d,0x154d,0x154d,0x154d,0x154d,0x154d,0x154d,0x154d,0x154d,0x154d,0x154d,0x154d,0x154d,0x154d,0x154d,0x154d, - 0x154d,0x154d,0x154d,0x154d,0x154d,0x154d,0x154d,0x154d,0x154d,0x154d,0x154d,0x154d,0x1555,0x1555,0x1555,0x1555, - 0x1390,0x1390,0x13d0,0x1410,0x1450,0x1490,0x14d0,0x1510,0x154c,0x158c,0x15b8,0x15f8,0x1638,0x1678,0x16b8,0x16f8, -@@ -1661,19 +1661,19 @@ static const uint16_t propsVectorsTrie_index[29236]={ - 0x1c7c,0x1c7c,0x1c7c,0x1c7c,0x1c7c,0x1c7c,0x1c7c,0x1c7c,0x1c7c,0x1c7c,0x1c7c,0x1c7c,0x1c7c,0x1c7c,0x1c7c,0x1c7c, - 0x282,0x282,0x282,0x282,0x282,0x282,0x282,0x282,0x282,0x285,0x28e,0x288,0x288,0x28b,0x282,0x282, - 0x282,0x282,0x282,0x282,0x282,0x282,0x282,0x282,0x282,0x282,0x282,0x282,0x282,0x282,0x282,0x282, --0x7b0,0x7aa,0x78f,0x786,0x77d,0x77a,0x771,0x78c,0x777,0x783,0x786,0x7a1,0x798,0x789,0x7ad,0x780, --0x76e,0x76e,0x76e,0x76e,0x76e,0x76e,0x76e,0x76e,0x76e,0x76e,0x795,0x792,0x79b,0x79b,0x79b,0x7aa, --0x771,0x7bc,0x7bc,0x7bc,0x7bc,0x7bc,0x7bc,0x7b6,0x7b6,0x7b6,0x7b6,0x7b6,0x7b6,0x7b6,0x7b6,0x7b6, --0x7b6,0x7b6,0x7b6,0x7b6,0x7b6,0x7b6,0x7b6,0x7b6,0x7b6,0x7b6,0x7b6,0x777,0x77d,0x783,0x7a7,0x76b, --0x7a4,0x7b9,0x7b9,0x7b9,0x7b9,0x7b9,0x7b9,0x7b3,0x7b3,0x7b3,0x7b3,0x7b3,0x7b3,0x7b3,0x7b3,0x7b3, --0x7b3,0x7b3,0x7b3,0x7b3,0x7b3,0x7b3,0x7b3,0x7b3,0x7b3,0x7b3,0x7b3,0x777,0x79e,0x774,0x79b,0x282, -+0x7b3,0x7ad,0x792,0x789,0x780,0x77d,0x774,0x78f,0x77a,0x786,0x789,0x7a4,0x79b,0x78c,0x7b0,0x783, -+0x771,0x771,0x771,0x771,0x771,0x771,0x771,0x771,0x771,0x771,0x798,0x795,0x79e,0x79e,0x79e,0x7ad, -+0x774,0x7bf,0x7bf,0x7bf,0x7bf,0x7bf,0x7bf,0x7b9,0x7b9,0x7b9,0x7b9,0x7b9,0x7b9,0x7b9,0x7b9,0x7b9, -+0x7b9,0x7b9,0x7b9,0x7b9,0x7b9,0x7b9,0x7b9,0x7b9,0x7b9,0x7b9,0x7b9,0x77a,0x780,0x786,0x7aa,0x76e, -+0x7a7,0x7bc,0x7bc,0x7bc,0x7bc,0x7bc,0x7bc,0x7b6,0x7b6,0x7b6,0x7b6,0x7b6,0x7b6,0x7b6,0x7b6,0x7b6, -+0x7b6,0x7b6,0x7b6,0x7b6,0x7b6,0x7b6,0x7b6,0x7b6,0x7b6,0x7b6,0x7b6,0x77a,0x7a1,0x777,0x79e,0x282, - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, - 0x291,0x291,0x291,0x291,0x291,0x2a0,0x291,0x291,0x291,0x291,0x291,0x291,0x291,0x291,0x291,0x291, - 0x291,0x291,0x291,0x291,0x291,0x291,0x291,0x291,0x291,0x291,0x291,0x291,0x291,0x291,0x291,0x291, --0x294,0x609,0x7c5,0x7c8,0x60f,0x7c8,0x7c2,0x606,0x5fd,0x29a,0x61b,0x29d,0x7cb,0x5f4,0x612,0x7bf, -+0x294,0x609,0x7c8,0x7cb,0x60f,0x7cb,0x7c5,0x606,0x5fd,0x29a,0x61b,0x29d,0x7ce,0x5f4,0x612,0x7c2, - 0x60c,0x618,0x5fa,0x5fa,0x600,0x297,0x606,0x603,0x5fd,0x5fa,0x61b,0x29d,0x5f7,0x5f7,0x5f7,0x609, - 0x2a6,0x2a6,0x2a6,0x2a6,0x2a6,0x2a6,0x624,0x2a6,0x2a6,0x2a6,0x2a6,0x2a6,0x2a6,0x2a6,0x2a6,0x2a6, - 0x624,0x2a6,0x2a6,0x2a6,0x2a6,0x2a6,0x2a6,0x615,0x624,0x2a6,0x2a6,0x2a6,0x2a6,0x2a6,0x624,0x61e, -@@ -1748,7 +1748,7 @@ static const uint16_t propsVectorsTrie_index[29236]={ - 0x333,0x333,0x333,0x333,0x333,0x333,0x333,0x333,0x333,0x333,0x333,0x333,0x333,0x333,0x333,0xc, - 0xc,0x336,0x327,0x327,0x327,0x32a,0x327,0x327,0xc,0x32d,0x32d,0x32d,0x32d,0x32d,0x32d,0x32d, - 0x32d,0x32d,0x32d,0x32d,0x32d,0x32d,0x32d,0x32d,0x32d,0x32d,0x32d,0x32d,0x32d,0x32d,0x32d,0x32d, --0x32d,0x32d,0x32d,0x32d,0x32d,0x32d,0x32d,0x32d,0x32d,0x32d,0x32d,0x330,0xc,0x870,0x9c6,0xc, -+0x32d,0x32d,0x32d,0x32d,0x32d,0x32d,0x32d,0x32d,0x32d,0x32d,0x32d,0x330,0xc,0x87c,0x9c6,0xc, - 0xc,0x14a9,0x14a9,0x13c2,0xf,0x936,0x936,0x936,0x936,0x936,0x936,0x936,0x936,0x936,0x936,0x936, - 0x936,0x936,0x936,0x936,0x936,0x936,0xd6e,0x936,0x936,0x936,0x936,0x936,0x936,0x936,0x936,0x936, - 0x936,0x936,0x936,0x936,0x339,0x339,0x339,0x339,0x339,0x339,0x339,0x339,0x339,0x339,0xeb2,0x339, -@@ -1757,10 +1757,10 @@ static const uint16_t propsVectorsTrie_index[29236]={ - 0x34b,0x34b,0x34b,0x34b,0x34b,0x34b,0x34b,0x34b,0x34b,0x34b,0x34b,0x34b,0x34b,0x34b,0x34b,0xf, - 0xf,0xf,0xf,0xf,0x34b,0x34b,0x34b,0x342,0x33f,0xf,0xf,0xf,0xf,0xf,0xf,0xf, - 0xf,0xf,0xf,0xf,0xc87,0xc87,0xc87,0xc87,0x13c5,0x14ac,0xf5a,0xf5a,0xf5a,0xf57,0xf57,0xd7d, --0x876,0xc81,0xc7e,0xc7e,0xc75,0xc75,0xc75,0xc75,0xc75,0xc75,0xf54,0xf54,0xf54,0xf54,0xf54,0x873, --0x14a3,0x12,0xd7a,0x879,0x12d5,0x366,0x369,0x369,0x369,0x369,0x369,0x366,0x366,0x366,0x366,0x366, -+0x882,0xc81,0xc7e,0xc7e,0xc75,0xc75,0xc75,0xc75,0xc75,0xc75,0xf54,0xf54,0xf54,0xf54,0xf54,0x87f, -+0x14a3,0x12,0xd7a,0x885,0x12d5,0x366,0x369,0x369,0x369,0x369,0x369,0x366,0x366,0x366,0x366,0x366, - 0x366,0x366,0x366,0x366,0x366,0x366,0x366,0x366,0x366,0x366,0x366,0x366,0x366,0x366,0x366,0xf5d, --0xf5d,0xf5d,0xf5d,0xf5d,0x87c,0x366,0x366,0x366,0x366,0x366,0x366,0x366,0x366,0x366,0x366,0x8fd, -+0xf5d,0xf5d,0xf5d,0xf5d,0x888,0x366,0x366,0x366,0x366,0x366,0x366,0x366,0x366,0x366,0x366,0x8fd, - 0x8fd,0x8fd,0x8fd,0x8fd,0x8fd,0x8fd,0x8fd,0xb10,0xb10,0xb10,0xc75,0xc7b,0xc78,0xd77,0xd77,0xd77, - 0xd77,0xd77,0xd77,0x12d2,0x918,0x918,0x918,0x918,0x918,0x918,0x918,0x918,0x918,0x918,0x360,0x35d, - 0x35a,0x357,0xb73,0xb73,0x8fa,0x366,0x366,0x372,0x366,0x36c,0x36c,0x36c,0x36c,0x366,0x366,0x366, -@@ -1988,21 +1988,21 @@ static const uint16_t propsVectorsTrie_index[29236]={ - 0xae3,0xae3,0xae3,0xae3,0xae3,0xae3,0xae3,0xae3,0xae3,0xae3,0xae3,0xae6,0x6c,0x6c,0x6c,0x6c, - 0x6c,0x6c,0x6c,0x6c,0x6c,0x6c,0x6c,0x6c,0xae9,0xae9,0xae9,0xae9,0xae9,0xae9,0xae9,0xae9, - 0xae9,0xae9,0xae9,0xae9,0xae9,0xae9,0xae9,0xae9,0xae9,0xae9,0xae9,0xae9,0xae9,0xae9,0x6f,0x6f, --0x6f,0x6f,0x6f,0x6f,0x6f,0x6f,0x6f,0x6f,0x75,0x7ef,0x7e9,0x7ef,0x7e9,0x7ef,0x7e9,0x7ef, --0x7e9,0x7ef,0x7e9,0x7e9,0x7ec,0x7e9,0x7ec,0x7e9,0x7ec,0x7e9,0x7ec,0x7e9,0x7ec,0x7e9,0x7ec,0x7e9, --0x7ec,0x7e9,0x7ec,0x7e9,0x7ec,0x7e9,0x7ec,0x7e9,0x7e9,0x7e9,0x7e9,0x7ef,0x7e9,0x7ef,0x7e9,0x7ef, --0x7e9,0x7e9,0x7e9,0x7e9,0x7e9,0x7e9,0x7ef,0x7e9,0x7e9,0x7e9,0x7e9,0x7e9,0x7ec,0xc3f,0xc3f,0x75, --0x75,0x90f,0x90f,0x8d9,0x8d9,0x7f2,0x7f5,0xc3c,0x78,0x78,0x78,0x78,0x78,0x807,0x807,0x807, --0x807,0x807,0x807,0x807,0x807,0x807,0x807,0x807,0x807,0x807,0x807,0x807,0x807,0x807,0x807,0x807, --0x807,0x807,0x807,0x807,0x807,0x807,0x807,0x807,0x807,0x10e6,0x18c3,0x78,0x7b,0x80a,0x80a,0x80a, --0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x7b, -+0x6f,0x6f,0x6f,0x6f,0x6f,0x6f,0x6f,0x6f,0x75,0x7fb,0x7f5,0x7fb,0x7f5,0x7fb,0x7f5,0x7fb, -+0x7f5,0x7fb,0x7f5,0x7f5,0x7f8,0x7f5,0x7f8,0x7f5,0x7f8,0x7f5,0x7f8,0x7f5,0x7f8,0x7f5,0x7f8,0x7f5, -+0x7f8,0x7f5,0x7f8,0x7f5,0x7f8,0x7f5,0x7f8,0x7f5,0x7f5,0x7f5,0x7f5,0x7fb,0x7f5,0x7fb,0x7f5,0x7fb, -+0x7f5,0x7f5,0x7f5,0x7f5,0x7f5,0x7f5,0x7fb,0x7f5,0x7f5,0x7f5,0x7f5,0x7f5,0x7f8,0xc3f,0xc3f,0x75, -+0x75,0x90f,0x90f,0x8d9,0x8d9,0x7fe,0x801,0xc3c,0x78,0x78,0x78,0x78,0x78,0x813,0x813,0x813, -+0x813,0x813,0x813,0x813,0x813,0x813,0x813,0x813,0x813,0x813,0x813,0x813,0x813,0x813,0x813,0x813, -+0x813,0x813,0x813,0x813,0x813,0x813,0x813,0x813,0x813,0x10e6,0x18c3,0x78,0x7b,0x816,0x816,0x816, -+0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x7b, - 0x8e2,0x8e2,0x8e5,0x8e5,0x8e5,0x8e5,0x8e5,0x8e5,0x8e5,0x8e5,0x8e5,0x8e5,0x8e5,0x8e5,0x8e5,0x8e5, - 0xaf5,0xaf5,0xaf5,0xaf5,0xaf5,0xaf5,0xaf5,0xaf5,0xaf5,0xaf5,0xaf5,0xaf5,0xaf5,0xaf5,0xaf5,0xaf5, - 0xaf5,0xaf5,0xaf5,0xaf5,0xaf5,0xaf5,0xaf5,0xaf5,0x1389,0x1389,0x1389,0x7e,0x7e,0x7e,0x7e,0x7e, --0x813,0x813,0x813,0x813,0x813,0x813,0x813,0x813,0x813,0x813,0x813,0x813,0x813,0x813,0x813,0x813, --0x813,0x813,0x813,0x813,0x813,0x813,0x813,0x813,0x813,0x813,0x813,0x813,0x813,0xd41,0xd41,0x81, --0x819,0x819,0x819,0x819,0x819,0x819,0x819,0x819,0x819,0x819,0x819,0x819,0x819,0x819,0x819,0x819, --0x819,0x819,0x819,0x819,0x819,0x819,0x819,0x819,0x819,0x819,0x819,0x819,0x819,0x819,0x819,0x81, -+0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f, -+0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0xd41,0xd41,0x81, -+0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825, -+0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x81, - 0xafb,0xafb,0xafb,0xafb,0xafb,0xafb,0xafb,0xafb,0xafb,0xafb,0xafb,0xafb,0xafb,0x84,0x84,0x84, - 0xb01,0xb01,0xb01,0xb01,0xb01,0xb01,0xb01,0xb01,0xb01,0xb01,0xb01,0xb01,0xb01,0xb01,0xb01,0xb01, - 0xb01,0xc48,0xb01,0xb01,0xb01,0xc48,0xb01,0x87,0x87,0x87,0x87,0x87,0x87,0x87,0x87,0x87, -@@ -2024,16 +2024,16 @@ static const uint16_t propsVectorsTrie_index[29236]={ - 0x5d0,0x5d0,0x5d0,0x5d3,0x5d3,0x5d3,0x5d0,0x5d0,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90, - 0xb1c,0xb1c,0xb1c,0xb1c,0xb1c,0xb1c,0xb1c,0xb1c,0xb1c,0xb1c,0xb1c,0xb1c,0xb1c,0xb1c,0xb1c,0xb1c, - 0x5d6,0x5d6,0x930,0x5d6,0x5d6,0x5d6,0x5d6,0x5d6,0x5d6,0x5d6,0x5cd,0x5cd,0xbd3,0xd59,0x90,0x90, --0x82b,0x83d,0x83a,0x83d,0x83a,0xc5d,0xc5d,0xd4d,0xd4a,0x82e,0x82e,0x82e,0x82e,0x840,0x840,0x840, --0x858,0x85b,0x86a,0x93,0x85e,0x861,0x86d,0x86d,0x855,0x84c,0x846,0x84c,0x846,0x84c,0x846,0x849, --0x849,0x864,0x864,0x867,0x864,0x864,0x864,0x93,0x864,0x852,0x84f,0x849,0x93,0x93,0x93,0x93, -+0x837,0x849,0x846,0x849,0x846,0xc5d,0xc5d,0xd4d,0xd4a,0x83a,0x83a,0x83a,0x83a,0x84c,0x84c,0x84c, -+0x864,0x867,0x876,0x93,0x86a,0x86d,0x879,0x879,0x861,0x858,0x852,0x858,0x852,0x858,0x852,0x855, -+0x855,0x870,0x870,0x873,0x870,0x870,0x870,0x93,0x870,0x85e,0x85b,0x855,0x93,0x93,0x93,0x93, - 0x5e2,0x5ee,0x5e2,0xbd6,0x5e2,0x96,0x5e2,0x5ee,0x5e2,0x5ee,0x5e2,0x5ee,0x5e2,0x5ee,0x5e2,0x5ee, - 0x5ee,0x5eb,0x5e5,0x5e8,0x5ee,0x5eb,0x5e5,0x5e8,0x5ee,0x5eb,0x5e5,0x5e8,0x5ee,0x5eb,0x5e5,0x5eb, - 0x5e5,0x5eb,0x5e5,0x5e8,0x5ee,0x5eb,0x5e5,0x5eb,0x5e5,0x5eb,0x5e5,0x5eb,0x5e5,0x96,0x96,0x5df, --0x732,0x735,0x74a,0x74d,0x72c,0x735,0x735,0x9c,0x717,0x71a,0x71a,0x71a,0x71a,0x717,0x717,0x9c, -+0x735,0x738,0x74d,0x750,0x72f,0x738,0x738,0x9c,0x717,0x71a,0x71a,0x71a,0x71a,0x717,0x717,0x9c, - 0x99,0x99,0x99,0x99,0x99,0x99,0x99,0x99,0x99,0xad7,0xad7,0xad7,0x996,0x711,0x5f1,0x5f1, --0x9c,0x75c,0x73b,0x72c,0x735,0x732,0x72c,0x73e,0x72f,0x729,0x72c,0x74a,0x741,0x738,0x759,0x72c, --0x756,0x756,0x756,0x756,0x756,0x756,0x756,0x756,0x756,0x756,0x747,0x744,0x74a,0x74a,0x74a,0x75c, -+0x9c,0x75f,0x73e,0x72f,0x738,0x735,0x72f,0x741,0x732,0x72c,0x72f,0x74d,0x744,0x73b,0x75c,0x72f, -+0x759,0x759,0x759,0x759,0x759,0x759,0x759,0x759,0x759,0x759,0x74a,0x747,0x74d,0x74d,0x74d,0x75f, - 0x720,0x71d,0x71d,0x71d,0x71d,0x71d,0x71d,0x71d,0x71d,0x71d,0x71d,0x71d,0x71d,0x71d,0x71d,0x71d, - 0x71d,0x71d,0x71d,0x71d,0x71d,0x71d,0x71d,0x71d,0x71d,0x71d,0x71d,0x71d,0x71d,0x71d,0x71d,0x9c, - 0x9c,0x9c,0x71d,0x71d,0x71d,0x71d,0x71d,0x71d,0x9c,0x9c,0x71d,0x71d,0x71d,0x71d,0x71d,0x71d, -@@ -2513,14 +2513,14 @@ static const uint16_t propsVectorsTrie_index[29236]={ - 0x387,0x387,0x387,0x387,0x387,0x387,0x387,0x387,0x387,0x387,0x387,0x387,0x387,0x387,0x387,0x387, - 0x387,0x387,0x387,0x387,0x384,0x378,0x378,0x378,0x378,0x378,0x378,0x378,0x378,0x384,0x384,0x384, - 0x384,0x37e,0x1104,0x12db,0x387,0x900,0x903,0x37b,0x37b,0x1101,0x12d8,0x12d8,0x38a,0x38a,0x38a,0x38a, --0x38a,0x38a,0x38a,0x38a,0x387,0x387,0x378,0x378,0x87f,0x882,0x91b,0x91b,0x91b,0x91b,0x91b,0x91b, -+0x38a,0x38a,0x38a,0x38a,0x387,0x387,0x378,0x378,0x88b,0x88e,0x91b,0x91b,0x91b,0x91b,0x91b,0x91b, - 0x91b,0x91b,0x91b,0x91b,0x381,0xf63,0xf60,0x12de,0x12de,0x12de,0x12de,0x12de,0x14af,0x1107,0x1107,0xeb5, - 0xeb5,0xd80,0xeb5,0xeb5,0x387,0x387,0x387,0x387,0x387,0x387,0x387,0x387,0x387,0x38a,0x387,0x387, - 0x387,0x387,0x387,0x387,0x387,0x38a,0x387,0x387,0x38a,0x387,0x387,0x387,0x387,0x387,0x12d8,0x12db, - 0x37b,0x387,0x384,0x384,0x429,0x429,0x429,0x429,0x429,0x429,0x429,0x429,0x429,0x12e4,0x429,0x429, - 0x429,0x429,0x429,0x429,0x429,0x429,0x429,0x429,0x429,0x429,0x429,0x429,0x429,0x429,0x12e4,0x1857, - 0x1857,0xf81,0x41a,0x423,0x465,0x465,0x465,0x465,0x465,0x465,0x465,0x465,0x465,0x465,0x465,0x465, --0x465,0x465,0x465,0x465,0x465,0x465,0x465,0x465,0x465,0x465,0x465,0xb79,0xb79,0xd8c,0xd8c,0x885, -+0x465,0x465,0x465,0x465,0x465,0x465,0x465,0x465,0x465,0x465,0x465,0xb79,0xb79,0xd8c,0xd8c,0x891, - 0xd8f,0x13ce,0x13ce,0x13ce,0x468,0x468,0x468,0x468,0x468,0x468,0x468,0x468,0x468,0x468,0x468,0x468, - 0x468,0x468,0x468,0x468,0x468,0x468,0x468,0x468,0x468,0x468,0x468,0x468,0x468,0x468,0x468,0x468, - 0x468,0x468,0x468,0x468,0x46e,0x46e,0x46e,0x111c,0x111c,0x111c,0x111c,0x111c,0x46b,0x46b,0x46b,0x46b, -@@ -2574,8 +2574,8 @@ static const uint16_t propsVectorsTrie_index[29236]={ - 0x546,0x546,0x546,0x546,0x546,0x546,0x549,0x549,0x549,0x549,0x546,0x54f,0x546,0x546,0xbb2,0xbb2, - 0xbb2,0xbb2,0xbb2,0xbb2,0xbb2,0xbb2,0xbb2,0xbb2,0xbb2,0xbb2,0xbb2,0xbb2,0x558,0xac5,0x558,0x558, - 0x558,0x558,0x558,0x558,0x564,0x561,0x564,0x561,0x558,0x558,0x558,0x558,0x558,0x558,0x6d2,0x558, --0x558,0x558,0x558,0x558,0x558,0x558,0x7d4,0x7d4,0x558,0x558,0x558,0x558,0x55e,0x55e,0x558,0x558, --0x558,0x558,0x558,0x558,0x55b,0x7da,0x7d7,0x558,0x558,0x558,0x558,0x558,0x558,0x558,0x558,0x558, -+0x558,0x558,0x558,0x558,0x558,0x558,0x7d7,0x7d7,0x558,0x558,0x558,0x558,0x55e,0x55e,0x558,0x558, -+0x558,0x558,0x558,0x558,0x55b,0x7dd,0x7da,0x558,0x558,0x558,0x558,0x558,0x558,0x558,0x558,0x558, - 0x558,0x558,0x558,0x558,0x558,0x558,0x558,0x558,0x558,0x558,0x558,0x558,0x558,0x558,0x558,0x558, - 0x558,0x558,0x558,0x558,0x558,0x558,0x558,0x558,0x558,0x558,0x558,0xac5,0xbb8,0xac5,0xac5,0xac5, - 0x567,0x567,0x567,0x567,0x567,0x567,0x567,0x567,0x567,0x567,0x567,0x567,0x567,0x567,0x567,0x567, -@@ -2598,8 +2598,8 @@ static const uint16_t propsVectorsTrie_index[29236]={ - 0x582,0x588,0x582,0x582,0xd3b,0xd3b,0xbc4,0xbc4,0xdbc,0xace,0x585,0x585,0x6f6,0x58e,0x6f6,0x585, - 0x588,0x582,0x588,0x588,0x582,0x582,0x588,0x582,0x582,0x582,0x588,0x582,0x582,0x582,0x588,0x588, - 0x582,0x582,0x582,0x582,0x582,0x582,0x582,0x582,0x588,0x58b,0x58b,0x585,0x582,0x582,0x582,0x582, --0x705,0x582,0x705,0x582,0x582,0x582,0x582,0x582,0x7dd,0x7dd,0x7dd,0x7dd,0x7dd,0x7dd,0x7dd,0x7dd, --0x7dd,0x7dd,0x7dd,0x7dd,0x582,0x582,0x582,0x582,0x582,0x582,0x582,0x582,0x582,0x582,0x582,0x582, -+0x705,0x582,0x705,0x582,0x582,0x582,0x582,0x582,0x7e0,0x7e0,0x7e0,0x7e0,0x7e0,0x7e0,0x7e0,0x7e0, -+0x7e0,0x7e0,0x7e0,0x7e0,0x582,0x582,0x582,0x582,0x582,0x582,0x582,0x582,0x582,0x582,0x582,0x582, - 0x702,0x6ff,0x591,0x702,0x6f3,0x6f9,0x588,0x6f3,0x6fc,0x6f3,0x6f3,0x582,0x6f3,0x6ff,0x591,0x6ff, - 0xace,0xace,0xbc7,0xbc7,0xbc7,0xbc7,0xbc7,0xbc7,0xbc7,0xbc7,0xbc7,0xbca,0xbc7,0xbc7,0xdb3,0xe73, - 0x594,0x594,0x594,0x594,0x594,0x594,0x594,0x594,0x594,0x594,0x594,0x594,0x594,0x594,0x594,0x594, -@@ -2642,8 +2642,8 @@ static const uint16_t propsVectorsTrie_index[29236]={ - 0x5d6,0x5d6,0x5d6,0x5d6,0x5d6,0x5d6,0x5d6,0x5d6,0x5d6,0x5d6,0x5d6,0x5d6,0x5d9,0x5d9,0x5d9,0x5d9, - 0x5d9,0x5d9,0x5d9,0x5d9,0x5d9,0x5d9,0x5d9,0x5d9,0x5d9,0x5d9,0x5d9,0x5d9,0x5d9,0x5d9,0x5d9,0x5d9, - 0x5d9,0x5d6,0x5d6,0x5d6,0x5d6,0x5d6,0x5d6,0x5d6,0x5d6,0x5d6,0x5d6,0x5d6,0x5dc,0x5dc,0x5dc,0x5dc, --0xfc6,0xfc6,0xfc6,0x14d6,0x14d6,0x14d6,0x14d6,0x14d6,0x14d6,0x14d6,0x16e3,0x16e3,0x831,0x837,0x837,0x843, --0x843,0x834,0x82b,0x834,0x82b,0x834,0x82b,0x834,0x82b,0x834,0x82b,0x834,0x5eb,0x5eb,0x5e5,0x5eb, -+0xfc6,0xfc6,0xfc6,0x14d6,0x14d6,0x14d6,0x14d6,0x14d6,0x14d6,0x14d6,0x16e3,0x16e3,0x83d,0x843,0x843,0x84f, -+0x84f,0x840,0x837,0x840,0x837,0x840,0x837,0x840,0x837,0x840,0x837,0x840,0x5eb,0x5eb,0x5e5,0x5eb, - 0x5e5,0x5eb,0x5e5,0x5eb,0x5e5,0x5eb,0x5e5,0x5e8,0x5ee,0x5eb,0x5e5,0x5eb,0x5e5,0x5e8,0x5ee,0x5eb, - 0x5e5,0x5eb,0x5e5,0x5e8,0x5ee,0x5eb,0x5e5,0x5e8,0x5ee,0x5eb,0x5e5,0x5e8,0x5ee,0x5eb,0x5e5,0x5eb, - 0x5e5,0x5eb,0x5e5,0x5eb,0x5e5,0x5eb,0x5e5,0x5e8,0x5ee,0x5eb,0x5e5,0x5e8,0x5ee,0x5eb,0x5e5,0x5e8, -@@ -2658,51 +2658,51 @@ static const uint16_t propsVectorsTrie_index[29236]={ - 0x6e4,0x6e4,0x6e4,0x6e4,0x6e4,0x6e4,0x6e4,0x6e4,0x6e4,0x6e4,0x6e4,0x6e4,0x6e4,0x6e4,0x6e4,0x6e4, - 0x6e4,0x6e4,0x6e4,0x6e4,0x6e4,0x6e4,0x6e4,0x6e4,0x70e,0x70e,0x70e,0x70e,0x70e,0x70e,0x70e,0x70e, - 0x70e,0x70e,0x70e,0x70e,0x70e,0x70e,0x70e,0x70e,0x70e,0x70e,0x70e,0x70e,0x70e,0x70e,0x70e,0x70e, --0x70e,0x70e,0x70e,0x70e,0x70e,0x70e,0x70e,0x70e,0xc24,0x897,0x891,0x88e,0x894,0x88b,0x723,0x726, --0x726,0x726,0x726,0x726,0x726,0x726,0x726,0x726,0x89d,0x723,0x723,0x723,0x723,0x723,0x723,0x723, -+0x70e,0x70e,0x70e,0x70e,0x70e,0x70e,0x70e,0x70e,0xc24,0x8a3,0x89d,0x89a,0x8a0,0x897,0x723,0x726, -+0x726,0x726,0x726,0x726,0x726,0x726,0x726,0x726,0x8a9,0x723,0x723,0x723,0x723,0x723,0x723,0x723, - 0x723,0x723,0x723,0x723,0x723,0x723,0x723,0x723,0x723,0x723,0x723,0x723,0x723,0x723,0x723,0x723, --0x723,0x723,0x723,0x723,0x723,0x723,0x723,0x723,0x723,0x723,0x89a,0x89a,0x72c,0x768,0x768,0x768, -+0x723,0x723,0x723,0x723,0x723,0x723,0x723,0x723,0x723,0x723,0x8a6,0x8a6,0x729,0x8b8,0x8bb,0x8c1, -+0x7e3,0x7ef,0x8d6,0x7ec,0x8af,0x8ac,0x8af,0x8ac,0x8b5,0x8b2,0x8b5,0x8b2,0x8af,0x8ac,0x7e9,0x8c1, -+0x8af,0x8ac,0x8af,0x8ac,0x8af,0x8ac,0x8af,0x8ac,0x8c4,0x8cd,0x8ca,0x8ca,0x72f,0x76b,0x76b,0x76b, -+0x76b,0x76b,0x76b,0x765,0x765,0x765,0x765,0x765,0x765,0x765,0x765,0x765,0x765,0x765,0x765,0x765, -+0x765,0x765,0x765,0x765,0x765,0x765,0x765,0x732,0x74d,0x72c,0x753,0x756,0x750,0x768,0x768,0x768, - 0x768,0x768,0x768,0x762,0x762,0x762,0x762,0x762,0x762,0x762,0x762,0x762,0x762,0x762,0x762,0x762, --0x762,0x762,0x762,0x762,0x762,0x762,0x762,0x72f,0x74a,0x729,0x750,0x753,0x74d,0x765,0x765,0x765, --0x765,0x765,0x765,0x75f,0x75f,0x75f,0x75f,0x75f,0x75f,0x75f,0x75f,0x75f,0x75f,0x75f,0x75f,0x75f, --0x75f,0x75f,0x75f,0x75f,0x75f,0x75f,0x75f,0x72f,0x74a,0x729,0x74a,0xc27,0x7ce,0x7ce,0x7ce,0x7ce, --0x7ce,0x7ce,0x7ce,0x7ce,0x7ce,0x7ce,0x7ce,0x7ce,0x7ce,0x7ce,0x7ce,0x7ce,0x7ce,0x7ce,0x7ce,0x7ce, --0x7ce,0x7ce,0x7ce,0x7ce,0x7ce,0x7ce,0x7ce,0x7ce,0x7ce,0x7ce,0x7ce,0x7ce,0x7ce,0x7ce,0x1281,0x1281, --0x1281,0x1281,0x1281,0x7d1,0x8a0,0x8b8,0x8bb,0x8c1,0x8a3,0x7e3,0x8d6,0x7e0,0x8af,0x8a9,0x8af,0x8a9, --0x8b5,0x8b2,0x8b5,0x8b2,0x8af,0x8a9,0x8ac,0x8c1,0x8af,0x8a9,0x8af,0x8a9,0x8af,0x8a9,0x8af,0x8a9, --0x8c4,0x8cd,0x8ca,0x8ca,0x8ac,0x7e0,0x7e0,0x7e0,0x7e0,0x7e0,0x7e0,0x7e0,0x7e0,0x7e0,0x90c,0x90c, --0x90c,0x90c,0x7e6,0x7e6,0x8c7,0x8d3,0x8d3,0x8d3,0x8d3,0x8d0,0x8a6,0x8be,0xaf2,0xaf2,0xaf2,0xc39, --0xc57,0xc54,0xb0d,0x888,0x7ec,0x7e9,0x7ec,0x7ef,0x7e9,0x7ec,0x7e9,0x7ec,0x7e9,0x7ec,0x7e9,0x7e9, --0x7e9,0x7e9,0x7e9,0x7e9,0x7ec,0x7ec,0x7e9,0x7ec,0x7ec,0x7e9,0x7ec,0x7ec,0x7e9,0x7ec,0x7ec,0x7e9, --0x7ec,0x7ec,0x7e9,0x7e9,0xc5a,0x7fe,0x7f8,0x7fe,0x7f8,0x7fe,0x7f8,0x7fe,0x7f8,0x7fe,0x7f8,0x7f8, --0x7fb,0x7f8,0x7fb,0x7f8,0x7fb,0x7f8,0x7fb,0x7f8,0x7fb,0x7f8,0x7fb,0x7f8,0x7fb,0x7f8,0x7fb,0x7f8, --0x7fb,0x7f8,0x7fb,0x7f8,0x7fb,0x7f8,0x7fb,0x7fe,0x7f8,0x7fb,0x7f8,0x7fb,0x7f8,0x7fb,0x7f8,0x7f8, --0x7f8,0x7f8,0x7f8,0x7f8,0x7fb,0x7fb,0x7f8,0x7fb,0x7fb,0x7f8,0x7fb,0x7fb,0x7f8,0x7fb,0x7fb,0x7f8, --0x7fb,0x7fb,0x7f8,0x7f8,0x7f8,0x7f8,0x7f8,0x7fe,0x7f8,0x7fe,0x7f8,0x7fe,0x7f8,0x7f8,0x7f8,0x7f8, --0x7f8,0x7f8,0x7fe,0x7f8,0x7f8,0x7f8,0x7f8,0x7f8,0x7fb,0x7fe,0x7fe,0x7fb,0x7fb,0x7fb,0x7fb,0x8dc, --0x8df,0x801,0x804,0xc42,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a, --0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a, --0x80a,0x80a,0x80a,0x80a,0x80d,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a, --0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a,0x80a, -+0x762,0x762,0x762,0x762,0x762,0x762,0x762,0x732,0x74d,0x72c,0x74d,0xc27,0x7d1,0x7d1,0x7d1,0x7d1, -+0x7d1,0x7d1,0x7d1,0x7d1,0x7d1,0x7d1,0x7d1,0x7d1,0x7d1,0x7d1,0x7d1,0x7d1,0x7d1,0x7d1,0x7d1,0x7d1, -+0x7d1,0x7d1,0x7d1,0x7d1,0x7d1,0x7d1,0x7d1,0x7d1,0x7d1,0x7d1,0x7d1,0x7d1,0x7d1,0x7d1,0x1281,0x1281, -+0x1281,0x1281,0x1281,0x7d4,0x7e9,0x7ec,0x7ec,0x7ec,0x7ec,0x7ec,0x7ec,0x7ec,0x7ec,0x7ec,0x90c,0x90c, -+0x90c,0x90c,0x7f2,0x7f2,0x8c7,0x8d3,0x8d3,0x8d3,0x8d3,0x8d0,0x7e6,0x8be,0xaf2,0xaf2,0xaf2,0xc39, -+0xc57,0xc54,0xb0d,0x894,0x7f8,0x7f5,0x7f8,0x7fb,0x7f5,0x7f8,0x7f5,0x7f8,0x7f5,0x7f8,0x7f5,0x7f5, -+0x7f5,0x7f5,0x7f5,0x7f5,0x7f8,0x7f8,0x7f5,0x7f8,0x7f8,0x7f5,0x7f8,0x7f8,0x7f5,0x7f8,0x7f8,0x7f5, -+0x7f8,0x7f8,0x7f5,0x7f5,0xc5a,0x80a,0x804,0x80a,0x804,0x80a,0x804,0x80a,0x804,0x80a,0x804,0x804, -+0x807,0x804,0x807,0x804,0x807,0x804,0x807,0x804,0x807,0x804,0x807,0x804,0x807,0x804,0x807,0x804, -+0x807,0x804,0x807,0x804,0x807,0x804,0x807,0x80a,0x804,0x807,0x804,0x807,0x804,0x807,0x804,0x804, -+0x804,0x804,0x804,0x804,0x807,0x807,0x804,0x807,0x807,0x804,0x807,0x807,0x804,0x807,0x807,0x804, -+0x807,0x807,0x804,0x804,0x804,0x804,0x804,0x80a,0x804,0x80a,0x804,0x80a,0x804,0x804,0x804,0x804, -+0x804,0x804,0x80a,0x804,0x804,0x804,0x804,0x804,0x807,0x80a,0x80a,0x807,0x807,0x807,0x807,0x8dc, -+0x8df,0x80d,0x810,0xc42,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816, - 0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816, --0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0xd44,0xd44,0xe76,0x810, -+0x816,0x816,0x816,0x816,0x819,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816, -+0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816,0x816, -+0x822,0x822,0x822,0x822,0x822,0x822,0x822,0x822,0x822,0x822,0x822,0x822,0x822,0x822,0x822,0x822, -+0x822,0x822,0x822,0x822,0x822,0x822,0x822,0x822,0x822,0x822,0x822,0x822,0xd44,0xd44,0xe76,0x81c, - 0x8e8,0x8e8,0x8e8,0x8e8,0x8e8,0x8e8,0x8e8,0x8e8,0x8e8,0x8e8,0x8e8,0x8e8,0xd3e,0xd3e,0xd3e,0xd3e, --0x819,0x819,0x819,0x819,0x819,0x819,0x819,0x819,0x819,0x819,0x819,0x819,0x819,0x819,0x819,0x819, -+0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825, - 0x8f1,0x8f1,0x8f1,0x8f1,0x8f1,0x8f1,0x8f1,0x8f1,0x8f1,0x8f1,0x8f1,0x8f1,0x8f1,0x8f1,0x8f1,0x8f1, --0x8f1,0x81c,0x81c,0x81c,0x81c,0x81c,0x81c,0xd47,0xd47,0xd47,0xd47,0x8f4,0x8f4,0x8f4,0x8f4,0x8f4, --0x81c,0x81c,0x81c,0x81c,0x81c,0x81c,0x81c,0x81c,0x81c,0x81c,0x81c,0x81c,0x81c,0x81c,0x81c,0x81c, --0x81c,0x81c,0x81c,0x81c,0x81c,0x81c,0x81c,0x81c,0x81c,0x81c,0x81c,0x81c,0x81c,0x81c,0x81c,0x81c, --0x81c,0x81c,0xd47,0xd47,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f, --0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f,0x81f, --0x81f,0x81f,0x81f,0x81f,0x8f1,0x8f1,0x8f1,0x8f1,0x8f1,0x8f1,0x8f1,0x8f1,0x822,0x822,0x822,0x822, --0x822,0x822,0x822,0x822,0x822,0x822,0x822,0x822,0x822,0x822,0x822,0x822,0x822,0x822,0x822,0x822, --0x822,0x822,0x822,0x822,0x822,0x822,0x822,0x822,0x822,0x822,0x822,0x822,0x822,0x822,0xe79,0xe79, -+0x8f1,0x828,0x828,0x828,0x828,0x828,0x828,0xd47,0xd47,0xd47,0xd47,0x8f4,0x8f4,0x8f4,0x8f4,0x8f4, -+0x828,0x828,0x828,0x828,0x828,0x828,0x828,0x828,0x828,0x828,0x828,0x828,0x828,0x828,0x828,0x828, -+0x828,0x828,0x828,0x828,0x828,0x828,0x828,0x828,0x828,0x828,0x828,0x828,0x828,0x828,0x828,0x828, -+0x828,0x828,0xd47,0xd47,0x82b,0x82b,0x82b,0x82b,0x82b,0x82b,0x82b,0x82b,0x82b,0x82b,0x82b,0x82b, -+0x82b,0x82b,0x82b,0x82b,0x82b,0x82b,0x82b,0x82b,0x82b,0x82b,0x82b,0x82b,0x82b,0x82b,0x82b,0x82b, -+0x82b,0x82b,0x82b,0x82b,0x8f1,0x8f1,0x8f1,0x8f1,0x8f1,0x8f1,0x8f1,0x8f1,0x82e,0x82e,0x82e,0x82e, -+0x82e,0x82e,0x82e,0x82e,0x82e,0x82e,0x82e,0x82e,0x82e,0x82e,0x82e,0x82e,0x82e,0x82e,0x82e,0x82e, -+0x82e,0x82e,0x82e,0x82e,0x82e,0x82e,0x82e,0x82e,0x82e,0x82e,0x82e,0x82e,0x82e,0x82e,0xe79,0xe79, - 0xe79,0xe79,0xe79,0xe79,0xe79,0xe79,0xe79,0xe79,0xe79,0xe79,0xe79,0xe79,0xe79,0xe79,0xe79,0xe79, --0xe79,0xe79,0xe79,0xe79,0x10e9,0x10e9,0x10e9,0x10e9,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825, --0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825, --0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x828,0x828,0x825,0x828,0x825,0x828, --0x828,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x825,0x828,0x825,0x828,0x825,0x828, --0x828,0x825,0x825,0x828,0x828,0x828,0x825,0x825,0x825,0x825,0x148b,0x148b,0xc4b,0xc4b,0xc4b,0xc4b, -+0xe79,0xe79,0xe79,0xe79,0x10e9,0x10e9,0x10e9,0x10e9,0x831,0x831,0x831,0x831,0x831,0x831,0x831,0x831, -+0x831,0x831,0x831,0x831,0x831,0x831,0x831,0x831,0x831,0x831,0x831,0x831,0x831,0x831,0x831,0x831, -+0x831,0x831,0x831,0x831,0x831,0x831,0x831,0x831,0x831,0x831,0x834,0x834,0x831,0x834,0x831,0x834, -+0x834,0x831,0x831,0x831,0x831,0x831,0x831,0x831,0x831,0x831,0x831,0x834,0x831,0x834,0x831,0x834, -+0x834,0x831,0x831,0x834,0x834,0x834,0x831,0x831,0x831,0x831,0x148b,0x148b,0xc4b,0xc4b,0xc4b,0xc4b, - 0xc4b,0xc4b,0xc4b,0xc4b,0xc4b,0xc4b,0xc4b,0xc4b,0xc4b,0xc4b,0xc4b,0xc4b,0x8e8,0x8e8,0x8e8,0x8e8, - 0x8e8,0x8e8,0x8e8,0x8e8,0x8e8,0x8e8,0x8e8,0x8e8,0x8e8,0x8e8,0x8e8,0x8e8,0x8e8,0x8e8,0x8e8,0x8e8, - 0x8e8,0x8e8,0x8e8,0x8e8,0x8e8,0x8e8,0x8e8,0x8e8,0x8e8,0x8e8,0x8e8,0x8e8,0x12bd,0x12bd,0x12bd,0x12bd, -@@ -3314,31 +3314,31 @@ static const uint32_t propsVectors[6375]={ - 0x11023600,0x24000020,0x10100000,0x11023700,0x24000000,0x100000,0x11023700,0x24000000,0xe00000,0x11023700,0x24000000,0x10100000,0x11023700,0x24000000,0x10e00000,0x11023700, - 0x24000020,0x100000,0x11023700,0x24000020,0x10100000,0x11023700,0x24000020,0x10105200,0x11023800,0x4000000,0x100000,0x11023800,0x24000000,0x200000,0x11024e67,0, - 0,0x11025600,0x4000000,0x100000,0x11042a00,0x4000000,0x1600000,0x11045700,0x4000000,0x20000a,0x11045700,0x4000020,0x20000a,0x11045712,0x7c00100,0xe3040a, --0x11045712,0x7c80100,0xe3040a,0x11045716,0x7c00100,0xe30c0a,0x11045716,0x7c00100,0x2530c0a,0x11065700,0x4000000,0x810011,0x11065700,0x4000000,0xe00011,0x11065700, --0x4000000,0x1410011,0x11065700,0x4000000,0x1500011,0x11065700,0x4000000,0x1600011,0x11065700,0x4000006,0xe70011,0x11065700,0x4000008,0xe00011,0x11065700,0x4000008, --0xe02c11,0x11065700,0x4000010,0x871411,0x11065700,0x4000010,0x1201411,0x11065700,0x4000010,0x1271011,0x11065700,0x4000020,0xe00011,0x11065700,0x4000400,0xe00011, --0x11065700,0x4000420,0xe00011,0x11065700,0x6800000,0xe01c11,0x11065700,0x6800040,0xe00011,0x11065700,0xc000010,0x80ac11,0x11065700,0xc000010,0xb48011,0x11065719, --0x7c00100,0xe20411,0x11065719,0x7c00100,0xe50411,0x11065719,0x7c00140,0xe20411,0x11065719,0x7c00140,0xe50411,0x11080100,0x6800000,0x201c00,0x11080100,0x68000c0, --0x19329800,0x11080100,0x24000000,0x200000,0x11080100,0x24000000,0x810000,0x11080100,0x24000000,0x1410000,0x11080100,0x24000000,0x1500000,0x11080100,0x24000000,0x1600000, --0x11080100,0x24000000,0x1b00000,0x11080100,0x24000000,0x2410000,0x11080100,0x24000000,0x18200000,0x11080100,0x24000006,0xd70000,0x11080100,0x24000008,0x1713c00,0x11080100, --0x24000008,0x1714000,0x11080100,0x24000010,0x1001400,0x11080100,0x24000010,0x1071000,0x11080100,0x24000010,0x1071400,0x11080100,0x24000020,0x200000,0x11080100,0x24000020, --0x400000,0x11080100,0x24000020,0x1600000,0x11080100,0x24000400,0x200000,0x11080100,0x24000420,0x200000,0x11080100,0x2c000010,0xb48000,0x11080100,0x2c000010,0x100ac00, --0x11080100,0x44000001,0x1a40000,0x11080119,0x7c00100,0x220400,0x11080119,0x7c00100,0x250400,0x11080119,0x7c001c0,0x220400,0x11080119,0x7c001c0,0x250400,0x11080200, --0x4000400,0x200002,0x11080200,0x24000000,0x200000,0x11080200,0x24000000,0x1500000,0x11080200,0x24000000,0x1600000,0x11080200,0x24000020,0x200000,0x110a1e12,0x7c00100, --0x2130480,0x110a1e12,0x7c80100,0x2130480,0x110a3000,0x24000000,0x30e00000,0x110a3000,0x24100000,0x810001,0x110a3000,0x24100000,0x1410001,0x110a3700,0x24000000,0x30200000, --0x110a3d11,0x7c00300,0xe30000,0x110a3d11,0x7c00900,0x1230400,0x110a3d12,0x2802400,0x962460,0x110a3e14,0x7c00100,0xe30000,0x110a3e14,0x7c00100,0xe30001,0x110a3e14, --0x7c00100,0x2530000,0x110a3e14,0x7c00900,0x1230000,0x110a3e14,0x7c00900,0x1230001,0x110a3f16,0x7c00100,0xe30c00,0x110a3f16,0x7c00100,0xe30c01,0x110a3f16,0x7c00100, --0x2530c00,0x110a3f16,0x7c00900,0x1230c00,0x110a3f16,0x7c00900,0x1230c01,0x110a4005,0x7c00100,0xe30400,0x110a4112,0x7c00100,0xe30402,0x110a4112,0x7c80100,0xe30402, --0x110a4400,0x4000000,0xe00000,0x110a4412,0x4000000,0xe00002,0x110a4412,0x4000000,0xe00003,0x110a4416,0x4000000,0xe00c03,0x110a4500,0x4000000,0xe0000d,0x110a4516, --0x4000000,0xe00c0d,0x110a4711,0x7c40300,0xe30000,0x110a4f11,0x7c00300,0xe30001,0x110a4f11,0x7c40300,0xe30000,0x110a5300,0x4000000,0x810010,0x110a5300,0x4000000, --0xe00002,0x110a5300,0x4000000,0xe00010,0x110a5300,0x4000000,0x1410010,0x110a5300,0x4000002,0xe70010,0x110a5300,0x4000008,0x810010,0x110a5300,0x4000008,0x1410010, --0x110a5300,0x6800000,0xe01c02,0x110a5300,0x6800000,0xe01c10,0x110a5400,0x4000000,0x81000c,0x110a5400,0x4000000,0xe0000c,0x110a5400,0x4000000,0x141000c,0x110a5400, --0x4000000,0x150000c,0x110a5400,0x4000000,0x160000c,0x110a5400,0x4000002,0xe7000c,0x110a5400,0x4000010,0x87140c,0x110a5400,0x4000010,0xe7000c,0x110a5400,0x4000010, --0x120140c,0x110a5400,0x4000010,0x127100c,0x110a5400,0x4000020,0xe0000c,0x110a5400,0x4000026,0xe7000c,0x110a5400,0xc000010,0x80ac0c,0x110a5400,0xc000010,0xb4800c, --0x11400a0c,0xc000010,0x1049400,0x11400c0e,0x4000010,0xb00000,0x11400c0e,0x4000010,0x1071400,0x11400c0e,0xc000010,0xb48000,0x11400c13,0x7c00900,0x230400,0x11400f36, --0xc000010,0x448000,0x11400f46,0xc000010,0x448000,0x11401d72,0x4000000,0x200000,0x11403d95,0x4000000,0xe00000,0x1144578a,0x4000004,0x120000a,0x1144578a,0x4000008, --0x81000a,0x1144578a,0x4000008,0x141000a,0x1144578a,0x4000010,0x87000a,0x1144578a,0xc000010,0x84800a,0x11445793,0x3802500,0x126246a,0x11445793,0x7c00d00,0x2530c0a, --0x11463d8a,0x4000001,0x440011,0x114a3d8a,0x4000000,0xe00000,0x114a3d8a,0x4000000,0xe00002,0x114a3d8a,0x24000000,0x810000,0x114a3d8a,0x24000000,0xe00000,0x114a3d8a, -+0x11045712,0x7c80100,0xe3040a,0x11045716,0x7c00100,0xe30c0a,0x11045716,0x7c00100,0x2530c0a,0x11063d00,0x4000001,0x440011,0x11065700,0x4000000,0x810011,0x11065700, -+0x4000000,0xe00011,0x11065700,0x4000000,0x1410011,0x11065700,0x4000000,0x1500011,0x11065700,0x4000000,0x1600011,0x11065700,0x4000006,0xe70011,0x11065700,0x4000008, -+0xe00011,0x11065700,0x4000008,0xe02c11,0x11065700,0x4000010,0x871411,0x11065700,0x4000010,0x1201411,0x11065700,0x4000010,0x1271011,0x11065700,0x4000020,0xe00011, -+0x11065700,0x4000400,0xe00011,0x11065700,0x4000420,0xe00011,0x11065700,0x6800000,0xe01c11,0x11065700,0x6800040,0xe00011,0x11065700,0xc000010,0x80ac11,0x11065700, -+0xc000010,0xb48011,0x11065719,0x7c00100,0xe20411,0x11065719,0x7c00100,0xe50411,0x11065719,0x7c00140,0xe20411,0x11065719,0x7c00140,0xe50411,0x11080100,0x6800000, -+0x201c00,0x11080100,0x68000c0,0x19329800,0x11080100,0x24000000,0x200000,0x11080100,0x24000000,0x810000,0x11080100,0x24000000,0x1410000,0x11080100,0x24000000,0x1500000, -+0x11080100,0x24000000,0x1600000,0x11080100,0x24000000,0x1b00000,0x11080100,0x24000000,0x2410000,0x11080100,0x24000000,0x18200000,0x11080100,0x24000006,0xd70000,0x11080100, -+0x24000008,0x1713c00,0x11080100,0x24000008,0x1714000,0x11080100,0x24000010,0x1001400,0x11080100,0x24000010,0x1071000,0x11080100,0x24000010,0x1071400,0x11080100,0x24000020, -+0x200000,0x11080100,0x24000020,0x400000,0x11080100,0x24000020,0x1600000,0x11080100,0x24000400,0x200000,0x11080100,0x24000420,0x200000,0x11080100,0x2c000010,0xb48000, -+0x11080100,0x2c000010,0x100ac00,0x11080100,0x44000001,0x1a40000,0x11080119,0x7c00100,0x220400,0x11080119,0x7c00100,0x250400,0x11080119,0x7c001c0,0x220400,0x11080119, -+0x7c001c0,0x250400,0x11080200,0x4000400,0x200002,0x11080200,0x24000000,0x200000,0x11080200,0x24000000,0x1500000,0x11080200,0x24000000,0x1600000,0x11080200,0x24000020, -+0x200000,0x110a1e12,0x7c00100,0x2130480,0x110a1e12,0x7c80100,0x2130480,0x110a3000,0x24000000,0x30e00000,0x110a3000,0x24100000,0x810001,0x110a3000,0x24100000,0x1410001, -+0x110a3700,0x24000000,0x30200000,0x110a3d00,0x4000000,0xe00000,0x110a3d00,0x4000000,0xe00002,0x110a3d00,0x24000000,0xe00000,0x110a3d11,0x7c00300,0xe30000,0x110a3d11, -+0x7c00900,0x1230400,0x110a3d12,0x2802400,0x962460,0x110a3e14,0x7c00100,0xe30000,0x110a3e14,0x7c00100,0xe30001,0x110a3e14,0x7c00100,0x2530000,0x110a3e14,0x7c00900, -+0x1230000,0x110a3e14,0x7c00900,0x1230001,0x110a3f16,0x7c00100,0xe30c00,0x110a3f16,0x7c00100,0xe30c01,0x110a3f16,0x7c00100,0x2530c00,0x110a3f16,0x7c00900,0x1230c00, -+0x110a3f16,0x7c00900,0x1230c01,0x110a4005,0x7c00100,0xe30400,0x110a4112,0x7c00100,0xe30402,0x110a4112,0x7c80100,0xe30402,0x110a4400,0x4000000,0xe00000,0x110a4412, -+0x4000000,0xe00002,0x110a4412,0x4000000,0xe00003,0x110a4416,0x4000000,0xe00c03,0x110a4500,0x4000000,0xe0000d,0x110a4516,0x4000000,0xe00c0d,0x110a4711,0x7c40300, -+0xe30000,0x110a4f11,0x7c00300,0xe30001,0x110a4f11,0x7c40300,0xe30000,0x110a5300,0x4000000,0x810010,0x110a5300,0x4000000,0xe00002,0x110a5300,0x4000000,0xe00010, -+0x110a5300,0x4000000,0x1410010,0x110a5300,0x4000002,0xe70010,0x110a5300,0x4000008,0x810010,0x110a5300,0x4000008,0x1410010,0x110a5300,0x6800000,0xe01c02,0x110a5300, -+0x6800000,0xe01c10,0x110a5400,0x4000000,0x81000c,0x110a5400,0x4000000,0xe0000c,0x110a5400,0x4000000,0x141000c,0x110a5400,0x4000000,0x150000c,0x110a5400,0x4000000, -+0x160000c,0x110a5400,0x4000002,0xe7000c,0x110a5400,0x4000010,0x87140c,0x110a5400,0x4000010,0xe7000c,0x110a5400,0x4000010,0x120140c,0x110a5400,0x4000010,0x127100c, -+0x110a5400,0x4000020,0xe0000c,0x110a5400,0x4000026,0xe7000c,0x110a5400,0xc000010,0x80ac0c,0x110a5400,0xc000010,0xb4800c,0x11400a0c,0xc000010,0x1049400,0x11400c0e, -+0x4000010,0xb00000,0x11400c0e,0x4000010,0x1071400,0x11400c0e,0xc000010,0xb48000,0x11400c13,0x7c00900,0x230400,0x11400f36,0xc000010,0x448000,0x11400f46,0xc000010, -+0x448000,0x11401d72,0x4000000,0x200000,0x11403d95,0x4000000,0xe00000,0x1144578a,0x4000004,0x120000a,0x1144578a,0x4000008,0x81000a,0x1144578a,0x4000008,0x141000a, -+0x1144578a,0x4000010,0x87000a,0x1144578a,0xc000010,0x84800a,0x11445793,0x3802500,0x126246a,0x11445793,0x7c00d00,0x2530c0a,0x114a3d8a,0x24000000,0x810000,0x114a3d8a, - 0x24000000,0x1410000,0x114a3d8a,0x24000008,0x810000,0x114a3d8a,0x24000008,0x1410000,0x114a3d8a,0x24000010,0x870000,0x114a3d8a,0x2c000010,0x848000,0x114a3d90,0x4000000, - 0xe00000,0x114a3d90,0x24000000,0xe00000,0x114a3d90,0x24000002,0x1200000,0x114a3d90,0x24000002,0x10e00000,0x114a3d90,0x24000008,0x810000,0x114a3d90,0x24000008,0x1410000, - 0x114a3d93,0x7c00900,0x930c00,0x114a3d93,0x7c00900,0xe30c00,0x114a3d95,0x7c00300,0xe30000,0x114a3e93,0x7000400,0x1200c02,0x114a3f8a,0x4000004,0x1200000,0x114a3f93, -@@ -3601,7 +3601,7 @@ static const uint32_t propsVectors[6375]={ - 0xe30000,0xa00b1596,0x7c00300,0xe30000,0xa040af86,0x6800400,0x962540}; - - static const int32_t countPropsVectors=6375; --static const int32_t propsVectorsColumns=3; /* The code assumes that this value is > 0*/ -+static const int32_t propsVectorsColumns=3; - static const uint16_t scriptExtensions[198]={ - 0x800e,0x8019,8,0x8059,8,2,8,0x8038,8,6,8,0x8019,3,0x800c,2,0x22, - 0x8025,2,0xe,2,0x22,0x54,0x79,0x7b,0x80a7,2,0x8022,2,0x8025,2,0x1b,4, ---- test/intltest/ucdtest.cpp.orig 2017-05-25 19:03:11 UTC -+++ test/intltest/ucdtest.cpp -@@ -62,6 +62,7 @@ void UnicodeTest::runIndexedTest( int32_t index, UBool - TESTCASE_AUTO(TestScriptMetadata); - TESTCASE_AUTO(TestBidiPairedBracketType); - TESTCASE_AUTO(TestEmojiProperties); -+ TESTCASE_AUTO(TestDefaultScriptExtensions); - TESTCASE_AUTO_END; - } - -@@ -529,4 +530,19 @@ void UnicodeTest::TestEmojiProperties() { - u_hasBinaryProperty(0x1F64B, UCHAR_EMOJI_MODIFIER_BASE)); - assertTrue("asterisk is Emoji_Component", - u_hasBinaryProperty(0x2A, UCHAR_EMOJI_COMPONENT)); -+} -+ -+void UnicodeTest::TestDefaultScriptExtensions() { -+ // Block 3000..303F CJK Symbols and Punctuation defaults to scx=Bopo Hang Hani Hira Kana Yiii -+ // but some of its characters revert to scx=