fixed compile of uil; added -ansi to cflags #38013

3 files changed, 13 insertions, 7 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index 07b69a6caf37..132a775dd305 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.32 2004/01/13 14:38:11 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.33 2004/01/17 19:44:17 lanius Exp $
+
+  17 Jan 2004; Heinrich Wendel <lanius@gentoo.org> openmotif-2.1.30-r3.ebuild:
+  fixed compile of uil; added -ansi to cflags #38013
 
   13 Jan 2004; Heinrich Wendel <lanius@gentoo.org> openmotif-2.1.30-r3.ebuild:
   added warning about libXm.so.3
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index eb1dcc40f29c..b5b5cfef1a96 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -1,7 +1,7 @@
 MD5 9939ef9e24d2968ac1467e6f8e0119a1 openmotif-2.1.30-r1.ebuild 867
-MD5 f43566dd1f989cce0e6fd3abc58a9cc2 openmotif-2.1.30-r3.ebuild 2791
+MD5 b9dd1607aa3221388762c41fc0ccc4cf openmotif-2.1.30-r3.ebuild 2905
 MD5 b766188f8d5455c19fd57875392b2e23 openmotif-2.1.30-r2.ebuild 2743
-MD5 6251634fb5bd3844c308849c540435a8 ChangeLog 4781
+MD5 f5d585f18a684a5ebd12568eb0243780 ChangeLog 4914
 MD5 216193f922fae0747195fd851696b580 files/mwm-configdir.patch 1549
 MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r1 79
 MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r2 79
diff --git a/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild b/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild
index a730cb23324a..abcecc721cb8 100644
--- a/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild
+++ b/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild,v 1.10 2004/01/13 14:38:11 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild,v 1.11 2004/01/17 19:44:17 lanius Exp $
 
 MY_P=${P}-4_MLI.src
 S=${WORKDIR}/motif
@@ -22,6 +22,7 @@ SLOT="0"
 # packages athlon-xp and only motif i686.  needs investigation.
 inherit flag-o-matic
 replace-flags "-mcpu=athlon-xp" "-mcpu=i686"
+append-flags "-ansi"
 
 src_unpack() {
 	local cfg="${S}/config/cf/site.def"
@@ -36,6 +37,8 @@ src_unpack() {
 	echo >>$cfg "#undef  OptimizedCplusplusDebugFlags"
 	echo >>$cfg "#define OptimizedCplusplusDebugFlags ${CXXFLAGS}"
 
+	sed -i -e "s:#define USE_BYACC               YES:#undef USE_BYACC:" config/cf/host.def
+
 	# move `system.mwmrc' from `lib/X11' to `lib/X11/mwm' (but install into
 	# `/etc/X11/mwm')
 	ebegin "patching 'clients/mwm/Imakefile' (mwm confdir)"
@@ -44,8 +47,8 @@ src_unpack() {
 	  -e 's:\(InstallNonExecFile.system\.mwmrc,\).*/lib/X11\(.*\):\1/etc/X11/mwm\2:'\
 	    "${S}/clients/mwm/Imakefile"
 	eend $? || die
-
 	#
+
 	epatch ${FILESDIR}/${P}-imake-tmpdir.patch
 }
 
@@ -69,10 +72,10 @@ src_install() {
 
 	einfo "Cleaning up X11 stuff"
 	rm -fR ${D}/etc
-	for nib in $NOINSTBIN; do
+	for nib in ${NOINSTBIN}; do
 		f="${D}usr/X11R6/bin/${nib}"; rm "$f" || die "rm $f"
 	done
-	for nim in $NOINSTMAN1; do
+	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" || die "rm config"