# ChangeLog for x11-misc/bbppp
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbppp/ChangeLog,v 1.9 2004/06/24 22:13:27 agriffis Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbppp/ChangeLog,v 1.10 2005/01/08 18:39:23 ka0ttic Exp $
+
+ 08 Jan 2005; Aaron Walker <ka0ttic@gentoo.org>
+ +files/bbppp-gcc3-multiline.diff, bbppp-0.2.3.ebuild:
+ Added patch to fix compile failure - bug 58326.
14 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> bbppp-0.2.3.ebuild:
Removed S=, added IUSE=
-MD5 98f473b8e6f30c14e0e62bbadd544264 bbppp-0.2.2-r1.ebuild 879
-MD5 9156af16a1396c71d563cb4a7e215e65 bbppp-0.2.3.ebuild 828
-MD5 0971fb69a9a99ee48d4210bbcd10b7f5 bbppp-0.2.2-r2.ebuild 873
-MD5 9fa69950b74d24fff7d4912681e3adc2 ChangeLog 1337
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 902f45f58693528dcc072a7ef2528daf bbppp-0.2.2-r1.ebuild 878
+MD5 cf5aca8a769f8939673c45f532952378 bbppp-0.2.3.ebuild 1008
+MD5 52fecfbca0ed78563d76302343b54ca1 bbppp-0.2.2-r2.ebuild 872
+MD5 f24a33849b4d7c6c3a6c303c32f96224 ChangeLog 1493
MD5 d42cf2dcf1d1ec3872a841e0a5de140a metadata.xml 244
+MD5 2d9e9b50a2d05c586f3faf22158596f2 files/bbppp-gcc3-multiline.diff 2884
MD5 7eeb78566dc0cecf2c5e381067c1ed0a files/digest-bbppp-0.2.2-r1 62
MD5 7eeb78566dc0cecf2c5e381067c1ed0a files/digest-bbppp-0.2.2-r2 62
MD5 e8cc607e24fb73eae134b7aee08591b6 files/digest-bbppp-0.2.3 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB4Cj4EZCkKN40op4RAly8AJwJXmk9FS1crTDTVsWZU8N4eUCLKACgh2VT
+ebQPtCgtwuBaKVQiih5IGjo=
+=vhWc
+-----END PGP SIGNATURE-----
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbppp/bbppp-0.2.2-r1.ebuild,v 1.12 2004/07/15 00:51:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbppp/bbppp-0.2.2-r1.ebuild,v 1.13 2005/01/08 18:39:23 ka0ttic Exp $
DESCRIPTION="blackbox ppp frontend/monitor"
SRC_URI="http://bbtools.thelinuxcommunity.org/sources/${P}.tar.gz"
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbppp/bbppp-0.2.2-r2.ebuild,v 1.11 2004/07/15 00:51:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbppp/bbppp-0.2.2-r2.ebuild,v 1.12 2005/01/08 18:39:23 ka0ttic Exp $
DESCRIPTION="blackbox ppp frontend/monitor"
SRC_URI="http://bbtools.thelinuxcommunity.org/sources/${P}.tar.gz"
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbppp/bbppp-0.2.3.ebuild,v 1.5 2004/06/24 22:13:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbppp/bbppp-0.2.3.ebuild,v 1.6 2005/01/08 18:39:23 ka0ttic Exp $
+
+inherit eutils
-IUSE=""
DESCRIPTION="blackbox ppp frontend/monitor"
+HOMEPAGE="http://bbtools.windsofstorm.net/sources/available.phtml#bbppp"
SRC_URI="http://bbtools.windsofstorm.net/sources/${P}.tar.gz"
-HOMEPAGE="http://bbtools.windsofstorm.net/available.phtml#bbppp"
+
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="x86 sparc ppc"
+IUSE=""
DEPEND="virtual/blackbox"
-src_compile() {
- econf || die
- emake || die
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ epatch ${FILESDIR}/${PN}-gcc3-multiline.diff
}
src_install () {
- make DESTDIR=${D} install || die
+ make DESTDIR="${D}" install || die
dodoc README COPYING AUTHORS BUGS INSTALL ChangeLog NEWS TODO data/README.bbppp
}
pkg_postinst() {
- cd ${ROOT}usr/X11R6/bin/wm
- if [ ! "`grep bbppp blackbox`" ] ; then
- sed -e "s/.*blackbox/exec \/usr\/bin\/bbppp \&\n&/" blackbox | cat > blackbox
+ # don't assume blackbox exists because virtual/blackbox is installed
+ if [[ -x ${ROOT}/usr/bin/blackbox ]] ; then
+ if ! grep bbppp ${ROOT}/usr/bin/blackbox &>/dev/null ; then
+ sed -e "s/.*blackbox/exec \/usr\/bin\/bbppp \&\n&/" blackbox | cat > blackbox
+ fi
fi
}
--- /dev/null
+--- main.cc.orig 2001-04-28 05:32:24.000000000 -0500
++++ main.cc 2004-08-12 17:25:13.727140704 -0500
+@@ -24,26 +24,25 @@
+
+ void Usage()
+ {
+- char* usageOptions = {"Options:\n\
+- -display <display name> X server to connect to\n\
+- -c[onfig] <filename> Alternate config file\n\
+- -n[obb] Fall back on default configuration\n\
+- -v[ersion] Display version number\n\
+- -h[elp] Display this help\n\
+- -geom[etry] <geometry> Set geometry of window\n\
+- -d[ecorated] Show 'normal' decorated window\n\
+- -w[ithdrawn] Place bbtool in the Slit\n\
+- -s[hape] Don't display groundplate\n\
+- -thru[put] Display throughput rate\n\
+- -o[rient] <v|h> Display window widgets horizontally or vertically\n\
+- -com[pact] Display buttons in compact style\n\
+- -notime Dont display time window\n\
+- -nosecs Show uptime in old-style hh:mm format\n\
+- "};
++ char* usageOptions = {"Options:\n"
++ "-display <display name> X server to connect to\n"
++ "-c[onfig] <filename> Alternate config file\n"
++ "-n[obb] Fall back on default configuration\n"
++ "-v[ersion] Display version number\n"
++ "-h[elp] Display this help\n"
++ "-geom[etry] <geometry> Set geometry of window\n"
++ "-d[ecorated] Show 'normal' decorated window\n"
++ "-w[ithdrawn] Place bbtool in the Slit\n"
++ "-s[hape] Don't display groundplate\n"
++ "-thru[put] Display throughput rate\n"
++ "-o[rient] <v|h> Display window widgets horizontally or vertically\n"
++ "-com[pact] Display buttons in compact style\n"
++ "-notime Dont display time window\n"
++ "-nosecs Show uptime in old-style hh:mm format\n"
++ };
+
+ fprintf(stdout,"\n%s version %s \n",BBTOOL,BBTOOL_VERSION);
+- fprintf(stdout,"Usage:
+- %s [options]\n",BBTOOL);
++ fprintf(stdout,"Usage:\n%s [options]\n",BBTOOL);
+ fprintf(stdout, "%s", usageOptions);
+ /*
+ fprintf(stdout,"-t[ype] <0|1|2|3> 0:
projects / gentoo.git / commitdiff