The Big Commit. Modifies apps to install into /usr instead of /usr/X11R6. If it breaks, fix it.

20 files changed, 22 insertions, 59 deletions

diff --git a/x11-misc/bbapm/bbapm-0.0.1.ebuild b/x11-misc/bbapm/bbapm-0.0.1-r1.ebuild
index 5b14308b37bf..7af21e5df536 100644
--- a/x11-misc/bbapm/bbapm-0.0.1.ebuild
+++ b/x11-misc/bbapm/bbapm-0.0.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Craig Joly <joly@ee.ualberta.ca>
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbapm/bbapm-0.0.1.ebuild,v 1.2 2001/10/01 00:20:58 lordjoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbapm/bbapm-0.0.1-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="blackbox advanced power management tool"
@@ -12,7 +12,7 @@ DEPEND=">=x11-wm/blackbox-0.61
         >=sys-apps/apmd-3.0.1"
 
 src_compile() {
-	./configure --prefix=/usr/X11R6 --host=${CHOST} || die
+	./configure --prefix=/usr --host=${CHOST} || die
 	emake || die
 }
 
diff --git a/x11-misc/bbapm/files/digest-bbapm-0.0.1 b/x11-misc/bbapm/files/digest-bbapm-0.0.1
deleted file mode 100644
index 33ef2d23d594..000000000000
--- a/x11-misc/bbapm/files/digest-bbapm-0.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4d2629959bd907696c7765b7c34bc54f bbapm-0.0.1.tar.gz
diff --git a/x11-misc/bbkeys/bbkeys-0.8.2-r1.ebuild b/x11-misc/bbkeys/bbkeys-0.8.2-r1.ebuild
deleted file mode 100644
index bb6d391c1a74..000000000000
--- a/x11-misc/bbkeys/bbkeys-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Joe Bormolini <lordjoe@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbkeys/bbkeys-0.8.2-r1.ebuild,v 1.1 2001/08/30 06:50:04 woodchip Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Use keyboard shortcuts in the blackbox wm"
-HOMEPAGE="http://movingparts.thelinuxcommunity.org"
-SRC_URI="http://movingparts.thelinuxcommunity.org/bbkeys/${P}.tar.gz"
-
-DEPEND=">=x11-wm/blackbox-0.61"
-
-src_compile() {
-	./configure --prefix=/usr/X11R6 --host=${CHOST} || die
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	rm -rf ${D}/usr/X11R6/doc
-	dodoc AUTHORS ChangeLog README
-}
-
-pkg_postinst() {
-	cd ${ROOT}usr/X11R6/bin/wm
-	sed -e "s/.*blackbox/exec \/usr\/X11R6\/bin\/bbkeys \&\n&/" blackbox | cat > blackbox
-}
diff --git a/x11-misc/bbkeys/bbkeys-0.8.3.ebuild b/x11-misc/bbkeys/bbkeys-0.8.3-r1.ebuild
index 6e485d679e8b..db6d09641d22 100644
--- a/x11-misc/bbkeys/bbkeys-0.8.3.ebuild
+++ b/x11-misc/bbkeys/bbkeys-0.8.3-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Joe Bormolini <lordjoe@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbkeys/bbkeys-0.8.3.ebuild,v 1.1 2001/10/01 00:20:58 lordjoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbkeys/bbkeys-0.8.3-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Use keyboard shortcuts in the blackbox wm"
@@ -11,7 +11,7 @@ SRC_URI="http://movingparts.thelinuxcommunity.org/bbkeys/${P}.tar.gz"
 DEPEND=">=x11-wm/blackbox-0.61"
 
 src_compile() {
-	./configure --prefix=/usr/X11R6 --host=${CHOST} || die
+	./configure --prefix=/usr --host=${CHOST} || die
 	emake || die
 }
 
