fixed mwm config path, includes

3 files changed, 28 insertions, 16 deletions

diff --git a/x11-libs/lesstif/ChangeLog b/x11-libs/lesstif/ChangeLog
index c47bdd654f3c..51b909883c01 100644
--- a/x11-libs/lesstif/ChangeLog
+++ b/x11-libs/lesstif/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/lesstif
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/ChangeLog,v 1.16 2003/11/23 13:45:27 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/ChangeLog,v 1.17 2003/12/01 15:17:01 lanius Exp $
+
+  01 Dec 2003; Heinrich Wendel <lanius@gentoo.org> lesstif-0.93.91.ebuild:
+  fixed mwm config path, includes
 
   23 Nov 2003; Heinrich Wendel <lanius@gentoo.org> lesstif-0.93.91.ebuild:
   added slot
diff --git a/x11-libs/lesstif/Manifest b/x11-libs/lesstif/Manifest
index 685338f351a8..3288a24bacda 100644
--- a/x11-libs/lesstif/Manifest
+++ b/x11-libs/lesstif/Manifest
@@ -1,9 +1,9 @@
 MD5 538f14f4c9a506a96c2342d3074f3240 lesstif-0.93.40.ebuild 1671
 MD5 d0af95bace88edd90d0e683c09779274 lesstif-0.93.36.ebuild 1266
+MD5 5f15e310ea442bded294c932e84763cb lesstif-0.93.91.ebuild 2467
+MD5 a823819c9b28bf2cbde83727d091fcc1 lesstif-0.93.36-r3.ebuild 1736
+MD5 91c726bdb4cd5f9725e932456a85dd7f ChangeLog 2866
 MD5 caf61eda01cd0774b43a4b748b7406d6 files/digest-lesstif-0.93.36-r3 69
 MD5 caf61eda01cd0774b43a4b748b7406d6 files/digest-lesstif-0.93.36 69
 MD5 d9f21def21c6d7a280a7a40d0d8ff377 files/digest-lesstif-0.93.40 69
 MD5 68634aa34d141564480f544d35c01785 files/digest-lesstif-0.93.91 69
-MD5 d25d69ce6e345c8b8913c7f448062851 lesstif-0.93.91.ebuild 1970
-MD5 a823819c9b28bf2cbde83727d091fcc1 lesstif-0.93.36-r3.ebuild 1736
-MD5 82f25ad45af5ee2b2f691a7c7b866786 ChangeLog 2756
diff --git a/x11-libs/lesstif/lesstif-0.93.91.ebuild b/x11-libs/lesstif/lesstif-0.93.91.ebuild
index ba395d5a587c..b66f822a94e0 100644
--- a/x11-libs/lesstif/lesstif-0.93.91.ebuild
+++ b/x11-libs/lesstif/lesstif-0.93.91.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header:
 
-inherit libtool
+inherit libtool motif
 
 DESCRIPTION="An OSF/Motif(R) clone"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
@@ -17,6 +17,11 @@ DEPEND="virtual/glibc
 src_compile() {
 	elibtoolize
 
+	einfo "Fixing Mwm app-defaults path"
+	sed -i -e 's:$(libdir)/X11/app-defaults:$(sysconfdir)/X11/app-defaults:' clients/Motif-1.2/mwm/Makefile.in
+	sed -i -e 's:$(libdir)/X11/app-defaults:$(sysconfdir)/X11/app-defaults:' clients/Motif-1.2/mwm/Makefile.am
+	sed -i -e 's:usr/X11R6/lib/X11/app-defaults/Mwm:etc/X11/app-defaults/Mwm' doc/lessdox/clients/mwm.1
+
 	econf \
 	  --enable-build-12 \
 	  --disable-build-20 \
@@ -34,25 +39,19 @@ src_install() {
 	make DESTDIR=${D} install || die "make install"
 
 
-	# bin
+	einfo "Fixing binaries"
 	for file in `ls ${D}/usr/bin`
 	do
 		mv ${D}/usr/bin/${file} ${D}/usr/bin/${file}-1.2
 	done
 
 
-	# docs
+	einfo "Fixing docs"
 	dodir /usr/share/doc/
 	mv ${D}/usr/LessTif ${D}/usr/share/doc/${P}
 
 
-	# garbage
-	rm -fR ${D}/usr/lib/LessTif
-	rm -fR ${D}/usr/lib/X11
-	rm -f  ${D}/bin/mxmkmf
-
-
-	# libs
+	einfo "Fixing libraries"
 	dodir /usr/lib/motif/1.2
 	mv ${D}/usr/lib/lib* ${D}/usr/lib/motif/1.2
 
@@ -65,7 +64,7 @@ src_install() {
 	done
 
 
-	# includes
+	einfo "Fixing includes"
 	dodir /usr/include/Mrm/1.2/Mrm
 	dodir /usr/include/Xm/1.2/Xm
 	dodir /usr/include/uil/1.2/uil
@@ -74,8 +73,11 @@ src_install() {
 	mv ${D}/usr/include/Xm/*.h ${D}/usr/include/Xm/1.2/Xm
 	mv ${D}/usr/include/uil/*.{h,uil} ${D}/usr/include/uil/1.2/uil
 
+	cd ${D}/usr/include
+	motif_fix_headers 1.2
+
 
-	# man pages
+	einfo "Fixing man pages"
 	for file in `ls ${D}/usr/share/man/man1`
 	do
 		file=${file/.1/}
@@ -91,4 +93,11 @@ src_install() {
 		file=${file/.5/}
 		mv ${D}/usr/share/man/man5/${file}.5 ${D}/usr/share/man/man5/${file}-12.5
 	done
+
+	einfo "Cleaning up"
+	rm -fR ${D}/usr/lib/LessTif
+	rm -fR ${D}/usr/lib/X11
+	rm -f  ${D}/bin/mxmkmf-1.2
+
+
 }