Patch the configure script to fix a broken check for flex/lex -- the

variable LEX is allowed to be a full path.

3 files changed, 51 insertions, 1 deletions

diff --git a/audio/gtkpod/distinfo b/audio/gtkpod/distinfo
index c4da127a654..6f89069da1e 100644
--- a/audio/gtkpod/distinfo
+++ b/audio/gtkpod/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2008/01/06 17:04:14 rillig Exp $
+$NetBSD: distinfo,v 1.9 2008/03/02 07:02:01 jlam Exp $
 
 SHA1 (gtkpod-0.99.12.tar.gz) = ab7c03ee1a875fe2bab953d5805a2a4d65fcd669
 RMD160 (gtkpod-0.99.12.tar.gz) = de41d4ab3c907416e88e81fbc79ca1d82411c4c4
@@ -6,5 +6,7 @@ Size (gtkpod-0.99.12.tar.gz) = 1218052 bytes
 SHA1 (gtkpod-0.99.8_libgpod-0.4.2.diff) = a5090b4597922cc81fc33efd9a3f7e1278b57708
 RMD160 (gtkpod-0.99.8_libgpod-0.4.2.diff) = 2e8094b8eba3179279d1b91133df588833e9df3e
 Size (gtkpod-0.99.8_libgpod-0.4.2.diff) = 2580 bytes
+SHA1 (patch-ad) = 66265b590f68f3ad5aee9aa9f331954930967da9
+SHA1 (patch-ae) = a2da63d59d90b137d32482632c08db19fcbf1ec9
 SHA1 (patch-bi) = 664a807d14318fd205a89dacc3084212cc9c6d5e
 SHA1 (patch-bj) = 1142f4d4833463427e8aa687cf395213b6c53251
diff --git a/audio/gtkpod/patches/patch-ad b/audio/gtkpod/patches/patch-ad
new file mode 100644
index 00000000000..8750da5e3c4
--- /dev/null
+++ b/audio/gtkpod/patches/patch-ad
@@ -0,0 +1,26 @@
+$NetBSD: patch-ad,v 1.1 2008/03/02 07:02:01 jlam Exp $
+
+--- configure.orig	2007-12-17 23:38:40.000000000 -0500
++++ configure
+@@ -6553,15 +6553,17 @@ fi
+ if test "$LEX" = :; then
+   LEX=${am_missing_run}flex
+ fi
+-if ! test "y$LEX" = "yflex"; then
+-    if ! test "y$LEX" = "ylex"; then
++case "$LEX" in
++flex|*/flex|lex|*/lex)    
++        ;;
++*)      
+         { { echo "$as_me:$LINENO: error: *** flex or lex required
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: *** flex or lex required
+ See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
+-    fi
+-fi
++        ;;
++esac
+ 
+ # Extract the first word of "mount", so it can be a program name with args.
+ set dummy mount; ac_word=$2
diff --git a/audio/gtkpod/patches/patch-ae b/audio/gtkpod/patches/patch-ae
new file mode 100644
index 00000000000..3617ea9b547
--- /dev/null
+++ b/audio/gtkpod/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1 2008/03/02 07:02:01 jlam Exp $
+
+--- configure.in.orig	2007-12-17 23:37:46.000000000 -0500
++++ configure.in
+@@ -53,11 +53,13 @@ LIBS="$LIBS $GTK_LIBS $GLIB_LIBS $GMODUL
+ 
+ dnl we need 'flex'
+ AM_PROG_LEX
+-if ! test "y$LEX" = "yflex"; then
+-    if ! test "y$LEX" = "ylex"; then
++case "$LEX" in
++flex|*/flex|lex|*/lex)
++	;;
++*)
+         AC_MSG_FAILURE([*** flex or lex required])
+-    fi
+-fi
++	;;
++esac
+ 
+ dnl Retrieve the path of mount and umount binaries
+ AC_PATH_PROG(MOUNT, mount)