Bug 174761
| Summary: | www/squidguard only allows squid27 or 31 but not squid32 | ||
|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Dewayne <dewayne> |
| Component: | Individual Port(s) | Assignee: | Guido Falsi <madpilot> |
| Status: | Closed FIXED | ||
| Severity: | Affects Only Me | ||
| Priority: | Normal | ||
| Version: | Latest | ||
| Hardware: | Any | ||
| OS: | Any | ||
Responsible Changed From-To: freebsd-www->freebsd-ports-bugs Make this a ports PR and assign. The GNATS www/ category is only for things relating to the FreeBSD website. Responsible Changed From-To: freebsd-ports-bugs->madpilot Over to maintainer (via the GNATS Auto Assign Tool) State Changed From-To: open->closed Committed. Thanks! Author: madpilot Date: Fri Dec 28 19:07:34 2012 New Revision: 309578 URL: http://svnweb.freebsd.org/changeset/ports/309578 Log: - Add option to depend on www/squid32 PR: ports/174761 Submitted by: Dewayne <dewayne@amdg.etowns.org> Modified: head/www/squidguard/Makefile Modified: head/www/squidguard/Makefile ============================================================================== --- head/www/squidguard/Makefile Fri Dec 28 19:03:02 2012 (r309577) +++ head/www/squidguard/Makefile Fri Dec 28 19:07:34 2012 (r309578) @@ -45,7 +45,7 @@ PKGMESSAGE= ${WRKDIR}/pkg-message OPTIONS_DEFINE= DNS_BL DOCS LDAP QUOTE_STRING SAMPLE_BL OPTIONS_SINGLE= SV -OPTIONS_SINGLE_SV= SQUID27 SQUID31 +OPTIONS_SINGLE_SV= SQUID27 SQUID31 SQUID32 OPTIONS_DEFAULT= SAMPLE_BL SQUID27 SAMPLE_BL_DESC= Install sample blacklists @@ -53,6 +53,7 @@ DNS_BL_DESC= Enable DNS based blacklists QUOTE_STRING_DESC= Add quoted string patch SQUID27_DESC= Depend on Squid 2.7.x SQUID31_DESC= Depend on Squid 3.1.x +SQUID32_DESC= Depend on Squid 3.2.x .include <bsd.port.options.mk> @@ -64,6 +65,10 @@ RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${P RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid31 .endif +.if ${PORT_OPTIONS:MSQUID32} +RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid32 +.endif + .if ${PORT_OPTIONS:MLDAP} CONFIGURE_ARGS+= --with-ldap USE_OPENLDAP= yes _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" |
Squidguard contains dependency options to for squid27 or 31 but not squid32. While attempting to build squid31, you're advised to build using squid32 for new installations and stops. Therefore need to include the hooks for squid32. Fix: OPTIONS_DEFINE= DNS_BL DOCS LDAP QUOTE_STRING SAMPLE_BL OPTIONS_SINGLE= SV -OPTIONS_SINGLE_SV= SQUID27 SQUID31 +OPTIONS_SINGLE_SV= SQUID27 SQUID31 SQUID32 OPTIONS_DEFAULT= SAMPLE_BL SQUID27 SAMPLE_BL_DESC= Install sample blacklists @@ -53,6 +53,7 @@ QUOTE_STRING_DESC= Add quoted string patch SQUID27_DESC= Depend on Squid 2.7.x SQUID31_DESC= Depend on Squid 3.1.x +SQUID32_DESC= Depend on Squid 3.2.x .include <bsd.port.options.mk> @@ -64,6 +65,11 @@ RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid31 .endif +.if ${PORT_OPTIONS:MSQUID32} +RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid32 +.endif + + .if ${PORT_OPTIONS:MLDAP} CONFIGURE_ARGS+= --with-ldap USE_OPENLDAP= yes--XgpSNEe6W3gyuwGpguXVqezid5CldtTmTqPmt4tSFYHG8h6a Content-Type: text/plain; name="file.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="file.diff" --- /usr/ports/www/squidguard/Makefile.orig 2012-11-17 17:03:06.000000000 +1100 +++ /usr/ports/www/squidguard/Makefile 2012-12-28 14:11:15.000000000 +1100 @@ -45,7 +45,7 @@ How-To-Repeat: Refer to patch below