more motif cleanups

4 files changed, 157 insertions, 4 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index 5c9c82dfc5f4..8f4bb48f4cf0 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.19 2003/11/13 13:24:25 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.20 2003/11/24 14:38:41 lanius Exp $
+
+*openmotif-2.1.30-r3 (24 Nov 2003)
+
+  24 Nov 2003; Heinrich Wendel <lanius@gentoo.org> openmotif-2.1.30-r3.ebuild:
+  motif cleanups
 
   13 Nov 2003; Heinrich Wendel <lanius@gentoo.org> openmotif-2.2.2-r2.ebuild:
   bug #32834
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index 75adfafde2e6..265d01d00a2e 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -1,10 +1,9 @@
 MD5 e07f6b89edd5ffa4a803816b7ce33336 openmotif-2.1.30-r1.ebuild 864
 MD5 55e52e621e48d9824ff551f2c48f8d82 openmotif-2.2.2-r1.ebuild 1051
-MD5 3ba166fe95dd5aab5b1ba19a3dddf2cb openmotif-2.1.30-r3.ebuild 2635
+MD5 389b0cb2fe561f3fa882d69f28a0b845 openmotif-2.1.30-r3.ebuild 4214
 MD5 d9ee153704ba81a8d4f9b50224f47f37 openmotif-2.1.30-r2.ebuild 2633
 MD5 69813b1fd9e16c545cb4fd3e18b7145b openmotif-2.2.2-r2.ebuild 4796
-MD5 9cf769733146c68fb072db780528fd71 ChangeLog 3459
-MD5 5d98ed732dc1147894a15e0db7b409e3 .openmotif-2.2.2-r2.ebuild.swp 16384
+MD5 b98f72c358ee24e3cab096b7ecf18c21 ChangeLog 3592
 MD5 216193f922fae0747195fd851696b580 files/mwm-configdir.patch 1549
 MD5 009fd49058dd31057e2cbdc0c5cbb6a5 files/digest-openmotif-2.2.2-r1 136
 MD5 e0b6cf2385221247e7204f63a199c6c3 files/digest-openmotif-2.2.2-r2 68
