From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jul 30 16:20:02 2007 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EE6F516A46D for ; Mon, 30 Jul 2007 16:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id CEFC913C467 for ; Mon, 30 Jul 2007 16:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l6UGK2V8062842 for ; Mon, 30 Jul 2007 16:20:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l6UGK2dg062841; Mon, 30 Jul 2007 16:20:02 GMT (envelope-from gnats) Resent-Date: Mon, 30 Jul 2007 16:20:02 GMT Resent-Message-Id: <200707301620.l6UGK2dg062841@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Martin Matuska Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 44F6416A417 for ; Mon, 30 Jul 2007 16:17:51 +0000 (UTC) (envelope-from rebum@mail.vx.sk) Received: from mail.vx.sk (neo.vx.sk [88.198.35.14]) by mx1.freebsd.org (Postfix) with ESMTP id 0C1E013C45B for ; Mon, 30 Jul 2007 16:17:51 +0000 (UTC) (envelope-from rebum@mail.vx.sk) Received: from localhost (localhost [127.0.0.1]) by mail.vx.sk (Postfix) with ESMTP id 5B0694423E for ; Mon, 30 Jul 2007 18:17:50 +0200 (CEST) Received: from mail.vx.sk ([127.0.0.1]) by localhost (mail.vx.sk [127.0.0.1]) (amavisd-new, port 10024) with LMTP id jEOjAxr5GP43 for ; Mon, 30 Jul 2007 18:17:47 +0200 (CEST) Received: by mail.vx.sk (Postfix, from userid 1001) id B8F4844250; Mon, 30 Jul 2007 18:17:47 +0200 (CEST) Message-Id: <20070730161747.B8F4844250@mail.vx.sk> Date: Mon, 30 Jul 2007 18:17:47 +0200 (CEST) From: Martin Matuska To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/115049: [PATCH] unbreak sysutils/lavaps 2.7_3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jul 2007 16:20:03 -0000 >Number: 115049 >Category: ports >Synopsis: [PATCH] unbreak sysutils/lavaps 2.7_3 >Confidential: no >Severity: serious >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Jul 30 16:20:02 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Martin Matuska >Release: FreeBSD 6.2-STABLE i386 amd64 >Organization: >Environment: System: FreeBSD 6.2-STABLE i386 amd64 >Description: Latest x11-toolkits/tk8* updates reduced tk depends from USE_XLIB to USE_XORG=x11 This port requires in addition USE_XORG=xext sm ice Unbroken with USE_XORG= x11 xext sm ice + reorganized Makefile to use USE_TK >How-To-Repeat: >Fix: Index: ports/sysutils/lavaps/Makefile =================================================================== RCS file: /home/pcvs/ports/sysutils/lavaps/Makefile,v retrieving revision 1.27 diff -u -r1.27 Makefile --- ports/sysutils/lavaps/Makefile 19 May 2007 20:23:26 -0000 1.27 +++ ports/sysutils/lavaps/Makefile 30 Jul 2007 16:15:47 -0000 @@ -16,26 +16,22 @@ GNU_CONFIGURE= yes USE_GNOME= gnometarget -CONFIGURE_ENV= CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= -x-includes="${X11BASE}/include" -x-libraries="${X11BASE}/lib" USE_PERL5_BUILD= yes +USE_XORG= x11 xext sm ice MAN1= lavaps.1 -TCL_VER?= 8.4 +OPTIONS= GTK "Build with GTK frontend instead of the default TK" off -CPPFLAGS+= -I${LOCALBASE}/include/tcl${TCL_VER} \ - -I${LOCALBASE}/include/tk${TCL_VER} \ - -I${LOCALBASE}/include -CFLAGS+= -I${LOCALBASE}/include/tcl${TCL_VER} \ - -I${LOCALBASE}/include/tk${TCL_VER} \ - -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include +CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS= GTK "Build with GTK frontend instead of the default TK" off - .include +CONFIGURE_ARGS+= -x-includes="${X11BASE}/include" \ + -x-libraries="${X11BASE}/lib" + .if defined(WITH_GTK) PKGNAMESUFFIX= -gtk2 USE_GNOME+= gtk20 libgnomeui @@ -43,10 +39,15 @@ CONFIGURE_ARGS+= --with-gtk PLIST_SUB+= NLS="" .else -LIB_DEPENDS+= tk${TCL_VER:S/.//}:${PORTSDIR}/x11-toolkits/tk${TCL_VER:S/.//} +USE_TK= 84+ +.include "${PORTSDIR}/Mk/bsd.tcl.mk" +CPPFLAGS+= -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} +CFLAGS+= -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} CONFIGURE_ARGS+= --with-tcltk --disable-nls \ --with-tcl-ver=${TCL_VER} --with-tk-ver=${TCL_VER} PLIST_SUB+= NLS="@comment " .endif +CONFIGURE_ENV+= CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" + .include >Release-Note: >Audit-Trail: >Unformatted: