summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorTavis Ormandy <taviso@gentoo.org>2003-07-06 20:20:20 +0000
committerTavis Ormandy <taviso@gentoo.org>2003-07-06 20:20:20 +0000
commit2f51e42e0dfa103100fa00b4663443c69c1023ab (patch)
treefbe93174ec6ba6a0a647b3d2c6967ac61b72f986 /x11-wm
parentMarked stable on x86 (diff)
downloadgentoo-2-2f51e42e0dfa103100fa00b4663443c69c1023ab.tar.gz
gentoo-2-2f51e42e0dfa103100fa00b4663443c69c1023ab.tar.bz2
gentoo-2-2f51e42e0dfa103100fa00b4663443c69c1023ab.zip
bugfix
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/fvwm/ChangeLog7
-rw-r--r--x11-wm/fvwm/Manifest4
-rw-r--r--x11-wm/fvwm/fvwm-2.4.16.ebuild8
3 files changed, 14 insertions, 5 deletions
diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog
index 8c90266b19a0..29bfdeba4440 100644
--- a/x11-wm/fvwm/ChangeLog
+++ b/x11-wm/fvwm/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-wm/fvwm
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.13 2003/07/03 18:38:54 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.14 2003/07/06 20:20:10 taviso Exp $
+
+*fvwm-2.4.16 (06 Jul 2003)
+
+ 06 Jul 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.4.16.ebuild:
+ build bombs out if a comma is in CFLAGS, replaced with !'s.
03 Jul 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.4.7-r1.ebuild:
new release, now includes rplay support.
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 845e888a7f65..d397cea9491f 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -1,7 +1,7 @@
MD5 ed461756b79f840ed23c7146d1d44108 fvwm-2.4.15.ebuild 1169
MD5 640cc8cf1c7b29a974fed717d4460794 fvwm-2.4.14.ebuild 1102
-MD5 cf7f8f14ad7ba52dac79090d0ea5b4e6 fvwm-2.4.16.ebuild 1174
-MD5 38a43dd33ebe0a656861d765bb27510b ChangeLog 2504
+MD5 3a9940048e42d2b4075c5b4625433727 fvwm-2.4.16.ebuild 1336
+MD5 5ec980bd370c0f186da26c7f804ad42a ChangeLog 2664
MD5 beaa1ad08ff661a32c25d1a51c879a8d metadata.xml 450
MD5 ccd8378d86941cb17669e64ca88949c1 fvwm-2.4.8.ebuild 1146
MD5 282c809ddaa59071830b6c8dd9b0a3a1 files/fvwm2 25
diff --git a/x11-wm/fvwm/fvwm-2.4.16.ebuild b/x11-wm/fvwm/fvwm-2.4.16.ebuild
index 691f90c7632c..bbe2075f8b09 100644
--- a/x11-wm/fvwm/fvwm-2.4.16.ebuild
+++ b/x11-wm/fvwm/fvwm-2.4.16.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.4.16.ebuild,v 1.1 2003/07/03 18:38:55 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.4.16.ebuild,v 1.2 2003/07/06 20:20:10 taviso Exp $
inherit gnuconfig
@@ -35,6 +35,10 @@ src_compile() {
&& myconf="--with-gnome" \
|| myconf="--without-gnome" \
+ # CFLAGS containing comma will break this.
+ sed -i 's#\x27s,xCFLAGSx,$(CFLAGS),\x27#\x27s!xCFLAGSx!$(CFLAGS)!\x27#' \
+ ${S}/utils/Makefile.am
+
automake
econf \
@@ -46,7 +50,7 @@ src_compile() {
}
src_install () {
- einstall || die
+ make DESTDIR=${D} install || die
echo "#!/bin/bash" > fvwm2
echo "/usr/bin/fvwm2" >> fvwm2