diff options
| author | mat <mat@FreeBSD.org> | 2015-09-16 21:03:45 +0800 |
|---|---|---|
| committer | mat <mat@FreeBSD.org> | 2015-09-16 21:03:45 +0800 |
| commit | 0626f37f1e7a53c27719215ea1c7e55c5933011d (patch) | |
| tree | d37448b1d3b9d6316db368890a90c01765f26f42 /net-im/ejabberd | |
| parent | 3f1bef742f739745c93f4968fd5cb7090bf8150f (diff) | |
| download | freebsd-ports-graphics-0626f37f1e7a53c27719215ea1c7e55c5933011d.tar.gz freebsd-ports-graphics-0626f37f1e7a53c27719215ea1c7e55c5933011d.tar.zst freebsd-ports-graphics-0626f37f1e7a53c27719215ea1c7e55c5933011d.zip | |
It seems some people keep adding $FreeBSD$ to patch files.
Patches must not be changed by the vcs, this includes the
svn:keyword expansion. Set fbsd:nokeywords to a couple of patches.
With hat: portmgr
Sponsored by: Absolight
Diffstat (limited to 'net-im/ejabberd')
| -rw-r--r-- | net-im/ejabberd/files/patch-ejabberdctl.template | 3 | ||||
| -rw-r--r-- | net-im/ejabberd/files/patch-erlang-17-dict-queue | 17 |
2 files changed, 0 insertions, 20 deletions
diff --git a/net-im/ejabberd/files/patch-ejabberdctl.template b/net-im/ejabberd/files/patch-ejabberdctl.template index 7e492eb9bc6..ceca246e067 100644 --- a/net-im/ejabberd/files/patch-ejabberdctl.template +++ b/net-im/ejabberd/files/patch-ejabberdctl.template @@ -1,6 +1,3 @@ - -$FreeBSD$ - --- ejabberdctl.template.orig +++ ejabberdctl.template @@ -71,10 +71,10 @@ diff --git a/net-im/ejabberd/files/patch-erlang-17-dict-queue b/net-im/ejabberd/files/patch-erlang-17-dict-queue index 5f67b39599f..ace41dd408e 100644 --- a/net-im/ejabberd/files/patch-erlang-17-dict-queue +++ b/net-im/ejabberd/files/patch-erlang-17-dict-queue @@ -1,10 +1,5 @@ -$FreeBSD$ - Fixes to make it work with Erlang R17 - -$FreeBSD$ - --- ../deps/riak_pb/src/riak_pb_kv_codec.erl.orig +++ ../deps/riak_pb/src/riak_pb_kv_codec.erl @@ -49,7 +49,11 @@ @@ -20,8 +15,6 @@ $FreeBSD$ %% @doc Convert a list of object {MetaData,Value} pairs to protocol -$FreeBSD$ - --- ../deps/riak_pb/rebar.config.orig +++ ../deps/riak_pb/rebar.config @@ -1,5 +1,5 @@ @@ -32,8 +25,6 @@ $FreeBSD$ {protobuffs, "0.8.1", {git, "git://github.com/basho/erlang_protobuffs.git", {tag, "0.8.1p1"}}} ]}. -$FreeBSD$ - --- ../deps/esip/src/esip_listener.erl.orig +++ ../deps/esip/src/esip_listener.erl @@ -37,7 +37,11 @@ @@ -49,8 +40,6 @@ $FreeBSD$ %%%=================================================================== %%% API -$FreeBSD$ - --- ../deps/esip/rebar.config.orig +++ ../deps/esip/rebar.config @@ -1,4 +1,5 @@ @@ -61,8 +50,6 @@ $FreeBSD$ {i, "../p1_stun/include"}]}. -$FreeBSD$ - --- ../deps/p1_stun/src/turn.erl.orig +++ ../deps/p1_stun/src/turn.erl @@ -56,6 +56,29 @@ @@ -104,8 +91,6 @@ $FreeBSD$ %%==================================================================== %% API -$FreeBSD$ - --- ../deps/p1_stun/rebar.config.orig +++ ../deps/p1_stun/rebar.config @@ -1,4 +1,5 @@ @@ -116,8 +101,6 @@ $FreeBSD$ {deps, [{p1_tls, ".*", {git, "git://github.com/processone/tls.git"}}, {p1_utils, ".*", {git, "git://github.com/processone/p1_utils.git"}}]}. -$FreeBSD$ - --- ../deps/p1_stun/src/stun_listener.erl.orig +++ ../deps/p1_stun/src/stun_listener.erl @@ -36,7 +36,11 @@ |