diff --git a/x11-misc/bbkeys/files/digest-bbkeys-0.8.2-r1 b/x11-misc/bbkeys/files/digest-bbkeys-0.8.2-r1
deleted file mode 100644
index 5016d7965c30..000000000000
--- a/x11-misc/bbkeys/files/digest-bbkeys-0.8.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ce506020fbb17dab286129dcde444ffa bbkeys-0.8.2.tar.gz
diff --git a/x11-misc/bbkeys/files/digest-bbkeys-0.8.3 b/x11-misc/bbkeys/files/digest-bbkeys-0.8.3
deleted file mode 100644
index e7695ae67c83..000000000000
--- a/x11-misc/bbkeys/files/digest-bbkeys-0.8.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f38ea900ad8c6a797833b4d380f737cd bbkeys-0.8.3.tar.gz
diff --git a/x11-misc/bbkeysconf/bbkeysconf-1.3.ebuild b/x11-misc/bbkeysconf/bbkeysconf-1.3-r1.ebuild
index 763876238f61..b2f289f10d72 100644
--- a/x11-misc/bbkeysconf/bbkeysconf-1.3.ebuild
+++ b/x11-misc/bbkeysconf/bbkeysconf-1.3-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Joe Bormolini <lordjoe@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbkeysconf/bbkeysconf-1.3.ebuild,v 1.2 2001/09/02 05:51:01 lordjoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbkeysconf/bbkeysconf-1.3-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -21,7 +21,7 @@ src_compile() {
 
 src_install () {
 
-    into /usr/X11R6
+    into /usr
     dobin bbkeysconf
 }
 
diff --git a/x11-misc/bbkeysconf/files/digest-bbkeysconf-1.3 b/x11-misc/bbkeysconf/files/digest-bbkeysconf-1.3
deleted file mode 100644
index a883842b923a..000000000000
--- a/x11-misc/bbkeysconf/files/digest-bbkeysconf-1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 23cb901110dc398c6972f0849714cecb bbkeysconf-1.3.tar.gz
diff --git a/x11-misc/bbmail/bbmail-0.6.11.ebuild b/x11-misc/bbmail/bbmail-0.6.11-r1.ebuild
index 2c7404d56bba..0e818aa7d465 100644
--- a/x11-misc/bbmail/bbmail-0.6.11.ebuild
+++ b/x11-misc/bbmail/bbmail-0.6.11-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Craig Joly <joly@ee.ualberta.ca>
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbmail/bbmail-0.6.11.ebuild,v 1.2 2001/10/01 00:20:58 lordjoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbmail/bbmail-0.6.11-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="blackbox mail notification, patched for maildir"
@@ -18,7 +18,7 @@ src_unpack () {
 }
 
 src_compile() {
-	./configure --prefix=/usr/X11R6 --host=${CHOST} || die
+	./configure --prefix=/usr --host=${CHOST} || die
 	emake || die
 }
 
@@ -30,6 +30,6 @@ src_install () {
 pkg_postinst() {
 	cd ${ROOT}usr/X11R6/bin/wm
 	if [ ! "`grep bbmail blackbox`" ] ; then
-	sed -e "s/.*blackbox/exec \/usr\/X11R6\/bin\/bbmail \&\n&/" blackbox | cat > blackbox
+	sed -e "s/.*blackbox/exec \/usr\/bin\/bbmail \&\n&/" blackbox | cat > blackbox
 	fi
 }
diff --git a/x11-misc/bbmail/files/digest-bbmail-0.6.11 b/x11-misc/bbmail/files/digest-bbmail-0.6.11
deleted file mode 100644
index 98e7288a0d76..000000000000
--- a/x11-misc/bbmail/files/digest-bbmail-0.6.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 26e442a09ceab67a39b73ad80ceafff9 bbmail-0.6.11.tar.gz
diff --git a/x11-misc/bbpager/bbpager-0.3.0.ebuild b/x11-misc/bbpager/bbpager-0.3.0-r1.ebuild
index 5425811b18ad..b9e3cc5da36d 100644
--- a/x11-misc/bbpager/bbpager-0.3.0.ebuild
+++ b/x11-misc/bbpager/bbpager-0.3.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Gontran Zepeda <gontran@gontran.net>
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbpager/bbpager-0.3.0.ebuild,v 1.2 2001/10/01 00:20:58 lordjoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbpager/bbpager-0.3.0-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="An understated pager for Blackbox."
@@ -11,7 +11,7 @@ HOMEPAGE="http://bbtools.windsofstorm.net/available.phtml#bbpager"
 DEPEND=">=x11-wm/blackbox-0.61"
 
 src_compile() {
-	./configure --prefix=/usr/X11R6 --host=${CHOST} || die
+	./configure --prefix=/usr --host=${CHOST} || die
 	emake || die
 }
 
@@ -23,6 +23,6 @@ src_install () {
 pkg_postinst() {
 	cd ${ROOT}usr/X11R6/bin/wm
 	if [ ! "`grep bbpager blackbox`" ] ; then
-	sed -e "s/.*blackbox/exec \/usr\/X11R6\/bin\/bbpager \&\n&/" blackbox | cat > blackbox
+	sed -e "s/.*blackbox/exec \/usr\/bin\/bbpager \&\n&/" blackbox | cat > blackbox
 	fi
 }
diff --git a/x11-misc/bbpager/files/digest-bbpager-0.3.0 b/x11-misc/bbpager/files/digest-bbpager-0.3.0
deleted file mode 100644
index 8d64ea0c93a0..000000000000
--- a/x11-misc/bbpager/files/digest-bbpager-0.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0a8aa4b0c68346b71f8d375f4362c3cb bbpager-0.3.0.tar.gz
diff --git a/x11-misc/bbppp/bbppp-0.2.2.ebuild b/x11-misc/bbppp/bbppp-0.2.2-r1.ebuild
index 5ac3cf8a2fb8..8a306f30691a 100644
--- a/x11-misc/bbppp/bbppp-0.2.2.ebuild
+++ b/x11-misc/bbppp/bbppp-0.2.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Joe Bormolini <lordjoe@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbppp/bbppp-0.2.2.ebuild,v 1.2 2001/10/01 00:20:58 lordjoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbppp/bbppp-0.2.2-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="blackbox ppp frontend/monitor"
@@ -11,7 +11,7 @@ HOMEPAGE="http://bbtools.windsofstorm.net/available.phtml#bbppp"
 DEPEND=">=x11-wm/blackbox-0.61"
 
 src_compile() {
-	./configure --prefix=/usr/X11R6 --host=${CHOST} || die
+	./configure --prefix=/usr --host=${CHOST} || die
 	emake || die
 }
 
@@ -23,6 +23,6 @@ src_install () {
 pkg_postinst() {
 	cd ${ROOT}usr/X11R6/bin/wm
 	if [ ! "`grep bbppp blackbox`" ] ; then
-	sed -e "s/.*blackbox/exec \/usr\/X11R6\/bin\/bbppp \&\n&/" blackbox | cat > blackbox
+	sed -e "s/.*blackbox/exec \/usr\/bin\/bbppp \&\n&/" blackbox | cat > blackbox
 	fi
 }
diff --git a/x11-misc/bbppp/files/digest-bbppp-0.2.2 b/x11-misc/bbppp/files/digest-bbppp-0.2.2
deleted file mode 100644
index 09f57dd1507b..000000000000
--- a/x11-misc/bbppp/files/digest-bbppp-0.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e1e8a4795c5446688144ec25112a5b40 bbppp-0.2.2.tar.gz
diff --git a/x11-misc/bbsload/bbsload-0.2.5.ebuild b/x11-misc/bbsload/bbsload-0.2.5-r1.ebuild
index 3e3937ada609..7f1650a4981d 100644
--- a/x11-misc/bbsload/bbsload-0.2.5.ebuild
+++ b/x11-misc/bbsload/bbsload-0.2.5-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Joe Bormolini <lordjoe@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbsload/bbsload-0.2.5.ebuild,v 1.2 2001/10/01 00:20:58 lordjoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbsload/bbsload-0.2.5-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="blackbox load monitor"
@@ -11,7 +11,7 @@ HOMEPAGE="http://bbtools.windsofstorm.net/available.phtml#bbsload"
 DEPEND=">=x11-wm/blackbox-0.61"
 
 src_compile() {
-	./configure --prefix=/usr/X11R6 --host=${CHOST} || die
+	./configure --prefix=/usr --host=${CHOST} || die
 	emake || die
 }
 
@@ -23,6 +23,6 @@ src_install () {
 pkg_postinst() {
 	cd ${ROOT}usr/X11R6/bin/wm
 	if [ ! "`grep bbsload blackbox`" ] ; then
-	sed -e "s/.*blackbox/exec \/usr\/X11R6\/bin\/bbsload \&\n&/" blackbox | cat > blackbox
+	sed -e "s/.*blackbox/exec \/usr\/bin\/bbsload \&\n&/" blackbox | cat > blackbox
 	fi
 }
diff --git a/x11-misc/bbsload/files/digest-bbsload-0.2.5 b/x11-misc/bbsload/files/digest-bbsload-0.2.5
deleted file mode 100644
index 43177b055ffe..000000000000
--- a/x11-misc/bbsload/files/digest-bbsload-0.2.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b7096bddeffbc37d87fa1000370b67e6 bbsload-0.2.5.tar.gz
diff --git a/x11-misc/bbweather/bbweather-0.3.ebuild b/x11-misc/bbweather/bbweather-0.3-r1.ebuild
index 5b30315a3d12..f926539efdfe 100644
--- a/x11-misc/bbweather/bbweather-0.3.ebuild
+++ b/x11-misc/bbweather/bbweather-0.3-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Joe Bormolini <lordjoe@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbweather/bbweather-0.3.ebuild,v 1.1 2001/08/31 00:49:02 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbweather/bbweather-0.3-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="blackbox weather monitor"
@@ -13,7 +13,7 @@ DEPEND=">=x11-wm/blackbox-0.61
         >=sys-devel/perl-5.6.1"
 
 src_compile() {
-	./configure --prefix=/usr/X11R6 --host=${CHOST} || die
+	./configure --prefix=/usr --host=${CHOST} || die
 	emake || die
 }
 
diff --git a/x11-misc/bbweather/files/digest-bbweather-0.3 b/x11-misc/bbweather/files/digest-bbweather-0.3
deleted file mode 100644
index 31562ff36cc9..000000000000
--- a/x11-misc/bbweather/files/digest-bbweather-0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 526e505dc2938016fb0a7622896b5d3d bbweather-0.3.tar.bz2
diff --git a/x11-misc/toolbox/files/digest-toolbox-0.6.0 b/x11-misc/toolbox/files/digest-toolbox-0.6.0
deleted file mode 100644
index 1f89040a69bb..000000000000
--- a/x11-misc/toolbox/files/digest-toolbox-0.6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 72283d94f128bdfd90887eb1489daafb toolbox-0.6.0.tar.gz
diff --git a/x11-misc/toolbox/toolbox-0.6.0.ebuild b/x11-misc/toolbox/toolbox-0.6.0-r1.ebuild
index 24dcd10d7102..d21552b18442 100644
--- a/x11-misc/toolbox/toolbox-0.6.0.ebuild
+++ b/x11-misc/toolbox/toolbox-0.6.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Craig Joly <joly@ee.ualberta.ca>
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/toolbox/toolbox-0.6.0.ebuild,v 1.1 2001/08/31 01:04:15 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/toolbox/toolbox-0.6.0-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 
 A=${P}.tar.gz
@@ -15,7 +15,7 @@ DEPEND=">=x11-wm/blackbox-0.61
 
 src_compile() {
 
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST}
+    try ./configure --prefix=/usr --host=${CHOST}
     try emake
 
 }