added patch to compile with gcc 2.9x

8 files changed, 347 insertions, 71 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index 24b876273750..c8fcf78d1acb 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,13 @@
 # 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.34 2004/01/18 10:55:29 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.35 2004/01/19 11:20:59 lanius Exp $
+
+*openmotif-2.1.30-r4 (19 Jan 2004)
+
+  19 Jan 2004; Heinrich Wendel <lanius@gentoo.org> openmotif-2.1.30-r1.ebuild,
+  openmotif-2.1.30-r2.ebuild, openmotif-2.1.30-r3.ebuild,
+  openmotif-2.1.30-r4.ebuild, files/openmotif-2.1.30-imake-ansi.patch:
+  added patch to compile with gcc 2.9x
 
   18 Jan 2004; Heinrich Wendel <lanius@gentoo.org> openmotif-2.1.30-r3.ebuild:
   make it work with userpriv
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index 68694e982f42..d8cc320702bf 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -1,6 +1,6 @@
-MD5 a1287b5ab649e6cba972382f6abf1371 openmotif-2.1.30-r3.ebuild 3025
-MD5 400ef0235c69a93e302ad4fc5a8ee32f ChangeLog 5023
-MD5 daca29a6363b43416d4225d33a5515b1 openmotif-2.1.30-r4.ebuild 3090
+MD5 be90d502df38df5e6bd925bbff6cedb3 openmotif-2.1.30-r3.ebuild 3025
+MD5 653971cf391e5259a99d9fec86f683e7 ChangeLog 5307
+MD5 2de61dfd5e2b94f4f792325d26484fde openmotif-2.1.30-r4.ebuild 3096
 MD5 216193f922fae0747195fd851696b580 files/mwm-configdir.patch 1549
 MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r3 79
 MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r4 79
