ports/115766: [PATCH] x11-toolkits/blt use USE_TK

[Martin Matuska]

>Number:         115766
>Category:       ports
>Synopsis:       [PATCH] x11-toolkits/blt use USE_TK
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 23 19:40:00 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:
As this software supports Tk from 8.0 to 8.4, use USE_TK=80+ and USE_XORG=x11
- make advantage of bsd.tcl.mk variables
- --prefix=${PREFIX} is included in bsd.port.mk
- --x-libraries and --x-includes are in bsd.port.mk if USE_XORG defined
>How-To-Repeat:
>Fix:
Index: ports/x11-toolkits/blt/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-toolkits/blt/Makefile,v
retrieving revision 1.48
diff -u -r1.48 Makefile
--- ports/x11-toolkits/blt/Makefile	19 May 2007 20:30:39 -0000	1.48
+++ ports/x11-toolkits/blt/Makefile	23 Aug 2007 19:32:55 -0000
@@ -26,25 +26,23 @@
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
 
-LIB_DEPENDS=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
-
 WRKSRC=		${WRKDIR}/blt2.4z
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX} \
-		--exec_prefix=${PREFIX} \
-		--with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \
-		--with-tk=${LOCALBASE}/lib/tk${TK_VER} \
-		--with-tcllibs=${LOCALBASE}/lib/ \
-		--with-tklibs=${LOCALBASE}/lib/ \
-		--with-tclincls=${LOCALBASE}/include/tcl${TK_VER} \
-		--with-tkincls=${LOCALBASE}/include/tk${TK_VER} \
-		--x-libraries=${X11BASE}/lib \
-		--x-includes=${X11BASE}/include
 
-TK_VER?=	8.4
+USE_TK=		80+
+INVALID_TK_VER=	85
+USE_XORG=	x11
 
 .include <bsd.port.pre.mk>
 
+CONFIGURE_ARGS+=	--exec_prefix=${PREFIX} \
+		--with-tcl=${TCL_LIBDIR} \
+		--with-tk=${TK_LIBDIR} \
+		--with-tcllibs=${LOCALBASE}/lib/ \
+		--with-tklibs=${LOCALBASE}/lib/ \
+		--with-tclincls=${TCL_INCLUDEDIR} \
+		--with-tkincls=${TK_INCLUDEDIR}
+
 post-install:
 	${LN} -sf libBLT24.so.3 ${PREFIX}/lib/libBLT24.so
 	${LN} -sf libBLTlite24.so.3 ${PREFIX}/lib/libBLTlite24.so
>Release-Note:
>Audit-Trail:
>Unformatted: