svn commit: r453865 - in head: devel/cppcheck/files devel/p5-Config-Auto/files graphics/ImageMagick/files graphics/ImageMagick7/files japanese/esecanna/files lang/tcl84/files www/py-gunicorn/files ...
Antoine Brodin
antoine at FreeBSD.org
Thu Nov 9 20:09:20 UTC 2017
Author: antoine
Date: Thu Nov 9 20:09:18 2017
New Revision: 453865
URL: https://svnweb.freebsd.org/changeset/ports/453865
Log:
Fix the context of some patches so that they apply with stricter patch(1)
PR: 223545
With hat: portmgr
Modified:
head/devel/cppcheck/files/patch-CMakeLists.txt
head/devel/cppcheck/files/patch-gui_CMakeLists.txt
head/devel/p5-Config-Auto/files/patch-Makefile.PL
head/graphics/ImageMagick/files/patch-config_policy.xml
head/graphics/ImageMagick7/files/patch-config_policy.xml
head/japanese/esecanna/files/patch-README.jp (contents, props changed)
head/lang/tcl84/files/patch-warnings
head/www/py-gunicorn/files/patch-requirements__test.txt
head/x11/rxvt-unicode/files/patch-src_gencompose
head/x11/rxvt-unicode/files/patch-src_genlinedraw
Modified: head/devel/cppcheck/files/patch-CMakeLists.txt
==============================================================================
--- head/devel/cppcheck/files/patch-CMakeLists.txt Thu Nov 9 19:57:31 2017 (r453864)
+++ head/devel/cppcheck/files/patch-CMakeLists.txt Thu Nov 9 20:09:18 2017 (r453865)
@@ -1,8 +1,8 @@
---- CMakeLists.txt.orig 2017-05-13 09:27:11 UTC
+--- CMakeLists.txt.orig 2017-10-07 21:11:39 UTC
+++ CMakeLists.txt
@@ -1,4 +1,4 @@
-project(CppCheck)
+project(cppcheck)
- cmake_minimum_required(VERSION 2.8)
+ cmake_minimum_required(VERSION 2.8.4)
include(GNUInstallDirs)
Modified: head/devel/cppcheck/files/patch-gui_CMakeLists.txt
==============================================================================
--- head/devel/cppcheck/files/patch-gui_CMakeLists.txt Thu Nov 9 19:57:31 2017 (r453864)
+++ head/devel/cppcheck/files/patch-gui_CMakeLists.txt Thu Nov 9 20:09:18 2017 (r453865)
@@ -1,7 +1,7 @@
---- gui/CMakeLists.txt.orig 2017-05-13 09:27:11 UTC
+--- gui/CMakeLists.txt.orig 2017-10-07 21:11:39 UTC
+++ gui/CMakeLists.txt
-@@ -29,7 +29,7 @@ if (BUILD_GUI)
-
+@@ -27,7 +27,7 @@ if (BUILD_GUI)
+ qt5_use_modules(cppcheck-gui ${GUI_QT_COMPONENTS})
install(TARGETS cppcheck-gui RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications)
- install(FILES ${qms} DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications)
Modified: head/devel/p5-Config-Auto/files/patch-Makefile.PL
==============================================================================
--- head/devel/p5-Config-Auto/files/patch-Makefile.PL Thu Nov 9 19:57:31 2017 (r453864)
+++ head/devel/p5-Config-Auto/files/patch-Makefile.PL Thu Nov 9 20:09:18 2017 (r453865)
@@ -1,12 +1,14 @@
---- Makefile.PL.orig Sun Sep 28 13:41:23 2003
-+++ Makefile.PL Sun Sep 28 13:42:32 2003
-@@ -29,4 +29,9 @@
- AUTHOR => 'Jos I. Boumans <kane at cpan.org>')
- : ()
- ),
+--- Makefile.PL.orig 2013-05-12 15:18:54 UTC
++++ Makefile.PL
+@@ -29,6 +29,11 @@ WriteMakefile1(
+ LICENSE => 'perl',
+ META_MERGE => {
+ resources => {
+
+ 'MAN3PODS' => {
+ 'lib/Config/Auto.pm' => '$(INST_MAN3DIR)/Config::Auto.$(MAN3EXT)',
+ },
+
- );
+ repository => 'https://github.com/jib/config-auto',
+ },
+ },
Modified: head/graphics/ImageMagick/files/patch-config_policy.xml
==============================================================================
--- head/graphics/ImageMagick/files/patch-config_policy.xml Thu Nov 9 19:57:31 2017 (r453864)
+++ head/graphics/ImageMagick/files/patch-config_policy.xml Thu Nov 9 20:09:18 2017 (r453865)
@@ -1,12 +1,14 @@
---- config/policy.xml.orig 2016-05-09 19:28:58.000000000 +0200
-+++ config/policy.xml 2016-05-10 17:44:26.720503000 +0200
-@@ -64,4 +64,9 @@
- <!-- <policy domain="coder" rights="none" pattern="HTTPS" /> -->
- <!-- <policy domain="path" rights="none" pattern="@*" /> -->
- <policy domain="cache" name="shared-secret" value="passphrase"/>
+--- config/policy.xml.orig 2017-09-23 12:22:04 UTC
++++ config/policy.xml
+@@ -64,6 +64,11 @@
+ <!-- <policy domain="resource" name="map" value="4GiB"/> -->
+ <!-- <policy domain="resource" name="width" value="10KP"/> -->
+ <!-- <policy domain="resource" name="height" value="10KP"/> -->
+ <policy domain="coder" rights="none" pattern="EPHEMERAL" />
+ <policy domain="coder" rights="none" pattern="URL" />
+ <policy domain="coder" rights="none" pattern="HTTPS" />
+ <policy domain="coder" rights="none" pattern="MVG" />
+ <policy domain="coder" rights="none" pattern="MSL" />
- </policymap>
+ <!-- <policy domain="resource" name="area" value="100MP"/> -->
+ <!-- <policy domain="resource" name="disk" value="16EiB"/> -->
+ <!-- <policy domain="resource" name="file" value="768"/> -->
Modified: head/graphics/ImageMagick7/files/patch-config_policy.xml
==============================================================================
--- head/graphics/ImageMagick7/files/patch-config_policy.xml Thu Nov 9 19:57:31 2017 (r453864)
+++ head/graphics/ImageMagick7/files/patch-config_policy.xml Thu Nov 9 20:09:18 2017 (r453865)
@@ -1,12 +1,14 @@
---- config/policy.xml.orig 2016-05-09 19:28:58.000000000 +0200
-+++ config/policy.xml 2016-05-10 17:44:26.720503000 +0200
-@@ -64,4 +64,9 @@
- <!-- <policy domain="coder" rights="none" pattern="HTTPS" /> -->
- <!-- <policy domain="path" rights="none" pattern="@*" /> -->
- <policy domain="cache" name="shared-secret" value="passphrase"/>
+--- config/policy.xml.orig 2017-09-23 12:22:07 UTC
++++ config/policy.xml
+@@ -64,6 +64,11 @@
+ <!-- <policy domain="resource" name="map" value="4GiB"/> -->
+ <!-- <policy domain="resource" name="width" value="10KP"/> -->
+ <!-- <policy domain="resource" name="height" value="10KP"/> -->
+ <policy domain="coder" rights="none" pattern="EPHEMERAL" />
+ <policy domain="coder" rights="none" pattern="URL" />
+ <policy domain="coder" rights="none" pattern="HTTPS" />
+ <policy domain="coder" rights="none" pattern="MVG" />
+ <policy domain="coder" rights="none" pattern="MSL" />
- </policymap>
+ <!-- <policy domain="resource" name="area" value="100MP"/> -->
+ <!-- <policy domain="resource" name="disk" value="16EiB"/> -->
+ <!-- <policy domain="resource" name="file" value="768"/> -->
Modified: head/japanese/esecanna/files/patch-README.jp
==============================================================================
Binary file (source and/or target). No diff available.
Modified: head/lang/tcl84/files/patch-warnings
==============================================================================
--- head/lang/tcl84/files/patch-warnings Thu Nov 9 19:57:31 2017 (r453864)
+++ head/lang/tcl84/files/patch-warnings Thu Nov 9 20:09:18 2017 (r453865)
@@ -1,12 +1,14 @@
Quiet the noisy "already defined" warning triggered, when building with TCL_THREADS.
---- ../unix/tclUnixPort.h Tue Dec 6 04:01:07 2005
-+++ ../unix/tclUnixPort.h Tue Jun 27 15:16:21 2006
-@@ -607,4 +607,7 @@
- #endif
- EXTERN char * TclpInetNtoa(struct in_addr);
+--- ../unix/tclUnixPort.h.orig 2012-11-19 16:27:16 UTC
++++ ../unix/tclUnixPort.h
+@@ -606,6 +606,9 @@ extern double strtod();
+ # undef HAVE_LANGINFO
+ # endif
+ # endif /* MAC_OS_X_VERSION_MAX_ALLOWED */
+#ifdef inet_ntoa
+# undef inet_ntoa
+#endif
- #define inet_ntoa(x) TclpInetNtoa(x)
- #else
+ # if defined(HAVE_COREFOUNDATION) && defined(__LP64__) && \
+ defined(HAVE_WEAK_IMPORT) && MAC_OS_X_VERSION_MIN_REQUIRED < 1050
+ # warning "Weak import of 64-bit CoreFoundation is not supported, will not run on Mac OS X < 10.5."
Modified: head/www/py-gunicorn/files/patch-requirements__test.txt
==============================================================================
--- head/www/py-gunicorn/files/patch-requirements__test.txt Thu Nov 9 19:57:31 2017 (r453864)
+++ head/www/py-gunicorn/files/patch-requirements__test.txt Thu Nov 9 20:09:18 2017 (r453865)
@@ -1,6 +1,6 @@
---- requirements_test.txt.orig 2015-02-04 13:43:57 UTC
+--- requirements_test.txt.orig 2016-01-05 00:10:38 UTC
+++ requirements_test.txt
@@ -1,2 +1 @@
--pytest==2.6.3
+-pytest==2.8.3
-pytest-cov==1.7.0
+pytest>=2.6.3
Modified: head/x11/rxvt-unicode/files/patch-src_gencompose
==============================================================================
--- head/x11/rxvt-unicode/files/patch-src_gencompose Thu Nov 9 19:57:31 2017 (r453864)
+++ head/x11/rxvt-unicode/files/patch-src_gencompose Thu Nov 9 20:09:18 2017 (r453865)
@@ -1,8 +1,8 @@
---- ./src/gencompose.orig Wed Aug 4 04:59:09 2004
-+++ ./src/gencompose Tue Aug 10 00:03:21 2004
+--- src/gencompose.orig 2014-05-22 18:53:16 UTC
++++ src/gencompose
@@ -1,4 +1,4 @@
--#!/opt/bin/perl
+-#!/usr/bin/perl
+#!/usr/bin/env perl
- # the generated tables mostly have NOT been checked so far!
-
+ open UNIDATA, "<", "www.unicode.org/Public/UNIDATA/UnicodeData.txt"
+ or die "www.unicode.org/Public/UNIDATA/UnicodeData.txt: $!";
Modified: head/x11/rxvt-unicode/files/patch-src_genlinedraw
==============================================================================
--- head/x11/rxvt-unicode/files/patch-src_genlinedraw Thu Nov 9 19:57:31 2017 (r453864)
+++ head/x11/rxvt-unicode/files/patch-src_genlinedraw Thu Nov 9 20:09:18 2017 (r453865)
@@ -1,8 +1,8 @@
---- ./src/genlinedraw.orig Wed Aug 4 04:59:09 2004
-+++ ./src/genlinedraw Tue Aug 10 00:03:21 2004
+--- src/genlinedraw.orig 2014-05-22 18:53:16 UTC
++++ src/genlinedraw
@@ -1,4 +1,4 @@
--#!/opt/bin/perl
+-#!/usr/bin/perl
+#!/usr/bin/env perl
- # the generated tables mostly have NOT been checked so far!
-
+ open TABLE, ">", "table/linedraw.h";
+ select TABLE;
More information about the svn-ports-all
mailing list