Upped dependancy to >=fltk-1.1.0_rc7 and included virtual/x11. Added

lib and include locations for fltk so xpp detects them properly.  Also
patched cups-related code for gcc3 strictness.

3 files changed, 67 insertions, 10 deletions

diff --git a/net-print/xpp/ChangeLog b/net-print/xpp/ChangeLog
index b27b84719896..e2b4191d50b8 100644
--- a/net-print/xpp/ChangeLog
+++ b/net-print/xpp/ChangeLog
@@ -1,14 +1,19 @@
 # ChangeLog for net-print/xpp
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/ChangeLog,v 1.3 2002/07/14 20:41:22 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/ChangeLog,v 1.4 2002/10/04 14:15:39 raker Exp $
 
 *xpp-1.1 (12 Mar 2002)
 
+  04 Oct 2002; Nick Hadaway <raker@gentoo.org> xpp-1.1.ebuild,
+  files/cups.diff :
+  Upped dependancy to >=fltk-1.1.0_rc7 and included virtual/x11.  Added
+  lib and include locations for fltk so xpp detects them properly.  Also
+  patched cups-related code for gcc3 strictness.
+
   14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> xpp-1.1.ebuild :
   Added KEYWORDS, SLOT.
 
   12 Mar 2002; Guido Bakker <guidob@gentoo.org> ebuild :
-
   Version update, works with latest cups.
 
 *xpp-1.0-r1 (1 Feb 2002)
@@ -17,7 +22,6 @@
   Added KEYWORDS, SLOT.
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
diff --git a/net-print/xpp/files/cups.diff b/net-print/xpp/files/cups.diff
new file mode 100644
index 000000000000..dae39512cb71
--- /dev/null
+++ b/net-print/xpp/files/cups.diff
@@ -0,0 +1,34 @@
+diff -urN xpp-1.1/cupshelper.cxx xpp-1.1-modified/cupshelper.cxx
+--- xpp-1.1/cupshelper.cxx	2002-01-09 07:34:17.000000000 -0600
++++ xpp-1.1-modified/cupshelper.cxx	2002-10-04 09:07:59.000000000 -0500
+@@ -67,14 +67,14 @@
+ 	return port_;
+ }
+ 
+-void CupsHelper::setHostInfo(const char *host, int port = 631){
++void CupsHelper::setHostInfo(const char *host, int port){
+ 	strcpy(host_,host);
+ 	cupsSetServer(host_);
+ 	port_ = port;
+ 	ippSetPort(port_);
+ }
+ 
+-void CupsHelper::setLoginInfo(const char *usr = 0, const char *pwd = 0){
++void CupsHelper::setLoginInfo(const char *usr, const char *pwd){
+ 	strcpy(login_,usr);
+ 	cupsSetUser(login_);
+ 	strcpy(password_,pwd);
+diff -urN xpp-1.1/cupshelper.h xpp-1.1-modified/cupshelper.h
+--- xpp-1.1/cupshelper.h	2002-01-09 07:34:17.000000000 -0600
++++ xpp-1.1-modified/cupshelper.h	2002-10-04 09:08:15.000000000 -0500
+@@ -51,8 +51,8 @@
+ public: 
+ 	CupsHelper();
+ 	~CupsHelper();
+-  static void setLoginInfo(const char *usr = 0, const char *pwd = 0);
+-  static void setHostInfo(const char *host, int port = 631);
++  static void setLoginInfo(const char *usr, const char *pwd);
++  static void setHostInfo(const char *host, int port);
+   static int port();
+   static const char* host();
+   static const char* password();
diff --git a/net-print/xpp/xpp-1.1.ebuild b/net-print/xpp/xpp-1.1.ebuild
index 1a76829682c7..a3f67ab18808 100644
--- a/net-print/xpp/xpp-1.1.ebuild
+++ b/net-print/xpp/xpp-1.1.ebuild
@@ -1,28 +1,47 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/xpp-1.1.ebuild,v 1.5 2002/10/04 06:18:46 vapier Exp $
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/xpp-1.1.ebuild,v 1.6 2002/10/04 14:15:39 raker Exp $
 
 S=${WORKDIR}/${P}
+
 DESCRIPTION="X Printing Panel"
 SRC_URI="mirror://sourceforge/cups/${P}.tar.gz"
 HOMEPAGE="http://cups.sourceforge.net/xpp/"
+
 KEYWORDS="x86"
 SLOT="0"
 LICENSE="GPL-2"
 
-DEPEND="virtual/glibc >=net-print/cups-1.1.14
-	>=x11-libs/fltk-1.0.11"
+DEPEND="virtual/glibc
+	virtual/x11
+	>=net-print/cups-1.1.14
+	>=x11-libs/fltk-1.1.0_rc7"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	patch -p1 < ${FILESDIR}/cups.diff || die "patch failed"
+
+}
 
 src_compile() {
 
-	econf || die
-	make || die
+	export CXX=g++
+	export LDFLAGS="-L/usr/lib/fltk-1.1"
+	export CPPFLAGS="-I/usr/include/fltk-1.1"
+
+	econf || die "configure failed"
+
+	make || die "make failed"
 
 }
 
 src_install () {
 
-	make DESTDIR=${D} install || die
+	einstall || die "make install failed"
+
 	dodoc LICENSE ChangeLog README
+
 }