From marius@alchemy.franken.de  Wed Mar 24 12:57:47 2004
Return-Path: <marius@alchemy.franken.de>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8B6ED16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 24 Mar 2004 12:57:47 -0800 (PST)
Received: from alchemy.franken.de (alchemy.franken.de [194.94.249.218])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D217943D31
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 24 Mar 2004 12:57:45 -0800 (PST)
	(envelope-from marius@alchemy.franken.de)
Received: from alchemy.franken.de (localhost [127.0.0.1])
	by alchemy.franken.de (8.12.10/8.12.10/ALCHEMY.FRANKEN.DE) with ESMTP id i2OKviHx050024
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 24 Mar 2004 21:57:44 +0100 (CET)
	(envelope-from marius@alchemy.franken.de)
Received: (from marius@localhost)
	by alchemy.franken.de (8.12.10/8.12.10/Submit) id i2OKvh6l050023;
	Wed, 24 Mar 2004 21:57:43 +0100 (CET)
	(envelope-from marius)
Message-Id: <200403242057.i2OKvh6l050023@alchemy.franken.de>
Date: Wed, 24 Mar 2004 21:57:43 +0100 (CET)
From: Marius Strobl <marius@alchemy.franken.de>
Reply-To: Marius Strobl <marius@alchemy.franken.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: ftp/curl: pkg-plist broken when built with WITHOUT_SSL
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         64667
>Category:       ports
>Synopsis:       ftp/curl: pkg-plist broken when built with WITHOUT_SSL
>Confidential:   yes
>Severity:       non-critical
>Priority:       low
>Responsible:    roam
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 24 13:00:38 PST 2004
>Closed-Date:    Sat Mar 27 04:46:20 PST 2004
>Last-Modified:  Sat Mar 27 04:46:20 PST 2004
>Originator:     Marius Strobl
>Release:        FreeBSD 5.2-CURRENT sparc64
>Organization:
>Environment:
>Description:
	Curl installs curl-ca-bundle.crt only when built with SSL-support,
	but currently curl-ca-bundle.crt is static in pkg-plist.
>How-To-Repeat:
	cd $PORTSDIR/ftp/curl && make -DWITHOUT_SSL package
>Fix:

Index: Makefile
===================================================================
RCS file: /usr/data/bsd/cvs/fbsd/ports/ftp/curl/Makefile,v
retrieving revision 1.60
diff -u -r1.60 Makefile
--- Makefile	6 Feb 2004 09:43:28 -0000	1.60
+++ Makefile	23 Mar 2004 23:57:17 -0000
@@ -53,8 +53,10 @@
 
 .if !defined(WITHOUT_SSL)
 CONFIGURE_ARGS=	--with-ssl=${OPENSSLBASE}
+PLIST_SUB+=	SSL=""
 .else
 CONFIGURE_ARGS=	--without-ssl
+PLIST_SUB+=	SSL="@comment "
 .endif
 
 .if exists(/usr/lib/libkrb.a) && defined(WITH_KERBEROS4)
Index: pkg-plist
===================================================================
RCS file: /usr/data/bsd/cvs/fbsd/ports/ftp/curl/pkg-plist,v
retrieving revision 1.9
diff -u -r1.9 pkg-plist
--- pkg-plist	13 Dec 2003 08:32:09 -0000	1.9
+++ pkg-plist	23 Mar 2004 23:58:00 -0000
@@ -10,8 +10,8 @@
 lib/libcurl.a
 lib/libcurl.so
 lib/libcurl.so.%%SHLIB_VER%%
-%%DATADIR%%/curl-ca-bundle.crt
-@dirrm %%DATADIR%%
+%%SSL%%%%DATADIR%%/curl-ca-bundle.crt
+%%SSL%%@dirrm %%DATADIR%%
 %%PORTDOCS%%%%DOCSDIR%%/BINDINGS
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTE
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->roam  
Responsible-Changed-By: krion 
Responsible-Changed-When: Wed Mar 24 14:42:01 PST 2004 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=64667 
State-Changed-From-To: open->closed 
State-Changed-By: roam 
State-Changed-When: Sat Mar 27 04:46:04 PST 2004 
State-Changed-Why:  
Committed, thanks! 

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