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

7 files changed, 65 insertions, 14 deletions

diff --git a/app-misc/jpilot/files/jpilot-0.99-r2.patch b/app-misc/jpilot/files/jpilot-0.99-r2.patch
new file mode 100644
index 000000000000..12e009ed8346
--- /dev/null
+++ b/app-misc/jpilot/files/jpilot-0.99-r2.patch
@@ -0,0 +1,53 @@
+--- Makefile.orig	Thu Jun 28 23:43:29 2001
++++ Makefile	Thu Jun 28 23:47:40 2001
+@@ -224,37 +224,20 @@
+ 	jpilot-sync jpilot jpilot-dump
+ 
+ install:
+-#	./install-sh -d $(prefix)/bin/
+-	if test -d "$(prefix)/bin" ; then \
+-	  ./install-sh -s -c -m 555 jpilot $(prefix)/bin/jpilot ; \
+-	else \
+-	  ./install-sh -s -c -m 555 jpilot $(prefix)/jpilot ; \
+-	fi
+-	if test -d "$(prefix)/bin" ; then \
+-	  ./install-sh -s -c -m 555 jpilot-sync $(prefix)/bin/jpilot-sync ; \
+-	else \
+-	  ./install-sh -s -c -m 555 jpilot-sync $(prefix)/jpilot-sync ; \
+-	fi
+-	if test -d "$(prefix)/bin" ; then \
+-	  ./install-sh -s -c -m 555 jpilot-dump $(prefix)/bin/jpilot-dump ; \
+-	else \
+-	  ./install-sh -s -c -m 555 jpilot-dump $(prefix)/jpilot-dump ; \
+-	fi
+-	if test -d "$(prefix)/bin" ; then \
+-	  ./install-sh -s -c -m 555 jpilot-dump $(prefix)/bin/jpilot-upgrade-99 ; \
+-	else \
+-	  ./install-sh -s -c -m 555 jpilot-dump $(prefix)/jpilot-upgrade-99 ; \
+-	fi
++	  ./install-sh -s -c -m 755 jpilot $(prefix)/bin/jpilot
++	  ./install-sh -s -c -m 755 jpilot-sync $(prefix)/bin/jpilot-sync
++	  ./install-sh -s -c -m 755 jpilot-dump $(prefix)/bin/jpilot-dump
++	  ./install-sh -s -c -m 755 jpilot-dump $(prefix)/bin/jpilot-upgrade-99
+ 	./install-sh -d -m 755 $(prefix)/share/jpilot
+-	./install-sh -c -m 755 jpilotrc.blue $(prefix)/share/jpilot
+-	./install-sh -c -m 755 jpilotrc.default $(prefix)/share/jpilot/
+-	./install-sh -c -m 755 jpilotrc.green $(prefix)/share/jpilot/
+-	./install-sh -c -m 755 jpilotrc.purple $(prefix)/share/jpilot/
+-	./install-sh -c -m 755 jpilotrc.steel $(prefix)/share/jpilot/
+-	./install-sh -c -m 755 empty/DatebookDB.pdb $(prefix)/share/jpilot/
+-	./install-sh -c -m 755 empty/AddressDB.pdb $(prefix)/share/jpilot/
+-	./install-sh -c -m 755 empty/ToDoDB.pdb $(prefix)/share/jpilot/
+-	./install-sh -c -m 755 empty/MemoDB.pdb $(prefix)/share/jpilot/
++	./install-sh -c -m 644 jpilotrc.blue $(prefix)/share/jpilot
++	./install-sh -c -m 644 jpilotrc.default $(prefix)/share/jpilot/
++	./install-sh -c -m 644 jpilotrc.green $(prefix)/share/jpilot/
++	./install-sh -c -m 644 jpilotrc.purple $(prefix)/share/jpilot/
++	./install-sh -c -m 644 jpilotrc.steel $(prefix)/share/jpilot/
++	./install-sh -c -m 644 empty/DatebookDB.pdb $(prefix)/share/jpilot/
++	./install-sh -c -m 644 empty/AddressDB.pdb $(prefix)/share/jpilot/
++	./install-sh -c -m 644 empty/ToDoDB.pdb $(prefix)/share/jpilot/
++	./install-sh -c -m 644 empty/MemoDB.pdb $(prefix)/share/jpilot/
+ 	cd intl; $(MAKE) install
+ 	cd po; $(MAKE) install
+ 
diff --git a/app-misc/wmmon+smp/files/digest-wmmon+smp-1.0 b/app-misc/wmmon+smp/files/digest-wmmon+smp-1.0
deleted file mode 100644
index feb73bfeed5d..000000000000
--- a/app-misc/wmmon+smp/files/digest-wmmon+smp-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9c50ad3e59a2bf048735a71ea4559a4c wmmon+smp.tar.gz
diff --git a/app-misc/wmmon+smp/wmmon+smp-1.0.ebuild b/app-misc/wmmon+smp/wmmon+smp-1.0-r1.ebuild
index 85b2ec885a4f..3c10126a00ab 100644
--- a/app-misc/wmmon+smp/wmmon+smp-1.0.ebuild
+++ b/app-misc/wmmon+smp/wmmon+smp-1.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 Jano (default3) <your email>
-# $Header: /var/cvsroot/gentoo-x86/app-misc/wmmon+smp/wmmon+smp-1.0.ebuild,v 1.1 2001/07/18 23:56:15 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/wmmon+smp/wmmon+smp-1.0-r1.ebuild,v 1.1 2001/10/06 15:30:15 danarmak Exp $
 
 
 S=${WORKDIR}/wmmon.app
