From owner-svn-ports-head@FreeBSD.ORG Mon Jul 21 16:45:40 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9F8B9D0C; Mon, 21 Jul 2014 16:45:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8CAB729F9; Mon, 21 Jul 2014 16:45:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6LGjek5020716; Mon, 21 Jul 2014 16:45:40 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6LGjebK020715; Mon, 21 Jul 2014 16:45:40 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201407211645.s6LGjebK020715@svn.freebsd.org> From: Adam Weinberger Date: Mon, 21 Jul 2014 16:45:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362449 - head/www/WebMagick X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jul 2014 16:45:40 -0000 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 +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 +.include