From owner-svn-ports-head@FreeBSD.ORG Sun May 10 07:51:17 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CD8C968A; Sun, 10 May 2015 07:51:17 +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 A3A401D16; Sun, 10 May 2015 07:51:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4A7pHof065305; Sun, 10 May 2015 07:51:17 GMT (envelope-from johans@FreeBSD.org) Received: (from johans@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4A7pHas065304; Sun, 10 May 2015 07:51:17 GMT (envelope-from johans@FreeBSD.org) Message-Id: <201505100751.t4A7pHas065304@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: johans set sender to johans@FreeBSD.org using -f From: Johan van Selst Date: Sun, 10 May 2015 07:51:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r385928 - head/www/xshttpd-devel 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.20 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: Sun, 10 May 2015 07:51:17 -0000 Author: johans Date: Sun May 10 07:51:16 2015 New Revision: 385928 URL: https://svnweb.freebsd.org/changeset/ports/385928 Log: - Add option to disable netpbm dependency (no change for default package) - While here, sort options alphabetically Suggested by: adamw Modified: head/www/xshttpd-devel/Makefile Modified: head/www/xshttpd-devel/Makefile ============================================================================== --- head/www/xshttpd-devel/Makefile Sun May 10 07:46:37 2015 (r385927) +++ head/www/xshttpd-devel/Makefile Sun May 10 07:51:16 2015 (r385928) @@ -12,8 +12,7 @@ DISTNAME= ${PORTNAME}-${DISTVERSION:S/./ MAINTAINER= johans@FreeBSD.org COMMENT= Webserver with CGI as own user and SSL support -RUN_DEPENDS= run-mailcap:${PORTSDIR}/misc/mime-support \ - ppmtogif:${PORTSDIR}/graphics/netpbm +RUN_DEPENDS= run-mailcap:${PORTSDIR}/misc/mime-support LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre CONFLICTS_INSTALL= xshttpd-[0-9]* publicfile-[0-9]* @@ -24,22 +23,24 @@ USE_RC_SUBR= xshttpd GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-hier=bsd --with-userid=${WWWOWN}:${WWWGRP} -OPTIONS_DEFINE= LDAP CURL M4 PERL BDB -OPTIONS_DEFAULT= CURL M4 BDB +OPTIONS_DEFINE= BDB CURL LDAP M4 NETPBM PERL +OPTIONS_DEFAULT= BDB CURL M4 NETPBM OPTIONS_SUB= yes +BDB_USE= BDB=5+ +BDB_CONFIGURE_ON= --with-db-libdir=${BDB_LIB_DIR} \ + --with-db-include-dir=${BDB_INCLUDE_DIR} +BDB_CONFIGURE_WITH= db +CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl +CURL_CONFIGURE_WITH= curl LDAP_USE= openldap LDAP_CONFIGURE_WITH= ldap M4_DESC= Enable configuration preprocessor (m4) M4_CONFIGURE_WITH= preprocessor +NETPBM_DESC= Enable NETPBM (for graphical counters) +NETPBM_RUN_DEPENDS= ppmtogif:${PORTSDIR}/graphics/netpbm PERL_DESC= Enable persistent Perl interpreter PERL_USES= perl5 PERL_CONFIGURE_WITH= perl -CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl -CURL_CONFIGURE_WITH= curl -BDB_USE= BDB=5+ -BDB_CONFIGURE_ON= --with-db-libdir=${BDB_LIB_DIR} \ - --with-db-include-dir=${BDB_INCLUDE_DIR} -BDB_CONFIGURE_WITH= db PORTDOCS= README ChangeLog