From owner-freebsd-ports Thu Feb 7 7: 0:12 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0607B37B405 for ; Thu, 7 Feb 2002 07:00:04 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g17F03B94954; Thu, 7 Feb 2002 07:00:03 -0800 (PST) (envelope-from gnats) Date: Thu, 7 Feb 2002 07:00:03 -0800 (PST) Message-Id: <200202071500.g17F03B94954@freefall.freebsd.org> To: freebsd-ports@FreeBSD.org Cc: From: Alan Eldridge Subject: Re: ports/34683: samba doesn't include cups dependency by default Reply-To: Alan Eldridge Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org The following reply was made to PR ports/34683; it has been noted by GNATS. From: Alan Eldridge To: FreeBSD Bugs Cc: Alan Eldridge , dwcjr@freebsd.org Subject: Re: ports/34683: samba doesn't include cups dependency by default Date: Thu, 7 Feb 2002 09:53:16 -0500 Per Will's suggestion, here's another patch. It adds a WITHOUT_CUPS knob. The existing WITH_CUPS knob is present, in order to achieve backward compatibility, and will override the WITHOUT_CUPS knob. The WITHOUT_CUPS knob works correctly, *even if cups is installed on the build system*. ---8<-snip---8<-snip---8<-snip---8<-snip---8<-snip---8<-snip---8<--- Index: net/samba/Makefile =================================================================== RCS file: /home/alane/cvsroot/ports/net/samba/Makefile,v retrieving revision 1.71 diff -u -3 -r1.71 Makefile --- net/samba/Makefile 3 Feb 2002 04:45:50 -0000 1.71 +++ net/samba/Makefile 7 Feb 2002 14:43:14 -0000 @@ -17,10 +17,6 @@ MAINTAINER= dwcjr@FreeBSD.org -.if defined(WITH_CUPS) -LIB_DEPENDS= cups.2:${PORTSDIR}/print/cups-base -.endif - .if defined(WITH_RECYCLE) PATCH_SITES+= http://www.amherst.edu/~bbstone/recycle_bin/2.2.2/ PATCHFILES+= proto.h.patch loadparm.c.patch reply.c.patch @@ -45,9 +41,15 @@ .include -# to find CUPS libs, includes +.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 .if defined(KRB5_HOME) && exists(${KRB5_HOME}) CONFIGURE_ARGS+= --with-krb5=${KRB5_HOME} ---8<-snip---8<-snip---8<-snip---8<-snip---8<-snip---8<-snip---8<--- -- Alan Eldridge "Dave's not here, man." To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message