Improved patch. See bug #9303

4 files changed, 126 insertions, 1 deletions

diff --git a/net-irc/quirc/ChangeLog b/net-irc/quirc/ChangeLog
index fb5d30f07357..0effecb60431 100644
--- a/net-irc/quirc/ChangeLog
+++ b/net-irc/quirc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/quirc
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quirc/ChangeLog,v 1.2 2002/10/22 05:01:11 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quirc/ChangeLog,v 1.3 2002/11/06 08:04:33 raker Exp $
+
+*quirc-0.9.83-r1 (06 Nov 2002)
+
+  06 Nov 2002; Nick Hadaway <raker@gentoo.org> quirc-0.9.83-r1.ebuild,
+  files/digest-quirc-0.9.83-r1, files/0.9.83-r1-gentoo.diff :
+  Improved patch based on suggestions by Jay Nation.
 
 *quirc-0.9.83 (21 Oct 2002)
 
diff --git a/net-irc/quirc/files/0.9.83-r1-gentoo.diff b/net-irc/quirc/files/0.9.83-r1-gentoo.diff
new file mode 100644
index 000000000000..5d82a9c8e9be
--- /dev/null
+++ b/net-irc/quirc/files/0.9.83-r1-gentoo.diff
@@ -0,0 +1,62 @@
+diff -urN quirc-0.9.83/configure.in quirc-0.9.83-modified/configure.in
+--- quirc-0.9.83/configure.in	2002-10-02 01:23:58.000000000 -0500
++++ quirc-0.9.83-modified/configure.in	2002-11-06 01:58:07.000000000 -0600
+@@ -55,12 +55,12 @@
+ CXXFLAGS="$CXXFLAGS $X_CFLAGS"
+ 
+ dnl Add some convenient directories to LIBS
+-LDFLAGS="$LDFLAGS -L/usr/local/lib -L. -L.. -L$HOME/lib"
++LDFLAGS="$LDFLAGS -L. -L.. -L$HOME/lib"
+ 
+ dnl Add some nice dirs to CPPFLAGS (-I. -I.. -IHOME/include ?)
+ dnl $x_includes may have more than one dir in it.  $X_CFLAGS could be used as
+ dnl an alternative if such a case is discovered.
+-CPPFLAGS="$CPPFLAGS -I/usr/local/include"
++dnl CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+ 
+ dnl Back up the existing flags, then add the X includes on, for internal use.
+ cppflags_backup="$CPPFLAGS"
+@@ -111,7 +111,7 @@
+ 
+ if test "$WISH" = "notfound"; then
+   AC_PATH_PROGS(WISH, wish8.3 wish8.2 wish8.1 wish8.0 wish, notfound, \
+-  $PATH:/usr/bin:/usr/local/bin)
++  $PATH:/usr/bin)
+ fi
+ 
+ if test "$WISH" = "notfound"; then
+diff -urN quirc-0.9.83/server.cc quirc-0.9.83-modified/server.cc
+--- quirc-0.9.83/server.cc	2002-10-02 01:19:22.000000000 -0500
++++ quirc-0.9.83-modified/server.cc	2002-11-06 01:54:36.000000000 -0600
+@@ -11,7 +11,8 @@
+ #include <ctype.h>
+ #include <netdb.h> 
+ #include <stdarg.h>
+-#include <iostream.h>
++
++using namespace std;
+ 
+ #include "config.h"
+ 
+diff -urN quirc-0.9.83/servertcl.cc quirc-0.9.83-modified/servertcl.cc
+--- quirc-0.9.83/servertcl.cc	2002-10-02 01:18:59.000000000 -0500
++++ quirc-0.9.83-modified/servertcl.cc	2002-11-06 01:54:36.000000000 -0600
+@@ -1,6 +1,7 @@
+ #include <sys/types.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
++#include <ctype.h>
+ 
+ #ifdef DMALLOC
+ #include <dmalloc.h>
+diff -urN quirc-0.9.83/tcl.cc quirc-0.9.83-modified/tcl.cc
+--- quirc-0.9.83/tcl.cc	2002-10-01 03:32:32.000000000 -0500
++++ quirc-0.9.83-modified/tcl.cc	2002-11-06 01:54:36.000000000 -0600
+@@ -1,6 +1,7 @@
+ #include <sys/time.h>
+ #include <unistd.h>
+ #include <sys/socket.h>
++#include <ctype.h>
+ 
+ #ifdef DMALLOC
+ #include <dmalloc.h>
diff --git a/net-irc/quirc/files/digest-quirc-0.9.83-r1 b/net-irc/quirc/files/digest-quirc-0.9.83-r1
new file mode 100644
index 000000000000..0bae9897cdb1
--- /dev/null
+++ b/net-irc/quirc/files/digest-quirc-0.9.83-r1
@@ -0,0 +1 @@
+MD5 27f357aac1f305682ae79c9f0163c069 quirc-0.9.83.tar.gz 297139
diff --git a/net-irc/quirc/quirc-0.9.83-r1.ebuild b/net-irc/quirc/quirc-0.9.83-r1.ebuild
new file mode 100644
index 000000000000..4ee309765278
--- /dev/null
+++ b/net-irc/quirc/quirc-0.9.83-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quirc/quirc-0.9.83-r1.ebuild,v 1.1 2002/11/06 08:04:33 raker Exp $
+
+S=${WORKDIR}/${P}
+
+DESCRIPTION="A GUI IRC client scriptable in Tcl/Tk"
+SRC_URI="http://quirc.org/${P}.tar.gz"
+HOMEPAGE="http://quirc.org/"
+
+DEPEND="dev-lang/tcl 
+	dev-lang/tk"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	patch -p1 < ${FILESDIR}/0.9.83-r1-gentoo.diff || die "patch failed"
+
+}
+
+src_compile() {
+
+	export CXX="g++"
+
+	econf \
+		--datadir=/usr/share/quirc \
+		|| die "./configure failed"
+
+	emake || die
+
+}
+
+src_install () {
+
+	exeinto /usr/bin
+	doexe quirc
+
+	insinto /usr/share/quirc
+	doins data/*.tcl data/quedit data/fontsel data/servers data/VERSION
+
+	insinto /usr/share/quirc/common
+	doins ${S}/data/common/*.tcl
+
+	insinto /usr/share/quirc/themes
+	doins ${S}/data/themes/*.tcl
+
+	# this package installs docs, but we would rather do that ourselves
+	dodoc README NEWS INSTALL FAQ ChangeLog* COPYING AUTHORS
+	dodoc doc/*.txt
+
+}