diff --git a/x11-libs/openmotif/files/digest-openmotif-2.1.30-r2 b/x11-libs/openmotif/files/digest-openmotif-2.1.30-r2
deleted file mode 100644
index ead704e865e9..000000000000
--- a/x11-libs/openmotif/files/digest-openmotif-2.1.30-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 950f0d409e0ce508fa3995790c1106c7 openmotif-2.1.30-4_MLI.src.tar.gz 8645792
diff --git a/x11-libs/openmotif/files/digest-openmotif-2.1.30-r1 b/x11-libs/openmotif/files/digest-openmotif-2.1.30-r4
index ead704e865e9..ead704e865e9 100644
--- a/x11-libs/openmotif/files/digest-openmotif-2.1.30-r1
+++ b/x11-libs/openmotif/files/digest-openmotif-2.1.30-r4
diff --git a/x11-libs/openmotif/files/openmotif-2.1.30-imake-ansi.patch b/x11-libs/openmotif/files/openmotif-2.1.30-imake-ansi.patch
new file mode 100644
index 000000000000..dffee1f9e1c0
--- /dev/null
+++ b/x11-libs/openmotif/files/openmotif-2.1.30-imake-ansi.patch
@@ -0,0 +1,304 @@
+--- motif/config/cf/Imake.cf	2000-06-03 22:49:34.000000000 +0000
++++ motif/config/cf/Imake.cf.new	2004-01-19 01:10:14.000000000 +0000
+@@ -53,10 +70,19 @@
+ # define MacroIncludeFile <bsdi.cf>
+ # define MacroFile bsdi.cf
+ # undef bsdi
+-# define BSD386Architecture
+-# define i386BsdArchitecture
+-# define i386Architecture
+-# undef i386
++# define BSDOSArchitecture
++# if defined(__i386__) || defined(i386)
++#  define i386BsdArchitecture
++#  define i386Architecture
++#  undef i386
++#  undef __i386__
++# endif
++# if defined(__sparc__) || defined(__sparc_v9__) || defined(sparc)
++#  define SparcArchitecture
++#  undef sparc
++#  undef __sparc__
++#  undef __sparc_v9__
++# endif
+ #endif /* bsdi */
+ 
+ #ifdef __OpenBSD__
+@@ -114,6 +140,10 @@
+ #  endif
+ #  undef mc68000
+ # endif
++# ifdef __powerpc__
++#  define PpcArchitecture
++#  undef __powerpc__
++# endif
+ #endif /* OpenBSD */
+ 
+ #ifdef __NetBSD__
+@@ -141,13 +171,19 @@
+ # endif
+ # ifdef mc68000
+ #   define Mc68020Architecture
+-#   undef mc68000
+ # endif
+-# if defined(arm32) || defined(__arm32__)
++# ifdef __arm32__
+ #   define Arm32Architecture
+-#   undef arm32
+ #   undef __arm32__
+ # endif
++# ifdef __vax__
++#   define VaxArchitecture
++#   undef __vax__
++# endif
++# ifdef __powerpc__
++#   define PpcArchitecture
++#   undef __powerpc__
++# endif
+ #endif /* NetBSD */
+ 
+ #ifdef __FreeBSD__
+@@ -160,6 +196,11 @@
+ #  define i386Architecture
+ #  undef i386
+ # endif
++# ifdef __alpha__
++#  define AlphaBsdArchitecture
++#  define AlphaArchitecture
++#  undef __alpha__
++# endif
+ #endif /* __FreeBSD__ */
+ 
+ #ifdef AMOEBA
+@@ -325,6 +366,7 @@
+ # undef sgi
+ # define SGIArchitecture
+ # undef mips
++# undef __mips
+ # define MipsArchitecture
+ # ifdef _SVR4
+ #  undef _SVR4
+@@ -553,44 +595,158 @@
+ # undef linux
+ # define LinuxArchitecture
+ # ifdef i386
+-#  define i386Architecture
++#  ifndef i386Architecture
++#   define i386Architecture
++#  endif
+ #  undef i386
+-# endif /* i386 */
++XCOMM Keep cpp from replacing path elements containing i486/i586/i686
++#  ifdef i486
++#  ifndef i386Architecture
++#   define i386Architecture
++#  endif
++#   undef i486
++#  endif
++#  ifdef i586
++#  ifndef i386Architecture
++#   define i386Architecture
++#  endif
++#   undef i586
++#  endif
++#  ifdef i686
++#  ifndef i386Architecture
++#   define i386Architecture
++#  endif
++#   undef i686
++#  endif
++#  ifdef k6
++#  ifndef i386Architecture
++#   define i386Architecture
++#  endif
++#   undef k6
++#  endif
++# endif /* k6 */
+ # ifdef __i386__
+ #  ifndef i386Architecture
+ #   define i386Architecture
+ #  endif
+ #  undef __i386__
+ # endif /* __i386__ */
++# ifdef __i486__
++#  ifndef i386Architecture
++#   define i386Architecture
++#  endif
++#  undef __i486__
++# endif /* __i486__ */
++# ifdef __i586__
++#  ifndef i386Architecture
++#   define i386Architecture
++#  endif
++#  undef __i586__
++# endif /* __i586__ */
++# ifdef __i686__
++#  ifndef i386Architecture
++#   define i386Architecture
++#  endif
++#  undef __i686__
++# endif /* __i686__ */
++# ifdef __k6__
++#  ifndef i386Architecture
++#   define i386Architecture
++#  endif
++#  undef __k6__
++# endif /* __k6__ */
++# ifdef __i386
++#  ifndef i386Architecture
++#   define i386Architecture
++#  endif
++#  undef __i386
++# endif /* __i386 */
++# ifdef __i486
++#  ifndef i386Architecture
++#   define i386Architecture
++#  endif
++#  undef __i486
++# endif /* __i486 */
++# ifdef __i586
++#  ifndef i386Architecture
++#   define i386Architecture
++#  endif
++#  undef __i586
++# endif /* __i586 */
++# ifdef __i686
++#  ifndef i386Architecture
++#   define i386Architecture
++#  endif
++#  undef __i686
++# endif /* __i686 */
++# ifdef __k6
++#  ifndef i386Architecture
++#   define i386Architecture
++#  endif
++#  undef __k6
++# endif /* __k6 */
++# ifdef __s390__
++#   define s390Architecture
++#  undef __s390__
++# endif /* s390 */
+ # ifdef __alpha
+ #  define AlphaArchitecture
+ #  undef __alpha
+ # endif /* __alpha */
+ # ifdef __alpha__
+-#  define AlphaArchitecture
++#  ifndef AlphaArchitecture
++#   define AlphaArchitecture
++#  endif
+ #  undef __alpha__
+ # endif /* __alpha__ */
++# ifdef __arm__
++#  define Arm32Architecture
++#  undef arm
++#  undef __arm
++#  undef __arm__
++# endif
+ # ifdef mc68000
+ #  define Mc68020Architecture
+ #  undef mc68000
+ # endif /* mc68000 */
+ # ifdef powerpc
+-#  define PowerPCArchitecture
++#  define PpcArchitecture
+ #  undef powerpc
+ # endif
+-# if defined(arm) || defined(__arm__)
+-#   define ArmArchitecture
+-#   undef arm
+-#   undef __arm__
+-#   if defined(__ARM_ARCH_4__)
+-#     define Arm4Architecture
+-#     define Arm32Architecture
+-#     undef __ARM_ARCH_4__
+-#   endif
+-#   if defined(__ARM_ARCH_3__)
+-#     define Arm3Architecture
+-#     undef __ARM_ARCH_3__
+-#   endif
++# ifdef __powerpc__
++#  ifndef PpcArchitecture
++#   define PpcArchitecture
++#  endif
++#  undef __powerpc__
++# endif
++# ifdef sparc
++#  define SparcArchitecture
++#  undef sparc
++# endif
++# ifdef __sparc__
++#  ifndef SparcArchitecture
++#   define SparcArchitecture
++#  endif
++#  undef __sparc__
++# endif
++# ifdef ia64 
++#  define ia64Architecture
++#  undef ia64 
++# endif
++# ifdef __ia64__
++#  ifndef ia64Architecture
++#   define ia64Architecture
++#  endif
++#  undef __ia64__
++# endif
++# if defined(mips) || defined(__mips__)
++#  define MipsArchitecture
++#  undef mips
++#  undef __mips__
++# endif
++XCOMM  for compatibility with 3.3.x 
++# ifdef PpcArchitecture
++#  define PowerPCArchitecture
+ # endif
+ #endif /* linux */
+ 
+@@ -608,7 +764,7 @@
+ #  undef __x86__
+ # endif
+ # ifdef __powerpc__
+-#  define ppcArchitecture
++#  define PpcArchitecture
+ #  undef __powerpc__
+ # endif
+ # if defined(sparc) || defined(__sparc__)
+@@ -616,6 +772,10 @@
+ #  undef sparc
+ #  undef __sparc__
+ # endif
++/* for compatibility with 3.3.x */
++# ifdef PpcArchitecture
++#  define PowerPCArchitecture
++# endif
+ #endif /* LynxOS AT/PPC/microSPARC */
+ 
+ #ifdef __uxp__
+@@ -687,6 +847,14 @@
+ #undef i386
+ #endif /* MACH */
+ 
++/* On NetBSD, `unix' is not defined, and cpp emits a warning every time
++ * it sees a test using the `unix' symbol */
++#if !defined(NetBSDArchitecture) || (defined(NetBSDArchitecture) && DefaultOSMajorVersion == 1 && DefaultOSMinorVersion <= 3)
++#ifdef unix
++#undef unix
++#endif
++#endif
++
+ #ifdef emxos2
+ #define MacroIncludeFile <os2.cf>
+ #define MacroFile os2.cf
+@@ -721,6 +889,12 @@
+ #endif
+ #endif /* QNX/Neutrino */
+ 
++#ifdef SparcArchitecture
++# if defined(__sparc_v9) || defined(__arch64__)
++#  define Sparc64Architecture
++# endif
++#endif
++
+ #ifndef MacroIncludeFile
+ XCOMM WARNING:  Imake.cf not configured; guessing at definitions!!!
+ XCOMM This might mean that BOOTSTRAPCFLAGS was not set when building imake.
diff --git a/x11-libs/openmotif/openmotif-2.1.30-r1.ebuild b/x11-libs/openmotif/openmotif-2.1.30-r1.ebuild
deleted file mode 100644
index 9376904ced4b..000000000000
--- a/x11-libs/openmotif/openmotif-2.1.30-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2003 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-r1.ebuild,v 1.19 2003/12/16 12:33:16 gmsoft Exp $
-
-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"
-SLOT="0"
-KEYWORDS="x86 ppc sparc ~alpha hppa"
-
-DEPEND="virtual/glibc virtual/x11"
-
-src_unpack() {
-	unpack ${A}
-	cp ${FILESDIR}/site.def ${S}/config/cf/
-}
-
-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
-
-}
diff --git a/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild b/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild
index d76da9994983..7faa05572fa6 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.12 2004/01/18 10:55:29 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild,v 1.13 2004/01/19 11:20:59 lanius Exp $
 
 MY_P=${P}-4_MLI.src
 S=${WORKDIR}/motif
