Attachment 164300 Details for Bug 205367 – Use ${PERL} instead of ${PERL5}

[patch] Use ${PERL} instead of ${PERL5}

perl5.patch (text/plain), 2.62 KB, created by Mikhail Teterin on 2015-12-16 22:05:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikhail Teterin

Created: 2015-12-16 22:05:28 UTC

Size: 2.62 KB

patch

obsolete

>--- mail/cyrus-imapd23/Makefile	(revision 403872)
>+++ mail/cyrus-imapd23/Makefile	(working copy)
>@@ -32,7 +32,7 @@
> 		--with-bdb=${BDB_LIB_NAME} \
> 		--with-com_err \
> 		--with-openssl=${OPENSSLBASE} \
>-		--with-perl=${PERL5}
>+		--with-perl=${PERL}
> CPPFLAGS+=	-I${LOCALBASE}/include
> LIBS+=		-L${LOCALBASE}/lib
> MAKE_JOBS_UNSAFE=	yes
>--- mail/cyrus-imapd24/Makefile	(revision 403872)
>+++ mail/cyrus-imapd24/Makefile	(working copy)
>@@ -33,7 +33,7 @@
> 		--with-bdb=${BDB_LIB_NAME} \
> 		--with-com_err \
> 		--with-openssl=${OPENSSLBASE} \
>-		--with-perl=${PERL5}
>+		--with-perl=${PERL}
> CPPFLAGS+=	-I${LOCALBASE}/include
> LIBS+=		-L${LOCALBASE}/lib
> MAKE_JOBS_UNSAFE=	yes
>--- mail/cyrus-imapd25/Makefile	(revision 403872)
>+++ mail/cyrus-imapd25/Makefile	(working copy)
>@@ -33,7 +33,7 @@
> 		--with-bdb=${BDB_LIB_NAME} \
> 		--with-com_err \
> 		--with-openssl=${OPENSSLBASE} \
>-		--with-perl=${PERL5}
>+		--with-perl=${PERL}
> CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
> CPPFLAGS+=	-I${LOCALBASE}/include
> MAKE_JOBS_UNSAFE=	yes
>--- www/wml/Makefile	(revision 403872)
>+++ www/wml/Makefile	(working copy)
>@@ -32,13 +32,13 @@
> GNU_CONFIGURE=	yes
> USES=		gettext perl5 gmake
> USE_PERL5=	run build patch
>-CONFIGURE_ARGS=	--with-perl=${PERL5} --with-catdir=man \
>+CONFIGURE_ARGS=	--with-perl=${PERL} --with-catdir=man \
> 		--prefix=${PREFIX}
> 
> .include <bsd.port.pre.mk>
> 
> post-patch:
>-	@${PERL5} -pi -e 's!^(\s+have_\S+)=\S+!\1=1!' \
>+	@${PERL} -pi -e 's!^(\s+have_\S+)=\S+!\1=1!' \
> 		${WRKSRC}/wml_common/Makefile.in
> 
> do-configure:
>--- graphics/ImageMagick/Makefile	(revision 403872)
>+++ graphics/ImageMagick/Makefile	(working copy)
>@@ -106,7 +106,7 @@
> .endif
> 
> .if ${PORT_OPTIONS:MPERL}
>-CONFIGURE_ARGS+=	--with-perl=${PERL5} \
>+CONFIGURE_ARGS+=	--with-perl=${PERL} \
> 			--with-perl-options="MAKE=${MAKE_CMD}"
> PLIST_SUB+=		WITH_PERL=''
> # PerlMagick does not work with threads, if perl is not threaded, and vice versa
>--- graphics/ImageMagick7/Makefile	(revision 403872)
>+++ graphics/ImageMagick7/Makefile	(working copy)
>@@ -112,7 +112,7 @@
> .endif
> 
> .if ${PORT_OPTIONS:MPERL}
>-CONFIGURE_ARGS+=	--with-perl=${PERL5} \
>+CONFIGURE_ARGS+=	--with-perl=${PERL} \
> 			--with-perl-options="MAKE=${MAKE_CMD}"
> PLIST_SUB+=		WITH_PERL=''
> # PerlMagick does not work with threads, if perl is not threaded, and vice versa
>--- www/p5-libapreq2/Makefile	(revision 403872)
>+++ www/p5-libapreq2/Makefile	(working copy)
>@@ -20,7 +20,7 @@
> USE_AUTOTOOLS=	autoconf
> CONFIGURE_ARGS+=	--with-apache2-apxs=${APXS} \
> 			--with-expat=${LOCALBASE} \
>-			--enable-perl-glue --with-perl=${PERL5}
>+			--enable-perl-glue --with-perl=${PERL}
> 
> MAKE_ENV+=     MAKE=${GMAKE} ## MakeMaker blows it without this
>

Actions: View | Diff

Attachments on bug 205367: 164300