From 71f67c4cce47b313b40ef14412376a0160ce197b Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Thu, 6 Jul 2017 06:48:36 +0200 Subject: [PATCH] */*: sync with upstream Taken from: HardenedBSD --- benchmarks/dbs/Makefile | 8 +- benchmarks/stream/Makefile | 6 +- benchmarks/webbench/Makefile | 13 +- databases/Makefile | 2 + databases/pgFormatter/Makefile | 20 ++ databases/pgFormatter/distinfo | 3 + databases/pgFormatter/pkg-descr | 8 + databases/pgFormatter/pkg-plist | 9 + databases/plpgsql_check/Makefile | 30 +++ databases/plpgsql_check/distinfo | 3 + databases/plpgsql_check/pkg-descr | 7 + databases/plpgsql_check/pkg-plist | 7 + databases/timescaledb/Makefile | 2 +- devel/Makefile | 1 + devel/ccache/Makefile | 7 +- devel/codesearch-py/Makefile | 3 +- devel/codesearch-py/distinfo | 6 +- devel/cppcheck-gui/Makefile | 8 + devel/cppcheck/Makefile | 31 ++- devel/cppcheck/pkg-plist | 16 -- devel/cppcheck/pkg-plist-gui | 16 ++ devel/gpsim/Makefile | 9 +- devel/libexecinfo/Makefile | 9 +- devel/libexecinfo/files/patch-Makefile | 6 +- devel/libexecinfo/files/patch-execinfo.c | 12 +- devel/pecl-swoole/Makefile | 2 +- devel/pecl-swoole/distinfo | 6 +- devel/py-mailcap-fix/Makefile | 2 +- devel/sope3/Makefile | 2 +- devel/sope3/distinfo | 6 +- dns/dnsdist/Makefile | 2 - emulators/citra/Makefile | 4 - finance/gnucash-docs/Makefile | 5 +- finance/gnucash-docs/distinfo | 6 +- finance/gnucash-docs/pkg-plist | 210 ++++++++++++++++++ finance/gnucash/Makefile | 22 +- finance/gnucash/distinfo | 6 +- japanese/asterisk-sounds/Makefile | 13 +- mail/cleanup-maildir/Makefile | 7 +- mail/cleanup-maildir/distinfo | 5 +- mail/pymsgauth/Makefile | 12 +- mail/pymsgauth/pkg-plist | 5 - mail/roundcube-thunderbird_labels/Makefile | 1 + math/R/Makefile | 4 +- math/libRmath/Makefile | 2 +- math/libRmath/distinfo | 6 +- math/liborigin/Makefile | 5 +- multimedia/w_scan/Makefile | 19 +- multimedia/w_scan/distinfo | 5 +- multimedia/w_scan/files/patch-descriptors.c | 39 ---- multimedia/w_scan/files/patch-scan.c | 25 --- net/asterisk11/Makefile | 3 + net/concourse-fly/Makefile | 2 +- net/concourse-fly/distinfo | 6 +- net/libvncserver/Makefile | 1 + net/libvncserver/files/patch-common_md5.c | 11 + net/libvncserver/files/patch-common_md5.h | 59 +++++ net/libvncserver/files/patch-common_vncauth.c | 22 ++ net/libvncserver/files/patch-rfb_rfb.h | 20 ++ security/enchive/Makefile | 2 +- security/testssl.sh/Makefile | 12 +- textproc/ripgrep/Makefile | 4 +- www/gitlab/Makefile | 2 +- www/gitlab/files/patch-Gemfile | 8 +- www/py-urlobject/Makefile | 4 +- www/rubygem-rdf/Makefile | 2 - www/sogo3/Makefile | 2 +- www/sogo3/distinfo | 6 +- .../files/patch-Tools_GNUmakefile.preamble | 2 +- www/sogo3/pkg-plist | 2 + www/youtube_dl/Makefile | 2 - .../xorg-nestserver/files/patch-Xext_shm.c | 14 ++ .../xorg-nestserver/files/patch-configure | 10 + .../files/patch-include_dix-config.h.in | 12 + x11-servers/xorg-server/Makefile | 2 +- .../xorg-server/files/patch-Xext_shm.c | 14 ++ x11-servers/xorg-server/files/patch-configure | 8 + .../files/patch-include_dix-config.h.in | 12 + .../xorg-vfbserver/files/patch-Xext_shm.c | 14 ++ .../xorg-vfbserver/files/patch-configure | 10 + .../files/patch-include_dix-config.h.in | 12 + x11-servers/xwayland/Makefile | 2 +- x11-servers/xwayland/files/patch-Xext_shm.c | 14 ++ x11-servers/xwayland/files/patch-configure | 10 + .../files/patch-include_dix-config.h.in | 12 + x11-themes/beastie/Makefile | 11 +- x11-themes/beastie/pkg-descr | 2 +- x11/p5-X11-Xlib/Makefile | 5 +- x11/p5-X11-Xlib/distinfo | 6 +- x11/p5-X11-Xlib/pkg-plist | 6 + 90 files changed, 774 insertions(+), 237 deletions(-) create mode 100644 databases/pgFormatter/Makefile create mode 100644 databases/pgFormatter/distinfo create mode 100644 databases/pgFormatter/pkg-descr create mode 100644 databases/pgFormatter/pkg-plist create mode 100644 databases/plpgsql_check/Makefile create mode 100644 databases/plpgsql_check/distinfo create mode 100644 databases/plpgsql_check/pkg-descr create mode 100644 databases/plpgsql_check/pkg-plist create mode 100644 devel/cppcheck-gui/Makefile create mode 100644 devel/cppcheck/pkg-plist-gui delete mode 100644 multimedia/w_scan/files/patch-descriptors.c delete mode 100644 multimedia/w_scan/files/patch-scan.c create mode 100644 net/libvncserver/files/patch-common_md5.c create mode 100644 net/libvncserver/files/patch-common_md5.h create mode 100644 net/libvncserver/files/patch-common_vncauth.c create mode 100644 net/libvncserver/files/patch-rfb_rfb.h create mode 100644 x11-servers/xorg-nestserver/files/patch-Xext_shm.c create mode 100644 x11-servers/xorg-nestserver/files/patch-configure create mode 100644 x11-servers/xorg-nestserver/files/patch-include_dix-config.h.in create mode 100644 x11-servers/xorg-server/files/patch-Xext_shm.c create mode 100644 x11-servers/xorg-server/files/patch-include_dix-config.h.in create mode 100644 x11-servers/xorg-vfbserver/files/patch-Xext_shm.c create mode 100644 x11-servers/xorg-vfbserver/files/patch-configure create mode 100644 x11-servers/xorg-vfbserver/files/patch-include_dix-config.h.in create mode 100644 x11-servers/xwayland/files/patch-Xext_shm.c create mode 100644 x11-servers/xwayland/files/patch-configure create mode 100644 x11-servers/xwayland/files/patch-include_dix-config.h.in diff --git a/benchmarks/dbs/Makefile b/benchmarks/dbs/Makefile index f1f55a6b732c..4d8ad8fed987 100644 --- a/benchmarks/dbs/Makefile +++ b/benchmarks/dbs/Makefile @@ -11,6 +11,8 @@ MASTER_SITES= http://www.kusa.ac.jp/~yukio-m/dbs/software1.1.5/ \ MAINTAINER= ports@FreeBSD.org COMMENT= Distributed network benchmarking system +LICENSE= BSD3CLAUSE + RUN_DEPENDS= gnuplot:math/gnuplot BROKEN_FreeBSD_12= tcp_debug.h: field has incomplete type 'struct tcpcb' @@ -29,7 +31,7 @@ PORTEXAMPLES= * OPTIONS_DEFINE= DOCS EXAMPLES pre-build: - cd ${WRKSRC}/src; ${MAKE} dir + cd ${WRKSRC}/src && ${MAKE_CMD} dir do-install: .for bin in dbsc dbsd @@ -38,10 +40,14 @@ do-install: .for bin in dbs_view ${INSTALL_SCRIPT} ${WRKSRC}/script/${bin} ${STAGEDIR}${PREFIX}/bin .endfor + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for doc in Copyright dbs.man dbs.man.jis dbs_paper.ps ${INSTALL_DATA} ${WRKSRC}/doc/${doc} ${STAGEDIR}${DOCSDIR} .endfor + +do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for ex in TCP2.cmd TCPvsMPEG.cmd ${INSTALL_DATA} ${WRKSRC}/sample/${ex} ${STAGEDIR}${EXAMPLESDIR} diff --git a/benchmarks/stream/Makefile b/benchmarks/stream/Makefile index 11dbd8a54e3b..18b6956d7dd9 100644 --- a/benchmarks/stream/Makefile +++ b/benchmarks/stream/Makefile @@ -11,8 +11,6 @@ DIST_SUBDIR= ${PORTNAME}-1.0/${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Synthetic benchmark program that measures sustainable memory bandwidth -OPTIONS_DEFINE= DOCS - NO_WRKSUBDIR= yes EXTRACT_CMD= ${CP} @@ -22,11 +20,15 @@ EXTRACT_AFTER_ARGS= ${WRKSRC} PORTDOCS= stream.c PLIST_FILES= bin/stream_bench +OPTIONS_DEFINE= DOCS + do-build: (cd ${WRKSRC} && ${CC} ${CFLAGS} -o stream_bench stream.c -lm) do-install: (cd ${WRKSRC} && ${INSTALL_PROGRAM} stream_bench ${STAGEDIR}${PREFIX}/bin) + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) diff --git a/benchmarks/webbench/Makefile b/benchmarks/webbench/Makefile index a7db5be01448..e65016404991 100644 --- a/benchmarks/webbench/Makefile +++ b/benchmarks/webbench/Makefile @@ -9,18 +9,23 @@ MASTER_SITES= SUNSITE/apps/www/servers MAINTAINER= ports@FreeBSD.org COMMENT= Simple forking web benchmark -MAKE_ARGS+= CFLAGS="${CPPFLAGS} ${CFLAGS}" +LICENSE= GPLv2 -PORTDOCS= copyright changelog +MAKE_ARGS= CFLAGS="${CPPFLAGS} ${CFLAGS}" + +PORTDOCS= ChangeLog PLIST_FILES= bin/webbench \ man/man1/webbench.1.gz +OPTIONS_DEFINE= DOCS + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/webbench ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/webbench.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/debian/copyright ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/debian/changelog ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${STAGEDIR}${DOCSDIR} .include diff --git a/databases/Makefile b/databases/Makefile index 9a444923bd88..65b67c64a172 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -579,6 +579,7 @@ SUBDIR += pgbouncer SUBDIR += pgdbf SUBDIR += pgespresso + SUBDIR += pgFormatter SUBDIR += pgfouine SUBDIR += pgloader SUBDIR += pglogical @@ -649,6 +650,7 @@ SUBDIR += phpmyadmin SUBDIR += phppgadmin SUBDIR += pldebugger + SUBDIR += plpgsql_check SUBDIR += postgis-jdbc SUBDIR += postgis20 SUBDIR += postgis21 diff --git a/databases/pgFormatter/Makefile b/databases/pgFormatter/Makefile new file mode 100644 index 000000000000..aaf33ffb1940 --- /dev/null +++ b/databases/pgFormatter/Makefile @@ -0,0 +1,20 @@ +# Created by: Jov amutu@amutu.com +# $FreeBSD$ + +PORTNAME= pgFormatter +PORTVERSION= 2.0 +DISTVERSIONPREFIX= v +CATEGORIES= databases + +MAINTAINER= amutu@amutu.com +COMMENT= PostgreSQL SQL syntax beautifier + +LICENSE= PostgreSQL +LICENSE_FILE= ${WRKSRC}/LICENSE + +USES= perl5 +USE_PERL5= configure +USE_GITHUB= yes +GH_ACCOUNT= darold + +.include diff --git a/databases/pgFormatter/distinfo b/databases/pgFormatter/distinfo new file mode 100644 index 000000000000..7ca3590c98fb --- /dev/null +++ b/databases/pgFormatter/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1496217380 +SHA256 (darold-pgFormatter-v2.0_GH0.tar.gz) = ef2f7bc124a694c0384b6bda661582ad2dae7c25b289aba596a23fb17dd5f130 +SIZE (darold-pgFormatter-v2.0_GH0.tar.gz) = 52674 diff --git a/databases/pgFormatter/pkg-descr b/databases/pgFormatter/pkg-descr new file mode 100644 index 000000000000..0039357e6ac2 --- /dev/null +++ b/databases/pgFormatter/pkg-descr @@ -0,0 +1,8 @@ +This SQL formatter/beautifier supports keywords from SQL-92, SQL-99, +SQL-2003, SQL-2008, SQL-2011 and PostgreSQL specifics keywords. May +works with any other databases too. pgFormatter can work as a console +program or as a CGI. It will automatically detect his environment and +output as text or as HTML following the context. Keywords highlighting +will only be available in CGI context. + +WWW: https://github.com/darold/pgFormatter diff --git a/databases/pgFormatter/pkg-plist b/databases/pgFormatter/pkg-plist new file mode 100644 index 000000000000..778b4694155e --- /dev/null +++ b/databases/pgFormatter/pkg-plist @@ -0,0 +1,9 @@ +bin/pg_format +%%PERL5_MAN1%%/pg_format.1.gz +%%PERL5_MAN3%%/pgFormatter::Beautify.3.gz +%%PERL5_MAN3%%/pgFormatter::CGI.3.gz +%%PERL5_MAN3%%/pgFormatter::CLI.3.gz +%%SITE_PERL%%/pgFormatter/Beautify.pm +%%SITE_PERL%%/pgFormatter/CGI.pm +%%SITE_PERL%%/pgFormatter/CLI.pm +%%SITE_PERL%%/regress_test.pl diff --git a/databases/plpgsql_check/Makefile b/databases/plpgsql_check/Makefile new file mode 100644 index 000000000000..f9217b844cf5 --- /dev/null +++ b/databases/plpgsql_check/Makefile @@ -0,0 +1,30 @@ +# Created by: Jov +# $FreeBSD$ + +PORTNAME= plpgsql_check +PORTVERSION= 1.2.0 +DISTVERSIONPREFIX= v +CATEGORIES= databases +PKGNAMEPREFIX= postgresql${PGSQL_VER:S/.//}- + +MAINTAINER= amutu@amutu.com +COMMENT= PostgreSQL extension to check PL/pgSQL code + +LICENSE= UNKNOWN +LICENSE_NAME= postcardware +LICENSE_TEXT= If you like it - send a postcard to address: \ + Pavel Stehule \ + Skalice 12 \ + Benesov u Prahy \ + 256 01 \ + Czech Republic \ + Use this code freely on own risk +LICENSE_PERMS= dist-mirror pkg-mirror dist-sell pkg-sell auto-accept + +USES= gmake pgsql:9.2+ +USE_GITHUB= yes +GH_ACCOUNT= okbob + +WANT_PGSQL= server + +.include diff --git a/databases/plpgsql_check/distinfo b/databases/plpgsql_check/distinfo new file mode 100644 index 000000000000..63d64ed1eb27 --- /dev/null +++ b/databases/plpgsql_check/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1496223426 +SHA256 (okbob-plpgsql_check-v1.2.0_GH0.tar.gz) = 370be67e557e91936f05c3697629ce45f1a7855d668359dc147d7fbf125dfcf5 +SIZE (okbob-plpgsql_check-v1.2.0_GH0.tar.gz) = 62269 diff --git a/databases/plpgsql_check/pkg-descr b/databases/plpgsql_check/pkg-descr new file mode 100644 index 000000000000..bd28ddfbee08 --- /dev/null +++ b/databases/plpgsql_check/pkg-descr @@ -0,0 +1,7 @@ +Plpgsql_check is next generation of plpgsql_lint. It allows to check source +code by explicit call plpgsql_check_function. The SQL statements inside +PL/pgSQL functions are checked by validator for semantic errors. These errors +can be found by plpgsql_check_function. PostgreSQL 9.2 is required, PostgreSQL +9.3, 9.4, 9.5, 9.6 and 10 are supported. + +WWW: https://github.com/okbob/plpgsql_check diff --git a/databases/plpgsql_check/pkg-plist b/databases/plpgsql_check/pkg-plist new file mode 100644 index 000000000000..87ecece9a70d --- /dev/null +++ b/databases/plpgsql_check/pkg-plist @@ -0,0 +1,7 @@ +lib/postgresql/plpgsql_check.so +share/postgresql/extension/plpgsql_check--1.0--1.1.sql +share/postgresql/extension/plpgsql_check--1.0.sql +share/postgresql/extension/plpgsql_check--1.1--1.2.sql +share/postgresql/extension/plpgsql_check--1.1.sql +share/postgresql/extension/plpgsql_check--1.2.sql +share/postgresql/extension/plpgsql_check.control diff --git a/databases/timescaledb/Makefile b/databases/timescaledb/Makefile index 76e850d21627..d9e7095298ec 100644 --- a/databases/timescaledb/Makefile +++ b/databases/timescaledb/Makefile @@ -16,7 +16,7 @@ GH_ACCOUNT= timescale MAKE_ARGS= PG_CONFIG=${LOCALBASE}/bin/pg_config USE_PGXS=1 \ install_bin=/usr/bin/install USE_LDCONFIG= yes -USES= gmake pgsql:9.6 +USES= compiler:c11 gmake pgsql:9.6 PLIST_FILES= lib/postgresql/timescaledb.so \ share/postgresql/extension/timescaledb--0.1.0.sql \ diff --git a/devel/Makefile b/devel/Makefile index 7357bd3f2188..adde851deee0 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -339,6 +339,7 @@ SUBDIR += cpp-hocon SUBDIR += cpp-netlib SUBDIR += cppcheck + SUBDIR += cppcheck-gui SUBDIR += cppi SUBDIR += cpprestsdk SUBDIR += cpptest diff --git a/devel/ccache/Makefile b/devel/ccache/Makefile index 274ec420e88b..f63dcf129afe 100644 --- a/devel/ccache/Makefile +++ b/devel/ccache/Makefile @@ -3,7 +3,7 @@ PORTNAME= ccache PORTVERSION= 3.3.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= http://www.samba.org/ftp/ccache/ \ LOCAL/bdrewery @@ -11,7 +11,8 @@ MASTER_SITES= http://www.samba.org/ftp/ccache/ \ MAINTAINER= bdrewery@FreeBSD.org COMMENT= Tool to minimize the compile time of C/C++ programs -LICENSE= GPLv3 +LICENSE= GPLv3+ +LICENSE_FILE= ${WRKSRC}/GPL-3.0.txt CONFLICTS_INSTALL= ccache-static-[0-9]* ccache-memcached-[0-9]* ccache-memcached-static-[0-9]* @@ -75,7 +76,7 @@ PLIST_SUB+= CCLINKDIR="${CCLINKDIR}" CCACHE_COMPILERS+= icc icpc .endif -GNU_COMPILERS+= 34 42 43 44 45 46 47 48 49 5 6 7 +GNU_COMPILERS+= 34 42 43 44 45 46 47 48 49 5 6 7 8 CCACHE_COMPILERS+= cc c++ CC gcc g++ ${GNU_COMPILERS:S|^|gcc|} ${GNU_COMPILERS:S|^|g++|} .if ${PORT_OPTIONS:MCLANGLINK} diff --git a/devel/codesearch-py/Makefile b/devel/codesearch-py/Makefile index 6990136fdfe2..4ff3c9a09d0d 100644 --- a/devel/codesearch-py/Makefile +++ b/devel/codesearch-py/Makefile @@ -3,6 +3,7 @@ PORTNAME= codesearch-py PORTVERSION= 0.1 +PORTREVISION= 1 CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -17,7 +18,7 @@ USE_PYTHON= autoplist concurrent distutils USE_GITHUB= yes GH_ACCOUNT= chromium -GH_TAGNAME= ec3ad68 +GH_TAGNAME= 86cf193 NO_ARCH= yes diff --git a/devel/codesearch-py/distinfo b/devel/codesearch-py/distinfo index 8341796289b5..7a25e34a6e8a 100644 --- a/devel/codesearch-py/distinfo +++ b/devel/codesearch-py/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1498485588 -SHA256 (chromium-codesearch-py-0.1-ec3ad68_GH0.tar.gz) = 93c5c3476fafcec52d0bc1f732b31d9ddc700882e5f6755b36da7740f747ef24 -SIZE (chromium-codesearch-py-0.1-ec3ad68_GH0.tar.gz) = 335302 +TIMESTAMP = 1499190870 +SHA256 (chromium-codesearch-py-0.1-86cf193_GH0.tar.gz) = fe0c58fa6e4f2c10e731e7fc96da9c87f2e2448818f626567557de608379230d +SIZE (chromium-codesearch-py-0.1-86cf193_GH0.tar.gz) = 344158 diff --git a/devel/cppcheck-gui/Makefile b/devel/cppcheck-gui/Makefile new file mode 100644 index 000000000000..be5b348cb37f --- /dev/null +++ b/devel/cppcheck-gui/Makefile @@ -0,0 +1,8 @@ +# Created by: Dmitry Marakasov +# $FreeBSD$ + +MASTERDIR= ${.CURDIR}/../cppcheck + +GUI_ONLY= yes + +.include "${MASTERDIR}/Makefile" diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile index a8ecdc473405..5a5d08ae56c1 100644 --- a/devel/cppcheck/Makefile +++ b/devel/cppcheck/Makefile @@ -7,18 +7,35 @@ CATEGORIES= devel MASTER_SITES= SF MAINTAINER= amdmi3@FreeBSD.org -COMMENT= Static analysis of C/C++ code +COMMENT?= Static analysis of C/C++ code LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_powerpc64= fails to compile: analyzerinfo.cpp: 'to_string' is not a member of 'std' -USES= compiler:c++11-lib cmake shebangfix tar:bzip2 -SHEBANG_FILES= htmlreport/cppcheck-htmlreport +USES= compiler:c++11-lib cmake tar:bzip2 -OPTIONS_DEFINE= RULES GUI HTMLREPORT MANPAGES MATCHCOMPILER TEST -OPTIONS_DEFAULT= RULES GUI HTMLREPORT MANPAGES MATCHCOMPILER +.if defined(GUI_ONLY) +COMMENT= Static analysis of C/C++ code (GUI) + +RUN_DEPENDS= cppcheck:devel/cppcheck + +CMAKE_ARGS= -DBUILD_GUI=TRUE +USE_QT4= corelib gui xml qmake_build moc_build uic_build rcc_build linguisttools_build + +BUILD_WRKSRC= ${WRKSRC}/gui +INSTALL_WRKSRC= ${WRKSRC}/gui + +PLIST= ${PKGDIR}/pkg-plist-gui + +PKGNAMESUFFIX= -gui +.else +USES+= shebangfix +SHEBANG_FILES= htmlreport/cppcheck-htmlreport + +OPTIONS_DEFINE= RULES HTMLREPORT MANPAGES MATCHCOMPILER TEST +OPTIONS_DEFAULT= RULES HTMLREPORT MANPAGES MATCHCOMPILER OPTIONS_SUB= yes RULES_DESC= User-defined rule support (requires PCRE) @@ -26,9 +43,6 @@ RULES_CMAKE_BOOL= HAVE_RULES RULES_LIB_DEPENDS= libpcre.so:devel/pcre RULES_USES= localbase:ldflags -GUI_CMAKE_BOOL= BUILD_GUI -GUI_USE= QT4=corelib,gui,xml,qmake_build,moc_build,uic_build,rcc_build,linguisttools_build - TEST_CMAKE_BOOL= BUILD_TESTS HTMLREPORT_DESC= Install cppcheck-htmlreport @@ -57,5 +71,6 @@ post-install-MANPAGES-on: do-test-TEST-on: cd ${WRKSRC} && ctest +.endif .include diff --git a/devel/cppcheck/pkg-plist b/devel/cppcheck/pkg-plist index 943ecb83619d..fa06047489c1 100644 --- a/devel/cppcheck/pkg-plist +++ b/devel/cppcheck/pkg-plist @@ -1,20 +1,7 @@ -%%GUI%%bin/cppcheck-gui bin/cppcheck %%DATADIR%%/avr.cfg %%DATADIR%%/gnu.cfg %%DATADIR%%/gtk.cfg -%%GUI%%%%DATADIR%%/lang/cppcheck_de.qm -%%GUI%%%%DATADIR%%/lang/cppcheck_es.qm -%%GUI%%%%DATADIR%%/lang/cppcheck_fi.qm -%%GUI%%%%DATADIR%%/lang/cppcheck_fr.qm -%%GUI%%%%DATADIR%%/lang/cppcheck_it.qm -%%GUI%%%%DATADIR%%/lang/cppcheck_ja.qm -%%GUI%%%%DATADIR%%/lang/cppcheck_ko.qm -%%GUI%%%%DATADIR%%/lang/cppcheck_nl.qm -%%GUI%%%%DATADIR%%/lang/cppcheck_ru.qm -%%GUI%%%%DATADIR%%/lang/cppcheck_sr.qm -%%GUI%%%%DATADIR%%/lang/cppcheck_sv.qm -%%GUI%%%%DATADIR%%/lang/cppcheck_zh_CN.qm %%DATADIR%%/microsoft_sal.cfg %%DATADIR%%/posix.cfg %%DATADIR%%/qt.cfg @@ -24,6 +11,3 @@ bin/cppcheck %%DATADIR%%/windows.cfg %%DATADIR%%/wxwidgets.cfg %%MANPAGES%%man/man1/cppcheck.1.gz -%%GUI%%share/applications/cppcheck-gui.desktop -%%GUI%%share/icons/hicolor/64x64/apps/cppcheck-gui.png -%%GUI%%share/icons/hicolor/scalable/apps/cppcheck-gui.svg diff --git a/devel/cppcheck/pkg-plist-gui b/devel/cppcheck/pkg-plist-gui new file mode 100644 index 000000000000..59166495601d --- /dev/null +++ b/devel/cppcheck/pkg-plist-gui @@ -0,0 +1,16 @@ +bin/cppcheck-gui +share/applications/cppcheck-gui.desktop +%%DATADIR%%/lang/cppcheck_de.qm +%%DATADIR%%/lang/cppcheck_es.qm +%%DATADIR%%/lang/cppcheck_fi.qm +%%DATADIR%%/lang/cppcheck_fr.qm +%%DATADIR%%/lang/cppcheck_it.qm +%%DATADIR%%/lang/cppcheck_ja.qm +%%DATADIR%%/lang/cppcheck_ko.qm +%%DATADIR%%/lang/cppcheck_nl.qm +%%DATADIR%%/lang/cppcheck_ru.qm +%%DATADIR%%/lang/cppcheck_sr.qm +%%DATADIR%%/lang/cppcheck_sv.qm +%%DATADIR%%/lang/cppcheck_zh_CN.qm +share/icons/hicolor/64x64/apps/cppcheck-gui.png +share/icons/hicolor/scalable/apps/cppcheck-gui.svg diff --git a/devel/gpsim/Makefile b/devel/gpsim/Makefile index f0ceff26e4c0..17617a35cef0 100644 --- a/devel/gpsim/Makefile +++ b/devel/gpsim/Makefile @@ -17,15 +17,12 @@ BUILD_DEPENDS= gpasm:devel/gputils LIB_DEPENDS= libpopt.so:devel/popt RUN_DEPENDS= gpasm:devel/gputils -USES= gmake libtool pathfix pkgconfig readline +USES= gmake libtool localbase:ldflags pathfix pkgconfig readline USE_GNOME= glib20 GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - OPTIONS_DEFINE= DOCS EXAMPLES GTK2 OPTIONS_DEFAULT= GTK2 OPTIONS_SUB= yes @@ -41,12 +38,14 @@ post-patch: 's|-lstdc++||' ${WRKSRC}/${i} .endfor -post-install: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in AUTHORS ChangeLog PROCESSORS README* doc/gpsim.pdf (cd ${WRKSRC} && ${INSTALL_DATA} ${i} \ ${STAGEDIR}${DOCSDIR}) .endfor + +post-install-EXAMPLES-on: .for i in led_test logic_test mod_test usart_gui usart_test @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/modules/${i} (cd ${WRKSRC}/examples/modules/${i} && ${INSTALL_DATA} *.asm *.stc \ diff --git a/devel/libexecinfo/Makefile b/devel/libexecinfo/Makefile index 030e6d7620c9..64d06b620934 100644 --- a/devel/libexecinfo/Makefile +++ b/devel/libexecinfo/Makefile @@ -10,19 +10,20 @@ MASTER_SITES= LOCAL/itetcu MAINTAINER= ports@FreeBSD.org COMMENT= Library for inspecting program's backtrace -OPTIONS_DEFINE= DOCS +LICENSE= BSD2CLAUSE USES= tar:bzip2 uidfix USE_LDCONFIG= yes -CFLAGS= -fno-omit-frame-pointer MAKE_FLAGS= LIBDIR=${PREFIX}/lib \ INCLUDEDIR=${PREFIX}/include +CFLAGS+= -fno-omit-frame-pointer + PORTDOCS= README -CFLAGS_amd64= -fno-omit-frame-pointer +OPTIONS_DEFINE= DOCS -post-install: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} diff --git a/devel/libexecinfo/files/patch-Makefile b/devel/libexecinfo/files/patch-Makefile index 6540d2ae9c2f..79e7d86e39eb 100644 --- a/devel/libexecinfo/files/patch-Makefile +++ b/devel/libexecinfo/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orgi 2013-02-05 23:13:54.375834807 +0800 -+++ Makefile 2013-02-05 23:14:13.106833334 +0800 -@@ -34,6 +34,7 @@ +--- Makefile.orig 2004-07-19 05:19:55 UTC ++++ Makefile +@@ -34,6 +34,7 @@ SHLIB_MAJOR= 1 SHLIB_MINOR= 0 NOPROFILE= yes diff --git a/devel/libexecinfo/files/patch-execinfo.c b/devel/libexecinfo/files/patch-execinfo.c index 03b5af0ca201..367da87546d8 100644 --- a/devel/libexecinfo/files/patch-execinfo.c +++ b/devel/libexecinfo/files/patch-execinfo.c @@ -1,6 +1,6 @@ ---- execinfo.c.orig +--- execinfo.c.orig 2004-07-19 05:21:09 UTC +++ execinfo.c -@@ -69,7 +69,8 @@ +@@ -69,7 +69,8 @@ backtrace(void **buffer, int size) char ** backtrace_symbols(void *const *buffer, int size) { @@ -10,7 +10,7 @@ char **rval; char *cp; Dl_info info; -@@ -78,7 +79,6 @@ +@@ -78,7 +79,6 @@ backtrace_symbols(void *const *buffer, i rval = malloc(clen); if (rval == NULL) return NULL; @@ -18,7 +18,7 @@ for (i = 0; i < size; i++) { if (dladdr(buffer[i], &info) != 0) { if (info.dli_sname == NULL) -@@ -92,14 +92,14 @@ +@@ -92,14 +92,14 @@ backtrace_symbols(void *const *buffer, i 2 + /* " <" */ strlen(info.dli_sname) + /* "function" */ 1 + /* "+" */ @@ -35,7 +35,7 @@ buffer[i], info.dli_sname, offset, info.dli_fname); } else { alen = 2 + /* "0x" */ -@@ -108,12 +108,15 @@ +@@ -108,12 +108,15 @@ backtrace_symbols(void *const *buffer, i rval = realloc_safe(rval, clen + alen); if (rval == NULL) return NULL; @@ -54,7 +54,7 @@ return rval; } -@@ -155,6 +158,6 @@ +@@ -155,6 +158,6 @@ backtrace_symbols_fd(void *const *buffer return; snprintf(buf, len, "%p\n", buffer[i]); } diff --git a/devel/pecl-swoole/Makefile b/devel/pecl-swoole/Makefile index 7741081d817d..01af6f49d69f 100644 --- a/devel/pecl-swoole/Makefile +++ b/devel/pecl-swoole/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= swoole -PORTVERSION= 1.9.14 +PORTVERSION= 1.9.15 CATEGORIES= devel net MAINTAINER= vanilla@FreeBSD.org diff --git a/devel/pecl-swoole/distinfo b/devel/pecl-swoole/distinfo index 70c77c6105a8..f019a2d68dbf 100644 --- a/devel/pecl-swoole/distinfo +++ b/devel/pecl-swoole/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1498112799 -SHA256 (PECL/swoole-1.9.14.tgz) = c9af66c0b7ee2400d8768e27b7a10109cd91cc8745d3155fc447b57f415be03b -SIZE (PECL/swoole-1.9.14.tgz) = 574516 +TIMESTAMP = 1499223149 +SHA256 (PECL/swoole-1.9.15.tgz) = f80ea85d633b73dc174eb2d97817ccdc28f2fc706ab0b541a02cc79a03029275 +SIZE (PECL/swoole-1.9.15.tgz) = 685387 diff --git a/devel/py-mailcap-fix/Makefile b/devel/py-mailcap-fix/Makefile index cb38b3b8ea3a..d3cc127ce89d 100644 --- a/devel/py-mailcap-fix/Makefile +++ b/devel/py-mailcap-fix/Makefile @@ -9,7 +9,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= dbaio@FreeBSD.org COMMENT= Mailcap module that correctly handles windcard entries -LICENSE= PD +LICENSE= UNLICENSE LICENSE_FILE= ${WRKSRC}/UNLICENSE USE_GITHUB= yes diff --git a/devel/sope3/Makefile b/devel/sope3/Makefile index ecf9589c1075..43f7b79d04da 100644 --- a/devel/sope3/Makefile +++ b/devel/sope3/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sope3 -PORTVERSION= 3.2.8 +PORTVERSION= 3.2.9 CATEGORIES= devel gnustep MASTER_SITES= http://www.sogo.nu/files/downloads/SOGo/Sources/ DISTNAME= SOPE-${PORTVERSION} diff --git a/devel/sope3/distinfo b/devel/sope3/distinfo index e020db37e278..21c3d6a90f77 100644 --- a/devel/sope3/distinfo +++ b/devel/sope3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1492458332 -SHA256 (SOPE-3.2.8.tar.gz) = 56a297ee15372f61c6413fe66ad1e624c5492f049eb1d145393f3a49fce96892 -SIZE (SOPE-3.2.8.tar.gz) = 2281889 +TIMESTAMP = 1496436462 +SHA256 (SOPE-3.2.9.tar.gz) = d1749b71c61e856e3445593e4525062441b4b09a9f8ba209ae934cd8f8e4e72e +SIZE (SOPE-3.2.9.tar.gz) = 2281793 diff --git a/dns/dnsdist/Makefile b/dns/dnsdist/Makefile index e18ee622d20b..44f05ee40906 100644 --- a/dns/dnsdist/Makefile +++ b/dns/dnsdist/Makefile @@ -13,9 +13,7 @@ COMMENT= Highly DNS-, DoS- and abuse-aware loadbalancer LICENSE= GPLv2 UNLICENSE LICENSE_COMB= multi -LICENSE_NAME_UNLICENSE= The Unlicense LICENSE_FILE_UNLICENSE= ${WRKSRC}/ext/incbin/UNLICENSE -LICENSE_PERMS_UNLICENSE= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BUILD_DEPENDS= ${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops LIB_DEPENDS= libboost_serialization.so:devel/boost-libs \ diff --git a/emulators/citra/Makefile b/emulators/citra/Makefile index bb9509ad3857..8f74b63deaa1 100644 --- a/emulators/citra/Makefile +++ b/emulators/citra/Makefile @@ -15,10 +15,6 @@ LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/externals/inih/inih/LICENSE.txt LICENSE_FILE_BSL= ${WRKSRC}/externals/catch/LICENSE.txt LICENSE_FILE_GPLv2+ = ${WRKSRC}/license.txt LICENSE_FILE_LGPL21+ = ${_LICENSE_STORE}/LGPL21 # soundtouch -LICENSE_NAME_UNLICENSE= The Unlicense -LICENSE_TEXT_UNLICENSE= See http://unlicense.org/ -LICENSE_PERMS_UNLICENSE= ${_LICENSE_PERMS_PD} -LICENSE_GROUPS_UNLICENSE= ${_LICENSE_GROUPS_PD} BUILD_DEPENDS= boost-libs>=1.57:devel/boost-libs LIB_DEPENDS= libpng.so:graphics/png diff --git a/finance/gnucash-docs/Makefile b/finance/gnucash-docs/Makefile index 398373edb904..750b384ee2ee 100644 --- a/finance/gnucash-docs/Makefile +++ b/finance/gnucash-docs/Makefile @@ -3,7 +3,7 @@ # $MCom: ports/finance/gnucash-docs/Makefile,v 1.7 2007/08/04 03:51:29 marcus Exp $ PORTNAME= gnucash-docs -PORTVERSION= 2.6.16 +PORTVERSION= 2.6.17 CATEGORIES= finance gnome MASTER_SITES= SF/gnucash/${PORTNAME}/${PORTVERSION} \ http://www.gnucash.org/pub/gnucash/sources/stable/ \ @@ -17,11 +17,10 @@ LIB_DEPENDS= librarian.so:textproc/rarian RUN_DEPENDS= yelp:x11/yelp INSTALLS_OMF= yes -USES= autoreconf gmake +USES= autoreconf localbase gmake USE_GNOME= libxml2 GNU_CONFIGURE= yes NO_ARCH= yes -CPPFLAGS+= -I${LOCALBASE}/include post-patch: @${REINPLACE_CMD} -e '/scrollkeeper-preinstall/s|$$(docdir)|$$(gnomehelpdir)|' \ diff --git a/finance/gnucash-docs/distinfo b/finance/gnucash-docs/distinfo index 1bc7caff0098..d260be018a2c 100644 --- a/finance/gnucash-docs/distinfo +++ b/finance/gnucash-docs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1490595775 -SHA256 (gnucash-docs-2.6.16.tar.gz) = dad213032651eaef485d919030ec4e2a30cfec5cdcfb7505f94502fffec2dabe -SIZE (gnucash-docs-2.6.16.tar.gz) = 81516817 +TIMESTAMP = 1499107148 +SHA256 (gnucash-docs-2.6.17.tar.gz) = 79646c60b1cbc3dd6da817e2546af7baa72497ab846939d3565711044825cb35 +SIZE (gnucash-docs-2.6.17.tar.gz) = 92073384 diff --git a/finance/gnucash-docs/pkg-plist b/finance/gnucash-docs/pkg-plist index e83726b2fd1c..da6c09108018 100644 --- a/finance/gnucash-docs/pkg-plist +++ b/finance/gnucash-docs/pkg-plist @@ -1007,6 +1007,216 @@ share/gnome/help/gnucash-guide/pt/figures/txns_sxn_ledger3.png share/gnome/help/gnucash-guide/pt/figures/txns_sxn_ledger4.png share/gnome/help/gnucash-guide/pt/gnucash-guide.xml share/gnome/help/gnucash-guide/pt/legal.xml +share/gnome/help/gnucash-guide/ru/appendixa.xml +share/gnome/help/gnucash-guide/ru/appendixb.xml +share/gnome/help/gnucash-guide/ru/appendixc.xml +share/gnome/help/gnucash-guide/ru/appendixd.xml +share/gnome/help/gnucash-guide/ru/ch_accts.xml +share/gnome/help/gnucash-guide/ru/ch_basics.xml +share/gnome/help/gnucash-guide/ru/ch_budgets.xml +share/gnome/help/gnucash-guide/ru/ch_bus_features.xml +share/gnome/help/gnucash-guide/ru/ch_capgain.xml +share/gnome/help/gnucash-guide/ru/ch_cbook.xml +share/gnome/help/gnucash-guide/ru/ch_cc.xml +share/gnome/help/gnucash-guide/ru/ch_currency.xml +share/gnome/help/gnucash-guide/ru/ch_dep.xml +share/gnome/help/gnucash-guide/ru/ch_expenses.xml +share/gnome/help/gnucash-guide/ru/ch_import_business_data.xml +share/gnome/help/gnucash-guide/ru/ch_invest.xml +share/gnome/help/gnucash-guide/ru/ch_loans.xml +share/gnome/help/gnucash-guide/ru/ch_oth_assets.xml +share/gnome/help/gnucash-guide/ru/ch_oview.xml +share/gnome/help/gnucash-guide/ru/ch_python_bindings.xml +share/gnome/help/gnucash-guide/ru/ch_reports.xml +share/gnome/help/gnucash-guide/ru/ch_txns.xml +share/gnome/help/gnucash-guide/ru/fdl-appendix.xml +share/gnome/help/gnucash-guide/ru/figures/accts_CreateAssetsAccount.png +share/gnome/help/gnucash-guide/ru/figures/accts_DefaultExpenseAccounts.png +share/gnome/help/gnucash-guide/ru/figures/accts_DefaultIncomeAccounts.png +share/gnome/help/gnucash-guide/ru/figures/accts_toplevel.png +share/gnome/help/gnucash-guide/ru/figures/accts_tree.png +share/gnome/help/gnucash-guide/ru/figures/basics_AccountRelationships.png +share/gnome/help/gnucash-guide/ru/figures/basics_Accounts.png +share/gnome/help/gnucash-guide/ru/figures/basics_AccountsSampleQIF.png +share/gnome/help/gnucash-guide/ru/figures/basics_CheckAccount.png +share/gnome/help/gnucash-guide/ru/figures/basics_DoubleEntryIntro_SalarySplit.png +share/gnome/help/gnucash-guide/ru/figures/basics_DoubleEntryIntro_compact.png +share/gnome/help/gnucash-guide/ru/figures/basics_DoubleEntryIntro_expanded.png +share/gnome/help/gnucash-guide/ru/figures/basics_DoubleEntryIntro_groceries.png +share/gnome/help/gnucash-guide/ru/figures/basics_DoubleEntryIntro_salary.png +share/gnome/help/gnucash-guide/ru/figures/basics_EmptyAccounts.png +share/gnome/help/gnucash-guide/ru/figures/basics_NewAccountHierarchySetup.png +share/gnome/help/gnucash-guide/ru/figures/basics_NewAccountHierarchySetup_Accounts.png +share/gnome/help/gnucash-guide/ru/figures/basics_NewAccountHierarchySetup_Finish.png +share/gnome/help/gnucash-guide/ru/figures/basics_NewAccountHierarchySetup_Setup.png +share/gnome/help/gnucash-guide/ru/figures/basics_NewAccountHierarchySetup_currency.png +share/gnome/help/gnucash-guide/ru/figures/basics_NewBookOpts.png +share/gnome/help/gnucash-guide/ru/figures/basics_QIF_Import_welcome.png +share/gnome/help/gnucash-guide/ru/figures/basics_SaveSQL.png +share/gnome/help/gnucash-guide/ru/figures/basics_SaveXML.png +share/gnome/help/gnucash-guide/ru/figures/basics_TipOfDay.png +share/gnome/help/gnucash-guide/ru/figures/bus_ap_billedit.png +share/gnome/help/gnucash-guide/ru/figures/bus_ap_billnew.png +share/gnome/help/gnucash-guide/ru/figures/bus_ap_billpost.png +share/gnome/help/gnucash-guide/ru/figures/bus_ap_jobnew.png +share/gnome/help/gnucash-guide/ru/figures/bus_ap_payment.png +share/gnome/help/gnucash-guide/ru/figures/bus_ap_vendorfind.png +share/gnome/help/gnucash-guide/ru/figures/bus_ap_vendornew.png +share/gnome/help/gnucash-guide/ru/figures/bus_ar_custfind.png +share/gnome/help/gnucash-guide/ru/figures/bus_ar_custnew.png +share/gnome/help/gnucash-guide/ru/figures/bus_ar_invoicechange1.png +share/gnome/help/gnucash-guide/ru/figures/bus_ar_invoicechange2.png +share/gnome/help/gnucash-guide/ru/figures/bus_ar_invoicechange3.png +share/gnome/help/gnucash-guide/ru/figures/bus_ar_invoiceedit.png +share/gnome/help/gnucash-guide/ru/figures/bus_ar_invoicenew.png +share/gnome/help/gnucash-guide/ru/figures/bus_ar_invoicepost.png +share/gnome/help/gnucash-guide/ru/figures/bus_ar_invoiceprint.png +share/gnome/help/gnucash-guide/ru/figures/bus_ar_jobnew.png +share/gnome/help/gnucash-guide/ru/figures/bus_ar_payment.png +share/gnome/help/gnucash-guide/ru/figures/bus_co_reg.png +share/gnome/help/gnucash-guide/ru/figures/bus_pay_ex1.png +share/gnome/help/gnucash-guide/ru/figures/bus_pay_ex2.png +share/gnome/help/gnucash-guide/ru/figures/bus_pay_ex3.png +share/gnome/help/gnucash-guide/ru/figures/bus_pay_ex4.png +share/gnome/help/gnucash-guide/ru/figures/bus_tax_main.png +share/gnome/help/gnucash-guide/ru/figures/bus_tax_new.png +share/gnome/help/gnucash-guide/ru/figures/bus_terms_main.png +share/gnome/help/gnucash-guide/ru/figures/bus_terms_new.png +share/gnome/help/gnucash-guide/ru/figures/capgain_app2main.png +share/gnome/help/gnucash-guide/ru/figures/capgain_app3main.png +share/gnome/help/gnucash-guide/ru/figures/capgain_appmain.png +share/gnome/help/gnucash-guide/ru/figures/cbook_CashFlow.png +share/gnome/help/gnucash-guide/ru/figures/cbook_TransactionRptAssets.png +share/gnome/help/gnucash-guide/ru/figures/cbook_TransactionRptExpenses.png +share/gnome/help/gnucash-guide/ru/figures/cbook_atm.png +share/gnome/help/gnucash-guide/ru/figures/cbook_bankstmt.png +share/gnome/help/gnucash-guide/ru/figures/cbook_chartaccts5.png +share/gnome/help/gnucash-guide/ru/figures/cbook_checkexamp.png +share/gnome/help/gnucash-guide/ru/figures/cbook_gcashdata4.png +share/gnome/help/gnucash-guide/ru/figures/cbook_reconciledCheckAct.png +share/gnome/help/gnucash-guide/ru/figures/cbook_reconexamp.png +share/gnome/help/gnucash-guide/ru/figures/cbook_servch.png +share/gnome/help/gnucash-guide/ru/figures/cbook_transferin.png +share/gnome/help/gnucash-guide/ru/figures/cc_CashFlow.png +share/gnome/help/gnucash-guide/ru/figures/cc_Reversing_Transaction_1.png +share/gnome/help/gnucash-guide/ru/figures/cc_Reversing_Transaction_2.png +share/gnome/help/gnucash-guide/ru/figures/cc_TransactionRptExpenses.png +share/gnome/help/gnucash-guide/ru/figures/cc_TransactionRptVisa.png +share/gnome/help/gnucash-guide/ru/figures/cc_accounts.png +share/gnome/help/gnucash-guide/ru/figures/cc_final.png +share/gnome/help/gnucash-guide/ru/figures/cc_interest.png +share/gnome/help/gnucash-guide/ru/figures/cc_payment.png +share/gnome/help/gnucash-guide/ru/figures/cc_purchases.png +share/gnome/help/gnucash-guide/ru/figures/cc_reconcile.png +share/gnome/help/gnucash-guide/ru/figures/cc_reconcile_init.png +share/gnome/help/gnucash-guide/ru/figures/cc_refund.png +share/gnome/help/gnucash-guide/ru/figures/currency_AfterGetOnlineQuotes.png +share/gnome/help/gnucash-guide/ru/figures/currency_BeforeGetOnlineQuotes.png +share/gnome/help/gnucash-guide/ru/figures/currency_PutTogether_AfterMoney.png +share/gnome/help/gnucash-guide/ru/figures/currency_PutTogether_AfterStocks.png +share/gnome/help/gnucash-guide/ru/figures/currency_PutTogether_AussieHouse.png +share/gnome/help/gnucash-guide/ru/figures/currency_addcurr.png +share/gnome/help/gnucash-guide/ru/figures/currency_main1.png +share/gnome/help/gnucash-guide/ru/figures/currency_main2.png +share/gnome/help/gnucash-guide/ru/figures/currency_main3.png +share/gnome/help/gnucash-guide/ru/figures/currency_peditor.png +share/gnome/help/gnucash-guide/ru/figures/currency_purchase_AfterBoat.png +share/gnome/help/gnucash-guide/ru/figures/currency_purchase_AfterStocks.png +share/gnome/help/gnucash-guide/ru/figures/currency_purchase_BeforeBoat.png +share/gnome/help/gnucash-guide/ru/figures/currency_purchase_BeforeStocks.png +share/gnome/help/gnucash-guide/ru/figures/currency_purchase_Commodities.png +share/gnome/help/gnucash-guide/ru/figures/currency_purchase_MoveMoney.png +share/gnome/help/gnucash-guide/ru/figures/currency_purchase_SetExchangeRate.png +share/gnome/help/gnucash-guide/ru/figures/currency_purchase_ToAmount.png +share/gnome/help/gnucash-guide/ru/figures/dep_assetmain.png +share/gnome/help/gnucash-guide/ru/figures/dep_assetreg.png +share/gnome/help/gnucash-guide/ru/figures/dep_example.png +share/gnome/help/gnucash-guide/ru/figures/invest2Lots0RegB4Scrub.png +share/gnome/help/gnucash-guide/ru/figures/invest2Lots1B4Scrub.png +share/gnome/help/gnucash-guide/ru/figures/invest2Lots2LotsAftScrubAcct.png +share/gnome/help/gnucash-guide/ru/figures/invest2Lots3RegAftScrubAcct.png +share/gnome/help/gnucash-guide/ru/figures/investLots0_RegB4Scrub.png +share/gnome/help/gnucash-guide/ru/figures/investLots1_BeforeCreateLot.png +share/gnome/help/gnucash-guide/ru/figures/investLots2_BeforeScrub1Lot.png +share/gnome/help/gnucash-guide/ru/figures/investLots2_RegAfterScrub1Lot.png +share/gnome/help/gnucash-guide/ru/figures/investLotsSplitLot0.png +share/gnome/help/gnucash-guide/ru/figures/investLotsSplitLot1.png +share/gnome/help/gnucash-guide/ru/figures/investLotsSplitReg.png +share/gnome/help/gnucash-guide/ru/figures/invest_AccountsPredef.png +share/gnome/help/gnucash-guide/ru/figures/invest_SetupPortfolio2.png +share/gnome/help/gnucash-guide/ru/figures/invest_SetupPortfolio3.png +share/gnome/help/gnucash-guide/ru/figures/invest_dividendcash.png +share/gnome/help/gnucash-guide/ru/figures/invest_dividendreinvest1.png +share/gnome/help/gnucash-guide/ru/figures/invest_int1.png +share/gnome/help/gnucash-guide/ru/figures/invest_int2-1.png +share/gnome/help/gnucash-guide/ru/figures/invest_int2.png +share/gnome/help/gnucash-guide/ru/figures/invest_int3.png +share/gnome/help/gnucash-guide/ru/figures/invest_merge2.png +share/gnome/help/gnucash-guide/ru/figures/invest_merge3.png +share/gnome/help/gnucash-guide/ru/figures/invest_newaccount.png +share/gnome/help/gnucash-guide/ru/figures/invest_newsecurity.png +share/gnome/help/gnucash-guide/ru/figures/invest_peditor.png +share/gnome/help/gnucash-guide/ru/figures/invest_peditor2.png +share/gnome/help/gnucash-guide/ru/figures/invest_ret_of_cap.png +share/gnome/help/gnucash-guide/ru/figures/invest_selectsecurity.png +share/gnome/help/gnucash-guide/ru/figures/invest_sellstock.png +share/gnome/help/gnucash-guide/ru/figures/invest_sellstock2.png +share/gnome/help/gnucash-guide/ru/figures/invest_sellstockLoss2.png +share/gnome/help/gnucash-guide/ru/figures/invest_sellstockManProfCombNet.png +share/gnome/help/gnucash-guide/ru/figures/invest_sellstockManProfSep.png +share/gnome/help/gnucash-guide/ru/figures/invest_sellstockManProfSepNet.png +share/gnome/help/gnucash-guide/ru/figures/invest_setup_current.png +share/gnome/help/gnucash-guide/ru/figures/invest_setup_portfolio1.png +share/gnome/help/gnucash-guide/ru/figures/invest_simplesplit1.png +share/gnome/help/gnucash-guide/ru/figures/invest_split1.png +share/gnome/help/gnucash-guide/ru/figures/invest_split2.png +share/gnome/help/gnucash-guide/ru/figures/invest_split3.png +share/gnome/help/gnucash-guide/ru/figures/invest_split4.png +share/gnome/help/gnucash-guide/ru/figures/invest_split5.png +share/gnome/help/gnucash-guide/ru/figures/invest_stockmerge1.png +share/gnome/help/gnucash-guide/ru/figures/invest_stockvalue.png +share/gnome/help/gnucash-guide/ru/figures/invest_stockvalue_report.png +share/gnome/help/gnucash-guide/ru/figures/invest_stockvalue_report_options.png +share/gnome/help/gnucash-guide/ru/figures/loans_PrivateLoanCalculation.png +share/gnome/help/gnucash-guide/ru/figures/loans_PrivateLoanFirstPayment.png +share/gnome/help/gnucash-guide/ru/figures/loans_PrivateLoanInitial.png +share/gnome/help/gnucash-guide/ru/figures/loans_PrivateLoanSecondPayment.png +share/gnome/help/gnucash-guide/ru/figures/loans_PrivateLoanSecondPaymentAccounts.png +share/gnome/help/gnucash-guide/ru/figures/loans_fcalc.png +share/gnome/help/gnucash-guide/ru/figures/loans_mortgage1.png +share/gnome/help/gnucash-guide/ru/figures/loans_mortgage2.png +share/gnome/help/gnucash-guide/ru/figures/loans_mortgage3.png +share/gnome/help/gnucash-guide/ru/figures/oview_intro.png +share/gnome/help/gnucash-guide/ru/figures/txns_CashFlow.png +share/gnome/help/gnucash-guide/ru/figures/txns_TransactionRptChecking.png +share/gnome/help/gnucash-guide/ru/figures/txns_TransactionRptExpenses.png +share/gnome/help/gnucash-guide/ru/figures/txns_puttoget_Charts.png +share/gnome/help/gnucash-guide/ru/figures/txns_puttoget_Charts1.png +share/gnome/help/gnucash-guide/ru/figures/txns_puttoget_Charts2.png +share/gnome/help/gnucash-guide/ru/figures/txns_reconcile_window1.png +share/gnome/help/gnucash-guide/ru/figures/txns_reconcile_window2.png +share/gnome/help/gnucash-guide/ru/figures/txns_reconcile_window3.png +share/gnome/help/gnucash-guide/ru/figures/txns_register_2account.png +share/gnome/help/gnucash-guide/ru/figures/txns_register_2account2.png +share/gnome/help/gnucash-guide/ru/figures/txns_register_multiaccount.png +share/gnome/help/gnucash-guide/ru/figures/txns_registersplit2.png +share/gnome/help/gnucash-guide/ru/figures/txns_registersplit3.png +share/gnome/help/gnucash-guide/ru/figures/txns_registersplit4.png +share/gnome/help/gnucash-guide/ru/figures/txns_registersplit5.png +share/gnome/help/gnucash-guide/ru/figures/txns_registersplit6.png +share/gnome/help/gnucash-guide/ru/figures/txns_sxn_editor-2.png +share/gnome/help/gnucash-guide/ru/figures/txns_sxn_editor-3-frequency.png +share/gnome/help/gnucash-guide/ru/figures/txns_sxn_editor-3-overview.png +share/gnome/help/gnucash-guide/ru/figures/txns_sxn_editor-3-template.png +share/gnome/help/gnucash-guide/ru/figures/txns_sxn_editor-4.png +share/gnome/help/gnucash-guide/ru/figures/txns_sxn_editor_slr.png +share/gnome/help/gnucash-guide/ru/figures/txns_sxn_ledger1.png +share/gnome/help/gnucash-guide/ru/figures/txns_sxn_ledger2.png +share/gnome/help/gnucash-guide/ru/figures/txns_sxn_ledger3.png +share/gnome/help/gnucash-guide/ru/figures/txns_sxn_ledger4.png +share/gnome/help/gnucash-guide/ru/gnc-glossary.xml +share/gnome/help/gnucash-guide/ru/gnucash-guide.xml +share/gnome/help/gnucash-guide/ru/legal.xml share/gnome/help/gnucash-help/C/Help_ch_Account-Actions.xml share/gnome/help/gnucash-help/C/Help_ch_Business.xml share/gnome/help/gnucash-help/C/Help_ch_Customize.xml diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile index 34eecfc3e3bc..b0362f6ad339 100644 --- a/finance/gnucash/Makefile +++ b/finance/gnucash/Makefile @@ -2,8 +2,7 @@ # $MCom: ports/finance/gnucash/Makefile,v 1.26 2008/12/31 03:25:18 mezz Exp $ PORTNAME= gnucash -PORTVERSION= 2.6.16 -PORTREVISION= 1 +PORTVERSION= 2.6.17 CATEGORIES= finance gnome MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION} @@ -42,8 +41,10 @@ AQBANKING_CONFIGURE_ENABLE=aqbanking AQBANKING_LIB_DEPENDS= libgwengui-gtk2.so:devel/gwenhywfar-gtk2 \ libktoblzcheck.so:finance/ktoblzcheck \ libaqbanking.so:finance/aqbanking +AQBANKING_VARS= GLIB_SCHEMAS+=org.gnucash.dialogs.import.hbci.gschema.xml OFX_CONFIGURE_ENABLE= ofx OFX_LIB_DEPENDS= libofx.so:finance/libofx +OFX_VARS= GLIB_SCHEMAS+=org.gnucash.dialogs.import.ofx.gschema.xml DATABASE_CONFIGURE_ENABLE=dbi DATABASE_BUILD_DEPENDS= libdbi-drivers>=0:databases/libdbi-drivers DATABASE_LIB_DEPENDS= libdbi.so:databases/libdbi @@ -65,6 +66,7 @@ GUILE2_RUN_DEPENDS= slib-guile2>0:lang/slib-guile2 USE_XORG= x11 USES= compiler:c++11-lib desktop-file-utils gettext gmake libtool localbase \ perl5 pkgconfig shebangfix tar:bzip2 +USE_CXXSTD= c++11 INSTALLS_ICONS= yes USE_GNOME+= cairo gtk20 intltool libgnomecanvas libxml2 libxslt GNU_CONFIGURE= yes @@ -90,24 +92,13 @@ GLIB_SCHEMAS= org.gnucash.dialogs.business.gschema.xml \ org.gnucash.window.pages.account.tree.gschema.xml \ org.gnucash.window.pages.gschema.xml -.include - -.if ${PORT_OPTIONS:MAQBANKING} -GLIB_SCHEMAS+= org.gnucash.dialogs.import.hbci.gschema.xml -.endif - -.if ${PORT_OPTIONS:MOFX} -GLIB_SCHEMAS+= org.gnucash.dialogs.import.ofx.gschema.xml -.endif - .include .if ${CHOSEN_COMPILER_TYPE} == gcc LDFLAGS+= -lstdc++ .endif -post-install: -.if ${PORT_OPTIONS:MPYTHON} +post-install-PYTHON-on: @(cd ${STAGEDIR}${PREFIX} \ && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/${PORTNAME}) @@ -115,7 +106,8 @@ post-install: && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/${PORTNAME}) @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/gnucash/_gnucash_core_c.so -.endif + +post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*so* @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gnucash/lib*.so diff --git a/finance/gnucash/distinfo b/finance/gnucash/distinfo index 19011dfc1f64..0400f643dd35 100644 --- a/finance/gnucash/distinfo +++ b/finance/gnucash/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1490595521 -SHA256 (gnucash-2.6.16.tar.bz2) = 2c556299a6a610fc93dd2ea8d432357e3d43d4630d66d7f888fcf5f4b4ce0881 -SIZE (gnucash-2.6.16.tar.bz2) = 13447266 +TIMESTAMP = 1499106917 +SHA256 (gnucash-2.6.17.tar.bz2) = db965f39b6c5181810a064a1d1f5bb719722ac3b54dfce0cecf43ee7b38e593c +SIZE (gnucash-2.6.17.tar.bz2) = 13508462 diff --git a/japanese/asterisk-sounds/Makefile b/japanese/asterisk-sounds/Makefile index c62db8584462..0f1ccbc40970 100644 --- a/japanese/asterisk-sounds/Makefile +++ b/japanese/asterisk-sounds/Makefile @@ -3,6 +3,7 @@ PORTNAME= asterisk PORTVERSION= 1.6 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= japanese net MASTER_SITES= http://ftp.voip-info.jp/asterisk/sounds/${PORTVERSION:S|.|_|}/ \ @@ -13,8 +14,6 @@ DISTNAME= asterisk-sound-jp_${PORTVERSION:S|.||}_pre MAINTAINER= ports@FreeBSD.org COMMENT= Japanese sound files for Asterisk -RUN_DEPENDS= asterisk:net/asterisk11 - NO_BUILD= yes ASTERISKDIR= ${PREFIX}/share/asterisk/sounds DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} @@ -23,6 +22,16 @@ SUB_LIST= PORTSDIR=${PORTSDIR} OPTIONS_DEFINE= DOCS +OPTIONS_SINGLE= ASTVER +OPTIONS_SINGLE_ASTVER= ASTERISK11 ASTERISK13 +OPTIONS_DEFAULT= ASTERISK13 + +ASTERISK11_DESC= Depend on Asterisk 11 +ASTERISK13_DESC= Depend on Asterisk 13 + +ASTERISK11_RUN_DEPENDS= asterisk:net/asterisk11 +ASTERISK13_RUN_DEPENDS= asterisk:net/asterisk13 + do-install: @-${MKDIR} ${STAGEDIR}${ASTERISKDIR}/ja for gsm in ${WRKDIR}/ja/*.gsm; do \ diff --git a/mail/cleanup-maildir/Makefile b/mail/cleanup-maildir/Makefile index e5784c6590a8..19f585a7e5d4 100644 --- a/mail/cleanup-maildir/Makefile +++ b/mail/cleanup-maildir/Makefile @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= cleanup-maildir -PORTVERSION= 0.1.0.2016010801 +PORTVERSION= 0.1.1 +DISTVERSIONPREFIX= v CATEGORIES= mail python -MASTER_SITES= LOCAL/ehaupt MAINTAINER= ehaupt@FreeBSD.org COMMENT= Script for cleaning up mails in Maildir folders based on arival date @@ -12,9 +12,12 @@ COMMENT= Script for cleaning up mails in Maildir folders based on arival date RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}graph-core>=${PORTVERSION}:graphics/py-graph-core USES= python shebangfix +USE_GITHUB= yes NO_BUILD= yes NO_ARCH= yes +GH_ACCOUNT= ehaupt + SHEBANG_FILES= cleanup-maildir.py PLIST_FILES= bin/cleanup-maildir diff --git a/mail/cleanup-maildir/distinfo b/mail/cleanup-maildir/distinfo index b0be6dc35fd7..93bf0448b9be 100644 --- a/mail/cleanup-maildir/distinfo +++ b/mail/cleanup-maildir/distinfo @@ -1,2 +1,3 @@ -SHA256 (cleanup-maildir-0.1.0.2016010801.tar.gz) = 27569c590b6dc51f745f021f07c8f249454340dbbe4fa6a88abd9f01e8e6dc37 -SIZE (cleanup-maildir-0.1.0.2016010801.tar.gz) = 6209 +TIMESTAMP = 1499242225 +SHA256 (ehaupt-cleanup-maildir-v0.1.1_GH0.tar.gz) = 110186d1521a737e92d63badbb25baf0d48f343ae02bc08e05b29e8d718838db +SIZE (ehaupt-cleanup-maildir-v0.1.1_GH0.tar.gz) = 6371 diff --git a/mail/pymsgauth/Makefile b/mail/pymsgauth/Makefile index c4a0eabae962..01289dbe9019 100644 --- a/mail/pymsgauth/Makefile +++ b/mail/pymsgauth/Makefile @@ -21,8 +21,8 @@ NO_ARCH= yes SUB_FILES= pkg-message -DOCS= BUGS CHANGELOG pymsgauth.txt pymsgauth.html -EXAMPLES= pymsgauthrc-example +PORTDOCS= BUGS CHANGELOG pymsgauth.txt pymsgauth.html +PORTEXAMPLES= pymsgauthrc-example OPTIONS_DEFINE= DOCS EXAMPLES @@ -33,9 +33,13 @@ do-install: .for f in clean confirm mail ${LN} -sf ${DATADIR}/pymsgauth-${f} ${STAGEDIR}${PREFIX}/bin .endfor + +do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${EXAMPLES:S|^|${WRKSRC}/|} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/|} ${STAGEDIR}${EXAMPLESDIR} + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include diff --git a/mail/pymsgauth/pkg-plist b/mail/pymsgauth/pkg-plist index 9f4cf571c066..020a52237a54 100644 --- a/mail/pymsgauth/pkg-plist +++ b/mail/pymsgauth/pkg-plist @@ -6,8 +6,3 @@ bin/pymsgauth-mail %%DATADIR%%/pymsgauth-clean %%DATADIR%%/pymsgauth-confirm %%DATADIR%%/pymsgauth-mail -%%PORTDOCS%%%%DOCSDIR%%/BUGS -%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG -%%PORTDOCS%%%%DOCSDIR%%/pymsgauth.html -%%PORTDOCS%%%%DOCSDIR%%/pymsgauth.txt -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pymsgauthrc-example diff --git a/mail/roundcube-thunderbird_labels/Makefile b/mail/roundcube-thunderbird_labels/Makefile index 332c85d78e11..b088d090cdc9 100644 --- a/mail/roundcube-thunderbird_labels/Makefile +++ b/mail/roundcube-thunderbird_labels/Makefile @@ -11,6 +11,7 @@ MAINTAINER= moiseev@mezonplus.ru COMMENT= Thunderbird Labels plugin for RoundCube webmail LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE.md RUN_DEPENDS= roundcube>=0.5:mail/roundcube diff --git a/math/R/Makefile b/math/R/Makefile index 3b7b1fe08036..896d38e4fccc 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -45,10 +45,10 @@ OPTIONS_SINGLE_FORTRAN_amd64= GFORTRAN FLANG OPTIONS_SUB= YES ATLAS_DESC= ATLAS BLAS implementation -FLANG_DESC= Experimental Fortan support via flang +FLANG_DESC= Experimental Fortran support via flang GHOSTSCRIPT_DESC= Graphics device for bitmap files via Ghostscript CAIROPANGO_DESC= Cairo graphics device and Pango multi-language text -GFORTRAN_DESC= Fortan support via gfortran +GFORTRAN_DESC= Fortran support via gfortran INFO_DESC= GNU info manuals JPEG_DESC= JPEG graphics device LDOUBLE_DESC= Long double data type diff --git a/math/libRmath/Makefile b/math/libRmath/Makefile index 72b2f3976392..ed3059a1fd7d 100644 --- a/math/libRmath/Makefile +++ b/math/libRmath/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libRmath -PORTVERSION= 3.4.0 +PORTVERSION= 3.4.1 PORTREVISION= 0 CATEGORIES= math lang MASTER_SITES= CRAN/src/base/R-${PORTVERSION:C|\..*||} diff --git a/math/libRmath/distinfo b/math/libRmath/distinfo index da6b40c15ea0..f32a2d403a93 100644 --- a/math/libRmath/distinfo +++ b/math/libRmath/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1492890009 -SHA256 (R-3.4.0.tar.gz) = 288e9ed42457c47720780433b3d5c3c20983048b789291cc6a7baa11f9428b91 -SIZE (R-3.4.0.tar.gz) = 30175855 +TIMESTAMP = 1499255209 +SHA256 (R-3.4.1.tar.gz) = 02b1135d15ea969a3582caeb95594a05e830a6debcdb5b85ed2d5836a6a3fc78 +SIZE (R-3.4.1.tar.gz) = 30200109 diff --git a/math/liborigin/Makefile b/math/liborigin/Makefile index 2ff3111b774c..313ddd443d26 100644 --- a/math/liborigin/Makefile +++ b/math/liborigin/Makefile @@ -10,6 +10,9 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2.0 MAINTAINER= ports@FreeBSD.org COMMENT= Library and utility for reading OriginLab project files +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING # GPLv3 + BUILD_DEPENDS= ${LOCALBASE}/include/boost/algorithm/string.hpp:devel/boost-libs CONFLICTS_INSTALL= labplot-2.* @@ -24,6 +27,6 @@ OPTIONS_DEFINE= DOXYGEN DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen post-patch-DOXYGEN-off: - ${REINPLACE_CMD} -e '/find_package(Doxygen)/d' ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} -e '/find_package(Doxygen)/d' ${WRKSRC}/CMakeLists.txt .include diff --git a/multimedia/w_scan/Makefile b/multimedia/w_scan/Makefile index 57a511487229..0e78968da38d 100644 --- a/multimedia/w_scan/Makefile +++ b/multimedia/w_scan/Makefile @@ -2,45 +2,34 @@ # $FreeBSD$ PORTNAME= w_scan -PORTVERSION= 20120415 -PORTREVISION= 1 +PORTVERSION= 20170107 CATEGORIES= multimedia MASTER_SITES= http://wirbel.htpc-forum.de/w_scan/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= rene@FreeBSD.org COMMENT= Perform frequency scans for DVB and ATSC transmissions LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= v4l_compat>=1.0.20120501:multimedia/v4l_compat +BUILD_DEPENDS= v4l_compat>=1.0.20120501:multimedia/v4l_compat GNU_CONFIGURE= yes USES= dos2unix gettext iconv localbase tar:bzip2 DOS2UNIX_GLOB= *.c *.h LDFLAGS+= ${ICONV_LIB} -NO_WRKSUBDIR= yes PORTDOCS= COPYING ChangeLog README PLIST_FILES= bin/${PORTNAME} \ man/man1/${PORTNAME}.1.gz -OPTIONS_DEFINE= LINUX DOCS - -LINUX_DESC= Install Linux binary too (linux-w_scan) -LINUX_USES= linux -LINUX_RUN_DEPENDS= linux_dvbwrapper-kmod>=1.0:multimedia/linux_dvbwrapper-kmod -LINUX_PLIST_FILES= bin/linux-${PORTNAME} +OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -f ${FILESDIR}/types.sed ${WRKSRC}/configure ${WRKSRC}/*.c ${WRKSRC}/*.h - @${CP} ${WRKSRC}/${PORTNAME} ${WRKSRC}/linux-${PORTNAME} post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) -post-install-LINUX-on: - (cd ${WRKSRC} && ${INSTALL_PROGRAM} linux-${PORTNAME} ${STAGEDIR}${PREFIX}/bin) - .include diff --git a/multimedia/w_scan/distinfo b/multimedia/w_scan/distinfo index a1d6799e2e23..92582157acc7 100644 --- a/multimedia/w_scan/distinfo +++ b/multimedia/w_scan/distinfo @@ -1,2 +1,3 @@ -SHA256 (w_scan-20120415.tar.bz2) = 02b81bf6f64f3d1b9965e79e2e69a70e96766facf0f5a57499d1ca7262aa1847 -SIZE (w_scan-20120415.tar.bz2) = 361591 +TIMESTAMP = 1499198536 +SHA256 (w_scan-20170107.tar.bz2) = 38e0f38a7bf06cff6d6ea01652ad4ee60da2cb0e937360468f936da785b46ffe +SIZE (w_scan-20170107.tar.bz2) = 245517 diff --git a/multimedia/w_scan/files/patch-descriptors.c b/multimedia/w_scan/files/patch-descriptors.c deleted file mode 100644 index 0bfcf37ed9e2..000000000000 --- a/multimedia/w_scan/files/patch-descriptors.c +++ /dev/null @@ -1,39 +0,0 @@ -The code is using gnu C extensions. The following new patchfile under files/ fixes the issue: - -# cat files/patch-descriptors.c ---- descriptors.c.orig 2016-06-20 13:13:56 UTC -+++ descriptors.c -@@ -1000,6 +1000,16 @@ void parse_T2_delivery_system_descriptor - } - } - -+__u8 LeapYear(__u16 year) { -+ if ((year % 400) == 0) -+ return 1; -+ else if ((year % 100) == 0) -+ return 0; -+ else if ((year % 4) == 0) -+ return 1; -+ return 0; -+} -+ - - /* 300468 v011101 annex C, Conversion between time and date conventions - * NOTE: These formulas are applicable between the inclusive dates 1900 March 1 to 2100 February 28. -@@ -1011,16 +1021,6 @@ struct tm modified_julian_date_to_utc(__ - int _M = (int) (MJD - 14956.1 - (int) (_Y * 365.25)) / 30.6001; - int K = (_M == 14) ? 1 : (_M == 15) ? 1 : 0; - -- __u8 LeapYear(__u16 year) { -- if ((year % 400) == 0) -- return 1; -- else if ((year % 100) == 0) -- return 0; -- else if ((year % 4) == 0) -- return 1; -- return 0; -- } -- - memset(&utc, 0, sizeof(struct tm)); - utc.tm_mday = MJD - 14956 - (int) (_Y * 365.25) - (int) (_M * 30.6001); - utc.tm_year = _Y + K; diff --git a/multimedia/w_scan/files/patch-scan.c b/multimedia/w_scan/files/patch-scan.c deleted file mode 100644 index 88910e56532d..000000000000 --- a/multimedia/w_scan/files/patch-scan.c +++ /dev/null @@ -1,25 +0,0 @@ ---- scan.c.orig 2016-06-20 13:13:56 UTC -+++ scan.c -@@ -1816,7 +1816,11 @@ static int set_frontend(int frontend_fd, - case SCAN_TERRESTRIAL: - set_cmd_sequence(DTV_DELIVERY_SYSTEM, t->param.u.terr.delivery_system); - if (t->param.u.terr.delivery_system == SYS_DVBT2) { -+#ifndef DTV_DVBT2_PLP_ID -+ set_cmd_sequence(DTV_DVBT2_PLP_ID_LEGACY, t->pids.plp_id); -+#else - set_cmd_sequence(DTV_DVBT2_PLP_ID, t->pids.plp_id); -+#endif - } - set_cmd_sequence(DTV_FREQUENCY, t->param.frequency); - set_cmd_sequence(DTV_INVERSION, t->param.inversion); -@@ -3010,8 +3014,8 @@ int main (int argc, char **argv) - cleanup(); - return -1; - } -- if (((adapter > 7) && (adapter != 999)) || (adapter < 0)) { -- info("Invalid adapter: out of range (0..7)\n"); -+ if (((adapter > 255) && (adapter != 999)) || (adapter < 0)) { -+ info("Invalid adapter: out of range (0..255)\n"); - bad_usage(argv[0]); - cleanup(); - return -1; diff --git a/net/asterisk11/Makefile b/net/asterisk11/Makefile index 7b33ceda97fb..ae0fb6f1663e 100644 --- a/net/asterisk11/Makefile +++ b/net/asterisk11/Makefile @@ -17,6 +17,9 @@ COMMENT= Open Source PBX and telephony toolkit LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE +DEPRECATED= Asterisk 11.x will reach EOL on 2017-10-25. Please migrate to net/asterisk13 +EXPIRATION_DATE=2017-10-25 + EXTRACT_ONLY:= ${DISTNAME}${EXTRACT_SUFX} BROKEN_armv6= fails to configure: the SPANDSP installation appears to be missing or broken diff --git a/net/concourse-fly/Makefile b/net/concourse-fly/Makefile index 5fc1511b7538..7640c721e045 100644 --- a/net/concourse-fly/Makefile +++ b/net/concourse-fly/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= concourse -PORTVERSION= 3.2.1 +PORTVERSION= 3.3.1 CATEGORIES= net sysutils MASTER_SITES= LOCAL/dumbbell/concourse/ PKGNAMESUFFIX= -fly diff --git a/net/concourse-fly/distinfo b/net/concourse-fly/distinfo index 9bed3d6b4566..9d1a71cfaa35 100644 --- a/net/concourse-fly/distinfo +++ b/net/concourse-fly/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1497853980 -SHA256 (concourse-3.2.1.tar.xz) = 642765677bba14bf131f90ead3993beefddb3e4f6655dd9d3f8e8bce682de3a4 -SIZE (concourse-3.2.1.tar.xz) = 23058224 +TIMESTAMP = 1499181809 +SHA256 (concourse-3.3.1.tar.xz) = 68b3918bd99a7a045f29bc13a4736bd8a8a0b5e155c8f49e1ac403168ecd5cc9 +SIZE (concourse-3.3.1.tar.xz) = 31605512 diff --git a/net/libvncserver/Makefile b/net/libvncserver/Makefile index 480e1e5f3fdd..c617b19d266b 100644 --- a/net/libvncserver/Makefile +++ b/net/libvncserver/Makefile @@ -3,6 +3,7 @@ PORTNAME= libvncserver PORTVERSION= 0.9.11 +PORTREVISION= 1 DISTVERSIONPREFIX= LibVNCServer- CATEGORIES= net devel diff --git a/net/libvncserver/files/patch-common_md5.c b/net/libvncserver/files/patch-common_md5.c new file mode 100644 index 000000000000..c2b4aa538622 --- /dev/null +++ b/net/libvncserver/files/patch-common_md5.c @@ -0,0 +1,11 @@ +--- common/md5.c.orig 2017-07-05 07:48:23 UTC ++++ common/md5.c +@@ -29,7 +29,7 @@ + #include "md5.h" + + /* #ifdef _LIBC */ +-# include ++# include + # if __BYTE_ORDER == __BIG_ENDIAN + # define WORDS_BIGENDIAN 1 + # endif diff --git a/net/libvncserver/files/patch-common_md5.h b/net/libvncserver/files/patch-common_md5.h new file mode 100644 index 000000000000..585fa75eeb32 --- /dev/null +++ b/net/libvncserver/files/patch-common_md5.h @@ -0,0 +1,59 @@ +--- common/md5.h.orig 2017-07-05 07:48:49 UTC ++++ common/md5.h +@@ -98,21 +98,21 @@ struct md5_ctx + + /* Initialize structure containing state of computation. + (RFC 1321, 3.3: Step 3) */ +-extern void __md5_init_ctx (struct md5_ctx *ctx) __THROW; ++extern void __md5_init_ctx (struct md5_ctx *ctx) ; + + /* Starting with the result of former calls of this function (or the + initialization function update the context for the next LEN bytes + starting at BUFFER. + It is necessary that LEN is a multiple of 64!!! */ + extern void __md5_process_block (const void *buffer, size_t len, +- struct md5_ctx *ctx) __THROW; ++ struct md5_ctx *ctx) ; + + /* Starting with the result of former calls of this function (or the + initialization function update the context for the next LEN bytes + starting at BUFFER. + It is NOT required that LEN is a multiple of 64. */ + extern void __md5_process_bytes (const void *buffer, size_t len, +- struct md5_ctx *ctx) __THROW; ++ struct md5_ctx *ctx) ; + + /* Process the remaining bytes in the buffer and put result from CTX + in first 16 bytes following RESBUF. The result is always in little +@@ -121,7 +121,7 @@ extern void __md5_process_bytes (const void *buffer, s + + IMPORTANT: On some systems it is required that RESBUF is correctly + aligned for a 32 bits value. */ +-extern void *__md5_finish_ctx (struct md5_ctx *ctx, void *resbuf) __THROW; ++extern void *__md5_finish_ctx (struct md5_ctx *ctx, void *resbuf) ; + + + /* Put result from CTX in first 16 bytes following RESBUF. The result is +@@ -130,19 +130,19 @@ extern void *__md5_finish_ctx (struct md5_ctx *ctx, vo + + IMPORTANT: On some systems it is required that RESBUF is correctly + aligned for a 32 bits value. */ +-extern void *__md5_read_ctx (const struct md5_ctx *ctx, void *resbuf) __THROW; ++extern void *__md5_read_ctx (const struct md5_ctx *ctx, void *resbuf) ; + + + /* Compute MD5 message digest for bytes read from STREAM. The + resulting message digest number will be written into the 16 bytes + beginning at RESBLOCK. */ +-extern int __md5_stream (FILE *stream, void *resblock) __THROW; ++extern int __md5_stream (FILE *stream, void *resblock) ; + + /* Compute MD5 message digest for LEN bytes beginning at BUFFER. The + result is always in little endian byte order, so that a byte-wise + output yields to the wanted ASCII representation of the message + digest. */ + extern void *__md5_buffer (const char *buffer, size_t len, +- void *resblock) __THROW; ++ void *resblock) ; + + #endif /* md5.h */ diff --git a/net/libvncserver/files/patch-common_vncauth.c b/net/libvncserver/files/patch-common_vncauth.c new file mode 100644 index 000000000000..ddbe8704295e --- /dev/null +++ b/net/libvncserver/files/patch-common_vncauth.c @@ -0,0 +1,22 @@ +--- common/vncauth.c.orig 2017-07-05 07:43:58 UTC ++++ common/vncauth.c +@@ -42,6 +42,10 @@ + #include + #endif + ++#ifdef __FreeBSD__ ++#include ++#endif ++ + #include + + #ifdef WIN32 +@@ -196,6 +200,8 @@ rfbEncryptBytes(unsigned char *bytes, char *passwd) + rfbDes(bytes+i, bytes+i); + } + } ++ ++void rfbEncryptBytes2(unsigned char *, const int, unsigned char *); + + void + rfbEncryptBytes2(unsigned char *where, const int length, unsigned char *key) { diff --git a/net/libvncserver/files/patch-rfb_rfb.h b/net/libvncserver/files/patch-rfb_rfb.h new file mode 100644 index 000000000000..6276f8584c50 --- /dev/null +++ b/net/libvncserver/files/patch-rfb_rfb.h @@ -0,0 +1,20 @@ +--- rfb/rfb.h.orig 2017-07-05 07:45:47 UTC ++++ rfb/rfb.h +@@ -43,7 +43,7 @@ extern "C" + #include + #include + +-#if defined(ANDROID) || defined(LIBVNCSERVER_HAVE_ANDROID) ++#if defined(ANDROID) || defined(LIBVNCSERVER_HAVE_ANDROID) || defined(__FreeBSD__) + #include + #include + #endif +@@ -265,6 +265,8 @@ typedef struct _rfbScreenInfo + rfbBool autoPort; + int port; + SOCKET listenSock; ++ SOCKET unixSock; ++ const char *unixSockPath; + int maxSock; + int maxFd; + #ifdef WIN32 diff --git a/security/enchive/Makefile b/security/enchive/Makefile index a5594fad2fec..ee322305f4ab 100644 --- a/security/enchive/Makefile +++ b/security/enchive/Makefile @@ -7,7 +7,7 @@ CATEGORIES= security MAINTAINER= acm@FreeBSD.org COMMENT= Tool to encrypt files to yourself for long-term archival -LICENSE= PD +LICENSE= UNLICENSE LICENSE_FILE= ${WRKSRC}/UNLICENSE USES= gmake diff --git a/security/testssl.sh/Makefile b/security/testssl.sh/Makefile index efdfb7497c38..a2e52793c41a 100644 --- a/security/testssl.sh/Makefile +++ b/security/testssl.sh/Makefile @@ -2,6 +2,7 @@ PORTNAME= testssl.sh PORTVERSION= 2.8 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= tobik@FreeBSD.org @@ -44,7 +45,6 @@ CONFIGURE_ARGS= --openssldir=${OPENSSLDIR} \ enable-camellia \ enable-idea \ enable-rfc3779 \ - enable-ec_nistp_64_gcc_128 \ experimental-jpake \ -DOPENSSL_USE_IPV6 CONFIGURE_ENV= PERL="${PERL}" @@ -57,6 +57,14 @@ CONFIGURE_WRKSRC= ${WRKSRC_openssl} # unknown reasons. MAKE_JOBS_UNSAFE= yes +.include + +.if ${ARCH} == "amd64" +CONFIGURE_ARGS+= enable-ec_nistp_64_gcc_128 +.else +CONFIGURE_ARGS+= no-ec_nistp_64_gcc_128 +.endif + post-patch: @${REINPLACE_CMD} -e '/elif test_openssl_suffix/d' \ -e 's@: \# 5. we tried.*$$@else OPENSSL="${PREFIX}/libexec/openssl.testssl.sh"@' \ @@ -71,4 +79,4 @@ do-install: @cd ${WRKSRC}/etc && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/etc @cd ${WRKSRC}/utils && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/utils -.include +.include diff --git a/textproc/ripgrep/Makefile b/textproc/ripgrep/Makefile index 7d011a2ae3e0..f0f958d004ff 100644 --- a/textproc/ripgrep/Makefile +++ b/textproc/ripgrep/Makefile @@ -11,11 +11,9 @@ MAINTAINER= petteri.valkonen@iki.fi COMMENT= Command line search tool LICENSE= MIT UNLICENSE -LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_COMB= dual -LICENSE_NAME_UNLICENSE= The Unlicense +LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_FILE_UNLICENSE= ${WRKSRC}/UNLICENSE -LICENSE_PERMS_UNLICENSE=dist-mirror dist-sell pkg-mirror pkg-sell auto-accept USES= cargo USE_GITHUB= yes diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index bdcd7cbee5d4..b69621ecde76 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -4,7 +4,7 @@ PORTNAME= gitlab PORTVERSION= 9.0.10 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www devel MAINTAINER= tz@FreeBSD.org diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index 6b0962d75ce0..9666ae27d17d 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,6 +1,12 @@ --- Gemfile.orig 2017-06-07 20:58:14 UTC +++ Gemfile -@@ -6,41 +6,36 @@ gem 'rails-deprecated_sanitizer', '~> 1. +@@ -1,46 +1,41 @@ + source 'https://rubygems.org' + +-gem 'rails', '4.2.8' ++gem 'rails', '>= 4.2.8' + gem 'rails-deprecated_sanitizer', '~> 1.0.3' + # Responders respond_to and respond_with gem 'responders', '~> 2.0' diff --git a/www/py-urlobject/Makefile b/www/py-urlobject/Makefile index 8f831e48f926..d68450ba1324 100644 --- a/www/py-urlobject/Makefile +++ b/www/py-urlobject/Makefile @@ -11,10 +11,8 @@ DISTNAME= URLObject-${PORTVERSION} MAINTAINER= freebsd@skinc.ru COMMENT= Utility class for manipulating URLs -LICENSE= Unlicense -LICENSE_NAME= The Unlicense +LICENSE= UNLICENSE LICENSE_FILE= ${WRKSRC}/UNLICENSE -LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept USES= python:2.7+ USE_PYTHON= distutils autoplist diff --git a/www/rubygem-rdf/Makefile b/www/rubygem-rdf/Makefile index 8a2704ec49bc..8360e43080c1 100644 --- a/www/rubygem-rdf/Makefile +++ b/www/rubygem-rdf/Makefile @@ -10,9 +10,7 @@ MAINTAINER= ruby@FreeBSD.org COMMENT= Pure-Ruby library for working with RDF data LICENSE= UNLICENSE -LICENSE_NAME= Unlicense LICENSE_FILE= ${WRKSRC}/UNLICENSE -LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept RUN_DEPENDS= rubygem-hamster>=3.0:devel/rubygem-hamster \ rubygem-link_header>=0.0.8:www/rubygem-link_header diff --git a/www/sogo3/Makefile b/www/sogo3/Makefile index 01007df2b23c..35ef623459e6 100644 --- a/www/sogo3/Makefile +++ b/www/sogo3/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sogo3 -PORTVERSION= 3.2.8 +PORTVERSION= 3.2.9 CATEGORIES= www gnustep MASTER_SITES= http://www.sogo.nu/files/downloads/SOGo/Sources/ DISTNAME= SOGo-${PORTVERSION} diff --git a/www/sogo3/distinfo b/www/sogo3/distinfo index 23d10779817f..2f45df53983b 100644 --- a/www/sogo3/distinfo +++ b/www/sogo3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1492458403 -SHA256 (SOGo-3.2.8.tar.gz) = 1b9fdd20cfa9efd564afe579171ffcd7501059ea7ed4c1e4e0efb08d88da359a -SIZE (SOGo-3.2.8.tar.gz) = 32455093 +TIMESTAMP = 1496436541 +SHA256 (SOGo-3.2.9.tar.gz) = 1f065e5acf5090959b5e37cbf72dc41d7ccca76cca2e2a1962cb1c1e674efc7d +SIZE (SOGo-3.2.9.tar.gz) = 32557925 diff --git a/www/sogo3/files/patch-Tools_GNUmakefile.preamble b/www/sogo3/files/patch-Tools_GNUmakefile.preamble index 24e39a0ca3b3..65bf13f26828 100644 --- a/www/sogo3/files/patch-Tools_GNUmakefile.preamble +++ b/www/sogo3/files/patch-Tools_GNUmakefile.preamble @@ -6,4 +6,4 @@ -L../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ -lNGCards \ - -lEOControl -lNGStreams -lNGMime -lNGExtensions -lNGObjWeb + -lEOControl -lNGStreams -lNGMime -lNGExtensions -lNGObjWeb \ -+ -lGDLAccess -lDOM -lSaxObjC -lNGLdap -lSBJson ++ -lGDLAccess -lDOM -lSaxObjC -lNGLdap -lSBJson -lWEExtensions diff --git a/www/sogo3/pkg-plist b/www/sogo3/pkg-plist index 0efd8df05eb9..6bf00929b297 100644 --- a/www/sogo3/pkg-plist +++ b/www/sogo3/pkg-plist @@ -1188,6 +1188,7 @@ GNUstep/Local/Library/SOGo/Templates/Appointments/SOGoAptMailDeletion.wox GNUstep/Local/Library/SOGo/Templates/Appointments/SOGoAptMailICalReply.wox GNUstep/Local/Library/SOGo/Templates/Appointments/SOGoAptMailInvitation.wox GNUstep/Local/Library/SOGo/Templates/Appointments/SOGoAptMailReceipt.wox +GNUstep/Local/Library/SOGo/Templates/Appointments/SOGoAptMailReminder.wox GNUstep/Local/Library/SOGo/Templates/Appointments/SOGoAptMailUpdate.wox GNUstep/Local/Library/SOGo/Templates/ContactsUI/UIxContactEditor.wox GNUstep/Local/Library/SOGo/Templates/ContactsUI/UIxContactEditorTemplate.wox @@ -1601,6 +1602,7 @@ GNUstep/Local/Library/SOGo/WebServerResources/js/Common/sgFocus.directive.js GNUstep/Local/Library/SOGo/WebServerResources/js/Common/sgFocus.service.js GNUstep/Local/Library/SOGo/WebServerResources/js/Common/sgFolderStylesheet.directive.js GNUstep/Local/Library/SOGo/WebServerResources/js/Common/sgHotkeys.service.js +GNUstep/Local/Library/SOGo/WebServerResources/js/Common/sgNoDirtyCheck.directive.js GNUstep/Local/Library/SOGo/WebServerResources/js/Common/sgPlaceholder.directive.js GNUstep/Local/Library/SOGo/WebServerResources/js/Common/sgResetOnDisabled.directive.js GNUstep/Local/Library/SOGo/WebServerResources/js/Common/sgRippleClick.directive.js diff --git a/www/youtube_dl/Makefile b/www/youtube_dl/Makefile index 3de0d5cef4bf..86e2e08d27ef 100644 --- a/www/youtube_dl/Makefile +++ b/www/youtube_dl/Makefile @@ -12,9 +12,7 @@ COMMENT= Program for downloading videos from YouTube.com EXPLICIT_SAFESTACK= yes LICENSE= UNLICENSE -LICENSE_NAME= The Unlicense LICENSE_FILE= ${WRKSRC}/LICENSE -LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BUILD_DEPENDS= zip:archivers/zip diff --git a/x11-servers/xorg-nestserver/files/patch-Xext_shm.c b/x11-servers/xorg-nestserver/files/patch-Xext_shm.c new file mode 100644 index 000000000000..04106a049ab7 --- /dev/null +++ b/x11-servers/xorg-nestserver/files/patch-Xext_shm.c @@ -0,0 +1,14 @@ +--- Xext/shm.c.orig 2016-07-19 17:14:21 UTC ++++ Xext/shm.c +@@ -1210,7 +1210,11 @@ shm_tmpfile(void) + } + ErrorF ("Not using O_TMPFILE\n"); + #endif ++#ifdef HAVE_MKOSTEMP ++ fd = mkostemp(template, O_CLOEXEC); ++#else + fd = mkstemp(template); ++#endif + if (fd < 0) + return -1; + unlink(template); diff --git a/x11-servers/xorg-nestserver/files/patch-configure b/x11-servers/xorg-nestserver/files/patch-configure new file mode 100644 index 000000000000..f59122539cd9 --- /dev/null +++ b/x11-servers/xorg-nestserver/files/patch-configure @@ -0,0 +1,10 @@ +--- configure.orig 2017-01-11 21:16:40 UTC ++++ configure +@@ -22758,6 +22758,7 @@ fi + for ac_func in backtrace ffs geteuid getuid issetugid getresuid \ + getdtablesize getifaddrs getpeereid getpeerucred getprogname getzoneid \ + mmap posix_fallocate seteuid shmctl64 strncasecmp vasprintf vsnprintf \ ++ mkostemp \ + walkcontext setitimer poll epoll_create1 + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` diff --git a/x11-servers/xorg-nestserver/files/patch-include_dix-config.h.in b/x11-servers/xorg-nestserver/files/patch-include_dix-config.h.in new file mode 100644 index 000000000000..270890f9bcbc --- /dev/null +++ b/x11-servers/xorg-nestserver/files/patch-include_dix-config.h.in @@ -0,0 +1,12 @@ +--- include/dix-config.h.in.orig 2016-07-19 17:07:29 UTC ++++ include/dix-config.h.in +@@ -140,6 +140,9 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_LINUX_FB_H + ++/* Define to 1 if you have the `mkostemp' function. */ ++#undef HAVE_MKOSTEMP ++ + /* Define to 1 if you have the `mmap' function. */ + #undef HAVE_MMAP + diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 85f7c7f08987..9408d04dad62 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -3,7 +3,7 @@ PORTNAME?= xorg-server PORTVERSION?= 1.18.4 -PORTREVISION?= 1 +PORTREVISION?= 2 PORTEPOCH?= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver diff --git a/x11-servers/xorg-server/files/patch-Xext_shm.c b/x11-servers/xorg-server/files/patch-Xext_shm.c new file mode 100644 index 000000000000..04106a049ab7 --- /dev/null +++ b/x11-servers/xorg-server/files/patch-Xext_shm.c @@ -0,0 +1,14 @@ +--- Xext/shm.c.orig 2016-07-19 17:14:21 UTC ++++ Xext/shm.c +@@ -1210,7 +1210,11 @@ shm_tmpfile(void) + } + ErrorF ("Not using O_TMPFILE\n"); + #endif ++#ifdef HAVE_MKOSTEMP ++ fd = mkostemp(template, O_CLOEXEC); ++#else + fd = mkstemp(template); ++#endif + if (fd < 0) + return -1; + unlink(template); diff --git a/x11-servers/xorg-server/files/patch-configure b/x11-servers/xorg-server/files/patch-configure index 10674bc6034d..af362d5653c4 100644 --- a/x11-servers/xorg-server/files/patch-configure +++ b/x11-servers/xorg-server/files/patch-configure @@ -1,5 +1,13 @@ --- configure.orig 2016-07-19 17:27:31 UTC +++ configure +@@ -22742,6 +22742,7 @@ fi + for ac_func in backtrace ffs geteuid getuid issetugid getresuid \ + getdtablesize getifaddrs getpeereid getpeerucred getprogname getzoneid \ + mmap posix_fallocate seteuid shmctl64 strncasecmp vasprintf vsnprintf \ ++ mkostemp \ + walkcontext + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -23168,9 +23168,14 @@ $as_echo "#define USE_ALPHA_PIO 1" >>con esac GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee" diff --git a/x11-servers/xorg-server/files/patch-include_dix-config.h.in b/x11-servers/xorg-server/files/patch-include_dix-config.h.in new file mode 100644 index 000000000000..270890f9bcbc --- /dev/null +++ b/x11-servers/xorg-server/files/patch-include_dix-config.h.in @@ -0,0 +1,12 @@ +--- include/dix-config.h.in.orig 2016-07-19 17:07:29 UTC ++++ include/dix-config.h.in +@@ -140,6 +140,9 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_LINUX_FB_H + ++/* Define to 1 if you have the `mkostemp' function. */ ++#undef HAVE_MKOSTEMP ++ + /* Define to 1 if you have the `mmap' function. */ + #undef HAVE_MMAP + diff --git a/x11-servers/xorg-vfbserver/files/patch-Xext_shm.c b/x11-servers/xorg-vfbserver/files/patch-Xext_shm.c new file mode 100644 index 000000000000..04106a049ab7 --- /dev/null +++ b/x11-servers/xorg-vfbserver/files/patch-Xext_shm.c @@ -0,0 +1,14 @@ +--- Xext/shm.c.orig 2016-07-19 17:14:21 UTC ++++ Xext/shm.c +@@ -1210,7 +1210,11 @@ shm_tmpfile(void) + } + ErrorF ("Not using O_TMPFILE\n"); + #endif ++#ifdef HAVE_MKOSTEMP ++ fd = mkostemp(template, O_CLOEXEC); ++#else + fd = mkstemp(template); ++#endif + if (fd < 0) + return -1; + unlink(template); diff --git a/x11-servers/xorg-vfbserver/files/patch-configure b/x11-servers/xorg-vfbserver/files/patch-configure new file mode 100644 index 000000000000..f59122539cd9 --- /dev/null +++ b/x11-servers/xorg-vfbserver/files/patch-configure @@ -0,0 +1,10 @@ +--- configure.orig 2017-01-11 21:16:40 UTC ++++ configure +@@ -22758,6 +22758,7 @@ fi + for ac_func in backtrace ffs geteuid getuid issetugid getresuid \ + getdtablesize getifaddrs getpeereid getpeerucred getprogname getzoneid \ + mmap posix_fallocate seteuid shmctl64 strncasecmp vasprintf vsnprintf \ ++ mkostemp \ + walkcontext setitimer poll epoll_create1 + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` diff --git a/x11-servers/xorg-vfbserver/files/patch-include_dix-config.h.in b/x11-servers/xorg-vfbserver/files/patch-include_dix-config.h.in new file mode 100644 index 000000000000..270890f9bcbc --- /dev/null +++ b/x11-servers/xorg-vfbserver/files/patch-include_dix-config.h.in @@ -0,0 +1,12 @@ +--- include/dix-config.h.in.orig 2016-07-19 17:07:29 UTC ++++ include/dix-config.h.in +@@ -140,6 +140,9 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_LINUX_FB_H + ++/* Define to 1 if you have the `mkostemp' function. */ ++#undef HAVE_MKOSTEMP ++ + /* Define to 1 if you have the `mmap' function. */ + #undef HAVE_MMAP + diff --git a/x11-servers/xwayland/Makefile b/x11-servers/xwayland/Makefile index 5a83d704dba0..4f6ab1879390 100644 --- a/x11-servers/xwayland/Makefile +++ b/x11-servers/xwayland/Makefile @@ -7,7 +7,7 @@ COMMENT= X Clients under Wayland LICENSE= MIT -BUILD_DEPENDS= /usr/local/libdata/pkgconfig/wayland-protocols.pc:graphics/wayland-protocols +BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/wayland-protocols.pc:graphics/wayland-protocols LIB_DEPENDS= libwayland-client.so:graphics/wayland \ libinput.so:x11/libinput diff --git a/x11-servers/xwayland/files/patch-Xext_shm.c b/x11-servers/xwayland/files/patch-Xext_shm.c new file mode 100644 index 000000000000..04106a049ab7 --- /dev/null +++ b/x11-servers/xwayland/files/patch-Xext_shm.c @@ -0,0 +1,14 @@ +--- Xext/shm.c.orig 2016-07-19 17:14:21 UTC ++++ Xext/shm.c +@@ -1210,7 +1210,11 @@ shm_tmpfile(void) + } + ErrorF ("Not using O_TMPFILE\n"); + #endif ++#ifdef HAVE_MKOSTEMP ++ fd = mkostemp(template, O_CLOEXEC); ++#else + fd = mkstemp(template); ++#endif + if (fd < 0) + return -1; + unlink(template); diff --git a/x11-servers/xwayland/files/patch-configure b/x11-servers/xwayland/files/patch-configure new file mode 100644 index 000000000000..f59122539cd9 --- /dev/null +++ b/x11-servers/xwayland/files/patch-configure @@ -0,0 +1,10 @@ +--- configure.orig 2017-01-11 21:16:40 UTC ++++ configure +@@ -22758,6 +22758,7 @@ fi + for ac_func in backtrace ffs geteuid getuid issetugid getresuid \ + getdtablesize getifaddrs getpeereid getpeerucred getprogname getzoneid \ + mmap posix_fallocate seteuid shmctl64 strncasecmp vasprintf vsnprintf \ ++ mkostemp \ + walkcontext setitimer poll epoll_create1 + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` diff --git a/x11-servers/xwayland/files/patch-include_dix-config.h.in b/x11-servers/xwayland/files/patch-include_dix-config.h.in new file mode 100644 index 000000000000..270890f9bcbc --- /dev/null +++ b/x11-servers/xwayland/files/patch-include_dix-config.h.in @@ -0,0 +1,12 @@ +--- include/dix-config.h.in.orig 2016-07-19 17:07:29 UTC ++++ include/dix-config.h.in +@@ -140,6 +140,9 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_LINUX_FB_H + ++/* Define to 1 if you have the `mkostemp' function. */ ++#undef HAVE_MKOSTEMP ++ + /* Define to 1 if you have the `mmap' function. */ + #undef HAVE_MMAP + diff --git a/x11-themes/beastie/Makefile b/x11-themes/beastie/Makefile index 0735a91e1470..14db3178cec0 100644 --- a/x11-themes/beastie/Makefile +++ b/x11-themes/beastie/Makefile @@ -13,22 +13,23 @@ DISTNAME= Beastie-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Gnome theme with FreeBSD Colors -RUN_DEPENDS+= gtk-engines2>=2.7.4_1:x11-themes/gtk-engines2 \ +LICENSE= NONE + +RUN_DEPENDS= gtk-engines2>=2.7.4_1:x11-themes/gtk-engines2 \ gnome-themes>=2.11.91:x11-themes/gnome-themes WRKSRC= ${WRKDIR}/Beastie NO_BUILD= yes +NO_ARCH= yes THEME_FILES= README index.theme gtk-2.0/gtkrc THEME_DIR= share/themes/Beastie/ PLIST_FILES= ${THEME_FILES:S|^|${THEME_DIR}|} -.include - do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/${THEME_DIR}/gtk-2.0 + @${MKDIR} ${STAGEDIR}${PREFIX}/${THEME_DIR}/gtk-2.0 .for f in ${THEME_FILES} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/${THEME_DIR}/${f} .endfor -.include +.include diff --git a/x11-themes/beastie/pkg-descr b/x11-themes/beastie/pkg-descr index d2c1f82ed36d..2dcad118cd1a 100644 --- a/x11-themes/beastie/pkg-descr +++ b/x11-themes/beastie/pkg-descr @@ -1,3 +1,3 @@ GNOME theme with FreeBSD colors -WWW: http://people.freebsd.org/~ahze/Beastie/ +WWW: https://people.freebsd.org/~ahze/Beastie/ diff --git a/x11/p5-X11-Xlib/Makefile b/x11/p5-X11-Xlib/Makefile index 4351ebbc9265..c6967576637f 100644 --- a/x11/p5-X11-Xlib/Makefile +++ b/x11/p5-X11-Xlib/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= X11-Xlib -PORTVERSION= 0.14 -PORTREVISION= 1 +PORTVERSION= 0.15 CATEGORIES= x11 perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -18,7 +17,7 @@ BUILD_DEPENDS= p5-Devel-CheckLib>=0:devel/p5-Devel-CheckLib \ RUN_DEPENDS:= ${BUILD_DEPENDS} USES= perl5 -USE_XORG= x11 xcomposite xext xfixes xproto xinerama xtst +USE_XORG= x11 xcomposite xext xfixes xinerama xproto xrender xtst pre-configure: cd ${WRKSRC} && ${PERL} Makefile.PL diff --git a/x11/p5-X11-Xlib/distinfo b/x11/p5-X11-Xlib/distinfo index d64460f2b08a..1f6705f729f1 100644 --- a/x11/p5-X11-Xlib/distinfo +++ b/x11/p5-X11-Xlib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1492787969 -SHA256 (X11-Xlib-0.14.tar.gz) = 62b663b9135f3a718cc2b39d4208c67b12df485857924d098fa1e8c746980b4d -SIZE (X11-Xlib-0.14.tar.gz) = 117401 +TIMESTAMP = 1499175631 +SHA256 (X11-Xlib-0.15.tar.gz) = 5fdcfcd15793195ada930feb1a02d9720a5522fee0b00c0036b4dceb2501cf8d +SIZE (X11-Xlib-0.15.tar.gz) = 130340 diff --git a/x11/p5-X11-Xlib/pkg-plist b/x11/p5-X11-Xlib/pkg-plist index e09524823aa7..bbff4ba5b336 100644 --- a/x11/p5-X11-Xlib/pkg-plist +++ b/x11/p5-X11-Xlib/pkg-plist @@ -2,6 +2,7 @@ %%PERL5_MAN3%%/X11::Xlib::Colormap.3.gz %%PERL5_MAN3%%/X11::Xlib::Display.3.gz %%PERL5_MAN3%%/X11::Xlib::Keymap.3.gz +%%PERL5_MAN3%%/X11::Xlib::Opaque.3.gz %%PERL5_MAN3%%/X11::Xlib::Pixmap.3.gz %%PERL5_MAN3%%/X11::Xlib::Screen.3.gz %%PERL5_MAN3%%/X11::Xlib::Struct.3.gz @@ -10,11 +11,13 @@ %%PERL5_MAN3%%/X11::Xlib::XEvent.3.gz %%PERL5_MAN3%%/X11::Xlib::XID.3.gz %%PERL5_MAN3%%/X11::Xlib::XRectangle.3.gz +%%PERL5_MAN3%%/X11::Xlib::XRenderPictFormat.3.gz %%PERL5_MAN3%%/X11::Xlib::XSetWindowAttributes.3.gz %%PERL5_MAN3%%/X11::Xlib::XSizeHints.3.gz %%PERL5_MAN3%%/X11::Xlib::XVisualInfo.3.gz %%PERL5_MAN3%%/X11::Xlib::XWindowAttributes.3.gz %%PERL5_MAN3%%/X11::Xlib::XWindowChanges.3.gz +%%PERL5_MAN3%%/X11::Xlib::XserverRegion.3.gz %%SITE_ARCH%%/X11/Xlib.pm %%SITE_ARCH%%/X11/Xlib/Colormap.pm %%SITE_ARCH%%/X11/Xlib/Display.pm @@ -22,6 +25,7 @@ %%SITE_ARCH%%/X11/Xlib/Install/PerlXlib.h %%SITE_ARCH%%/X11/Xlib/Install/typemap %%SITE_ARCH%%/X11/Xlib/Keymap.pm +%%SITE_ARCH%%/X11/Xlib/Opaque.pm %%SITE_ARCH%%/X11/Xlib/Pixmap.pm %%SITE_ARCH%%/X11/Xlib/Screen.pm %%SITE_ARCH%%/X11/Xlib/Struct.pm @@ -30,9 +34,11 @@ %%SITE_ARCH%%/X11/Xlib/XEvent.pm %%SITE_ARCH%%/X11/Xlib/XID.pm %%SITE_ARCH%%/X11/Xlib/XRectangle.pm +%%SITE_ARCH%%/X11/Xlib/XRenderPictFormat.pm %%SITE_ARCH%%/X11/Xlib/XSetWindowAttributes.pm %%SITE_ARCH%%/X11/Xlib/XSizeHints.pm %%SITE_ARCH%%/X11/Xlib/XVisualInfo.pm %%SITE_ARCH%%/X11/Xlib/XWindowAttributes.pm %%SITE_ARCH%%/X11/Xlib/XWindowChanges.pm +%%SITE_ARCH%%/X11/Xlib/XserverRegion.pm %%SITE_ARCH%%/auto/X11/Xlib/Xlib.so