marking -r3 stable, adding -r4 with a couple of patches from cvs.

7 files changed, 397 insertions, 3 deletions

diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog
index fb752fef36d3..b00470ad8a21 100644
--- a/x11-wm/fvwm/ChangeLog
+++ b/x11-wm/fvwm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/fvwm
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.70 2004/05/28 08:21:20 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.71 2004/05/29 19:53:13 taviso Exp $
+
+  29 May 2004; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.10-r3.ebuild:
+  marking -r3 stable on x86, added -r4 which adds two patches from cvs, 
+  a bugfix for FvwmCommand, and an update to the Test () Syntax.
 
   28 May 2004; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.10-r1.ebuild,
   fvwm-2.5.10-r2.ebuild:
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index f8d803f98512..d78247585709 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -1,10 +1,12 @@
 MD5 cf0d32f2c40f1d531efc6908fb0d44d1 fvwm-2.5.7-r5.ebuild 8763
 MD5 c3f7361730942c44c3bd2c9c3a8c3efa fvwm-2.5.8-r6.ebuild 10702
+MD5 72b43c0bfacd862090353038db17a457 fvwm-2.5.10-r4.ebuild 9483
 MD5 bb2c0917e421c44536d2b1855cfe6498 ChangeLog 13357
 MD5 4833e4d0685ef48988c0c5c4f9c6b377 metadata.xml 527
 MD5 dd7d825b801da4995d45578db3c25717 fvwm-2.4.18.ebuild 3172
 MD5 a0e134f9e9ac0cecb62962b775ddc142 fvwm-2.5.10-r3.ebuild 9290
 MD5 d91fb7d2af57653fc93a70e6e1c0a0ea files/fvwm-menu-xlock-xlockmore-compat.diff 550
+MD5 d8a3811b3a9581c42119cdc86dff4c7d files/fvwm-2.5.10-Test-update.diff 702
 MD5 e2ceb5d855c5406a09d82442196efad8 files/README.transluceny.gz 5788
 MD5 7e00938e8f20ffaa22e1c5672666c027 files/fvwm-2.5.8-iconfile.diff 791
 MD5 e5701841190ad529d5577c8da69d5006 files/fvwmtabs-insecure-tmp-handling.diff 2350
@@ -16,8 +18,10 @@ MD5 8ebd7b398d3c580ca5067c78f8642ae1 files/fvwm-2.5.8-taskbar-margins.diff 1384
 MD5 0fcb3587e80a443304b2e6878b6eab0a files/fvwmtabs-2.8-insecure-tmp-handling.diff 2349
 MD5 d15c4e05878e8e2b8a9d5edcf30abdc2 files/fvwm-2.5.9-translucent-menus.diff.gz 58529
 MD5 977c11b7ca7c17cff7a14d1d4a0136f4 files/fvwm-2.5.8-perllib-disconnect.diff 1179
+MD5 0a39299dd7ca570060f545e659c77604 files/fvwm-2.5.10-FvwmCommand.diff 1013
 MD5 5dc401c9f6a50da0bfa85a025749652a files/fvwm-2.5.8-fvwm-menu-directory-security.diff 382
 MD5 0c1b906138bf4e2977e7be1631f949d9 files/digest-fvwm-2.5.10-r3 128
+MD5 0c1b906138bf4e2977e7be1631f949d9 files/digest-fvwm-2.5.10-r4 128
 MD5 e9263b93f666293d0a1220ea3457efcd files/mini.happy.xpm 425
 MD5 2bdb17132f9d7f352002a1fbace7fca1 files/acinclude.m4 61423
 MD5 4f044a8a47c9f8ea61d54dfa4bd79b70 files/fvwm-2.5.8-fvwm-bug-security.diff 327
