From d546d0feb7bf92409c975b664a8bf73b0384ab2b Mon Sep 17 00:00:00 2001
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Mon, 21 Jul 2014 16:45:40 +0000
Subject: 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.
---
 www/WebMagick/Makefile | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'www/WebMagick/Makefile')

diff --git a/www/WebMagick/Makefile b/www/WebMagick/Makefile
index f56c5f0569ef..068b2baed70b 100644
--- a/www/WebMagick/Makefile
+++ b/www/WebMagick/Makefile
@@ -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>
-- 
cgit v1.2.3