Date: Mon, 21 Jul 2014 16:59:29 -0400 From: Adam Weinberger <adamw@adamw.org> To: Antoine Brodin <antoine@FreeBSD.org> Cc: "svn-ports-head@freebsd.org" <svn-ports-head@freebsd.org>, "svn-ports-all@freebsd.org" <svn-ports-all@freebsd.org>, Adam Weinberger <adamw@freebsd.org>, "ports-committers@freebsd.org" <ports-committers@freebsd.org> Subject: Re: svn commit: r362484 - head/www/WebMagick Message-ID: <6400BBC7-4F40-45AC-8786-E452FECE386C@adamw.org> In-Reply-To: <CAALwa8=Pi14WpoGLjg53-9a64q2Xa=tZopc=xBDi%2B-wrnBYOiA@mail.gmail.com> References: <201407212053.s6LKru8U037225@svn.freebsd.org> <CAALwa8=Pi14WpoGLjg53-9a64q2Xa=tZopc=xBDi%2B-wrnBYOiA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 21 Jul, 2014, at 16:57, Antoine Brodin <antoine@FreeBSD.org> wrote: > On Mon, Jul 21, 2014 at 10:53 PM, Adam Weinberger <adamw@freebsd.org> = wrote: >> Author: adamw >> Date: Mon Jul 21 20:53:56 2014 >> New Revision: 362484 >> URL: http://svnweb.freebsd.org/changeset/ports/362484 >> QAT: https://qat.redports.org/buildarchive/r362484/ >>=20 >> Log: >> As suggested by ache, actually check for the presence of = Image/Magick.pm and only barf if it >> doesn't exist. >>=20 >> Modified: >> head/www/WebMagick/Makefile >>=20 >> Modified: head/www/WebMagick/Makefile >> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >> --- head/www/WebMagick/Makefile Mon Jul 21 20:51:34 2014 = (r362483) >> +++ head/www/WebMagick/Makefile Mon Jul 21 20:53:56 2014 = (r362484) >> @@ -38,12 +38,15 @@ X11_BUILD_DEPENDS=3D xlsfonts:${PORTSDIR}/ >> X11_RUN_DEPENDS=3D xlsfonts:${PORTSDIR}/x11-fonts/xlsfonts >> X11_CONFIGURE_ENV_OFF=3D with_x=3Dno >>=20 >> -pre-everything:: >> - @${ECHO_CMD} >> - @${ECHO_CMD} ${PORTNAME} requires that ImageMagick be = installed with the PERL option enabled. >> - @${ECHO_CMD} >> +.include <bsd.port.pre.mk> >> + >> +do-configure: >> + @if [ ! -f ${SITE_PERL}/${PERL_ARCH}/Image/Magick.pm ]; then = \ >> + ${ECHO_CMD} ERROR: ImageMagick must be installed with = the PERL option enabled; \ >> + ${FALSE}; \ >> + fi >>=20 >> pre-install: >> @${MKDIR} ${STAGEDIR}${PREFIX}/www/data >>=20 >> -.include <bsd.port.mk> >> +.include <bsd.port.post.mk> >>=20 >=20 > Hi, >=20 > A custom do-configure looks really wrong.. Oops, fixed, thanks! # Adam --=20 Adam Weinberger adamw@adamw.org http://www.adamw.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6400BBC7-4F40-45AC-8786-E452FECE386C>