pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/comms/pilotmgr Remove unnecessary "perl" binary detect...
details: https://anonhg.NetBSD.org/pkgsrc/rev/c41bf1859efd
branches: trunk
changeset: 488972:c41bf1859efd
user: tron <tron%pkgsrc.org@localhost>
date: Sun Feb 13 20:36:11 2005 +0000
description:
Remove unnecessary "perl" binary detection which gets confused by the
buildlink3 framework. Also use "${WRKDIR}" instead of hard coded "/tmp"
for temporary files.
diffstat:
comms/pilotmgr/Makefile | 3 +-
comms/pilotmgr/distinfo | 3 +-
comms/pilotmgr/patches/patch-ae | 63 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 67 insertions(+), 2 deletions(-)
diffs (98 lines):
diff -r 34f7200f6b2c -r c41bf1859efd comms/pilotmgr/Makefile
--- a/comms/pilotmgr/Makefile Sun Feb 13 20:28:41 2005 +0000
+++ b/comms/pilotmgr/Makefile Sun Feb 13 20:36:11 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2004/12/16 04:10:37 tron Exp $
+# $NetBSD: Makefile,v 1.30 2005/02/13 20:36:11 tron Exp $
DISTNAME= pilotmgr-1.107p2
PKGNAME= pilotmgr-1.107.2
@@ -23,6 +23,7 @@
NO_BUILD= YES
CONFIGURE_ARGS= </dev/null
+CONFIGURE_ENV+= PERL="${LOCALBASE}/bin/perl" WRKDIR="${WRKDIR}"
CONFIGURE_SCRIPT= ./Setup
PM_PERL_DIR= ${PREFIX}/lib/${DISTNAME:C/-.*$//}
diff -r 34f7200f6b2c -r c41bf1859efd comms/pilotmgr/distinfo
--- a/comms/pilotmgr/distinfo Sun Feb 13 20:28:41 2005 +0000
+++ b/comms/pilotmgr/distinfo Sun Feb 13 20:36:11 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/03/23 15:28:59 magick Exp $
+$NetBSD: distinfo,v 1.5 2005/02/13 20:36:11 tron Exp $
SHA1 (pilotmgr-1.107p2.tar.bz2) = 3eda213891fbddc1239c49b7f704bd1447dd9112
Size (pilotmgr-1.107p2.tar.bz2) = 161129 bytes
@@ -6,3 +6,4 @@
SHA1 (patch-ab) = 2c6bca3b173574830866d4fc5a2909345dff4109
SHA1 (patch-ac) = d8482ee4c6e20b264cb5262d1674a2f292d61384
SHA1 (patch-ad) = 809277732a213516c184b8d8ba8e810c8973f82e
+SHA1 (patch-ae) = 5241ea2684628c85ee6374ddc2b399135cc9200f
diff -r 34f7200f6b2c -r c41bf1859efd comms/pilotmgr/patches/patch-ae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/comms/pilotmgr/patches/patch-ae Sun Feb 13 20:36:11 2005 +0000
@@ -0,0 +1,63 @@
+$NetBSD: patch-ae,v 1.1 2005/02/13 20:36:11 tron Exp $
+
+--- Setup.orig 1999-03-24 23:00:00.000000000 +0000
++++ Setup 2005-02-13 20:34:12.000000000 +0000
+@@ -36,50 +36,11 @@
+ read foo
+
+ VERS="5.003"
+-PERL=
+-
+-echo "Locating Perl 5..."
+-for dir in `echo $PATH | sed -e 's/:/ /g'`
+-do
+- for cmd in perl5 perl
+- do
+- if [ -n "$dir" -a -x "$dir/$cmd" ]
+- then
+- MAYBE=`$dir/$cmd -e 'print $^X'`
+-
+- if [ "$MAYBE" != "" ]
+- then
+- `$MAYBE -e "eval{require $VERS}; \
+- exit 0 if \\$@; exit 1"`
+- fi
+-
+- if [ $? -eq 1 ]
+- then
+- PERL=$MAYBE
+- break 2
+- fi
+- fi
+- done
+-done
+-
+-# Now, either we've found the right version of Perl and we
+-# can continue, or we haven't and we should fail.
+-#
+-
+-if [ -z "$PERL" ]
+-then
+- cat<<EOF
+-Setup was unable to locate an appropriate version of
+-Perl from your path. You need to have Perl v5.003 or
+-later in your path for PilotManager to work.
+-EOF
+- exit 1;
+-fi
+
+ echo "Perl 5 found [at $PERL]"
+ echo "Please wait..."
+
+-cat > /tmp/pmgr-setup.pl <<EOF
++cat > ${WRKDIR}/pmgr-setup.pl <<EOF
+
+ use Config;
+
+@@ -212,5 +173,5 @@
+
+ EOF
+
+-$PERL /tmp/pmgr-setup.pl
++$PERL ${WRKDIR}/pmgr-setup.pl
+
Home |
Main Index |
Thread Index |
Old Index