Date: Mon, 30 Jul 2007 18:17:47 +0200 (CEST) From: Martin Matuska <mm@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/115049: [PATCH] unbreak sysutils/lavaps 2.7_3 Message-ID: <20070730161747.B8F4844250@mail.vx.sk> Resent-Message-ID: <200707301620.l6UGK2dg062841@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.pre.mk>
+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 <bsd.port.post.mk>
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070730161747.B8F4844250>