svn commit: r385928 - head/www/xshttpd-devel

[Johan van Selst]

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 at 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