From mdharnois@mharnois.mdharnois.net  Tue Apr  2 12:08:51 2002
Return-Path: <mdharnois@mharnois.mdharnois.net>
Received: from mharnois.mdharnois.net (customer-mpls-23.cpinternet.com [209.240.253.23])
	by hub.freebsd.org (Postfix) with ESMTP id 4151437B41B
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  2 Apr 2002 12:08:51 -0800 (PST)
Received: by mharnois.mdharnois.net (Postfix, from userid 1000)
	id 7CA0D3CA8; Tue,  2 Apr 2002 14:08:50 -0600 (CST)
Message-Id: <20020402200850.7CA0D3CA8@mharnois.mdharnois.net>
Date: Tue,  2 Apr 2002 14:08:50 -0600 (CST)
From: Michael D.Harnois <mharnois@cpinternet.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: samba-devel ignores WITH_CUPS
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         36666
>Category:       ports
>Synopsis:       samba-devel ignores WITH_CUPS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    dwcjr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 02 12:10:04 PST 2002
>Closed-Date:    Tue Apr 02 15:43:00 PST 2002
>Last-Modified:  Tue Apr 02 15:43:00 PST 2002
>Originator:     Michael D. Harnois
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD mharnois.mdharnois.net 5.0-CURRENT FreeBSD 5.0-CURRENT #42: Tue Apr 2 09:20:39 CST 2002 mdharnois@mharnois.mdharnois.net:/usr/src/sys/i386/compile/NEWKERNEL i386


	
>Description:
Well, ignores isn't quite the right word. What actually happens is that
neither configure nor the stock Makefile look in /usr/local for libs or
includes. So configure tries to find -lcups, and doesn't.


>How-To-Repeat:
make -DWITH_CUPS


>Fix:
patch the distro to add -L/usr/local/lib and -I/usr/local/include
	

>Release-Note:
>Audit-Trail:

From: Alan E <alane@geeksrus.net>
To: "Michael D.Harnois" <mharnois@cpinternet.com>
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: Re: ports/36666: samba-devel ignores WITH_CUPS
Date: Tue, 2 Apr 2002 17:10:49 -0500

 On Tue, Apr 02, 2002 at 02:08:50PM -0600, Michael D.Harnois wrote:
 >
 >>Number:         36666
 >>Category:       ports
 >>Synopsis:       samba-devel ignores WITH_CUPS
 
 Maintainer has had the patch from me since 2002/02/13. This fixes
 samba-devel in the same manner as samba:
 
 WITH_CUPS is default; links with cups libraries. 
 
 WITHOUT_CUPS is provided to exclude it if you really think you need to
 (but there's no reason to).
 
 The patch follows:
 
 ==8<====8<====8<====8<====8<====8<====8<====8<====8<====8<==
 Index: net/samba-devel/Makefile
 ===================================================================
 RCS file: /home/alane/cvsroot/ports/net/samba-devel/Makefile,v
 retrieving revision 1.82
 diff -u -3 -r1.82 Makefile
 --- net/samba-devel/Makefile	12 Feb 2002 21:48:56 -0000	1.82
 +++ net/samba-devel/Makefile	14 Feb 2002 00:42:58 -0000
 @@ -18,8 +18,14 @@
  
  MAINTAINER=	dwcjr@FreeBSD.org
  
 +.if !defined(WITHOUT_CUPS)
 +WITH_CUPS=	yes
 +.endif
 +
  .if defined(WITH_CUPS)
  LIB_DEPENDS=	cups.2:${PORTSDIR}/print/cups-base
 +CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
 +		LDFLAGS=-L${LOCALBASE}/lib
  .endif
  
  # directories
 @@ -47,11 +53,6 @@
  CONFIGURE_ARGS+=	--with-krb5=${KRB5_HOME}
  .else
  CONFIGURE_ARGS+=	--with-krb5=no
 -.endif
 -
 -.if defined(WITH_CUPS)
 -# This enables CUPS printing support in Samba.
 -CONFIGURE_ARGS+=	--with-cups=${LOCALBASE}
  .endif
  
  .if defined(WITH_ACL_SUPPORT)
 Index: net/samba-devel/files/patch-include-includes.h
 ===================================================================
 RCS file: net/samba-devel/files/patch-include-includes.h
 diff -N net/samba-devel/files/patch-include-includes.h
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ net/samba-devel/files/patch-include-includes.h	14 Feb 2002 01:13:08 -0000
 @@ -0,0 +1,14 @@
 +--- include/includes.h.orig	Wed Jan 30 05:24:18 2002
 ++++ include/includes.h	Wed Feb 13 20:12:12 2002
 +@@ -27,6 +27,11 @@
 + 
 + #include "local.h"
 + 
 ++#ifdef __FreeBSD__
 ++#define DEFAULT_PRINTING PRINT_BSD
 ++#define PRINTCAP_NAME "/etc/printcap"
 ++#endif /* __FreeBSD__ */
 ++
 + #ifdef AIX
 + #define DEFAULT_PRINTING PRINT_AIX
 + #define PRINTCAP_NAME "/etc/qconfig"
 ==8<====8<====8<====8<====8<====8<====8<====8<====8<====8<==
 
 -- 
 Alan Eldridge
 "Dave's not here, man."
 
 
 -- 
 AlanE
 "When the going gets weird, the weird turn pro." - HST
 
Responsible-Changed-From-To: freebsd-ports->dwcjr 
Responsible-Changed-By: pat 
Responsible-Changed-When: Tue Apr 2 14:34:41 PST 2002 
Responsible-Changed-Why:  
Over to maintainer 

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

From: "David W. Chapman Jr." <dwcjr@inethouston.net>
To: <freebsd-gnats-submit@FreeBSD.org>, <mharnois@cpinternet.com>
Cc: "Alan Eldridge" <alane@geeksrus.net>
Subject: Re: ports/36666: samba-devel ignores WITH_CUPS
Date: Tue, 2 Apr 2002 16:45:41 -0600

 Alan,
 
     Sorry for not getting to your patch already, I could have sworn I had
 committed it.  Your new patch has a conflict with files/patch-includes.h
 which I had to add to fix samba with OpenPAM.  Do you want to merge them or
 do you want to wait on me?  I apologize for not getting your previous one in
 earlier.
 
State-Changed-From-To: open->closed 
State-Changed-By: dwcjr 
State-Changed-When: Tue Apr 2 15:42:52 PST 2002 
State-Changed-Why:  
Committed, thanks! 

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