From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Nov 8 07:10:16 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0855D16A420 for ; Tue, 8 Nov 2005 07:10:16 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D864743D53 for ; Tue, 8 Nov 2005 07:10:14 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id jA87AE4u035573 for ; Tue, 8 Nov 2005 07:10:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id jA87AEqO035572; Tue, 8 Nov 2005 07:10:14 GMT (envelope-from gnats) Resent-Date: Tue, 8 Nov 2005 07:10:14 GMT Resent-Message-Id: <200511080710.jA87AEqO035572@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, NIIMI Satoshi Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E533016A420 for ; Tue, 8 Nov 2005 07:08:55 +0000 (GMT) (envelope-from sa2c@sa2c.net) Received: from freebird.and.or.jp (ns.and.or.jp [203.141.148.11]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7ADD743D48 for ; Tue, 8 Nov 2005 07:08:54 +0000 (GMT) (envelope-from sa2c@sa2c.net) Received: from localhost (localhost [127.0.0.1]) by freebird.and.or.jp (Postfix) with ESMTP id 74A2E2E034 for ; Tue, 8 Nov 2005 16:08:50 +0900 (JST) Message-Id: <20051108070849.7E2A81145B@berkeley.l.sa2c.net> Date: Tue, 8 Nov 2005 16:08:49 +0900 (JST) From: NIIMI Satoshi To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/88645: ports using OpenSSL depends on security/openssl-stable unconditionaly on RELENG_6_0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: NIIMI Satoshi List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Nov 2005 07:10:16 -0000 >Number: 88645 >Category: ports >Synopsis: ports using OpenSSL depends on security/openssl-stable unconditionaly on RELENG_6_0 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Nov 08 07:10:14 GMT 2005 >Closed-Date: >Last-Modified: >Originator: NIIMI Satoshi >Release: FreeBSD 6.0-RELEASE i386 >Organization: >Environment: System: FreeBSD berkeley.l.sa2c.net 6.0-RELEASE FreeBSD 6.0-RELEASE #2: Wed Nov 2 15:10:33 JST 2005 root@berkeley.l.sa2c.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: >How-To-Repeat: On FreeBSD 6.0: % make -C /usr/ports/security/cyrus-sasl2 -V WITH_OPENSSL_PORT (empty string) % make -C /usr/ports/security/cyrus-sasl2 -V OPENSSLBASE /usr/local >Fix: --- diff begins here --- Index: bsd.openssl.mk =================================================================== RCS file: /home/ncvs/ports/Mk/bsd.openssl.mk,v retrieving revision 1.25 diff -u -r1.25 bsd.openssl.mk --- bsd.openssl.mk 7 Nov 2005 20:58:17 -0000 1.25 +++ bsd.openssl.mk 8 Nov 2005 06:58:39 -0000 @@ -46,11 +46,13 @@ WITH_OPENSSL_STABLE=yes .endif +.if defined(WITH_OPENSSL_PORT) .if !defined(WITHOUT_OPENSSL_097) && !defined(WITH_OPENSSL_BETA) .if ( ${OSVERSION} >= 600000 ) && ( ${OSVERSION} < 600100 ) WITH_OPENSSL_STABLE=yes .endif .endif +.endif # if no preference was set, check for an installed base version # but give an installed port preference over it. --- diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: