pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/lang/perl5 Make this look more like lang/perl58/Makefi...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/27d2cbfebbfe
branches:  trunk
changeset: 465759:27d2cbfebbfe
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Jan 05 22:15:14 2004 +0000

description:
Make this look more like lang/perl58/Makefile, and bl3ify.

diffstat:

 lang/perl5/Makefile |  30 +++++++++++++++++++++---------
 1 files changed, 21 insertions(+), 9 deletions(-)

diffs (80 lines):

diff -r bbf4853ccea8 -r 27d2cbfebbfe lang/perl5/Makefile
--- a/lang/perl5/Makefile       Mon Jan 05 22:14:18 2004 +0000
+++ b/lang/perl5/Makefile       Mon Jan 05 22:15:14 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2003/12/05 05:31:12 reed Exp $
+# $NetBSD: Makefile,v 1.74 2004/01/05 22:15:14 jlam Exp $
 
 .include "../../lang/perl5/Makefile.common"
 
@@ -17,7 +17,9 @@
 
 NOT_FOR_PLATFORM=      Darwin-*-*
 
-USE_BUILDLINK2=                # defined
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
+USE_BUILDLINK3=                # defined
 HAS_CONFIGURE=         # defined
 CONFIGURE_SCRIPT=      ./Configure
 CONFIGURE_ARGS+=       -sde
@@ -41,6 +43,10 @@
 CONFIGURE_ARGS+=       -Dman3dir="${PERL5_PRIVLIB}/man/man3"
 CONFIGURE_ARGS+=       -Dinstallsiteman3dir="${PERL5_SITEPERL}/man/man3"
 
+# The site directories are all relative to the perl view.
+CONFIGURE_ARGS+=       -Dsiteprefix="${VIEWBASE}"
+CONFIGURE_ARGS+=       -Dinstallsiteman1dir="${VIEWBASE}/man/man1"
+
 .include "../../mk/bsd.prefs.mk"
 
 MKPIC?=                        yes
@@ -113,10 +119,12 @@
 CONFIGURE_ARGS+=       -Duseshrplib
 .endif
 
+PERL5=                 ${PREFIX}/bin/perl${PERL5_DIST_VERS}
 PERL5_PRIVLIB?=                ${PREFIX}/lib/perl5/${PERL5_DIST_VERS}
 PERL5_ARCHLIB=         ${PREFIX}/lib/perl5/${PERL5_DIST_VERS}/${MACHINE_ARCH}-${LOWER_OPSYS}
-PERL5_SITEPERL?=       ${PREFIX}/lib/perl5/site_perl
-PERL5_SITEARCH=                ${PREFIX}/lib/perl5/site_perl/${PERL5_DIST_VERS}/${MACHINE_ARCH}-${LOWER_OPSYS}
+PERL5_SITEPERL?=       ${VIEWBASE}/lib/perl5/site_perl
+PERL5_SITELIB?=                ${VIEWBASE}/lib/perl5/site_perl/${PERL5_DIST_VERS}
+PERL5_SITEARCH=                ${VIEWBASE}/lib/perl5/site_perl/${PERL5_DIST_VERS}/${MACHINE_ARCH}-${LOWER_OPSYS}
 PERL5_PACKLIST=                ${PERL5_ARCHLIB}/.packlist
 PLIST_SUBST+=          PERL5_SITEPERL=${PERL5_SITEPERL:S/^${PREFIX}\///}
 
@@ -161,24 +169,28 @@
 .endif
 STATIC_PERL?=          YES
 
+WRKSRC_PERL5=          ${WRKSRC}/perl
+
 .if defined(STATIC_PERL) && ${STATIC_PERL} == "YES"
 STATIC_WRKDIR=         ${WRKDIR}/static
 STATIC_MAKEFLAGS=      MKPIC=no STATIC_PERL=NO
 STATIC_MAKEFLAGS+=     WRKDIR=${STATIC_WRKDIR}
 STATIC_MAKEFLAGS+=     ALL_TARGET=perl
+WRKSRC_PERL5=          ${STATIC_WRKDIR}/${WRKSRC:T}/perl
 
 post-build:
        cd ${.CURDIR} && ${MAKE} build ${STATIC_MAKEFLAGS}
 .endif
 
 post-install:
-.if defined(STATIC_PERL) && ${STATIC_PERL} == "YES"
        ${RM} -f ${PREFIX}/bin/perl ${PREFIX}/bin/perl${PERL5_DIST_VERS}
-       ${INSTALL_PROGRAM} ${STATIC_WRKDIR}/${DISTNAME}/perl ${PREFIX}/bin/perl
-       ${LN} -f ${PREFIX}/bin/perl ${PREFIX}/bin/perl${PERL5_DIST_VERS}
+       ${INSTALL_PROGRAM} ${WRKSRC_PERL5} ${PREFIX}/bin/perl${PERL5_DIST_VERS}
+       ${LN} -f ${PREFIX}/bin/perl${PERL5_DIST_VERS} ${PREFIX}/bin/perl
+.if !empty(_STRIPFLAG_INSTALL)
+       if [ -x ${PREFIX}/bin/a2p]; then                                \
+               strip ${PREFIX}/bin/a2p;                                \
+       fi
 .endif
-       strip ${PREFIX}/bin/a2p
-       strip ${PREFIX}/bin/perl
        ${RMDIR} -p ${PERL5_SITEARCH} 2>/dev/null || ${TRUE}
        ${RM} -f ${WRKDIR}/bsd.perl.mk
        eval `${PERL5} -V:installsitelib 2>/dev/null` && \



Home | Main Index | Thread Index | Old Index