diff options
| author | Antoine Brodin <antoine@FreeBSD.org> | 2017-11-10 07:10:35 +0000 |
|---|---|---|
| committer | Antoine Brodin <antoine@FreeBSD.org> | 2017-11-10 07:10:35 +0000 |
| commit | 1cd3011b812cec794b1413c3a087d8a47abde2b3 (patch) | |
| tree | 89e58904ded243b9400fcb02cbf5d712c29d2a63 | |
| parent | Update to 3.0-2592-gba53cb5b (diff) | |
Fix the context of some patches so that they apply with stricter patch(1)
PR: 223545
With hat: portmgr
Notes
Notes:
svn path=/head/; revision=453885
4 files changed, 18 insertions, 15 deletions
diff --git a/comms/morse/files/patch-QSO.1 b/comms/morse/files/patch-QSO.1 index 4488ce3654cd..fc74d54e7fc5 100644 --- a/comms/morse/files/patch-QSO.1 +++ b/comms/morse/files/patch-QSO.1 @@ -1,5 +1,5 @@ ---- QSO.1.orig 2012-04-12 10:05:53.000000000 -0700 -+++ QSO.1 2012-04-12 10:05:57.000000000 -0700 +--- QSO.1.orig 2012-11-27 06:47:32 UTC ++++ QSO.1 @@ -1 +1 @@ --.so man1/morse.1 +-.so morse.1 +.so man1/morsec.1 diff --git a/databases/mongodb32-tools/files/patch-vendor_src_github.com_spacemonkeygo_openssl_build.go b/databases/mongodb32-tools/files/patch-vendor_src_github.com_spacemonkeygo_openssl_build.go index 9a64dec16a65..6e35a6a6149f 100644 --- a/databases/mongodb32-tools/files/patch-vendor_src_github.com_spacemonkeygo_openssl_build.go +++ b/databases/mongodb32-tools/files/patch-vendor_src_github.com_spacemonkeygo_openssl_build.go @@ -1,8 +1,9 @@ ---- vendor/src/github.com/spacemonkeygo/openssl/build.go.orig 2016-01-03 17:52:18 UTC +--- vendor/src/github.com/spacemonkeygo/openssl/build.go.orig 2016-08-30 17:14:55 UTC +++ vendor/src/github.com/spacemonkeygo/openssl/build.go -@@ -19,4 +19,5 @@ package openssl +@@ -19,5 +19,6 @@ package openssl // #cgo linux pkg-config: openssl // #cgo windows CFLAGS: -DWIN32_LEAN_AND_MEAN - // #cgo darwin LDFLAGS: -lssl -lcrypto + // #cgo darwin CFLAGS: -Wno-deprecated-declarations +// #cgo freebsd LDFLAGS: -lssl -lcrypto + // #cgo darwin LDFLAGS: -lssl -lcrypto import "C" diff --git a/databases/mongodb34-tools/files/patch-vendor_src_github.com_spacemonkeygo_openssl_build.go b/databases/mongodb34-tools/files/patch-vendor_src_github.com_spacemonkeygo_openssl_build.go index 9a64dec16a65..84c06e3f3083 100644 --- a/databases/mongodb34-tools/files/patch-vendor_src_github.com_spacemonkeygo_openssl_build.go +++ b/databases/mongodb34-tools/files/patch-vendor_src_github.com_spacemonkeygo_openssl_build.go @@ -1,8 +1,10 @@ ---- vendor/src/github.com/spacemonkeygo/openssl/build.go.orig 2016-01-03 17:52:18 UTC +--- vendor/src/github.com/spacemonkeygo/openssl/build.go.orig 2017-07-31 19:00:22 UTC +++ vendor/src/github.com/spacemonkeygo/openssl/build.go -@@ -19,4 +19,5 @@ package openssl +@@ -19,6 +19,7 @@ package openssl // #cgo linux pkg-config: openssl // #cgo windows CFLAGS: -DWIN32_LEAN_AND_MEAN - // #cgo darwin LDFLAGS: -lssl -lcrypto + // #cgo windows LDFLAGS: -lcrypt32 +// #cgo freebsd LDFLAGS: -lssl -lcrypto + // #cgo darwin CFLAGS: -Wno-deprecated-declarations + // #cgo darwin LDFLAGS: -lssl -lcrypto -framework CoreFoundation -framework Foundation -framework Security import "C" diff --git a/sysutils/mapchan/files/patch-examples__default b/sysutils/mapchan/files/patch-examples__default index 32e3ff0aaf8b..a396c03248ff 100644 --- a/sysutils/mapchan/files/patch-examples__default +++ b/sysutils/mapchan/files/patch-examples__default @@ -1,8 +1,8 @@ ---- examples/default.orig Sat Dec 23 09:47:26 2000 -+++ examples/default Sun Aug 31 13:51:08 2003 +--- examples/default.orig 2005-09-18 08:03:13 UTC ++++ examples/default @@ -1,4 +1,4 @@ --tty5 altkoi.map +-# Настройки mapchan по умолчанию +ttyv5 altkoi.map - ttyS1 koiualt.map - ttyS16 koiumain.map - ttyS17 sm7238.map + # + # <tty> <map-file> <pty> <quiet> <debug> <logfile> <program> + # |