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

4 files changed, 14 insertions, 12 deletions

diff --git a/app-text/acroread/acroread-4.05.ebuild b/app-text/acroread/acroread-4.05-r1.ebuild
index 22a8b2fd302d..abb1ee65ebf1 100644
--- a/app-text/acroread/acroread-4.05.ebuild
+++ b/app-text/acroread/acroread-4.05-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 Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-4.05.ebuild,v 1.3 2001/05/01 18:29:05 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-4.05-r1.ebuild,v 1.1 2001/10/06 15:30:15 danarmak Exp $
 
 A=linux-ar-405.tar.gz
 S=${WORKDIR}/ILINXR.install
@@ -16,21 +16,21 @@ src_compile() {
 
   tar xvf ILINXR.TAR
   tar xvf READ.TAR 
-  sed -e "s:REPLACE_ME:/usr/X11R6/lib/Acrobat4/Reader:" \
+  sed -e "s:REPLACE_ME:/usr/lib/Acrobat4/Reader:" \
 	bin/acroread.sh > acroread
 }
 
 src_install () {
 
-  dodir /usr/X11R6/lib/Acrobat4
+  dodir /usr/lib/Acrobat4
   for i in Browsers Reader Resource
   do
-    cp -a ${S}/${i} ${D}/usr/X11R6/lib/Acrobat4
+    cp -a ${S}/${i} ${D}/usr/lib/Acrobat4
   done
-  exeinto /usr/X11R6/bin
+  exeinto /usr/bin
   doexe acroread
   dodoc ReadMe LICREAD.TXT
   dodir /opt/netscape/plugins
-  dosym /usr/X11R6/lib/Acrobat4/Browsers/intellinux/nppdf.so /opt/netscape/plugins
+  dosym /usr/lib/Acrobat4/Browsers/intellinux/nppdf.so /opt/netscape/plugins
 }
 
diff --git a/app-text/acroread/files/digest-acroread-4.05 b/app-text/acroread/files/digest-acroread-4.05-r1
index 28e599efa303..28e599efa303 100644
--- a/app-text/acroread/files/digest-acroread-4.05
+++ b/app-text/acroread/files/digest-acroread-4.05-r1
diff --git a/app-text/xpdf/files/digest-xpdf-0.92-r1 b/app-text/xpdf/files/digest-xpdf-0.92-r1
deleted file mode 100644
index ccae308af5da..000000000000
--- a/app-text/xpdf/files/digest-xpdf-0.92-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2d6e9fb157db928bd0cca4214ddd2c80 xpdf-0.92.tgz
diff --git a/app-text/xpdf/xpdf-0.92-r1.ebuild b/app-text/xpdf/xpdf-0.92-r2.ebuild
index 57f29f29b104..686d23cb4317 100644
--- a/app-text/xpdf/xpdf-0.92-r1.ebuild
+++ b/app-text/xpdf/xpdf-0.92-r2.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 Ryan Tolboom <ryan@intphsys.com>
-# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-0.92-r1.ebuild,v 1.5 2001/08/01 18:44:26 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-0.92-r2.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 S=${WORKDIR}/${P}
 
@@ -14,12 +14,15 @@ DEPEND="virtual/x11
 	>=media-libs/t1lib-1.0.1"
 
 src_compile() {
-    try ./configure --prefix=/usr/X11R6 --mandir=/usr/X11R6/man --with-gzip
-    try make
+	./configure --prefix=/usr --mandir=/usr/man --with-gzip || die
+	make || die
 }
 
 
 src_install() {
-    try make DESTDIR=${D} install
-    dodoc README ANNOUNCE CHANGES
+	# don't use builtin make install, as it doesn't compress manpages
+	into /usr
+	dodoc README ANNOUNCE CHANGES
+	doman doc/*.1
+	dobin xpdf/pdfimages xpdf/pdfinfo xpdf/pdftopbm xpdf/pdftops xpdf/pdftotext xpdf/xpdf        
 }