Date: Wed, 19 Feb 2003 18:40:02 -0800 (PST) From: "Scot W. Hetzel" <hetzels@westbend.net> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/48465: Wrong perl dependency in bsd.port.mk Message-ID: <200302200240.h1K2e2jJ017781@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/48465; it has been noted by GNATS.
From: "Scot W. Hetzel" <hetzels@westbend.net>
To: freebsd-gnats-submit@FreeBSD.org
Cc: Anton Berezin <tobez@FreeBSD.org>
Subject: Re: ports/48465: Wrong perl dependency in bsd.port.mk
Date: Wed, 19 Feb 2003 20:39:30 -0600 (CST)
At the sugestion of Anton, here's a patch that doesn't require any
changes to the lang/perl5* ports.
I also read Kris Kennaway comment to PR 47377. This patch also
takes into account the concern of using a lowercase variable, as
this patch uses PORT_LEVEL to determine which port is installed.
Scot
Index: Mk/bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.439
diff -u -r1.439 bsd.port.mk
--- Mk/bsd.port.mk 12 Feb 2003 05:15:03 -0000 1.439
+++ Mk/bsd.port.mk 20 Feb 2003 02:05:51 -0000
@@ -248,6 +248,8 @@
# whether a particular dependency is needed, etc.
# PERL_ARCH - Directory name of architecture dependent libraries
# (value: ${ARCH}-freebsd).
+# PERL_PORT - Name of the perl port that is installed
+# (value: perl5)
# SITE_PERL - Directory name where site specific perl packages go.
# This value is added to PLIST_SUB.
# USE_BISON - Says that the port uses bison for building.
@@ -1194,6 +1194,12 @@
.endif
.endif
+.if ${PERL_LEVEL} >= 500800
+PERL_PORT?= perl5.8
+.else
+PERL_PORT?= perl5
+.endif
+
SITE_PERL?= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \
@@ -1218,10 +1254,10 @@
PERL5= ${LOCALBASE}/bin/perl${PERL_VERSION}
PERL= ${LOCALBASE}/bin/perl
.if defined(USE_PERL5) || defined(USE_PERL5_BUILD)
-BUILD_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/perl5
+BUILD_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT}
.endif
.if defined(USE_PERL5) || defined(USE_PERL5_RUN)
-RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/perl5
+RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT}
.endif
.endif
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200302200240.h1K2e2jJ017781>