[pkgsrc/trunk]: pkgsrc/net/libradius Add RCS Id to patch-aa and remove confli...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/729cc15e92ac
branches:  trunk
changeset: 485481:729cc15e92ac
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Dec 13 11:50:59 2004 +0000

description:
Add RCS Id to patch-aa and remove conflicts lines from distinfo.

diffstat:

 net/libradius/distinfo         |  7 ++-----
 net/libradius/patches/patch-aa |  2 ++
 2 files changed, 4 insertions(+), 5 deletions(-)

diffs (23 lines):

diff -r d2aace1e8b12 -r 729cc15e92ac net/libradius/distinfo
--- a/net/libradius/distinfo    Mon Dec 13 08:10:52 2004 +0000
+++ b/net/libradius/distinfo    Mon Dec 13 11:50:59 2004 +0000
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.3 2004/12/13 08:10:52 manu Exp $
+$NetBSD: distinfo,v 1.4 2004/12/13 11:50:59 wiz Exp $
 
 SHA1 (libradius-linux-20040827.tar.gz) = 27abd1390d16befe290ded70579bfdda8fabe68f
 Size (libradius-linux-20040827.tar.gz) = 15791 bytes
-<<<<<<< distinfo
-=======
->>>>>>> 1.2
-SHA1 (patch-aa) = 5fdf496cad5f656f8af502533a1a0e4c376783c6
+SHA1 (patch-aa) = 4d8f06404570a758805afe19cadea9d421808f9f
diff -r d2aace1e8b12 -r 729cc15e92ac net/libradius/patches/patch-aa
--- a/net/libradius/patches/patch-aa    Mon Dec 13 08:10:52 2004 +0000
+++ b/net/libradius/patches/patch-aa    Mon Dec 13 11:50:59 2004 +0000
@@ -1,3 +1,5 @@
+$NetBSD: patch-aa,v 1.5 2004/12/13 11:51:00 wiz Exp $
+
 --- Makefile.orig      2004-08-27 09:20:33.000000000 +0200
 +++ Makefile   2004-12-13 09:11:36.000000000 +0100
 @@ -23,17 +23,13 @@