pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Restore binary compatibility with previous versions of...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c35ea50f2af7
branches:  trunk
changeset: 506360:c35ea50f2af7
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Jan 15 07:40:30 2006 +0000

description:
Restore binary compatibility with previous versions of perl-5.8.x that
were lost in PKGREVISION nb7.  We do this by avoiding inspecting the
value of ${WRKSRC} within the package Makefile and instead deferring
using ${WRKSRC} until we actually need the value (after extraction).
This is necessary because WRKSRC is defined in bsd.pkg.mk, which is
too late.

Bump the PKGREVISION to 8.

diffstat:

 doc/CHANGES         |   3 ++-
 lang/perl5/Makefile |  21 +++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diffs (53 lines):

diff -r e6aaf4b7d7ae -r c35ea50f2af7 doc/CHANGES
--- a/doc/CHANGES       Sun Jan 15 06:01:57 2006 +0000
+++ b/doc/CHANGES       Sun Jan 15 07:40:30 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.12517 2006/01/15 06:01:57 uebayasi Exp $
+$NetBSD: CHANGES,v 1.12518 2006/01/15 07:40:42 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2006:
 
@@ -300,3 +300,4 @@
        Updated net/mDNSResponder to 107.5 [wiz 2006-01-15]
        Added devel/mercurial version 0.7 [wiz 2006-01-15]
        Updated misc/elscreen to 1.4.3 [uebayasi 2006-01-15]
+       Updated lang/perl5 to 5.8.7nb8 [jlam 2006-01-15]
diff -r e6aaf4b7d7ae -r c35ea50f2af7 lang/perl5/Makefile
--- a/lang/perl5/Makefile       Sun Jan 15 06:01:57 2006 +0000
+++ b/lang/perl5/Makefile       Sun Jan 15 07:40:30 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.114 2006/01/13 20:04:48 jlam Exp $
+# $NetBSD: Makefile,v 1.115 2006/01/15 07:40:30 jlam Exp $
 
 DISTNAME=      perl-5.8.7
-PKGREVISION=   7
+PKGREVISION=   8
 CATEGORIES=    lang devel perl5
 MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:S,/modules/by-module/$,/src/,}
 EXTRACT_SUFX=  .tar.bz2
@@ -33,16 +33,17 @@
 # Determine the Perl API version from the patchlevel.h file from the
 # source distribution.
 #
-PERL5_API_VERS?=       unknown
-.if exists(${WRKSRC}/patchlevel.h)
 PERL5_API_VERS_cmd=                                                    \
-       ${AWK} '/\#define[      ]*PERL_API_REVISION/ { R = $$3 }        \
-               /\#define[      ]*PERL_API_VERSION/ { r = "."$$3 }      \
-               /\#define[      ]*PERL_API_SUBVERSION/ { s = "."$$3 }   \
-               END { printf "%s%s%s\n", R, r, s }'                     \
-               ${WRKSRC}/patchlevel.h
+       if ${TEST} -f ${WRKSRC}/patchlevel.h; then                      \
+               ${AWK} '/\#define[      ]*PERL_API_REVISION/ { R = $$3 }\
+                       /\#define[      ]*PERL_API_VERSION/ { r = "."$$3 } \
+                       /\#define[      ]*PERL_API_SUBVERSION/ { s = "."$$3 } \
+                       END { printf "%s%s%s\n", R, r, s }'             \
+                       ${WRKSRC}/patchlevel.h;                         \
+       else                                                            \
+               ${ECHO} "unknown";                                      \
+       fi
 PERL5_API_VERS=                ${PERL5_API_VERS_cmd:sh}
-.endif
 
 PERL5_PREFIX=          ${PREFIX}
 PERL5_VENDORPREFIX=    ${PERL5_PREFIX}



Home | Main Index | Thread Index | Old Index