3 files changed, 47 insertions, 41 deletions
diff --git a/net-im/jabberd/files/digest-jabberd-2.0.8-r2 b/net-im/jabberd/files/digest-jabberd-2.0.8-r2
new file mode 100644
index 000000000000..f3bef4a18c1c
--- /dev/null
+++ b/net-im/jabberd/files/digest-jabberd-2.0.8-r2
@@ -0,0 +1 @@
+MD5 96753c5e74676ace0841a4cee9f13fdb jabberd-2.0s8.tar.gz 757149
diff --git a/net-im/jabberd/files/jabberd-2.0.8-r2-FindBin.patch b/net-im/jabberd/files/jabberd-2.0.8-r2-FindBin.patch
new file mode 100644
index 000000000000..289121aa8d07
--- /dev/null
+++ b/net-im/jabberd/files/jabberd-2.0.8-r2-FindBin.patch
@@ -0,0 +1,46 @@
+diff -ur jabberd-2.0s8.orig/tools/jabberd.in jabberd-2.0s8/tools/jabberd.in
+--- jabberd-2.0s8.orig/tools/jabberd.in	2004-12-07 18:08:38.000000000 +0100
++++ jabberd-2.0s8/tools/jabberd.in	2005-06-14 00:01:29.000000000 +0200
+@@ -14,7 +14,7 @@
+ 
+ use strict;
+ use Getopt::Std;
+-use FindBin qw($Bin);
++#use FindBin qw($Bin);
+ use FileHandle;
+ use IPC::Open3;
+ use IO::Select;
+@@ -25,6 +25,7 @@
+ #-----------------------------------------------------------------------------
+ # Define some initial variables and default them as needed.
+ #-----------------------------------------------------------------------------
++my $Bin = "@bindir@";
+ my $VERSION = "@VERSION@";
+ my $config_dir = "@sysconfdir@";
+ my $config = $config_dir."/jabberd.cfg";
+diff -ur jabberd-2.0s8.orig/tools/Makefile.am jabberd-2.0s8/tools/Makefile.am
+--- jabberd-2.0s8.orig/tools/Makefile.am	2005-04-14 21:43:52.000000000 +0200
++++ jabberd-2.0s8/tools/Makefile.am	2005-06-14 00:01:29.000000000 +0200
+@@ -3,7 +3,8 @@
+ 
+ edit = sed \
+ 	-e 's,@sysconfdir\@,$(sysconfdir),g' \
+-	-e 's,@VERSION\@,$(VERSION),g'
++	-e 's,@VERSION\@,$(VERSION),g' \
++	-e 's,@bindir\@,$(bindir),g'
+ 
+ $(bin_SCRIPTS): $(EXTRA_DIST)
+ 	@echo "generating $@ from $@.in"; \
+diff -ur jabberd-2.0s8.orig/tools/Makefile.in jabberd-2.0s8/tools/Makefile.in
+--- jabberd-2.0s8.orig/tools/Makefile.in	2005-04-20 09:37:33.000000000 +0200
++++ jabberd-2.0s8/tools/Makefile.in	2005-06-14 00:02:27.000000000 +0200
+@@ -152,7 +152,8 @@
+ EXTRA_DIST = db-setup.mysql db-setup.pgsql jabberd.in jabberd.rc pipe-auth.pl migrate.pl db-update.mysql db-setup.oracle
+ edit = sed \
+ 	-e 's,@sysconfdir\@,$(sysconfdir),g' \
+-	-e 's,@VERSION\@,$(VERSION),g'
++	-e 's,@VERSION\@,$(VERSION),g' \
++	-e 's,@bindir\@,$(bindir),g'
+ 
+ all: all-am
+ 
diff --git a/net-im/jabberd/files/jabberd-2.0s8-FindBin.patch b/net-im/jabberd/files/jabberd-2.0s8-FindBin.patch
deleted file mode 100644
index a4c398d5f118..000000000000
--- a/net-im/jabberd/files/jabberd-2.0s8-FindBin.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: tools/jabberd.in
-===================================================================
-RCS file: /home/cvs/jabberd2/tools/jabberd.in,v
-retrieving revision 1.3.2.1
-diff -u -r1.3.2.1 jabberd.in
---- tools/jabberd.in	7 Dec 2004 17:08:38 -0000	1.3.2.1
-+++ tools/jabberd.in	12 Jun 2005 11:01:11 -0000
-@@ -14,7 +14,7 @@
- 
- use strict;
- use Getopt::Std;
--use FindBin qw($Bin);
-+#use FindBin qw($Bin);
- use FileHandle;
- use IPC::Open3;
- use IO::Select;
-@@ -25,6 +25,7 @@
- #-----------------------------------------------------------------------------
- # Define some initial variables and default them as needed.
- #-----------------------------------------------------------------------------
-+my $Bin = "@bindir@";
- my $VERSION = "@VERSION@";
- my $config_dir = "@sysconfdir@";
- my $config = $config_dir."/jabberd.cfg";
-Index: tools/Makefile.am
-===================================================================
-RCS file: /home/cvs/jabberd2/tools/Makefile.am,v
-retrieving revision 1.10.2.2
-diff -u -r1.10.2.2 Makefile.am
---- tools/Makefile.am	14 Apr 2005 19:48:03 -0000	1.10.2.2
-+++ tools/Makefile.am	12 Jun 2005 11:01:11 -0000
-@@ -3,7 +3,8 @@
- 
- edit = sed \
- 	-e 's,@sysconfdir\@,$(sysconfdir),g' \
--	-e 's,@VERSION\@,$(VERSION),g'
-+	-e 's,@VERSION\@,$(VERSION),g' \
-+	-e 's,@bindir\@,$(bindir),g'
- 
- $(bin_SCRIPTS): $(EXTRA_DIST)
- 	@echo "generating $@ from $@.in"; \