aboutsummaryrefslogtreecommitdiff
path: root/net-im/ejabberd
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2015-09-16 13:03:45 +0000
committerMathieu Arnold <mat@FreeBSD.org>2015-09-16 13:03:45 +0000
commit320514f1dd81c5d1a7bfd6891b34bd078110ebf4 (patch)
treed37448b1d3b9d6316db368890a90c01765f26f42 /net-im/ejabberd
parentb2abb350a9ca6a4b2c5f8882c7b6360ea4322753 (diff)
downloadports-320514f1dd81c5d1a7bfd6891b34bd078110ebf4.tar.gz
ports-320514f1dd81c5d1a7bfd6891b34bd078110ebf4.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
Notes
Notes: svn path=/head/; revision=397064
Diffstat (limited to 'net-im/ejabberd')
-rw-r--r--net-im/ejabberd/files/patch-ejabberdctl.template3
-rw-r--r--net-im/ejabberd/files/patch-erlang-17-dict-queue17
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 7e492eb9bc60..ceca246e0678 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 5f67b39599f4..ace41dd408e2 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 @@