Date: Tue, 2 Apr 2002 14:20:02 -0800 (PST) From: Alan E <alane@geeksrus.net> To: freebsd-ports@FreeBSD.org Subject: Re: ports/36666: samba-devel ignores WITH_CUPS Message-ID: <200204022220.g32MK2S38323@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/36666; it has been noted by GNATS.
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
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204022220.g32MK2S38323>