From owner-svn-ports-branches@freebsd.org Sun Aug 26 00:26:23 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CD28F109AA68; Sun, 26 Aug 2018 00:26:23 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 82F858822E; Sun, 26 Aug 2018 00:26:23 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5FBF227396; Sun, 26 Aug 2018 00:26:23 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7Q0QNL4052534; Sun, 26 Aug 2018 00:26:23 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7Q0QNGI052533; Sun, 26 Aug 2018 00:26:23 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201808260026.w7Q0QNGI052533@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Sun, 26 Aug 2018 00:26:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r478091 - branches/2018Q3/devel/git X-SVN-Group: ports-branches X-SVN-Commit-Author: koobs X-SVN-Commit-Paths: branches/2018Q3/devel/git X-SVN-Commit-Revision: 478091 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Aug 2018 00:26:24 -0000 Author: koobs Date: Sun Aug 26 00:26:22 2018 New Revision: 478091 URL: https://svnweb.freebsd.org/changeset/ports/478091 Log: MFH: r477627 devel/git: Add missing (send-email) dependency The send-email command uses (require's) IO:Socket:SSL directly, and the devel/git port previously depended on mail/p5-Net-SMTP-SSL, which depended on and brought in the security/p5-IO-Socket-SSL port to satisfy it. ports r431794 [1] removed the dependency on p5-Net-SMTP-SSL due to deprecation which prevented the (direct) dependency from being installed (via another dependency), resulting in breaking function for encrypted/secured mail destinations. This change adds a direct dependency on IO::Socket::SSL as it ought to have been originally. [1] https://svnweb.freebsd.org/changeset/ports/431794 Reported by: ns5 (via IRC) Approved by: portmgr (blanket: broken dependencies) Approved by: ports-secteam (riggs) Modified: branches/2018Q3/devel/git/Makefile Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/devel/git/Makefile ============================================================================== --- branches/2018Q3/devel/git/Makefile Sun Aug 26 00:24:24 2018 (r478090) +++ branches/2018Q3/devel/git/Makefile Sun Aug 26 00:26:22 2018 (r478091) @@ -3,7 +3,7 @@ PORTNAME= git DISTVERSION= 2.18.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= KERNEL_ORG/software/scm/git DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -87,7 +87,8 @@ PCRE2_LIB_DEPENDS= libpcre2-8.so:devel/pcre2 PCRE2_CONFIGURE_WITH= libpcre SEND_EMAIL_IMPLIES= PERL -SEND_EMAIL_RUN_DEPENDS= p5-Authen-SASL>=0:security/p5-Authen-SASL +SEND_EMAIL_RUN_DEPENDS= p5-Authen-SASL>=0:security/p5-Authen-SASL \ + p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL ICONV_USES= iconv ICONV_MAKE_ARGS_OFF= NO_ICONV=1 From owner-svn-ports-branches@freebsd.org Sun Aug 26 15:51:19 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D961F1079E29; Sun, 26 Aug 2018 15:51:18 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8E54184CBB; Sun, 26 Aug 2018 15:51:18 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 70A1510F6A; Sun, 26 Aug 2018 15:51:18 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7QFpIMH025287; Sun, 26 Aug 2018 15:51:18 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7QFpGUC025276; Sun, 26 Aug 2018 15:51:16 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201808261551.w7QFpGUC025276@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 26 Aug 2018 15:51:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r478130 - in branches/2018Q3/graphics/openorienteering-mapper: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: in branches/2018Q3/graphics/openorienteering-mapper: . files X-SVN-Commit-Revision: 478130 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Aug 2018 15:51:19 -0000 Author: riggs Date: Sun Aug 26 15:51:15 2018 New Revision: 478130 URL: https://svnweb.freebsd.org/changeset/ports/478130 Log: MFH: r478129 Update to upstream version 0.8.2 PR: 230853 Submitted by: sikmir@gmail.com (maintainer) Approved by: ports-secteam (riggs) Modified: branches/2018Q3/graphics/openorienteering-mapper/Makefile branches/2018Q3/graphics/openorienteering-mapper/distinfo branches/2018Q3/graphics/openorienteering-mapper/files/patch-CMakeLists.txt branches/2018Q3/graphics/openorienteering-mapper/files/patch-doc_licensing_freebsd-licensing.cmake branches/2018Q3/graphics/openorienteering-mapper/files/patch-packaging_CMakeLists.txt branches/2018Q3/graphics/openorienteering-mapper/files/patch-packaging_custom__install.cmake.in branches/2018Q3/graphics/openorienteering-mapper/files/patch-src_CMakeLists.txt branches/2018Q3/graphics/openorienteering-mapper/files/patch-src_gdal_CMakeLists.txt branches/2018Q3/graphics/openorienteering-mapper/files/patch-src_mapper__config.h.in branches/2018Q3/graphics/openorienteering-mapper/files/patch-translations_CMakeLists.txt branches/2018Q3/graphics/openorienteering-mapper/files/patch-translations_translate__text__files.sh branches/2018Q3/graphics/openorienteering-mapper/pkg-plist Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/graphics/openorienteering-mapper/Makefile ============================================================================== --- branches/2018Q3/graphics/openorienteering-mapper/Makefile Sun Aug 26 15:04:34 2018 (r478129) +++ branches/2018Q3/graphics/openorienteering-mapper/Makefile Sun Aug 26 15:51:15 2018 (r478130) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= openorienteering-mapper -PORTVERSION= 0.8.1 +PORTVERSION= 0.8.2 DISTVERSIONPREFIX= v CATEGORIES= graphics geography Modified: branches/2018Q3/graphics/openorienteering-mapper/distinfo ============================================================================== --- branches/2018Q3/graphics/openorienteering-mapper/distinfo Sun Aug 26 15:04:34 2018 (r478129) +++ branches/2018Q3/graphics/openorienteering-mapper/distinfo Sun Aug 26 15:51:15 2018 (r478130) @@ -1,3 +1,3 @@ -TIMESTAMP = 1523720387 -SHA256 (OpenOrienteering-mapper-v0.8.1_GH0.tar.gz) = 14debf0c31a3ca5b608154e264007a7582ea87d3466bd7d30527157396ae16d7 -SIZE (OpenOrienteering-mapper-v0.8.1_GH0.tar.gz) = 8449610 +TIMESTAMP = 1535041627 +SHA256 (OpenOrienteering-mapper-v0.8.2_GH0.tar.gz) = 11e6f2e93442f217f7373bd737a58a75e8e6da81d4365e12691a8dfdf1f01066 +SIZE (OpenOrienteering-mapper-v0.8.2_GH0.tar.gz) = 8586246 Modified: branches/2018Q3/graphics/openorienteering-mapper/files/patch-CMakeLists.txt ============================================================================== --- branches/2018Q3/graphics/openorienteering-mapper/files/patch-CMakeLists.txt Sun Aug 26 15:04:34 2018 (r478129) +++ branches/2018Q3/graphics/openorienteering-mapper/files/patch-CMakeLists.txt Sun Aug 26 15:51:15 2018 (r478130) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2018-03-11 14:00:07 UTC +--- CMakeLists.txt.orig 2018-08-11 08:14:55 UTC +++ CMakeLists.txt -@@ -69,6 +69,11 @@ option(Mapper_DEBUG_TRANSLATIONS "Debug +@@ -73,6 +73,11 @@ option(Mapper_DEBUG_TRANSLATIONS "Debug # Used for some Linux distributions which do not provide the polyclipping lib. option(Mapper_BUILD_CLIPPER "Build the Clipper package from source" OFF) @@ -12,7 +12,7 @@ option(Mapper_USE_GDAL "Use the GDAL library" ON) if(CMAKE_BUILD_TYPE MATCHES Release|MinSizeRel|RelWithDebInfo) -@@ -227,10 +232,20 @@ endif() +@@ -231,10 +236,20 @@ endif() # Subdirectories @@ -36,7 +36,7 @@ add_subdirectory("3rd-party/qbezier") if(NOT ANDROID) add_subdirectory("3rd-party/qtsingleapplication") -@@ -250,7 +265,7 @@ if(CMAKE_CROSSCOMPILING) +@@ -254,7 +269,7 @@ if(CMAKE_CROSSCOMPILING) add_custom_target(TEST_WARNING ALL COMMENT "Crosscompiling, skipping all tests") add_dependencies(TEST_WARNING Mapper) Modified: branches/2018Q3/graphics/openorienteering-mapper/files/patch-doc_licensing_freebsd-licensing.cmake ============================================================================== --- branches/2018Q3/graphics/openorienteering-mapper/files/patch-doc_licensing_freebsd-licensing.cmake Sun Aug 26 15:04:34 2018 (r478129) +++ branches/2018Q3/graphics/openorienteering-mapper/files/patch-doc_licensing_freebsd-licensing.cmake Sun Aug 26 15:51:15 2018 (r478130) @@ -1,4 +1,4 @@ ---- doc/licensing/freebsd-licensing.cmake.orig 2018-04-14 16:13:40 UTC +--- doc/licensing/freebsd-licensing.cmake.orig 2018-08-23 17:44:26 UTC +++ doc/licensing/freebsd-licensing.cmake @@ -0,0 +1,6 @@ +include("linux-distribution.cmake") Modified: branches/2018Q3/graphics/openorienteering-mapper/files/patch-packaging_CMakeLists.txt ============================================================================== --- branches/2018Q3/graphics/openorienteering-mapper/files/patch-packaging_CMakeLists.txt Sun Aug 26 15:04:34 2018 (r478129) +++ branches/2018Q3/graphics/openorienteering-mapper/files/patch-packaging_CMakeLists.txt Sun Aug 26 15:51:15 2018 (r478130) @@ -1,4 +1,4 @@ ---- packaging/CMakeLists.txt.orig 2018-03-11 14:00:07 UTC +--- packaging/CMakeLists.txt.orig 2018-08-11 08:14:55 UTC +++ packaging/CMakeLists.txt @@ -437,7 +437,7 @@ endforeach(_qt_plugin) if(UNIX AND NOT APPLE AND NOT ANDROID) Modified: branches/2018Q3/graphics/openorienteering-mapper/files/patch-packaging_custom__install.cmake.in ============================================================================== --- branches/2018Q3/graphics/openorienteering-mapper/files/patch-packaging_custom__install.cmake.in Sun Aug 26 15:04:34 2018 (r478129) +++ branches/2018Q3/graphics/openorienteering-mapper/files/patch-packaging_custom__install.cmake.in Sun Aug 26 15:51:15 2018 (r478130) @@ -1,4 +1,4 @@ ---- packaging/custom_install.cmake.in.orig 2018-03-11 14:00:07 UTC +--- packaging/custom_install.cmake.in.orig 2018-08-11 08:14:55 UTC +++ packaging/custom_install.cmake.in @@ -215,4 +215,4 @@ endif() set(runtime "") Modified: branches/2018Q3/graphics/openorienteering-mapper/files/patch-src_CMakeLists.txt ============================================================================== --- branches/2018Q3/graphics/openorienteering-mapper/files/patch-src_CMakeLists.txt Sun Aug 26 15:04:34 2018 (r478129) +++ branches/2018Q3/graphics/openorienteering-mapper/files/patch-src_CMakeLists.txt Sun Aug 26 15:51:15 2018 (r478130) @@ -1,4 +1,4 @@ ---- src/CMakeLists.txt.orig 2018-03-11 14:00:07 UTC +--- src/CMakeLists.txt.orig 2018-08-11 08:14:55 UTC +++ src/CMakeLists.txt @@ -286,8 +286,9 @@ target_compile_definitions(Mapper_Common # MAPPER_ENABLE_COMPATIBILITY Modified: branches/2018Q3/graphics/openorienteering-mapper/files/patch-src_gdal_CMakeLists.txt ============================================================================== --- branches/2018Q3/graphics/openorienteering-mapper/files/patch-src_gdal_CMakeLists.txt Sun Aug 26 15:04:34 2018 (r478129) +++ branches/2018Q3/graphics/openorienteering-mapper/files/patch-src_gdal_CMakeLists.txt Sun Aug 26 15:51:15 2018 (r478130) @@ -1,4 +1,4 @@ ---- src/gdal/CMakeLists.txt.orig 2018-03-11 14:00:07 UTC +--- src/gdal/CMakeLists.txt.orig 2018-08-11 08:14:55 UTC +++ src/gdal/CMakeLists.txt @@ -34,8 +34,10 @@ set(MAPPER_GDAL_SOURCES ogr_template.cpp Modified: branches/2018Q3/graphics/openorienteering-mapper/files/patch-src_mapper__config.h.in ============================================================================== --- branches/2018Q3/graphics/openorienteering-mapper/files/patch-src_mapper__config.h.in Sun Aug 26 15:04:34 2018 (r478129) +++ branches/2018Q3/graphics/openorienteering-mapper/files/patch-src_mapper__config.h.in Sun Aug 26 15:51:15 2018 (r478130) @@ -1,4 +1,4 @@ ---- src/mapper_config.h.in.orig 2018-03-11 14:00:07 UTC +--- src/mapper_config.h.in.orig 2018-08-11 08:14:55 UTC +++ src/mapper_config.h.in @@ -30,6 +30,7 @@ Modified: branches/2018Q3/graphics/openorienteering-mapper/files/patch-translations_CMakeLists.txt ============================================================================== --- branches/2018Q3/graphics/openorienteering-mapper/files/patch-translations_CMakeLists.txt Sun Aug 26 15:04:34 2018 (r478129) +++ branches/2018Q3/graphics/openorienteering-mapper/files/patch-translations_CMakeLists.txt Sun Aug 26 15:51:15 2018 (r478130) @@ -1,6 +1,6 @@ ---- translations/CMakeLists.txt.orig 2018-03-11 14:00:07 UTC +--- translations/CMakeLists.txt.orig 2018-08-11 08:14:55 UTC +++ translations/CMakeLists.txt -@@ -220,24 +220,24 @@ else() +@@ -223,24 +223,24 @@ else() set(pre_lupdate ) set(post_lupdate Modified: branches/2018Q3/graphics/openorienteering-mapper/files/patch-translations_translate__text__files.sh ============================================================================== --- branches/2018Q3/graphics/openorienteering-mapper/files/patch-translations_translate__text__files.sh Sun Aug 26 15:04:34 2018 (r478129) +++ branches/2018Q3/graphics/openorienteering-mapper/files/patch-translations_translate__text__files.sh Sun Aug 26 15:51:15 2018 (r478130) @@ -1,4 +1,4 @@ ---- translations/translate_text_files.sh.orig 2018-03-11 14:00:07 UTC +--- translations/translate_text_files.sh.orig 2018-08-11 08:14:55 UTC +++ translations/translate_text_files.sh @@ -21,8 +21,8 @@ set -e Modified: branches/2018Q3/graphics/openorienteering-mapper/pkg-plist ============================================================================== --- branches/2018Q3/graphics/openorienteering-mapper/pkg-plist Sun Aug 26 15:04:34 2018 (r478129) +++ branches/2018Q3/graphics/openorienteering-mapper/pkg-plist Sun Aug 26 15:51:15 2018 (r478130) @@ -2,8 +2,8 @@ bin/Mapper man/man1/Mapper.1.gz share/applications/Mapper.desktop %%DOCSDIR%%/3rd-party/qtsingleapplication.txt -%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.8.1 Manual.qch -%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.8.1 Manual.qhc +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.8.2 Manual.qch +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.8.2 Manual.qhc %%DOCSDIR%%/common-licenses/GPL-3.txt %%DOCSDIR%%/licensing.html share/icons/hicolor/128x128/apps/Mapper.png @@ -87,8 +87,6 @@ share/mime/packages/openorienteering-mapper.xml %%NLS%%%%DATADIR%%/translations/map_symbols_fi.qm %%NLS%%%%DATADIR%%/translations/map_symbols_fr.qm %%NLS%%%%DATADIR%%/translations/map_symbols_hu.qm -%%NLS%%%%DATADIR%%/translations/map_symbols_it.qm -%%NLS%%%%DATADIR%%/translations/map_symbols_nl.qm %%NLS%%%%DATADIR%%/translations/map_symbols_ru.qm %%NLS%%%%DATADIR%%/translations/map_symbols_sv.qm %%NLS%%%%DATADIR%%/translations/map_symbols_uk.qm From owner-svn-ports-branches@freebsd.org Mon Aug 27 11:00:14 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 57B0810848A0; Mon, 27 Aug 2018 11:00:14 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id ECB8989EB6; Mon, 27 Aug 2018 11:00:13 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C71FB1CADA; Mon, 27 Aug 2018 11:00:13 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7RB0DnY014913; Mon, 27 Aug 2018 11:00:13 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7RB0BYk014898; Mon, 27 Aug 2018 11:00:11 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201808271100.w7RB0BYk014898@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 27 Aug 2018 11:00:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r478189 - in branches/2018Q3/devel: android-tools-adb android-tools-adb/files android-tools-fastboot android-tools-fastboot/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q3/devel: android-tools-adb android-tools-adb/files android-tools-fastboot android-tools-fastboot/files X-SVN-Commit-Revision: 478189 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Aug 2018 11:00:14 -0000 Author: jbeich Date: Mon Aug 27 11:00:10 2018 New Revision: 478189 URL: https://svnweb.freebsd.org/changeset/ports/478189 Log: MFH: r477244 r477245 r477246 r477248 r477247 devel/android-tools-{adb,fastboot}: update to 9.0.0.r3 Changes: https://android.googlesource.com/platform/system/core/+log/android-8.1.0_r2..android-9.0.0_r3/adb Changes: https://android.googlesource.com/platform/system/core/+log/android-8.1.0_r2..android-9.0.0_r3/fastboot Approved by: ports-secteam (riggs) Added: branches/2018Q3/devel/android-tools-adb/files/patch-libcutils_threads.cpp - copied unchanged from r477244, head/devel/android-tools-adb/files/patch-libcutils_threads.cpp branches/2018Q3/devel/android-tools-fastboot/files/patch-libziparchive_zip__archive.cc - copied unchanged from r477244, head/devel/android-tools-fastboot/files/patch-libziparchive_zip__archive.cc Deleted: branches/2018Q3/devel/android-tools-adb/files/extra-patch-base_include_android-base_logging.h branches/2018Q3/devel/android-tools-adb/files/patch-libcutils_threads.c branches/2018Q3/devel/android-tools-fastboot/files/extra-patch-base_file.cpp branches/2018Q3/devel/android-tools-fastboot/files/patch-ext4__utils_ext4__utils.c branches/2018Q3/devel/android-tools-fastboot/files/patch-libselinux_src_init.c Modified: branches/2018Q3/devel/android-tools-adb/Makefile branches/2018Q3/devel/android-tools-adb/distinfo branches/2018Q3/devel/android-tools-adb/files/Makefile branches/2018Q3/devel/android-tools-adb/files/patch-adb_client_usb__libusb.cpp branches/2018Q3/devel/android-tools-adb/files/patch-adb_transport__usb.cpp branches/2018Q3/devel/android-tools-adb/files/patch-adb_usb.h branches/2018Q3/devel/android-tools-adb/files/patch-base_logging.cpp branches/2018Q3/devel/android-tools-fastboot/Makefile branches/2018Q3/devel/android-tools-fastboot/distinfo branches/2018Q3/devel/android-tools-fastboot/files/Makefile branches/2018Q3/devel/android-tools-fastboot/files/patch-base_logging.cpp Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/devel/android-tools-adb/Makefile ============================================================================== --- branches/2018Q3/devel/android-tools-adb/Makefile Mon Aug 27 10:16:03 2018 (r478188) +++ branches/2018Q3/devel/android-tools-adb/Makefile Mon Aug 27 11:00:10 2018 (r478189) @@ -2,8 +2,8 @@ PORTNAME= android-tools-adb DISTVERSIONPREFIX= android- -DISTVERSION?= 8.1.0_r2 -PORTREVISION?= 1 +DISTVERSION?= 9.0.0_r3 +PORTREVISION?= 0 CATEGORIES= devel comms MAINTAINER= jbeich@FreeBSD.org @@ -32,8 +32,8 @@ PLIST_FILES= bin/adb PORTDOCS= * # Generated by "make update-revision" for "adb --version" -SDK_REVISION?= 27.0.0 -GH_REVISION= ${DISTVERSIONSUFFIX:U86c2b588a369:S/-g//} +SDK_REVISION?= 28.0.0 +GH_REVISION= ${DISTVERSIONSUFFIX:U0fac9018f238:S/-g//} OPTIONS_DEFINE+=MDNSRESPONDER BASH DOCS TEST TEST_PYTHON OPTIONS_DEFAULT=MDNSRESPONDER Modified: branches/2018Q3/devel/android-tools-adb/distinfo ============================================================================== --- branches/2018Q3/devel/android-tools-adb/distinfo Mon Aug 27 10:16:03 2018 (r478188) +++ branches/2018Q3/devel/android-tools-adb/distinfo Mon Aug 27 11:00:10 2018 (r478189) @@ -1,7 +1,7 @@ -TIMESTAMP = 1509048179 -SHA256 (aosp-mirror-platform_system_core-android-8.1.0_r2_GH0.tar.gz) = 29c58327e06c9c938f8f3c0d3e991339eb98c53026203fbafc564e85cb6538bc -SIZE (aosp-mirror-platform_system_core-android-8.1.0_r2_GH0.tar.gz) = 5227210 +TIMESTAMP = 1529542722 +SHA256 (aosp-mirror-platform_system_core-android-9.0.0_r3_GH0.tar.gz) = b9de23465b304432aa2b585aa66c6bf4841b177f2139b75ca5adc5d917e0ecd6 +SIZE (aosp-mirror-platform_system_core-android-9.0.0_r3_GH0.tar.gz) = 27484684 SHA256 (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = ca3311ba47a5edd56c929ac9aae57c02c2c3f1636519c5f67abb00b6e3ecd75c SIZE (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = 5967 -SHA256 (aosp-mirror-platform_development-android-8.1.0_r2_GH0.tar.gz) = bc9cdaf522147ce6a4d11e695394ce6044940172f8a19150e613adc4ae77279c -SIZE (aosp-mirror-platform_development-android-8.1.0_r2_GH0.tar.gz) = 93884716 +SHA256 (aosp-mirror-platform_development-android-9.0.0_r3_GH0.tar.gz) = f35f681e6fad873f3e94b5c2362939741f15f276022717e352bd21a74653704b +SIZE (aosp-mirror-platform_development-android-9.0.0_r3_GH0.tar.gz) = 59064522 Modified: branches/2018Q3/devel/android-tools-adb/files/Makefile ============================================================================== --- branches/2018Q3/devel/android-tools-adb/files/Makefile Mon Aug 27 10:16:03 2018 (r478188) +++ branches/2018Q3/devel/android-tools-adb/files/Makefile Mon Aug 27 11:00:10 2018 (r478189) @@ -77,13 +77,13 @@ SRCS+= android_pubkey.c TEST_SRCS+= android_pubkey_test.cpp .PATH: ${.CURDIR}/../libcutils -SRCS+= socket_inaddr_any_server_unix.c -SRCS+= socket_local_client_unix.c -SRCS+= socket_local_server_unix.c -SRCS+= socket_network_client_unix.c +SRCS+= socket_inaddr_any_server_unix.cpp +SRCS+= socket_local_client_unix.cpp +SRCS+= socket_local_server_unix.cpp +SRCS+= socket_network_client_unix.cpp SRCS+= ../libcutils/sockets.cpp -SRCS+= load_file.c -SRCS+= threads.c +SRCS+= load_file.cpp +SRCS+= threads.cpp # XXX Obsolete after 10.2 or r279980/r280329 CPPFLAGS.sockets.cpp+= -o ${.TARGET} @@ -102,11 +102,7 @@ SRCS+= stderr_write.c CPPFLAGS+= -DADB_VERSION="\"${VERSION}\"" CPPFLAGS+= -DADB_HOST=1 -CPPFLAGS+= -DHAVE_FORKEXEC=1 -CPPFLAGS+= -DHAVE_SYMLINKS -CPPFLAGS+= -DHAVE_TERMIO_H -CPPFLAGS+= -DHAVE_SYS_SOCKET_H -CPPFLAGS+= -D_FILE_OFFSET_BITS=64 +CPPFLAGS+= -Doff64_t=off_t CPPFLAGS+= -DFAKE_LOG_DEVICE=1 CPPFLAGS+= -I${.CURDIR} CPPFLAGS+= -I${.CURDIR}/../include Modified: branches/2018Q3/devel/android-tools-adb/files/patch-adb_client_usb__libusb.cpp ============================================================================== --- branches/2018Q3/devel/android-tools-adb/files/patch-adb_client_usb__libusb.cpp Mon Aug 27 10:16:03 2018 (r478188) +++ branches/2018Q3/devel/android-tools-adb/files/patch-adb_client_usb__libusb.cpp Mon Aug 27 11:00:10 2018 (r478189) @@ -1,13 +1,6 @@ --- adb/client/usb_libusb.cpp.orig 2017-06-20 10:50:27 UTC +++ adb/client/usb_libusb.cpp -@@ -22,13 +22,14 @@ - - #include - #include -+#include - #include - #include - #include +@@ -30,7 +30,7 @@ #include #include @@ -16,11 +9,19 @@ #include #include +@@ -39,6 +39,7 @@ + + #include "adb.h" + #include "adb_utils.h" ++#include "sysdeps/chrono.h" + #include "transport.h" + #include "usb.h" + @@ -89,7 +89,11 @@ struct transfer_info { }; namespace libusb { -+#if defined(__linux__) || defined(__APPLE__) ++#if defined(__linux__) || defined(__APPLE__) || defined(_WIN32) struct usb_handle : public ::usb_handle { +#else +struct usb_handle { Modified: branches/2018Q3/devel/android-tools-adb/files/patch-adb_transport__usb.cpp ============================================================================== --- branches/2018Q3/devel/android-tools-adb/files/patch-adb_transport__usb.cpp Mon Aug 27 10:16:03 2018 (r478188) +++ branches/2018Q3/devel/android-tools-adb/files/patch-adb_transport__usb.cpp Mon Aug 27 11:00:10 2018 (r478189) @@ -1,11 +1,11 @@ ---- adb/transport_usb.cpp.orig 2017-06-20 10:50:27 UTC +--- adb/transport_usb.cpp.orig 2018-06-21 00:58:42 UTC +++ adb/transport_usb.cpp -@@ -191,6 +191,8 @@ int is_adb_interface(int usb_class, int usb_subclass, +@@ -186,6 +186,8 @@ int is_adb_interface(int usb_class, int usb_subclass, bool should_use_libusb() { - #if defined(_WIN32) || !ADB_HOST + #if !ADB_HOST return false; -+#elif !defined(__linux__) && !defined(__APPLE__) ++#elif !defined(__linux__) && !defined(__APPLE__) && !defined(_WIN32) + return true; #else - static bool disable = getenv("ADB_LIBUSB") && strcmp(getenv("ADB_LIBUSB"), "0") == 0; - return !disable; + static bool enable = getenv("ADB_LIBUSB") && strcmp(getenv("ADB_LIBUSB"), "1") == 0; + return enable; Modified: branches/2018Q3/devel/android-tools-adb/files/patch-adb_usb.h ============================================================================== --- branches/2018Q3/devel/android-tools-adb/files/patch-adb_usb.h Mon Aug 27 10:16:03 2018 (r478188) +++ branches/2018Q3/devel/android-tools-adb/files/patch-adb_usb.h Mon Aug 27 11:00:10 2018 (r478189) @@ -4,7 +4,7 @@ ADB_USB_INTERFACE(libusb::usb_handle*); } -+#if defined(__linux__) || defined(__APPLE__) ++#if defined(__linux__) || defined(__APPLE__) || defined(_WIN32) namespace native { struct usb_handle; ADB_USB_INTERFACE(native::usb_handle*); Modified: branches/2018Q3/devel/android-tools-adb/files/patch-base_logging.cpp ============================================================================== --- branches/2018Q3/devel/android-tools-adb/files/patch-base_logging.cpp Mon Aug 27 10:16:03 2018 (r478188) +++ branches/2018Q3/devel/android-tools-adb/files/patch-base_logging.cpp Mon Aug 27 11:00:10 2018 (r478189) @@ -28,7 +28,7 @@ +#include +#elif defined(__NetBSD__) +#include -+#else ++#else // OpenBSD, Solaris +#include #endif @@ -39,11 +39,11 @@ return GetCurrentThreadId(); +#elif defined(__DragonFly__) + return lwp_gettid(); -+#elif defined(__NetBSD__) -+ return _lwp_self(); +#elif defined(__FreeBSD__) + return pthread_getthreadid_np(); -+#else ++#elif defined(__NetBSD__) ++ return _lwp_self(); ++#else // OpenBSD, Solaris + return (intptr_t) pthread_self(); #endif } Copied: branches/2018Q3/devel/android-tools-adb/files/patch-libcutils_threads.cpp (from r477244, head/devel/android-tools-adb/files/patch-libcutils_threads.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q3/devel/android-tools-adb/files/patch-libcutils_threads.cpp Mon Aug 27 11:00:10 2018 (r478189, copy of r477244, head/devel/android-tools-adb/files/patch-libcutils_threads.cpp) @@ -0,0 +1,41 @@ +--- libcutils/threads.cpp.orig 2018-07-13 19:58:45 UTC ++++ libcutils/threads.cpp +@@ -24,11 +24,19 @@ + #include + #include + #include ++#elif defined(__DragonFly__) ++#include ++#elif defined(__FreeBSD__) ++#include ++#elif defined(__NetBSD__) ++#include + #elif defined(__linux__) && !defined(__ANDROID__) + #include + #include + #elif defined(_WIN32) + #include ++#else // OpenBSD, Solaris ++#include + #endif + + // No definition needed for Android because we'll just pick up bionic's copy. +@@ -38,10 +46,18 @@ pid_t gettid() { + uint64_t tid; + pthread_threadid_np(NULL, &tid); + return tid; ++#elif defined(__DragonFly__) ++ return lwp_gettid(); ++#elif defined(__FreeBSD__) ++ return pthread_getthreadid_np(); ++#elif defined(__NetBSD__) ++ return _lwp_self(); + #elif defined(__linux__) + return syscall(__NR_gettid); + #elif defined(_WIN32) + return GetCurrentThreadId(); ++#else // OpenBSD, Solaris ++ return (intptr_t) pthread_self(); + #endif + } + #endif // __ANDROID__ Modified: branches/2018Q3/devel/android-tools-fastboot/Makefile ============================================================================== --- branches/2018Q3/devel/android-tools-fastboot/Makefile Mon Aug 27 10:16:03 2018 (r478188) +++ branches/2018Q3/devel/android-tools-fastboot/Makefile Mon Aug 27 11:00:10 2018 (r478189) @@ -2,8 +2,8 @@ PORTNAME= android-tools-fastboot DISTVERSIONPREFIX= android- -DISTVERSION?= 8.1.0_r2 -PORTREVISION?= 1 +DISTVERSION?= 9.0.0_r3 +PORTREVISION?= 0 CATEGORIES= devel sysutils MASTER_SITES= https://salsa.debian.org/android-tools-team/android-tools/raw/706e754/debian/:manpage DISTFILES= fastboot.1:manpage @@ -12,18 +12,12 @@ EXTRACT_ONLY= ${DISTFILES:N*\:manpage:C/:.*//} MAINTAINER= jbeich@FreeBSD.org COMMENT= Android Fastboot protocol CLI tool -LICENSE= APACHE20 BSD2CLAUSE PD +LICENSE= APACHE20 BSD2CLAUSE LICENSE_COMB= multi -LICENSE_FILE_PD= ${WRKSRC}/libselinux/NOTICE -LIB_DEPENDS= libpcre.so:devel/pcre - USE_GITHUB= yes -GH_ACCOUNT= aosp-mirror jbeich:extras,libselinux -GH_PROJECT= platform_system_core platform_system_extras:extras \ - platform_external_libselinux:libselinux -GH_TAGNAME?= android-7.1.2_r17:libselinux -GH_SUBDIR= libselinux:libselinux +GH_ACCOUNT= aosp-mirror jbeich:extras +GH_PROJECT= platform_system_core platform_system_extras:extras CONFLICTS_INSTALL?= ${PORTNAME}-devel-* @@ -35,16 +29,15 @@ MAKEFILE?= ${.CURDIR}/files/Makefile MAKE_ENV= BINDIR="${PREFIX}/bin" EXTRADIR="${FILESDIR}" \ FILESDIR="${DOCSDIR}" \ VERSION="${SDK_REVISION}-0 ${GH_REVISION}-android" \ - MANDIR="${PREFIX}/man/man" \ - LIBPCRE="${LOCALBASE}/lib/libpcre.a" + MANDIR="${PREFIX}/man/man" PLIST_FILES= bin/fastboot \ man/man1/fastboot.1.gz PORTDOCS= * SUB_FILES= pkg-message # Generated by "make update-revision" for "fastboot --version" -SDK_REVISION?= 27.0.0 -GH_REVISION= ${DISTVERSIONSUFFIX:U86c2b588a369:S/-g//} +SDK_REVISION?= 28.0.0 +GH_REVISION= ${DISTVERSIONSUFFIX:U0fac9018f238:S/-g//} OPTIONS_DEFINE= BASH DOCS OPTIONS_SUB= yes Modified: branches/2018Q3/devel/android-tools-fastboot/distinfo ============================================================================== --- branches/2018Q3/devel/android-tools-fastboot/distinfo Mon Aug 27 10:16:03 2018 (r478188) +++ branches/2018Q3/devel/android-tools-fastboot/distinfo Mon Aug 27 11:00:10 2018 (r478189) @@ -1,11 +1,9 @@ -TIMESTAMP = 1509048179 +TIMESTAMP = 1529542722 SHA256 (fastboot.1) = 2af01b064440952a82f1602691a0fecc030302722a71444946fb70d9c423d283 SIZE (fastboot.1) = 5906 -SHA256 (aosp-mirror-platform_system_core-android-8.1.0_r2_GH0.tar.gz) = 29c58327e06c9c938f8f3c0d3e991339eb98c53026203fbafc564e85cb6538bc -SIZE (aosp-mirror-platform_system_core-android-8.1.0_r2_GH0.tar.gz) = 5227210 -SHA256 (jbeich-platform_system_extras-android-8.1.0_r2_GH0.tar.gz) = 3ffa650a11b546928ffd9cf9688aea379151cb71f90fa6ef3d7ab4bf56a9dc67 -SIZE (jbeich-platform_system_extras-android-8.1.0_r2_GH0.tar.gz) = 196070852 -SHA256 (jbeich-platform_external_libselinux-android-7.1.2_r17_GH0.tar.gz) = 659e43d3e14b4f4fe8955975ad268310bfad0529f408fb33342ed70ae0d456c7 -SIZE (jbeich-platform_external_libselinux-android-7.1.2_r17_GH0.tar.gz) = 59763 +SHA256 (aosp-mirror-platform_system_core-android-9.0.0_r3_GH0.tar.gz) = b9de23465b304432aa2b585aa66c6bf4841b177f2139b75ca5adc5d917e0ecd6 +SIZE (aosp-mirror-platform_system_core-android-9.0.0_r3_GH0.tar.gz) = 27484684 +SHA256 (jbeich-platform_system_extras-android-9.0.0_r3_GH0.tar.gz) = d82c4576bed24bfe701bb8c781714fa70365c03aed93cf4777407215de4d672d +SIZE (jbeich-platform_system_extras-android-9.0.0_r3_GH0.tar.gz) = 211722695 SHA256 (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = ca3311ba47a5edd56c929ac9aae57c02c2c3f1636519c5f67abb00b6e3ecd75c SIZE (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = 5967 Modified: branches/2018Q3/devel/android-tools-fastboot/files/Makefile ============================================================================== --- branches/2018Q3/devel/android-tools-fastboot/files/Makefile Mon Aug 27 10:16:03 2018 (r478188) +++ branches/2018Q3/devel/android-tools-fastboot/files/Makefile Mon Aug 27 11:00:10 2018 (r478189) @@ -34,25 +34,11 @@ SRCS+= stringprintf.cpp SRCS+= strings.cpp # required by fastboot -.PATH: ${.CURDIR}/../ext4_utils -SRCS+= allocate.c -SRCS+= contents.c -SRCS+= crc16.c -SRCS+= ext4_sb.c -SRCS+= ext4_utils.c -SRCS+= ext4fixup.c -SRCS+= extent.c -SRCS+= indirect.c -SRCS+= make_ext4fs.c -SRCS+= sha1.c -SRCS+= wipe.c - -# required by fastboot .PATH: ${.CURDIR}/../libcutils SRCS+= android_get_control_file.cpp SRCS+= ../libcutils/sockets.cpp -SRCS+= socket_inaddr_any_server_unix.c -SRCS+= socket_network_client_unix.c +SRCS+= socket_inaddr_any_server_unix.cpp +SRCS+= socket_network_client_unix.cpp SRCS+= sockets_unix.cpp CPPFLAGS.sockets.cpp+= -o ${.TARGET} # XXX pre-r279980 @@ -70,19 +56,7 @@ SRCS+= logprint.c SRCS+= stderr_write.c SRCS+= test_utils.cpp -# required by ext4_utils -.PATH: ${.CURDIR}/../libselinux/src -SRCS+= callbacks.c -SRCS+= check_context.c -SRCS+= freecon.c -SRCS+= init.c -SRCS+= label.c -SRCS+= label_android_property.c -SRCS+= label_file.c -SRCS+= label_support.c -CPPFLAGS.label_file.c+= -D_WITH_GETLINE - -# required by fastboot and ext4_utils +# required by fastboot .PATH: ${.CURDIR}/../libsparse SRCS+= backed_block.c SRCS+= output_file.c @@ -109,15 +83,11 @@ CPPFLAGS+= -DFAKE_LOG_DEVICE=1 CPPFLAGS+= -I${.CURDIR} CPPFLAGS+= -I${.CURDIR}/../include CPPFLAGS+= -I${.CURDIR}/../adb -CPPFLAGS+= -I${.CURDIR}/../mkbootimg +CPPFLAGS+= -I${.CURDIR}/../mkbootimg/include/bootimg CPPFLAGS+= -I${.CURDIR}/../base/include -CPPFLAGS+= -I${.CURDIR}/../ext4_utils/include -CPPFLAGS+= -I${.CURDIR}/../f2fs_utils -CPPFLAGS+= -I${.CURDIR}/../libselinux/include CPPFLAGS+= -I${.CURDIR}/../libsparse/include CPPFLAGS+= -I${.CURDIR}/../libziparchive/include CPPFLAGS+= ${CPPFLAGS.${.IMPSRC:T}} -CPPFLAGS+= $$(${PKG_CONFIG} libpcre --cflags 2>/dev/null) CPPFLAGS+= $$(${PKG_CONFIG} libusb-1.0 --cflags 2>/dev/null) CXXFLAGS+= -D__STDC_LIMIT_MACROS # DragonFly CXXFLAGS+= -std=gnu++11 @@ -127,10 +97,9 @@ CFLAGS+= ${CPPFLAGS} CXXFLAGS+= ${CPPFLAGS} .endif -LDADD+= $$(${PKG_CONFIG} libpcre --libs 2>/dev/null || echo -lpcre) LDADD+= $$(${PKG_CONFIG} libusb-1.0 --libs 2>/dev/null || echo -lusb) LDADD+= -lz \-lpthread -DPADD+= ${LIBPCRE} ${LIBPTHREAD} ${LIBUSB} ${LIBZ} +DPADD+= ${LIBPTHREAD} ${LIBUSB} ${LIBZ} PKG_CONFIG?= pkg-config Modified: branches/2018Q3/devel/android-tools-fastboot/files/patch-base_logging.cpp ============================================================================== --- branches/2018Q3/devel/android-tools-fastboot/files/patch-base_logging.cpp Mon Aug 27 10:16:03 2018 (r478188) +++ branches/2018Q3/devel/android-tools-fastboot/files/patch-base_logging.cpp Mon Aug 27 11:00:10 2018 (r478189) @@ -28,7 +28,7 @@ +#include +#elif defined(__NetBSD__) +#include -+#else ++#else // OpenBSD, Solaris +#include #endif @@ -39,11 +39,11 @@ return GetCurrentThreadId(); +#elif defined(__DragonFly__) + return lwp_gettid(); -+#elif defined(__NetBSD__) -+ return _lwp_self(); +#elif defined(__FreeBSD__) + return pthread_getthreadid_np(); -+#else ++#elif defined(__NetBSD__) ++ return _lwp_self(); ++#else // OpenBSD, Solaris + return (intptr_t) pthread_self(); #endif } Copied: branches/2018Q3/devel/android-tools-fastboot/files/patch-libziparchive_zip__archive.cc (from r477244, head/devel/android-tools-fastboot/files/patch-libziparchive_zip__archive.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q3/devel/android-tools-fastboot/files/patch-libziparchive_zip__archive.cc Mon Aug 27 11:00:10 2018 (r478189, copy of r477244, head/devel/android-tools-fastboot/files/patch-libziparchive_zip__archive.cc) @@ -0,0 +1,29 @@ +--- libziparchive/zip_archive.cc.orig 2018-06-21 00:58:42 UTC ++++ libziparchive/zip_archive.cc +@@ -47,6 +47,17 @@ + #include "zip_archive_common.h" + #include "zip_archive_private.h" + ++#if !defined(_WIN32) ++#if __cplusplus >= 201703 || (defined(_LIBCPP_VERSION) && __has_include()) ++#include ++#elif __cplusplus >= 201402 ++#include ++namespace std { ++using std::experimental::string_view; ++} ++#endif // __cplusplus >= 201703 ++#endif // !defined(_WIN32) ++ + using android::base::get_unaligned; + + // Used to turn on crc checks - verify that the content CRC matches the values +@@ -100,7 +111,7 @@ static uint32_t RoundUpPower2(uint32_t val) { + } + + static uint32_t ComputeHash(const ZipString& name) { +-#if !defined(_WIN32) ++#if __cplusplus >= 201402 && !defined(_WIN32) + return std::hash{}( + std::string_view(reinterpret_cast(name.name), name.name_length)); + #else From owner-svn-ports-branches@freebsd.org Mon Aug 27 17:31:45 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5456E10918CE; Mon, 27 Aug 2018 17:31:45 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 09EEC7BB80; Mon, 27 Aug 2018 17:31:45 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E08E720BB8; Mon, 27 Aug 2018 17:31:44 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7RHViBa021836; Mon, 27 Aug 2018 17:31:44 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7RHViUd021833; Mon, 27 Aug 2018 17:31:44 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201808271731.w7RHViUd021833@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 27 Aug 2018 17:31:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r478240 - in branches/2018Q3/games/keeperrl: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q3/games/keeperrl: . files X-SVN-Commit-Revision: 478240 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Aug 2018 17:31:45 -0000 Author: jbeich Date: Mon Aug 27 17:31:44 2018 New Revision: 478240 URL: https://svnweb.freebsd.org/changeset/ports/478240 Log: MFH: r478237 r478238 r478239 games/keeperrl: unbreak with libc++ 7, GCC and on FreeBSD 10 Approved by: ports-secteam blanket Added: branches/2018Q3/games/keeperrl/files/patch-stack__printer.cpp - copied unchanged from r478238, head/games/keeperrl/files/patch-stack__printer.cpp Modified: branches/2018Q3/games/keeperrl/Makefile branches/2018Q3/games/keeperrl/distinfo (contents, props changed) Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/games/keeperrl/Makefile ============================================================================== --- branches/2018Q3/games/keeperrl/Makefile Mon Aug 27 17:29:39 2018 (r478239) +++ branches/2018Q3/games/keeperrl/Makefile Mon Aug 27 17:31:44 2018 (r478240) @@ -2,9 +2,12 @@ PORTNAME= keeperrl PORTVERSION= 0.0.${ALPHA_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES= c0fc69cbee72.patch:-p1 + MAINTAINER= ports@FreeBSD.org COMMENT= Ambitious dungeon builder with roguelike elements @@ -13,12 +16,10 @@ LICENSE_COMB= multi LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING.txt LICENSE_FILE_OFL11= ${WRKSRC}/data_contrib/SIL_Open_Font_License.txt -BROKEN_FreeBSD_10= needs c++14, does not build even with clang5 - LIB_DEPENDS= libvorbis.so:audio/libvorbis \ libcurl.so:ftp/curl -USES= gmake localbase openal +USES= compiler:c++14-lang gmake localbase openal USE_GITHUB= yes GH_ACCOUNT= miki151 @@ -32,6 +33,8 @@ LIBS+= -lexecinfo LLD_UNSAFE= yes MAKE_ARGS= DATA_DIR="${DATADIR}" GCC="${CXX}" \ LDFLAGS="${LDFLAGS}" RELEASE=true +# USE_GCC adds -Wl,-rpath=${_GCC_RUNTIME} which breaks -x c++-header +MAKE_ARGS+= PCH= PCHINC= DESKTOP_ENTRIES="KeeperRL" "" "" "keeper" \ "Game;Simulation;" false @@ -42,8 +45,6 @@ post-patch: -e 's|bash|sh|' \ ${WRKSRC}/Makefile @${REINPLACE_CMD} 's|bash|sh|' ${WRKSRC}/check_serial.sh - @${REINPLACE_CMD} '/_GLIBCXX_END_NAMESPACE_VERSION/d' \ - ${WRKSRC}/extern/iomanip.h do-install: ${INSTALL_PROGRAM} ${WRKSRC}/keeper ${STAGEDIR}${PREFIX}/bin Modified: branches/2018Q3/games/keeperrl/distinfo ============================================================================== --- branches/2018Q3/games/keeperrl/distinfo Mon Aug 27 17:29:39 2018 (r478239) +++ branches/2018Q3/games/keeperrl/distinfo Mon Aug 27 17:31:44 2018 (r478240) @@ -1,3 +1,5 @@ TIMESTAMP = 1516986107 SHA256 (miki151-keeperrl-0.0.23-alpha23_GH0.tar.gz) = 046cba3c8834f52f9e796d2deece8770b833d351eb222c216fdf65b0c1869979 SIZE (miki151-keeperrl-0.0.23-alpha23_GH0.tar.gz) = 3252139 +SHA256 (c0fc69cbee72.patch) = ca2a3158182b1bcab2c9ec0d9e9525800d49c62f2d544c9a3b6c01fbee75750b +SIZE (c0fc69cbee72.patch) = 533 Copied: branches/2018Q3/games/keeperrl/files/patch-stack__printer.cpp (from r478238, head/games/keeperrl/files/patch-stack__printer.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q3/games/keeperrl/files/patch-stack__printer.cpp Mon Aug 27 17:31:44 2018 (r478240, copy of r478238, head/games/keeperrl/files/patch-stack__printer.cpp) @@ -0,0 +1,20 @@ +https://svnweb.freebsd.org/changeset/base/294930 + +stack_printer.cpp:329:18: error: assigning to 'char *' from incompatible type 'void *' + ss.ss_sp = (void*)alternate_stack; + ^~~~~~~~~~~~~~~~~~~~~~ + +--- stack_printer.cpp.orig 2017-10-24 09:45:42 UTC ++++ stack_printer.cpp +@@ -326,7 +326,11 @@ int printStacktraceWithGdb() { + stack_t ss = {}; + /* malloc is usually used here, I'm not 100% sure my static allocation + is valid but it seems to work just fine. */ ++#if defined(__DragonFly__) || (defined(__FreeBSD__) && __FreeBSD__ < 11) ++ ss.ss_sp = (char*)alternate_stack; ++#else + ss.ss_sp = (void*)alternate_stack; ++#endif + ss.ss_size = SIGSTKSZ; + ss.ss_flags = 0; + From owner-svn-ports-branches@freebsd.org Tue Aug 28 00:33:41 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EF6AE109A7EC; Tue, 28 Aug 2018 00:33:40 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9BE228A562; Tue, 28 Aug 2018 00:33:40 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 60296252A9; Tue, 28 Aug 2018 00:33:40 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7S0Xem3042812; Tue, 28 Aug 2018 00:33:40 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7S0Xehb042810; Tue, 28 Aug 2018 00:33:40 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201808280033.w7S0Xehb042810@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 28 Aug 2018 00:33:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r478271 - branches/2018Q3/emulators/rpcs3 X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q3/emulators/rpcs3 X-SVN-Commit-Revision: 478271 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Aug 2018 00:33:41 -0000 Author: jbeich Date: Tue Aug 28 00:33:39 2018 New Revision: 478271 URL: https://svnweb.freebsd.org/changeset/ports/478271 Log: MFH: r478266 emulators/rpcs3: update to 0.0.5.794 Changes: https://github.com/RPCS3/rpcs3/compare/21e191111...23f5cee65 Approved by: ports-secteam (junovitch, implicit for snapshots) Modified: branches/2018Q3/emulators/rpcs3/Makefile branches/2018Q3/emulators/rpcs3/distinfo Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/emulators/rpcs3/Makefile ============================================================================== --- branches/2018Q3/emulators/rpcs3/Makefile Tue Aug 28 00:30:42 2018 (r478270) +++ branches/2018Q3/emulators/rpcs3/Makefile Tue Aug 28 00:33:39 2018 (r478271) @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.5-774 -DISTVERSIONSUFFIX= -g21e191111 +DISTVERSION= 0.0.5-794 +DISTVERSIONSUFFIX= -g23f5cee65 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org @@ -24,18 +24,18 @@ ONLY_FOR_ARCHS_REASON= requires int128 and SSE2 USE_GITHUB= yes GH_ACCOUNT= RPCS3 -GH_TUPLE= RPCS3:hidapi:hidapi-0.8.0-rc1-25-gca39ce8:hidapi/3rdparty/hidapi \ +GH_TUPLE= RPCS3:hidapi:hidapi-0.8.0-rc1-26-g4c27501:hidapi/3rdparty/hidapi \ RPCS3:llvm:be9f7bfe2068:llvm/llvm \ akrzemi1:Optional:f27e790:Optional/3rdparty/Optional \ Cyan4973:xxHash:v0.6.5:xxHash/3rdparty/xxHash \ - jbeder:yaml-cpp:yaml-cpp-0.6.2-4-g4fb1c4b:yamlcpp/3rdparty/yaml-cpp \ + jbeder:yaml-cpp:yaml-cpp-0.6.2-8-gc90c08c:yamlcpp/3rdparty/yaml-cpp \ kobalicek:asmjit:673dcef:asmjit/asmjit \ KhronosGroup:glslang:5.1-184-gc99304c5:glslang/Vulkan/glslang \ - Microsoft:GSL:fc5fce4:GSL/3rdparty/GSL \ + Microsoft:GSL:v2.0.0:GSL/3rdparty/GSL \ USCiLab:cereal:v1.2.0:cereal/3rdparty/cereal \ zeux:pugixml:v1.9:pugixml/3rdparty/pugixml -USES= cmake:outsource compiler:c++14-lang iconv:wchar_t localbase:ldflags \ +USES= cmake:outsource compiler:c++17-lang iconv:wchar_t localbase:ldflags \ openal:soft pkgconfig qt:5 USE_GL= gl glew USE_QT= qmake_build buildtools_build core dbus gui network widgets qml Modified: branches/2018Q3/emulators/rpcs3/distinfo ============================================================================== --- branches/2018Q3/emulators/rpcs3/distinfo Tue Aug 28 00:30:42 2018 (r478270) +++ branches/2018Q3/emulators/rpcs3/distinfo Tue Aug 28 00:33:39 2018 (r478271) @@ -1,22 +1,22 @@ -TIMESTAMP = 1535111542 -SHA256 (RPCS3-rpcs3-v0.0.5-774-g21e191111_GH0.tar.gz) = 77b383d41fa2a841f6430a069d0e05d114aee76422c1078ad52b25c61b742dd4 -SIZE (RPCS3-rpcs3-v0.0.5-774-g21e191111_GH0.tar.gz) = 4976597 -SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = e50e4f4e9035e891e16867e995f44aac87ce734a9dde169f02fc9719b2ce3642 -SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = 105623 +TIMESTAMP = 1535396025 +SHA256 (RPCS3-rpcs3-v0.0.5-794-g23f5cee65_GH0.tar.gz) = 8c4325ae2d45b1741fb0cfa13d78d4165874146fe0e0bfee8b9d61e5c330a3a3 +SIZE (RPCS3-rpcs3-v0.0.5-794-g23f5cee65_GH0.tar.gz) = 4976445 +SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-26-g4c27501_GH0.tar.gz) = 4f58ba2a51136cc6af0f1d833688b55f78468c4f5429a4bf9b38bb51c9d212b1 +SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-26-g4c27501_GH0.tar.gz) = 105372 SHA256 (RPCS3-llvm-be9f7bfe2068_GH0.tar.gz) = 6fc805799e0853505ce786882e5856d018130fcca37206e7ef5fcef6b72937d3 SIZE (RPCS3-llvm-be9f7bfe2068_GH0.tar.gz) = 42328799 SHA256 (akrzemi1-Optional-f27e790_GH0.tar.gz) = d9f81fa3699b724812994897180365b7ee2fdef1549239d5086722bd4552baf1 SIZE (akrzemi1-Optional-f27e790_GH0.tar.gz) = 16055 SHA256 (Cyan4973-xxHash-v0.6.5_GH0.tar.gz) = 19030315f4fc1b4b2cdb9d7a317069a109f90e39d1fe4c9159b7aaa39030eb95 SIZE (Cyan4973-xxHash-v0.6.5_GH0.tar.gz) = 37521 -SHA256 (jbeder-yaml-cpp-yaml-cpp-0.6.2-4-g4fb1c4b_GH0.tar.gz) = abe67a50a1486f986dd2daf90a7ee7400af94a2712e94f271850810cc51944c8 -SIZE (jbeder-yaml-cpp-yaml-cpp-0.6.2-4-g4fb1c4b_GH0.tar.gz) = 1396702 +SHA256 (jbeder-yaml-cpp-yaml-cpp-0.6.2-8-gc90c08c_GH0.tar.gz) = 97c3638ef39adb392199d51c4bb700201e15160f43f6da9f2d09c3e87f5c8c51 +SIZE (jbeder-yaml-cpp-yaml-cpp-0.6.2-8-gc90c08c_GH0.tar.gz) = 1396727 SHA256 (kobalicek-asmjit-673dcef_GH0.tar.gz) = 228dd2f422740a1c9e713f1c86934e95d75fc1a8731a88ea006a2cebb033ca8c SIZE (kobalicek-asmjit-673dcef_GH0.tar.gz) = 448118 SHA256 (KhronosGroup-glslang-5.1-184-gc99304c5_GH0.tar.gz) = b6a3b853a31b6aace0826bdeafce2d1f26c00ba349664e87fb35d189b99c0b58 SIZE (KhronosGroup-glslang-5.1-184-gc99304c5_GH0.tar.gz) = 2329404 -SHA256 (Microsoft-GSL-fc5fce4_GH0.tar.gz) = 2df1538ff240bf4dd3ef44ba8c832451376fff8e74f7734d32fc8c337557a64d -SIZE (Microsoft-GSL-fc5fce4_GH0.tar.gz) = 38809 +SHA256 (Microsoft-GSL-v2.0.0_GH0.tar.gz) = 6cce6fb16b651e62711a4f58e484931013c33979b795d1b1f7646f640cfa9c8e +SIZE (Microsoft-GSL-v2.0.0_GH0.tar.gz) = 64726 SHA256 (USCiLab-cereal-v1.2.0_GH0.tar.gz) = 1ccf3ed205a7a2f0d6a060415b123f1ae0d984cd4435db01af8de11a2eda49c1 SIZE (USCiLab-cereal-v1.2.0_GH0.tar.gz) = 299883 SHA256 (zeux-pugixml-v1.9_GH0.tar.gz) = 7ac060048bf00da4b3902cf411f0ba9f048cdc5580eed1f5a27ff51be4a38243 From owner-svn-ports-branches@freebsd.org Tue Aug 28 00:35:29 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B4A32109A8EA; Tue, 28 Aug 2018 00:35:29 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6B1538A7BD; Tue, 28 Aug 2018 00:35:29 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4BC0D252B3; Tue, 28 Aug 2018 00:35:29 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7S0ZTRt043170; Tue, 28 Aug 2018 00:35:29 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7S0ZSbD043168; Tue, 28 Aug 2018 00:35:28 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201808280035.w7S0ZSbD043168@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 28 Aug 2018 00:35:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r478273 - branches/2018Q3/emulators/citra X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q3/emulators/citra X-SVN-Commit-Revision: 478273 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Aug 2018 00:35:29 -0000 Author: jbeich Date: Tue Aug 28 00:35:28 2018 New Revision: 478273 URL: https://svnweb.freebsd.org/changeset/ports/478273 Log: MFH: r478267 emulators/citra: update to s20180826 Changes: https://github.com/citra-emu/citra/compare/0a5621faf...05118a232 Approved by: ports-secteam (swills, implicit for snapshots) Modified: branches/2018Q3/emulators/citra/Makefile branches/2018Q3/emulators/citra/distinfo Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/emulators/citra/Makefile ============================================================================== --- branches/2018Q3/emulators/citra/Makefile Tue Aug 28 00:34:30 2018 (r478272) +++ branches/2018Q3/emulators/citra/Makefile Tue Aug 28 00:35:28 2018 (r478273) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20180824 +PORTVERSION= s20180826 PORTREVISION?= 0 CATEGORIES= emulators @@ -23,7 +23,7 @@ BUILD_DEPENDS= boost-libs>=1.66:devel/boost-libs USE_GITHUB= yes GH_ACCOUNT= citra-emu -GH_TAGNAME= 0a5621faf +GH_TAGNAME= 05118a232 GH_TUPLE= citra-emu:ext-libressl-portable:7d01cb0:libressl/externals/libressl \ citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \ MerryMage:dynarmic:r1-2-g4b350a3:dynarmic/externals/dynarmic \ Modified: branches/2018Q3/emulators/citra/distinfo ============================================================================== --- branches/2018Q3/emulators/citra/distinfo Tue Aug 28 00:34:30 2018 (r478272) +++ branches/2018Q3/emulators/citra/distinfo Tue Aug 28 00:35:28 2018 (r478273) @@ -1,6 +1,6 @@ -TIMESTAMP = 1535134895 -SHA256 (citra-emu-citra-s20180824-0a5621faf_GH0.tar.gz) = 4555fe9785d748101c4eb58bef92dc95c883ce3213b8441ecceba9d87e9ce3b5 -SIZE (citra-emu-citra-s20180824-0a5621faf_GH0.tar.gz) = 4092577 +TIMESTAMP = 1535307754 +SHA256 (citra-emu-citra-s20180826-05118a232_GH0.tar.gz) = f6846d71c8311e914726d4d7f2892e9b2ccc9ed0317200ba433d4fd8a745edfa +SIZE (citra-emu-citra-s20180826-05118a232_GH0.tar.gz) = 4103846 SHA256 (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = f3fc8c9d4991b05ca1e1c8f5907ecd3ffd9724a8dccf328087b4784cda5c7db3 SIZE (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = 1762942 SHA256 (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = a593ab188e4feaeef8376c27b554cc413986efc777c195e44c6d3d223de9a63c From owner-svn-ports-branches@freebsd.org Tue Aug 28 04:53:12 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CF94410A1F4F; Tue, 28 Aug 2018 04:53:12 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 805F77253E; Tue, 28 Aug 2018 04:53:12 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 47A6F27ECD; Tue, 28 Aug 2018 04:53:12 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7S4rC7n077175; Tue, 28 Aug 2018 04:53:12 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7S4rBqH077173; Tue, 28 Aug 2018 04:53:11 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201808280453.w7S4rBqH077173@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Tue, 28 Aug 2018 04:53:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r478279 - in branches/2018Q3/dns/void-zones-tools: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in branches/2018Q3/dns/void-zones-tools: . files X-SVN-Commit-Revision: 478279 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Aug 2018 04:53:13 -0000 Author: tobik Date: Tue Aug 28 04:53:11 2018 New Revision: 478279 URL: https://svnweb.freebsd.org/changeset/ports/478279 Log: MFH: r478228 dns/void-zones-tools: Respect CFLAGS and avoid using -march=native It currently compiles with -march=native which breaks on some machines cc -march=native -mssse3 -ffast-math -std=c11 -g0 -Ofast -fstrict-aliasing -Wno-parentheses binutils.c -c -o binutils.o error: unknown target CPU 'k6-3' Given that the build is currently targeting the build host CPU, existing binary packages on pkg.FreeBSD.org (or elsewhere) might be broken on many machines too, so bump PORTREVISION to trigger a rebuild. PR: 230899 Submitted by: tobik Reported by: Marco Beishuizen Approved by: Vidar Karlsen (maintainer) Approved by: ports-secteam (miwi) Added: branches/2018Q3/dns/void-zones-tools/files/patch-Makefile - copied unchanged from r478228, head/dns/void-zones-tools/files/patch-Makefile Modified: branches/2018Q3/dns/void-zones-tools/Makefile Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/dns/void-zones-tools/Makefile ============================================================================== --- branches/2018Q3/dns/void-zones-tools/Makefile Tue Aug 28 02:44:06 2018 (r478278) +++ branches/2018Q3/dns/void-zones-tools/Makefile Tue Aug 28 04:53:11 2018 (r478279) @@ -3,7 +3,7 @@ PORTNAME= void-zones-tools DISTVERSIONPREFIX= v DISTVERSION= 1.0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= dns MAINTAINER= vidar@karlsen.tech Copied: branches/2018Q3/dns/void-zones-tools/files/patch-Makefile (from r478228, head/dns/void-zones-tools/files/patch-Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q3/dns/void-zones-tools/files/patch-Makefile Tue Aug 28 04:53:11 2018 (r478279, copy of r478228, head/dns/void-zones-tools/files/patch-Makefile) @@ -0,0 +1,19 @@ +--- Makefile.orig 2018-08-26 02:54:47 UTC ++++ Makefile +@@ -25,15 +25,7 @@ + + CC ?= clang + +-.if $(MACHINE) == "i386" || $(MACHINE) == "amd64" || $(MACHINE) == "x86_64" +-CFLAGS = $(CDEFS) -march=native -mssse3 -ffast-math +-.elif $(MACHINE) == "arm" +-CFLAGS = $(CDEFS) -fsigned-char +-.else +-CFLAGS = $(CDEFS) +-.endif +- +-CFLAGS += -std=c11 -g0 -Ofast -fstrict-aliasing -Wno-parentheses ++CFLAGS += -std=c11 -fstrict-aliasing -Wno-parentheses + PREFIX ?= /usr/local + + HEADERS = binutils.h store.h From owner-svn-ports-branches@freebsd.org Tue Aug 28 06:19:15 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E30581080947; Tue, 28 Aug 2018 06:19:14 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 98BCF7499F; Tue, 28 Aug 2018 06:19:14 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 75602C69; Tue, 28 Aug 2018 06:19:14 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7S6JE1t018690; Tue, 28 Aug 2018 06:19:14 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7S6JEi4018688; Tue, 28 Aug 2018 06:19:14 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201808280619.w7S6JEi4018688@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Tue, 28 Aug 2018 06:19:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r478286 - branches/2018Q3/sysutils/e2fsprogs X-SVN-Group: ports-branches X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: branches/2018Q3/sysutils/e2fsprogs X-SVN-Commit-Revision: 478286 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Aug 2018 06:19:15 -0000 Author: mandree Date: Tue Aug 28 06:19:13 2018 New Revision: 478286 URL: https://svnweb.freebsd.org/changeset/ports/478286 Log: MFH: r478261 Update sysutils/e2fsprogs to new upstream release 1.44.4. This is a bug fixing release. Full release notes: Approved by: ports-secteam@ (miwi@) Modified: branches/2018Q3/sysutils/e2fsprogs/Makefile branches/2018Q3/sysutils/e2fsprogs/distinfo Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/sysutils/e2fsprogs/Makefile ============================================================================== --- branches/2018Q3/sysutils/e2fsprogs/Makefile Tue Aug 28 06:00:55 2018 (r478285) +++ branches/2018Q3/sysutils/e2fsprogs/Makefile Tue Aug 28 06:19:13 2018 (r478286) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= e2fsprogs -# XXX if bumping PORTVERSION, check/adjust pre-configure! -PORTVERSION= 1.44.3 +PORTVERSION= 1.44.4 PORTREVISION?= 0 CATEGORIES?= sysutils MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION} @@ -125,6 +124,7 @@ post-patch:: -e "s/ == 0/ = 0/" -e "s/tar x$$/tar xf -/" -e "s/\/gdd/" \ ${WRKSRC}/tests/[a-z]_*/script @${REINPLACE_CMD} -e 's///' ${WRKSRC}/*/*.c + @${REINPLACE_CMD} -E -e 's/__GNUC_PREREQ\>/__GNUC_PREREQ__/' ${WRKSRC}/*/*/*.[ch] ${WRKSRC}/*/*.c .if empty(PORT_OPTIONS:MALLTESTS) . for i in \ d_fallocate_blkmap \ @@ -172,9 +172,6 @@ post-patch:: @${MV} ${WRKSRC}/tests/${i} ${WRKSRC}/tests/disabled_test-${i} . endfor .endif - -pre-configure:: - ${REINPLACE_CMD} -e 's/July/Jul/' ${WRKSRC}/version.h ############################################################## # Master port stuff that is not to be seen by the slave ports. Modified: branches/2018Q3/sysutils/e2fsprogs/distinfo ============================================================================== --- branches/2018Q3/sysutils/e2fsprogs/distinfo Tue Aug 28 06:00:55 2018 (r478285) +++ branches/2018Q3/sysutils/e2fsprogs/distinfo Tue Aug 28 06:19:13 2018 (r478286) @@ -1,3 +1,3 @@ -TIMESTAMP = 1531207325 -SHA256 (e2fsprogs-1.44.3.tar.xz) = 5d899f7d30f481cc0c6a049ebe26ebe145f1b524182ea1ecde4086162d4e4bb6 -SIZE (e2fsprogs-1.44.3.tar.xz) = 5364552 +TIMESTAMP = 1535408315 +SHA256 (e2fsprogs-1.44.4.tar.xz) = ee03b2f2180614c5ae5f6dd2666f8808de61c3d8b37d22ba86cc6daea25be55a +SIZE (e2fsprogs-1.44.4.tar.xz) = 5363496 From owner-svn-ports-branches@freebsd.org Tue Aug 28 12:48:01 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 07750108B443; Tue, 28 Aug 2018 12:48:01 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B15538245C; Tue, 28 Aug 2018 12:48:00 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 937FC506B; Tue, 28 Aug 2018 12:48:00 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7SCm0Gi021669; Tue, 28 Aug 2018 12:48:00 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7SCm0db021668; Tue, 28 Aug 2018 12:48:00 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201808281248.w7SCm0db021668@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 28 Aug 2018 12:48:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r478310 - in branches/2018Q3/emulators/rpcs3: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q3/emulators/rpcs3: . files X-SVN-Commit-Revision: 478310 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Aug 2018 12:48:01 -0000 Author: jbeich Date: Tue Aug 28 12:47:59 2018 New Revision: 478310 URL: https://svnweb.freebsd.org/changeset/ports/478310 Log: MFH: r478309 emulators/rpcs3: unbreak on FreeBSD 10.4/11.1 Utilities/types.h:94:13: error: no member named 'byte' in namespace 'std' using std::byte; ~~~~~^ Utilities/types.h:773:18: error: no type named 'byte' in namespace 'std' alignas(A) std::byte data[S]; ~~~~~^ rpcs3/Emu/RSX/rsx_utils.h:9:10: fatal error: 'optional' file not found #include ^~~~~~~~~~ rpcs3/Emu/RSX/Overlays/overlay_controls.h:1354:20: error: no member named 'clamp' in namespace 'std' m_value = std::clamp(value, 0.f, m_limit); ~~~~~^ Reported by: pkg-fallout Pointy hat to: jbeich Approved by: ports-secteam blanket Added: branches/2018Q3/emulators/rpcs3/files/extra-patch-c++14 - copied unchanged from r478309, head/emulators/rpcs3/files/extra-patch-c++14 Modified: branches/2018Q3/emulators/rpcs3/Makefile Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/emulators/rpcs3/Makefile ============================================================================== --- branches/2018Q3/emulators/rpcs3/Makefile Tue Aug 28 12:44:46 2018 (r478309) +++ branches/2018Q3/emulators/rpcs3/Makefile Tue Aug 28 12:47:59 2018 (r478310) @@ -42,6 +42,9 @@ USE_QT= qmake_build buildtools_build core dbus gui ne USE_XORG= x11 CMAKE_ON= CMAKE_SKIP_RPATH USE_SYSTEM_FFMPEG USE_SYSTEM_LIBPNG CMAKE_OFF= USE_NATIVE_INSTRUCTIONS +EXTRA_PATCHES+= ${EXTRA_PATCHES_${COMPILER_FEATURES:Mlib*}_${OPSYS}_${OSREL}} +EXTRA_PATCHES_libc++_FreeBSD_10.4= ${PATCHDIR}/extra-patch-c++14 +EXTRA_PATCHES_libc++_FreeBSD_11.1= ${PATCHDIR}/extra-patch-c++14 CXXFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528 CXXFLAGS+= -Wno-macro-redefined # __STDC_*_MACROS sys/cdefs.h vs. llvm-config LDFLAGS+= -Wl,--as-needed # GLU Copied: branches/2018Q3/emulators/rpcs3/files/extra-patch-c++14 (from r478309, head/emulators/rpcs3/files/extra-patch-c++14) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q3/emulators/rpcs3/files/extra-patch-c++14 Tue Aug 28 12:47:59 2018 (r478310, copy of r478309, head/emulators/rpcs3/files/extra-patch-c++14) @@ -0,0 +1,104 @@ +Downgrade to C++14 as libc++ < 5 doesn't support std::byte + +--- Utilities/BEType.h.orig 2018-08-27 18:53:45 UTC ++++ Utilities/BEType.h +@@ -334,10 +334,14 @@ inline v128 operator~(const v128& other) + template + struct se_storage + { ++#if __cplusplus < 201703L ++ using type = std::aligned_storage_t; ++#else + struct type + { + alignas(Align) std::byte data[Size]; + }; ++#endif + + // Unoptimized generic byteswap for unaligned data + static void reverse(u8* dst, const u8* src) +--- Utilities/types.h.orig 2018-08-27 18:53:45 UTC ++++ Utilities/types.h +@@ -91,7 +91,11 @@ using steady_clock = std::conditional< + + namespace gsl + { ++#if __cplusplus < 201703L ++ enum class byte : u8; ++#else + using std::byte; ++#endif + } + + // Formatting helper, type-specific preprocessing for improving safety and functionality +@@ -120,6 +124,8 @@ class atomic_t; + + #if defined(__INTELLISENSE__) && !defined(_MSC_VER) + namespace std { template using void_t = void; } ++#elif defined(_LIBCPP_VERSION) && __cplusplus < 201703L ++namespace std { template using void_t = void; } + #endif + + // Extract T::simple_type if available, remove cv qualifiers +@@ -770,7 +776,11 @@ struct value_hash + template