diff --git a/x11-wm/fvwm/files/digest-fvwm-2.5.10-r4 b/x11-wm/fvwm/files/digest-fvwm-2.5.10-r4
new file mode 100644
index 000000000000..620b8bcd87f6
--- /dev/null
+++ b/x11-wm/fvwm/files/digest-fvwm-2.5.10-r4
@@ -0,0 +1,2 @@
+MD5 b3c86e2af2a4eabe692c9c849ff4b243 fvwm-2.5.10.tar.bz2 1788873
+MD5 cc3c0f7e89a712d266de69c6da340aaf FvwmTabs-3.0.tar.gz 25495
diff --git a/x11-wm/fvwm/files/fvwm-2.5.10-FvwmCommand.diff b/x11-wm/fvwm/files/fvwm-2.5.10-FvwmCommand.diff
new file mode 100644
index 000000000000..21c0b0c34ce0
--- /dev/null
+++ b/x11-wm/fvwm/files/fvwm-2.5.10-FvwmCommand.diff
@@ -0,0 +1,34 @@
+--- modules/FvwmCommand/FvwmCommand.c	2003-07-06 15:34:07.000000000 +0100
++++ modules/FvwmCommand/FvwmCommand.c	2004-05-28 09:26:59.360540104 +0100
+@@ -56,7 +56,6 @@
+ void sendit( char *cmd );
+ void receive( void );
+ static RETSIGTYPE sig_ttin(int);
+-/* void sig_pipe( int ); */
+ static RETSIGTYPE sig_quit(int);
+ void usage(void);
+ int  read_f(int fd, char *p, int len);
+@@ -125,6 +124,7 @@
+     sigaction(SIGHUP, &sigact, NULL);
+     sigaction(SIGQUIT, &sigact, NULL);
+     sigaction(SIGTERM, &sigact, NULL);
++    sigaction(SIGPIPE, &sigact, NULL);
+   }
+ #else
+ #ifdef USE_BSD_SIGNALS
+@@ -135,6 +135,7 @@
+   signal(SIGHUP, sig_quit);
+   signal(SIGQUIT, sig_quit);
+   signal(SIGTERM, sig_quit);
++  signal(SIGPIPE, sig_quit);
+   signal(SIGTTIN, sig_ttin);
+   signal(SIGTTOU, sig_ttin);
+ #ifdef HAVE_SIGINTERRUPT
+@@ -142,6 +143,7 @@
+   siginterrupt(SIGHUP, 1);
+   siginterrupt(SIGQUIT, 1);
+   siginterrupt(SIGTERM, 1);
++  siginterrupt(SIGPIPE, 1);
+   siginterrupt(SIGTTIN, 0);
+   siginterrupt(SIGTTOU, 0);
+ #endif
diff --git a/x11-wm/fvwm/files/fvwm-2.5.10-Test-update.diff b/x11-wm/fvwm/files/fvwm-2.5.10-Test-update.diff
new file mode 100644
index 000000000000..477ce6d51dd2
--- /dev/null
+++ b/x11-wm/fvwm/files/fvwm-2.5.10-Test-update.diff
@@ -0,0 +1,44 @@
+--- fvwm/conditional.c	2004-03-02 11:20:48.000000000 +0000
++++ fvwm/conditional.c	2004-05-09 14:07:19.000000000 +0100
+@@ -1599,19 +1599,23 @@
+ 	while (condition)
+ 	{
+ 		char *cond;
+-		Bool on;
++		Bool reverse;
+ 
+ 		cond = condition;
+-		on = 1;
++		reverse = 0;
+ 		if (*cond == '!')
+ 		{
+-			on = 0;
++			reverse = 1;
+ 			cond++;
+ 		}
+ 		if (StrEquals(cond, "True"))
+ 		{
+ 			match = True;
+ 		}
++		else if (StrEquals(cond, "False"))
++		{
++			match = False;
++		}
+ 		else if (StrEquals(cond, "Version"))
+ 		{
+ 			char *pattern;
+@@ -1698,8 +1702,13 @@
+ 				error = True;
+ 			}
+ 		}
++		else
++		{
++			/* unrecognized condition */
++			error = 1;
++		}
+ 
+-		if (!on)
++		if (reverse)
+ 		{
+ 			match = !match;
+ 		}
diff --git a/x11-wm/fvwm/fvwm-2.5.10-r3.ebuild b/x11-wm/fvwm/fvwm-2.5.10-r3.ebuild
index 7786d531c19e..e1f0880ed6d4 100644
--- a/x11-wm/fvwm/fvwm-2.5.10-r3.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.10-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-wm/fvwm/fvwm-2.5.10-r3.ebuild,v 1.2 2004/05/25 17:32:17 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.10-r3.ebuild,v 1.3 2004/05/29 19:53:14 taviso Exp $
 
 inherit eutils flag-o-matic
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2
 HOMEPAGE="http://www.fvwm.org/"
 
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~sparc ~ppc ~amd64"
+KEYWORDS="x86 ~alpha ~sparc ~ppc ~amd64"
 LICENSE="GPL-2 FVWM"
 
 RDEPEND="readline? ( >=sys-libs/readline-4.1
