diff --git a/archivers/kf5-karchive/Makefile b/archivers/kf5-karchive/Makefile index 2c91a721021..a4e02b283b6 100644 --- a/archivers/kf5-karchive/Makefile +++ b/archivers/kf5-karchive/Makefile @@ -2,12 +2,16 @@ # $FreeBSD$ PORTNAME= karchive -PORTVERSION= ${KDE_FRAMEWORKS_VERSION} +DISTVERSION= ${KDE_FRAMEWORKS_VERSION} CATEGORIES= archivers kde kde-frameworks MAINTAINER= kde@FreeBSD.org COMMENT= KF5 library that provides classes for handling archive formats +# Sources say LGPL20, KDE policy says LGPL21+, license file is LGPL21 +LICENSE= LGPL20 +LICENSE_FILE= ${WRKSRC}/COPYING.LIB + USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz USE_KDE= ecm USE_QT5= buildtools_build core qmake_build diff --git a/biology/bcftools/Makefile b/biology/bcftools/Makefile index da04d2ad072..7f3f88d1a42 100644 --- a/biology/bcftools/Makefile +++ b/biology/bcftools/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= bcftools -PORTVERSION= 1.3.1 -PORTREVISION= 2 +PORTVERSION= 1.6 CATEGORIES= biology MAINTAINER= cartwright@asu.edu @@ -12,7 +11,7 @@ COMMENT= Tools for manipulating next-generation sequencing data LICENSE= MIT # LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= htslib>=1.3:biology/htslib +BUILD_DEPENDS= htslib>=1.6:biology/htslib LIB_DEPENDS= libhts.so:biology/htslib TEST_DEPENDS= bash:shells/bash @@ -21,10 +20,12 @@ CONFLICTS_BUILD=openssl USE_GITHUB= yes GH_ACCOUNT= samtools -USES= gmake perl5 shebangfix +USES= autoreconf gmake perl5 python shebangfix USE_PERL5= test +PYTHON_NO_DEPENDS= yes +GNU_CONFIGURE= yes SUB_FILES= pkg-message -SHEBANG_FILES= vcfutils.pl plot-vcfstats plugins/color-chrs.pl test/test.pl +SHEBANG_FILES= misc/* test/test.pl OPTIONS_DEFINE= GPL GPL_DESC= Enable modules that rely on GPL code @@ -37,19 +38,15 @@ GPL_LIB_DEPENDS= libgsl.so:math/gsl CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAKE_ENV= INSTALL_LIB="${INSTALL_LIB}" \ - INSTALL_DATA="${INSTALL_DATA}" \ - INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - INSTALL_DIR="${MKDIR}" - .if ${PORT_OPTIONS:MGPL} MAKE_ENV+= USE_GPL=1 LICENSE= GPLv3 .endif -PLIST_SUB= PORTVERSION="${PORTVERSION}" - TEST_TARGET= test +post-patch: + @${GREP} -q '@PORTVERSION@' ${WRKSRC}/configure.ac || (echo "@PORTVERSION@ in file/patch-configure.ac is overwritten probably due to using 'make makepatch'"; exit 1) + @${REINPLACE_CMD} -e 's|@PORTVERSION@|${PORTVERSION}|g' ${WRKSRC}/configure.ac + .include diff --git a/biology/bcftools/distinfo b/biology/bcftools/distinfo index 2d4c03eecc9..0f73a563097 100644 --- a/biology/bcftools/distinfo +++ b/biology/bcftools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1463692643 -SHA256 (samtools-bcftools-1.3.1_GH0.tar.gz) = 99a5cc05faa974f5ddbeebf346bb51a806bdaaf8e2f6adc3bead28551983e77e -SIZE (samtools-bcftools-1.3.1_GH0.tar.gz) = 958207 +TIMESTAMP = 1508307708 +SHA256 (samtools-bcftools-1.6_GH0.tar.gz) = afb2a96d3419fbe77fab5c501dc28bc5e691145353ac5600909a75c0e625f025 +SIZE (samtools-bcftools-1.6_GH0.tar.gz) = 2333330 diff --git a/biology/bcftools/files/patch-Makefile b/biology/bcftools/files/patch-Makefile index 1d241001fd5..a79ce1aa448 100644 --- a/biology/bcftools/files/patch-Makefile +++ b/biology/bcftools/files/patch-Makefile @@ -1,18 +1,8 @@ ---- Makefile.orig 2015-12-15 21:42:34 UTC +--- Makefile.orig 2017-09-28 11:22:48 UTC +++ Makefile -@@ -29,16 +29,15 @@ TEST_PROG= test/test-rbuf - all: $(PROG) $(TEST_PROG) - - # Adjust $(HTSDIR) to point to your top-level htslib directory --HTSDIR = ../htslib --include $(HTSDIR)/htslib.mk --HTSLIB = $(HTSDIR)/libhts.a --BGZIP = $(HTSDIR)/bgzip --TABIX = $(HTSDIR)/tabix -+HTSDIR = $(prefix)/include -+HTSLIB = -lhts -+BGZIP = $(HTSDIR)/../bin/bgzip -+TABIX = $(HTSDIR)/../bin/tabix +@@ -22,10 +22,10 @@ + # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + # DEALINGS IN THE SOFTWARE. -CC = gcc -CPPFLAGS = @@ -24,17 +14,13 @@ +LDFLAGS += LIBS = - OBJS = main.o vcfindex.o tabix.o \ -@@ -57,26 +56,20 @@ GSL_LIBS = - ifdef USE_GPL - EXTRA_CPPFLAGS += -DUSE_GPL - OBJS += polysomy.o peakfit.o -- GSL_LIBS = -lgsl -lcblas -+ GSL_LIBS = -lgsl -lgslcblas - endif + DYNAMIC_FLAGS = -rdynamic +@@ -42,26 +42,25 @@ OBJS = main.o vcfindex.o tabix.o \ + vcfsort.o \ + ccall.o em.o prob1.o kmin.o # the original samtools calling -prefix = /usr/local -+prefix = ${STAGEDIR}${PREFIX} ++prefix = ${PREFIX} exec_prefix = $(prefix) bindir = $(exec_prefix)/bin libdir = $(exec_prefix)/lib @@ -42,37 +28,52 @@ -mandir = $(prefix)/share/man +mandir = $(prefix)/man man1dir = $(mandir)/man1 - + # Installation location for $(PLUGINS) plugindir = $(libexecdir)/bcftools pluginpath = $(plugindir) + # Installation location for $(MISC_PROGRAMS) and $(MISC_SCRIPTS) +-misc_bindir = $(bindir) ++misc_bindir = $(bindir)/samtools_misc --MKDIR_P = mkdir -p + MKDIR_P = mkdir -p -INSTALL = install -p --INSTALL_PROGRAM = $(INSTALL) -INSTALL_DATA = $(INSTALL) -m 644 -INSTALL_DIR = $(MKDIR_P) -m 755 -- - MISC_PROGRAMS = plot-vcfstats vcfutils.pl plugins/color-chrs.pl +-INSTALL_MAN = $(INSTALL_DATA) +-INSTALL_PROGRAM = $(INSTALL) +-INSTALL_SCRIPT = $(INSTALL_PROGRAM) ++INSTALL_DATA = ${BSD_INSTALL_DATA} ++INSTALL_DIR = $(MKDIR_P) ++INSTALL_MAN = ${BSD_INSTALL_MAN} ++INSTALL_PROGRAM = ${BSD_INSTALL_PROGRAM} ++INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT} - all:$(PROG) plugins -@@ -181,7 +174,7 @@ test/test-rbuf: test/test-rbuf.o - $(CC) $(LDFLAGS) -o $@ $^ -lm $(LIBS) + PROGRAMS = bcftools + MISC_SCRIPTS = \ +@@ -77,7 +76,7 @@ all: $(PROGRAMS) $(TEST_PROGRAMS) plugin - bcftools: $(HTSLIB) $(OBJS) -- $(CC) -rdynamic $(LDFLAGS) -o $@ $(OBJS) $(HTSLIB) -lpthread -lz -lm -ldl $(GSL_LIBS) $(LIBS) -+ $(CC) -rdynamic $(LDFLAGS) -o $@ $(OBJS) $(HTSLIB) -pthread -lz -lm $(GSL_LIBS) $(LIBS) + ALL_CPPFLAGS = -I. $(HTSLIB_CPPFLAGS) $(CPPFLAGS) + ALL_LDFLAGS = $(HTSLIB_LDFLAGS) $(LDFLAGS) +-ALL_LIBS = -lz -ldl $(LIBS) ++ALL_LIBS = -lz $(LIBS) - doc/bcftools.1: doc/bcftools.txt - cd doc && a2x -adate="$(DOC_DATE)" -aversion=$(DOC_VERSION) --doctype manpage --format manpage bcftools.txt -@@ -198,8 +191,9 @@ docs: doc/bcftools.1 doc/bcftools.html + # Usually config.mk and config.h are generated by running configure + # or config.status, but if those aren't used create defaults here. +@@ -131,7 +130,7 @@ print-version: + ifdef USE_GPL + main.o : EXTRA_CPPFLAGS += -DUSE_GPL + OBJS += polysomy.o peakfit.o +- GSL_LIBS ?= -lgsl -lcblas ++ GSL_LIBS ?= -lgsl -lgslcblas + endif + + bcftools: $(OBJS) $(HTSLIB) +@@ -273,7 +272,7 @@ docs: doc/bcftools.1 doc/bcftools.html # Since there is no make dependency, bcftools.1 can be out-of-date and # make docs can be run to update if asciidoc is available - install: $(PROG) + install: $(PROG) $(PLUGINS) - $(INSTALL_DIR) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(plugindir) -- $(INSTALL_PROGRAM) $(PROG) $(MISC_PROGRAMS) $(DESTDIR)$(bindir) -+ $(INSTALL_DIR) $(DESTDIR)$(bindir) $(DESTDIR)$(bindir)/samtools_misc $(DESTDIR)$(man1dir) $(DESTDIR)$(plugindir) -+ $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(bindir) -+ $(INSTALL_SCRIPT) $(MISC_PROGRAMS) $(DESTDIR)$(bindir)/samtools_misc - $(INSTALL_DATA) doc/bcftools.1 $(DESTDIR)$(man1dir) - $(INSTALL_PROGRAM) plugins/*.so $(DESTDIR)$(plugindir) - ++ $(INSTALL_DIR) $(DESTDIR)$(bindir) $(DESTDIR)$(misc_bindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(plugindir) + $(INSTALL_PROGRAM) $(PROGRAMS) $(DESTDIR)$(bindir) + $(INSTALL_SCRIPT) $(MISC_SCRIPTS) $(DESTDIR)$(misc_bindir) + $(INSTALL_MAN) doc/bcftools.1 $(DESTDIR)$(man1dir) diff --git a/biology/bcftools/files/patch-configure.ac b/biology/bcftools/files/patch-configure.ac new file mode 100644 index 00000000000..40dd18b1099 --- /dev/null +++ b/biology/bcftools/files/patch-configure.ac @@ -0,0 +1,11 @@ +--- configure.ac.orig 2017-09-28 11:22:48 UTC ++++ configure.ac +@@ -23,7 +23,7 @@ + # DEALINGS IN THE SOFTWARE. + + dnl Process this file with autoconf to produce a configure script +-AC_INIT([BCFtools], m4_esyscmd_s([make print-version]), ++AC_INIT([BCFtools], [@PORTVERSION@], + [samtools-help@lists.sourceforge.net], [], [http://www.htslib.org/]) + AC_PREREQ([2.63]) dnl This version introduced 4-argument AC_CHECK_HEADER + AC_CONFIG_SRCDIR([main.c]) diff --git a/biology/bcftools/files/patch-misc_run-roh.pl b/biology/bcftools/files/patch-misc_run-roh.pl new file mode 100644 index 00000000000..4b5cd620028 --- /dev/null +++ b/biology/bcftools/files/patch-misc_run-roh.pl @@ -0,0 +1,11 @@ +--- misc/run-roh.pl.orig 2017-10-18 09:33:24 UTC ++++ misc/run-roh.pl +@@ -97,7 +97,7 @@ sub cmd + else + { + # child +- exec('/bin/bash', '-o','pipefail','-c', $cmd) or error("Failed to run the command [/bin/sh -o pipefail -c $cmd]: $!"); ++ exec('/bin/sh', '-c', $cmd) or error("Failed to run the command [/bin/sh -c $cmd]: $!"); + } + + if ( exists($args{exit_on_error}) && !$args{exit_on_error} ) { return @out; } diff --git a/biology/bcftools/files/patch-prob1.c b/biology/bcftools/files/patch-prob1.c index 04694984b8c..9fdaa65b4f5 100644 --- a/biology/bcftools/files/patch-prob1.c +++ b/biology/bcftools/files/patch-prob1.c @@ -1,4 +1,4 @@ ---- prob1.c.orig 2015-12-15 21:42:34 UTC +--- prob1.c.orig 2017-09-28 11:22:48 UTC +++ prob1.c @@ -33,6 +33,12 @@ THE SOFTWARE. */ #include diff --git a/biology/bcftools/files/patch-test_test.pl b/biology/bcftools/files/patch-test_test.pl index e5c436a3775..a42f062d310 100644 --- a/biology/bcftools/files/patch-test_test.pl +++ b/biology/bcftools/files/patch-test_test.pl @@ -1,6 +1,6 @@ ---- test/test.pl.orig 2015-12-22 22:45:13 UTC +--- test/test.pl.orig 2017-10-18 09:33:24 UTC +++ test/test.pl -@@ -290,7 +290,7 @@ sub _cmd +@@ -381,7 +381,7 @@ sub _cmd else { # child @@ -9,7 +9,7 @@ } return ($? >> 8, join('',@out)); } -@@ -657,7 +657,7 @@ sub test_usage +@@ -782,7 +782,7 @@ sub test_usage my $command = $args{cmd}; my $commandpath = $$opts{bin}."/".$command; my ($ret,$out) = _cmd("$commandpath $args{redirection} 2>&1"); @@ -18,7 +18,7 @@ my @sections = ($out =~ m/(^[A-Za-z]+.*?)(?:(?=^[A-Za-z]+:)|\z)/msg); -@@ -708,7 +708,7 @@ sub test_usage_subcommand +@@ -833,7 +833,7 @@ sub test_usage_subcommand my $subcommand = $args{subcmd}; my $commandpath = $$opts{bin}."/".$command; my ($ret,$out) = _cmd("$commandpath $subcommand $args{redirection} 2>&1"); diff --git a/biology/bcftools/files/pkg-message.in b/biology/bcftools/files/pkg-message.in index 508265e42c5..ef35a871f42 100644 --- a/biology/bcftools/files/pkg-message.in +++ b/biology/bcftools/files/pkg-message.in @@ -3,5 +3,5 @@ The miscellaneous tools included with Bcftools have been installed to Add that directory to your path if you want to use these tools. -Some of these tools depend on Perl5, and it will need to be installed to +Some of these tools depend on Perl5/Python, and it will need to be installed to use them. diff --git a/biology/bcftools/pkg-plist b/biology/bcftools/pkg-plist index a005b7adb72..3c946a32d96 100644 --- a/biology/bcftools/pkg-plist +++ b/biology/bcftools/pkg-plist @@ -1,19 +1,32 @@ bin/bcftools bin/samtools_misc/color-chrs.pl +bin/samtools_misc/guess-ploidy.py +bin/samtools_misc/plot-roh.py bin/samtools_misc/plot-vcfstats +bin/samtools_misc/run-roh.pl bin/samtools_misc/vcfutils.pl libexec/bcftools/GTisec.so +libexec/bcftools/GTsubset.so +libexec/bcftools/ad-bias.so +libexec/bcftools/af-dist.so +libexec/bcftools/check-ploidy.so +libexec/bcftools/check-sparsity.so libexec/bcftools/color-chrs.so libexec/bcftools/counts.so libexec/bcftools/dosage.so libexec/bcftools/fill-AN-AC.so +libexec/bcftools/fill-from-fasta.so libexec/bcftools/fill-tags.so libexec/bcftools/fixploidy.so +libexec/bcftools/fixref.so libexec/bcftools/frameshifts.so +libexec/bcftools/guess-ploidy.so libexec/bcftools/impute-info.so +libexec/bcftools/isecGT.so libexec/bcftools/mendelian.so libexec/bcftools/missing2ref.so +libexec/bcftools/prune.so libexec/bcftools/setGT.so libexec/bcftools/tag2tag.so -libexec/bcftools/vcf2sex.so +libexec/bcftools/trio-switch-rate.so man/man1/bcftools.1.gz diff --git a/biology/htslib/Makefile b/biology/htslib/Makefile index 1a080d9f26b..4293a9a07b8 100644 --- a/biology/htslib/Makefile +++ b/biology/htslib/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= htslib -PORTVERSION= 1.3.1 +PORTVERSION= 1.6 CATEGORIES= biology devel MAINTAINER= cartwright@asu.edu @@ -34,16 +34,8 @@ CURL_CONFIGURE_ENABLE= libcurl CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAKE_ENV= INSTALL_LIB="${INSTALL_LIB}" \ - INSTALL_DATA="${INSTALL_DATA}" \ - INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - INSTALL_DIR="${MKDIR}" - PLIST_SUB= PORTVERSION="${PORTVERSION}" TEST_TARGET= test -post-patch: - @${REINPLACE_CMD} -e 's|@PORTVERSION@|${PORTVERSION}|g' ${WRKSRC}/configure.ac - .include diff --git a/biology/htslib/distinfo b/biology/htslib/distinfo index d5438781f02..437e0b06550 100644 --- a/biology/htslib/distinfo +++ b/biology/htslib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1463688817 -SHA256 (samtools-htslib-1.3.1_GH0.tar.gz) = 3bbd04f9a0c4c301abd5d19a81920894ac2ee5e86e8aa977e8c2035e01d93ea7 -SIZE (samtools-htslib-1.3.1_GH0.tar.gz) = 1065840 +TIMESTAMP = 1508301522 +SHA256 (samtools-htslib-1.6_GH0.tar.gz) = 4215c9153c27603cbaaf542f2ec128c5e839380d6df6edd4dbf67955170740c6 +SIZE (samtools-htslib-1.6_GH0.tar.gz) = 1155672 diff --git a/biology/htslib/files/patch-Makefile b/biology/htslib/files/patch-Makefile index 3a2b195df91..f01cc74714d 100644 --- a/biology/htslib/files/patch-Makefile +++ b/biology/htslib/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2016-04-22 08:45:12 UTC +--- Makefile.orig 2017-10-18 08:03:33 UTC +++ Makefile -@@ -22,16 +22,7 @@ +@@ -22,41 +22,26 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. @@ -8,16 +8,23 @@ -AR = ar -RANLIB = ranlib - +-# Default libraries to link if configure is not used +-htslib_default_libs = -lz -lm -lbz2 -llzma +- -CPPFLAGS = -# TODO: probably update cram code to make it compile cleanly with -Wc++-compat +-# For testing strict C99 support add -std=c99 -D_XOPEN_SOURCE=600 +-#CFLAGS = -g -Wall -O2 -pedantic -std=c99 -D_XOPEN_SOURCE=600 -D__FUNCTION__=__func__ -CFLAGS = -g -Wall -O2 EXTRA_CFLAGS_PIC = -fpic -LDFLAGS = --LIBS = +-LIBS = $(htslib_default_libs) - # For now these don't work too well as samtools also needs to know to - # add -lbz2 and -llzma if linking against the static libhts.a library. -@@ -58,17 +49,11 @@ includedir = $(prefix)/include +-prefix = /usr/local ++prefix = ${PREFIX} + exec_prefix = $(prefix) + bindir = $(exec_prefix)/bin + includedir = $(prefix)/include libdir = $(exec_prefix)/lib libexecdir = $(exec_prefix)/libexec datarootdir = $(prefix)/share @@ -27,30 +34,27 @@ man5dir = $(mandir)/man5 pkgconfigdir= $(prefix)/libdata/pkgconfig --MKDIR_P = mkdir -p + MKDIR_P = mkdir -p -INSTALL = install -p --INSTALL_PROGRAM = $(INSTALL) -INSTALL_DATA = $(INSTALL) -m 644 -INSTALL_DIR = $(MKDIR_P) -m 755 -- +-INSTALL_LIB = $(INSTALL_DATA) +-INSTALL_MAN = $(INSTALL_DATA) +-INSTALL_PROGRAM = $(INSTALL) ++INSTALL_DATA = ${BSD_INSTALL_DATA} ++INSTALL_DIR = $(MKDIR_P) ++INSTALL_LIB = ${BSD_INSTALL_LIB} ++INSTALL_MAN = ${BSD_INSTALL_MAN} ++INSTALL_PROGRAM = ${BSD_INSTALL_PROGRAM} + # Set by config.mk if plugins are enabled plugindir = - -@@ -86,7 +71,7 @@ BUILT_TEST_PROGRAMS = \ - test/test-vcf-api \ - test/test-vcf-sweep +@@ -87,7 +72,7 @@ BUILT_THRASH_PROGRAMS = \ + test/thrash_threads5 \ + test/thrash_threads6 -all: lib-static lib-shared $(BUILT_PROGRAMS) plugins $(BUILT_TEST_PROGRAMS) +all: lib-static lib-shared $(BUILT_PROGRAMS) plugins HTSPREFIX = include htslib_vars.mk -@@ -360,7 +345,7 @@ installdirs: - # and libhts.so.NN (used by client executables at runtime). - - install-so: libhts.so installdirs -- $(INSTALL_DATA) libhts.so $(DESTDIR)$(libdir)/libhts.so.$(PACKAGE_VERSION) -+ $(INSTALL_LIB) libhts.so $(DESTDIR)$(libdir)/libhts.so.$(PACKAGE_VERSION) - ln -sf libhts.so.$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libhts.so - ln -sf libhts.so.$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libhts.so.$(LIBHTS_SOVERSION) - diff --git a/biology/htslib/files/patch-configure.ac b/biology/htslib/files/patch-configure.ac deleted file mode 100644 index 8e1d8bc9ea6..00000000000 --- a/biology/htslib/files/patch-configure.ac +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac.orig 2015-12-15 16:34:33 UTC -+++ configure.ac -@@ -23,7 +23,7 @@ - # DEALINGS IN THE SOFTWARE. - - dnl Process this file with autoconf to produce a configure script --AC_INIT([HTSlib], m4_esyscmd_s([make print-version]), -+AC_INIT([HTSlib], [1.3], - [samtools-help@lists.sourceforge.net], [], [http://www.htslib.org/]) - AC_PREREQ(2.63) dnl This version introduced 4-argument AC_CHECK_HEADER - AC_CONFIG_SRCDIR(hts.c) diff --git a/biology/htslib/files/patch-hfile__libcurl.c b/biology/htslib/files/patch-hfile__libcurl.c index d9e7bb2917c..6b6ebb6e48d 100644 --- a/biology/htslib/files/patch-hfile__libcurl.c +++ b/biology/htslib/files/patch-hfile__libcurl.c @@ -1,13 +1,13 @@ ---- hfile_libcurl.c.orig 2015-12-15 16:34:33 UTC +--- hfile_libcurl.c.orig 2017-09-28 11:20:23 UTC +++ hfile_libcurl.c -@@ -39,6 +39,10 @@ DEALINGS IN THE SOFTWARE. */ - - #include +@@ -49,6 +49,10 @@ typedef struct { + unsigned int size; + } hdrlist; +#ifndef ENOTRECOVERABLE +#define ENOTRECOVERABLE EIO +#endif + typedef struct { - hFILE base; - CURL *easy; + hdrlist fixed; // List of headers supplied at hopen() + hdrlist extra; // List of headers from callback diff --git a/biology/htslib/pkg-plist b/biology/htslib/pkg-plist index 37233cb78fa..ea4eb9a990f 100644 --- a/biology/htslib/pkg-plist +++ b/biology/htslib/pkg-plist @@ -7,6 +7,9 @@ include/htslib/faidx.h include/htslib/hfile.h include/htslib/hts.h include/htslib/hts_defs.h +include/htslib/hts_endian.h +include/htslib/hts_log.h +include/htslib/hts_os.h include/htslib/kbitset.h include/htslib/kfunc.h include/htslib/khash.h @@ -20,13 +23,14 @@ include/htslib/regidx.h include/htslib/sam.h include/htslib/synced_bcf_reader.h include/htslib/tbx.h +include/htslib/thread_pool.h include/htslib/vcf.h include/htslib/vcf_sweep.h include/htslib/vcfutils.h lib/libhts.a lib/libhts.so -lib/libhts.so.1 lib/libhts.so.%%PORTVERSION%% +lib/libhts.so.2 libdata/pkgconfig/htslib.pc man/man1/htsfile.1.gz man/man1/tabix.1.gz diff --git a/biology/samtools/Makefile b/biology/samtools/Makefile index 632d0a9c001..da12548a171 100644 --- a/biology/samtools/Makefile +++ b/biology/samtools/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= samtools -PORTVERSION= 1.3.1 +PORTVERSION= 1.6 CATEGORIES= biology MAINTAINER= cartwright@asu.edu @@ -11,34 +11,22 @@ COMMENT= Tools for manipulating next-generation sequencing data LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= htslib>=1.3:biology/htslib +BUILD_DEPENDS= htslib>=1.6:biology/htslib LIB_DEPENDS= libhts.so:biology/htslib TEST_DEPENDS= bash:shells/bash USE_GITHUB= yes -USES= autoreconf gmake ncurses perl5 shebangfix +USES= autoreconf gmake ncurses perl5 python shebangfix USE_PERL5= test +PYTHON_NO_DEPENDS= yes GNU_CONFIGURE= yes SUB_FILES= pkg-message -SHEBANG_FILES= misc/*.pl misc/plot-bamstats test/test.pl +SHEBANG_FILES= misc/*.pl misc/*.py misc/plot-bamstats test/test.pl CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAKE_ENV= INSTALL_LIB="${INSTALL_LIB}" \ - INSTALL_DATA="${INSTALL_DATA}" \ - INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - INSTALL_DIR="${MKDIR}" - -PLIST_SUB= PORTVERSION="${PORTVERSION}" - TEST_TARGET= test -post-patch: - @${REINPLACE_CMD} -e 's|@PORTVERSION@|${PORTVERSION}|g' ${WRKSRC}/configure.ac - ${CP} ${FILESDIR}/ax_with_htslib.m4 ${WRKSRC}/ - ${CP} ${FILESDIR}/ax_with_curses.m4 ${WRKSRC}/ - .include diff --git a/biology/samtools/distinfo b/biology/samtools/distinfo index 439a947c14c..a0736b45298 100644 --- a/biology/samtools/distinfo +++ b/biology/samtools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1463691050 -SHA256 (samtools-samtools-1.3.1_GH0.tar.gz) = 30752c7b92cd9e146f4017983b2a41beb58c8966e93572cea76a14719f95a768 -SIZE (samtools-samtools-1.3.1_GH0.tar.gz) = 3757176 +TIMESTAMP = 1508304738 +SHA256 (samtools-samtools-1.6_GH0.tar.gz) = c0d1ffefe441297ee0eec0e032ac3131519f82fd1a11d38fbcec19e2d5822b28 +SIZE (samtools-samtools-1.6_GH0.tar.gz) = 4014195 diff --git a/biology/samtools/files/ax_with_curses.m4 b/biology/samtools/files/ax_with_curses.m4 deleted file mode 100644 index e4cbd31bae4..00000000000 --- a/biology/samtools/files/ax_with_curses.m4 +++ /dev/null @@ -1,518 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_with_curses.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_WITH_CURSES -# -# DESCRIPTION -# -# This macro checks whether a SysV or X/Open-compatible Curses library is -# present, along with the associated header file. The NcursesW -# (wide-character) library is searched for first, followed by Ncurses, -# then the system-default plain Curses. The first library found is the -# one returned. -# -# The following options are understood: --with-ncursesw, --with-ncurses, -# --without-ncursesw, --without-ncurses. The "--with" options force the -# macro to use that particular library, terminating with an error if not -# found. The "--without" options simply skip the check for that library. -# The effect on the search pattern is: -# -# (no options) - NcursesW, Ncurses, Curses -# --with-ncurses --with-ncursesw - NcursesW only [*] -# --without-ncurses --with-ncursesw - NcursesW only [*] -# --with-ncursesw - NcursesW only [*] -# --with-ncurses --without-ncursesw - Ncurses only [*] -# --with-ncurses - NcursesW, Ncurses [**] -# --without-ncurses --without-ncursesw - Curses only -# --without-ncursesw - Ncurses, Curses -# --without-ncurses - NcursesW, Curses -# -# [*] If the library is not found, abort the configure script. -# -# [**] If the second library (Ncurses) is not found, abort configure. -# -# The following preprocessor symbols may be defined by this macro if the -# appropriate conditions are met: -# -# HAVE_CURSES - if any SysV or X/Open Curses library found -# HAVE_CURSES_ENHANCED - if library supports X/Open Enhanced functions -# HAVE_CURSES_COLOR - if library supports color (enhanced functions) -# HAVE_CURSES_OBSOLETE - if library supports certain obsolete features -# HAVE_NCURSESW - if NcursesW (wide char) library is to be used -# HAVE_NCURSES - if the Ncurses library is to be used -# -# HAVE_CURSES_H - if is present and should be used -# HAVE_NCURSESW_H - if should be used -# HAVE_NCURSES_H - if should be used -# HAVE_NCURSESW_CURSES_H - if should be used -# HAVE_NCURSES_CURSES_H - if should be used -# -# (These preprocessor symbols are discussed later in this document.) -# -# The following output variable is defined by this macro; it is precious -# and may be overridden on the ./configure command line: -# -# CURSES_LIB - library to add to xxx_LDADD -# -# The library listed in CURSES_LIB is NOT added to LIBS by default. You -# need to add CURSES_LIB to the appropriate xxx_LDADD line in your -# Makefile.am. For example: -# -# prog_LDADD = @CURSES_LIB@ -# -# If CURSES_LIB is set on the configure command line (such as by running -# "./configure CURSES_LIB=-lmycurses"), then the only header searched for -# is . The user may use the CPPFLAGS precious variable to -# override the standard #include search path. If the user needs to -# specify an alternative path for a library (such as for a non-standard -# NcurseW), the user should use the LDFLAGS variable. -# -# The following shell variables may be defined by this macro: -# -# ax_cv_curses - set to "yes" if any Curses library found -# ax_cv_curses_enhanced - set to "yes" if Enhanced functions present -# ax_cv_curses_color - set to "yes" if color functions present -# ax_cv_curses_obsolete - set to "yes" if obsolete features present -# -# ax_cv_ncursesw - set to "yes" if NcursesW library found -# ax_cv_ncurses - set to "yes" if Ncurses library found -# ax_cv_plaincurses - set to "yes" if plain Curses library found -# ax_cv_curses_which - set to "ncursesw", "ncurses", "plaincurses" or "no" -# -# These variables can be used in your configure.ac to determine the level -# of support you need from the Curses library. For example, if you must -# have either Ncurses or NcursesW, you could include: -# -# AX_WITH_CURSES -# if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then -# AC_MSG_ERROR([requires either NcursesW or Ncurses library]) -# fi -# -# If any Curses library will do (but one must be present and must support -# color), you could use: -# -# AX_WITH_CURSES -# if test "x$ax_cv_curses" != xyes || test "x$ax_cv_curses_color" != xyes; then -# AC_MSG_ERROR([requires an X/Open-compatible Curses library with color]) -# fi -# -# Certain preprocessor symbols and shell variables defined by this macro -# can be used to determine various features of the Curses library. In -# particular, HAVE_CURSES and ax_cv_curses are defined if the Curses -# library found conforms to the traditional SysV and/or X/Open Base Curses -# definition. Any working Curses library conforms to this level. -# -# HAVE_CURSES_ENHANCED and ax_cv_curses_enhanced are defined if the -# library supports the X/Open Enhanced Curses definition. In particular, -# the wide-character types attr_t, cchar_t and wint_t, the functions -# wattr_set() and wget_wch() and the macros WA_NORMAL and _XOPEN_CURSES -# are checked. The Ncurses library does NOT conform to this definition, -# although NcursesW does. -# -# HAVE_CURSES_COLOR and ax_cv_curses_color are defined if the library -# supports color functions and macros such as COLOR_PAIR, A_COLOR, -# COLOR_WHITE, COLOR_RED and init_pair(). These are NOT part of the -# X/Open Base Curses definition, but are part of the Enhanced set of -# functions. The Ncurses library DOES support these functions, as does -# NcursesW. -# -# HAVE_CURSES_OBSOLETE and ax_cv_curses_obsolete are defined if the -# library supports certain features present in SysV and BSD Curses but not -# defined in the X/Open definition. In particular, the functions -# getattrs(), getcurx() and getmaxx() are checked. -# -# To use the HAVE_xxx_H preprocessor symbols, insert the following into -# your system.h (or equivalent) header file: -# -# #if defined HAVE_NCURSESW_CURSES_H -# # include -# #elif defined HAVE_NCURSESW_H -# # include -# #elif defined HAVE_NCURSES_CURSES_H -# # include -# #elif defined HAVE_NCURSES_H -# # include -# #elif defined HAVE_CURSES_H -# # include -# #else -# # error "SysV or X/Open-compatible Curses header file required" -# #endif -# -# For previous users of this macro: you should not need to change anything -# in your configure.ac or Makefile.am, as the previous (serial 10) -# semantics are still valid. However, you should update your system.h (or -# equivalent) header file to the fragment shown above. You are encouraged -# also to make use of the extended functionality provided by this version -# of AX_WITH_CURSES, as well as in the additional macros -# AX_WITH_CURSES_PANEL, AX_WITH_CURSES_MENU and AX_WITH_CURSES_FORM. -# -# LICENSE -# -# Copyright (c) 2009 Mark Pulford -# Copyright (c) 2009 Damian Pietras -# Copyright (c) 2012 Reuben Thomas -# Copyright (c) 2011 John Zaitseff -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 15 - -AU_ALIAS([MP_WITH_CURSES], [AX_WITH_CURSES]) -AC_DEFUN([AX_WITH_CURSES], [ - AC_ARG_VAR([CURSES_LIB], [linker library for Curses, e.g. -lcurses]) - AC_ARG_WITH([ncurses], [AS_HELP_STRING([--with-ncurses], - [force the use of Ncurses or NcursesW])], - [], [with_ncurses=check]) - AC_ARG_WITH([ncursesw], [AS_HELP_STRING([--without-ncursesw], - [do not use NcursesW (wide character support)])], - [], [with_ncursesw=check]) - - ax_saved_LIBS=$LIBS - AS_IF([test "x$with_ncurses" = xyes || test "x$with_ncursesw" = xyes], - [ax_with_plaincurses=no], [ax_with_plaincurses=check]) - - ax_cv_curses_which=no - - # Test for NcursesW - - AS_IF([test "x$CURSES_LIB" = x && test "x$with_ncursesw" != xno], [ - LIBS="$ax_saved_LIBS -lncursesw" - - AC_CACHE_CHECK([for NcursesW wide-character library], [ax_cv_ncursesw], [ - AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])], - [ax_cv_ncursesw=yes], [ax_cv_ncursesw=no]) - ]) - AS_IF([test "x$ax_cv_ncursesw" = xno && test "x$with_ncursesw" = xyes], [ - AC_MSG_ERROR([--with-ncursesw specified but could not find NcursesW library]) - ]) - - AS_IF([test "x$ax_cv_ncursesw" = xyes], [ - ax_cv_curses=yes - ax_cv_curses_which=ncursesw - CURSES_LIB="-lncursesw" - AC_DEFINE([HAVE_NCURSESW], [1], [Define to 1 if the NcursesW library is present]) - AC_DEFINE([HAVE_CURSES], [1], [Define to 1 if a SysV or X/Open compatible Curses library is present]) - - AC_CACHE_CHECK([for working ncursesw/curses.h], [ax_cv_header_ncursesw_curses_h], [ - AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - @%:@define _XOPEN_SOURCE_EXTENDED 1 - @%:@include - ]], [[ - chtype a = A_BOLD; - int b = KEY_LEFT; - chtype c = COLOR_PAIR(1) & A_COLOR; - attr_t d = WA_NORMAL; - cchar_t e; - wint_t f; - int g = getattrs(stdscr); - int h = getcurx(stdscr) + getmaxx(stdscr); - initscr(); - init_pair(1, COLOR_WHITE, COLOR_RED); - wattr_set(stdscr, d, 0, NULL); - wget_wch(stdscr, &f); - ]])], - [ax_cv_header_ncursesw_curses_h=yes], - [ax_cv_header_ncursesw_curses_h=no]) - ]) - AS_IF([test "x$ax_cv_header_ncursesw_curses_h" = xyes], [ - ax_cv_curses_enhanced=yes - ax_cv_curses_color=yes - ax_cv_curses_obsolete=yes - AC_DEFINE([HAVE_CURSES_ENHANCED], [1], [Define to 1 if library supports X/Open Enhanced functions]) - AC_DEFINE([HAVE_CURSES_COLOR], [1], [Define to 1 if library supports color (enhanced functions)]) - AC_DEFINE([HAVE_CURSES_OBSOLETE], [1], [Define to 1 if library supports certain obsolete features]) - AC_DEFINE([HAVE_NCURSESW_CURSES_H], [1], [Define to 1 if is present]) - ]) - - AC_CACHE_CHECK([for working ncursesw.h], [ax_cv_header_ncursesw_h], [ - AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - @%:@define _XOPEN_SOURCE_EXTENDED 1 - @%:@include - ]], [[ - chtype a = A_BOLD; - int b = KEY_LEFT; - chtype c = COLOR_PAIR(1) & A_COLOR; - attr_t d = WA_NORMAL; - cchar_t e; - wint_t f; - int g = getattrs(stdscr); - int h = getcurx(stdscr) + getmaxx(stdscr); - initscr(); - init_pair(1, COLOR_WHITE, COLOR_RED); - wattr_set(stdscr, d, 0, NULL); - wget_wch(stdscr, &f); - ]])], - [ax_cv_header_ncursesw_h=yes], - [ax_cv_header_ncursesw_h=no]) - ]) - AS_IF([test "x$ax_cv_header_ncursesw_h" = xyes], [ - ax_cv_curses_enhanced=yes - ax_cv_curses_color=yes - ax_cv_curses_obsolete=yes - AC_DEFINE([HAVE_CURSES_ENHANCED], [1], [Define to 1 if library supports X/Open Enhanced functions]) - AC_DEFINE([HAVE_CURSES_COLOR], [1], [Define to 1 if library supports color (enhanced functions)]) - AC_DEFINE([HAVE_CURSES_OBSOLETE], [1], [Define to 1 if library supports certain obsolete features]) - AC_DEFINE([HAVE_NCURSESW_H], [1], [Define to 1 if is present]) - ]) - - AC_CACHE_CHECK([for working ncurses.h], [ax_cv_header_ncurses_h_with_ncursesw], [ - AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - @%:@define _XOPEN_SOURCE_EXTENDED 1 - @%:@include - ]], [[ - chtype a = A_BOLD; - int b = KEY_LEFT; - chtype c = COLOR_PAIR(1) & A_COLOR; - attr_t d = WA_NORMAL; - cchar_t e; - wint_t f; - int g = getattrs(stdscr); - int h = getcurx(stdscr) + getmaxx(stdscr); - initscr(); - init_pair(1, COLOR_WHITE, COLOR_RED); - wattr_set(stdscr, d, 0, NULL); - wget_wch(stdscr, &f); - ]])], - [ax_cv_header_ncurses_h_with_ncursesw=yes], - [ax_cv_header_ncurses_h_with_ncursesw=no]) - ]) - AS_IF([test "x$ax_cv_header_ncurses_h_with_ncursesw" = xyes], [ - ax_cv_curses_enhanced=yes - ax_cv_curses_color=yes - ax_cv_curses_obsolete=yes - AC_DEFINE([HAVE_CURSES_ENHANCED], [1], [Define to 1 if library supports X/Open Enhanced functions]) - AC_DEFINE([HAVE_CURSES_COLOR], [1], [Define to 1 if library supports color (enhanced functions)]) - AC_DEFINE([HAVE_CURSES_OBSOLETE], [1], [Define to 1 if library supports certain obsolete features]) - AC_DEFINE([HAVE_NCURSES_H], [1], [Define to 1 if is present]) - ]) - - AS_IF([test "x$ax_cv_header_ncursesw_curses_h" = xno && test "x$ax_cv_header_ncursesw_h" = xno && test "x$ax_cv_header_ncurses_h_with_ncursesw" = xno], [ - AC_MSG_WARN([could not find a working ncursesw/curses.h, ncursesw.h or ncurses.h]) - ]) - ]) - ]) - - # Test for Ncurses - - AS_IF([test "x$CURSES_LIB" = x && test "x$with_ncurses" != xno && test "x$ax_cv_curses_which" = xno], [ - LIBS="$ax_saved_LIBS -lncurses" - - AC_CACHE_CHECK([for Ncurses library], [ax_cv_ncurses], [ - AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])], - [ax_cv_ncurses=yes], [ax_cv_ncurses=no]) - ]) - AS_IF([test "x$ax_cv_ncurses" = xno && test "x$with_ncurses" = xyes], [ - AC_MSG_ERROR([--with-ncurses specified but could not find Ncurses library]) - ]) - - AS_IF([test "x$ax_cv_ncurses" = xyes], [ - ax_cv_curses=yes - ax_cv_curses_which=ncurses - CURSES_LIB="-lncurses" - AC_DEFINE([HAVE_NCURSES], [1], [Define to 1 if the Ncurses library is present]) - AC_DEFINE([HAVE_CURSES], [1], [Define to 1 if a SysV or X/Open compatible Curses library is present]) - - AC_CACHE_CHECK([for working ncurses/curses.h], [ax_cv_header_ncurses_curses_h], [ - AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - @%:@include - ]], [[ - chtype a = A_BOLD; - int b = KEY_LEFT; - chtype c = COLOR_PAIR(1) & A_COLOR; - int g = getattrs(stdscr); - int h = getcurx(stdscr) + getmaxx(stdscr); - initscr(); - init_pair(1, COLOR_WHITE, COLOR_RED); - ]])], - [ax_cv_header_ncurses_curses_h=yes], - [ax_cv_header_ncurses_curses_h=no]) - ]) - AS_IF([test "x$ax_cv_header_ncurses_curses_h" = xyes], [ - ax_cv_curses_color=yes - ax_cv_curses_obsolete=yes - AC_DEFINE([HAVE_CURSES_COLOR], [1], [Define to 1 if library supports color (enhanced functions)]) - AC_DEFINE([HAVE_CURSES_OBSOLETE], [1], [Define to 1 if library supports certain obsolete features]) - AC_DEFINE([HAVE_NCURSES_CURSES_H], [1], [Define to 1 if is present]) - ]) - - AC_CACHE_CHECK([for working ncurses.h], [ax_cv_header_ncurses_h], [ - AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - @%:@include - ]], [[ - chtype a = A_BOLD; - int b = KEY_LEFT; - chtype c = COLOR_PAIR(1) & A_COLOR; - int g = getattrs(stdscr); - int h = getcurx(stdscr) + getmaxx(stdscr); - initscr(); - init_pair(1, COLOR_WHITE, COLOR_RED); - ]])], - [ax_cv_header_ncurses_h=yes], - [ax_cv_header_ncurses_h=no]) - ]) - AS_IF([test "x$ax_cv_header_ncurses_h" = xyes], [ - ax_cv_curses_color=yes - ax_cv_curses_obsolete=yes - AC_DEFINE([HAVE_CURSES_COLOR], [1], [Define to 1 if library supports color (enhanced functions)]) - AC_DEFINE([HAVE_CURSES_OBSOLETE], [1], [Define to 1 if library supports certain obsolete features]) - AC_DEFINE([HAVE_NCURSES_H], [1], [Define to 1 if is present]) - ]) - - AS_IF([test "x$ax_cv_header_ncurses_curses_h" = xno && test "x$ax_cv_header_ncurses_h" = xno], [ - AC_MSG_WARN([could not find a working ncurses/curses.h or ncurses.h]) - ]) - ]) - ]) - - # Test for plain Curses (or if CURSES_LIB was set by user) - - AS_IF([test "x$with_plaincurses" != xno && test "x$ax_cv_curses_which" = xno], [ - AS_IF([test "x$CURSES_LIB" != x], [ - LIBS="$ax_saved_LIBS $CURSES_LIB" - ], [ - LIBS="$ax_saved_LIBS -lcurses" - ]) - - AC_CACHE_CHECK([for Curses library], [ax_cv_plaincurses], [ - AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])], - [ax_cv_plaincurses=yes], [ax_cv_plaincurses=no]) - ]) - - AS_IF([test "x$ax_cv_plaincurses" = xyes], [ - ax_cv_curses=yes - ax_cv_curses_which=plaincurses - AS_IF([test "x$CURSES_LIB" = x], [ - CURSES_LIB="-lcurses" - ]) - AC_DEFINE([HAVE_CURSES], [1], [Define to 1 if a SysV or X/Open compatible Curses library is present]) - - # Check for base conformance (and header file) - - AC_CACHE_CHECK([for working curses.h], [ax_cv_header_curses_h], [ - AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - @%:@include - ]], [[ - chtype a = A_BOLD; - int b = KEY_LEFT; - initscr(); - ]])], - [ax_cv_header_curses_h=yes], - [ax_cv_header_curses_h=no]) - ]) - AS_IF([test "x$ax_cv_header_curses_h" = xyes], [ - AC_DEFINE([HAVE_CURSES_H], [1], [Define to 1 if is present]) - - # Check for X/Open Enhanced conformance - - AC_CACHE_CHECK([for X/Open Enhanced Curses conformance], [ax_cv_plaincurses_enhanced], [ - AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - @%:@define _XOPEN_SOURCE_EXTENDED 1 - @%:@include - @%:@ifndef _XOPEN_CURSES - @%:@error "this Curses library is not enhanced" - "this Curses library is not enhanced" - @%:@endif - ]], [[ - chtype a = A_BOLD; - int b = KEY_LEFT; - chtype c = COLOR_PAIR(1) & A_COLOR; - attr_t d = WA_NORMAL; - cchar_t e; - wint_t f; - initscr(); - init_pair(1, COLOR_WHITE, COLOR_RED); - wattr_set(stdscr, d, 0, NULL); - wget_wch(stdscr, &f); - ]])], - [ax_cv_plaincurses_enhanced=yes], - [ax_cv_plaincurses_enhanced=no]) - ]) - AS_IF([test "x$ax_cv_plaincurses_enhanced" = xyes], [ - ax_cv_curses_enhanced=yes - ax_cv_curses_color=yes - AC_DEFINE([HAVE_CURSES_ENHANCED], [1], [Define to 1 if library supports X/Open Enhanced functions]) - AC_DEFINE([HAVE_CURSES_COLOR], [1], [Define to 1 if library supports color (enhanced functions)]) - ]) - - # Check for color functions - - AC_CACHE_CHECK([for Curses color functions], [ax_cv_plaincurses_color], [ - AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - @%:@define _XOPEN_SOURCE_EXTENDED 1 - @%:@include - ]], [[ - chtype a = A_BOLD; - int b = KEY_LEFT; - chtype c = COLOR_PAIR(1) & A_COLOR; - initscr(); - init_pair(1, COLOR_WHITE, COLOR_RED); - ]])], - [ax_cv_plaincurses_color=yes], - [ax_cv_plaincurses_color=no]) - ]) - AS_IF([test "x$ax_cv_plaincurses_color" = xyes], [ - ax_cv_curses_color=yes - AC_DEFINE([HAVE_CURSES_COLOR], [1], [Define to 1 if library supports color (enhanced functions)]) - ]) - - # Check for obsolete functions - - AC_CACHE_CHECK([for obsolete Curses functions], [ax_cv_plaincurses_obsolete], [ - AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - @%:@include - ]], [[ - chtype a = A_BOLD; - int b = KEY_LEFT; - int g = getattrs(stdscr); - int h = getcurx(stdscr) + getmaxx(stdscr); - initscr(); - ]])], - [ax_cv_plaincurses_obsolete=yes], - [ax_cv_plaincurses_obsolete=no]) - ]) - AS_IF([test "x$ax_cv_plaincurses_obsolete" = xyes], [ - ax_cv_curses_obsolete=yes - AC_DEFINE([HAVE_CURSES_OBSOLETE], [1], [Define to 1 if library supports certain obsolete features]) - ]) - ]) - - AS_IF([test "x$ax_cv_header_curses_h" = xno], [ - AC_MSG_WARN([could not find a working curses.h]) - ]) - ]) - ]) - - AS_IF([test "x$ax_cv_curses" != xyes], [ax_cv_curses=no]) - AS_IF([test "x$ax_cv_curses_enhanced" != xyes], [ax_cv_curses_enhanced=no]) - AS_IF([test "x$ax_cv_curses_color" != xyes], [ax_cv_curses_color=no]) - AS_IF([test "x$ax_cv_curses_obsolete" != xyes], [ax_cv_curses_obsolete=no]) - - LIBS=$ax_saved_LIBS -])dnl diff --git a/biology/samtools/files/ax_with_htslib.m4 b/biology/samtools/files/ax_with_htslib.m4 deleted file mode 100644 index f39e4eb1427..00000000000 --- a/biology/samtools/files/ax_with_htslib.m4 +++ /dev/null @@ -1,140 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_with_htslib.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_WITH_HTSLIB -# -# DESCRIPTION -# -# This macro checks whether HTSlib is installed -# or nearby, and adds a --with-htslib=DIR option to the configure script -# for specifying the location. It locates either an installation prefix -# (with 'include' and 'lib' subdirectories) or an HTSlib source tree, as -# HTSlib is fast-moving and users may wish to use an in-development tree. -# -# Different checks occur depending on the --with-htslib argument given: -# -# With --with-htslib=DIR, checks whether DIR is a source tree or contains -# a working installation. -# By default, searches for a source tree (with a name matching htslib*) -# within or alongside $srcdir. Produces AC_MSG_ERROR if there are -# several equally-likely candidates. If there are none, checks for -# a working default installation. -# With --with-htslib=system, checks for a working default installation. -# -# If a source tree is found or specified, it is added to AC_CONFIG_SUBDIRS -# (which unfortunately may cause a "you should use literals" warning when -# autoconf is run). -# -# The following output variables are set by this macro: -# -# HTSDIR Directory containing HTSlib source tree -# HTSLIB_CPPFLAGS Preprocessor flags for compiling with HTSlib -# HTSLIB_LDFLAGS Linker flags for linking with HTSlib -# -# The following shell variables may be defined: -# -# ax_cv_htslib Set to "yes" if HTSlib was found -# ax_cv_htslib_which Set to "source", "install", or "none" -# -# LICENSE -# -# Copyright (C) 2015 Genome Research Ltd -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 1 - -AC_DEFUN([AX_WITH_HTSLIB], -[AC_ARG_WITH([htslib], - [AS_HELP_STRING([--with-htslib=DIR], - [use the HTSlib source tree or installation in DIR]) -dnl Not indented, to avoid extra whitespace outwith AS_HELP_STRING() -AS_HELP_STRING([--with-htslib=system], - [use only a system HTSlib installation])], - [], [with_htslib=search]) - -case $with_htslib in -yes|search) - AC_MSG_CHECKING([location of HTSlib source tree]) - case $srcdir in - .) srcp= ;; - *) srcp=$srcdir/ ;; - esac - found= - for dir in ${srcp}htslib* -- ${srcp}../htslib -- ${srcp}../htslib* - do - if test "$dir" = "--"; then - test -n "$found" && break - elif test -f "$dir/hts.c" && test -f "$dir/htslib/hts.h"; then - found="${found}1" - HTSDIR=$dir - fi - done - if test -z "$found"; then - AC_MSG_RESULT([none found]) - ax_cv_htslib_which=system - elif test "$found" = 1; then - AC_MSG_RESULT([$HTSDIR]) - ax_cv_htslib_which=source - else - AC_MSG_RESULT([several directories found]) - AC_MSG_ERROR([use --with-htslib=DIR to select which HTSlib to use]) - fi - ;; -no) ax_cv_htslib_which=none ;; -system) ax_cv_htslib_which=system ;; -*) - HTSDIR=$with_htslib - if test -f "$HTSDIR/hts.c" && test -f "$HTSDIR/htslib/hts.h"; then - ax_cv_htslib_which=source - else - ax_cv_htslib_which=install - fi - ;; -esac - -case $ax_cv_htslib_which in -#source) -# ax_cv_htslib=yes -# HTSLIB_CPPFLAGS="-I$HTSDIR" -# HTSLIB_LDFLAGS="-L$HTSDIR" -# # We can't use a literal, because $HTSDIR is user-provided and variable -# AC_CONFIG_SUBDIRS($HTSDIR) -# ;; -system) - AC_CHECK_HEADER([htslib/sam.h], - [AC_CHECK_LIB(hts, hts_version, [ax_cv_htslib=yes], [ax_cv_htslib=no])], - [ax_cv_htslib=no], [;]) - ax_cv_htslib_which=install - HTSDIR= - HTSLIB_CPPFLAGS= - HTSLIB_LDFLAGS= - ;; -install) - ax_saved_CPPFLAGS=$CPPFLAGS - ax_saved_LDFLAGS=$LDFLAGS - HTSLIB_CPPFLAGS="-I$HTSDIR/include" - HTSLIB_LDFLAGS="-L$HTSDIR/lib" - CPPFLAGS="$CPPFLAGS $HTSLIB_CPPFLAGS" - LDFLAGS="$LDFLAGS $HTSLIB_LDFLAGS" - AC_CHECK_HEADER([htslib/sam.h], - [AC_CHECK_LIB(hts, hts_version, [ax_cv_htslib=yes], [ax_cv_htslib=no])], - [ax_cv_htslib=no], [;]) - HTSDIR= - CPPFLAGS=$ax_saved_CPPFLAGS - LDFLAGS=$ax_saved_LDFLAGS - ;; -none) - ax_cv_htslib=no - ;; -esac - -AC_SUBST([HTSDIR]) -AC_SUBST([HTSLIB_CPPFLAGS]) -AC_SUBST([HTSLIB_LDFLAGS])]) diff --git a/biology/samtools/files/patch-Makefile b/biology/samtools/files/patch-Makefile index eaa977f79e0..afdbfd1ed1a 100644 --- a/biology/samtools/files/patch-Makefile +++ b/biology/samtools/files/patch-Makefile @@ -1,11 +1,11 @@ ---- Makefile.orig 2016-04-22 09:22:44 UTC +--- Makefile.orig 2017-09-28 11:12:01 UTC +++ Makefile -@@ -38,18 +38,18 @@ AOBJS= bam_index.o bam_plcmd.o sam_ +@@ -40,23 +40,22 @@ AOBJS= bam_index.o bam_plcmd.o sam_ bam_tview.o bam_tview_curses.o bam_tview_html.o bam_lpileup.o \ - bam_quickcheck.o bam_addrprg.o + bam_quickcheck.o bam_addrprg.o bam_markdup.o -prefix = /usr/local -+prefix = ${STAGEDIR}${PREFIX} ++prefix = ${PREFIX} exec_prefix = $(prefix) bindir = $(exec_prefix)/bin datarootdir = $(prefix)/share @@ -13,46 +13,22 @@ +mandir = $(prefix)/man man1dir = $(mandir)/man1 --MKDIR_P = mkdir -p + # Installation location for $(MISC_PROGRAMS) and $(MISC_SCRIPTS) +-misc_bindir = $(bindir) ++misc_bindir = $(bindir)/samtools_misc + + MKDIR_P = mkdir -p -INSTALL = install -p --INSTALL_PROGRAM = $(INSTALL) -INSTALL_DATA = $(INSTALL) -m 644 -INSTALL_DIR = $(MKDIR_P) -m 755 -+#MKDIR_P = mkdir -p -+#INSTALL = install -p -+#INSTALL_PROGRAM = $(INSTALL) -+#INSTALL_DATA = $(INSTALL) -m 644 -+#INSTALL_DIR = $(MKDIR_P) -m 755 +-INSTALL_MAN = $(INSTALL_DATA) +-INSTALL_PROGRAM = $(INSTALL) +-INSTALL_SCRIPT = $(INSTALL_PROGRAM) ++INSTALL_DATA = ${BSD_INSTALL_DATA} ++INSTALL_DIR = $(MKDIR_P) ++INSTALL_MAN = ${BSD_INSTALL_MAN} ++INSTALL_PROGRAM = ${BSD_INSTALL_PROGRAM} ++INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT} PROGRAMS = samtools -@@ -59,7 +59,6 @@ BUILT_MISC_PROGRAMS = \ - misc/md5fa misc/md5sum-lite misc/wgsim - - MISC_PROGRAMS = \ -- $(BUILT_MISC_PROGRAMS) \ - misc/blast2sam.pl misc/bowtie2sam.pl misc/export2sam.pl \ - misc/interpolate_sam.pl misc/novo2sam.pl \ - misc/plot-bamstats misc/psl2sam.pl \ -@@ -82,7 +81,7 @@ all: $(PROGRAMS) $(BUILT_MISC_PROGRAMS) - # TODO Use configure or htslib.pc to add -rdynamic/-ldl conditionally - ALL_CPPFLAGS = -I. $(HTSLIB_CPPFLAGS) $(CPPFLAGS) - ALL_LDFLAGS = -rdynamic $(HTSLIB_LDFLAGS) $(LDFLAGS) --ALL_LIBS = -lz -ldl $(LIBS) -+ALL_LIBS = -lz $(LIBS) - - # Usually config.mk and config.h are generated by running configure - # or config.status, but if those aren't used create defaults here. -@@ -280,8 +279,10 @@ misc/maq2sam-long.o: misc/maq2sam.c conf - - - install: $(PROGRAMS) $(BUILT_MISC_PROGRAMS) -- $(INSTALL_DIR) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) -- $(INSTALL_PROGRAM) $(PROGRAMS) $(MISC_PROGRAMS) $(DESTDIR)$(bindir) -+ $(INSTALL_DIR) $(DESTDIR)$(bindir) $(DESTDIR)$(bindir)/samtools_misc $(DESTDIR)$(man1dir) -+ $(INSTALL_PROGRAM) $(PROGRAMS) $(DESTDIR)$(bindir) -+ $(INSTALL_PROGRAM) $(BUILT_MISC_PROGRAMS) $(DESTDIR)$(bindir)/samtools_misc -+ $(INSTALL_SCRIPT) $(MISC_PROGRAMS) $(DESTDIR)$(bindir)/samtools_misc - $(INSTALL_DATA) samtools.1 misc/wgsim.1 $(DESTDIR)$(man1dir) - - diff --git a/biology/samtools/files/patch-configure.ac b/biology/samtools/files/patch-configure.ac deleted file mode 100644 index 94264e9994f..00000000000 --- a/biology/samtools/files/patch-configure.ac +++ /dev/null @@ -1,19 +0,0 @@ ---- configure.ac.orig 2015-12-15 21:26:20 UTC -+++ configure.ac -@@ -23,12 +23,15 @@ - # DEALINGS IN THE SOFTWARE. - - dnl Process this file with autoconf to produce a configure script --AC_INIT([Samtools], m4_esyscmd_s([make print-version]), -+AC_INIT([Samtools], [1.3], - [samtools-help@lists.sourceforge.net], [], [http://www.htslib.org/]) - AC_PREREQ([2.63]) dnl This version introduced 4-argument AC_CHECK_HEADER - AC_CONFIG_SRCDIR([bamtk.c]) - AC_CONFIG_HEADERS([config.h]) - -+m4_include([ax_with_htslib.m4]) -+m4_include([ax_with_curses.m4]) -+ - dnl Copyright notice to be copied into the generated configure script - AC_COPYRIGHT([Portions copyright (C) 2015 Genome Research Ltd. - diff --git a/biology/samtools/files/patch-dict.c b/biology/samtools/files/patch-dict.c deleted file mode 100644 index 5f00387a43c..00000000000 --- a/biology/samtools/files/patch-dict.c +++ /dev/null @@ -1,10 +0,0 @@ ---- dict.c.orig 2015-12-15 21:26:20 UTC -+++ dict.c -@@ -25,6 +25,7 @@ DEALINGS IN THE SOFTWARE. */ - #include - #include - #include -+#include - #include "htslib/kseq.h" - #include "htslib/hts.h" - diff --git a/biology/samtools/files/patch-errmod.c b/biology/samtools/files/patch-errmod.c deleted file mode 100644 index 4473c96af53..00000000000 --- a/biology/samtools/files/patch-errmod.c +++ /dev/null @@ -1,16 +0,0 @@ ---- errmod.c.orig 2015-12-15 21:26:20 UTC -+++ errmod.c -@@ -24,6 +24,13 @@ FROM, OUT OF OR IN CONNECTION WITH THE S - DEALINGS IN THE SOFTWARE. */ - - #include -+ -+#include -+#if defined(__FreeBSD__) && (__FreeBSD_version < 1000034) -+# define logl(x) log(x) -+# define expl(x) exp(x) -+#endif -+ - #include "errmod.h" - #include "htslib/ksort.h" - KSORT_INIT_GENERIC(uint16_t) diff --git a/biology/samtools/files/patch-test_test.pl b/biology/samtools/files/patch-test_test.pl index 918afb8be32..c8450c50056 100644 --- a/biology/samtools/files/patch-test_test.pl +++ b/biology/samtools/files/patch-test_test.pl @@ -1,15 +1,6 @@ ---- test/test.pl.orig 2015-12-22 22:43:15 UTC +--- test/test.pl.orig 2017-10-18 06:08:39 UTC +++ test/test.pl -@@ -136,7 +136,7 @@ sub _cmd - else - { - # child -- exec('/bin/bash', '-o','pipefail','-c', "($cmd) 2> $err_filename") or error("Cannot execute the command [/bin/sh -o pipefail -c $cmd]: $!"); -+ exec('/usr/local/bin/bash', '-o','pipefail','-c', "($cmd) 2> $err_filename") or error("Cannot execute the command [/usr/local/bin/bash -o pipefail -c $cmd]: $!"); - } - } - sub cmd -@@ -560,7 +560,7 @@ sub test_usage +@@ -636,7 +636,7 @@ sub test_usage my $command = $args{cmd}; my $commandpath = $$opts{bin}."/".$command; my ($ret,$out,$err) = _cmd("$commandpath $args{redirection}"); @@ -18,7 +9,7 @@ my @sections = ($err =~ m/(^[A-Za-z]+.*?)(?:(?=^[A-Za-z]+:)|\z)/msg); -@@ -615,7 +615,7 @@ sub test_usage_subcommand +@@ -694,7 +694,7 @@ sub test_usage_subcommand my $commandpath = $$opts{bin}."/".$command; my ($ret,$out,$err) = _cmd("$commandpath $subcommand $args{redirection}"); diff --git a/biology/samtools/files/pkg-message.in b/biology/samtools/files/pkg-message.in index e996d1340a7..388a94893ec 100644 --- a/biology/samtools/files/pkg-message.in +++ b/biology/samtools/files/pkg-message.in @@ -3,5 +3,5 @@ The miscellaneous tools included with Samtools have been installed to Add that directory to your path if you want to use these tools. -Some of these tools depend on Perl5, and it will need to be installed to +Some of these tools depend on Perl5/Python, and it will need to be installed to use them. diff --git a/cad/iverilog/Makefile b/cad/iverilog/Makefile index 8658975c275..45b025e3eed 100644 --- a/cad/iverilog/Makefile +++ b/cad/iverilog/Makefile @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= iverilog -PORTVERSION= 10.1.1 +PORTVERSION= 10.2 CATEGORIES= cad -MASTER_SITES= ftp://icarus.com/pub/eda/verilog/v${PORTVERSION:C,\.[0-9]\.[0-9]$,,}/ +MASTER_SITES= ftp://icarus.com/pub/eda/verilog/v10/ DISTNAME= verilog-${PORTVERSION} MAINTAINER= zeising@FreeBSD.org @@ -14,8 +14,7 @@ LICENSE= GPLv2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-suffix -USES= bison gmake -MAKE_JOBS_UNSAFE= yes +USES= bison gmake readline .include diff --git a/cad/iverilog/distinfo b/cad/iverilog/distinfo index f4b35dbf846..baaffb2c46b 100644 --- a/cad/iverilog/distinfo +++ b/cad/iverilog/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1464367614 -SHA256 (verilog-10.1.1.tar.gz) = fdaa75dfe7c58cbc471fc12710ee49b3f32fd6cc055d9181b5190cbcbbd6cada -SIZE (verilog-10.1.1.tar.gz) = 1684925 +TIMESTAMP = 1508676832 +SHA256 (verilog-10.2.tar.gz) = 96dedbddb12d375edb45a144a926a3ba1e3e138d6598b18e7d79f2ae6de9e500 +SIZE (verilog-10.2.tar.gz) = 1695227 diff --git a/cad/iverilog/files/patch-load_module.cc b/cad/iverilog/files/patch-load_module.cc deleted file mode 100644 index 4fb17b22154..00000000000 --- a/cad/iverilog/files/patch-load_module.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- load_module.cc.orig 2015-08-23 21:41:41 UTC -+++ load_module.cc -@@ -21,6 +21,7 @@ - # include "util.h" - # include "parse_api.h" - # include "compiler.h" -+# include - # include - # include - # include diff --git a/databases/galera/Makefile b/databases/galera/Makefile index 27339010c30..dd07c199214 100644 --- a/databases/galera/Makefile +++ b/databases/galera/Makefile @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= galera -PORTVERSION?= 25.3.21 +PORTVERSION?= 25.3.22 DISTVERSIONPREFIX?= release_ -PORTREVISION= 2 CATEGORIES= databases MAINTAINER= devel@galeracluster.com diff --git a/databases/galera/distinfo b/databases/galera/distinfo index a437ee68348..b70acc4b376 100644 --- a/databases/galera/distinfo +++ b/databases/galera/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1501158019 -SHA256 (codership-galera-release_25.3.21_GH0.tar.gz) = dc0d8e9bcbd16de98c3ee558f7e7e2cf4596670a2e2e38a03d3e45bf5c9ebd5e -SIZE (codership-galera-release_25.3.21_GH0.tar.gz) = 3276033 +TIMESTAMP = 1508930849 +SHA256 (codership-galera-release_25.3.22_GH0.tar.gz) = cf9d13af44411c8e09222554eb7b6dd82896ad4fe8c2cb54066862abbefef8fb +SIZE (codership-galera-release_25.3.22_GH0.tar.gz) = 3278520 diff --git a/databases/galera/files/patch-gcomm__src__asio_tcp.cpp b/databases/galera/files/patch-gcomm__src__asio_tcp.cpp deleted file mode 100644 index 2f641dd9972..00000000000 --- a/databases/galera/files/patch-gcomm__src__asio_tcp.cpp +++ /dev/null @@ -1,115 +0,0 @@ ---- gcomm/src/asio_tcp.cpp.orig 2017-01-25 07:55:06 UTC -+++ gcomm/src/asio_tcp.cpp -@@ -231,10 +231,18 @@ void gcomm::AsioTcpSocket::close() - } - } - -+// Enable to introduce random errors for write handler -+// #define GCOMM_ASIO_TCP_SIMULATE_WRITE_HANDLER_ERROR - - void gcomm::AsioTcpSocket::write_handler(const asio::error_code& ec, - size_t bytes_transferred) - { -+#ifdef GCOMM_ASIO_TCP_SIMULATE_WRITE_HANDLER_ERROR -+ static const long empty_rate(10000); -+ static const long bytes_transferred_less_than_rate(10000); -+ static const long bytes_transferred_not_zero_rate(10000); -+#endif // GCOMM_ASIO_TCP_SIMULATE_WRITE_HANDLER_ERROR -+ - Critical crit(net_); - - if (state() != S_CONNECTED && state() != S_CLOSING) -@@ -252,34 +260,70 @@ void gcomm::AsioTcpSocket::write_handler - - if (!ec) - { -- gcomm_assert(send_q_.empty() == false); -- gcomm_assert(send_q_.front().len() >= bytes_transferred); -- -- while (send_q_.empty() == false && -- bytes_transferred >= send_q_.front().len()) -+ if (send_q_.empty() == true -+#ifdef GCOMM_ASIO_TCP_SIMULATE_WRITE_HANDLER_ERROR -+ || ::rand() % empty_rate == 0 -+#endif // GCOMM_ASIO_TCP_SIMULATE_WRITE_HANDLER_ERROR -+ ) - { -- const Datagram& dg(send_q_.front()); -- bytes_transferred -= dg.len(); -- send_q_.pop_front(); -+ log_warn << "write_handler() called with empty send_q_. " -+ << "Transport may not be reliable, closing the socket"; -+ FAILED_HANDLER(asio::error_code(EPROTO, -+ asio::error::system_category)); - } -- gcomm_assert(bytes_transferred == 0); -- -- if (send_q_.empty() == false) -+ else if (send_q_.front().len() < bytes_transferred -+#ifdef GCOMM_ASIO_TCP_SIMULATE_WRITE_HANDLER_ERROR -+ || ::rand() % bytes_transferred_less_than_rate == 0 -+#endif // GCOMM_ASIO_TCP_SIMULATE_WRITE_HANDLER_ERROR -+ ) - { -- const Datagram& dg(send_q_.front()); -- boost::array cbs; -- cbs[0] = asio::const_buffer(dg.header() -- + dg.header_offset(), -- dg.header_len()); -- cbs[1] = asio::const_buffer(&dg.payload()[0], -- dg.payload().size()); -- write_one(cbs); -+ log_warn << "write_handler() bytes_transferred " -+ << bytes_transferred -+ << " less than sent " -+ << send_q_.front().len() -+ << ". Transport may not be reliable, closing the socket"; -+ FAILED_HANDLER(asio::error_code(EPROTO, -+ asio::error::system_category)); - } -- else if (state_ == S_CLOSING) -+ else - { -- log_debug << "deferred close of " << id(); -- close_socket(); -- state_ = S_CLOSED; -+ while (send_q_.empty() == false && -+ bytes_transferred >= send_q_.front().len()) -+ { -+ const Datagram& dg(send_q_.front()); -+ bytes_transferred -= dg.len(); -+ send_q_.pop_front(); -+ } -+ if (bytes_transferred != 0 -+#ifdef GCOMM_ASIO_TCP_SIMULATE_WRITE_HANDLER_ERROR -+ || ::rand() % bytes_transferred_not_zero_rate == 0 -+#endif // GCOMM_ASIO_TCP_SIMULATE_WRITE_HANDLER_ERROR -+ ) -+ { -+ log_warn << "write_handler() bytes_transferred " -+ << bytes_transferred -+ << " after processing the send_q_. " -+ << "Transport may not be reliable, closing the socket"; -+ FAILED_HANDLER(asio::error_code(EPROTO, -+ asio::error::system_category)); -+ } -+ else if (send_q_.empty() == false) -+ { -+ const Datagram& dg(send_q_.front()); -+ boost::array cbs; -+ cbs[0] = asio::const_buffer(dg.header() -+ + dg.header_offset(), -+ dg.header_len()); -+ cbs[1] = asio::const_buffer(&dg.payload()[0], -+ dg.payload().size()); -+ write_one(cbs); -+ } -+ else if (state_ == S_CLOSING) -+ { -+ log_debug << "deferred close of " << id(); -+ close_socket(); -+ state_ = S_CLOSED; -+ } - } - } - else if (state_ == S_CLOSING) diff --git a/databases/mysqlwsrep56-server/Makefile b/databases/mysqlwsrep56-server/Makefile index 53ef95448b8..d23419f19d6 100644 --- a/databases/mysqlwsrep56-server/Makefile +++ b/databases/mysqlwsrep56-server/Makefile @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= mysqlwsrep -PORTVERSION?= 5.6.36 +PORTVERSION?= 5.6.38 DISTVERSIONPREFIX?= wsrep_ -DISTVERSIONSUFFIX?= -25.20 -PORTREVISION?= 2 +DISTVERSIONSUFFIX?= -25.21 CATEGORIES= databases ipv6 PKGNAMESUFFIX= 56-server diff --git a/databases/mysqlwsrep56-server/distinfo b/databases/mysqlwsrep56-server/distinfo index 3c371e33af1..8a4b5211826 100644 --- a/databases/mysqlwsrep56-server/distinfo +++ b/databases/mysqlwsrep56-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1501158237 -SHA256 (codership-mysql-wsrep-wsrep_5.6.36-25.20_GH0.tar.gz) = b40e01d95d8ccc5c23b9f1bf6c43c93776a7f542d57c14da661191b5a656754b -SIZE (codership-mysql-wsrep-wsrep_5.6.36-25.20_GH0.tar.gz) = 32374284 +TIMESTAMP = 1508939312 +SHA256 (codership-mysql-wsrep-wsrep_5.6.38-25.21_GH0.tar.gz) = 9fcad79b2a8940c5a16077790f2b0eebc9ca5c75679f010cfe78ec6d939e965a +SIZE (codership-mysql-wsrep-wsrep_5.6.38-25.21_GH0.tar.gz) = 32414996 diff --git a/devel/kf5-extra-cmake-modules/Makefile b/devel/kf5-extra-cmake-modules/Makefile index e4173f96d23..5ccf0448787 100644 --- a/devel/kf5-extra-cmake-modules/Makefile +++ b/devel/kf5-extra-cmake-modules/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= extra-cmake-modules -PORTVERSION= ${KDE_FRAMEWORKS_VERSION} +DISTVERSION= ${KDE_FRAMEWORKS_VERSION} CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org diff --git a/devel/kf5-kapidox/Makefile b/devel/kf5-kapidox/Makefile index e20e6557f2f..0c9cd45a78f 100644 --- a/devel/kf5-kapidox/Makefile +++ b/devel/kf5-kapidox/Makefile @@ -2,12 +2,15 @@ # $FreeBSD$ PORTNAME= kapidox -PORTVERSION= ${KDE_FRAMEWORKS_VERSION} +DISTVERSION= ${KDE_FRAMEWORKS_VERSION} CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org COMMENT= KF5 API Documentation Tools +LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE + USES= cmake:outsource kde:5 python tar:xz USE_KDE= archive ecm USE_QT5= buildtools_build qmake_build diff --git a/devel/kf5-kconfig/Makefile b/devel/kf5-kconfig/Makefile index 8510ccf82f2..32cbc19a5bc 100644 --- a/devel/kf5-kconfig/Makefile +++ b/devel/kf5-kconfig/Makefile @@ -2,12 +2,16 @@ # $FreeBSD$ PORTNAME= kconfig -PORTVERSION= ${KDE_FRAMEWORKS_VERSION} +DISTVERSION= ${KDE_FRAMEWORKS_VERSION} CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org COMMENT= KF5 widgets for configuration dialogs +# Sources say LGPL20+, KDE policy says LGPL21+, license file is LGPL21 +LICENSE= LGPL21+ +LICENSE_FILE= ${WRKSRC}/COPYING.LIB + USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz USE_KDE= ecm USE_QT5= buildtools_build concurrent core gui linguisttools \ diff --git a/devel/kf5-kcoreaddons/Makefile b/devel/kf5-kcoreaddons/Makefile index 5b41f2a670e..e0c2f221dc8 100644 --- a/devel/kf5-kcoreaddons/Makefile +++ b/devel/kf5-kcoreaddons/Makefile @@ -2,12 +2,17 @@ # $FreeBSD$ PORTNAME= kcoreaddons -PORTVERSION= ${KDE_FRAMEWORKS_VERSION} +DISTVERSION= ${KDE_FRAMEWORKS_VERSION} CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org COMMENT= KF5 addons to QtCore +LICENSE= LGPL21+ BSD3CLAUSE +LICENSE_COMB= multi +LICENSE_FILE_LGPL21+= ${WRKSRC}/COPYING.LIB +LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/COPYING-CMAKE-SCRIPTS + USES= cmake:outsource compiler:c++11-lib kde:5 shared-mime-info tar:xz USE_KDE= ecm USE_QT5= buildtools_build core linguisttools qmake_build diff --git a/devel/kf5-kdbusaddons/Makefile b/devel/kf5-kdbusaddons/Makefile index 8eaa60334ff..947ff943015 100644 --- a/devel/kf5-kdbusaddons/Makefile +++ b/devel/kf5-kdbusaddons/Makefile @@ -2,12 +2,15 @@ # $FreeBSD$ PORTNAME= kdbusaddons -PORTVERSION= ${KDE_FRAMEWORKS_VERSION} +DISTVERSION= ${KDE_FRAMEWORKS_VERSION} CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org COMMENT= KF5 addons to QtDBus +LICENSE= LGPL21+ +LICENSE_FILE= ${WRKSRC}/COPYING.LIB + USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz USE_KDE= ecm USE_QT5= buildtools_build core dbus gui linguisttools \ diff --git a/devel/py-apscheduler/Makefile b/devel/py-apscheduler/Makefile index 1905c60c15b..990f0a75815 100644 --- a/devel/py-apscheduler/Makefile +++ b/devel/py-apscheduler/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= apscheduler -PORTVERSION= 3.3.1 +PORTVERSION= 3.4.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-apscheduler/distinfo b/devel/py-apscheduler/distinfo index 3a4a3483dee..b64c81e4201 100644 --- a/devel/py-apscheduler/distinfo +++ b/devel/py-apscheduler/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1482877432 -SHA256 (APScheduler-3.3.1.tar.gz) = f68874dff1bdffcc6ce3adb7840c1e4d162c609a3e3f831351df30b75732767b -SIZE (APScheduler-3.3.1.tar.gz) = 84198 +TIMESTAMP = 1508593119 +SHA256 (APScheduler-3.4.0.tar.gz) = b51118a8ed014104f7e440456dcbd90f2015aea7bcc34c57e307fb34bc746316 +SIZE (APScheduler-3.4.0.tar.gz) = 85878 diff --git a/devel/sdl20/Makefile b/devel/sdl20/Makefile index bd1823776ed..f9794a38e52 100644 --- a/devel/sdl20/Makefile +++ b/devel/sdl20/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= sdl2 -PORTVERSION= 2.0.6 -PORTREVISION= 1 +PORTVERSION= 2.0.7 CATEGORIES= devel MASTER_SITES= http://www.libsdl.org/release/ DISTNAME= SDL2-${PORTVERSION} diff --git a/devel/sdl20/distinfo b/devel/sdl20/distinfo index 6ca7f834d85..c554f21e6ad 100644 --- a/devel/sdl20/distinfo +++ b/devel/sdl20/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1506106261 -SHA256 (SDL2-2.0.6.tar.gz) = 03658b5660d16d7b31263a691e058ed37acdab155d68dabbad79998fb552c5df -SIZE (SDL2-2.0.6.tar.gz) = 4420311 +TIMESTAMP = 1508786865 +SHA256 (SDL2-2.0.7.tar.gz) = ee35c74c4313e2eda104b14b1b86f7db84a04eeab9430d56e001cea268bf4d5e +SIZE (SDL2-2.0.7.tar.gz) = 4432499 diff --git a/devel/sdl20/files/patch-src_video_SDL__surface.c b/devel/sdl20/files/patch-src_video_SDL__surface.c deleted file mode 100644 index ba55080fa22..00000000000 --- a/devel/sdl20/files/patch-src_video_SDL__surface.c +++ /dev/null @@ -1,31 +0,0 @@ -SDL_FreeSurface deallocates surface->map even if the surface is not yet freed -https://bugzilla.libsdl.org/show_bug.cgi?id=3852 - -Memory leak in SDL_FreeSurface (after bug 3852 fix) -https://bugzilla.libsdl.org/show_bug.cgi?id=3855 - ---- src/video/SDL_surface.c.orig 2017-09-22 18:51:01 UTC -+++ src/video/SDL_surface.c -@@ -1198,10 +1198,8 @@ SDL_FreeSurface(SDL_Surface * surface) - if (surface->flags & SDL_DONTFREE) { - return; - } -- if (surface->map != NULL) { -- SDL_FreeBlitMap(surface->map); -- surface->map = NULL; -- } -+ SDL_InvalidateMap(surface->map); -+ - if (--surface->refcount > 0) { - return; - } -@@ -1219,6 +1217,9 @@ SDL_FreeSurface(SDL_Surface * surface) - if (!(surface->flags & SDL_PREALLOC)) { - SDL_free(surface->pixels); - } -+ if (surface->map) { -+ SDL_FreeBlitMap(surface->map); -+ } - SDL_free(surface); - } - diff --git a/devel/sdl20/pkg-plist b/devel/sdl20/pkg-plist index bc2c90a0e00..5460f6ecc45 100644 --- a/devel/sdl20/pkg-plist +++ b/devel/sdl20/pkg-plist @@ -60,6 +60,7 @@ include/SDL2/SDL_test_harness.h include/SDL2/SDL_test_images.h include/SDL2/SDL_test_log.h include/SDL2/SDL_test_md5.h +include/SDL2/SDL_test_memory.h include/SDL2/SDL_test_random.h include/SDL2/SDL_thread.h include/SDL2/SDL_timer.h @@ -72,7 +73,7 @@ include/SDL2/begin_code.h include/SDL2/close_code.h lib/cmake/SDL2/sdl2-config.cmake lib/libSDL2-2.0.so.0 -lib/libSDL2-2.0.so.0.6.0 +lib/libSDL2-2.0.so.0.7.0 lib/libSDL2.a lib/libSDL2.so lib/libSDL2_test.a diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile index 65e5c062481..c1b47150ded 100644 --- a/dns/bind9-devel/Makefile +++ b/dns/bind9-devel/Makefile @@ -8,7 +8,7 @@ PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} PORTREVISION= 0 .else # dns/bind9xx here -PORTREVISION= 0 +PORTREVISION= 1 .endif CATEGORIES= dns net ipv6 MASTER_SITES= LOCAL/mat/bind @@ -269,8 +269,8 @@ post-install: ${INSTALL_DATA} ${FILESDIR}/empty.db ${STAGEDIR}${ETCDIR}/master ${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${STAGEDIR}${ETCDIR}/master ${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${ETCDIR}/master - ${INSTALL_DATA} ${FILESDIR}/BIND.chroot.dist ${STAGEDIR}${PREFIX}/etc/mtree - ${INSTALL_DATA} ${FILESDIR}/BIND.chroot.local.dist ${STAGEDIR}${PREFIX}/etc/mtree + ${INSTALL_DATA} ${FILESDIR}/BIND.chroot.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.dist.sample + ${INSTALL_DATA} ${FILESDIR}/BIND.chroot.local.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.local.dist.sample ${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \ ${STAGEDIR}${ETCDIR}/rndc.conf.sample diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist index 19f94766dcb..7956c19d606 100644 --- a/dns/bind9-devel/pkg-plist +++ b/dns/bind9-devel/pkg-plist @@ -9,8 +9,8 @@ bin/mdig bin/named-rrchecker bin/nslookup bin/nsupdate -etc/mtree/BIND.chroot.dist -etc/mtree/BIND.chroot.local.dist +@sample etc/mtree/BIND.chroot.dist.sample +@sample etc/mtree/BIND.chroot.local.dist.sample %%ETCDIR%%/bind.keys %%ETCDIR%%/master/empty.db %%ETCDIR%%/master/localhost-forward.db diff --git a/dns/bind910/Makefile b/dns/bind910/Makefile index 377c9bd959f..6035fbe6fa9 100644 --- a/dns/bind910/Makefile +++ b/dns/bind910/Makefile @@ -3,7 +3,7 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX= 910 @@ -219,8 +219,8 @@ post-install: ${INSTALL_DATA} ${FILESDIR}/empty.db ${STAGEDIR}${ETCDIR}/master ${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${STAGEDIR}${ETCDIR}/master ${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${ETCDIR}/master - ${INSTALL_DATA} ${FILESDIR}/BIND.chroot.dist ${STAGEDIR}${PREFIX}/etc/mtree - ${INSTALL_DATA} ${FILESDIR}/BIND.chroot.local.dist ${STAGEDIR}${PREFIX}/etc/mtree + ${INSTALL_DATA} ${FILESDIR}/BIND.chroot.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.dist.sample + ${INSTALL_DATA} ${FILESDIR}/BIND.chroot.local.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.local.dist.sample ${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \ ${STAGEDIR}${ETCDIR}/rndc.conf.sample diff --git a/dns/bind910/pkg-plist b/dns/bind910/pkg-plist index 148657f0064..6dc746bdb47 100644 --- a/dns/bind910/pkg-plist +++ b/dns/bind910/pkg-plist @@ -7,8 +7,8 @@ bin/isc-config.sh bin/named-rrchecker bin/nslookup bin/nsupdate -etc/mtree/BIND.chroot.dist -etc/mtree/BIND.chroot.local.dist +@sample etc/mtree/BIND.chroot.dist.sample +@sample etc/mtree/BIND.chroot.local.dist.sample %%ETCDIR%%/bind.keys %%ETCDIR%%/master/empty.db %%ETCDIR%%/master/localhost-forward.db diff --git a/dns/bind99/Makefile b/dns/bind99/Makefile index 5cb27199eba..fb28c7cfb34 100644 --- a/dns/bind99/Makefile +++ b/dns/bind99/Makefile @@ -3,7 +3,7 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX= 99 @@ -202,8 +202,8 @@ post-install: ${INSTALL_DATA} ${FILESDIR}/empty.db ${STAGEDIR}${ETCDIR}/master ${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${STAGEDIR}${ETCDIR}/master ${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${ETCDIR}/master - ${INSTALL_DATA} ${FILESDIR}/BIND.chroot.dist ${STAGEDIR}${PREFIX}/etc/mtree - ${INSTALL_DATA} ${FILESDIR}/BIND.chroot.local.dist ${STAGEDIR}${PREFIX}/etc/mtree + ${INSTALL_DATA} ${FILESDIR}/BIND.chroot.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.dist.sample + ${INSTALL_DATA} ${FILESDIR}/BIND.chroot.local.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.local.dist.sample ${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \ ${STAGEDIR}${ETCDIR}/rndc.conf.sample diff --git a/dns/bind99/pkg-plist b/dns/bind99/pkg-plist index 96765acd110..455fe4319a1 100644 --- a/dns/bind99/pkg-plist +++ b/dns/bind99/pkg-plist @@ -5,8 +5,8 @@ bin/host bin/isc-config.sh bin/nslookup bin/nsupdate -etc/mtree/BIND.chroot.dist -etc/mtree/BIND.chroot.local.dist +@sample etc/mtree/BIND.chroot.dist.sample +@sample etc/mtree/BIND.chroot.local.dist.sample %%ETCDIR%%/bind.keys %%ETCDIR%%/master/empty.db %%ETCDIR%%/master/localhost-forward.db diff --git a/emulators/fuse/Makefile b/emulators/fuse/Makefile index 804a5c23a40..9b2964a4f78 100644 --- a/emulators/fuse/Makefile +++ b/emulators/fuse/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= fuse -PORTVERSION= 1.4.0 +PORTVERSION= 1.4.1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}-emulator/${PORTNAME}/${PORTVERSION} diff --git a/emulators/fuse/distinfo b/emulators/fuse/distinfo index 8d3ab9f0a8b..527a3c47746 100644 --- a/emulators/fuse/distinfo +++ b/emulators/fuse/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1505558455 -SHA256 (fuse-1.4.0.tar.gz) = 75ac811534c7e352f238b1959a7f6478661bc4103f96dd1166ec395ad7523d97 -SIZE (fuse-1.4.0.tar.gz) = 1652821 +TIMESTAMP = 1508788895 +SHA256 (fuse-1.4.1.tar.gz) = 817d57db6da95a411b5b44ccae2a00fff332b251b502957a8a886d794d475aa3 +SIZE (fuse-1.4.1.tar.gz) = 1654522 diff --git a/emulators/libspectrum/Makefile b/emulators/libspectrum/Makefile index f48235d53f3..011a257bf75 100644 --- a/emulators/libspectrum/Makefile +++ b/emulators/libspectrum/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libspectrum -PORTVERSION= 1.4.0 +PORTVERSION= 1.4.1 CATEGORIES= emulators devel MASTER_SITES= SF/fuse-emulator/${PORTNAME}/${PORTVERSION} diff --git a/emulators/libspectrum/distinfo b/emulators/libspectrum/distinfo index 321047fc7cc..32b1c06af1c 100644 --- a/emulators/libspectrum/distinfo +++ b/emulators/libspectrum/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1505638448 -SHA256 (libspectrum-1.4.0.tar.gz) = 6207d60e259fac2c2074b2149ff64914d656b658fb002d002a2be30bf0e6185f -SIZE (libspectrum-1.4.0.tar.gz) = 514972 +TIMESTAMP = 1508788575 +SHA256 (libspectrum-1.4.1.tar.gz) = 025a1663491cc58174e91df77d82b28782310f6831485cb14291ce774f23c729 +SIZE (libspectrum-1.4.1.tar.gz) = 516697 diff --git a/emulators/libspectrum/pkg-plist b/emulators/libspectrum/pkg-plist index 3c15012c462..b5805839a3c 100644 --- a/emulators/libspectrum/pkg-plist +++ b/emulators/libspectrum/pkg-plist @@ -2,7 +2,7 @@ include/libspectrum.h lib/libspectrum.a lib/libspectrum.so lib/libspectrum.so.8 -lib/libspectrum.so.8.7.10 +lib/libspectrum.so.8.7.11 libdata/pkgconfig/libspectrum.pc man/man3/libspectrum.3.gz %%PORTDOCS%%%%DOCSDIR%%/AUTHORS diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile index f2923d9f994..27c4d8600a0 100644 --- a/emulators/virtualbox-ose-kmod/Makefile +++ b/emulators/virtualbox-ose-kmod/Makefile @@ -3,6 +3,7 @@ PORTNAME= virtualbox-ose PORTVERSION= 5.2.0 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/ PKGNAMESUFFIX= -kmod @@ -41,6 +42,7 @@ CONFLICTS_INSTALL= virtualbox-ose-kmod-devel-* \ virtualbox-ose-kmod-legacy-* OPTIONS_DEFINE= DEBUG VIMAGE +OPTIONS_DEFAULT=VIMAGE OPTIONS_SUB= yes DEBUG_DESC= Debug symbols, additional logs and assertions VIMAGE_DESC= VIMAGE virtual networking support diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index cd39ee9ad1b..92b756b1b03 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -3,6 +3,7 @@ PORTNAME= virtualbox-ose PORTVERSION= 5.2.0 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/ DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS} @@ -30,7 +31,7 @@ CPE_PRODUCT= vm_virtualbox WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION} ONLY_FOR_ARCHS= i386 amd64 -USES= compiler:c++11-lang cpe iconv pkgconfig ssl tar:bzip2 +USES= compiler:c++14-lang cpe iconv pkgconfig ssl tar:bzip2 USE_GNOME= libidl libxml2 HAS_CONFIGURE= yes @@ -276,7 +277,6 @@ post-patch: ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $$(VBOX_GCC_WARN) -Wno-long-long' >> \ ${WRKSRC}/LocalConfig.kmk - @${ECHO} 'VBOX_GCC_std = -std=c++11' >> ${WRKSRC}/LocalConfig.kmk .endif .if ${COMPILER_TYPE} == clang @${REINPLACE_CMD} -e 's| -finline-limit=8000||' \ diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Debugger_Makefile.kmk b/emulators/virtualbox-ose/files/patch-src_VBox_Debugger_Makefile.kmk new file mode 100644 index 00000000000..8a9cc4c3481 --- /dev/null +++ b/emulators/virtualbox-ose/files/patch-src_VBox_Debugger_Makefile.kmk @@ -0,0 +1,10 @@ +--- src/VBox/Debugger/Makefile.kmk.orig 2017-10-18 07:09:03 UTC ++++ src/VBox/Debugger/Makefile.kmk +@@ -109,6 +109,7 @@ VBoxDbg_SOURCES = \ + VBoxDbgBase.cpp \ + VBoxDbgConsole.cpp \ + VBoxDbgStatsQt.cpp ++VBoxDbg_CXXFLAGS.freebsd += -std=c++11 + VBoxDbg_LIBS = \ + $(VBOX_LIB_VMM_LAZY) + VBoxDbg_LDFLAGS.darwin = \ diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VirtualBox_Makefile.kmk b/emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VirtualBox_Makefile.kmk new file mode 100644 index 00000000000..d57e276cf6e --- /dev/null +++ b/emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VirtualBox_Makefile.kmk @@ -0,0 +1,18 @@ +--- src/VBox/Frontends/VirtualBox/Makefile.kmk.orig 2017-10-18 07:12:20 UTC ++++ src/VBox/Frontends/VirtualBox/Makefile.kmk +@@ -895,6 +895,7 @@ if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI + VirtualBox_SOURCES += \ + src/VBoxFBOverlay.cpp \ + src/VBoxGLSupportInfo.cpp ++ VirtualBox_CXXFLAGS.freebsd += -std=c++11 + endif + + # +@@ -1217,6 +1218,7 @@ if defined(VBOX_WITH_VIDEOHWACCEL) + VBoxOGL2D_SOURCES = \ + src/VBoxGLSupportInfo.cpp + VBoxOGL2D_INCS = include ++ VBoxOGL2D_CXXFLAGS.freebsd += -std=c++11 + endif + endif + diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_HostServices_SharedClipboard_x11-stub.cpp b/emulators/virtualbox-ose/files/patch-src_VBox_HostServices_SharedClipboard_x11-stub.cpp new file mode 100644 index 00000000000..c2868cd79b1 --- /dev/null +++ b/emulators/virtualbox-ose/files/patch-src_VBox_HostServices_SharedClipboard_x11-stub.cpp @@ -0,0 +1,37 @@ +--- src/VBox/HostServices/SharedClipboard/x11-stub.cpp.orig 2017-10-18 07:12:48 UTC ++++ src/VBox/HostServices/SharedClipboard/x11-stub.cpp +@@ -55,7 +55,7 @@ void vboxClipboardDestroy (void) + int vboxClipboardConnect (VBOXCLIPBOARDCLIENTDATA *pClient, + bool fHeadless) + { +- NOREF(pClient, fHeadless); ++ RT_NOREF2(pClient, fHeadless); + LogFlowFunc(("called, returning VINF_SUCCESS.\n")); + return VINF_SUCCESS; + } +@@ -91,7 +91,7 @@ void vboxClipboardDisconnect (VBOXCLIPBOARDCLIENTDATA + void vboxClipboardFormatAnnounce (VBOXCLIPBOARDCLIENTDATA *pClient, + uint32_t u32Formats) + { +- NOREF(pClient, u32Formats); ++ RT_NOREF2(pClient, u32Formats); + LogFlowFunc(("called, returning.\n")); + } + +@@ -107,7 +107,7 @@ void vboxClipboardFormatAnnounce (VBOXCLIPBOARDCLIENTD + int vboxClipboardReadData (VBOXCLIPBOARDCLIENTDATA *pClient, uint32_t u32Format, + void *pv, uint32_t cb, uint32_t *pcbActual) + { +- NOREF(pClient, u32Format, pv, cb); ++ RT_NOREF4(pClient, u32Format, pv, cb); + LogFlowFunc(("called, returning VINF_SUCCESS.\n")); + /* No data available. */ + *pcbActual = 0; +@@ -125,6 +125,6 @@ int vboxClipboardReadData (VBOXCLIPBOARDCLIENTDATA *pC + void vboxClipboardWriteData (VBOXCLIPBOARDCLIENTDATA *pClient, void *pv, + uint32_t cb, uint32_t u32Format) + { +- NOREF(pClient, pv, cb, u32Format); ++ RT_NOREF4(pClient, pv, cb, u32Format); + LogFlowFunc(("called, returning.\n")); + } diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_HostServices_SharedOpenGL_Makefile.kmk b/emulators/virtualbox-ose/files/patch-src_VBox_HostServices_SharedOpenGL_Makefile.kmk new file mode 100644 index 00000000000..8dddec41740 --- /dev/null +++ b/emulators/virtualbox-ose/files/patch-src_VBox_HostServices_SharedOpenGL_Makefile.kmk @@ -0,0 +1,10 @@ +--- src/VBox/HostServices/SharedOpenGL/Makefile.kmk.orig 2017-10-18 07:12:48 UTC ++++ src/VBox/HostServices/SharedOpenGL/Makefile.kmk +@@ -436,6 +436,7 @@ if ( defined(VBOX_WITH_QTGUI) \ + $(if $(VBOX_WITH_CROGL), VBOX_WITH_CROGL,) \ + $(if $(VBOX_WITH_VIDEOHWACCEL), VBOX_WITH_VIDEOHWACCEL,) + ifdef VBOX_WITH_VIDEOHWACCEL ++ VBoxTestOGL_CXXFLAGS.freebsd += -std=c++11 + VBoxTestOGL_QT_MODULES += Core Gui OpenGL Widgets + VBoxTestOGL_LIBS.linux += xcb + VBoxTestOGL_LIBS.solaris += xcb diff --git a/lang/erlang-runtime20/Makefile b/lang/erlang-runtime20/Makefile index 3dd63daeaf4..95b2e9d7d40 100644 --- a/lang/erlang-runtime20/Makefile +++ b/lang/erlang-runtime20/Makefile @@ -2,21 +2,24 @@ # $FreeBSD$ PORTNAME= erlang -PORTVERSION= 20.1 +PORTVERSION= 20.1.3 CATEGORIES= lang parallel java MASTER_SITES= http://www.erlang.org/download/:erlangorg \ http://erlang.stacken.kth.se/download/:erlangorg \ - http://www.csd.uu.se/ftp/mirror/erlang/download/:erlangorg + http://www.csd.uu.se/ftp/mirror/erlang/download/:erlangorg \ + http://olgeni.olgeni.com/~olgeni/distfiles/:local \ + LOCAL/olgeni:local PKGNAMESUFFIX= -runtime20 DISTNAME= otp_src_${ERL_RELEASE} DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:erlangorg \ - ${ERLANG_MAN}:erlangorg + ${ERLANG_MAN}:erlangorg \ + preloaded-${PORTVERSION}${EXTRACT_SUFX}:local DIST_SUBDIR= erlang EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} PATCH_SITES= http://olgeni.olgeni.com/~olgeni/distfiles/ \ LOCAL/olgeni -PATCHFILES= +PATCHFILES= patch-otp-20.1.1 patch-otp-20.1.2 patch-otp-20.1.3 MAINTAINER= olgeni@FreeBSD.org COMMENT= Functional programming language from Ericsson @@ -192,6 +195,7 @@ pre-configure: .if ! ${PORT_OPTIONS:MWX} echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP .endif + cd ${WRKSRC} && ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/preloaded-${PORTVERSION}${EXTRACT_SUFX} post-configure: .if ${PORT_OPTIONS:MODBC} diff --git a/lang/erlang-runtime20/distinfo b/lang/erlang-runtime20/distinfo index a187404f411..650fc9a4d8e 100644 --- a/lang/erlang-runtime20/distinfo +++ b/lang/erlang-runtime20/distinfo @@ -1,7 +1,15 @@ -TIMESTAMP = 1506693440 +TIMESTAMP = 1508934381 SHA256 (erlang/otp_src_20.1.tar.gz) = 900d35eb563607785a8e27f4b4c03cf6c98b4596028c5d6958569ddde5d4ddbf SIZE (erlang/otp_src_20.1.tar.gz) = 87342296 SHA256 (erlang/otp_doc_man_20.1.tar.gz) = 05ccf82ff85316e2eb1bebf1a1741dfac1ee450ed49cf0be365f9d4fec6d7b46 SIZE (erlang/otp_doc_man_20.1.tar.gz) = 1334036 +SHA256 (erlang/preloaded-20.1.3.tar.gz) = cf16dc6424772116612736bfa023fa11456380f76834b80e14246590300dbffc +SIZE (erlang/preloaded-20.1.3.tar.gz) = 335118 SHA256 (erlang/otp_doc_html_20.1.tar.gz) = 442c9b75a33be685a1af67414cc8758a4ef40e27cdcab9e432d4d9c6f3254dcf SIZE (erlang/otp_doc_html_20.1.tar.gz) = 33059931 +SHA256 (erlang/patch-otp-20.1.1) = 013f887a7773667b07a8bdd60b91df0c259931d54cd1f9e609c2832193c9f329 +SIZE (erlang/patch-otp-20.1.1) = 27377 +SHA256 (erlang/patch-otp-20.1.2) = df8f2d0cce45e277bc102d625e64ce57f6b0a3be710426570bc5cf837132f82f +SIZE (erlang/patch-otp-20.1.2) = 13450 +SHA256 (erlang/patch-otp-20.1.3) = 01452c3b8f24bff90c390e7efdf7830e070dcb0fcb9b11709cee18a689d379ed +SIZE (erlang/patch-otp-20.1.3) = 23545 diff --git a/lang/erlang-wx/Makefile b/lang/erlang-wx/Makefile index d1b027a0809..ecbed9ce0bd 100644 --- a/lang/erlang-wx/Makefile +++ b/lang/erlang-wx/Makefile @@ -2,6 +2,7 @@ PORTNAME= erlang PORTVERSION= 19.3.6.2 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= lang parallel MASTER_SITES= http://www.erlang.org/download/:erlangorg \ @@ -62,6 +63,8 @@ do-build: cd ${WRKSRC}/lib/wx && ${GMAKE} ERL_TOP=${WRKSRC} TARGET=${CONFIGURE_TARGET} ${STRIP_CMD} ${WRKSRC}/lib/wx/priv/${CONFIGURE_TARGET}/erl_gl.so ${STRIP_CMD} ${WRKSRC}/lib/wx/priv/${CONFIGURE_TARGET}/wxe_driver.so + ${MV} ${WRKSRC}/lib/wx/priv/${CONFIGURE_TARGET}/*.so ${WRKSRC}/lib/wx/priv + ${RMDIR} ${WRKSRC}/lib/wx/priv/${CONFIGURE_TARGET} do-install: @${MKDIR} ${STAGEDIR}${APP_DIR} diff --git a/lang/erlang-wx/pkg-plist b/lang/erlang-wx/pkg-plist index c40a16df627..b1c8ad18d5c 100644 --- a/lang/erlang-wx/pkg-plist +++ b/lang/erlang-wx/pkg-plist @@ -483,11 +483,11 @@ lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxe_util.beam lib/erlang/lib/wx-%%APP_VERSION%%/include/gl.hrl lib/erlang/lib/wx-%%APP_VERSION%%/include/glu.hrl lib/erlang/lib/wx-%%APP_VERSION%%/include/wx.hrl -lib/erlang/lib/wx-%%APP_VERSION%%/priv/%%CONFIGURE_TARGET%%/erl_gl.so -lib/erlang/lib/wx-%%APP_VERSION%%/priv/%%CONFIGURE_TARGET%%/wxe_driver.so +lib/erlang/lib/wx-%%APP_VERSION%%/priv/erl_gl.so lib/erlang/lib/wx-%%APP_VERSION%%/priv/erlang-logo128.png lib/erlang/lib/wx-%%APP_VERSION%%/priv/erlang-logo32.png lib/erlang/lib/wx-%%APP_VERSION%%/priv/erlang-logo64.png +lib/erlang/lib/wx-%%APP_VERSION%%/priv/wxe_driver.so lib/erlang/lib/wx-%%APP_VERSION%%/src/Makefile lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/gl.erl lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/glu.erl diff --git a/lang/see/Makefile b/lang/see/Makefile index 3f9b198a549..e84878afa87 100644 --- a/lang/see/Makefile +++ b/lang/see/Makefile @@ -13,7 +13,12 @@ MASTER_SITES= http://download.openpkg.org/components/cache/see/ \ MAINTAINER= numisemis@yahoo.com COMMENT= Simple ECMAScript Engine (SEE) -LICENSE= BSD +LICENSE= BSD3CLAUSE DTOA.C +LICENSE_COMB= multi +LICENSE_NAME_DTOA.C= License of dtoa.c +LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/COPYING +LICENSE_FILE_DTOA.C= ${WRKSRC}/COPYING +LICENSE_PERMS_DTOA.C= ${_LICENSE_PERMS_DEFAULT} BROKEN_aarch64= fails to configure: floating point not detected: Exactly one of IEEE_8087, IEEE_MC68k, VAX, or IBM should be defined BROKEN_armv6= fails to configure: floating point not detected: Exactly one of IEEE_8087, IEEE_MC68k, VAX, or IBM should be defined @@ -25,8 +30,8 @@ DEBUG_DESC= Internal SEE library debugging CONFLICTS= see-devel-[0-9]* -USE_LDCONFIG= yes USES= libtool pathfix perl5 +USE_LDCONFIG= yes USE_PERL5= build GNU_CONFIGURE= yes INSTALL_TARGET= install-strip diff --git a/lang/see/files/patch-libsee_dtoa.c b/lang/see/files/patch-libsee_dtoa.c index 978f306a3ea..79a2c29686a 100644 --- a/lang/see/files/patch-libsee_dtoa.c +++ b/lang/see/files/patch-libsee_dtoa.c @@ -1,6 +1,6 @@ ---- libsee/dtoa.c.orig 2009-04-26 23:04:58.000000000 +0200 -+++ libsee/dtoa.c 2015-03-16 15:46:21.218950229 +0100 -@@ -252,6 +252,14 @@ +--- libsee/dtoa.c.orig 2009-04-26 21:04:58 UTC ++++ libsee/dtoa.c +@@ -252,6 +252,14 @@ static double private_mem[PRIVATE_mem], #include "math.h" #endif diff --git a/math/octave-forge-gsl/Makefile b/math/octave-forge-gsl/Makefile index 3990c289645..c20ab555184 100644 --- a/math/octave-forge-gsl/Makefile +++ b/math/octave-forge-gsl/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= octave-forge-gsl -PORTVERSION= 2.0.0 -PORTREVISION= 5 +PORTVERSION= 2.1.0 CATEGORIES= math MAINTAINER= stephen@FreeBSD.org diff --git a/math/octave-forge-gsl/distinfo b/math/octave-forge-gsl/distinfo index 611ba6f3299..d196b0a032c 100644 --- a/math/octave-forge-gsl/distinfo +++ b/math/octave-forge-gsl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1480110430 -SHA256 (octave-forge/gsl-2.0.0.tar.gz) = 4a93623745024a7617eef435b99a03aaebece3d7967771518197f150746f58b1 -SIZE (octave-forge/gsl-2.0.0.tar.gz) = 111757 +TIMESTAMP = 1508897264 +SHA256 (octave-forge/gsl-2.1.0.tar.gz) = 940142b7d655d9196e1ec5197b4176388c69671e03ba8da717782d9f040fcedb +SIZE (octave-forge/gsl-2.1.0.tar.gz) = 117838 diff --git a/math/octave-forge-interval/Makefile b/math/octave-forge-interval/Makefile index 0b24b0467d8..b115e5554ae 100644 --- a/math/octave-forge-interval/Makefile +++ b/math/octave-forge-interval/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= octave-forge-interval -PORTVERSION= 2.1.0 -PORTREVISION= 1 +PORTVERSION= 3.0.0 CATEGORIES= math MAINTAINER= stephen@FreeBSD.org diff --git a/math/octave-forge-interval/distinfo b/math/octave-forge-interval/distinfo index 573632fa7c4..d0f83c7e7d2 100644 --- a/math/octave-forge-interval/distinfo +++ b/math/octave-forge-interval/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1497920403 -SHA256 (octave-forge/interval-2.1.0.tar.gz) = c2754e4216e768b5f2e76bae34233a9a97cb36b20a7f5f23603b74193947a4b0 -SIZE (octave-forge/interval-2.1.0.tar.gz) = 2853637 +TIMESTAMP = 1508897358 +SHA256 (octave-forge/interval-3.0.0.tar.gz) = 879c3bd443ac9470756cf671118dbf281d84149dfced62d7947074ff3a801a5b +SIZE (octave-forge/interval-3.0.0.tar.gz) = 2835125 diff --git a/math/octave-forge-io/Makefile b/math/octave-forge-io/Makefile index b27deb8e71d..f70370f053a 100644 --- a/math/octave-forge-io/Makefile +++ b/math/octave-forge-io/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= octave-forge-io -PORTVERSION= 2.4.7 -PORTREVISION= 1 +PORTVERSION= 2.4.8 PORTEPOCH= 1 CATEGORIES= math diff --git a/math/octave-forge-io/distinfo b/math/octave-forge-io/distinfo index 2c3c553ee5e..1404d5e717c 100644 --- a/math/octave-forge-io/distinfo +++ b/math/octave-forge-io/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1497927062 -SHA256 (octave-forge/io-2.4.7.tar.gz) = 9a926c5eb0ae6e101b1ab999ce9c09d1b4339e1dc578e5ad3f5d760e9787bf9a -SIZE (octave-forge/io-2.4.7.tar.gz) = 207855 +TIMESTAMP = 1508892648 +SHA256 (octave-forge/io-2.4.8.tar.gz) = 75733f711b8d0e820a13e9ce66020c0c392522f6d0c3fdbb7927848ad500096c +SIZE (octave-forge/io-2.4.8.tar.gz) = 231933 diff --git a/math/octave-forge-stk/Makefile b/math/octave-forge-stk/Makefile index 0462508c91f..406f87e2ce7 100644 --- a/math/octave-forge-stk/Makefile +++ b/math/octave-forge-stk/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= octave-forge-stk -PORTVERSION= 2.4.2 -PORTREVISION= 1 +PORTVERSION= 2.5.0 CATEGORIES= math MAINTAINER= stephen@FreeBSD.org diff --git a/math/octave-forge-stk/distinfo b/math/octave-forge-stk/distinfo index 2fcd9ffbb26..041cc51895c 100644 --- a/math/octave-forge-stk/distinfo +++ b/math/octave-forge-stk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1497927848 -SHA256 (octave-forge/stk-2.4.2.tar.gz) = cef2e4d40012a9fe8ff690efb0b78527eedbe9514e39432e76968875e0d9e874 -SIZE (octave-forge/stk-2.4.2.tar.gz) = 315557 +TIMESTAMP = 1508897414 +SHA256 (octave-forge/stk-2.5.0.tar.gz) = fb189a80bdd34c80cdba75ff52344b80266effa5b67230aae97f34f8479a5b88 +SIZE (octave-forge/stk-2.5.0.tar.gz) = 358164 diff --git a/misc/mmv/Makefile b/misc/mmv/Makefile index 5bc4d25d46a..7a28b6ec2bb 100644 --- a/misc/mmv/Makefile +++ b/misc/mmv/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mmv -PORTVERSION= 1.01b.15 +PORTVERSION= 1.01b.19 CATEGORIES= misc MASTER_SITES= DEBIAN_POOL DISTNAME= ${PORTNAME}_1.01b.orig @@ -11,24 +11,26 @@ PATCH_SITES= ${MASTER_SITES} PATCHFILES= ${PORTNAME}_1.01b-15.diff.gz PATCH_DIST_STRIP= -p1 -MAINTAINER= ports@FreeBSD.org +MAINTAINER= se@FreeBSD.org COMMENT= Move/Copy/Append/Link multiple files +LICENSE= Freeware +LICENSE_NAME= MMV +LICENSE_FILE= ${PATCHDIR}/LICENSE +LICENSE_PERMS= dist-mirror pkg-mirror auto-accept + CFLAGS+= -DHAS_DIRENT WRKSRC= ${WRKDIR}/${PORTNAME}-1.01b.orig do-build: - @(cd ${WRKSRC} ; \ - ${CC} ${CFLAGS} -o ${PORTNAME} ${PORTNAME}.c ; ) + cd ${WRKSRC}; ${CC} ${CFLAGS} -o ${PORTNAME} ${PORTNAME}.c do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} \ - ${STAGEDIR}${PREFIX}/bin/${PORTNAME} - @${INSTALL_MAN} ${WRKSRC}/mmv.1 \ - ${STAGEDIR}${PREFIX}/man/man1/${PORTNAME}.1 + ${INSTALL_PROGRAM} ${WRKSRC}/mmv ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_MAN} ${WRKSRC}/mmv.1 ${STAGEDIR}${PREFIX}/man/man1/ .for i in mcp mad mln - @${LN} -sf ${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${i} - @${LN} -sf ${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1/${i}.1 + ${LN} -sf ${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${i} + ${LN} -sf ${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1/${i}.1 .endfor .include diff --git a/misc/mmv/files/LICENSE b/misc/mmv/files/LICENSE new file mode 100644 index 00000000000..813ade3eb99 --- /dev/null +++ b/misc/mmv/files/LICENSE @@ -0,0 +1,10 @@ +Copyright (c) 1989 Vladimir Lanin + +Mmv is freeware. That means that the entire package of software and +documentation is copyrighted, and may not be distributed with any +modifications or for any charge (without the author's explicit written +permission). Other than that, it may be used and distributed freely. + +Vladimir Lanin +330 Wadsworth Ave, Apt 6F +New York, NY 10040 diff --git a/misc/mmv/files/patch-mmv.1 b/misc/mmv/files/patch-mmv.1 index 52b46c6342a..8af96730daa 100644 --- a/misc/mmv/files/patch-mmv.1 +++ b/misc/mmv/files/patch-mmv.1 @@ -1,6 +1,77 @@ ---- mmv.1 Thu Oct 5 19:09:58 2006 -+++ mmv.1 Thu Oct 5 19:12:46 2006 -@@ -345,7 +345,7 @@ +--- mmv.1.orig 2017-10-24 14:25:26 UTC ++++ mmv.1 +@@ -35,6 +35,43 @@ mmv \- move/copy/append multiple files by wildcard pat + .B mmvpatch + [\fBexecutable\fP] + \} ++.SH "EXAMPLES" ++Rename all ++.I *.jpeg ++files in the current directory to ++\fI*.jpg\fR: ++ ++.in +3 ++mmv '*.jpeg' '#1.jpg' ++.in -3 ++ ++Replace the first occurrence of ++.I abc ++with ++.I xyz ++in all files in the current directory: ++ ++.in +3 ++mmv '*abc*' '#1xyz#2' ++.in -3 ++ ++Rename files ending in \fI.html.en\fR, \fI.html.de\fR, etc. to ending ++in \fI.en.html\fR, \fI.de.html\fR, etc. in the current directory: ++ ++.in +3 ++mmv '*.html.??' '#1.#2#3.html' ++.in -3 ++ ++Rename music files from ++.I - - .ogg ++to ++.I - - .ogg ++in the current directory: ++ ++.in +3 ++mmv '* - * - *.ogg' '#2 - #1 - #3.ogg' ++.in -3 ++ + .SH "DESCRIPTION" + .I Mmv + moves (or copies, +@@ -196,8 +233,13 @@ and it applies to all matching files. + Remaining options need not be given separately, + i.e. "mmv \-mk" is allowed. + ++\fBWARNING:\fR This operation mode does \fBnot\fR work if the patterns ++itself contain \fBspaces\fR. See ++.I http://bugs.debian.org/149873 ++for details. ++ + .ce +-Multiple Pattern Pairs ++Multiple Pattern Pairs / Reading Patterns from STDIN + .PP + Multiple + .I from +@@ -240,6 +282,11 @@ would give the error message "a \-> c : no match" beca + (even if it exists) + was already matched by the first pattern pair. + ++\fBWARNING:\fR This operation mode does \fBnot\fR work if the patterns ++itself contain \fBspaces\fR. See ++.I http://bugs.debian.org/149873 ++for details. ++ + .ce + The \fIFrom\fP Pattern + .PP +@@ -350,7 +397,7 @@ pattern is a filename with embedded .I wildcard .IR indexes , @@ -9,7 +80,7 @@ followed by a string of digits. When a source file matches a .I from -@@ -406,7 +406,7 @@ +@@ -411,7 +458,7 @@ if "dir2" is indeed a directory, actually move "dir1\* However, if "dir2\*(SLa" already exists and is itself a directory, this is considered an error. .PP @@ -18,7 +89,20 @@ of its special meaning to .IR mmv , as when the actual replacement name must contain the character '#', -@@ -639,6 +639,15 @@ +@@ -555,6 +602,12 @@ and will accept pattern pairs with or without the inte + Lines with "(*)" after the target pattern have the effect of enabling \-d + for the files matching this pattern only, + so that such deletions are done silently. ++ ++\fBWARNING:\fR This means that \fBunexpected things\fR may happen if ++\fBfiles\fR matched by the patterns contain \fBspaces\fR. See ++.I http://bugs.debian.org/149873 ++for details. ++ + When feeding + .I mmv + its own output, +@@ -644,6 +697,15 @@ and with status 0 otherwise. .SH "SEE ALSO" mv(1), cp(1), ln(1), umask(1) \} diff --git a/misc/mmv/files/patch-mmv.c b/misc/mmv/files/patch-mmv.c index 6d729885372..025411be6a9 100644 --- a/misc/mmv/files/patch-mmv.c +++ b/misc/mmv/files/patch-mmv.c @@ -1,6 +1,6 @@ ---- mmv.c Thu Oct 5 10:36:36 2006 -+++ mmv.c Thu Oct 5 10:38:31 2006 -@@ -73,7 +73,8 @@ +--- mmv.c.orig 2017-10-24 14:25:26 UTC ++++ mmv.c +@@ -73,7 +73,8 @@ Use -- as the end of options.\n"; %s [-m|x|r|c|o|a|l%s] [-h] [-d|p] [-g|t] [-v|n] [from to]\n\ \n\ Use #[l|u]N in the ``to'' pattern to get the [lowercase|uppercase of the]\n\ @@ -10,7 +10,7 @@ \n\ A ``from'' pattern containing wildcards should be quoted when given\n\ on the command line. Also you may need to quote ``to'' pattern.\n\ -@@ -976,6 +977,9 @@ +@@ -977,6 +978,9 @@ static int parsepat() lastname = p + 1; break; case '#': @@ -20,7 +20,7 @@ c = *(++p); if (c == 'l' || c == 'u') { #ifdef IS_MSDOS -@@ -986,8 +990,8 @@ +@@ -987,8 +991,8 @@ static int parsepat() #endif } if (!isdigit(c)) { @@ -31,7 +31,7 @@ return(-1); } for(x = 0; ;x *= 10) { -@@ -998,8 +1002,8 @@ +@@ -999,8 +1003,8 @@ static int parsepat() p++; } if (x < 1 || x > totwilds) { @@ -42,7 +42,7 @@ return(-1); } #ifdef IS_MSDOS -@@ -1007,6 +1011,7 @@ +@@ -1008,6 +1012,7 @@ static int parsepat() havedot = 1; #endif break; @@ -50,7 +50,19 @@ case ESC: if ((c = *(++p)) == '\0') { printf(TRAILESC, from, to, ESC); -@@ -2029,7 +2034,7 @@ +@@ -1215,7 +1220,11 @@ static int keepmatch(ffrom, pathend, pk, needslash, di + getstat(pathbuf, ffrom); + if ((ffrom->fi_stflags & FI_ISDIR) ? !dirs : !fils) + #endif ++ { ++ if (verbose) ++ printf("ignoring directory %s\n", ffrom->fi_name); + return(0); ++ } + + if (needslash) { + strcpy(pathend + *pk, SLASHSTR); +@@ -2030,7 +2039,7 @@ static void makerep() repbad = 0; p = fullrep; for (pat = to, l = 0; (c = *pat) != '\0'; pat++, l++) { @@ -59,3 +71,12 @@ c = *(++pat); #ifndef IS_MSDOS if (c == 'l') { +@@ -2828,7 +2837,7 @@ static int getreply(m, failact) + static FILE *tty = NULL; + int c, r; + +- fprintf(stderr, m); ++ fprintf(stderr, "%s", m); + if (tty == NULL && (tty = fopen(TTY, "r")) == NULL) { + fprintf(stderr, "Can not open %s to get reply.\n", TTY); + if (failact == -1) diff --git a/misc/rump/Makefile b/misc/rump/Makefile index 39c86c21a0e..52bc21432ee 100644 --- a/misc/rump/Makefile +++ b/misc/rump/Makefile @@ -24,12 +24,12 @@ USE_LDCONFIG= yes .include .if ${ARCH} == "i386" || ${ARCH} == "amd64" -PLIST_SUB+= X8664="" +PLIST_SUB+= X8664="" .else -PLIST_SUB+= X8664="@comment " +PLIST_SUB+= X8664="@comment " .endif -.if ${OSVERSION} >= 1100121 +.if ${OSVERSION} >= 1100508 CFLAGS+= -Wno-address-of-packed-member .endif diff --git a/multimedia/rage/pkg-descr b/multimedia/rage/pkg-descr index 6ec30a21b78..a7542be5786 100644 --- a/multimedia/rage/pkg-descr +++ b/multimedia/rage/pkg-descr @@ -1,4 +1,4 @@ Rage is a video and audio player written with Enlightenment Foundation Libraries with some extra bells and whistles. -WWW: http://www.enlightenment.org/ +WWW: https://www.enlightenment.org/ diff --git a/net-im/py-fbmq/Makefile b/net-im/py-fbmq/Makefile index b04556e985c..5bd47d25143 100644 --- a/net-im/py-fbmq/Makefile +++ b/net-im/py-fbmq/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= fbmq -PORTVERSION= 2.3.1 +PORTVERSION= 2.3.2 CATEGORIES= net-im devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net-im/py-fbmq/distinfo b/net-im/py-fbmq/distinfo index a485b63684e..ada1a7e5d74 100644 --- a/net-im/py-fbmq/distinfo +++ b/net-im/py-fbmq/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1506412442 -SHA256 (fbmq-2.3.1.tar.gz) = 1dd8bf49a0d85ea397e4afbc7c0f6fbccaafd49d0c776357bb187430b627b4c4 -SIZE (fbmq-2.3.1.tar.gz) = 5818 +TIMESTAMP = 1508937681 +SHA256 (fbmq-2.3.2.tar.gz) = 680d5cca973657affac562605962f27f3977e13285b663d6632bf8bcb1fc1107 +SIZE (fbmq-2.3.2.tar.gz) = 5859 diff --git a/net-mgmt/cacti/Makefile b/net-mgmt/cacti/Makefile index 0ad48ed08ef..3534a9c472b 100644 --- a/net-mgmt/cacti/Makefile +++ b/net-mgmt/cacti/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= cacti -PORTVERSION= 1.1.26 +PORTVERSION= 1.1.27 CATEGORIES= net-mgmt www MASTER_SITES= http://www.cacti.net/downloads/ \ ftp://ftpmirror.uk/freebsd-ports/cacti/ diff --git a/net-mgmt/cacti/distinfo b/net-mgmt/cacti/distinfo index d8178d5c055..ef83d4da270 100644 --- a/net-mgmt/cacti/distinfo +++ b/net-mgmt/cacti/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1508315864 -SHA256 (cacti-1.1.26.tar.gz) = ad94d8b70a34efdc6132bd13706773878c0330be6eb891cf597ea75060627393 -SIZE (cacti-1.1.26.tar.gz) = 8940185 +TIMESTAMP = 1508833051 +SHA256 (cacti-1.1.27.tar.gz) = b4a5aa2a772aff7eb5abae31d07ed86a1c00300094d3c3c63091554fbb0deea9 +SIZE (cacti-1.1.27.tar.gz) = 8947294 diff --git a/net/Makefile b/net/Makefile index 72b7e361ac9..7c4881c6dc2 100644 --- a/net/Makefile +++ b/net/Makefile @@ -138,6 +138,7 @@ SUBDIR += exabgp SUBDIR += exaddos SUBDIR += fb + SUBDIR += file2pcap SUBDIR += findmtu SUBDIR += flower SUBDIR += flowgrep diff --git a/net/file2pcap/Makefile b/net/file2pcap/Makefile new file mode 100644 index 00000000000..3cda019ec66 --- /dev/null +++ b/net/file2pcap/Makefile @@ -0,0 +1,31 @@ +# Created by: Nobutaka Mantani +# $FreeBSD$ + +PORTNAME= file2pcap +PORTVERSION= 1.25 +CATEGORIES= net + +MAINTAINER= nobutaka@FreeBSD.org +COMMENT= Tool to make packet captures containing the content of specified file + +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/LICENSE + +GH_ACCOUNT= Cisco-Talos +GH_PROJECT= file2pcap + +USE_GITHUB= yes + +ALL_TARGET= file2pcap + +PLIST_FILES= bin/file2pcap +PORTDOCS= Changelog README.md TODO + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/file2pcap ${STAGEDIR}/${PREFIX}/bin + ${MKDIR} ${STAGEDIR}/${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/Changelog ${STAGEDIR}/${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}/${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/TODO ${STAGEDIR}/${DOCSDIR} + +.include diff --git a/net/file2pcap/distinfo b/net/file2pcap/distinfo new file mode 100644 index 00000000000..98312f4584f --- /dev/null +++ b/net/file2pcap/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1508678999 +SHA256 (Cisco-Talos-file2pcap-1.25_GH0.tar.gz) = 77a9cc8e2bf70fb88c140785a3f3f964aba16ed34844d12987a19cabf7b43d48 +SIZE (Cisco-Talos-file2pcap-1.25_GH0.tar.gz) = 27561 diff --git a/net/file2pcap/files/patch-Makefile b/net/file2pcap/files/patch-Makefile new file mode 100644 index 00000000000..b5658ac19cd --- /dev/null +++ b/net/file2pcap/files/patch-Makefile @@ -0,0 +1,7 @@ +--- Makefile.orig 2017-10-22 15:06:28 UTC ++++ Makefile +@@ -1,4 +1,3 @@ +-CC = gcc + + + diff --git a/net/file2pcap/pkg-descr b/net/file2pcap/pkg-descr new file mode 100644 index 00000000000..5adaa85ef57 --- /dev/null +++ b/net/file2pcap/pkg-descr @@ -0,0 +1,6 @@ +The File2pcap tool allows you to make various types of packet captures +containing the content of any file that you specify. + +Supported protocols: HTTP, HTTP/2, SMTP, POP3, IMAP, FTP + +WWW: https://github.com/Cisco-Talos/file2pcap diff --git a/ports-mgmt/porttree/Makefile b/ports-mgmt/porttree/Makefile index 76dcdfeb0a2..268040e5309 100644 --- a/ports-mgmt/porttree/Makefile +++ b/ports-mgmt/porttree/Makefile @@ -3,6 +3,7 @@ PORTNAME= porttree PORTVERSION= 0.3.r${SVN_REV} +PORTREVISION= 1 CATEGORIES= ports-mgmt python MASTER_SITES= SF MASTER_SITE_SUBDIR= ${PORTNAME} @@ -12,7 +13,7 @@ COMMENT= Show dependences of FreeBSD port as pseudo graphical tree LICENSE= MIT -USES= python tar:bzip2 +USES= python tar:bzip2 shebangfix RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}networkx>=1.5:math/py-networkx @@ -26,6 +27,8 @@ NO_BUILD= yes PLIST_FILES= bin/porttree man/man1/porttree.1.gz NO_ARCH= yes +SHEBANG_FILES= src/porttree.py + do-install: ${INSTALL_SCRIPT} ${WRKSRC}/src/porttree.py ${STAGEDIR}${PREFIX}/bin/porttree ${INSTALL_MAN} ${WRKSRC}/src/porttree.1 ${STAGEDIR}${MANPREFIX}/man/man1 diff --git a/sysutils/Makefile b/sysutils/Makefile index 2182e80867f..66e1974347e 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -627,6 +627,7 @@ SUBDIR += minimunin SUBDIR += minirsyslogd SUBDIR += mixer + SUBDIR += mkdesktop SUBDIR += mkfile SUBDIR += mkfwimage SUBDIR += mkntpwd diff --git a/sysutils/intel-pcm/Makefile b/sysutils/intel-pcm/Makefile index 7fbed1be475..436719f9ad8 100644 --- a/sysutils/intel-pcm/Makefile +++ b/sysutils/intel-pcm/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= intel-pcm -PORTVERSION= 201705 +PORTVERSION= 201710 CATEGORIES= sysutils MAINTAINER= imp@FreeBSD.org @@ -18,7 +18,7 @@ ONLY_FOR_ARCHS= i386 amd64 USE_GITHUB= yes GH_ACCOUNT= opcm GH_PROJECT= pcm -GH_TAGNAME= 201705 +GH_TAGNAME= 201710 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/*.x ${STAGEDIR}${PREFIX}/sbin diff --git a/sysutils/intel-pcm/distinfo b/sysutils/intel-pcm/distinfo index a4a7d63c0b6..a75764b65db 100644 --- a/sysutils/intel-pcm/distinfo +++ b/sysutils/intel-pcm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1505629521 -SHA256 (opcm-pcm-201705_GH0.tar.gz) = ad101e3803def846b0203a481fa73e97451d7b432b90e775f4109815343099b9 -SIZE (opcm-pcm-201705_GH0.tar.gz) = 1085327 +TIMESTAMP = 1508899852 +SHA256 (opcm-pcm-201710_GH0.tar.gz) = 772c7b6310ba9c89931ff6108cc71fa0cbe20540ab6a53503f5f61594c9f661d +SIZE (opcm-pcm-201710_GH0.tar.gz) = 1103994 diff --git a/sysutils/intel-pcm/files/patch-cpucounters.cpp b/sysutils/intel-pcm/files/patch-cpucounters.cpp deleted file mode 100644 index e51e4ab5cb9..00000000000 --- a/sysutils/intel-pcm/files/patch-cpucounters.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- cpucounters.cpp.orig 2017-09-17 06:31:28 UTC -+++ cpucounters.cpp -@@ -192,6 +192,9 @@ class InstanceLock (public) - }; - #endif // end of _MSC_VER else - -+#if defined(__FreeBSD__) -+#define cpu_set_t cpuset_t -+#endif - - class TemporalThreadAffinity // speedup trick for Linux, FreeBSD, DragonFlyBSD - { diff --git a/sysutils/intel-pcm/pkg-plist b/sysutils/intel-pcm/pkg-plist index 5978a07bcad..fb02bddb2e5 100644 --- a/sysutils/intel-pcm/pkg-plist +++ b/sysutils/intel-pcm/pkg-plist @@ -1,4 +1,6 @@ sbin/pcm-core.x +sbin/pcm-iio.x +sbin/pcm-lspci.x sbin/pcm-memory.x sbin/pcm-msr.x sbin/pcm-numa.x diff --git a/sysutils/mkdesktop/Makefile b/sysutils/mkdesktop/Makefile new file mode 100644 index 00000000000..a8dc2b9e59f --- /dev/null +++ b/sysutils/mkdesktop/Makefile @@ -0,0 +1,28 @@ +# $FreeBSD$ + +PORTNAME= mkdesktop +PORTVERSION= 1.6 +CATEGORIES= sysutils + +MAINTAINER= bourne.identity@hotmail.com +COMMENT= Powerful, flexible utility to setup a FreeBSD desktop + +RUN_DEPENDS= pkg>0:ports-mgmt/pkg + +USE_GITHUB= yes +GH_ACCOUNT= bourne-again + +NO_BUILD= yes +NO_ARCH= yes + +DATA1= stage-definitions +DATA2= mkdesktop.help +PLIST_FILES= bin/${PORTNAME} ${DATADIR}/${DATA1} ${DATADIR}/${DATA2} + +do-install: + ${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/${DATA1} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/${DATA2} ${STAGEDIR}${DATADIR} + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + +.include diff --git a/sysutils/mkdesktop/distinfo b/sysutils/mkdesktop/distinfo new file mode 100644 index 00000000000..5a826431fb8 --- /dev/null +++ b/sysutils/mkdesktop/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1508900370 +SHA256 (bourne-again-mkdesktop-1.6_GH0.tar.gz) = 11c9af79b78e6b6d9a92b7c2558e01855333b32db8208b12fa75df9f9345051c +SIZE (bourne-again-mkdesktop-1.6_GH0.tar.gz) = 10034 diff --git a/sysutils/mkdesktop/pkg-descr b/sysutils/mkdesktop/pkg-descr new file mode 100644 index 00000000000..e0dad17f939 --- /dev/null +++ b/sysutils/mkdesktop/pkg-descr @@ -0,0 +1,10 @@ +mkdesktop is a Bourne script that helps to standardize the process of FreeBSD +desktop installation as much as possible per user, with plenty of flexibility as +well as modularity. By default, you get 5 distinct stages for defining your +desktop environment. But you can always add/subtract/customize the stages as +much as you wish. Once you start using mkdesktop, you will pretty soon love it - +particularly its post-processor which automatically kicks in once the stages +have been processed - it sets up emulation layers and configuration of system +files, if the user so desires. + +WWW: https://github.com/bourne-again/mkdesktop diff --git a/textproc/fzf/Makefile b/textproc/fzf/Makefile index 4eed5828f66..cb53211b997 100644 --- a/textproc/fzf/Makefile +++ b/textproc/fzf/Makefile @@ -3,7 +3,7 @@ PORTNAME= fzf PORTVERSION= 0.16.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MAINTAINER= sascha@root-login.org diff --git a/textproc/fzf/files/patch-shell_completion.bash b/textproc/fzf/files/patch-shell_completion.bash new file mode 100644 index 00000000000..e28567cd6b8 --- /dev/null +++ b/textproc/fzf/files/patch-shell_completion.bash @@ -0,0 +1,11 @@ +--- shell/completion.bash.orig 2017-10-25 13:15:42 UTC ++++ shell/completion.bash +@@ -215,7 +215,7 @@ _fzf_complete_kill() { + + local selected fzf + fzf="$(__fzfcmd_complete)" +- selected=$(ps -ef | sed 1d | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-50%} --min-height 15 --reverse $FZF_DEFAULT_OPTS --preview 'echo {}' --preview-window down:3:wrap $FZF_COMPLETION_OPTS" $fzf -m | awk '{print $2}' | tr '\n' ' ') ++ selected=$(ps -uef | sed 1d | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-50%} --min-height 15 --reverse $FZF_DEFAULT_OPTS --preview 'echo {}' --preview-window down:3:wrap $FZF_COMPLETION_OPTS" $fzf -m | awk '{print $2}' | tr '\n' ' ') + printf '\e[5n' + + if [ -n "$selected" ]; then diff --git a/textproc/fzf/files/patch-shell_completion.zsh b/textproc/fzf/files/patch-shell_completion.zsh new file mode 100644 index 00000000000..0743e6d6e60 --- /dev/null +++ b/textproc/fzf/files/patch-shell_completion.zsh @@ -0,0 +1,11 @@ +--- shell/completion.zsh.orig 2017-10-25 13:15:38 UTC ++++ shell/completion.zsh +@@ -163,7 +163,7 @@ fzf-completion() { + # Kill completion (do not require trigger sequence) + if [ $cmd = kill -a ${LBUFFER[-1]} = ' ' ]; then + fzf="$(__fzfcmd_complete)" +- matches=$(ps -ef | sed 1d | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-50%} --min-height 15 --reverse $FZF_DEFAULT_OPTS --preview 'echo {}' --preview-window down:3:wrap $FZF_COMPLETION_OPTS" ${=fzf} -m | awk '{print $2}' | tr '\n' ' ') ++ matches=$(ps -uef | sed 1d | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-50%} --min-height 15 --reverse $FZF_DEFAULT_OPTS --preview 'echo {}' --preview-window down:3:wrap $FZF_COMPLETION_OPTS" ${=fzf} -m | awk '{print $2}' | tr '\n' ' ') + if [ -n "$matches" ]; then + LBUFFER="$LBUFFER$matches" + fi diff --git a/textproc/kf5-kcodecs/Makefile b/textproc/kf5-kcodecs/Makefile index b78f851c2cb..d74298cb6fb 100644 --- a/textproc/kf5-kcodecs/Makefile +++ b/textproc/kf5-kcodecs/Makefile @@ -2,12 +2,15 @@ # $FreeBSD$ PORTNAME= kcodecs -PORTVERSION= ${KDE_FRAMEWORKS_VERSION} +DISTVERSION= ${KDE_FRAMEWORKS_VERSION} CATEGORIES= textproc kde kde-frameworks MAINTAINER= kde@FreeBSD.org COMMENT= KF5 library for string manipulation +LICENSE= LGPL21 +LICENSE_FILE= ${WRKSRC}/COPYING.LIB + USES= cmake:outsource compiler:c++11-lib gperf kde:5 tar:xz USE_KDE= ecm USE_QT5= buildtools_build core linguisttools qmake_build diff --git a/www/firefox-i18n/Makefile b/www/firefox-i18n/Makefile index 2bc948a8d22..2d34e53e1fb 100644 --- a/www/firefox-i18n/Makefile +++ b/www/firefox-i18n/Makefile @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= firefox-i18n -PORTVERSION= 56.0.1 +PORTVERSION= 56.0.2 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \ - MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build2/linux-i686/xpi + MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi PKGNAMEPREFIX= DISTFILES= ${FIREFOX_I18N_:S/$/.xpi/} DIST_SUBDIR= xpi/${DISTNAME} diff --git a/www/firefox-i18n/distinfo b/www/firefox-i18n/distinfo index 04e78c05658..5361ed4719b 100644 --- a/www/firefox-i18n/distinfo +++ b/www/firefox-i18n/distinfo @@ -1,191 +1,191 @@ -TIMESTAMP = 1507068922 -SHA256 (xpi/firefox-i18n-56.0.1/ach.xpi) = 5a0769818c14878be1fc46c040fdd8c856914df481886270cd416389921e9862 -SIZE (xpi/firefox-i18n-56.0.1/ach.xpi) = 454896 -SHA256 (xpi/firefox-i18n-56.0.1/af.xpi) = 55ed0d5eeeb5038bc7cdbfaf64e38a5151b21331b6396b1b1bd67039290a1cd5 -SIZE (xpi/firefox-i18n-56.0.1/af.xpi) = 456214 -SHA256 (xpi/firefox-i18n-56.0.1/an.xpi) = 6d802d8c8fef1e3900443eee558dd54e2dbf9b5d548e4aaf6aa70efe53216971 -SIZE (xpi/firefox-i18n-56.0.1/an.xpi) = 475863 -SHA256 (xpi/firefox-i18n-56.0.1/ar.xpi) = eb07898a24acdbaa317bd7457abb6520e59b9fecd8fe7e66755e3f36b25d6c98 -SIZE (xpi/firefox-i18n-56.0.1/ar.xpi) = 500712 -SHA256 (xpi/firefox-i18n-56.0.1/as.xpi) = 3f0087df47d8f6faa492b580d7a3f3cec17ecaa74720c94e68a258171c94fe39 -SIZE (xpi/firefox-i18n-56.0.1/as.xpi) = 508238 -SHA256 (xpi/firefox-i18n-56.0.1/ast.xpi) = d5f77499d40153bfbc74713c61f3c6fecdf117a6e5240981a2bf822f974519e6 -SIZE (xpi/firefox-i18n-56.0.1/ast.xpi) = 469157 -SHA256 (xpi/firefox-i18n-56.0.1/az.xpi) = 3cf8984a42788b2627146fe64cd2bfca7597640ee1bf9f1ad268cbdce0b2b54c -SIZE (xpi/firefox-i18n-56.0.1/az.xpi) = 484984 -SHA256 (xpi/firefox-i18n-56.0.1/be.xpi) = 011d719bf75c77bf2c5cf56f246aaf58067b175151deee9ef9dee9e90b96bc17 -SIZE (xpi/firefox-i18n-56.0.1/be.xpi) = 531385 -SHA256 (xpi/firefox-i18n-56.0.1/bg.xpi) = 01070a5c87a1c39b8f39f2f5b7bd143b662526642d90098542f5b6eb17b69c69 -SIZE (xpi/firefox-i18n-56.0.1/bg.xpi) = 528789 -SHA256 (xpi/firefox-i18n-56.0.1/bn-BD.xpi) = ac18f71b01726dab12bbe200ba20282d98a5523f9d1dbea35869e3be43b12178 -SIZE (xpi/firefox-i18n-56.0.1/bn-BD.xpi) = 542772 -SHA256 (xpi/firefox-i18n-56.0.1/bn-IN.xpi) = 106d600b21c6877a11d028a7b2025c3ed8efa0eb4cf887621d579442138c273a -SIZE (xpi/firefox-i18n-56.0.1/bn-IN.xpi) = 534450 -SHA256 (xpi/firefox-i18n-56.0.1/br.xpi) = bc0a7456a118a2e01f408c0968ef8b9ae1c3992f50e5d190677b254881ccf127 -SIZE (xpi/firefox-i18n-56.0.1/br.xpi) = 464256 -SHA256 (xpi/firefox-i18n-56.0.1/bs.xpi) = dfce1edaa95d5d537f50b2ec71b41c2258699990ca7ff51f180d3fc7f3b4239d -SIZE (xpi/firefox-i18n-56.0.1/bs.xpi) = 472256 -SHA256 (xpi/firefox-i18n-56.0.1/ca.xpi) = d8056cbb6888fb408644fc19829c82b78f9bce429d2bc2d6a43124cb03b7d888 -SIZE (xpi/firefox-i18n-56.0.1/ca.xpi) = 480364 -SHA256 (xpi/firefox-i18n-56.0.1/cak.xpi) = dd5f141283676803730ddc2810f7bb645960b345bfe3afa6d38aea2cc6754cdd -SIZE (xpi/firefox-i18n-56.0.1/cak.xpi) = 489507 -SHA256 (xpi/firefox-i18n-56.0.1/cs.xpi) = 4c024e4244f2ba82e99435fcb368fa07a4426a49346599cecbfc5e83ba056bb6 -SIZE (xpi/firefox-i18n-56.0.1/cs.xpi) = 485090 -SHA256 (xpi/firefox-i18n-56.0.1/cy.xpi) = 57e43f3c40c54127f1485710a72d6dab400389c0736e1b02d5314108f782e10f -SIZE (xpi/firefox-i18n-56.0.1/cy.xpi) = 466288 -SHA256 (xpi/firefox-i18n-56.0.1/da.xpi) = 59e1abb36fdb7d47e74fd10d6033b86b9fa68acbfdc05d3da9e67378b7eb3b26 -SIZE (xpi/firefox-i18n-56.0.1/da.xpi) = 460091 -SHA256 (xpi/firefox-i18n-56.0.1/de.xpi) = f955f85aca61ffffebfbce54940b20177f272e7ff9c8096e274aef3154bf24ab -SIZE (xpi/firefox-i18n-56.0.1/de.xpi) = 473856 -SHA256 (xpi/firefox-i18n-56.0.1/dsb.xpi) = 1d3cb3448d68aa2fbd97d0d7771da47e141008595b78399c87f16615bbc8ef79 -SIZE (xpi/firefox-i18n-56.0.1/dsb.xpi) = 489897 -SHA256 (xpi/firefox-i18n-56.0.1/el.xpi) = fa77a8345f7a67a4ed480e6f702d32180fdbc1afc11ad0bad21ec9d6f52db168 -SIZE (xpi/firefox-i18n-56.0.1/el.xpi) = 554120 -SHA256 (xpi/firefox-i18n-56.0.1/en-GB.xpi) = 84c43b02c0ac41c4e4b8878ac1c29d620d9924c8fc8d0355591351edf9935349 -SIZE (xpi/firefox-i18n-56.0.1/en-GB.xpi) = 447375 -SHA256 (xpi/firefox-i18n-56.0.1/en-US.xpi) = fe1763e1c86d954c6ada561a884df22d10e88cf9c6339281b3750155cc05f425 -SIZE (xpi/firefox-i18n-56.0.1/en-US.xpi) = 446951 -SHA256 (xpi/firefox-i18n-56.0.1/en-ZA.xpi) = 6c0ecb3ff1e954d947dbabd80e9cc74969e5b19fec4a970006934f44bc28e619 -SIZE (xpi/firefox-i18n-56.0.1/en-ZA.xpi) = 445916 -SHA256 (xpi/firefox-i18n-56.0.1/eo.xpi) = 74ea18f4ac0adf3b4b246a6fbace1a863fa8d4a9c608a21cae7eedb6ea7f8060 -SIZE (xpi/firefox-i18n-56.0.1/eo.xpi) = 468952 -SHA256 (xpi/firefox-i18n-56.0.1/es-AR.xpi) = e1575e775c52c6d74148167dcaebd9805201f975871d8073e60854d919f3db9d -SIZE (xpi/firefox-i18n-56.0.1/es-AR.xpi) = 475449 -SHA256 (xpi/firefox-i18n-56.0.1/es-CL.xpi) = 8ecbb09d40c99823ff971f319a9012cae609207408e39f207b85e563c35d3c84 -SIZE (xpi/firefox-i18n-56.0.1/es-CL.xpi) = 479922 -SHA256 (xpi/firefox-i18n-56.0.1/es-ES.xpi) = b5d4691b663c223ac7e4d62b530fb9a94d1fab67d5c9ecfb6b8982451ab236fb -SIZE (xpi/firefox-i18n-56.0.1/es-ES.xpi) = 365631 -SHA256 (xpi/firefox-i18n-56.0.1/es-MX.xpi) = aec75604d1071ef585f1462ca33b9bf2b6c9299d6d49b2ffc01096462c3794c4 -SIZE (xpi/firefox-i18n-56.0.1/es-MX.xpi) = 482565 -SHA256 (xpi/firefox-i18n-56.0.1/et.xpi) = a7c7fdf6cdfd44e5f8786d587360d2aa022cde980fc17e67a4caa136197150df -SIZE (xpi/firefox-i18n-56.0.1/et.xpi) = 462104 -SHA256 (xpi/firefox-i18n-56.0.1/eu.xpi) = ed48e6df6381b74b6bb9525fc2401a39ccdb99eaf705ee41811eee81db4b13ac -SIZE (xpi/firefox-i18n-56.0.1/eu.xpi) = 467884 -SHA256 (xpi/firefox-i18n-56.0.1/fa.xpi) = 61d78db454d888a95c9dc731ffcbb6a6981c9de164a539b6d6d05dd5b52b4fcd -SIZE (xpi/firefox-i18n-56.0.1/fa.xpi) = 522909 -SHA256 (xpi/firefox-i18n-56.0.1/ff.xpi) = c50d38ccc0b57b68ab98fefa8537f34f8b594c67139335826e4f17ee0e6773fd -SIZE (xpi/firefox-i18n-56.0.1/ff.xpi) = 463098 -SHA256 (xpi/firefox-i18n-56.0.1/fi.xpi) = 278f60e6f3e4b2c52365a172509a4e372aa062409b46c7706002fe69693b51aa -SIZE (xpi/firefox-i18n-56.0.1/fi.xpi) = 461923 -SHA256 (xpi/firefox-i18n-56.0.1/fr.xpi) = 303dc412abde1e69f44bf8f24fe7f8951ce42cc27be76c9d17eb44a4b1832bb4 -SIZE (xpi/firefox-i18n-56.0.1/fr.xpi) = 484562 -SHA256 (xpi/firefox-i18n-56.0.1/fy-NL.xpi) = 7a420f2f0c65f8fef734c7f5731f4cdb0e2900ea7559e99bb382ab33c5e713f6 -SIZE (xpi/firefox-i18n-56.0.1/fy-NL.xpi) = 478044 -SHA256 (xpi/firefox-i18n-56.0.1/ga-IE.xpi) = a2934ac63c494a0b3e0d22f622a2e4b53b96df4bffa8d053517da8299c7173e8 -SIZE (xpi/firefox-i18n-56.0.1/ga-IE.xpi) = 489379 -SHA256 (xpi/firefox-i18n-56.0.1/gd.xpi) = b6a97f15d16b7ac69d3b1073d9c11ac6b20436188f3f0978a9115bc04b6ee2df -SIZE (xpi/firefox-i18n-56.0.1/gd.xpi) = 476927 -SHA256 (xpi/firefox-i18n-56.0.1/gl.xpi) = 54a990f5b50e065e4c3e13eda4fb2f25107693db14860e8ea0aa2236ef1e0cbe -SIZE (xpi/firefox-i18n-56.0.1/gl.xpi) = 466468 -SHA256 (xpi/firefox-i18n-56.0.1/gn.xpi) = edae7658377dc3431149baaafb716bb411deeeb61d935254fc192188fa226f6e -SIZE (xpi/firefox-i18n-56.0.1/gn.xpi) = 485790 -SHA256 (xpi/firefox-i18n-56.0.1/gu-IN.xpi) = b175317b939d97ead4166bf61f8eb8381948fba4a006d4463e80d19028c0cedc -SIZE (xpi/firefox-i18n-56.0.1/gu-IN.xpi) = 513740 -SHA256 (xpi/firefox-i18n-56.0.1/he.xpi) = 69c49d9f467d426e41d32626ebca768e56c7861e6352c24519d9a0b4ca8c24cf -SIZE (xpi/firefox-i18n-56.0.1/he.xpi) = 488495 -SHA256 (xpi/firefox-i18n-56.0.1/hi-IN.xpi) = fd75cea0e56a1bb346f71a902d487c2509f8904899492ee1f958af4e7df2c249 -SIZE (xpi/firefox-i18n-56.0.1/hi-IN.xpi) = 538303 -SHA256 (xpi/firefox-i18n-56.0.1/hr.xpi) = 04c0a9baa1ec3e19c14bc17d3d17a47ea53c993f3a81c4b3347e6a96492141bb -SIZE (xpi/firefox-i18n-56.0.1/hr.xpi) = 475058 -SHA256 (xpi/firefox-i18n-56.0.1/hsb.xpi) = 77dfa6996b9a0b821066d80508d3fbf68d2335190f5600f5699d012fffd2fbdf -SIZE (xpi/firefox-i18n-56.0.1/hsb.xpi) = 487599 -SHA256 (xpi/firefox-i18n-56.0.1/hu.xpi) = 32c183296a65eb0b10ace20c8b35d0a37d10278fabd4b9826ed16bebba4e8936 -SIZE (xpi/firefox-i18n-56.0.1/hu.xpi) = 490102 -SHA256 (xpi/firefox-i18n-56.0.1/hy-AM.xpi) = 44e685f7353997fe77176e9f60e90725603f3453857fc18906ba99a7f3241b58 -SIZE (xpi/firefox-i18n-56.0.1/hy-AM.xpi) = 527712 -SHA256 (xpi/firefox-i18n-56.0.1/id.xpi) = 67635d7c4cd289813783cb692c56ee4e4ffee71adbb3d9de9f87338203fb8e80 -SIZE (xpi/firefox-i18n-56.0.1/id.xpi) = 459066 -SHA256 (xpi/firefox-i18n-56.0.1/is.xpi) = c6087dad575452d8a4000a6e1e3d7fe4152b86fa84add96288b4fa4e50f8d85f -SIZE (xpi/firefox-i18n-56.0.1/is.xpi) = 467448 -SHA256 (xpi/firefox-i18n-56.0.1/it.xpi) = 1a78b44d14d7f8d42c16b62539026c6ff1016dd8b249abf6bfd5a7691d840ac1 -SIZE (xpi/firefox-i18n-56.0.1/it.xpi) = 358695 -SHA256 (xpi/firefox-i18n-56.0.1/ja.xpi) = 72b665fb904a8c9b6a0d52ad8d00d6e6bab4cc5e4b80ec0fc8aeb4c6eec0767b -SIZE (xpi/firefox-i18n-56.0.1/ja.xpi) = 527926 -SHA256 (xpi/firefox-i18n-56.0.1/ka.xpi) = 7db1c1c2a96ea24f5cb431061bc8e35edf4614841b4aba4d94ff772d12956cd7 -SIZE (xpi/firefox-i18n-56.0.1/ka.xpi) = 509096 -SHA256 (xpi/firefox-i18n-56.0.1/kab.xpi) = 7fcdfd89576f4bddd306fa086be78829f2d51ea8b8b711c08b38e3eee1ffc61b -SIZE (xpi/firefox-i18n-56.0.1/kab.xpi) = 477420 -SHA256 (xpi/firefox-i18n-56.0.1/kk.xpi) = cf68f9ccead4f294b34b65d834fca8958bc2a37c87f99caf3b2b505b9983391d -SIZE (xpi/firefox-i18n-56.0.1/kk.xpi) = 534932 -SHA256 (xpi/firefox-i18n-56.0.1/km.xpi) = 5ea6da095c7e6b2926be1344f9b0a5940d9e3c4afc7f069d090554e7ee505a2c -SIZE (xpi/firefox-i18n-56.0.1/km.xpi) = 549344 -SHA256 (xpi/firefox-i18n-56.0.1/kn.xpi) = d13f5fab53fe4c4a7c542f764d95312e77e82334b3f23503057acbd404a93403 -SIZE (xpi/firefox-i18n-56.0.1/kn.xpi) = 545518 -SHA256 (xpi/firefox-i18n-56.0.1/ko.xpi) = 0325f0fc9944836effe4e8eddc4c5c7ed42e43e09dd7256dfc07c07dbd6391e2 -SIZE (xpi/firefox-i18n-56.0.1/ko.xpi) = 502895 -SHA256 (xpi/firefox-i18n-56.0.1/lij.xpi) = 1fc0e47bb89335b6c53439e3b6d4fc0194822865acf7a4056ed779d4a77b0c3b -SIZE (xpi/firefox-i18n-56.0.1/lij.xpi) = 467275 -SHA256 (xpi/firefox-i18n-56.0.1/lt.xpi) = fc688802b4746dba520dee4c671d6f326e540aea0608e18c38f0f2eaefacb4e4 -SIZE (xpi/firefox-i18n-56.0.1/lt.xpi) = 488753 -SHA256 (xpi/firefox-i18n-56.0.1/lv.xpi) = fba7bdde1975652c41b3bcab2dc469d11be9ef232c2873034de371b1fc76f543 -SIZE (xpi/firefox-i18n-56.0.1/lv.xpi) = 481628 -SHA256 (xpi/firefox-i18n-56.0.1/mai.xpi) = 150368f961ab2bf857ed6595515fd3b92620f7d9c15aca7b3e675ce0ea740253 -SIZE (xpi/firefox-i18n-56.0.1/mai.xpi) = 524702 -SHA256 (xpi/firefox-i18n-56.0.1/mk.xpi) = 8e430484eb3630f48cf00dd594b4b3cac2e1982fa30edb905137f35b8ab6c961 -SIZE (xpi/firefox-i18n-56.0.1/mk.xpi) = 507818 -SHA256 (xpi/firefox-i18n-56.0.1/ml.xpi) = eb87db03918f7ff2eab63cdb9228af635c756add32a182d58ad531489d60405a -SIZE (xpi/firefox-i18n-56.0.1/ml.xpi) = 547547 -SHA256 (xpi/firefox-i18n-56.0.1/mr.xpi) = a4d4a5d410b421991b6935624651638679395fc7f82865649d0d2669244ad8cd -SIZE (xpi/firefox-i18n-56.0.1/mr.xpi) = 536673 -SHA256 (xpi/firefox-i18n-56.0.1/ms.xpi) = d5d17bef7724b6f4fb0f9a96b779e8840491de65a865d126edfeb66d49198100 -SIZE (xpi/firefox-i18n-56.0.1/ms.xpi) = 466107 -SHA256 (xpi/firefox-i18n-56.0.1/my.xpi) = 580979d39ef1bd11960e9a9619b59dddff15b3636071ca9dfea7a215ca744078 -SIZE (xpi/firefox-i18n-56.0.1/my.xpi) = 536722 -SHA256 (xpi/firefox-i18n-56.0.1/nb-NO.xpi) = b9a5d83079adb7f4b4bbdad55d88055ca6981849a76db0d027e0dff562118089 -SIZE (xpi/firefox-i18n-56.0.1/nb-NO.xpi) = 465575 -SHA256 (xpi/firefox-i18n-56.0.1/nl.xpi) = 165667535c09f079820d14a46fd72191e5fb1def75963c3a47bc80b8dab89fc7 -SIZE (xpi/firefox-i18n-56.0.1/nl.xpi) = 469053 -SHA256 (xpi/firefox-i18n-56.0.1/nn-NO.xpi) = ed42b684815c2bce7271afe55f7a06cde02cd399a278c0e54a3dbe840eb0a372 -SIZE (xpi/firefox-i18n-56.0.1/nn-NO.xpi) = 466208 -SHA256 (xpi/firefox-i18n-56.0.1/or.xpi) = 306d2554a6f6143d09e37be0714ea7bb170569e09514b2dcb6de3ec44fdd84cd -SIZE (xpi/firefox-i18n-56.0.1/or.xpi) = 518165 -SHA256 (xpi/firefox-i18n-56.0.1/pa-IN.xpi) = 029a92c54db643481dcfdbab08016a569622e3d80ff12961dacad3a68faafbbb -SIZE (xpi/firefox-i18n-56.0.1/pa-IN.xpi) = 509046 -SHA256 (xpi/firefox-i18n-56.0.1/pl.xpi) = 051ca15a827eb86a49fc899b08d90e447d5f6e3909642835c9c7163cd6aa8688 -SIZE (xpi/firefox-i18n-56.0.1/pl.xpi) = 377525 -SHA256 (xpi/firefox-i18n-56.0.1/pt-BR.xpi) = bf68302a604749211cdc2255073d1d755727afdbefa054118c322292c6d369fe -SIZE (xpi/firefox-i18n-56.0.1/pt-BR.xpi) = 470954 -SHA256 (xpi/firefox-i18n-56.0.1/pt-PT.xpi) = 156edd762bbeaf980211f91516ac3e7967bdaaab2cfdccf61238fdcf726ef5b2 -SIZE (xpi/firefox-i18n-56.0.1/pt-PT.xpi) = 472803 -SHA256 (xpi/firefox-i18n-56.0.1/rm.xpi) = 2f2399082c4e7cff27f1d77fd7bd76acda1e3b61d4f14b87efc7dd2abb317586 -SIZE (xpi/firefox-i18n-56.0.1/rm.xpi) = 467019 -SHA256 (xpi/firefox-i18n-56.0.1/ro.xpi) = afa7826fa3d68464960d3129eb64e17df73e8a41b4e8a6f6688e76111d2a941a -SIZE (xpi/firefox-i18n-56.0.1/ro.xpi) = 470785 -SHA256 (xpi/firefox-i18n-56.0.1/ru.xpi) = 62201c8e4c4ac140cb5e82fd699059de719f90ba77a41ba396971d65c0ba9e35 -SIZE (xpi/firefox-i18n-56.0.1/ru.xpi) = 541437 -SHA256 (xpi/firefox-i18n-56.0.1/si.xpi) = 385612528745dcc87df53770a8d52a573d69e71ea5275a40afd5be0108754bae -SIZE (xpi/firefox-i18n-56.0.1/si.xpi) = 515921 -SHA256 (xpi/firefox-i18n-56.0.1/sk.xpi) = 4d1a6cf70a5415a947f630ee41060ebbfea85271ce1dac9f3329fcf8c376115a -SIZE (xpi/firefox-i18n-56.0.1/sk.xpi) = 495564 -SHA256 (xpi/firefox-i18n-56.0.1/sl.xpi) = 4c5b93d99e038e86e8461ebfb1bcc4bfb7e52430d385bcb27354826fd7f1af09 -SIZE (xpi/firefox-i18n-56.0.1/sl.xpi) = 473806 -SHA256 (xpi/firefox-i18n-56.0.1/son.xpi) = f203ef6d205f6b69c706399a1013e94a4fb4017ffed9cff1c47ccd60eec02f0f -SIZE (xpi/firefox-i18n-56.0.1/son.xpi) = 464323 -SHA256 (xpi/firefox-i18n-56.0.1/sq.xpi) = d029c776769e327356304886e17846ec79568a9aeac47f779bd2e0a24229ce4f -SIZE (xpi/firefox-i18n-56.0.1/sq.xpi) = 479512 -SHA256 (xpi/firefox-i18n-56.0.1/sr.xpi) = fef5561cb30d850319544df750d717bf6a63f95ba2b981e0d8dd0857a20e0e2d -SIZE (xpi/firefox-i18n-56.0.1/sr.xpi) = 504486 -SHA256 (xpi/firefox-i18n-56.0.1/sv-SE.xpi) = a8819d2e17a9388bc2bf9f33219a85350470eb4c12fc3c752f90514198c68033 -SIZE (xpi/firefox-i18n-56.0.1/sv-SE.xpi) = 473949 -SHA256 (xpi/firefox-i18n-56.0.1/ta.xpi) = ba97a17431b9626e5f63fce46d7daf50944a95eb36ecd82d1baffacf71981381 -SIZE (xpi/firefox-i18n-56.0.1/ta.xpi) = 530646 -SHA256 (xpi/firefox-i18n-56.0.1/te.xpi) = 06a0ef7059b2d272f2cd4817d4b821e12baf0667bcf9226f95154e0f2f1ad4c0 -SIZE (xpi/firefox-i18n-56.0.1/te.xpi) = 549585 -SHA256 (xpi/firefox-i18n-56.0.1/th.xpi) = 57a0036f4d34487642e25011208f7bc2f7dec57e2e53003d30eae8eee54fd24b -SIZE (xpi/firefox-i18n-56.0.1/th.xpi) = 520297 -SHA256 (xpi/firefox-i18n-56.0.1/tr.xpi) = 1b4f6c67df638d197a4a335e4804c2ace7f4418143fb315f8b1869d0f58427d5 -SIZE (xpi/firefox-i18n-56.0.1/tr.xpi) = 480550 -SHA256 (xpi/firefox-i18n-56.0.1/uk.xpi) = e9d58bb00b3c5ab1fd3e733dad500fc5b16f8687a5c734be3005d3224fce6b2b -SIZE (xpi/firefox-i18n-56.0.1/uk.xpi) = 535436 -SHA256 (xpi/firefox-i18n-56.0.1/ur.xpi) = 38d1ca95c04dd04755c5bc81428cc023f745b3eecd89a7d25372d5d0d05533be -SIZE (xpi/firefox-i18n-56.0.1/ur.xpi) = 527354 -SHA256 (xpi/firefox-i18n-56.0.1/uz.xpi) = d1825e387c642e7138769e4ce93bb87f37c11af485d4f2304946c87cd3d5b561 -SIZE (xpi/firefox-i18n-56.0.1/uz.xpi) = 475101 -SHA256 (xpi/firefox-i18n-56.0.1/vi.xpi) = 4cf4623f5444494c004e0e68bb1fa6b7fa19c4312b64ca5853b18f21fbc881c3 -SIZE (xpi/firefox-i18n-56.0.1/vi.xpi) = 487150 -SHA256 (xpi/firefox-i18n-56.0.1/xh.xpi) = d1180cc0ed1e5d06ebd13e3349374d72d43d609047f61f1e69b1cc9306aec8be -SIZE (xpi/firefox-i18n-56.0.1/xh.xpi) = 477838 -SHA256 (xpi/firefox-i18n-56.0.1/zh-CN.xpi) = b50a88457241bd88e7e18dcd909d216fa37f52017f5d33f4721ec774ec57c845 -SIZE (xpi/firefox-i18n-56.0.1/zh-CN.xpi) = 498979 -SHA256 (xpi/firefox-i18n-56.0.1/zh-TW.xpi) = b812f005d3a87a80b228e9e01ff2daecb43fa781793cf73a4178cde54172b368 -SIZE (xpi/firefox-i18n-56.0.1/zh-TW.xpi) = 497765 +TIMESTAMP = 1508873487 +SHA256 (xpi/firefox-i18n-56.0.2/ach.xpi) = a78c4900c9dac71ea312d5ceda13987f4f8418ab078374c0e292cd30ce79aa23 +SIZE (xpi/firefox-i18n-56.0.2/ach.xpi) = 454896 +SHA256 (xpi/firefox-i18n-56.0.2/af.xpi) = e0ea5e99eb7cedd0c3893ae4baa3ca2af7f814bc069dcbf921069dcaba762fc6 +SIZE (xpi/firefox-i18n-56.0.2/af.xpi) = 456214 +SHA256 (xpi/firefox-i18n-56.0.2/an.xpi) = 18e3c4e6f85fb296bd955b110ba2c6a381ba4ba8de3a0e2990bc4618f9438593 +SIZE (xpi/firefox-i18n-56.0.2/an.xpi) = 475863 +SHA256 (xpi/firefox-i18n-56.0.2/ar.xpi) = c8dcb494321e5ef34092b7555ec67147461b387803df895c30858314f0509acb +SIZE (xpi/firefox-i18n-56.0.2/ar.xpi) = 500711 +SHA256 (xpi/firefox-i18n-56.0.2/as.xpi) = e77f99a72083b49e30f453d1f40ac670e42e6a637b8bb4e7c914f74b24e6b582 +SIZE (xpi/firefox-i18n-56.0.2/as.xpi) = 508237 +SHA256 (xpi/firefox-i18n-56.0.2/ast.xpi) = e4fe6028af88b67dce678e6a1215cda2c2aa0cbe76eb95947c46e08d93bb23bc +SIZE (xpi/firefox-i18n-56.0.2/ast.xpi) = 469157 +SHA256 (xpi/firefox-i18n-56.0.2/az.xpi) = 5d9cd26da6e1afe41c9d032054b066a9e0a13f7cfd9701e8126147f405ae6f1a +SIZE (xpi/firefox-i18n-56.0.2/az.xpi) = 484984 +SHA256 (xpi/firefox-i18n-56.0.2/be.xpi) = 647318eb3b3060ba2384ecf4b4b96fb70fb54f1428c20f776d8d99f75eed5f49 +SIZE (xpi/firefox-i18n-56.0.2/be.xpi) = 531385 +SHA256 (xpi/firefox-i18n-56.0.2/bg.xpi) = a844374d3453747f30382acf6019d379596f812f68d49ba7245a18993cea5ffb +SIZE (xpi/firefox-i18n-56.0.2/bg.xpi) = 528789 +SHA256 (xpi/firefox-i18n-56.0.2/bn-BD.xpi) = caafe8df84189999ed513e4f88e91f8b8c35e8a1d13fa54bd54f3a0654ec1f02 +SIZE (xpi/firefox-i18n-56.0.2/bn-BD.xpi) = 542772 +SHA256 (xpi/firefox-i18n-56.0.2/bn-IN.xpi) = 4278938cf3be47f2e7a865a2221c10f383b8c7930f71b2bd0c4ce09c1ff8a3c8 +SIZE (xpi/firefox-i18n-56.0.2/bn-IN.xpi) = 534450 +SHA256 (xpi/firefox-i18n-56.0.2/br.xpi) = 65e8b0a3e55e99701e0ecfb9cdb0775afc0946f23eab34d4ada4f0d973d2076d +SIZE (xpi/firefox-i18n-56.0.2/br.xpi) = 464256 +SHA256 (xpi/firefox-i18n-56.0.2/bs.xpi) = fef54b5ba9231eaedbe216c1f9e7c86d831ed032d1fcd6e5dd15a06619ad69ac +SIZE (xpi/firefox-i18n-56.0.2/bs.xpi) = 472256 +SHA256 (xpi/firefox-i18n-56.0.2/ca.xpi) = 11dc866f5f2a16622fa45c36c174150293e123bfd970890e4403ed224d6e4eb6 +SIZE (xpi/firefox-i18n-56.0.2/ca.xpi) = 480364 +SHA256 (xpi/firefox-i18n-56.0.2/cak.xpi) = 1ed05bcdb3977850ae21847f70122111ff459cc6669130ec9db5ccf11dde117f +SIZE (xpi/firefox-i18n-56.0.2/cak.xpi) = 489507 +SHA256 (xpi/firefox-i18n-56.0.2/cs.xpi) = 1191121195a77ec1315ec379b307819f1ce6b15bfa1bb9fc31ec0148cb08bcf5 +SIZE (xpi/firefox-i18n-56.0.2/cs.xpi) = 485090 +SHA256 (xpi/firefox-i18n-56.0.2/cy.xpi) = a04d0d37f46b89d2aba85eebc1524daba41b3a6db468e61a924e83b2814d8845 +SIZE (xpi/firefox-i18n-56.0.2/cy.xpi) = 466288 +SHA256 (xpi/firefox-i18n-56.0.2/da.xpi) = 3822d31c6b83317216f5124d603d9a8b8180a06d2407426dd90b71891c155f0c +SIZE (xpi/firefox-i18n-56.0.2/da.xpi) = 460091 +SHA256 (xpi/firefox-i18n-56.0.2/de.xpi) = ee02b96baf96be7e69ff12f06576a270e48ca454cc8f93c51070ebdd9c2a03f7 +SIZE (xpi/firefox-i18n-56.0.2/de.xpi) = 473856 +SHA256 (xpi/firefox-i18n-56.0.2/dsb.xpi) = 227588519f2ae092f6cbf0531287c5c36b7037c3355cc0d9e0e024d4e84472e3 +SIZE (xpi/firefox-i18n-56.0.2/dsb.xpi) = 489897 +SHA256 (xpi/firefox-i18n-56.0.2/el.xpi) = ace7c78e28297ea4dcc90a2b8c2881afc812a2416ae4cdba499749349bc2d3f3 +SIZE (xpi/firefox-i18n-56.0.2/el.xpi) = 554120 +SHA256 (xpi/firefox-i18n-56.0.2/en-GB.xpi) = 55fb37a478f2521b1b1543498d373ade08126c3ac71127bfbde504d8a3f95e16 +SIZE (xpi/firefox-i18n-56.0.2/en-GB.xpi) = 447375 +SHA256 (xpi/firefox-i18n-56.0.2/en-US.xpi) = 618f390c9a36aed65860d6ad20444c9c6224471d0a394de92a21262291327ff2 +SIZE (xpi/firefox-i18n-56.0.2/en-US.xpi) = 446951 +SHA256 (xpi/firefox-i18n-56.0.2/en-ZA.xpi) = 2fa254426d945152e9eb01cc02a8f86415fa5425aefed9825bd1dea9b6d0b76a +SIZE (xpi/firefox-i18n-56.0.2/en-ZA.xpi) = 445916 +SHA256 (xpi/firefox-i18n-56.0.2/eo.xpi) = f1d9e7acc5bb36a2acfb1659ad0857e5d2c9800836d096f41ceb87977a6e7377 +SIZE (xpi/firefox-i18n-56.0.2/eo.xpi) = 468952 +SHA256 (xpi/firefox-i18n-56.0.2/es-AR.xpi) = 12f34c15fb4cf11e5c007ea19a97f91370a66e192cc3c0aed5405659be36eaa3 +SIZE (xpi/firefox-i18n-56.0.2/es-AR.xpi) = 475449 +SHA256 (xpi/firefox-i18n-56.0.2/es-CL.xpi) = 5239da279a01681c00ece001d1477abba04b41d50fd442e761140ba93b68870f +SIZE (xpi/firefox-i18n-56.0.2/es-CL.xpi) = 479922 +SHA256 (xpi/firefox-i18n-56.0.2/es-ES.xpi) = 98b7422e833226916953ac89201652f406f84c805d293ab949adae475fc03a7c +SIZE (xpi/firefox-i18n-56.0.2/es-ES.xpi) = 365631 +SHA256 (xpi/firefox-i18n-56.0.2/es-MX.xpi) = 9516c169b883f8208c996f461221e9bb917e2e56c1f67d01f67026a8f5de3a1b +SIZE (xpi/firefox-i18n-56.0.2/es-MX.xpi) = 482565 +SHA256 (xpi/firefox-i18n-56.0.2/et.xpi) = dff5cbe5b933511fc10c1209dde31c45a521c9e687d909f4915eaf3eac8a3ad3 +SIZE (xpi/firefox-i18n-56.0.2/et.xpi) = 462104 +SHA256 (xpi/firefox-i18n-56.0.2/eu.xpi) = d47fe44fcab9328102334596678fe89289d8de44cd9018e13e1bcc70823ec6ec +SIZE (xpi/firefox-i18n-56.0.2/eu.xpi) = 467884 +SHA256 (xpi/firefox-i18n-56.0.2/fa.xpi) = 8f25e71eb0ee9ad9e90d9948012713013ee03b6fe1b3837b1d903c5102be0a93 +SIZE (xpi/firefox-i18n-56.0.2/fa.xpi) = 522909 +SHA256 (xpi/firefox-i18n-56.0.2/ff.xpi) = b8416ca244cb8c99744dc3c6daa55d893754ed051ea9731f57b49edc2f0e18f1 +SIZE (xpi/firefox-i18n-56.0.2/ff.xpi) = 463098 +SHA256 (xpi/firefox-i18n-56.0.2/fi.xpi) = 1c6ecc0d72a500f5a77a8fdde5e288ce2c578bc1b1de3d1a062e6d7a71765130 +SIZE (xpi/firefox-i18n-56.0.2/fi.xpi) = 461923 +SHA256 (xpi/firefox-i18n-56.0.2/fr.xpi) = 3aa8e3e74e35a4e1ca948cb83b42bb9b2c95ec6abdbc8b0872129f6f75d4e2e1 +SIZE (xpi/firefox-i18n-56.0.2/fr.xpi) = 484561 +SHA256 (xpi/firefox-i18n-56.0.2/fy-NL.xpi) = 21b16ee4d0a232d6860c9fa6db296544e13e9500796451a98adebcdf35f88c66 +SIZE (xpi/firefox-i18n-56.0.2/fy-NL.xpi) = 478044 +SHA256 (xpi/firefox-i18n-56.0.2/ga-IE.xpi) = 4d780a2c0f362742f069842ae2d7ddf3dd8177e66405c9c570ef52b2e7de1f32 +SIZE (xpi/firefox-i18n-56.0.2/ga-IE.xpi) = 489379 +SHA256 (xpi/firefox-i18n-56.0.2/gd.xpi) = 9e4e1ffc31853fe3e0d4e9e23cd1ccdf0be1b50182cefc9581b902370a3ae2fc +SIZE (xpi/firefox-i18n-56.0.2/gd.xpi) = 476927 +SHA256 (xpi/firefox-i18n-56.0.2/gl.xpi) = 7dc3615f3eca3bc09472207b8d78644923526dd51651a6a04cf8449bf78cca4b +SIZE (xpi/firefox-i18n-56.0.2/gl.xpi) = 466468 +SHA256 (xpi/firefox-i18n-56.0.2/gn.xpi) = 32d64cb5ceb3a8b53abafd0699d9697f190e137155484fc06968efe3ab2da294 +SIZE (xpi/firefox-i18n-56.0.2/gn.xpi) = 485790 +SHA256 (xpi/firefox-i18n-56.0.2/gu-IN.xpi) = 574654d88abc8d620d5d29c09a281738ff463f8a0e09386373005a4c33cd7adf +SIZE (xpi/firefox-i18n-56.0.2/gu-IN.xpi) = 513740 +SHA256 (xpi/firefox-i18n-56.0.2/he.xpi) = aa4437d071736c8009ff81f79cf51348fa7ce02d82dd603cc08c00997de79ddc +SIZE (xpi/firefox-i18n-56.0.2/he.xpi) = 488495 +SHA256 (xpi/firefox-i18n-56.0.2/hi-IN.xpi) = 9faa3d8242f2e13e82334c91018137a23a88374d6d8bcbdbca0bac69b709487d +SIZE (xpi/firefox-i18n-56.0.2/hi-IN.xpi) = 538303 +SHA256 (xpi/firefox-i18n-56.0.2/hr.xpi) = 78ea8859fc47c3fd35055ad7dacd3c89192619f637d1b10a5515db49c1aabd63 +SIZE (xpi/firefox-i18n-56.0.2/hr.xpi) = 475058 +SHA256 (xpi/firefox-i18n-56.0.2/hsb.xpi) = 7e868a01a8c881319703dd2d40aa7a90a2a6afda350a93cdee785c1cee3e334c +SIZE (xpi/firefox-i18n-56.0.2/hsb.xpi) = 487599 +SHA256 (xpi/firefox-i18n-56.0.2/hu.xpi) = ba7c06ffe790cb31450c47ffc73c0ef402e759e8d6798c284ab3004aa9b1a154 +SIZE (xpi/firefox-i18n-56.0.2/hu.xpi) = 490102 +SHA256 (xpi/firefox-i18n-56.0.2/hy-AM.xpi) = 5a78e97fe3b0a106a9839714e2a811d52501e5c427ba9c943bdcbdd2beb303cb +SIZE (xpi/firefox-i18n-56.0.2/hy-AM.xpi) = 527711 +SHA256 (xpi/firefox-i18n-56.0.2/id.xpi) = 916e89bb2bf8fcd0671a1cfe34944643e3f3bb1aeccf6bc7b86329e1f3261cb3 +SIZE (xpi/firefox-i18n-56.0.2/id.xpi) = 459066 +SHA256 (xpi/firefox-i18n-56.0.2/is.xpi) = f424cf833f52cb6a57933e6173bad7a1df2e01b9233feb0abfab0e9f3fd13a78 +SIZE (xpi/firefox-i18n-56.0.2/is.xpi) = 467447 +SHA256 (xpi/firefox-i18n-56.0.2/it.xpi) = 49e286eecc3e31a2581f728783f25717b994e466a1329f5121efff04d3400ccd +SIZE (xpi/firefox-i18n-56.0.2/it.xpi) = 358695 +SHA256 (xpi/firefox-i18n-56.0.2/ja.xpi) = f981b5dd41b2d2479034720d4d8d4ec98b936e5d4b092e954057a3135b802d93 +SIZE (xpi/firefox-i18n-56.0.2/ja.xpi) = 527926 +SHA256 (xpi/firefox-i18n-56.0.2/ka.xpi) = c84ec7d427a84290cc760cf35a900a188621c7c8fbc3b48f63d7c000642eb3c1 +SIZE (xpi/firefox-i18n-56.0.2/ka.xpi) = 509096 +SHA256 (xpi/firefox-i18n-56.0.2/kab.xpi) = e8ffa26d1acef0cfb554eced0b86656c4ac504b5459bb8fd3eb86c5292df7b3e +SIZE (xpi/firefox-i18n-56.0.2/kab.xpi) = 477420 +SHA256 (xpi/firefox-i18n-56.0.2/kk.xpi) = 5c918b32273f6a107c6a8d78be58c9e757884dcc28951949db39bba705c95d37 +SIZE (xpi/firefox-i18n-56.0.2/kk.xpi) = 534932 +SHA256 (xpi/firefox-i18n-56.0.2/km.xpi) = 52c280027d92449fda3cd321a091b2f65f401d417bff7fdce692191b748f99c2 +SIZE (xpi/firefox-i18n-56.0.2/km.xpi) = 549344 +SHA256 (xpi/firefox-i18n-56.0.2/kn.xpi) = 03120c4eb742e750c46f266fceb69cd1a8b97d3cf5bd0f2a55485d25af502272 +SIZE (xpi/firefox-i18n-56.0.2/kn.xpi) = 545517 +SHA256 (xpi/firefox-i18n-56.0.2/ko.xpi) = 60171b4d104a456df4a7fc60dc506eaa0ced1a32a216461bbddd2a215200f61b +SIZE (xpi/firefox-i18n-56.0.2/ko.xpi) = 502895 +SHA256 (xpi/firefox-i18n-56.0.2/lij.xpi) = b0b07f9e4be734145b6472ef506b4cb99c85eea98ece31dad6efa2003d59f893 +SIZE (xpi/firefox-i18n-56.0.2/lij.xpi) = 467275 +SHA256 (xpi/firefox-i18n-56.0.2/lt.xpi) = 09302dfb196300ae49c47cf4a9a1ac9ec4df954defa8abd19bdd985852af94b5 +SIZE (xpi/firefox-i18n-56.0.2/lt.xpi) = 488753 +SHA256 (xpi/firefox-i18n-56.0.2/lv.xpi) = 9f47b7ef87c55320d6d67a15f61a87b0cc9e891a5aeac382badfe3e3b27b51e4 +SIZE (xpi/firefox-i18n-56.0.2/lv.xpi) = 481628 +SHA256 (xpi/firefox-i18n-56.0.2/mai.xpi) = f16a670648ebdc3b914620d7fbe4f6095952f65c658901ecfcfbbc37645f5fdb +SIZE (xpi/firefox-i18n-56.0.2/mai.xpi) = 524702 +SHA256 (xpi/firefox-i18n-56.0.2/mk.xpi) = e537b92b6af439a1c1b9e667939f146b7a2ad17eae3d4f9075d1ad70bb958b0f +SIZE (xpi/firefox-i18n-56.0.2/mk.xpi) = 507818 +SHA256 (xpi/firefox-i18n-56.0.2/ml.xpi) = 5714a5481f111e1467a596973c824e9d09cb1e464cc74c332582d5079b495efd +SIZE (xpi/firefox-i18n-56.0.2/ml.xpi) = 547547 +SHA256 (xpi/firefox-i18n-56.0.2/mr.xpi) = 2993e10fa67e526691859805b5bf928be5607d59ceedbbb7aa68962688fa6723 +SIZE (xpi/firefox-i18n-56.0.2/mr.xpi) = 536673 +SHA256 (xpi/firefox-i18n-56.0.2/ms.xpi) = 7b4a6353a3b2e6e2fc923dc43191c0bc463aeacc9d9eaadb032f93f00376b6df +SIZE (xpi/firefox-i18n-56.0.2/ms.xpi) = 466107 +SHA256 (xpi/firefox-i18n-56.0.2/my.xpi) = 9ef461ae9ec46bc6198456411232ed37a0ed68f11d4bc587d2b8b4d8247868d5 +SIZE (xpi/firefox-i18n-56.0.2/my.xpi) = 536722 +SHA256 (xpi/firefox-i18n-56.0.2/nb-NO.xpi) = ee407654fbfad2523ec72fc921b9072772bacc231636b460ac239c406a43132f +SIZE (xpi/firefox-i18n-56.0.2/nb-NO.xpi) = 465575 +SHA256 (xpi/firefox-i18n-56.0.2/nl.xpi) = bbba1d13636b0f03868d202893eb995f3112a56ac2453bbdde6b8fb856fe49b1 +SIZE (xpi/firefox-i18n-56.0.2/nl.xpi) = 469053 +SHA256 (xpi/firefox-i18n-56.0.2/nn-NO.xpi) = 8120d52f0e9a0ecd870a0ea0d3b887df12b129d3bfda7c83f09e4036907d08e6 +SIZE (xpi/firefox-i18n-56.0.2/nn-NO.xpi) = 466208 +SHA256 (xpi/firefox-i18n-56.0.2/or.xpi) = 325acd5539ec48f65320ff0f5768fbdced82c788750f7c0cd00bf2a264751e32 +SIZE (xpi/firefox-i18n-56.0.2/or.xpi) = 518165 +SHA256 (xpi/firefox-i18n-56.0.2/pa-IN.xpi) = 2e3bcfc268606f1496226ca549df40e9c6b8b9f972cdd7f84d4d5c4b32173294 +SIZE (xpi/firefox-i18n-56.0.2/pa-IN.xpi) = 509046 +SHA256 (xpi/firefox-i18n-56.0.2/pl.xpi) = c6123361207e67bfd6f859c65c369fa0b22561fbb46b548d9b322433f209a712 +SIZE (xpi/firefox-i18n-56.0.2/pl.xpi) = 377524 +SHA256 (xpi/firefox-i18n-56.0.2/pt-BR.xpi) = 3a45de0fd1d0b18123e4f97de1de8f57c043a8c621a02f5267643fc5fb12c8bf +SIZE (xpi/firefox-i18n-56.0.2/pt-BR.xpi) = 470954 +SHA256 (xpi/firefox-i18n-56.0.2/pt-PT.xpi) = b8412464435c2e3c79017bc7ecc6b7b7d7715b1b47d0ca5f6e7c320d2c2b87d1 +SIZE (xpi/firefox-i18n-56.0.2/pt-PT.xpi) = 472803 +SHA256 (xpi/firefox-i18n-56.0.2/rm.xpi) = 2054926b1f43459aa857234466b686553555e2afc2e6072ef3883f28b2ebc676 +SIZE (xpi/firefox-i18n-56.0.2/rm.xpi) = 467019 +SHA256 (xpi/firefox-i18n-56.0.2/ro.xpi) = d69ce50c34f429d4a6724b4b8d954bb3f78e5a7fb42302c2e9de9e5f870c4e0e +SIZE (xpi/firefox-i18n-56.0.2/ro.xpi) = 470785 +SHA256 (xpi/firefox-i18n-56.0.2/ru.xpi) = 2339cce445c2c01de77fd89079c121301dfcc082f9f8e3b0f640d0f42a648cac +SIZE (xpi/firefox-i18n-56.0.2/ru.xpi) = 541437 +SHA256 (xpi/firefox-i18n-56.0.2/si.xpi) = 79c3fa18f421923b48505b74e39cd4fab474685584bb5daf71f41ebd8a388402 +SIZE (xpi/firefox-i18n-56.0.2/si.xpi) = 515921 +SHA256 (xpi/firefox-i18n-56.0.2/sk.xpi) = 0292ae81d9ae0af15489b2b420f3156cb2f7266cd881deaa4c9e164c987271c7 +SIZE (xpi/firefox-i18n-56.0.2/sk.xpi) = 495563 +SHA256 (xpi/firefox-i18n-56.0.2/sl.xpi) = bea8af482218c1bfde800e3461f64d008b46b1419745127fe838a29724098b5f +SIZE (xpi/firefox-i18n-56.0.2/sl.xpi) = 473806 +SHA256 (xpi/firefox-i18n-56.0.2/son.xpi) = 6f93b52c42355adafc0778516defce16af99a17ee41ec0d25003ab39bfc6dda1 +SIZE (xpi/firefox-i18n-56.0.2/son.xpi) = 464322 +SHA256 (xpi/firefox-i18n-56.0.2/sq.xpi) = 867d12980a8d3ee7ae28faa4f09f63ed405f9ea18b6c0c776da8194ecda937ed +SIZE (xpi/firefox-i18n-56.0.2/sq.xpi) = 479511 +SHA256 (xpi/firefox-i18n-56.0.2/sr.xpi) = b300ada0279186be68dbf292d41d446828acc71e3dcca94cf88a2ef34b38abc9 +SIZE (xpi/firefox-i18n-56.0.2/sr.xpi) = 504487 +SHA256 (xpi/firefox-i18n-56.0.2/sv-SE.xpi) = 0ccdf643e1f62ff1e41ceb3fe9c35191aece0efcbfc6b24293f88f7ef1d55043 +SIZE (xpi/firefox-i18n-56.0.2/sv-SE.xpi) = 473949 +SHA256 (xpi/firefox-i18n-56.0.2/ta.xpi) = 0186d38239a9db92394562eb70a6960eeeee052abce62bc3672c8644a37cb859 +SIZE (xpi/firefox-i18n-56.0.2/ta.xpi) = 530646 +SHA256 (xpi/firefox-i18n-56.0.2/te.xpi) = 789359330bdfefb1fc379582b098c040cdb6a46f770e2c80b1695a7eb634db40 +SIZE (xpi/firefox-i18n-56.0.2/te.xpi) = 549585 +SHA256 (xpi/firefox-i18n-56.0.2/th.xpi) = abeb0f7ff018d44efbcea4cba5c0c62a78f42f6395ea1535f757f2045064c880 +SIZE (xpi/firefox-i18n-56.0.2/th.xpi) = 520297 +SHA256 (xpi/firefox-i18n-56.0.2/tr.xpi) = b3798722e3a732e422a1fbff8d1c9ca7716b3fe9b2f21cc219432ec998556e26 +SIZE (xpi/firefox-i18n-56.0.2/tr.xpi) = 480549 +SHA256 (xpi/firefox-i18n-56.0.2/uk.xpi) = 6854f076f5ef93e72a4f38f03a8dadc61e3a2f8afa402783bbd00bcc63b6f14f +SIZE (xpi/firefox-i18n-56.0.2/uk.xpi) = 535436 +SHA256 (xpi/firefox-i18n-56.0.2/ur.xpi) = 01a4d64725be568e148d88dab405545f76a24a695d499a236a2be0599489324a +SIZE (xpi/firefox-i18n-56.0.2/ur.xpi) = 527354 +SHA256 (xpi/firefox-i18n-56.0.2/uz.xpi) = 79092d2f830adbf05cc884aa014fa9348e3449fa206cf91286d5bfb40ebe729c +SIZE (xpi/firefox-i18n-56.0.2/uz.xpi) = 475101 +SHA256 (xpi/firefox-i18n-56.0.2/vi.xpi) = 65633b00c1a124a23bfda2bdb7666ab8e12e113c956930cc975f838e3de04038 +SIZE (xpi/firefox-i18n-56.0.2/vi.xpi) = 487150 +SHA256 (xpi/firefox-i18n-56.0.2/xh.xpi) = af99554dc838c042310acbb0a7c2623d61ff3b3045667cf301cffeb29821c008 +SIZE (xpi/firefox-i18n-56.0.2/xh.xpi) = 477838 +SHA256 (xpi/firefox-i18n-56.0.2/zh-CN.xpi) = f2a1bb04222fbca3845b00694342a74c8d54cbf1a64104d96f1856879aed0abf +SIZE (xpi/firefox-i18n-56.0.2/zh-CN.xpi) = 498979 +SHA256 (xpi/firefox-i18n-56.0.2/zh-TW.xpi) = 8c547d631522048d060be5305c277024e8038386dcad232ed742b1edf14a9471 +SIZE (xpi/firefox-i18n-56.0.2/zh-TW.xpi) = 497765 diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 6bf3e743836..196a5cf2197 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -2,13 +2,13 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 56.0.1 +DISTVERSION= 56.0.2 DISTVERSIONSUFFIX=.source -PORTREVISION= 4 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla diff --git a/www/firefox/distinfo b/www/firefox/distinfo index df9186a028e..1294136080e 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1507068922 -SHA256 (firefox-56.0.1.source.tar.xz) = ece052c9385ac6ccf58edb213b875f4793014c431f7e40de146bcd2dbcb0a3cb -SIZE (firefox-56.0.1.source.tar.xz) = 254422768 +TIMESTAMP = 1508873487 +SHA256 (firefox-56.0.2.source.tar.xz) = 6f7d284c31383a9860d7b52f05f866526d5a7c31e3ef2959d79122ba074f5ca1 +SIZE (firefox-56.0.2.source.tar.xz) = 255658916 diff --git a/www/firefox/files/patch-bug1393283 b/www/firefox/files/patch-bug1393283 new file mode 100644 index 00000000000..0a4b9327ea2 --- /dev/null +++ b/www/firefox/files/patch-bug1393283 @@ -0,0 +1,144 @@ +commit d20c7d929c84 +Author: Ethan +Date: Fri Sep 1 17:29:44 2017 +0800 + + Bug 1393283 - Use the last ESR version as the spoofed Firefox version. r=tihuang, r=mcmanus +--- + .../test/browser/browser_navigator.js | 2 +- + netwerk/protocol/http/nsHttpHandler.cpp | 16 +++---- + .../resistfingerprinting/nsRFPService.cpp | 56 ++++++++++++++++++++++ + .../components/resistfingerprinting/nsRFPService.h | 3 ++ + 4 files changed, 66 insertions(+), 11 deletions(-) + +diff --git browser/components/resistfingerprinting/test/browser/browser_navigator.js browser/components/resistfingerprinting/test/browser/browser_navigator.js +index 25c393d8bb2a..9f52e34a9451 100644 +--- browser/components/resistfingerprinting/test/browser/browser_navigator.js ++++ browser/components/resistfingerprinting/test/browser/browser_navigator.js +@@ -91,7 +91,7 @@ add_task(async function setup() { + + let appInfo = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULAppInfo); + let appVersion = parseInt(appInfo.version); +- let spoofedVersion = appVersion - (appVersion % 10); ++ let spoofedVersion = appVersion - ((appVersion - 3) % 7); + spoofedUserAgent = `Mozilla/5.0 (${SPOOFED_OSCPU}; rv:${spoofedVersion}.0) Gecko/20100101 Firefox/${spoofedVersion}.0`; + }); + +diff --git netwerk/protocol/http/nsHttpHandler.cpp netwerk/protocol/http/nsHttpHandler.cpp +index 31d0f8832732..b957d835b52f 100644 +--- netwerk/protocol/http/nsHttpHandler.cpp ++++ netwerk/protocol/http/nsHttpHandler.cpp +@@ -461,16 +461,12 @@ nsHttpHandler::Init() + mAppVersion.AssignLiteral(MOZ_APP_UA_VERSION); + } + +- // Generating the spoofed userAgent for fingerprinting resistance. +- // The browser version will be rounded down to a multiple of 10. +- // By doing so, the anonymity group will cover more versions instead of one +- // version. +- uint32_t spoofedVersion = mAppVersion.ToInteger(&rv); +- if (NS_SUCCEEDED(rv)) { +- spoofedVersion = spoofedVersion - (spoofedVersion % 10); +- mSpoofedUserAgent.Assign(nsPrintfCString( +- "Mozilla/5.0 (%s; rv:%d.0) Gecko/%s Firefox/%d.0", +- SPOOFED_OSCPU, spoofedVersion, LEGACY_BUILD_ID, spoofedVersion)); ++ // Generating the spoofed User Agent for fingerprinting resistance. ++ rv = nsRFPService::GetSpoofedUserAgent(mSpoofedUserAgent); ++ if (NS_FAILED(rv)) { ++ // Empty mSpoofedUserAgent to make sure the unsuccessful spoofed UA string ++ // will not be used anywhere. ++ mSpoofedUserAgent.Truncate(); + } + + mSessionStartTime = NowInSeconds(); +diff --git toolkit/components/resistfingerprinting/nsRFPService.cpp toolkit/components/resistfingerprinting/nsRFPService.cpp +index 94554200c3b8..96a2940c04a0 100644 +--- toolkit/components/resistfingerprinting/nsRFPService.cpp ++++ toolkit/components/resistfingerprinting/nsRFPService.cpp +@@ -18,10 +18,13 @@ + #include "nsServiceManagerUtils.h" + #include "nsString.h" + #include "nsXULAppAPI.h" ++#include "nsPrintfCString.h" + + #include "nsIObserverService.h" + #include "nsIPrefBranch.h" + #include "nsIPrefService.h" ++#include "nsIXULAppInfo.h" ++#include "nsIXULRuntime.h" + #include "nsJSUtils.h" + + #include "prenv.h" +@@ -162,6 +165,59 @@ nsRFPService::GetSpoofedPresentedFrames(double aTime, uint32_t aWidth, uint32_t + return NSToIntFloor(time * sVideoFramesPerSec * ((100 - boundedDroppedRatio) / 100.0)); + } + ++/* static */ ++nsresult ++nsRFPService::GetSpoofedUserAgent(nsACString &userAgent) ++{ ++ // This function generates the spoofed value of User Agent. ++ // We spoof the values of the platform and Firefox version, which could be ++ // used as fingerprinting sources to identify individuals. ++ // Reference of the format of User Agent: ++ // https://developer.mozilla.org/en-US/docs/Web/API/NavigatorID/userAgent ++ // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/User-Agent ++ ++ nsresult rv; ++ nsCOMPtr appInfo = ++ do_GetService("@mozilla.org/xre/app-info;1", &rv); ++ NS_ENSURE_SUCCESS(rv, rv); ++ ++ nsAutoCString appVersion; ++ rv = appInfo->GetVersion(appVersion); ++ NS_ENSURE_SUCCESS(rv, rv); ++ ++ // The browser version will be spoofed as the last ESR version. ++ // By doing so, the anonymity group will cover more versions instead of one ++ // version. ++ uint32_t firefoxVersion = appVersion.ToInteger(&rv); ++ NS_ENSURE_SUCCESS(rv, rv); ++ ++ // Starting from Firefox 10, Firefox ESR was released once every seven ++ // Firefox releases, e.g. Firefox 10, 17, 24, 31, and so on. ++ // We infer the last and closest ESR version based on this rule. ++ nsCOMPtr runtime = ++ do_GetService("@mozilla.org/xre/runtime;1", &rv); ++ NS_ENSURE_SUCCESS(rv, rv); ++ ++ nsAutoCString updateChannel; ++ rv = runtime->GetDefaultUpdateChannel(updateChannel); ++ NS_ENSURE_SUCCESS(rv, rv); ++ ++ // If we are running in Firefox ESR, determine whether the formula of ESR ++ // version has changed. Once changed, we must update the formula in this ++ // function. ++ if (updateChannel.Equals("esr")) { ++ MOZ_ASSERT(((firefoxVersion % 7) == 3), ++ "Please udpate ESR version formula in nsRFPService.cpp"); ++ } ++ ++ uint32_t spoofedVersion = firefoxVersion - ((firefoxVersion - 3) % 7); ++ userAgent.Assign(nsPrintfCString( ++ "Mozilla/5.0 (%s; rv:%d.0) Gecko/%s Firefox/%d.0", ++ SPOOFED_OSCPU, spoofedVersion, LEGACY_BUILD_ID, spoofedVersion)); ++ ++ return rv; ++} ++ + nsresult + nsRFPService::Init() + { +diff --git toolkit/components/resistfingerprinting/nsRFPService.h toolkit/components/resistfingerprinting/nsRFPService.h +index cf1f688bb992..bad80383883b 100644 +--- toolkit/components/resistfingerprinting/nsRFPService.h ++++ toolkit/components/resistfingerprinting/nsRFPService.h +@@ -49,6 +49,9 @@ public: + static uint32_t GetSpoofedDroppedFrames(double aTime, uint32_t aWidth, uint32_t aHeight); + static uint32_t GetSpoofedPresentedFrames(double aTime, uint32_t aWidth, uint32_t aHeight); + ++ // This method generates the spoofed value of User Agent. ++ static nsresult GetSpoofedUserAgent(nsACString &userAgent); ++ + private: + nsresult Init(); + diff --git a/www/py-flexget/Makefile b/www/py-flexget/Makefile index 1010176a59f..cff2c28fcd5 100644 --- a/www/py-flexget/Makefile +++ b/www/py-flexget/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= flexget -PORTVERSION= 2.10.102 +PORTVERSION= 2.10.104 PORTEPOCH= 1 CATEGORIES= www python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-flexget/distinfo b/www/py-flexget/distinfo index a79b5e2d723..98cb0145e4b 100644 --- a/www/py-flexget/distinfo +++ b/www/py-flexget/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1508465796 -SHA256 (flexget-Flexget-2.10.102_GH0.tar.gz) = a73eb609b78e87faa1288dab429f3f491414fadaceaebe07f841af2f3a70abbd -SIZE (flexget-Flexget-2.10.102_GH0.tar.gz) = 6774166 +TIMESTAMP = 1508811383 +SHA256 (flexget-Flexget-2.10.104_GH0.tar.gz) = 978de46e779f2965b32c50a438ba8ccae7aba85b3059da8152bb489749130d71 +SIZE (flexget-Flexget-2.10.104_GH0.tar.gz) = 6774232 diff --git a/www/rtv/Makefile b/www/rtv/Makefile index 9bd80c26d5d..87c5addfed5 100644 --- a/www/rtv/Makefile +++ b/www/rtv/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= rtv -PORTVERSION= 1.18.0 +PORTVERSION= 1.19.0 DISTVERSIONPREFIX= v CATEGORIES= www diff --git a/www/rtv/distinfo b/www/rtv/distinfo index 430378062aa..0980fc66285 100644 --- a/www/rtv/distinfo +++ b/www/rtv/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1504959559 -SHA256 (michael-lazar-rtv-v1.18.0_GH0.tar.gz) = 44e49253db01bcda5992b80804444c6e996092146c5176a7f44ca1a1f1abe815 -SIZE (michael-lazar-rtv-v1.18.0_GH0.tar.gz) = 9095873 +TIMESTAMP = 1508888513 +SHA256 (michael-lazar-rtv-v1.19.0_GH0.tar.gz) = 2d5719cd47113917b924ed1bbb9882528433906dceb816fad1f40a31de30de8b +SIZE (michael-lazar-rtv-v1.19.0_GH0.tar.gz) = 13528757 diff --git a/x11-themes/kf5-breeze-icons/Makefile b/x11-themes/kf5-breeze-icons/Makefile index 6d68396d513..95d11ea0929 100644 --- a/x11-themes/kf5-breeze-icons/Makefile +++ b/x11-themes/kf5-breeze-icons/Makefile @@ -2,11 +2,14 @@ # $FreeBSD$ PORTNAME= breeze-icons -PORTVERSION= ${KDE_FRAMEWORKS_VERSION} +DISTVERSION= ${KDE_FRAMEWORKS_VERSION} CATEGORIES= x11-themes kde kde-frameworks MAINTAINER= kde@FreeBSD.org -COMMENT= The Breeze icon theme for KDE +COMMENT= Breeze icon theme for KDE + +LICENSE= LGPL3+ +LICENSE_FILE= ${WRKSRC}/COPYING-ICONS USES= cmake:outsource kde:5 tar:xz USE_KDE= ecm diff --git a/x11-toolkits/kf5-attica/Makefile b/x11-toolkits/kf5-attica/Makefile index e9eacc8de53..a57027dbf41 100644 --- a/x11-toolkits/kf5-attica/Makefile +++ b/x11-toolkits/kf5-attica/Makefile @@ -2,12 +2,18 @@ # $FreeBSD$ PORTNAME= attica -PORTVERSION= ${KDE_FRAMEWORKS_VERSION} +DISTVERSION= ${KDE_FRAMEWORKS_VERSION} CATEGORIES= x11-toolkits kde kde-frameworks MAINTAINER= kde@FreeBSD.org COMMENT= Open Collaboration Services API library KDE5 version +# The sources are LGPL21 or LGPL3 or later-version-approved-by-KDE, +# so use the OR of existing license versions. COPYING is LGPL21. +LICENSE= LGPL21 LGPL3 +LICENSE_COMB= dual +LICENSE_FILE= ${WRKSRC}/COPYING + USES= cmake:outsource compiler:c++11-lib kde:5 pathfix tar:xz USE_KDE= ecm USE_QT5= buildtools_build core gui network qmake_build testlib_build widgets diff --git a/x11/controllermap/Makefile b/x11/controllermap/Makefile index e79696b4efa..8634ea933f0 100644 --- a/x11/controllermap/Makefile +++ b/x11/controllermap/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= controllermap -PORTVERSION= 2.0.6 +PORTVERSION= 2.0.7 CATEGORIES= x11 MASTER_SITES= http://www.libsdl.org/release/ DISTNAME= SDL2-${DISTVERSION} diff --git a/x11/controllermap/distinfo b/x11/controllermap/distinfo index 6ca7f834d85..c554f21e6ad 100644 --- a/x11/controllermap/distinfo +++ b/x11/controllermap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1506106261 -SHA256 (SDL2-2.0.6.tar.gz) = 03658b5660d16d7b31263a691e058ed37acdab155d68dabbad79998fb552c5df -SIZE (SDL2-2.0.6.tar.gz) = 4420311 +TIMESTAMP = 1508786865 +SHA256 (SDL2-2.0.7.tar.gz) = ee35c74c4313e2eda104b14b1b86f7db84a04eeab9430d56e001cea268bf4d5e +SIZE (SDL2-2.0.7.tar.gz) = 4432499