@@ -21,7 +21,7 @@ src_compile() {
 
 src_install () {
 
-	exeinto /usr/X11R6/bin
+	exeinto /usr/bin
 	doexe ${S2}/wmmon
 	dodoc ${S}/README ${S}/COPYING ${S}/INSTALL
 
diff --git a/app-misc/xlockmore/files/digest-xlockmore-5.01.2 b/app-misc/xlockmore/files/digest-xlockmore-5.01.2-r1
index 35e6d7e3f59c..35e6d7e3f59c 100644
--- a/app-misc/xlockmore/files/digest-xlockmore-5.01.2
+++ b/app-misc/xlockmore/files/digest-xlockmore-5.01.2-r1
diff --git a/app-misc/xlockmore/xlockmore-5.01.2.ebuild b/app-misc/xlockmore/xlockmore-5.01.2-r1.ebuild
index ea930f8d6557..92772e75b609 100644
--- a/app-misc/xlockmore/xlockmore-5.01.2.ebuild
+++ b/app-misc/xlockmore/xlockmore-5.01.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 Ben Lutgens <blutgens@gentoo.org> 
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xlockmore/xlockmore-5.01.2.ebuild,v 1.5 2001/06/07 14:13:37 blutgens Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xlockmore/xlockmore-5.01.2-r1.ebuild,v 1.1 2001/10/06 15:30:15 danarmak Exp $
 
 #P=
 A=${P}.tar.gz
@@ -28,9 +28,9 @@ src_compile() {
     myconf="--disable-mesa"
     fi
 
-    try ./configure --prefix=/usr --mandir=${prefix}/X11R6/man/man1 \
-	--host=${CHOST} ${myconf}
-    try make
+    ./configure --prefix=/usr --mandir=${prefix}/man/man1 \
+	--host=${CHOST} ${myconf} || die
+    make || die
     cd xglock/
     make
 
@@ -38,8 +38,8 @@ src_compile() {
 
 src_install () {
 
-    try make prefix=${D}/usr mandir=${D}/usr/X11R6/man/man1 install
-    exeinto /usr/X11R6/bin
+    make prefix=${D}/usr mandir=${D}/usr/man/man1 install || die
+    exeinto /usr/bin
     doexe xmlock/xmlock
     doexe xglock/xglock
     dodoc docs/* README xglock/xglockrc xglock/README.xglock
diff --git a/app-misc/xosview/files/digest-xosview-1.7.3 b/app-misc/xosview/files/digest-xosview-1.7.3
deleted file mode 100644
index 0f8cc720f9af..000000000000
--- a/app-misc/xosview/files/digest-xosview-1.7.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9d2f87d67bc62ca9d263becd168bae4f xosview-1.7.3.tar.gz
diff --git a/app-misc/xosview/xosview-1.7.3.ebuild b/app-misc/xosview/xosview-1.7.3-r1.ebuild
index 726956a3ea5a..846423cd3cbe 100644
--- a/app-misc/xosview/xosview-1.7.3.ebuild
+++ b/app-misc/xosview/xosview-1.7.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 Grant Goodyear <grant@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xosview/xosview-1.7.3.ebuild,v 1.2 2001/06/01 18:27:40 grant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xosview/xosview-1.7.3-r1.ebuild,v 1.1 2001/10/06 15:30:15 danarmak Exp $
 
 #P=
 A=${P}.tar.gz
@@ -21,12 +21,12 @@ src_compile() {
 
 src_install () {
 
-    exeinto /usr/X11R6/bin
+    exeinto /usr/bin
     doexe xosview
-    insinto /usr/X11R6/lib/X11
+    insinto /usr/lib/X11
     cp Xdefaults XOsview
     doins XOsview
-    into /usr/X11R6
+    into /usr
     doman *.1
 
 }