[pkgsrc/pkgsrc-2009Q4]: pkgsrc/lang/perl5/files Pullup ticket 2988 - requeste...

[spz <spz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3aa1b969d200
branches:  pkgsrc-2009Q4
changeset: 569242:3aa1b969d200
user:      spz <spz%pkgsrc.org@localhost>
date:      Thu Feb 04 22:46:12 2010 +0000

description:
Pullup ticket 2988 - requested by tron
infrastructure fix

Revisions pulled up:
- pkgsrc/lang/perl5/files/deinstall.tmpl        1.2

   -------------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   tron
   Date:           Wed Feb  3 13:29:38 UTC 2010

   Modified Files:
           pkgsrc/lang/perl5/files: deinstall.tmpl

   Log Message:
   Don't use "${PKG_PREFIX}" which is not set when this script gets run.
   This avoids error messages from "perllink" while deinstalling (or
   updateing) a Perl module package.

   Fixed based on an analysis provided by Steven Drake on "tech-pkg".


   To generate a diff of this commit:
   cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/perl5/files/deinstall.tmpl

diffstat:

 lang/perl5/files/deinstall.tmpl |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r 5dc2c346f73b -r 3aa1b969d200 lang/perl5/files/deinstall.tmpl
--- a/lang/perl5/files/deinstall.tmpl   Tue Feb 02 23:01:05 2010 +0000
+++ b/lang/perl5/files/deinstall.tmpl   Thu Feb 04 22:46:12 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: deinstall.tmpl,v 1.1 2005/08/12 19:59:03 jlam Exp $
+# $NetBSD: deinstall.tmpl,v 1.1.40.1 2010/02/04 22:46:12 spz Exp $
 
 case ${STAGE} in
 DEINSTALL)
@@ -7,17 +7,17 @@
 
        # Remove the perllocal.pod file.
        case "$archlib" in
-       $prefix/*)      archlib="${PKG_PREFIX}/${archlib#$prefix/}" ;;
+       $prefix/*)      archlib="@PREFIX@/${archlib#$prefix/}" ;;
        esac
        ${RM} -f $archlib/perllocal.pod
        ${RMDIR} -p $archlib 2>/dev/null || ${TRUE}
 
        # Remove any symlinked bits that belong to this module.
-       $scriptdir/perllink -f -p ${PKG_PREFIX} delete ${PERL5_PACKLIST}
+       $scriptdir/perllink -f -p @PREFIX@ delete ${PERL5_PACKLIST}
 
        # If this is not the perl package, then re-link any perl bits
        # back into place.
        #
-       @PERL5_COMMENT@$scriptdir/perllink -p ${PKG_PREFIX} add
+       @PERL5_COMMENT@$scriptdir/perllink -p @PREFIX@ add
        ;;
 esac