diff options
| author | Andrey Slusar <anray@FreeBSD.org> | 2006-04-30 16:23:47 +0000 |
|---|---|---|
| committer | Andrey Slusar <anray@FreeBSD.org> | 2006-04-30 16:23:47 +0000 |
| commit | fd092d0ec061dcf1991745757cb0bff9c8b9b760 (patch) | |
| tree | b6eb95a6fa2004a26963dfc6d4a3ebe9431963b7 /irc/kvirc/files | |
| parent | Remove a forgotten patch to fix the apply patches. (diff) | |
Fix conflict between kvirc and kdenetwork.
PR: ports/93402
Submitted by: "chris@i13i.com" <kse@admin.i13i.com>
Approved by: maintainer
Notes
Notes:
svn path=/head/; revision=160922
Diffstat (limited to 'irc/kvirc/files')
| -rw-r--r-- | irc/kvirc/files/patch-Makefile.am | 10 | ||||
| -rw-r--r-- | irc/kvirc/files/patch-Makefile.in | 11 |
2 files changed, 21 insertions, 0 deletions
diff --git a/irc/kvirc/files/patch-Makefile.am b/irc/kvirc/files/patch-Makefile.am new file mode 100644 index 000000000000..f1bebcb5c8ec --- /dev/null +++ b/irc/kvirc/files/patch-Makefile.am @@ -0,0 +1,10 @@ +--- data/protocols/Makefile.am.bak Wed Feb 15 10:30:27 2006 ++++ data/protocols/Makefile.am Sun Aug 3 21:33:44 2003 +@@ -4,6 +4,6 @@ + + tmpdir = $(kdeservicesdir) + ++tmp_DATA = kvirc.protocol kvirc6.protocol +-tmp_DATA = irc.protocol irc6.protocol + + EXTRA_DIST = $(tmp_DATA) diff --git a/irc/kvirc/files/patch-Makefile.in b/irc/kvirc/files/patch-Makefile.in new file mode 100644 index 000000000000..91adc0232c8d --- /dev/null +++ b/irc/kvirc/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- data/protocols/Makefile.in.bak Wed Feb 15 10:36:43 2006 ++++ data/protocols/Makefile.in Fri Feb 25 21:34:49 2005 +@@ -183,7 +183,7 @@ + + tmpdir = $(kdeservicesdir) + +-tmp_DATA = irc.protocol irc6.protocol ++tmp_DATA = kvirc.protocol kvirc6.protocol + + EXTRA_DIST = $(tmp_DATA) + subdir = data/protocols |