added patch for configure.in

3 files changed, 79 insertions, 4 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index bb901154d261..f3f3c4a8636c 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/icewm
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.42 2004/02/03 15:41:57 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.43 2004/03/25 14:43:09 jhuebel Exp $
+
+  25 Mar 2004; Jason Huebel,,, <jhuebel@gentoo.org> icewm-1.2.13.ebuild,
+  files/icewm-1.2.13-gentoo.patch:
+  added patch for configure.in, contributed by Ryan C. Gordon
 
 *icewm-1.2.14_pre9 (03 Feb 2004)
 
diff --git a/x11-wm/icewm/files/icewm-1.2.13-gentoo.patch b/x11-wm/icewm/files/icewm-1.2.13-gentoo.patch
new file mode 100644
index 000000000000..2ec91fff92f8
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.2.13-gentoo.patch
@@ -0,0 +1,61 @@
+--- icewm-1.2.13/configure.in.orig	2003-12-30 19:56:55.975650544 -0500
++++ icewm-1.2.13/configure.in	2003-12-30 20:10:21.265227920 -0500
+@@ -21,7 +21,9 @@
+ 
+ dnl ---------- Checking for a C compiler in hope that it understands C++ too ---
+ dnl
+-ICE_PROG_CXX_LIGHT
++dnl
++dnl Gentoo patch by Ryan C. Gordon 12/30/2003: ICE_PROG_CXX_LIGHT is broken.
++dnl ICE_PROG_CXX_LIGHT
+ AC_LANG_CPLUSPLUS
+ AC_PROG_CXX
+ 
+@@ -29,9 +31,11 @@
+ dnl ---- for linking. Also check how to turn off RTTI and exception handling ---
+ if test x"$ac_cv_prog_gxx" != x; then
+   AC_PROG_CC
+-  if test x"$ac_cv_prog_gcc" != x; then
+-    CXX_LINK=${CC}
+-  fi
++
++  dnl Gentoo patch by Ryan C. Gordon 12/30/2003: Must link with CXX, not CC.
++  dnl if test x"$ac_cv_prog_gcc" != x; then
++  dnl   CXX_LINK=${CC}
++  dnl fi
+   
+   ICE_CXX_FLAG_ACCEPT(no_rtti, -fno-rtti)
+   dnl --- Intel C++ supports -fno-rtti, but doens't support -fno-*-exceptions
+@@ -368,7 +372,12 @@
+      AC_MSG_ERROR("xfreetype or core fonts must be enabled")
+   fi
+   if test "$enable_xfreetype" != "no" -o "$enable_xfreetype" = "implied"; then
+-    AC_PATH_PROG(XFT_CONFIG, xft-config,, ${with_xft_arg-${PATH}})
++    dnl Gentoo patch by Ryan C. Gordon 12/30/2003:
++    dnl xft-config is installed with the xfree package, but is in
++    dnl /usr/X11R6/bin, which isn't in the default path. The original
++    dnl version of AC_PATH_PROG can't be used, because it breaks other things.
++    dnl AC_PATH_PROG(XFT_CONFIG, xft-config,, ${with_xft_arg-${PATH}})
++    AC_PATH_PROG(XFT_CONFIG, xft-config,, ${PATH}:/usr/X11R6/bin)
+     if test "${XFT_CONFIG}" != ""; then
+       XFT_CFLAGS=`${XFT_CONFIG} --cflags`
+       XFT_LIBS=`${XFT_CONFIG} --libs`
+@@ -774,7 +783,17 @@
+       fi
+     fi ])
+ 
+-CONFIG_KDE_MENU_DIR="`kde-config --path apps | sed -e 's/.*://'`" 
++dnl Gentoo patch by Ryan C. Gordon 12/30/2003:
++dnl kde-config is installed with the kde package, but is in
++dnl /usr/kde/KDEVER/bin, which isn't in the default path.
++dnl CONFIG_KDE_MENU_DIR="`kde-config --path apps | sed -e 's/.*://'`"
++
++AC_PATH_PROG(KDE_CONFIG, kde-config,, ${PATH}:/usr/kde/*/bin)
++if test "${KDE_CONFIG}" != ""; then
++  CONFIG_KDE_MENU_DIR="`${KDE_CONFIG} --path apps | sed -e 's/.*://'`"
++else
++  CONFIG_KDE_MENU_DIR=""
++fi
+ 
+ AC_SUBST(GNOME_VER)
+ AC_SUBST(CONFIG_GNOME1_MENU_DIR)
diff --git a/x11-wm/icewm/icewm-1.2.13.ebuild b/x11-wm/icewm/icewm-1.2.13.ebuild
index 0a19946dc9b8..b305cd663707 100644
--- a/x11-wm/icewm/icewm-1.2.13.ebuild
+++ b/x11-wm/icewm/icewm-1.2.13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.13.ebuild,v 1.4 2003/11/05 19:38:57 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.13.ebuild,v 1.5 2004/03/25 14:43:09 jhuebel Exp $
 
 DESCRIPTION="Ice Window Manager"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -19,10 +19,20 @@ RDEPEND="${DEPEND}
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc sparc"
+KEYWORDS="x86 ~ppc sparc amd64"
 S=${WORKDIR}/${P}
 
+# rcg12302003 Various patches to configure.in...
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-${PV}-gentoo.patch
+}
+
 src_compile(){
+	# rcg12302003 We patch configure.in, so rebuild the configure script...
+	./autogen.sh
+
 	use esd \
 		&& myconf="${myconf} --with-esd-config=/usr/bin/esd-config"