This update allows a user to compile in modelock functionality by setting a WITH_MODELOCK environment variable at build-time.
I'm having a trouble attaching a file to this bug. Was unable to upload the attachment from Mozilla and Opera. :(
then paste it as a comment here :o)
Okay, the next message will contain a sharred WindowMaker-0.80.0-r1.ebuild file. I was trying to follow the online document on submitting ebuilds. I hope I can get CVS access so that I could commit a few new ports without this tedious process. (I already emailed drobbins@gentoo.org about this.)
#!/bin/sh # This is a shell archive (produced by GNU sharutils 4.2.1). # To extract the files from this archive, save it to some FILE, remove # everything before the `!/bin/sh' line above, then type `sh FILE'. # # Made on 2002-01-30 23:37 EST by <antipode@tea>. # Source directory was `/home/antipode'. # # Existing files will *not* be overwritten unless `-c' is specified. # # This shar contains: # length mode name # ------ ---------- ------------------------------------------ # 2600 -rw-r----- WindowMaker-0.80.0- r1.ebuild # save_IFS="${IFS}" IFS="${IFS}:" gettext_dir=FAILED locale_dir=FAILED first_param="$1" for dir in $PATH do if test "$gettext_dir" = FAILED && test -f $dir/gettext \ && ($dir/gettext -- version >/dev/null 2>&1) then set `$dir/gettext --version 2>&1` if test "$3" = GNU then gettext_dir=$dir fi fi if test "$locale_dir" = FAILED && test -f $dir/shar \ && ($dir/shar -- print-text-domain-dir >/dev/null 2>&1) then locale_dir=`$dir/shar --print-text-domain-dir` fi done IFS="$save_IFS" if test "$locale_dir" = FAILED || test "$gettext_dir" = FAILED then echo=echo else TEXTDOMAINDIR=$locale_dir export TEXTDOMAINDIR TEXTDOMAIN=sharutils export TEXTDOMAIN echo="$gettext_dir/gettext -s" fi if touch -am -t 200112312359.59 $$.touch >/dev/null 2>&1 && test ! -f 2001123123 59.59 -a -f $$.touch; then shar_touch='touch -am -t $1$2$3$4$5$6.$7 "$8"' elif touch -am 123123592001.59 $$.touch >/dev/null 2>&1 && test ! -f 12312359200 1.59 -a ! -f 123123592001.5 -a -f $$.touch; then shar_touch='touch -am $3$4$5$6$1$2.$7 "$8"' elif touch -am 1231235901 $$.touch >/dev/null 2>&1 && test ! -f 1231235901 -a -f $$.touch; then shar_touch='touch -am $3$4$5$6$2 "$8"' else shar_touch=: echo $echo 'WARNING: not restoring timestamps. Consider getting and' $echo "installing GNU \`touch', distributed in GNU File Utilities..." echo fi rm -f 200112312359.59 123123592001.59 123123592001.5 1231235901 $$.touch # if mkdir _sh15355; then $echo 'x -' 'creating lock directory' else $echo 'failed to create lock directory' exit 1 fi # ============= WindowMaker-0.80.0-r1.ebuild ============== if test -f 'WindowMaker-0.80.0-r1.ebuild' && test "$first_param" != -c; then $echo 'x -' SKIPPING 'WindowMaker-0.80.0-r1.ebuild' '(file already exists)' else $echo 'x -' extracting 'WindowMaker-0.80.0-r1.ebuild' '(text)' sed 's/^X//' << 'SHAR_EOF' > 'WindowMaker-0.80.0- r1.ebuild' && # Copyright 1999-2000 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Author Daniel Robbins <drobbins@gentoo.org> # /space/gentoo/cvsroot/gentoo-x86/x11- wm/WindowMaker/WindowMaker-0.80.0.ebuild, v 1.1 2002/01/16 16:40:08 g2boojum Exp X S=${WORKDIR}/${P} DESCRIPTION="Window Maker" SRC_URI="ftp://ftp.windowmaker.org/pub/source/release/${P}.tar.gz X ftp://ftp.windowmaker.org/pub/source/release/WindowMaker-extra- 0.1.tar. bz2" HOMEPAGE="http://www.windowmaker.org/" X DEPEND="virtual/glibc virtual/x11 X >=media-libs/tiff-3.5.5 X >=media-libs/libpng-1.0.12 X >=media-libs/jpeg-6b- r2 X x11-wm/gnustep-env X gif? ( >=media-libs/giflib-4.1.0-r3 ) X ungif? ( >=media- libs/libungif-4.1.0 ) X nls? ( >=sys-devel/gettext-0.10.39 )" # Replaced by WINGS # >=x11- libs/libPropList-0.10.1" X #NOTE: the default menu has the wrong path for the WMPrefs utility. Needs fixin g. X src_compile() { X X local myconf X if [ "`use gnome`" ] ; then X myconf="--enable-gnome" X fi X if [ "`use kde`" ] ; then X # hope this helps for linking against kdelibs, I'm not testing o ther wms right now X export KDEDIR=/usr/kde/2 X myconf="$myconf -- enable-kde" X fi X if [ "$WITH_MODELOCK" ] ; then X myconf="$myconf --enable-modelock" X fi X if [ "`use nls`" ] ; then X LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" X export LINGUAS X fi X X ./configure --host=${CHOST} \ X --prefix=/usr \ X --mandir=/usr/share/man \ X -- infodir=/usr/share/info \ X --sysconfdir=/etc/X11 \ X --with-nlsdir=/usr/share/locale \ X -- with-x \ X --enable-newstyle \ X --enable-superfluous \ X --enable-usermenu \ X $myconf || die X X make || die X X # WindowMaker Extra X cd ../WindowMaker-extra-0.1 X ./configure -- host=${CHOST} \ X --prefix=/usr \ X --mandir=/usr/share/man \ X --infodir=/usr/share/info || die X X make || die } X src_install() { X X make prefix=${D}/usr \ X mandir=${D}/usr/share/man \ X infodir=${D}/usr/share/info \ X sysconfdir=${D}/etc/X11 \ X NLSDIR=${D}/usr/share/locale \ X GNUSTEP_LOCAL_ROOT=${D}${GNUSTEP_LOCAL_ROOT} \ X install || die X X cp -f WindowMaker/plmenu ${D}/etc/X11/WindowMaker/WMRootMenu X X dodoc AUTHORS BUGFORUM BUGS ChangeLog COPYING* INSTALL* FAQ* \ X MIRRORS README* NEWS TODO X X # WindowMaker Extra X cd ../WindowMaker-extra-0.1 X make prefix=${D}/usr \ X mandir=${D}/usr/share/man \ X infodir=${D}/usr/share/info \ X install || die X X newdoc README README.extra } X SHAR_EOF (set 20 02 01 30 23 21 38 'WindowMaker-0.80.0-r1.ebuild'; eval "$shar_touch") && chmod 0640 'WindowMaker-0.80.0-r1.ebuild' || $echo 'restore of' 'WindowMaker-0.80.0-r1.ebuild' 'failed' if ( md5sum --help 2>&1 | grep 'sage: md5sum \[' ) >/dev/null 2>&1 \ && ( md5sum --version 2>&1 | grep -v 'textutils 1.12' ) >/dev/null; then md5sum - c << SHAR_EOF >/dev/null 2>&1 \ || $echo 'WindowMaker-0.80.0-r1.ebuild:' 'MD5 check failed' 55234eb0233cbfa461a15642b167999c WindowMaker-0.80.0-r1.ebuild SHAR_EOF else shar_count="`LC_ALL= LC_CTYPE= LANG= wc -c < 'WindowMaker-0.80.0-r1.ebuild'` " test 2600 -eq "$shar_count" || $echo 'WindowMaker-0.80.0-r1.ebuild:' 'original size' '2600,' 'current size' "$shar_count!" fi fi rm -fr _sh15355 exit 0
Crap, the lines got wrapped! I can't produce a patch because I overwrote the original ebuild script, and "emerge rsync" did not reproduce it, even though I moved the modified version away. [Leaves to read portage documentation.]
Ok, emerge --clean rsync did it. Below is the patch. ----------------- 8<------------ --- x11-wm/WindowMaker/WindowMaker- 0.80.0-r1.ebuild Thu Jan 31 00:09:12 2002 +++ x11-wm/WindowMaker/WindowMaker-0.80.0- r2.ebuild Thu Jan 31 00:09:07 2002 @@ -37,6 +37,9 @@ export KDEDIR=/usr/kde/2 myconf="$myconf --enable-kde" fi + if [ "$WITH_MODELOCK" ] ; then + myconf="$myconf --enable- modelock" + fi if [ "`use nls`" ] ; then LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" export LINGUAS
I wish bugzilla didn't have <TEXTAREA WRAP=HARD ... for the comments. :(
Put the files in ftp://verwilst.dyndns.org:3021/incoming please, make sure you put them all in a seperate dir, together with a text file with the bugnumber included :)
I could not connect to the ftp server you provided. In fact, I can't even ping the host. I've put the updated ebuild file up at the following URL: http://cdf.toronto.edu/~agenkin/WindowMaker-0.80.0-r2.ebuild The change is rather trivial (three lines). ;^)