From owner-freebsd-ports Thu Sep 21 10:57: 5 2000 Delivered-To: freebsd-ports@freebsd.org Received: from hub.lovett.com (hub.lovett.com [216.60.121.161]) by hub.freebsd.org (Postfix) with ESMTP id DE63037B43C; Thu, 21 Sep 2000 10:57:00 -0700 (PDT) Received: from ade by hub.lovett.com with local (Exim 3.16 #1) id 13cAai-000HG1-00; Thu, 21 Sep 2000 12:57:00 -0500 Date: Thu, 21 Sep 2000 12:57:00 -0500 From: Ade Lovett To: asami@FreeBSD.org Cc: ports@FreeBSD.org Subject: Cleaning up use of site_perl directories in Makefiles Message-ID: <20000921125700.S61840@FreeBSD.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="45Z9DzgjV8m4Oswq" Content-Disposition: inline User-Agent: Mutt/1.2.5i Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org --45Z9DzgjV8m4Oswq Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Asami-san (and -porters) A lot of perl-related modules have various slightly different methods of referring to other perl module dependencies in their Makefiles - some explicitly use the horrendously long pathnames, whereas others define local ${site_perl} variables and use those. The following is a patch that introduces three new variables to bsd.port.mk, PERL_BASE, PERL_SITE, and PERL_SITE_ARCH, allowing for a major amount of cleanup to be performed in these makefiles -- further along down the line, it may be advisable to have a bsd.perl.mk for USE_PERL ports in a similar manner to ruby, python (eventually gnome/kde) etc. but that is beyond the scope of what I would like to do now. Please review and, if appropriate, commit. Thanks, -aDe -- Ade Lovett, Austin, TX. ade@FreeBSD.org FreeBSD: The Power to Serve http://www.FreeBSD.org/ --45Z9DzgjV8m4Oswq Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="mk.patch" Index: bsd.port.mk =================================================================== RCS file: /home/src/FreeBSD/ports/Mk/bsd.port.mk,v retrieving revision 1.350 diff -u -r1.350 bsd.port.mk --- bsd.port.mk 2000/09/13 07:16:49 1.350 +++ bsd.port.mk 2000/09/21 17:51:47 @@ -854,6 +854,10 @@ PERL_VER=${PERL_VER} \ PERL_ARCH=${PERL_ARCH} +PERL_BASE?= ${LOCALBASE} +PERL_SITE= ${PERL_BASE}/lib/perl5/site_perl/${PERL_VER} +PERL_SITE_ARCH= ${PERL_SITE}/${PERL_ARCH} + .if exists(/usr/bin/perl5) && ${OSVERSION} >= 300000 # 3.0-current after perl5 import .if !exists(/usr/bin/perl${PERL_VERSION}) && defined(USE_PERL5) --45Z9DzgjV8m4Oswq-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message