From owner-freebsd-ports Fri May 25 18:20:10 2001 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 8DB4137B423 for ; Fri, 25 May 2001 18:20:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.1/8.11.1) id f4Q1K1m44054; Fri, 25 May 2001 18:20:01 -0700 (PDT) (envelope-from gnats) Received: from shumai.marcuscom.com (rdu26-228-058.nc.rr.com [66.26.228.58]) by hub.freebsd.org (Postfix) with ESMTP id AB02B37B422 for ; Fri, 25 May 2001 18:15:28 -0700 (PDT) (envelope-from marcus@shumai.marcuscom.com) Received: (from marcus@localhost) by shumai.marcuscom.com (8.11.3/8.11.3) id f4Q1FgG24278; Fri, 25 May 2001 21:15:42 -0400 (EDT) (envelope-from marcus) Message-Id: <200105260115.f4Q1FgG24278@shumai.marcuscom.com> Date: Fri, 25 May 2001 21:15:42 -0400 (EDT) From: marcus@marcuscom.com Reply-To: marcus@marcuscom.com To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/27650: Update samba to adds CUPS support 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 >Number: 27650 >Category: ports >Synopsis: Add CUPS support to Samba 2.0 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri May 25 18:20:00 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Joe "Marcus" Clarke >Release: FreeBSD 4.3-RELEASE i386 >Organization: MarcusCom >Environment: System: FreeBSD shumai.marcuscom.com 4.3-RELEASE FreeBSD 4.3-RELEASE #0: Sun May 6 01:46:59 EDT 2001 root@shumai.marcuscom.com:/usr/src/sys/compile/SHUMAI i386 >Description: These patches will add optional CUPS printing support to Samba 2.0. >How-To-Repeat: >Fix: --- Makefile.orig Fri May 25 21:00:47 2001 +++ Makefile Fri May 25 21:09:04 2001 @@ -18,6 +18,10 @@ MAINTAINER= dwcjr@inethouston.net +.if defined(WITH_CUPS) +LIB_DEPENDS= cups.2:${PORTSDIR}/print/cups +.endif + # directories VARDIR= /var SAMBA_SPOOL= ${VARDIR}/spool/samba @@ -37,6 +41,11 @@ .if defined(KRB5_HOME) && exists(${KRB5_HOME}) CONFIGURE_ARGS+=--with-krb5=${KRB5_HOME} +.endif + +.if defined(WITH_CUPS) +# This enables CUPS printing support in Samba. +CONFIGURE_ARGS+=--with-cups=${LOCALBASE} .endif WRKSRC= ${WRKDIR}/${DISTNAME}/source --- configure.orig Fri May 25 20:34:00 2001 +++ configure Fri May 25 20:51:55 2001 @@ -61,6 +61,8 @@ --with-netatalk Include experimental Netatalk support --without-netatalk Don't include experimental Netatalk support (default)" ac_help="$ac_help + --with-cups=DIR Where the CUPS includes and libraries are located (defaults to /usr)" +ac_help="$ac_help --with-quotas Include experimental disk-quota support --without-quotas Don't include experimental disk-quota support (default)" ac_help="$ac_help @@ -3252,7 +3254,36 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lcups $LIBS" + ac_save_CFLAGS="$CFLAGS" + ac_save_LDFLAGS="$LDFLAGS" + withval="/usr" + if test "${with_cups+set}" = set; then + withval="$with_cups"; + case "$withval" in + yes|no) + echo "configure: warning: --with-cups called without argument - will use default" 1>&w + CFLAGS="-I/usr/include $CFLAGS" + LIBS="-lcups $LIBS" + LDFLAGS="-L/usr/lib $LDFLAGS" + ;; + * ) + CFLAGS="-I${withval}/include $CFLAGS" + LIBS="-lcups $LIBS" + LDFLAGS="-L${withval}/lib $LDFLAGS" + ;; + esac + + else + CFLAGS="-I/usr/include $CFLAGS" + LIBS="-lcups $LIBS" + LDFLAGS="-L/usr/lib $LDFLAGS" + fi + + if test ! -d ${withval}; then + echo "configure: error: called with --with-cups, but cups base directory ${withval} does not exist or is not a directory. Aborting config" 1>&2 + exit 1 + fi + cat > conftest.$ac_ext <&6 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message