diff options
| author | tron <tron@pkgsrc.org> | 2005-02-13 20:36:11 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2005-02-13 20:36:11 +0000 |
| commit | 50f64b597ce524772661d3219083ed6fdf2074d4 (patch) | |
| tree | a9d0b1d074fc0c97066a5a3fbb3f7d7b804ce076 /comms | |
| parent | 0dca4817c336193067c6415f2b04f5648a512ceb (diff) | |
| download | pkgsrc-50f64b597ce524772661d3219083ed6fdf2074d4.tar.gz | |
Remove unnecessary "perl" binary detection which gets confused by the
buildlink3 framework. Also use "${WRKDIR}" instead of hard coded "/tmp"
for temporary files.
Diffstat (limited to 'comms')
| -rw-r--r-- | comms/pilotmgr/Makefile | 3 | ||||
| -rw-r--r-- | comms/pilotmgr/distinfo | 3 | ||||
| -rw-r--r-- | comms/pilotmgr/patches/patch-ae | 63 |
3 files changed, 67 insertions, 2 deletions
diff --git a/comms/pilotmgr/Makefile b/comms/pilotmgr/Makefile index c32973f7be1..1b26b981135 100644 --- a/comms/pilotmgr/Makefile +++ b/comms/pilotmgr/Makefile @@ -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 @@ HAS_CONFIGURE= YES 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 --git a/comms/pilotmgr/distinfo b/comms/pilotmgr/distinfo index f92d0c9317e..f8a635b64fc 100644 --- a/comms/pilotmgr/distinfo +++ b/comms/pilotmgr/distinfo @@ -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-aa) = a61287599e52580e9e56acfadc60e98f16555b5c SHA1 (patch-ab) = 2c6bca3b173574830866d4fc5a2909345dff4109 SHA1 (patch-ac) = d8482ee4c6e20b264cb5262d1674a2f292d61384 SHA1 (patch-ad) = 809277732a213516c184b8d8ba8e810c8973f82e +SHA1 (patch-ae) = 5241ea2684628c85ee6374ddc2b399135cc9200f diff --git a/comms/pilotmgr/patches/patch-ae b/comms/pilotmgr/patches/patch-ae new file mode 100644 index 00000000000..a4cf12ba56b --- /dev/null +++ b/comms/pilotmgr/patches/patch-ae @@ -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 + |