From 4cc825861a2d2d1f5cbc760a6e7cfd2488c81347 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 5 Sep 2017 05:41:59 +0200 Subject: [PATCH] */*: sync with upstream Taken from: HardenedBSD --- astro/josm/Makefile | 2 +- astro/josm/distinfo | 6 +-- devel/cgit/pkg-descr | 2 +- devel/elixir-quantum/Makefile | 2 +- devel/elixir-quantum/distinfo | 6 +-- devel/elixir-quantum/pkg-plist | 21 +++++++++- devel/py-magic/Makefile | 2 +- devel/py-magic/distinfo | 6 +-- devel/rubygem-google-api-client/Makefile | 2 +- devel/rubygem-google-api-client/distinfo | 6 +-- dns/bind9-devel/Makefile | 4 +- dns/bind9-devel/distinfo | 6 +-- .../files/extrapatch-bind-min-override-ttl | 40 +++++++++++-------- editors/emacs-devel/Makefile | 6 +-- editors/emacs-devel/distinfo | 6 +-- editors/emacs-devel/files/patch-configure.ac | 17 ++++++-- editors/emacs-devel/pkg-plist | 11 ++++- games/emptyepsilon/pkg-descr | 2 +- graphics/R-cran-diagram/Makefile | 9 +++-- graphics/R-cran-diagram/distinfo | 5 ++- graphics/R-cran-diagram/pkg-descr | 2 +- graphics/colmap/Makefile | 6 +-- graphics/colmap/distinfo | 6 +-- graphics/colmap/files/patch-no-sse | 16 -------- graphics/colmap/files/patch-vlfeat-rtcpu | 32 ++++++++------- lang/perl5-devel/Makefile | 2 +- lang/perl5-devel/distinfo | 6 +-- mail/cyrus-imapd30/Makefile | 9 +++-- mail/cyrus-imapd30/distinfo | 6 +-- misc/Makefile | 1 + misc/ptsort/Makefile | 18 +++++++++ misc/ptsort/distinfo | 3 ++ misc/ptsort/pkg-descr | 5 +++ net-mgmt/ccnet-server/Makefile | 15 ++++--- net-mgmt/ccnet-server/distinfo | 6 +-- net-mgmt/seafile-server/Makefile | 23 +++++------ net-mgmt/seafile-server/Makefile.include | 4 +- net-mgmt/seafile-server/distinfo | 6 +-- net-mgmt/seafile-server/pkg-plist | 1 + net/py-libcloud/Makefile | 2 +- net/py-libcloud/distinfo | 6 +-- polish/hunspell/Makefile | 2 +- polish/hunspell/distinfo | 6 +-- sysutils/heartbeat/Makefile | 6 +-- sysutils/heartbeat/files/pkg-install.in | 20 ---------- sysutils/zap/Makefile | 2 +- sysutils/zap/distinfo | 6 +-- textproc/rubygem-coderay/Makefile | 3 +- textproc/rubygem-coderay/distinfo | 5 ++- www/mod_http2-devel/Makefile | 2 +- www/mod_http2-devel/distinfo | 6 +-- www/py-seafdav/distinfo | 6 +-- www/py-seafobj/distinfo | 6 +-- www/seahub/distinfo | 6 +-- www/selenium/Makefile | 2 +- www/selenium/distinfo | 6 +-- x11-wm/i3/Makefile | 2 +- x11-wm/i3/distinfo | 6 +-- x11-wm/i3/files/patch-configure | 11 ----- .../i3/files/patch-libi3_get__config__path.c | 11 ----- 60 files changed, 236 insertions(+), 214 deletions(-) create mode 100644 misc/ptsort/Makefile create mode 100644 misc/ptsort/distinfo create mode 100644 misc/ptsort/pkg-descr delete mode 100644 sysutils/heartbeat/files/pkg-install.in delete mode 100644 x11-wm/i3/files/patch-configure delete mode 100644 x11-wm/i3/files/patch-libi3_get__config__path.c diff --git a/astro/josm/Makefile b/astro/josm/Makefile index e9cabb7f1cf..f72048a5d5f 100644 --- a/astro/josm/Makefile +++ b/astro/josm/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= josm -PORTVERSION= 12545 +PORTVERSION= 12712 CATEGORIES= astro java MASTER_SITES= http://josm.openstreetmap.de/download/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/astro/josm/distinfo b/astro/josm/distinfo index 6b81378c859..c9020cd53fd 100644 --- a/astro/josm/distinfo +++ b/astro/josm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1501502714 -SHA256 (josm-snapshot-12545.jar) = c49b82d1d8199e5585ba79c53f5b458f411a565cc7f4ed202c0b854098ac2720 -SIZE (josm-snapshot-12545.jar) = 11311720 +TIMESTAMP = 1504536608 +SHA256 (josm-snapshot-12712.jar) = 0ebfb35c07d0a0984cd7f05123719cd4ca710e9c79456bc62bf6ca3dbf27ff52 +SIZE (josm-snapshot-12712.jar) = 11396882 diff --git a/devel/cgit/pkg-descr b/devel/cgit/pkg-descr index f705814c8ab..1a9d82856dd 100644 --- a/devel/cgit/pkg-descr +++ b/devel/cgit/pkg-descr @@ -1,4 +1,4 @@ cgit is a fast web interface for the Git SCM, using a built-in cache to decrease server I/O pressure. -WWW: http://git.zx2c4.com/cgit/about/ +WWW: https://git.zx2c4.com/cgit/about/ diff --git a/devel/elixir-quantum/Makefile b/devel/elixir-quantum/Makefile index 0790f94b042..05899563f06 100644 --- a/devel/elixir-quantum/Makefile +++ b/devel/elixir-quantum/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= quantum -PORTVERSION= 1.9.3 +PORTVERSION= 2.0.3 DISTVERSIONPREFIX= v CATEGORIES= devel PKGNAMEPREFIX= elixir- diff --git a/devel/elixir-quantum/distinfo b/devel/elixir-quantum/distinfo index db59256ebc1..afd2382eeaf 100644 --- a/devel/elixir-quantum/distinfo +++ b/devel/elixir-quantum/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499888173 -SHA256 (c-rack-quantum-elixir-v1.9.3_GH0.tar.gz) = e2506646f57421902e5d6be1480edd118948b0142bd44067d57f075edfbab13a -SIZE (c-rack-quantum-elixir-v1.9.3_GH0.tar.gz) = 20532 +TIMESTAMP = 1504513942 +SHA256 (c-rack-quantum-elixir-v2.0.3_GH0.tar.gz) = 2b2d7d37ad3efe62438d9685f2c0434084af13c2ae56ed6a64fdf777f792b8b6 +SIZE (c-rack-quantum-elixir-v2.0.3_GH0.tar.gz) = 26814 diff --git a/devel/elixir-quantum/pkg-plist b/devel/elixir-quantum/pkg-plist index 6127c193cbf..ee16bc07baa 100644 --- a/devel/elixir-quantum/pkg-plist +++ b/devel/elixir-quantum/pkg-plist @@ -1,18 +1,35 @@ lib/elixir/lib/quantum/ebin/Elixir.Quantum.Application.beam -lib/elixir/lib/quantum/ebin/Elixir.Quantum.Config.beam +lib/elixir/lib/quantum/ebin/Elixir.Quantum.DateLibrary.Calendar.beam +lib/elixir/lib/quantum/ebin/Elixir.Quantum.DateLibrary.Timex.beam +lib/elixir/lib/quantum/ebin/Elixir.Quantum.DateLibrary.beam lib/elixir/lib/quantum/ebin/Elixir.Quantum.Executor.beam lib/elixir/lib/quantum/ebin/Elixir.Quantum.Job.beam lib/elixir/lib/quantum/ebin/Elixir.Quantum.Normalizer.beam +lib/elixir/lib/quantum/ebin/Elixir.Quantum.RunStrategy.All.beam +lib/elixir/lib/quantum/ebin/Elixir.Quantum.RunStrategy.NodeList.Quantum.RunStrategy.All.beam +lib/elixir/lib/quantum/ebin/Elixir.Quantum.RunStrategy.NodeList.Quantum.RunStrategy.Random.beam +lib/elixir/lib/quantum/ebin/Elixir.Quantum.RunStrategy.NodeList.beam +lib/elixir/lib/quantum/ebin/Elixir.Quantum.RunStrategy.Random.beam +lib/elixir/lib/quantum/ebin/Elixir.Quantum.RunStrategy.beam +lib/elixir/lib/quantum/ebin/Elixir.Quantum.Runner.beam +lib/elixir/lib/quantum/ebin/Elixir.Quantum.Scheduler.beam lib/elixir/lib/quantum/ebin/Elixir.Quantum.Supervisor.beam lib/elixir/lib/quantum/ebin/Elixir.Quantum.Timer.beam lib/elixir/lib/quantum/ebin/Elixir.Quantum.beam lib/elixir/lib/quantum/ebin/quantum.app lib/elixir/lib/quantum/lib/quantum.ex lib/elixir/lib/quantum/lib/quantum/application.ex -lib/elixir/lib/quantum/lib/quantum/config.ex +lib/elixir/lib/quantum/lib/quantum/date_library.ex +lib/elixir/lib/quantum/lib/quantum/date_library/calendar.ex +lib/elixir/lib/quantum/lib/quantum/date_library/timex.ex lib/elixir/lib/quantum/lib/quantum/executor.ex lib/elixir/lib/quantum/lib/quantum/job.ex lib/elixir/lib/quantum/lib/quantum/normalizer.ex +lib/elixir/lib/quantum/lib/quantum/run_strategy.ex +lib/elixir/lib/quantum/lib/quantum/run_strategy/all.ex +lib/elixir/lib/quantum/lib/quantum/run_strategy/random.ex +lib/elixir/lib/quantum/lib/quantum/runner.ex +lib/elixir/lib/quantum/lib/quantum/scheduler.ex lib/elixir/lib/quantum/lib/quantum/supervisor.ex lib/elixir/lib/quantum/lib/quantum/timer.ex %%PORTDOCS%%%%DOCSDIR%%/README.md diff --git a/devel/py-magic/Makefile b/devel/py-magic/Makefile index 79b8e8dafaa..9037d8c36e6 100644 --- a/devel/py-magic/Makefile +++ b/devel/py-magic/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= magic -PORTVERSION= 5.30 +PORTVERSION= 5.32 CATEGORIES= devel python MASTER_SITES= ftp://ftp.astron.com/pub/file/ \ ftp://ftp.gw.com/mirrors/pub/unix/file/ \ diff --git a/devel/py-magic/distinfo b/devel/py-magic/distinfo index ec79a4112f1..3e4370b8ea2 100644 --- a/devel/py-magic/distinfo +++ b/devel/py-magic/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1487302975 -SHA256 (file-5.30.tar.gz) = 694c2432e5240187524c9e7cf1ec6acc77b47a0e19554d34c14773e43dbbf214 -SIZE (file-5.30.tar.gz) = 789345 +TIMESTAMP = 1504520106 +SHA256 (file-5.32.tar.gz) = 8639dc4d1b21e232285cd483604afc4a6ee810710e00e579dbe9591681722b50 +SIZE (file-5.32.tar.gz) = 797025 diff --git a/devel/rubygem-google-api-client/Makefile b/devel/rubygem-google-api-client/Makefile index a9cf471ca62..92296a9c089 100644 --- a/devel/rubygem-google-api-client/Makefile +++ b/devel/rubygem-google-api-client/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= google-api-client -PORTVERSION= 0.13.4 +PORTVERSION= 0.13.5 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-google-api-client/distinfo b/devel/rubygem-google-api-client/distinfo index b7c08930eb8..3029631acbe 100644 --- a/devel/rubygem-google-api-client/distinfo +++ b/devel/rubygem-google-api-client/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1503939367 -SHA256 (rubygem/google-api-client-0.13.4.gem) = f584b556491c3669c202183469e5cff813d0bae811110ab05e96de0896b7487a -SIZE (rubygem/google-api-client-0.13.4.gem) = 3180032 +TIMESTAMP = 1504539990 +SHA256 (rubygem/google-api-client-0.13.5.gem) = 81cf397f3545bf0e4939a0b21b76f40cada52a4be4854788bbdc1b98fd48cb99 +SIZE (rubygem/google-api-client-0.13.5.gem) = 3206656 diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile index f9e6d60f082..ed66c61c0f2 100644 --- a/dns/bind9-devel/Makefile +++ b/dns/bind9-devel/Makefile @@ -31,8 +31,8 @@ LICENSE= MPL LICENSE_FILE= ${WRKSRC}/COPYRIGHT # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.12.0a.2017.08.26 -HASH= 503223b +ISCVERSION= 9.12.0a.2017.09.04 +HASH= 1007623 USES= cpe libedit diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo index 4708324d269..d396065b9ee 100644 --- a/dns/bind9-devel/distinfo +++ b/dns/bind9-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1503923142 -SHA256 (bind9-503223b.tar.gz) = ba4bc8ac9afa73cc6f0ae29066b929ff034fd555ebb4da23239a47dbc0812090 -SIZE (bind9-503223b.tar.gz) = 11901720 +TIMESTAMP = 1504530859 +SHA256 (bind9-1007623.tar.gz) = 8bd1cbde1ae534398eae50c6e1199215c608fabea328e64e91025a59d2ebeb2d +SIZE (bind9-1007623.tar.gz) = 11908264 diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl index 815421f454a..9197458abe5 100644 --- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl +++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl @@ -1,15 +1,21 @@ ---- bin/named/config.c.orig 2017-08-21 08:20:10 UTC +--- bin/named/config.c.orig 2017-09-04 08:22:52 UTC +++ bin/named/config.c -@@ -156,6 +156,8 @@ options {\n\ - lame-ttl 600;\n\ - servfail-ttl 1;\n\ - max-ncache-ttl 10800; /* 3 hours */\n\ -+ override-cache-ttl 0; /* do not override */\n\ -+ min-cache-ttl 0; /* no minimal, zero is allowed */\n\ - max-cache-ttl 604800; /* 1 week */\n\ - transfer-format many-answers;\n\ - max-cache-size 90%;\n\ ---- bin/named/server.c.orig 2017-08-21 08:20:10 UTC +@@ -176,12 +176,14 @@ options {\n\ + max-recursion-depth 7;\n\ + max-recursion-queries 75;\n\ + message-compression yes;\n\ ++ min-cache-ttl 0; /* no minimal, zero is allowed */\n\ + # min-roots ;\n\ + minimal-any false;\n\ + minimal-responses true;\n\ + notify-source *;\n\ + notify-source-v6 *;\n\ + nsec3-test-zone no;\n\ ++ override-cache-ttl 0; /* do not override */\n\ + provide-ixfr true;\n\ + query-source address *;\n\ + query-source-v6 address *;\n\ +--- bin/named/server.c.orig 2017-09-04 08:22:52 UTC +++ bin/named/server.c @@ -3722,6 +3722,16 @@ configure_view(dns_view_t *view, dns_vie } @@ -28,9 +34,9 @@ result = ns_config_get(maps, "max-cache-ttl", &obj); INSIST(result == ISC_R_SUCCESS); view->maxcachettl = cfg_obj_asuint32(obj); ---- lib/dns/include/dns/view.h.orig 2017-08-21 08:20:10 UTC +--- lib/dns/include/dns/view.h.orig 2017-09-04 08:22:52 UTC +++ lib/dns/include/dns/view.h -@@ -144,6 +144,8 @@ struct dns_view { +@@ -145,6 +145,8 @@ struct dns_view { isc_boolean_t requestnsid; isc_boolean_t sendcookie; dns_ttl_t maxcachettl; @@ -39,9 +45,9 @@ dns_ttl_t maxncachettl; isc_uint32_t nta_lifetime; isc_uint32_t nta_recheck; ---- lib/dns/resolver.c.orig 2017-08-21 08:20:10 UTC +--- lib/dns/resolver.c.orig 2017-09-04 08:22:52 UTC +++ lib/dns/resolver.c -@@ -5687,6 +5687,18 @@ cache_name(fetchctx_t *fctx, dns_name_t +@@ -5723,6 +5723,18 @@ cache_name(fetchctx_t *fctx, dns_name_t } /* @@ -60,9 +66,9 @@ * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) ---- lib/isccfg/namedconf.c.orig 2017-08-21 08:20:10 UTC +--- lib/isccfg/namedconf.c.orig 2017-09-04 08:22:52 UTC +++ lib/isccfg/namedconf.c -@@ -1896,6 +1896,8 @@ view_clauses[] = { +@@ -1894,6 +1894,8 @@ view_clauses[] = { { "max-acache-size", &cfg_type_sizenodefault, CFG_CLAUSEFLAG_OBSOLETE }, { "max-cache-size", &cfg_type_sizeorpercent, 0 }, diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile index 975d1643569..06614616aea 100644 --- a/editors/emacs-devel/Makefile +++ b/editors/emacs-devel/Makefile @@ -15,14 +15,14 @@ LICENSE_FILE= ${WRKSRC}/COPYING CONFLICTS= emacs25-[0-9]* emacs-nox11-[0-9]* -BROKEN_aarch64= Fails to link: missing sbrk +BROKEN_aarch64= Segfaults during build USE_GITHUB= yes GH_ACCOUNT= emacs-mirror -GH_TAGNAME= 01a98e9 +GH_TAGNAME= 1b492fa EMACS_VER= 26.0.50 -EMACS_REV= 20170712 +EMACS_REV= 20170903 GNU_CONFIGURE= yes USES= autoreconf:build cpe gmake makeinfo ncurses pkgconfig INFO_PATH= ${DATADIR_REL}/info diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo index 6eecc190ec9..b54c1b41dc3 100644 --- a/editors/emacs-devel/distinfo +++ b/editors/emacs-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499881754 -SHA256 (emacs-mirror-emacs-26.0.50.20170712-01a98e9_GH0.tar.gz) = a8dac385243085666eb1838be5e148e7a7a98508405e2fa3a10d2d29b3a4b480 -SIZE (emacs-mirror-emacs-26.0.50.20170712-01a98e9_GH0.tar.gz) = 39301316 +TIMESTAMP = 1504453415 +SHA256 (emacs-mirror-emacs-26.0.50.20170903-1b492fa_GH0.tar.gz) = f409d8d0afecbf35999a4af0bb168969cb84a8f21428bbbdc9c28b498e804da7 +SIZE (emacs-mirror-emacs-26.0.50.20170903-1b492fa_GH0.tar.gz) = 39365573 diff --git a/editors/emacs-devel/files/patch-configure.ac b/editors/emacs-devel/files/patch-configure.ac index 82865a1c0fd..7026a204348 100644 --- a/editors/emacs-devel/files/patch-configure.ac +++ b/editors/emacs-devel/files/patch-configure.ac @@ -1,8 +1,8 @@ ---- configure.ac.orig 2017-01-22 02:35:42 UTC +--- configure.ac.orig 2017-09-03 12:54:18 UTC +++ configure.ac -@@ -1225,7 +1225,8 @@ if test "$MAKEINFO" != "no"; then - MAKEINFO=makeinfo - fi +@@ -1251,7 +1251,8 @@ AC_SUBST([PAXCTL_notdumped]) + ## Require makeinfo >= 4.13 (last of the 4.x series) to build the manuals. + if test "${MAKEINFO:=makeinfo}" != "no"; then case `($MAKEINFO --version) 2>/dev/null` in - *' (GNU texinfo) '4.1[[3-9]]* | \ + *' (GNU texinfo) '4.[[8-9]]* | \ @@ -10,3 +10,12 @@ *' (GNU texinfo) '[[5-9]]* | \ *' (GNU texinfo) '[[1-9][0-9]]* ) ;; *) MAKEINFO=no;; +@@ -3364,7 +3365,7 @@ if test "${HAVE_X11}" = "yes"; then + AC_CACHE_CHECK([for XpmReturnAllocPixels preprocessor define], + [emacs_cv_cpp_xpm_return_alloc_pixels], + [AC_EGREP_CPP(no_return_alloc_pixels, +- [#include "noX/xpm.h" ++ [#include "X11/xpm.h" + #ifndef XpmReturnAllocPixels + no_return_alloc_pixels + #endif diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist index 9a4769f27c5..dddbaaf8502 100644 --- a/editors/emacs-devel/pkg-plist +++ b/editors/emacs-devel/pkg-plist @@ -765,7 +765,6 @@ share/applications/emacs.desktop %%DATADIR%%/%%EMACS_VER%%/etc/org/OrgOdtContentTemplate.xml %%DATADIR%%/%%EMACS_VER%%/etc/org/OrgOdtStyles.xml %%DATADIR%%/%%EMACS_VER%%/etc/org/README -%%DATADIR%%/%%EMACS_VER%%/etc/org/library-of-babel.org %%DATADIR%%/%%EMACS_VER%%/etc/package-keyring.gpg %%DATADIR%%/%%EMACS_VER%%/etc/ps-prin0.ps %%DATADIR%%/%%EMACS_VER%%/etc/ps-prin1.ps @@ -1451,6 +1450,8 @@ share/applications/emacs.desktop %%DATADIR%%/%%EMACS_VER%%/lisp/dirtrack.elc %%DATADIR%%/%%EMACS_VER%%/lisp/disp-table.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/disp-table.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/display-line-numbers.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/display-line-numbers.elc %%DATADIR%%/%%EMACS_VER%%/lisp/dnd.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/dnd.elc %%DATADIR%%/%%EMACS_VER%%/lisp/doc-view.el.gz @@ -3342,6 +3343,10 @@ share/applications/emacs.desktop %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/f90.elc %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake-proc.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake-proc.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake-ui.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake-ui.elc %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/fortran.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/fortran.elc %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/gdb-mi.el.gz @@ -3531,6 +3536,8 @@ share/applications/emacs.desktop %%DATADIR%%/%%EMACS_VER%%/lisp/term/internal.elc %%DATADIR%%/%%EMACS_VER%%/lisp/term/iris-ansi.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/term/iris-ansi.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/term/konsole.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/term/konsole.elc %%DATADIR%%/%%EMACS_VER%%/lisp/term/linux.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/term/linux.elc %%DATADIR%%/%%EMACS_VER%%/lisp/term/lk201.el.gz @@ -3587,6 +3594,8 @@ share/applications/emacs.desktop %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/flyspell.elc %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/ispell.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/ispell.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/less-css-mode.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/less-css-mode.elc %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/makeinfo.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/makeinfo.elc %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/mhtml-mode.el.gz diff --git a/games/emptyepsilon/pkg-descr b/games/emptyepsilon/pkg-descr index 96b40d307ae..9793d02d89c 100644 --- a/games/emptyepsilon/pkg-descr +++ b/games/emptyepsilon/pkg-descr @@ -7,4 +7,4 @@ Engineering. Except for the Captain, each officer operates part of the ship through a specialized screen. The Captain relies on their trusty crew to report information and follow orders. -WWW: http://emptyepsilon.org/ +WWW: http://daid.github.io/EmptyEpsilon/ diff --git a/graphics/R-cran-diagram/Makefile b/graphics/R-cran-diagram/Makefile index 816d67d1c27..bb8f7018a5b 100644 --- a/graphics/R-cran-diagram/Makefile +++ b/graphics/R-cran-diagram/Makefile @@ -2,17 +2,18 @@ # $FreeBSD$ PORTNAME= diagram -PORTVERSION= 1.6.3 +PORTVERSION= 1.6.4 CATEGORIES= graphics DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= tota@FreeBSD.org COMMENT= Functions for visualising simple graphs, plotting flow diagrams -LICENSE= GPLv2 GPLv3 -LICENSE_COMB= dual +LICENSE= GPLv2+ -RUN_DEPENDS= R-cran-shape>0:graphics/R-cran-shape +CRAN_DEPENDS= R-cran-shape>0:graphics/R-cran-shape +BUILD_DEPENDS= ${CRAN_DEPENDS} +RUN_DEPENDS= ${CRAN_DEPENDS} USES= cran:auto-plist diff --git a/graphics/R-cran-diagram/distinfo b/graphics/R-cran-diagram/distinfo index a548b96d067..5714640460c 100644 --- a/graphics/R-cran-diagram/distinfo +++ b/graphics/R-cran-diagram/distinfo @@ -1,2 +1,3 @@ -SHA256 (diagram_1.6.3.tar.gz) = 01eb732f343b26b3c2d7833f6ab82194c84ca05a2c560bca3b1f8691c929eac5 -SIZE (diagram_1.6.3.tar.gz) = 466691 +TIMESTAMP = 1504523708 +SHA256 (diagram_1.6.4.tar.gz) = 7c2bc5d5d634c3b8ca7fea79fb463e412962d88f47a77a74c811cc62f375ce38 +SIZE (diagram_1.6.4.tar.gz) = 542720 diff --git a/graphics/R-cran-diagram/pkg-descr b/graphics/R-cran-diagram/pkg-descr index dfa3678b9a0..eb640cd3c8a 100644 --- a/graphics/R-cran-diagram/pkg-descr +++ b/graphics/R-cran-diagram/pkg-descr @@ -4,4 +4,4 @@ the book "A practical guide to ecological modelling - using R as a simulation platform" by Karline Soetaert and Peter M.J. Herman (2009). Springer. Includes demo(flowchart), demo(plotmat), demo(plotweb) -WWW: http://cran.r-project.org/web/packages/diagram/ +WWW: https://cran.r-project.org/web/packages/diagram/ diff --git a/graphics/colmap/Makefile b/graphics/colmap/Makefile index 43059e3dcbc..de947707ccf 100644 --- a/graphics/colmap/Makefile +++ b/graphics/colmap/Makefile @@ -1,9 +1,7 @@ # $FreeBSD$ PORTNAME= colmap -DISTVERSION= 3.1-4 -DISTVERSIONSUFFIX= -g542ce21 # doc fixes -PORTREVISION= 1 +DISTVERSION= 3.2 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org @@ -28,7 +26,7 @@ LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \ USES= cmake compiler:${OPENMP}c++11-lib fortran localbase sqlite USE_GITHUB= yes -USE_GL= gl glew glut +USE_GL= gl glew USE_QT5= qmake_build buildtools_build core gui opengl_build widgets EXCLUDE= SQLite EXTRACT_AFTER_ARGS= ${EXCLUDE:S,^,--exclude src/ext/,} diff --git a/graphics/colmap/distinfo b/graphics/colmap/distinfo index 9d8311d5026..9e7875b1f0e 100644 --- a/graphics/colmap/distinfo +++ b/graphics/colmap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1497537121 -SHA256 (colmap-colmap-3.1-4-g542ce21_GH0.tar.gz) = c8b6c5f9eea30f8e5ff95fe87ff1cc6123639c450602035082d33609b6e275de -SIZE (colmap-colmap-3.1-4-g542ce21_GH0.tar.gz) = 5657539 +TIMESTAMP = 1504347098 +SHA256 (colmap-colmap-3.2_GH0.tar.gz) = 7d86d3a0a68efdbcdde7bf4f24fdf40f695e61454c8497d519e9c823d148e424 +SIZE (colmap-colmap-3.2_GH0.tar.gz) = 5674070 diff --git a/graphics/colmap/files/patch-no-sse b/graphics/colmap/files/patch-no-sse index 5b3204ed219..7aaf20badc4 100644 --- a/graphics/colmap/files/patch-no-sse +++ b/graphics/colmap/files/patch-no-sse @@ -32,19 +32,3 @@ build: don't force SSE on i386 #define CPUPBA_USE_SSE #include #include ---- src/ext/SiftGPU/CMakeLists.txt.orig 2017-06-15 14:32:01 UTC -+++ src/ext/SiftGPU/CMakeLists.txt -@@ -1,13 +1,9 @@ - set(SIFT_GPU_ENABLE_OPENCL FALSE) --set(SIFT_GPU_ENABLE_SSE TRUE) - set(SIFT_GPU_ENABLE_DEVIL FALSE) - set(SIFT_GPU_PREFER_GLUT TRUE) - - if(NOT IS_MSVC) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") -- if(SIFT_GPU_ENABLE_SSE) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=core2 -mfpmath=sse") -- endif() - endif() - - if(SIFT_GPU_PREFER_GLUT) diff --git a/graphics/colmap/files/patch-vlfeat-rtcpu b/graphics/colmap/files/patch-vlfeat-rtcpu index 1274f802d5f..0877c6e80cf 100644 --- a/graphics/colmap/files/patch-vlfeat-rtcpu +++ b/graphics/colmap/files/patch-vlfeat-rtcpu @@ -19,18 +19,24 @@ build: don't force SSE2/AVX, enable at runtime instead option(OPENMP_ENABLED "Whether to enable OpenMP" ON) option(LTO_ENABLED "Whether to enable link-time optimization" ON) option(CUDA_ENABLED "Whether to enable CUDA, if available" ON) ---- src/ext/VLFeat/CMakeLists.txt.orig 2016-12-07 13:47:54 UTC +--- src/ext/VLFeat/CMakeLists.txt.orig 2017-09-02 10:11:38 UTC +++ src/ext/VLFeat/CMakeLists.txt -@@ -1,8 +1,27 @@ --if(IS_MSVC OR NOT HAS_AVX_EXTENSION) -- add_definitions(-DVL_DISABLE_AVX) +@@ -1,14 +1,25 @@ +-if(IS_GNU OR IS_CLANG) +- if(NOT HAS_AVX_EXTENSION) +- add_definitions(-DVL_DISABLE_AVX) +- endif() +set(VLFEAT_SOURCE_FILES) -+ + +- if(NOT HAS_SSE2_EXTENSION) +- add_definitions(-DVL_DISABLE_SSE2) +- endif() +if(CMAKE_SYSTEM_PROCESSOR MATCHES "[ix].?86|amd64|AMD64") + set(IS_X86 TRUE) - endif() ++endif() --if(IS_MSVC OR NOT HAS_SSE2_EXTENSION) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SSE_FLAGS}") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SSE_FLAGS}") +if(SIMD_ENABLED AND IS_X86 AND NOT IS_MSVC) + set(SSE2_SOURCES + imopv_sse2.c @@ -47,12 +53,10 @@ build: don't force SSE2/AVX, enable at runtime instead + PROPERTIES COMPILE_FLAGS "-mavx") + set_source_files_properties(${SSE2_SOURCES} + PROPERTIES COMPILE_FLAGS "-msse2") -+else() -+ add_definitions(-DVL_DISABLE_AVX) + else() + add_definitions(-DVL_DISABLE_AVX) add_definitions(-DVL_DISABLE_SSE2) - endif() - -@@ -10,7 +29,7 @@ if(NOT OPENMP_ENABLED OR NOT OPENMP_FOUN +@@ -18,7 +29,7 @@ if(NOT OPENMP_ENABLED OR NOT OPENMP_FOUND) add_definitions(-DVL_DISABLE_OPENMP) endif() @@ -61,7 +65,7 @@ build: don't force SSE2/AVX, enable at runtime instead aib.c aib.h array.c -@@ -44,8 +63,6 @@ set(VLFEAT_SOURCE_FILES +@@ -52,8 +63,6 @@ set(VLFEAT_SOURCE_FILES ikmeans_lloyd.tc imopv.c imopv.h @@ -70,7 +74,7 @@ build: don't force SSE2/AVX, enable at runtime instead kdtree.c kdtree.h kmeans.c -@@ -56,10 +73,6 @@ set(VLFEAT_SOURCE_FILES +@@ -64,10 +73,6 @@ set(VLFEAT_SOURCE_FILES liop.h mathop.c mathop.h diff --git a/lang/perl5-devel/Makefile b/lang/perl5-devel/Makefile index 3b7be7658bd..224a73bb9df 100644 --- a/lang/perl5-devel/Makefile +++ b/lang/perl5-devel/Makefile @@ -35,7 +35,7 @@ TEST_ENV= ${MAKE_ENV} TEST_JOBS=${MAKE_JOBS_NUMBER} \ USE_GITHUB= yes GH_ACCOUNT= Perl GH_PROJECT= perl5 -GH_TAGNAME= v5.27.3-18-g365cfd8 +GH_TAGNAME= v5.27.3-35-g97fcda7 OPTIONS_DEFINE= DEBUG GDBM PERL_64BITINT MULTIPLICITY SITECUSTOMIZE \ THREADS PERL_MALLOC DTRACE DOT_INC diff --git a/lang/perl5-devel/distinfo b/lang/perl5-devel/distinfo index 2c9b85e4c88..700e3c4ff1c 100644 --- a/lang/perl5-devel/distinfo +++ b/lang/perl5-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1503923103 -SHA256 (perl/Perl-perl5-v5.27.3-18-g365cfd8_GH0.tar.gz) = 3650e35bbb10adb0c82cfd7b97dd1ffdf172432e0436d858932ff4683a7ee4d2 -SIZE (perl/Perl-perl5-v5.27.3-18-g365cfd8_GH0.tar.gz) = 18650963 +TIMESTAMP = 1504527123 +SHA256 (perl/Perl-perl5-v5.27.3-35-g97fcda7_GH0.tar.gz) = 502add113fcf5720bc6c389d087a66d275bb60a890fbf28e52c78c37d3b1e1b9 +SIZE (perl/Perl-perl5-v5.27.3-35-g97fcda7_GH0.tar.gz) = 18653543 diff --git a/mail/cyrus-imapd30/Makefile b/mail/cyrus-imapd30/Makefile index 2702eb3ef98..a895aa743a3 100644 --- a/mail/cyrus-imapd30/Makefile +++ b/mail/cyrus-imapd30/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= cyrus-imapd -PORTVERSION= 3.0.3 +PORTVERSION= 3.0.4 #PORTREVISION= 0 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-imapd/ \ @@ -44,8 +44,8 @@ MAKE_JOBS_UNSAFE= yes CPE_VENDOR= cmu CPE_PRODUCT= cyrus_imap_server -OPTIONS_DEFINE= AUTOCREATE BACKUP CLAMAV HTTP IDLED LDAP MURDER MYSQL \ - NNTP PGSQL REPLICATION SNMP SQLITE SQUAT DOCS +OPTIONS_DEFINE= AUTOCREATE BACKUP CLAMAV HTTP IDLED LDAP LMDB MURDER \ + MYSQL NNTP PGSQL REPLICATION SNMP SQLITE SQUAT DOCS #OPTIONS_DEFINE+= DRAC OPTIONS_DEFAULT= CLAMAV IDLED SQLITE SQUAT OPTIONS_SUB= yes @@ -74,6 +74,9 @@ IDLED_CONFIGURE_ENABLE= idled LDAP_DESC= Enable LDAP support (experimental) LDAP_USE= OPENLDAP=yes LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE} +LMDB_DESC= Use LMDB backend +LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb +LMDB_CONFIGURE_WITH= lmdb MURDER_DESC= Enable IMAP Murder support MURDER_CONFIGURE_ENABLE=murder MURDER_MAKE_ENV= PTHREAD_LIBS="-lpthread" diff --git a/mail/cyrus-imapd30/distinfo b/mail/cyrus-imapd30/distinfo index 89cd9b2c547..9a41f526fda 100644 --- a/mail/cyrus-imapd30/distinfo +++ b/mail/cyrus-imapd30/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1502436537 -SHA256 (cyrus-imapd-3.0.3.tar.gz) = 6a76d8d00b26a2c9d03c65197724a28ab6d044527d7e230e6331f8de79af889a -SIZE (cyrus-imapd-3.0.3.tar.gz) = 10819454 +TIMESTAMP = 1504488299 +SHA256 (cyrus-imapd-3.0.4.tar.gz) = ed17b4321bbe54df2c9b8832e189f52de4561f51e199f7c620216e79910c73a0 +SIZE (cyrus-imapd-3.0.4.tar.gz) = 10819487 diff --git a/misc/Makefile b/misc/Makefile index 2aefe34d3fc..4a056d555d4 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -369,6 +369,7 @@ SUBDIR += posixtestsuite SUBDIR += proxyper SUBDIR += pspresent + SUBDIR += ptsort SUBDIR += py-YABT SUBDIR += py-cinder SUBDIR += py-crudini diff --git a/misc/ptsort/Makefile b/misc/ptsort/Makefile new file mode 100644 index 00000000000..74803b0f375 --- /dev/null +++ b/misc/ptsort/Makefile @@ -0,0 +1,18 @@ +# $FreeBSD$ + +PORTNAME= ptsort +PORTVERSION= 1.20170904 +CATEGORIES= misc +MASTER_SITES= https://github.com/dag-erling/${PORTNAME}/releases/download/${PORTVERSION}/ + +MAINTAINER= des@FreeBSD.org +COMMENT= Prioritized topological sort + +LICENSE= BSD3CLAUSE + +GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip + +PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz + +.include diff --git a/misc/ptsort/distinfo b/misc/ptsort/distinfo new file mode 100644 index 00000000000..d401d644b62 --- /dev/null +++ b/misc/ptsort/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1504553271 +SHA256 (ptsort-1.20170904.tar.gz) = f759f2ca8f67e18c178361fda70671fbed7ad06a10ee96c96c9598859e456a75 +SIZE (ptsort-1.20170904.tar.gz) = 117293 diff --git a/misc/ptsort/pkg-descr b/misc/ptsort/pkg-descr new file mode 100644 index 00000000000..1c2fca8cd77 --- /dev/null +++ b/misc/ptsort/pkg-descr @@ -0,0 +1,5 @@ +The ptsort utility is a variant of the standard tsort (topological +sort) utility which allows nodes to be prioritized, moving them and +all their predecessors up in the final order. + +WWW: https://github.com/dag-erling/ptsort diff --git a/net-mgmt/ccnet-server/Makefile b/net-mgmt/ccnet-server/Makefile index b357eb31b72..fa12ea2743b 100644 --- a/net-mgmt/ccnet-server/Makefile +++ b/net-mgmt/ccnet-server/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= ccnet-server -PORTVERSION= ${SEAFILE_VER} DISTVERSIONPREFIX= v +DISTVERSION= ${SEAFILE_VER} DISTVERSIONSUFFIX= -server CATEGORIES= net-mgmt devel @@ -20,22 +20,25 @@ LIB_DEPENDS= libsearpc.so:devel/libsearpc \ libevent.so:devel/libevent \ libjansson.so:devel/jansson -CONFLICT= ccnet-[0-9]* - +USES= autoreconf libtool localbase mysql:client pathfix \ + pgsql pkgconfig python:-2.7 shebangfix ssl USE_GITHUB= yes GH_ACCOUNT= haiwen - -USES= autoreconf gettext libtool localbase mysql:client \ - pathfix pgsql pkgconfig python:-2.7 shebangfix ssl USE_GNOME= glib20 USE_LDCONFIG= yes USE_OPENLDAP= yes +CONFLICT= ccnet-[0-9]* + CONFIGURE_ENV= SSL_CFLAGS="${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-ldap INSTALL_TARGET= install-strip +OPTIONS_DEFINE= NLS + +NLS_USES= gettext + post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${SEABIN} ${STAGEDIR}${PREFIX}/${SEALIB} ${INSTALL_PROGRAM} ${STAGEDIR}${PREFIX}/bin/ccnet-init ${STAGEDIR}${PREFIX}/${SEABIN} diff --git a/net-mgmt/ccnet-server/distinfo b/net-mgmt/ccnet-server/distinfo index 0dd891d994b..40e0faa9299 100644 --- a/net-mgmt/ccnet-server/distinfo +++ b/net-mgmt/ccnet-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1498236981 -SHA256 (haiwen-ccnet-server-v6.1.1-server_GH0.tar.gz) = 1cb84c8155d348f14b5af6e085640f1b42c523210d0f01216f04b3ad6a0e047e -SIZE (haiwen-ccnet-server-v6.1.1-server_GH0.tar.gz) = 211230 +TIMESTAMP = 1502839888 +SHA256 (haiwen-ccnet-server-v6.1.2-server_GH0.tar.gz) = 582a4c72b9af7463dbe6f5af5e1c51e3210de93bf92db42f47e43e3887d9b61a +SIZE (haiwen-ccnet-server-v6.1.2-server_GH0.tar.gz) = 211617 diff --git a/net-mgmt/seafile-server/Makefile b/net-mgmt/seafile-server/Makefile index 635ec785b42..9568b568230 100644 --- a/net-mgmt/seafile-server/Makefile +++ b/net-mgmt/seafile-server/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= seafile-server -PORTVERSION= ${SEAFILE_VER} DISTVERSIONPREFIX= v +DISTVERSION= ${SEAFILE_VER} DISTVERSIONSUFFIX= -server CATEGORIES= net-mgmt @@ -28,31 +28,31 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ CONFLICTS= seafile-[0-9]* +USES= autoreconf iconv libarchive libtool localbase mysql \ + pathfix pgsql pkgconfig python:-2.7 shebangfix sqlite ssl USE_GITHUB= yes GH_ACCOUNT= haiwen - -USES= autoreconf gettext iconv libarchive libtool mysql pathfix \ - pgsql pkgconfig python:-2.7 shebangfix sqlite ssl USE_GNOME= glib20 +USE_LDCONFIG= yes +USE_RC_SUBR= seafile + SHEBANG_FILES= scripts/*.sh scripts/upgrade/*.sh *.sh scripts/build/*.py \ scripts/*.py scripts/upgrade/*.py tools/seafile-admin GNU_CONFIGURE= yes -USE_LDCONFIG= yes CONFIGURE_ENV= SSL_CFLAGS="${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" PATHFIX_MAKEFILEIN= Makefile.am INSTALL_TARGET= install-strip -CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/evhtp -LDFLAGS+= -L${LOCALBASE}/lib - -USE_RC_SUBR= seafile +CPPFLAGS+= -I${LOCALBASE}/include/evhtp SUB_FILES= pkg-message MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFINE= FUSE +OPTIONS_DEFINE= FUSE NLS +OPTIONS_DEFAULT= FUSE +OPTIONS_EXCLUDE_DragonFly= FUSE OPTIONS_SUB= yes FUSE_DESC= Use file system in userspace @@ -60,8 +60,7 @@ FUSE_DESC= Use file system in userspace FUSE_CONFIGURE_ENABLE= fuse FUSE_LIB_DEPENDS= libfuse.so:sysutils/fusefs-libs -OPTIONS_DEFAULT= FUSE -OPTIONS_EXCLUDE_DragonFly= FUSE +NLS_USES= gettext .include diff --git a/net-mgmt/seafile-server/Makefile.include b/net-mgmt/seafile-server/Makefile.include index 1f73faf6f55..e4828ca5ef7 100644 --- a/net-mgmt/seafile-server/Makefile.include +++ b/net-mgmt/seafile-server/Makefile.include @@ -1,7 +1,7 @@ # $FreeBSD$ -SEAFILE_VER=6.1.1 -SEAHUB_VER=6.1.7 +SEAFILE_VER=6.1.2 +SEAHUB_VER=6.1.8 # Various vars used in most/all the Makefiles diff --git a/net-mgmt/seafile-server/distinfo b/net-mgmt/seafile-server/distinfo index b9fddf5b66f..648e99a1960 100644 --- a/net-mgmt/seafile-server/distinfo +++ b/net-mgmt/seafile-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1498236981 -SHA256 (haiwen-seafile-server-v6.1.1-server_GH0.tar.gz) = e939f0d374961372f9a8bf8f34f2da6f190e1bb67f5a9b793d20e584c347e2fe -SIZE (haiwen-seafile-server-v6.1.1-server_GH0.tar.gz) = 697896 +TIMESTAMP = 1502839888 +SHA256 (haiwen-seafile-server-v6.1.2-server_GH0.tar.gz) = 6a724e2db9d304906b34be11cc3236b580914ed284b1ab5548e92357d76035a6 +SIZE (haiwen-seafile-server-v6.1.2-server_GH0.tar.gz) = 701524 diff --git a/net-mgmt/seafile-server/pkg-plist b/net-mgmt/seafile-server/pkg-plist index 0af382ba8d8..b4611c00adb 100644 --- a/net-mgmt/seafile-server/pkg-plist +++ b/net-mgmt/seafile-server/pkg-plist @@ -4,6 +4,7 @@ include/seafile/seafile-object.h libdata/pkgconfig/libseafile.pc %%SEAFILE_SERVER%%/breakpad.py %%SEAFILE_SERVER%%/check_init_admin.py +%%SEAFILE_SERVER%%/export-users.sh %%SEAFILE_SERVER%%/migrate-to-ceph.sh %%SEAFILE_SERVER%%/reset-admin.sh %%SEAFILE_SERVER%%/seaf-cli-wrapper.sh diff --git a/net/py-libcloud/Makefile b/net/py-libcloud/Makefile index 71a296487be..c4c03038178 100644 --- a/net/py-libcloud/Makefile +++ b/net/py-libcloud/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libcloud -PORTVERSION= 2.1.0 +PORTVERSION= 2.2.0 CATEGORIES= net python MASTER_SITES= APACHE/${PORTNAME} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net/py-libcloud/distinfo b/net/py-libcloud/distinfo index 81dae29df3f..207e8c49cfd 100644 --- a/net/py-libcloud/distinfo +++ b/net/py-libcloud/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1500781135 -SHA256 (apache-libcloud-2.1.0.tar.bz2) = 22a8f0c46fca37c47d4ca894b6fa3d0285c72d838ff24d69eacdcedba8ce5f71 -SIZE (apache-libcloud-2.1.0.tar.bz2) = 1326868 +TIMESTAMP = 1504533860 +SHA256 (apache-libcloud-2.2.0.tar.bz2) = 661000e3d8bcb9beafe038fa6a8b0869aa9cccce9f412a27a02a977885776a2c +SIZE (apache-libcloud-2.2.0.tar.bz2) = 1335402 diff --git a/polish/hunspell/Makefile b/polish/hunspell/Makefile index 9ff66b663f1..ac68cb1b91f 100644 --- a/polish/hunspell/Makefile +++ b/polish/hunspell/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= hunspell -PORTVERSION= 20170820 +PORTVERSION= 20170824 CATEGORIES= polish textproc MASTER_SITES= https://sjp.pl/slownik/ort/ \ LOCAL/sunpoet/${PORTNAME} diff --git a/polish/hunspell/distinfo b/polish/hunspell/distinfo index 09582d5ef72..f0bb7cc767f 100644 --- a/polish/hunspell/distinfo +++ b/polish/hunspell/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1503417170 -SHA256 (hunspell/sjp-myspell-pl-20170820.zip) = efb7d3f2b665048e24e49df15e597fce6908ae490907dbad66bd0f0f113757b0 -SIZE (hunspell/sjp-myspell-pl-20170820.zip) = 1173742 +TIMESTAMP = 1504539945 +SHA256 (hunspell/sjp-myspell-pl-20170824.zip) = c5513ddb6426727c8fd89908072e94ae02530c2ea98a82b966d3991a1183ffcd +SIZE (hunspell/sjp-myspell-pl-20170824.zip) = 1187711 diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile index bf157052376..3b6641bfcaf 100644 --- a/sysutils/heartbeat/Makefile +++ b/sysutils/heartbeat/Makefile @@ -3,14 +3,14 @@ PORTNAME= heartbeat PORTVERSION= 2.1.4 -PORTREVISION= 28 +PORTREVISION= 29 CATEGORIES= sysutils #MASTER_SITES= http://hg.linux-ha.org/lha-2.1/archive/STABLE-2.1.4.tar.bz2 MASTER_SITES= LOCAL/kuriyama/heartbeat DISTNAME= STABLE-${PORTVERSION} DIST_SUBDIR= heartbeat -MAINTAINER= ports@encarnate.com +MAINTAINER= grembo@FreeBSD.org COMMENT= Subsystem for High-Availability Clustering LICENSE= GPLv2 LGPL21 @@ -54,7 +54,7 @@ CONFIGURE_ARGS= --localstatedir=/var \ --disable-dopd \ --disable-fatal-warnings -SUB_FILES= pkg-install pkg-message +SUB_FILES= pkg-message PKGDEINSTALL= ${PKGINSTALL} diff --git a/sysutils/heartbeat/files/pkg-install.in b/sysutils/heartbeat/files/pkg-install.in deleted file mode 100644 index 2cc1848d2a7..00000000000 --- a/sysutils/heartbeat/files/pkg-install.in +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -PREFIX=${PREFIX:-%%PREFIX%%} - -case $2 in - -DEINSTALL) - - echo -e "\n\n" - - # Check for running processes - echo -n "Checking if heartbeat is running... " - if ps -axc | grep -q heartbeat; then - echo -n "FOUND. Stopping... " - ${PREFIX}/etc/rc.d/heartbeat forcestop - echo "STOPPED" - else - echo "NO" - fi -esac diff --git a/sysutils/zap/Makefile b/sysutils/zap/Makefile index ed90e146a6f..02ec8e2e0ad 100644 --- a/sysutils/zap/Makefile +++ b/sysutils/zap/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= zap -DISTVERSION= 0.7.2 +DISTVERSION= 0.7.3 CATEGORIES= sysutils MAINTAINER= jrm@FreeBSD.org diff --git a/sysutils/zap/distinfo b/sysutils/zap/distinfo index cea4bd5996e..6635da3f6eb 100644 --- a/sysutils/zap/distinfo +++ b/sysutils/zap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1504120292 -SHA256 (Jehops-zap-0.7.2_GH0.tar.gz) = af9d5fe9d776e4253436b1aba5d4eafa1d29ef0b1dc6c1d25d5e2400530049bc -SIZE (Jehops-zap-0.7.2_GH0.tar.gz) = 7861 +TIMESTAMP = 1504572828 +SHA256 (Jehops-zap-0.7.3_GH0.tar.gz) = d28bd276fd3a91c951a8165e401e15be54ddb514347e1e6eefa3543a46dbac31 +SIZE (Jehops-zap-0.7.3_GH0.tar.gz) = 7842 diff --git a/textproc/rubygem-coderay/Makefile b/textproc/rubygem-coderay/Makefile index 245cd028056..4c0b1309e3b 100644 --- a/textproc/rubygem-coderay/Makefile +++ b/textproc/rubygem-coderay/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= coderay -PORTVERSION= 1.1.1 +PORTVERSION= 1.1.2 CATEGORIES= textproc rubygems MASTER_SITES= RG @@ -10,6 +10,7 @@ MAINTAINER= ruby@FreeBSD.org COMMENT= Fast and easy syntax highlighting for selected languages LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/MIT-LICENSE NO_ARCH= yes USE_RUBY= yes diff --git a/textproc/rubygem-coderay/distinfo b/textproc/rubygem-coderay/distinfo index 3824ce641b6..fc4bd0d8419 100644 --- a/textproc/rubygem-coderay/distinfo +++ b/textproc/rubygem-coderay/distinfo @@ -1,2 +1,3 @@ -SHA256 (rubygem/coderay-1.1.1.gem) = 79a42eba4cbe2b056ba253eb02d1a7aec74ca951e54f33098830641e8748dff4 -SIZE (rubygem/coderay-1.1.1.gem) = 96256 +TIMESTAMP = 1504539996 +SHA256 (rubygem/coderay-1.1.2.gem) = 9efc1b3663fa561ccffada890bd1eec3a5466808ebc711ab1c5d300617d96a97 +SIZE (rubygem/coderay-1.1.2.gem) = 92160 diff --git a/www/mod_http2-devel/Makefile b/www/mod_http2-devel/Makefile index 1c07199b35e..a43fbcdd7e3 100644 --- a/www/mod_http2-devel/Makefile +++ b/www/mod_http2-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mod_http2-devel -PORTVERSION= 1.10.10 +PORTVERSION= 1.10.11 DISTVERSIONPREFIX= v CATEGORIES= www diff --git a/www/mod_http2-devel/distinfo b/www/mod_http2-devel/distinfo index 9b2dd89c6eb..69fde8fe52e 100644 --- a/www/mod_http2-devel/distinfo +++ b/www/mod_http2-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1501444962 -SHA256 (icing-mod_h2-v1.10.10_GH0.tar.gz) = 92c38acbbaec6b0724eeab352e6fee2588c91454e07920b8b80208e9b986071f -SIZE (icing-mod_h2-v1.10.10_GH0.tar.gz) = 205596 +TIMESTAMP = 1504548771 +SHA256 (icing-mod_h2-v1.10.11_GH0.tar.gz) = 213896fc3c1e7b2307ab224b4c37947d27ef67305220ff182e77c09ebcd9538e +SIZE (icing-mod_h2-v1.10.11_GH0.tar.gz) = 209548 diff --git a/www/py-seafdav/distinfo b/www/py-seafdav/distinfo index 6b96a8592c3..0ce80d1fc66 100644 --- a/www/py-seafdav/distinfo +++ b/www/py-seafdav/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1503036403 -SHA256 (haiwen-seafdav-v6.1.7-pro_GH0.tar.gz) = 49c4dd0377d17a8b7a864fa011e01d516b0b92cf01f344a3915a4cddae873506 -SIZE (haiwen-seafdav-v6.1.7-pro_GH0.tar.gz) = 2554678 +TIMESTAMP = 1503102904 +SHA256 (haiwen-seafdav-v6.1.8-pro_GH0.tar.gz) = e26614f274a2fa08b6913540296f5cf70bc771a045a0131eef08203012afcb75 +SIZE (haiwen-seafdav-v6.1.8-pro_GH0.tar.gz) = 2554678 diff --git a/www/py-seafobj/distinfo b/www/py-seafobj/distinfo index b8893b4be5b..3f6d27a6c83 100644 --- a/www/py-seafobj/distinfo +++ b/www/py-seafobj/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1503036406 -SHA256 (haiwen-seafobj-v6.1.7-pro_GH0.tar.gz) = 395a88d5cff134c8f6884d071ce82ff1bbc9e568fd9574d9ea60159c6aee3326 -SIZE (haiwen-seafobj-v6.1.7-pro_GH0.tar.gz) = 6626655 +TIMESTAMP = 1503102906 +SHA256 (haiwen-seafobj-v6.1.8-pro_GH0.tar.gz) = 4d73bb67fc8ce9c6e97bb4bcbbe17f6aadc62cd90b8e63b0c49d0449cf97cff1 +SIZE (haiwen-seafobj-v6.1.8-pro_GH0.tar.gz) = 6626664 diff --git a/www/seahub/distinfo b/www/seahub/distinfo index 6cc7c26ab5b..45ec59e0cb7 100644 --- a/www/seahub/distinfo +++ b/www/seahub/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1503036409 -SHA256 (haiwen-seahub-v6.1.7-pro_GH0.tar.gz) = e3e562878a5a951e93dd6da3d5f3394e39f1110a084b24304bd43fdf2ab170b5 -SIZE (haiwen-seahub-v6.1.7-pro_GH0.tar.gz) = 8993599 +TIMESTAMP = 1503102908 +SHA256 (haiwen-seahub-v6.1.8-pro_GH0.tar.gz) = ba138aa1d1b303db9c7804385432eb52306a3e651e547b7bdf34ff0f19af9150 +SIZE (haiwen-seahub-v6.1.8-pro_GH0.tar.gz) = 8991826 diff --git a/www/selenium/Makefile b/www/selenium/Makefile index 66a4f069076..33076667ab0 100644 --- a/www/selenium/Makefile +++ b/www/selenium/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= selenium -PORTVERSION= 3.5.2 +PORTVERSION= 3.5.3 CATEGORIES= www devel java MASTER_SITES= http://selenium-release.storage.googleapis.com/3.5/ DISTNAME= selenium-server-standalone-${PORTVERSION} diff --git a/www/selenium/distinfo b/www/selenium/distinfo index 770e4178b67..a753d4fdeae 100644 --- a/www/selenium/distinfo +++ b/www/selenium/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1503433309 -SHA256 (selenium-server-standalone-3.5.2.jar) = 47fab028b478f59de531432e448103581aa1fc6b4b8dcf497a955eab92e26021 -SIZE (selenium-server-standalone-3.5.2.jar) = 22432345 +TIMESTAMP = 1504519637 +SHA256 (selenium-server-standalone-3.5.3.jar) = 66c137224997e631573aa2354c13db4f467dccb08a5345aea15ea70b69728f2f +SIZE (selenium-server-standalone-3.5.3.jar) = 22440420 diff --git a/x11-wm/i3/Makefile b/x11-wm/i3/Makefile index df7d569fb1b..088eeb4cfa7 100644 --- a/x11-wm/i3/Makefile +++ b/x11-wm/i3/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= i3 -DISTVERSION= 4.13 +DISTVERSION= 4.14 CATEGORIES= x11-wm MASTER_SITES= http://i3wm.org/downloads/ diff --git a/x11-wm/i3/distinfo b/x11-wm/i3/distinfo index 142cefb5cab..9cff0f90e7b 100644 --- a/x11-wm/i3/distinfo +++ b/x11-wm/i3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1478723379 -SHA256 (i3-4.13.tar.bz2) = 94c13183e527a984132a3b050c8bf629626502a6e133e07b413641aec5f8cf8a -SIZE (i3-4.13.tar.bz2) = 1121298 +TIMESTAMP = 1504530368 +SHA256 (i3-4.14.tar.bz2) = ae3abde3af1b87e269d8aad2348be6f7298338cb8e06bad11cbf91cdbf92a5d6 +SIZE (i3-4.14.tar.bz2) = 1152501 diff --git a/x11-wm/i3/files/patch-configure b/x11-wm/i3/files/patch-configure deleted file mode 100644 index ce3980649a3..00000000000 --- a/x11-wm/i3/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2016-11-08 18:54:08 UTC -+++ configure -@@ -3351,7 +3351,7 @@ if test "x$_cv_gnu_make_command" = x""; - fi - - case $srcdir in #( -- .|.*) : -+ *) : - - # pwd -P is specified in IEEE 1003.1 from 2004 - as_dir=`cd "$srcdir" && pwd -P` diff --git a/x11-wm/i3/files/patch-libi3_get__config__path.c b/x11-wm/i3/files/patch-libi3_get__config__path.c deleted file mode 100644 index 0dae2577dc3..00000000000 --- a/x11-wm/i3/files/patch-libi3_get__config__path.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libi3/get_config_path.c.orig 2016-11-08 18:54:01 UTC -+++ libi3/get_config_path.c -@@ -71,7 +71,7 @@ char *get_config_path(const char *overri - - /* 4: check for $XDG_CONFIG_DIRS/i3/config */ - if ((xdg_config_dirs = getenv("XDG_CONFIG_DIRS")) == NULL) -- xdg_config_dirs = "/etc/xdg"; -+ xdg_config_dirs = SYSCONFDIR "/xdg"; - - char *buf = sstrdup(xdg_config_dirs); - char *tok = strtok(buf, ":");