svn commit: r385044 - in head/www/e2guardian: . files

[Renato Botelho]

Author: garga
Date: Thu Apr 30 14:11:10 2015
New Revision: 385044
URL: https://svnweb.freebsd.org/changeset/ports/385044

Log:
  - Fix debug option that was always on
  - Add a rc script
  - Add a warning when user choose a different number of filedescr
  - Fix PLIST when DNS option is off
  - Bump PORTREVISION
  
  PR:		199137
  Submitted by:	Marcello Coutinho (maintainer)

Added:
  head/www/e2guardian/files/
  head/www/e2guardian/files/e2guardian.in   (contents, props changed)
Modified:
  head/www/e2guardian/Makefile
  head/www/e2guardian/pkg-plist

Modified: head/www/e2guardian/Makefile
==============================================================================
--- head/www/e2guardian/Makefile	Thu Apr 30 14:01:56 2015	(r385043)
+++ head/www/e2guardian/Makefile	Thu Apr 30 14:11:10 2015	(r385044)
@@ -3,6 +3,7 @@
 
 PORTNAME=	e2guardian
 PORTVERSION=	3.0.4
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	GH
 
@@ -17,6 +18,7 @@ LIB_DEPENDS=	libpcre.so:${PORTSDIR}/deve
 USE_GITHUB=	yes
 GH_TAGNAME=	${PORTVERSION:S/^/v/}
 USES=		iconv pkgconfig
+USE_RC_SUBR=	e2guardian
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--with-logdir=/var/log \
@@ -62,7 +64,7 @@ NTLM_RUN_DEPENDS=		${LOCALBASE}/bin/icon
 NTLM_USES=			iconv
 DNS_CONFIGURE_ENABLE=		dnsauth
 EMAIL_CONFIGURE_ENABLE=		email
-DEBUG_CONFIGURE_WITH=		dgdebug
+DEBUG_CONFIGURE_ON=		--with-dgdebug=on
 1024_CONFIGURE_ON=		--with-filedescriptors=1024
 2048_CONFIGURE_ON=		--with-filedescriptors=2048
 4096_CONFIGURE_ON=		--with-filedescriptors=4096
@@ -79,6 +81,18 @@ PLIST_SUB+=	SCANNERS=""
 PLIST_SUB+=	SCANNERS="@comment "
 .endif
 
+post-extract:
+.if ${PORT_OPTIONS:M2048} || ${PORT_OPTIONS:M4096} || ${PORT_OPTIONS:M8192}
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "######################################################"
+	@${ECHO_MSG} "WARNING! Filedescriptors option higher then 1024."
+	@${ECHO_MSG} "Check/raise FD_SETSIZE in /usr/include/sys/select.h"
+	@${ECHO_MSG} "before preceeding with e2guardian compilation"
+	@${ECHO_MSG} "######################################################"
+	@${ECHO_MSG} ""
+	@sleep 3
+.endif
+
 post-install:
 	@${FIND} ${STAGEDIR}${ETCDIR} -type f \
 		\( -name '*.conf' -or -name '*list' \) -exec ${MV} {} {}.sample \;

Added: head/www/e2guardian/files/e2guardian.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/e2guardian/files/e2guardian.in	Thu Apr 30 14:11:10 2015	(r385044)
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: e2guardian
+# REQUIRE: NETWORKING SERVERS
+# BEFORE: DAEMON
+# KEYWORD: shutdown
+
+#
+# Add the following line to /etc/rc.conf to enable e2guardian:
+# e2guardian_enable (bool):	Set to "NO" by default.
+#				Set it to "YES" to enable e2guardian.
+# e2guardian_flags (text):	Set e2guardian extra flags
+
+. /etc/rc.subr
+
+name=e2guardian
+rcvar=e2guardian_enable
+desc="e2guardian startup script"
+
+load_rc_config $name
+
+: ${e2guardian_enable:=NO}
+: ${e2guardian_config="%%PREFIX%%/etc/${name}/${name}.conf"}
+
+command=%%PREFIX%%/sbin/${name}
+pidfile=/var/run/${name}.pid
+
+command_args="-p $pidfile -f $e2guardian_config $e2guardian_flags"
+
+run_rc_command "$1"
+

Modified: head/www/e2guardian/pkg-plist
==============================================================================
--- head/www/e2guardian/pkg-plist	Thu Apr 30 14:01:56 2015	(r385043)
+++ head/www/e2guardian/pkg-plist	Thu Apr 30 14:11:10 2015	(r385044)
@@ -16,8 +16,8 @@
 @sample %%ETCDIR%%/e2guardianf1.conf.sample
 %%ETCDIR%%/installation_or_migration_from_dg.sh
 @sample %%ETCDIR%%/lists/addheaderregexplist.sample
- at sample %%ETCDIR%%/lists/authexceptionsitelist.sample
- at sample %%ETCDIR%%/lists/authexceptionurllist.sample
+%%DNS%%@sample %%ETCDIR%%/lists/authexceptionsitelist.sample
+%%DNS%%@sample %%ETCDIR%%/lists/authexceptionurllist.sample
 @sample %%ETCDIR%%/lists/authplugins/ipgroups.sample
 @sample %%ETCDIR%%/lists/authplugins/portgroups.sample
 @sample %%ETCDIR%%/lists/bannedextensionlist.sample