diff --git a/x11-libs/openmotif/files/digest-openmotif-2.1.30-r3 b/x11-libs/openmotif/files/digest-openmotif-2.1.30-r3
new file mode 100644
index 000000000000..ead704e865e9
--- /dev/null
+++ b/x11-libs/openmotif/files/digest-openmotif-2.1.30-r3
@@ -0,0 +1 @@
+MD5 950f0d409e0ce508fa3995790c1106c7 openmotif-2.1.30-4_MLI.src.tar.gz 8645792
diff --git a/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild b/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild
new file mode 100644
index 000000000000..591fc042ca73
--- /dev/null
+++ b/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header:
+
+MY_P=${P}-4_MLI.src
+S=${WORKDIR}/motif
+DESCRIPTION="Open Motif (Metrolink Bug Fix Release)"
+SRC_URI="ftp://ftp.metrolink.com/pub/openmotif/2.1.30-4/${MY_P}.tar.gz"
+HOMEPAGE="http://www.metrolink.com/openmotif/"
+LICENSE="MOTIF"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+
+DEPEND="virtual/glibc
+	virtual/x11
+	dev-util/yacc
+	sys-devel/bison
+	sys-devel/flex"
+
+SLOT="2.1"
+
+# glibc-2.3.2-r1/gcc-3.2.3 /w `-mcpu=athlon-xp -O2', right-clicking
+# in nedit triggers DPMS monitor standby instead of popping up the 
+# context menu.  this doesn't happen on my `stable' test partition 
+# where everything is compiled i686, nor with most non-essential 
+# packages athlon-xp and only motif i686.  needs investigation.
+inherit flag-o-matic
+replace-flags "-mcpu=athlon-xp" "-mcpu=i686"
+
+src_unpack() {
+	local cfg="${S}/config/cf/site.def"
+
+	unpack ${A}
+	cd ${S}
+
+	cp ${FILESDIR}/site.def ${S}/config/cf/
+	echo >>$cfg
+	echo >>$cfg "#undef  OptimizedCDebugFlags"
+	echo >>$cfg "#define OptimizedCDebugFlags ${CFLAGS}"
+	echo >>$cfg "#undef  OptimizedCplusplusDebugFlags"
+	echo >>$cfg "#define OptimizedCplusplusDebugFlags ${CXXFLAGS}"
+
+	# move `system.mwmrc' from `lib/X11' to `lib/X11/mwm' (but install into
+	# `/etc/X11/mwm')
+	ebegin "patching 'clients/mwm/Imakefile' (mwm confdir)"
+	LC_ALL="C" sed -i \
+	  -e 's:\(SpecialObjectRule.*WmResParse\.o.*/lib/X11\)\(.*\):\1/mwm\2:'\
+	  -e 's:\(InstallNonExecFile.system\.mwmrc,\).*/lib/X11\(.*\):\1/etc/X11/mwm\2:'\
+	    "${S}/clients/mwm/Imakefile"
+	eend $? || die
+
+	#
+	epatch ${FILESDIR}/${P}-imake-tmpdir.patch
+}
+
+src_compile() {
+	mkdir -p imports/x11
+	cd imports/x11
+	ln -s /usr/X11R6/bin bin
+	ln -s /usr/X11R6/include include
+	ln -s /usr/X11R6/lib lib
+	cd ${S}
+	make World || die
+}
+
+src_install() {
+	make DESTDIR=${D} VARDIR=${D}/var/X11/ install || die "make install"
+	make DESTDIR=${D} install.man || die "make install.man"
+
+	# these overlap with X11
+	local NOINSTBIN="imake lndir makedepend makeg mergelib mkdirhier xmkmf"
+	local NOINSTMAN1="imake lndir makedepend makeg mkdirhier xmkmf"
+
+	# cleanups
+	rm -fR ${D}/etc
+	for nib in $NOINSTBIN; do
+		f="${D}usr/X11R6/bin/${nib}"; rm "$f" || die "rm $f"
+	done
+	for nim in $NOINSTMAN1; do
+		f="${D}usr/X11R6/man/man1/${nim}.1x"; rm "$f" || die "rm $f"
+	done
+	rm -rf "${D}usr/X11R6/lib/X11/config" || die "rm config"
+
+	# move includes
+	dodir /usr/include/Mrm/2.1/Mrm
+	dodir /usr/include/Xm/2.1/Xm
+	dodir /usr/include/uil/2.1/uil
+	dodir /usr/include/X11/bitmaps
+
+	mv ${D}/usr/X11R6/include/Mrm/*.h ${D}/usr/include/Mrm/2.1/Mrm
+	mv ${D}/usr/X11R6/include/Xm/*.h ${D}/usr/include/Xm/2.1/Xm
+	mv ${D}/usr/X11R6/include/uil/*.h ${D}/usr/include/uil/2.1/uil
+	mv ${D}/usr/X11R6/include/X11/bitmaps/* ${D}/usr/include/X11/bitmaps
+
+	# bin
+	dodir /usr/bin
+	for file in `ls ${D}/usr/X11R6/bin`
+	do
+		mv ${D}/usr/X11R6/bin/${file} ${D}/usr/bin/${file}-2.1
+	done
+
+	# libs
+	dodir /usr/lib/motif/2.1
+	mv ${D}/usr/X11R6/lib/lib* ${D}/usr/lib/motif/2.1
+
+	for lib in libMrm.so.2 libMrm.so.2.1 \
+		libXm.so.2 libXm.so.2.1 \
+		libUil.so.2 libUil.so.2.1
+	do
+		dosym "/usr/lib/motif/2.1/${lib}"\
+			"/usr/lib/${lib}"
+	done
+	dosym /usr/lib/motif/2.1/libMrm.so.2.1 /usr/lib/libMrm.so
+	dosym /usr/lib/motif/2.1/libXm.so.2.1 /usr/lib/libXm.so
+	dosym /usr/lib/motif/2.1/libUil.so.2.1 /usr/lib/libUil.so
+
+	# man pages
+	dodir /usr/share/man/man1
+	dodir /usr/share/man/man3
+	dodir /usr/share/man/man5
+	dodir /usr/share/man/man7
+
+	for file in `ls ${D}/usr/X11R6/man/man1`
+	do
+		file=${file/.1x/}
+		mv ${D}/usr/X11R6/man/man1/${file}.1x ${D}/usr/share/man/man1/${file}-21.1
+	done
+	for file in `ls ${D}/usr/X11R6/man/man3`
+	do
+		file=${file/.3x/}
+		mv ${D}/usr/X11R6/man/man3/${file}.3x ${D}/usr/share/man/man3/${file}-21.3
+	done
+	for file in `ls ${D}/usr/X11R6/man/man5`
+	do
+		file=${file/.5x/}
+		mv ${D}/usr/X11R6/man/man5/${file}.5x ${D}/usr/share/man/man5/${file}-21.5
+	done
+	for file in `ls ${D}/usr/X11R6/man/man7`
+	do
+		file=${file/.7x/}
+		mv ${D}/usr/X11R6/man/man7/${file}.7x ${D}/usr/share/man/man5/${file}-21.7
+	done
+
+	# cleanups
+	rm -fR ${D}/usr/X11R6/
+
+	dodoc README COPYRIGHT.MOTIF RELEASE RELNOTES
+	dodoc BUGREPORT OPENBUGS CLOSEDBUGS
+}