cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to new Tcl layout.

Browse Source 
While there, make use of the Tcl/Tk modules.

OK landry@, stu@
This commit is contained in:
sebastia 2011-01-05 18:49:20 +00:00
parent 2007c60f6d
commit 946c842914
2 changed files with 58 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lang/otcl/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.29 2010/11/17 08:05:18 espie Exp $
# $OpenBSD: Makefile,v 1.30 2011/01/05 18:49:20 sebastia Exp $
# $FreeBSD: ports/lang/otcl/Makefile,v 1.6 1999/11/28 18:31:28 steve Exp $
COMMENT= MIT Object Tcl
@ -18,20 +18,22 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xext c m pthread-stubs tcl84 xcb tk84
MODULES += x11/tk
MODTK_VERSION = 8.4
WANTLIB= X11 Xext c m ${MODTK_WANTLIB}
LIB_DEPENDS = ${MODTK_LIB_DEPENDS}
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=otcl-tclcl/}
WRKDIST= ${WRKDIR}/otcl-$V
LIB_DEPENDS= tk->=8.4,<8.5:x11/tk/8.4
CONFIGURE_STYLE= gnu dest
CONFIGURE_ARGS+=--includedir=${PREFIX}/include/tcl8.4/generic \
--with-tcl-ver=8.4 \
--with-tk-ver=8.4 \
--x-includes=${X11BASE}/include \
CONFIGURE_ARGS+= --x-includes=${X11BASE}/include \
--with-tcl=${MODTCL_LIBDIR} \
--with-tk=${MODTK_LIBDIR} \
--with-tcl-ver=${MODTCL_VERSION} \
--with-tk-ver=${MODTCL_VERSION} \
--x-libraries=${X11BASE}/lib
CONFIGURE_ENV= LIBotcl_VERSION=${LIBotcl_VERSION}
CONFIGURE_ENV= LIBotcl_VERSION=${LIBotcl_VERSION} \
NO_REGRESS= Yes

49
lang/otcl/patches/patch-configure
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.5 2007/10/24 14:58:16 steven Exp $
$OpenBSD: patch-configure,v 1.6 2011/01/05 18:49:20 sebastia Exp $
--- configure.orig Sun Feb 18 23:19:10 2007
+++ configure Sat Oct 13 15:48:01 2007
+++ configure Thu Dec 23 11:24:03 2010
@@ -4163,6 +4163,7 @@ TCL_H_PLACES=" \
/usr/local/lib/tcl$TCL_HI_VERS \
/usr/local/lib/tcl$TCL_ALT_VERS \
@ -9,6 +9,51 @@ $OpenBSD: patch-configure,v 1.5 2007/10/24 14:58:16 steven Exp $
/usr/local/include/tcl$TCL_HI_VERS \
/usr/local/include/tcl$TCL_ALT_VERS \
/usr/local/include \
@@ -4257,7 +4258,7 @@ else
echo "$as_me: error: $d is not a directory" >&2;}
{ (exit 1); exit 1; }; }
fi
- places="$TCL_H_PLACES_D"
+ places="$TCL_H_PLACES_D $TCL_H_PLACES"
fi
V_INCLUDE_TCL=""
@@ -4311,7 +4312,7 @@ else
echo "$as_me: error: $d is not a directory" >&2;}
{ (exit 1); exit 1; }; }
fi
- places="$TCL_H_PLACES_D"
+ places="$TCL_H_PLACES_D $TCL_H_PLACES"
fi
V_INCLUDE_TCL=""
@@ -4365,7 +4366,7 @@ else
echo "$as_me: error: $d is not a directory" >&2;}
{ (exit 1); exit 1; }; }
fi
- places="$TCL_LIB_PLACES_D"
+ places="$TCL_LIB_PLACES_D $TCL_LIB_PLACES"
fi
V_LIB_TCL=""
@@ -4824,7 +4825,7 @@ else
echo "$as_me: error: $d is not a directory" >&2;}
{ (exit 1); exit 1; }; }
fi
- places="$TK_H_PLACES_D"
+ places="$TK_H_PLACES_D $TK_H_PLACES"
fi
V_INCLUDE_TK=""
@@ -4878,7 +4879,7 @@ else
echo "$as_me: error: $d is not a directory" >&2;}
{ (exit 1); exit 1; }; }
fi
- places="$TK_LIB_PLACES_D"
+ places="$TK_LIB_PLACES_D $TK_LIB_PLACES"
fi
V_LIB_TK=""
@@ -5532,16 +5533,16 @@ case $system in
DL_LIBS="-ldl"
SHLD_FLAGS="-Wl,-Bexport"