From owner-freebsd-ports Thu Jul 5 10:30:12 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 5EE4437B403 for ; Thu, 5 Jul 2001 10:30:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.3/8.11.3) id f65HU2g81839; Thu, 5 Jul 2001 10:30:02 -0700 (PDT) (envelope-from gnats) Received: from yertle.kciLink.com (yertle.kcilink.com [216.194.193.105]) by hub.freebsd.org (Postfix) with ESMTP id A2F2737B403 for ; Thu, 5 Jul 2001 10:29:36 -0700 (PDT) (envelope-from khera@kciLink.com) Received: from onceler.kciLink.com (onceler.kciLink.com [216.194.193.106]) by yertle.kciLink.com (Postfix) with ESMTP id 4ACA22E45F; Thu, 5 Jul 2001 13:29:35 -0400 (EDT) Received: (from khera@localhost) by onceler.kciLink.com (8.11.4/8.11.3) id f65HTZR78528; Thu, 5 Jul 2001 13:29:35 -0400 (EDT) (envelope-from khera) Message-Id: <200107051729.f65HTZR78528@onceler.kciLink.com> Date: Thu, 5 Jul 2001 13:29:35 -0400 (EDT) From: Reply-To: khera@kciLink.com To: FreeBSD-gnats-submit@freebsd.org Cc: john@coastalgeology.org X-Send-Pr-Version: 3.113 Subject: ports/28727: patch to make expect honor WITHOUT_X11 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: 28727 >Category: ports >Synopsis: patch to make expect build WITHOUT_X11 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Jul 05 10:30:01 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Vivek Khera >Release: FreeBSD 4.3-STABLE i386 >Organization: >Environment: System: FreeBSD onceler.kciLink.com 4.3-STABLE FreeBSD 4.3-STABLE #6: Mon Jun 11 12:39:31 EDT 2001 khera@yertle.kciLink.com:/u/yertle2/usr.obj/amd/onceler/u/onceler1/usr/src/sys/ONCELER i386 >Description: The patch below allows ports/lang/expect to build without X11 support, if desired. This also requires a patch to tclConfig.sh to properly set the LD_SEARCH_FILES variable: http://www.freebsd.org/cgi/query-pr.cgi?pr=28726 >How-To-Repeat: >Fix: diff -u expect/Makefile expect.nox/Makefile --- expect/Makefile Tue Mar 13 16:23:55 2001 +++ expect.nox/Makefile Thu Jul 5 13:18:30 2001 @@ -12,20 +12,36 @@ MAINTAINER= john@coastalgeology.org +.if !defined(WITHOUT_X11) LIB_DEPENDS?= tk83.1:${PORTSDIR}/x11-toolkits/tk83 +.else +LIB_DEPENDS?= tcl83.1:${PORTSDIR}/lang/tcl83 +.endif WRKSRC= ${WRKDIR}/expect-5.32 INSTALLS_SHLIB= yes GNU_CONFIGURE= yes + +.if defined(WITHOUT_X11) +TK_CONFIG_ARGS = +PLIST_SUB += XFILES="@comment " +.else +TK_CONFIG_ARGS = --with-tkconfig=${PREFIX}/lib/tk8.3 \ + --with-tkinclude=${PREFIX}/include/tk8.3 +PLIST_SUB += XFILES="" +.endif + CONFIGURE_ARGS?= --enable-shared \ --with-tclconfig=${PREFIX}/lib/tcl8.3 \ --with-tclinclude=${PREFIX}/include/tcl8.3 \ - --with-tkconfig=${PREFIX}/lib/tk8.3 \ - --with-tkinclude=${PREFIX}/include/tk8.3 + ${TK_CONFIG_ARGS} .if !defined(NO_MAN_INSTALL) MAN1= autoexpect.1 cryptdir.1 decryptdir.1 dislocate.1 \ - expect.1 expectk.1 kibitz.1 mkpasswd.1 passmass.1 \ + expect.1 kibitz.1 mkpasswd.1 passmass.1 \ tknewsbiff.1 unbuffer.1 xkibitz.1 +.if !defined(WITHOUT_X11) +MAN1 += expectk.1 +.endif MAN3= libexpect.3 .endif Common subdirectories: expect/files and expect.nox/files diff -u expect/pkg-plist expect.nox/pkg-plist --- expect/pkg-plist Sat Aug 12 07:33:18 2000 +++ expect.nox/pkg-plist Thu Jul 5 12:55:46 2001 @@ -4,7 +4,7 @@ bin/decryptdir bin/dislocate bin/expect -bin/expectk +%%XFILES%%bin/expectk bin/ftp-rfc bin/kibitz bin/lpunlock >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message