From olivleh1@kartoffel.salatschuessel.net  Mon Jan  9 17:46:27 2006
Return-Path: <olivleh1@kartoffel.salatschuessel.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CD51B16A420
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  9 Jan 2006 17:46:17 +0000 (GMT)
	(envelope-from olivleh1@kartoffel.salatschuessel.net)
Received: from kartoffel.salatschuessel.net (p5084C510.dip.t-dialin.net [80.132.197.16])
	by mx1.FreeBSD.org (Postfix) with ESMTP id ACA9A43D45
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  9 Jan 2006 17:46:16 +0000 (GMT)
	(envelope-from olivleh1@kartoffel.salatschuessel.net)
Received: from kartoffel.salatschuessel.net (localhost [127.0.0.1])
	by kartoffel.salatschuessel.net (8.13.4/8.13.4) with ESMTP id k09FkQEh035711;
	Mon, 9 Jan 2006 16:46:26 +0100 (CET)
	(envelope-from olivleh1@kartoffel.salatschuessel.net)
Received: (from olivleh1@localhost)
	by kartoffel.salatschuessel.net (8.13.4/8.13.3/Submit) id k09FkQST035710;
	Mon, 9 Jan 2006 16:46:26 +0100 (CET)
	(envelope-from olivleh1)
Message-Id: <200601091546.k09FkQST035710@kartoffel.salatschuessel.net>
Date: Mon, 9 Jan 2006 16:46:26 +0100 (CET)
From: Oliver Lehmann <oliver@freebsd.org>
Reply-To: Oliver Lehmann <oliver@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Oliver Lehmann <oliver@freebsd.org>
Subject: fix port sysutils/ucspi-tcp
X-Send-Pr-Version: 3.113
X-GNATS-Notify: dom@happygiraffe.net

>Number:         91563
>Category:       ports
>Synopsis:       fix port sysutils/ucspi-tcp
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 09 17:50:02 GMT 2006
>Closed-Date:    Mon Jan 09 18:59:56 GMT 2006
>Last-Modified:  Mon Jan 09 18:59:56 GMT 2006
>Originator:     Oliver Lehmann
>Release:        FreeBSD 6.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD kartoffel.salatschuessel.net 6.0-STABLE FreeBSD 6.0-STABLE #0: Sat Dec 31 04:18:31 CET 2005 olivleh1@kartoffel.salatschuessel.net:/usr/obj/amd64-athlon64-6.0/usr/src/sys/KARTOFFEL amd64


>Description:
	fix SSL support if openssl is installed from ports and does not
	exists in base

>How-To-Repeat:
>Fix:


--- ucspi-tcp::Makefile.diff begins here ---
--- Makefile.orig	Mon Nov  7 18:01:43 2005
+++ Makefile	Mon Jan  9 12:16:57 2006
@@ -26,6 +26,10 @@
 SCRIPTS_ENV=	BINOWN="${BINOWN}" BINGRP="${BINGRP}" BINMODE="${BINMODE}" \
 		MANMODE="${MANMODE}" CFLAGS="${CFLAGS}"
 
+.if defined(WITH_SSL)
+USE_OPENSSL=	yes
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_MAN)
@@ -46,6 +50,11 @@
 PATCH_SITES+=	http://www.nrg4u.com/qmail/
 PATCHFILES+=	ucspi-tcp-ssl-20050405.patch.gz
 PATCH_DIST_STRIP=	-p1
+USE_REINPLACE=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|#INCS=-I/usr/local/include|INCS=-I${OPENSSLBASE}/include|g; \
+			s|-lcrypto|-L${OPENSSLBASE}/lib |g' ${WRKSRC}/Makefile
 .endif
 
 post-configure:
--- ucspi-tcp::Makefile.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Mon Jan 9 17:52:18 UTC 2006 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=91563 

From: Dominic Mitchell <dom@happygiraffe.net>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/91563: fix port sysutils/ucspi-tcp
Date: Mon, 09 Jan 2006 18:46:20 +0000

 Edwin Groothuis wrote:
 > Maintainer of sysutils/ucspi-tcp,
 > 
 > Please note that PR ports/91563 has just been submitted.
 > 
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 > 
 > The full text of the PR can be found at:
 >     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/91563
 
 Yes, the patch looks good.  Please commit.
 
 -Dom
State-Changed-From-To: feedback->closed 
State-Changed-By: oliver 
State-Changed-When: Mon Jan 9 18:59:44 UTC 2006 
State-Changed-Why:  
Comitted, thanks! 

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