Change tclConfig.sh to set TCL_SRC_DIR as the directory holding
the installed headers, rather than the port build directory. Remove configure.in patch ; obsoleted by a similar change to tclConfig.sh in lang/tcl/8.5 From Stuart Cassoff (maintainer), ok deanna
This commit is contained in:
parent
8723cde88a
commit
7b7cc8cba1
@ -1,11 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.2 2008/04/25 19:34:21 deanna Exp $
|
||||
# $OpenBSD: Makefile,v 1.3 2008/04/27 13:50:44 sthen Exp $
|
||||
|
||||
COMMENT= graphical toolkit for Tcl
|
||||
|
||||
VERSION= 8.5.2
|
||||
|
||||
DISTNAME= tk${VERSION}
|
||||
PKGNAME= tk-${VERSION}p0
|
||||
PKGNAME= tk-${VERSION}p1
|
||||
SHARED_LIBS= tk85 0.0
|
||||
CATEGORIES= x11 x11/tk
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/}
|
||||
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-unix_configure_in,v 1.1.1.1 2008/04/25 14:17:25 deanna Exp $
|
||||
--- unix/configure.in.orig Tue Mar 25 07:42:01 2008
|
||||
+++ unix/configure.in Tue Mar 25 07:44:17 2008
|
||||
@@ -47,6 +47,8 @@ Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl ${TK_VERSI
|
||||
Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl ${TK_VERSION}.])
|
||||
fi
|
||||
|
||||
+TCL_SRC_DIR=${prefix}/include/tcl${TCL_VERSION}
|
||||
+
|
||||
#------------------------------------------------------------------------
|
||||
# Handle the --prefix=... option
|
||||
#------------------------------------------------------------------------
|
12
x11/tk/8.5/patches/patch-unix_tkConfig_sh_in
Normal file
12
x11/tk/8.5/patches/patch-unix_tkConfig_sh_in
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-unix_tkConfig_sh_in,v 1.1 2008/04/27 13:50:44 sthen Exp $
|
||||
--- unix/tkConfig.sh.in.orig Fri Mar 28 18:46:36 2008
|
||||
+++ unix/tkConfig.sh.in Sun Apr 27 09:55:32 2008
|
||||
@@ -71,7 +71,7 @@ TK_INCLUDE_SPEC='@TK_INCLUDE_SPEC@'
|
||||
# different place than the directory containing the source files, this
|
||||
# points to the location of the sources, not the location where Tk was
|
||||
# compiled.
|
||||
-TK_SRC_DIR='@TK_SRC_DIR@'
|
||||
+TK_SRC_DIR='@includedir@'
|
||||
|
||||
# Needed if you want to make a 'fat' shared library library
|
||||
# containing tk objects or link a different wish.
|
Loading…
Reference in New Issue
Block a user