version bump

6 files changed, 35 insertions, 60 deletions

diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog
index 363e2a03ae6d..d1bf33f2de53 100644
--- a/x11-wm/fvwm/ChangeLog
+++ b/x11-wm/fvwm/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-wm/fvwm
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.5 2002/05/26 13:58:04 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.6 2002/08/12 06:47:36 seemant Exp $
+
+*fvwm-2.4.8 (12 Aug 2002)
+
+  12 Aug 2002; Seemant Kulleen <seemant@gentoo.org> fvwm-2.4.8.ebuild
+  files/digest-fvwm-2.4.8 files/fvwm2 :
+
+  Moved the fvwm2 script into a dynamic thing within the ebuild.  Made a big
+  bz2ball of the patches to be applied to the source.  Version bump and
+  patches from: matt@zigg.com (Matt Behrens) in bug #5886
 
 *fvwm-2.4.7-r1 (26 May 2002)
 
diff --git a/x11-wm/fvwm/files/digest-fvwm-2.4.3-r1 b/x11-wm/fvwm/files/digest-fvwm-2.4.3-r1
deleted file mode 100644
index 8e4afefd3108..000000000000
--- a/x11-wm/fvwm/files/digest-fvwm-2.4.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3fd013d29242570359028ec0096f8ae6 fvwm-2.4.3.tar.bz2 1298982
diff --git a/x11-wm/fvwm/files/digest-fvwm-2.4.7 b/x11-wm/fvwm/files/digest-fvwm-2.4.7
deleted file mode 100644
index 3efab460b8c1..000000000000
--- a/x11-wm/fvwm/files/digest-fvwm-2.4.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 57a5b11d57d551aef2c5ae385eb31050 fvwm-2.4.7.tar.bz2 1322700
diff --git a/x11-wm/fvwm/files/digest-fvwm-2.4.8 b/x11-wm/fvwm/files/digest-fvwm-2.4.8
new file mode 100644
index 000000000000..a96ef4507450
--- /dev/null
+++ b/x11-wm/fvwm/files/digest-fvwm-2.4.8
@@ -0,0 +1,2 @@
+MD5 68e7a6fd2d793a01ce3131ef5508b60d fvwm-2.4.8.tar.bz2 1328350
+MD5 ed9432c2c98b62166d84b5ea9666a12d fvwm-2.4.8-gentoo-diff.bz2 83491
diff --git a/x11-wm/fvwm/fvwm-2.4.7.ebuild b/x11-wm/fvwm/fvwm-2.4.7.ebuild
deleted file mode 100644
index 9dbe4f9a719a..000000000000
--- a/x11-wm/fvwm/fvwm-2.4.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.4.7.ebuild,v 1.3 2002/07/11 06:31:00 drobbins Exp $
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="an extremely powerful ICCCM-compliant multiple virtual desktop window manager"
-SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2"
-HOMEPAGE="http://www.fvwm.org/"
-LICENSE="GPL-2 & FVWM"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND=">=dev-libs/libstroke-0.4
-	gtk? ( =x11-libs/gtk+-1.2* )
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
-	ncurses? ( >=sys-libs/readline-4.1 )"
-
-
-src_compile() {
-	local myconf
-
-	use gnome	\
-		&& myconf="--with-gnome"	\
-		|| myconf="--without-gnome"	\
-
-	./configure	\
-		--prefix=/usr 	\
-		--host=${CHOST} \
-		--libexecdir=/usr/lib \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info	\
-		${myconf} || die
-
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	
-	exeinto /etc/X11/Sessions
-	doexe $FILESDIR/fvwm2
-}
diff --git a/x11-wm/fvwm/fvwm-2.4.3-r1.ebuild b/x11-wm/fvwm/fvwm-2.4.8.ebuild
index efa4048ae540..d105812eba17 100644
--- a/x11-wm/fvwm/fvwm-2.4.3-r1.ebuild
+++ b/x11-wm/fvwm/fvwm-2.4.8.ebuild
@@ -1,35 +1,41 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.4.3-r1.ebuild,v 1.5 2002/07/11 06:31:00 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.4.8.ebuild,v 1.1 2002/08/12 06:47:37 seemant Exp $
 
 
 S=${WORKDIR}/${P}
 DESCRIPTION="an extremely powerful ICCCM-compliant multiple virtual desktop window manager"
-SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2"
+SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2
+	mirror://gentoo/${P}-gentoo-diff.bz2"
 HOMEPAGE="http://www.fvwm.org/"
-LICENSE="GPL-2 & FVWM" 
+
 SLOT="0"
 KEYWORDS="x86"
+LICENSE="GPL-2 FVWM"
 
-DEPEND=">=dev-libs/libstroke-0.4
+RDEPEND=">=dev-libs/libstroke-0.4
 	gtk? ( =x11-libs/gtk+-1.2* )
 	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
 	ncurses? ( >=sys-libs/readline-4.1 )"
+DEPEND="${RDEPEND} sys-devel/automake"
+
+src_unpack() {
 
+	unpack ${A}
+	patch -p0 < ${P}-gentoo-diff || die
+}
 
 src_compile() {
 	local myconf
 
-	use gnome	\
-		&& myconf="--with-gnome"	\
-		|| myconf="--without-gnome"	\
+	use gnome \
+		&& myconf="--with-gnome" \
+		|| myconf="--without-gnome" \
 
-	./configure	\
-		--prefix=/usr 	\
-		--host=${CHOST} \
+	automake
+
+	econf \
 		--libexecdir=/usr/lib \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info	\
 		${myconf} || die
 
 	emake || die
@@ -37,7 +43,10 @@ src_compile() {
 
 src_install () {
 	make DESTDIR=${D} install || die
-	
+
+	echo "#!/bin/bash" > fvwm2
+	echo "/usr/bin/fvwm2" >> fvwm2
+
 	exeinto /etc/X11/Sessions
-	doexe $FILESDIR/fvwm2
+	doexe fvwm2
 }