Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 21 Jul 2014 16:45:40 +0000 (UTC)
From:      Adam Weinberger <adamw@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r362449 - head/www/WebMagick
Message-ID:  <201407211645.s6LGjebK020715@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adamw
Date: Mon Jul 21 16:45:40 2014
New Revision: 362449
URL: http://svnweb.freebsd.org/changeset/ports/362449
QAT: https://qat.redports.org/buildarchive/r362449/

Log:
  Turn the wacky X11 check into an OPTION.
  
  This program requires that ImageMagick be built with the PERL option enabled.
  I don't know of any way to force this, so package building will be perpetually
  broken. I at least added a warning message.

Modified:
  head/www/WebMagick/Makefile

Modified: head/www/WebMagick/Makefile
==============================================================================
--- head/www/WebMagick/Makefile	Mon Jul 21 16:44:07 2014	(r362448)
+++ head/www/WebMagick/Makefile	Mon Jul 21 16:45:40 2014	(r362449)
@@ -33,17 +33,17 @@ SHEBANG_FILES=	utils/aub \
 		utils/help2man \
 		utils/make_dir_index.pl
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=		X11
+X11_BUILD_DEPENDS=	xlsfonts:${PORTSDIR}/x11-fonts/xlsfonts
+X11_RUN_DEPENDS=	xlsfonts:${PORTSDIR}/x11-fonts/xlsfonts
+X11_CONFIGURE_ENV_OFF=	with_x=no
 
-.if !exists(${LOCALBASE}/bin/xlsfonts)
-WITHOUT_X11=	yes
-.endif
-
-.if defined(WITHOUT_X11)
-CONFIGURE_ENV+=with_x=no
-.endif
+pre-everything::
+	@${ECHO_CMD}
+	@${ECHO_CMD} ${PORTNAME} requires that ImageMagick be installed with the PERL option enabled.
+	@${ECHO_CMD}
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/www/data
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407211645.s6LGjebK020715>