diff --git a/x11-wm/fvwm/fvwm-2.5.10-r4.ebuild b/x11-wm/fvwm/fvwm-2.5.10-r4.ebuild
new file mode 100644
index 000000000000..b5e94b661dd4
--- /dev/null
+++ b/x11-wm/fvwm/fvwm-2.5.10-r4.ebuild
@@ -0,0 +1,306 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.10-r4.ebuild,v 1.1 2004/05/29 19:53:14 taviso Exp $
+
+inherit eutils flag-o-matic
+
+IUSE="readline truetype ncurses gtk stroke gnome rplay xinerama perl nls png bidi imlib tcltk debug gtk2"
+
+DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager"
+SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2
+		perl? ( mirror://gentoo/FvwmTabs-3.0.tar.gz )"
+HOMEPAGE="http://www.fvwm.org/"
+
+SLOT="0"
+KEYWORDS="~x86 ~alpha ~sparc ~ppc ~amd64"
+LICENSE="GPL-2 FVWM"
+
+RDEPEND="readline? ( >=sys-libs/readline-4.1
+				ncurses? ( >=sys-libs/ncurses-5.3-r1 )
+				!ncurses? ( >=sys-libs/libtermcap-compat-1.2.3 ) )
+		gtk? ( =x11-libs/gtk+-1.2*
+				imlib? ( >=media-libs/gdk-pixbuf-0.21.0
+						>=media-libs/imlib-1.9.14-r1 )
+				gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 ) )
+		rplay? ( >=media-sound/rplay-3.3.2 )
+		bidi? ( >=dev-libs/fribidi-0.10.4 )
+		png? ( >=media-libs/libpng-1.0.12-r2 )
+		stroke? ( >=dev-libs/libstroke-0.4 )
+		perl? ( tcltk? ( >=dev-lang/tk-8.3.4
+						>=dev-perl/perl-tk-800.024-r2
+						>=dev-perl/X11-Protocol-0.52 ) )
+		truetype? ( virtual/xft >=media-libs/fontconfig-2.1-r1 )
+		>=dev-lang/perl-5.6.1-r10
+		>=sys-libs/zlib-1.1.4-r1
+		sys-apps/debianutils
+		virtual/x11"
+# XXX:	gtk2 perl bindings require dev-perl/gtk2-perl, worth a dependency?
+# XXX:	gtk perl bindings require dev-perl/gtk-perl, worth a dependency?
+# XXX:	netpbm is used by FvwmScript-ScreenDump, worth a dependency?
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${P}
+
+src_unpack() {
+	unpack ${A}
+
+	# this patch enables fast translucent menus in fvwm..yummy! this is a 
+	# minor tweak of a patch posted to fvwm-user mailing list by Olivier 
+	# Chapuis in <20030827135125.GA6370@snoopy.folie>.
+	cd ${S}; epatch ${FILESDIR}/fvwm-2.5.9-translucent-menus.diff.gz
+
+	# according to a post to fvwm-workers mailing list, Mikhael Goikhman
+	# planned on disabling these debug statements before the release, but
+	# never got around to it.
+	cd ${S}; epatch ${FILESDIR}/disable-debug-statements.diff
+
+	if use perl; then
+		# I'll supply a default icon for FvwmTabs, this removes the need for
+		# installing an iconset, this one comes from the fvwm_icons package.
+		cd ${WORKDIR}
+		ebegin "	Setting default icon for FvwmTabs"
+			sed -i 's#happyMini.xpm#/usr/share/fvwm/mini-happy.xpm#g' \
+				FvwmTabs FvwmTabs.1 fvwmtabrc
+		eend $?
+	fi
+
+	# this patch adds an 'ShowOnlyIcons Never' option to FvwmIconMan.
+	cd ${S}; epatch ${FILESDIR}/fvwm-iconman.diff
+
+	# fix some issues reported since the 2.5.10 release.
+	cd ${S}; epatch ${FILESDIR}/fvwm-2.5.10-post-release.diff
+
+	# build fails on alpha with certain options without this.
+	use alpha && append-flags -fPIC
+
+	# just in case anyone on mips want to test.
+	use mips && epatch ${FILESDIR}/fvwm-2.5.10-mips-compat.diff
+
+	# fixing #51287, the fvwm-menu-xlock script is not compatible
+	# with the xlockmore implementation in portage.
+	epatch ${FILESDIR}/fvwm-menu-xlock-xlockmore-compat.diff
+
+	# fix hang when restarting
+	cd ${S}; epatch ${FILESDIR}/fvwm-2.5.10-FvwmCommand.diff
+
+	# some useful improvements to Test () Syntax.
+	cd ${S}; epatch ${FILESDIR}/fvwm-2.5.10-Test-update.diff
+}
+
+src_compile() {
+	local myconf="--libexecdir=/usr/lib --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm --enable-package-subdirs"
+
+	# ImagePath should include /usr/share/icons/fvwm (x11-themes/fvwm_icons)
+	#
+	# Another iconset for fvwm, wm-icons, includes configurations and user
+	# configuration utilities to make them easy to use with fvwm, no need
+	# to put them in the default ImagePath.
+
+	# use readline in FvwmConsole.
+	if ! use readline; then
+		myconf="${myconf} --without-readline-library"
+	else
+		myconf="${myconf} --with-readline-library"
+
+		# choose ncurses or termcap.
+		if use ncurses; then
+			myconf="${myconf} --without-termcap-library"
+		else
+			myconf="${myconf} --without-ncurses-library"
+		fi
+	fi
+
+	# since fvwm-2.5.8 GTK support can be diabled with --disable-gtk, previously
+	# we had to hide the includes/libs during configure. this is still the case
+	# for GDK image suport _with_ gtk, unfortunately.
+	# FvwmGtk can be built as a gnome application, or a Gtk+ application.
+	if ! use gtk; then
+		myconf="${myconf} --disable-gtk --without-gnome"
+	else
+		if ! use imlib; then
+			einfo "ATTN: You can safely ignore any imlib related configure errors."
+			myconf="${myconf} --with-imlib-prefix=${T}"
+		fi
+		if ! use gnome; then
+			myconf="${myconf} --without-gnome"
+		else
+			myconf="${myconf} --with-gnome"
+		fi
+	fi
+
+	# rplay is a cool, but little used way of playing sounds over a network
+	# Fvwm support is pretty good.
+	if ! use rplay; then
+		myconf="${myconf} --without-rplay-library"
+	fi
+
+	# Install perl bindings.
+	if use perl; then
+		myconf="${myconf} --enable-perllib"
+	else
+		myconf="${myconf} --disable-perllib"
+	fi
+
+	# xinerama support for those who have multi-headed machines.
+	if use xinerama; then
+		myconf="${myconf} --enable-xinerama"
+	else
+		myconf="${myconf} --disable-xinerama"
+	fi
+
+	# bidirectional writing support, eg hebrew
+	if use bidi; then
+		myconf="${myconf} --enable-bidi"
+	else
+		myconf="${myconf} --disable-bidi"
+	fi
+
+	# png image support (very nice in fvwm)
+	if ! use png; then
+		myconf="${myconf} --without-png-library"
+	fi
+
+	# native language support
+	if use nls; then
+		myconf="${myconf} --enable-nls --enable-iconv"
+	else
+		myconf="${myconf} --disable-nls --disable-iconv"
+	fi
+
+	# support for mouse gestures using libstroke (very very cool)
+	if ! use stroke; then
+		myconf="${myconf} --without-stroke-library"
+	fi
+
+	# more verbosity for module developers/hackers/etc.
+	if use debug; then
+		myconf="${myconf} --enable-debug-msgs --enable-command-log"
+		append-flags -DCR_DETECT_MOTION_METHOD_DEBUG
+	fi
+
+	# Xft Anti Aliased text support
+	if use truetype; then
+		myconf="${myconf} --enable-xft"
+	else
+		myconf="${myconf} --disable-xft"
+	fi
+
+	# disable xsm protocol (session management) support?
+	if use nosm; then
+		myconf="${myconf} --disable-sm"
+	else
+		myconf="${myconf} --enable-sm"
+	fi
+
+	# disable xpm support?
+	if use noxpm; then
+		myconf="${myconf} --without-xpm-library"
+	fi
+
+	# set the local maintainer for fvwm-bug.
+	export FVWM_BUGADDR="taviso@gentoo.org"
+
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+
+	make DESTDIR=${D} install || die
+
+	if use perl; then
+
+		local toolkits="gtk2 gtk tcltk"
+
+		if use tcltk; then
+			# Install the very cool FvwmTabs module
+			# http://users.tpg.com.au/users/scottie7/FvwmTabs
+			einfo "Installing FvwmTabs module..."
+
+			exeinto /usr/lib/fvwm/${PV}/
+			doexe ${WORKDIR}/FvwmTabs
+			dodoc ${WORKDIR}/fvwmtabrc ${WORKDIR}/README.fvwmtabs
+			doman ${WORKDIR}/FvwmTabs.1
+
+			# install default drag and drop icon.
+			insinto /usr/share/fvwm
+			newins ${FILESDIR}/mini.happy.xpm mini-happy.xpm
+		else
+			# Remove the Tk bindings (requires perl-tk)
+			rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Tk.pm
+			toolkits=${toolkits/tcltk/}
+		fi
+		if ! use gtk; then
+			# Remove gtk bindings (requires gtk-perl/gtk2-perl)
+			rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk.pm \
+				${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm
+			toolkits=${toolkits/gtk2/}
+			toolkits=${toolkits/gtk/}
+		else
+			if ! use gtk2; then
+				# Just remove the gtk2 bindings (requires gtk2-perl)
+				rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm
+				toolkits=${toolkits/gtk2/}
+			fi
+		fi
+		toolkits=${toolkits// /}
+		if ! test "${toolkits}"; then
+			# No perl toolkit bindings wanted, remove the unneeded files
+			# and empty directories.
+			rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm
+			find ${D}/usr/share/fvwm/perllib -depth -type d -exec rmdir {} \; 2>/dev/null
+		fi
+	else
+		# Remove useless script if perllib isnt required.
+		rm -rf ${D}/usr/bin/fvwm-perllib ${D}/usr/share/man/man1/fvwm-perllib.1
+	fi
+
+	# neat utility for testing fvwm behaviour on applications setting various 
+	# hints, creates a simple black window with configurable hints set. 
+	if use debug; then
+		dobin ${S}/tests/hints/hints_test
+		newdoc ${S}/tests/hints/README README.hints
+	fi
+
+	# fvwm-convert-2.6 is just a stub, contains no code - remove it for now.
+	# fvwm-convert-2.2 has a man page, but the script is no longer distributed.
+	rm -f ${D}/usr/bin/fvwm-convert-2.6 ${D}/usr/share/man/man1/fvwm-convert-2.6.1
+	rm -f ${D}/usr/share/man/man1/fvwm-convert-2.2.1
+
+	# ive included `exec` to save a few bytes of memory.
+	echo "#!/bin/bash" > fvwm2
+	echo "exec /usr/bin/fvwm2" >> fvwm2
+
+	exeinto /etc/X11/Sessions
+	doexe fvwm2
+
+	dodoc AUTHORS ChangeLog COPYING README NEWS docs/ANNOUNCE docs/BUGS \
+	docs/COMMANDS docs/DEVELOPERS docs/FAQ docs/error_codes docs/TODO \
+	docs/fvwm.lsm
+
+	dodoc utils/fvwm_make_directory_menu.sh  utils/fvwm_make_browse_menu.sh \
+	utils/quantize_pixmaps utils/xselection.c
+
+	dodoc ${FILESDIR}/README.transluceny.gz
+
+	# make sure FvwmGtk man page is installed
+	use gtk && doman ${S}/modules/FvwmGtk/FvwmGtk.1
+
+	# fix a couple of symlinks.
+	prepallman
+}
+
+pkg_postinst() {
+	if use perl; then
+		if use tcltk; then
+			einfo "By setting the perl and tcltk USE flags, you have elected to"
+			einfo "install the FvwmTabs module, a configurable tabbing system"
+			einfo "for FVWM. You can read more about FvwmTabs here:"
+			einfo
+			einfo "	http://users.tpg.com.au/users/scottie7/fvwmtabs.html"
+			einfo
+		fi
+	fi
+}