diff options
| -rw-r--r-- | x11-libs/openmotif/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-libs/openmotif/Manifest | 4 | ||||
| -rw-r--r-- | x11-libs/openmotif/files/digest-openmotif-2.1.30-r5 | 1 | ||||
| -rw-r--r-- | x11-libs/openmotif/files/openmotif-2.1.30-uil-bad_grammar_fix.diff | 35 | ||||
| -rw-r--r-- | x11-libs/openmotif/files/site.def.1 | 77 | ||||
| -rw-r--r-- | x11-libs/openmotif/openmotif-2.1.30-r5.ebuild | 99 |
6 files changed, 223 insertions, 1 deletions
diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog index de4d364319dd..02436c654a15 100644 --- a/x11-libs/openmotif/ChangeLog +++ b/x11-libs/openmotif/ChangeLog @@ -1,6 +1,12 @@ # 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.38 2004/01/31 19:02:31 lanius Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.39 2004/02/25 11:00:42 lanius Exp $ + +*openmotif-2.1.30-r5 (25 Feb 2004) + + 25 Feb 2004; Heinrich Wendel <lanius@gentoo.org> openmotif-2.1.30-r5.ebuild, + files/openmotif-2.1.30-uil-bad_grammar_fix.diff, files/site.def.1: + remove i386Architecture from site.def; add uil-bad-grammar-fix 27 Jan 2004; Heinrich Wendel <lanius@gentoo.org> openmotif-2.1.30-r3.ebuild, openmotif-2.1.30-r4.ebuild, files/Mwm.defaults, files/animate-demo.diff, diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest index 7c81dd63706f..b5750790cb01 100644 --- a/x11-libs/openmotif/Manifest +++ b/x11-libs/openmotif/Manifest @@ -1,6 +1,10 @@ +MD5 2d4f6c52316f86c8e7fcffcd5c995a7b openmotif-2.1.30-r5.ebuild 3149 MD5 961299b2c811808fcdba0398b2fc72c2 ChangeLog 5562 MD5 9a4ddc4d8ff1eb167bbaaf919c88d122 openmotif-2.1.30-r4.ebuild 3089 MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r4 79 +MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r5 79 MD5 7284e10e14cac30429821b824dd2f722 files/site.def 2062 MD5 ed2738dd3cbdc87b0800fe9710092d18 files/openmotif-2.1.30-imake-ansi.patch 6554 +MD5 f586e24ce0a2b3eeea25a82c8ec1d3c4 files/openmotif-2.1.30-uil-bad_grammar_fix.diff 832 MD5 28350d5dab901ef8cd0dc92e578e3f45 files/openmotif-2.1.30-imake-tmpdir.patch 1083 +MD5 7284e10e14cac30429821b824dd2f722 files/site.def.1 2062 diff --git a/x11-libs/openmotif/files/digest-openmotif-2.1.30-r5 b/x11-libs/openmotif/files/digest-openmotif-2.1.30-r5 new file mode 100644 index 000000000000..ead704e865e9 --- /dev/null +++ b/x11-libs/openmotif/files/digest-openmotif-2.1.30-r5 @@ -0,0 +1 @@ +MD5 950f0d409e0ce508fa3995790c1106c7 openmotif-2.1.30-4_MLI.src.tar.gz 8645792 diff --git a/x11-libs/openmotif/files/openmotif-2.1.30-uil-bad_grammar_fix.diff b/x11-libs/openmotif/files/openmotif-2.1.30-uil-bad_grammar_fix.diff new file mode 100644 index 000000000000..19568a8c9cc0 --- /dev/null +++ b/x11-libs/openmotif/files/openmotif-2.1.30-uil-bad_grammar_fix.diff @@ -0,0 +1,35 @@ +--- motif/tools/wml/Uil.y.orig Wed May 10 16:02:41 2000 ++++ motif/tools/wml/Uil.y Fri Feb 6 14:45:08 2004 +@@ -397,7 +397,7 @@ + | FONTSET { $$ = $1; $$.b_type = sym_k_fontset_value; } + | WIDGET { $$ = $1; $$.b_type = sym_k_widget_ref_value; } + /* End for fixing CR 5888 */ +- ++ ; + string_table_type + : STRING_TABLE + | COMPOUND_STRING_TABLE +@@ -1049,7 +1049,7 @@ + sar_private_error( &$$ ); + } + } +- ; ++ + | value { $$ = $1; + if ($$.b_type != sym_k_error_value) + { +@@ -1058,12 +1058,12 @@ + sar_private_error( &$$ ); + } + } +- ++ ; + non_export_value + : COLOR_TABLE LEFT_PAREN color_list RIGHT_PAREN { sar_make_color_table( &$$, &$3, &$1); } + + /* END HaL fix CR 5427 */ +- ++ ; + + value + : value_1 diff --git a/x11-libs/openmotif/files/site.def.1 b/x11-libs/openmotif/files/site.def.1 new file mode 100644 index 000000000000..ee7667250687 --- /dev/null +++ b/x11-libs/openmotif/files/site.def.1 @@ -0,0 +1,77 @@ +XCOMM site: $TOG: site.def /main/12 1997/07/02 17:52:18 samborn $ + +/*************************************************************************** + * * + * X Consortium In-House Build Parameters * + * Use at Your Own Risk * + * * + ***************************************************************************/ + +#ifndef SiteIConfigFiles +# define SiteIConfigFiles $(IRULESRC)/host.def +# define LocalConfigFiles host.def +#endif + +#ifdef BeforeVendorCF + +# include <host.def> + +/* We will import x11. */ +# define ImportX11 YES + +# ifndef TopLevelProject +# define TopLevelProject Motif +# endif + +/* On systems where cpp doesn't expand correctly macros in include directives + * the two following macros need to be defined directly (accordingly to the + * TopLevelProject macro defined above). + */ +# if defined(SunArchitecture) || defined(AIXArchitecture) \ + || defined(USLArchitecture) || defined(UXPArchitecture) +# ifndef ProjectRulesFile +# define ProjectRulesFile <Motif.rules> +# endif +# ifndef ProjectTmplFile +# define ProjectTmplFile <Motif.tmpl> +# endif +# endif + +# ifdef AlphaArchitecture +# define HasDECCplusplus YES +# endif + +# ifdef HPArchitecture +# define HasHPCplusplus YES +# endif + +# if defined(SGIArchitecture) +# define MipsN32Architecture YES +# endif + +# ifdef SunArchitecture +# define HasSunCplusplus YES +# endif + +# if defined(UXPArchitecture) || defined(USLArchitecture) \ + || defined(AIXArchitecture) +# define HasCplusplus YES +# endif + +#define LinuxDistribution LinuxUnknown +#define i386Architecture YES +#endif /* BeforeVendorCF */ + +#ifdef AfterVendorCF + +# define X11ProjectRoot /usr/X11R6 +# define ProjectRoot /usr/X11R6 +# define VirtualBindingsPath /usr/X11R6/lib/bindings + +# undef DefaultUserPath +# define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin:/usr/local/bin/mh:/site/local/scripts + +#endif /* AfterVendorCF */ +#define YaccCmd bison --yacc + + diff --git a/x11-libs/openmotif/openmotif-2.1.30-r5.ebuild b/x11-libs/openmotif/openmotif-2.1.30-r5.ebuild new file mode 100644 index 000000000000..c932d927baee --- /dev/null +++ b/x11-libs/openmotif/openmotif-2.1.30-r5.ebuild @@ -0,0 +1,99 @@ +# 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-r5.ebuild,v 1.1 2004/02/25 11:00:42 lanius 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" +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 + + ebegin "setting up site.def" + cp ${FILESDIR}/site.def.1 ${S}/config/cf/site.def && \ + 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') + 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 + # compile on gcc 2.9x + epatch ${FILESDIR}/${P}-imake-ansi.patch + epatch ${FILESDIR}/${P}-uil-bad_grammar_fix.diff +} + +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" + + 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 + 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" + + 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." +} |