Bug 36666 - samba-devel ignores WITH_CUPS
Summary: samba-devel ignores WITH_CUPS
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: dwcjr
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2002-04-02 21:10 UTC by Michael Harnois
Modified: 2002-04-03 00:43 UTC (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Michael Harnois 2002-04-02 21:10:04 UTC
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.

Fix: 

patch the distro to add -L/usr/local/lib and -I/usr/local/include
How-To-Repeat: make -DWITH_CUPS
Comment 1 Alan Eldridge 2002-04-02 23:10:49 UTC
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
Comment 2 Patrick Li freebsd_committer freebsd_triage 2002-04-02 23:34:41 UTC
Responsible Changed
From-To: freebsd-ports->dwcjr

Over to maintainer
Comment 3 dwcjr 2002-04-02 23:45:41 UTC
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.
Comment 4 dwcjr freebsd_committer freebsd_triage 2002-04-03 00:42:52 UTC
State Changed
From-To: open->closed

Committed, thanks!