summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2005-01-04 19:51:11 +0000
committermarkd <markd@pkgsrc.org>2005-01-04 19:51:11 +0000
commit4ffc12549ad50034a628b7c64e36c6ff1ce48303 (patch)
treec5a67943e17bd1f0e709f91c1efecb712208f48d /editors
parent78e11b746e744a35510c348e1ea1eab95b37f201 (diff)
downloadpkgsrc-4ffc12549ad50034a628b7c64e36c6ff1ce48303.tar.gz
When configuring reLyX use the value of PERL that is passed in rather
than trying to work it out again (badly). Fixes the build problems seen in the bulk builds. OK'ed by maintainer.
Diffstat (limited to 'editors')
-rw-r--r--editors/lyx-qt/distinfo3
-rw-r--r--editors/lyx-qt/patches/patch-ai42
2 files changed, 44 insertions, 1 deletions
diff --git a/editors/lyx-qt/distinfo b/editors/lyx-qt/distinfo
index 45d943e3f48..589f3446e6d 100644
--- a/editors/lyx-qt/distinfo
+++ b/editors/lyx-qt/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2004/12/21 07:00:52 martti Exp $
+$NetBSD: distinfo,v 1.7 2005/01/04 19:51:11 markd Exp $
SHA1 (lyx-1.3.5.tar.gz) = b654eff87339019702306c3aec8da8aa8058d386
Size (lyx-1.3.5.tar.gz) = 7412737 bytes
SHA1 (patch-aa) = 90a09a1adbb899cbaf063d4d7f46dc77f78a62da
SHA1 (patch-af) = dfd91bf21ccb7310e7ab8f62425e65efacba87a7
SHA1 (patch-ah) = 278f5deaf94c1082b755af3cb9511bc2f68231ba
+SHA1 (patch-ai) = ddd905f335293fa510745c5fe4f8011a5b3a1d9e
diff --git a/editors/lyx-qt/patches/patch-ai b/editors/lyx-qt/patches/patch-ai
new file mode 100644
index 00000000000..6bcac02c089
--- /dev/null
+++ b/editors/lyx-qt/patches/patch-ai
@@ -0,0 +1,42 @@
+$NetBSD: patch-ai,v 1.1 2005/01/04 19:51:11 markd Exp $
+
+--- lib/reLyX/configure.orig 2004-10-07 03:43:23.000000000 +1300
++++ lib/reLyX/configure 2005-01-05 02:10:36.000000000 +1300
+@@ -1724,37 +1724,6 @@
+ PATH_IFS=':'
+ ;;
+ esac
+-for ac_prog in perl perl5 perl5.6.1 perl5.6.0 perl5.005 perl5.004 perl5.003 perl5.002 ; do
+-# Extract the first word of "$ac_prog", so it can be a program name with
+-# args.
+- set dummy $ac_prog ; ac_word=$2
+- if test ! -n "$PERL"; then
+- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}$PATH_IFS"
+- for ac_dir in $PATH; do
+- test -z "$ac_dir" && ac_dir=.
+- if test -f $ac_dir/$ac_word -o -f $ac_dir/$ac_word$ac_exeext; then
+- PERL="$ac_prog"
+- break
+- fi
+- done
+- IFS="$ac_save_ifs"
+- fi
+-
+- if test -n "$PERL"; then
+- ac_result=yes
+- else
+- ac_result=no
+- fi
+-
+-if echo 'require 5.002;exit' | $ac_dir/$ac_prog 2>&5
+-then
+- PERL=$ac_dir/$ac_prog
+-else
+- PERL=
+-fi
+-
+- test -n "$PERL" && break
+-done
+
+ if test -n "$PERL" ; then
+ echo "$as_me:$LINENO: result: $PERL" >&5