@@ -22,7 +22,6 @@ 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"
diff --git a/x11-libs/openmotif/openmotif-2.1.30-r2.ebuild b/x11-libs/openmotif/openmotif-2.1.30-r4.ebuild
index a528fa72545b..d4b96773e33b 100644
--- a/x11-libs/openmotif/openmotif-2.1.30-r2.ebuild
+++ b/x11-libs/openmotif/openmotif-2.1.30-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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-r2.ebuild,v 1.3 2003/12/01 15:26:57 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r4.ebuild,v 1.1 2004/01/19 11:20:59 lanius Exp $
 
 MY_P=${P}-4_MLI.src
 S=${WORKDIR}/motif
@@ -8,36 +8,40 @@ 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"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
 
 DEPEND="virtual/glibc
 	virtual/x11"
 
 SLOT="0"
 
-#
 # 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}
+	ebegin "adjusting file permissions"
+	chmod -R ug+w .
+	eend $? || die
 
-	cp ${FILESDIR}/site.def ${S}/config/cf/
-	echo >>$cfg
-	echo >>$cfg "#undef  OptimizedCDebugFlags"
-	echo >>$cfg "#define OptimizedCDebugFlags ${CFLAGS}"
-	echo >>$cfg "#undef  OptimizedCplusplusDebugFlags"
+	ebegin "setting up site.def"
+	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}"
+	eend $? || die
+
+	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')
@@ -47,13 +51,14 @@ 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
+	# compile on gcc 2.9x
+	epatch ${FILESDIR}/${P}-imake-ansi.patch
 }
 
 src_compile() {
-
 	mkdir -p imports/x11
 	cd imports/x11
 	ln -s /usr/X11R6/bin bin
@@ -64,32 +69,30 @@ src_compile() {
 }
 
 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"
 
-	make DESTDIR=${D} VARDIR=${D}/var/X11/ install || die "make install"
-	make DESTDIR=${D} install.man || die "make install.man"
-
-	ln -s "../../../../etc/X11/mwm" \
-	      "${D}usr/X11R6/lib/X11/mwm" || die "ln -s confdir"
-
-	mv "${D}usr/X11R6/lib/X11/app-defaults"\
-	   "${D}etc/X11" || die "mv app-defaults"
-
-	rm -rf "${D}usr/X11R6/lib/X11/config" || die "rm config"
-
-	for nib in $NOINSTBIN; do
+	einfo "Cleaning up X11 stuff"
+	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
+	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"
+	rm -rf "${D}usr/X11R6/lib/bindings" || die "rm bindings"
 
-	prepman "/usr/X11R6"
-
+	einfo "Fixing docs"
 	dodoc README COPYRIGHT.MOTIF RELEASE RELNOTES
 	dodoc BUGREPORT OPENBUGS CLOSEDBUGS
+}
 
+pkg_postinst() {
+	ewarn "This might break applications linked against libXm.so.3"
+	ewarn "Just rebuild these applications."
 }