From sem@ciam.ru  Wed Mar 24 14:52:00 2004
Return-Path: <sem@ciam.ru>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3951216A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 24 Mar 2004 14:52:00 -0800 (PST)
Received: from mail.ciam.ru (mail.ciam.ru [213.147.57.66])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D3A1843D39
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 24 Mar 2004 14:51:59 -0800 (PST)
	(envelope-from sem@ciam.ru)
Received: from ppp9-199.pppoe.mtu-net.ru ([81.195.9.199] helo=Current.sem-home.ciam.ru)
	by mail.ciam.ru with esmtp (Exim 4.x)
	id 1B6HE6-000D4I-QE
	for FreeBSD-gnats-submit@freebsd.org; Thu, 25 Mar 2004 01:51:58 +0300
Received: from root by Current.sem-home.ciam.ru with local (Exim 4.30; FreeBSD)
	id 1B6HE6-0002Vn-Bv
	for FreeBSD-gnats-submit@freebsd.org; Thu, 25 Mar 2004 01:51:58 +0300
Message-Id: <E1B6HE6-0002Vn-Bv@Current.sem-home.ciam.ru>
Date: Thu, 25 Mar 2004 01:51:58 +0300
From: Sergey Matveychuk <sem@ciam.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] ftp/frox: fix default options
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         64673
>Category:       ports
>Synopsis:       [MAINTAINER] ftp/frox: fix default options
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 24 15:00:37 PST 2004
>Closed-Date:    Wed Mar 24 23:37:21 PST 2004
>Last-Modified:  Wed Mar 24 23:37:21 PST 2004
>Originator:     Sergey Matveychuk
>Release:        FreeBSD 5.2.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD Current.sem-home.ciam.ru 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE #5: Fri Mar 12 03:47:38 MSK 2004
>Description:
[DESCRIBE CHANGES]
- fix default options

Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:

--- frox-0.7.13.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/ftp/frox.orig/Makefile /usr/ports/ftp/frox/Makefile
--- /usr/ports/ftp/frox.orig/Makefile	Thu Mar 25 01:50:04 2004
+++ /usr/ports/ftp/frox/Makefile	Thu Mar 25 01:51:22 2004
@@ -47,10 +47,15 @@
 		LOCAL_CACHE "Enable use of local cache" off \
 		CCP "Ftp-proxy style command control programs" on \
 		ROOT_RUN "Allow frox running as root (not recomended)" off
-WITH_HTTP_CACHE?=	yes
-WITH_CCP?=	yes
-
 .include <bsd.port.pre.mk>
+
+# Set default options
+.if !defined(WITHOUT_HTTP_CACHE)
+WITH_HTTP_CACHE=	yes
+.endif
+.if !defined(WITHOUT_CCP)
+WITH_CCP=	yes
+.endif
 
 .if defined(WITH_IPFILTER)
 CONFIGURE_ARGS+=	--enable-ipfilter
--- frox-0.7.13.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: krion 
State-Changed-When: Wed Mar 24 23:37:15 PST 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=64673 
>Unformatted:
