Date: Fri, 8 Nov 2002 19:50:31 -0800 From: Kris Kennaway <kris@obsecurity.org> To: Doug Barton <DougB@FreeBSD.ORG> Cc: freebsd-ports@FreeBSD.ORG, edwin@FreeBSD.ORG Subject: Re: [Fwd: cvs commit: ports/sysutils/msyslog Makefile ports/devel/mingw-gccMakefile ports/graphics/linplasma Makefile ports/www/wb0 Makefileports/lang/fpc Makefile] Message-ID: <20021109035030.GA28901@rot13.obsecurity.org> In-Reply-To: <3DCC8004.611DCDA2@FreeBSD.org> References: <3DCC8004.611DCDA2@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Nov 08, 2002 at 07:24:52PM -0800, Doug Barton wrote:
> Pardon me for hijacking Edwin's fixup, but I'm a little concerned about
> the rapid proliferation of USE_PERL5 for build issues. One of the
> reasons that we have both BUILD_DEPENDS and RUN_DEPENDS is to allow
> packages to be built on one machine, and installed on a different one.
> Since USE_PERL5 defines both, we're registering a run-time dependency on
> perl for things that don't need it.
>
> Perhaps it's time for a new variable, like PERL_BUILD, or something to
> that effect?
I think this is a bug. Here's an (untested) patch.
Index: bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.427
diff -u -r1.427 bsd.port.mk
--- bsd.port.mk 3 Nov 2002 05:43:49 -0000 1.427
+++ bsd.port.mk 9 Nov 2002 03:47:24 -0000
@@ -200,6 +200,8 @@
# LIBTOOLFLAGS - Additional flags to pass to ltconfig
# (default: --disable-ltlibs)
# USE_PERL5 - Says that the port uses perl5 for building and running.
+# USE_PERL5_BUILD - Says that the port uses perl5 for building.
+# USE_PERL5_RUN - Says that the port uses perl5 for running.
# PERL5 - Set to full path of perl5, either in the system or
# installed from a port.
# PERL - Set to full path of perl5, either in the system or
@@ -1006,8 +1008,13 @@
PERL_VER=${PERL_VER} \
PERL_ARCH=${PERL_ARCH}
+.if defined(PERL_CONFIGURE)
+USE_PERL5= yes
+.endif
+
.if exists(/usr/bin/perl5) && ${OSVERSION} >= 300000 && ${OSVERSION} < 500036
-.if !exists(/usr/bin/perl${PERL_VERSION}) && defined(USE_PERL5)
+.if !exists(/usr/bin/perl${PERL_VERSION}) && ( defined(USE_PERL5) || \
+ defined(USE_PERL5_BUILD) || defined(USE_PERL5_RUN) )
pre-everything::
@${ECHO_CMD} "Error: you don't have the right version of perl in /usr/bin."
@${FALSE}
@@ -1017,9 +1024,12 @@
.else
PERL5= ${LOCALBASE}/bin/perl${PERL_VERSION}
PERL= ${LOCALBASE}/bin/perl
-.if defined(USE_PERL5)
-BUILD_DEPENDS+= perl${PERL_VERSION}:${PORTSDIR}/lang/perl5
-RUN_DEPENDS+= perl${PERL_VERSION}:${PORTSDIR}/lang/perl5
+.if defined(USE_PERL5) || defined(USE_PERL5_BUILD)
+BUILD_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/perl5
+.endif
+.if defined(USE_PERL5) || defined(USE_PERL5_RUN)
+RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/perl5
+.endif
.endif
.endif
@@ -1744,7 +1754,6 @@
CONFIGURE_ARGS+= CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}" \
INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib"
CONFIGURE_SCRIPT?= Makefile.PL
-USE_PERL5= yes
.undef HAS_CONFIGURE
.endif
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021109035030.GA28901>