head 1.6; access; symbols OPENPKG_2_STABLE_MP:1.2 OPENPKG_E1_MP_HEAD:1.2 OPENPKG_E1_MP:1.2 OPENPKG_E1_MP_2_STABLE:1.2 OPENPKG_E1_FP:1.2 OPENPKG_2_STABLE_20061018:1.2 OPENPKG_2_STABLE:1.2.0.14 OPENPKG_2_STABLE_BP:1.2 OPENPKG_2_5_SOLID:1.2.0.12 OPENPKG_2_5_SOLID_BP:1.2 OPENPKG_2_4_RELEASE:1.2 OPENPKG_2_4_SOLID:1.2.0.10 OPENPKG_2_4_SOLID_BP:1.2 OPENPKG_2_3_RELEASE:1.2 OPENPKG_2_3_SOLID:1.2.0.8 OPENPKG_2_3_SOLID_BP:1.2 OPENPKG_2_2_RELEASE:1.2 OPENPKG_2_2_SOLID:1.2.0.6 OPENPKG_2_2_SOLID_BP:1.2 OPENPKG_2_1_RELEASE:1.2 OPENPKG_2_1_SOLID:1.2.0.4 OPENPKG_2_1_SOLID_BP:1.2 OPENPKG_2_0_RELEASE:1.2 OPENPKG_2_0_SOLID:1.2.0.2 OPENPKG_2_0_SOLID_BP:1.2 OPENPKG_1_3_RELEASE:1.1.4.1 OPENPKG_1_3_SOLID:1.1.0.4 OPENPKG_1_STABLE:1.1.0.2; locks; strict; comment @# @; 1.6 date 2008.04.19.08.33.39; author rse; state Exp; branches; next 1.5; commitid iM2Oee5gqmbxdHZs; 1.5 date 2008.02.09.08.19.17; author rse; state Exp; branches; next 1.4; commitid lUKqxqrNtJX5oHQs; 1.4 date 2008.01.05.08.18.19; author rse; state Exp; branches; next 1.3; commitid Z6fPWnFwYDTvvcMs; 1.3 date 2007.12.22.09.20.07; author rse; state Exp; branches; next 1.2; commitid WRec5fgTwsiCipKs; 1.2 date 2003.12.11.10.31.21; author rse; state dead; branches; next 1.1; 1.1 date 2003.07.30.09.02.26; author mlelstv; state Exp; branches 1.1.2.1 1.1.4.1; next ; 1.1.2.1 date 2003.07.30.18.17.52; author rse; state Exp; branches; next ; 1.1.4.1 date 2003.07.30.18.20.08; author rse; state Exp; branches; next ; desc @@ 1.6 log @modifying package: expect-5.43.0 20080209 -> 20080419 @ text @Index: tcl8.4.19/unix/configure --- tcl8.4.19/unix/configure.orig 2007-09-21 19:07:02 +0200 +++ tcl8.4.19/unix/configure 2007-12-22 10:09:33 +0100 @@@@ -9150,7 +9150,7 @@@@ DBGX='${TCL_DBGX}' eval "TCL_LIB_FILE=${TCL_LIB_FILE}" -TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)' +TCL_LIBRARY='$(prefix)/lib/expect/tcl' PRIVATE_INCLUDE_DIR='$(includedir)' HTML_DIR='$(DISTDIR)/html' @ 1.5 log @modifying package: expect-5.43.0 20080105 -> 20080209 @ text @d1 3 a3 3 Index: tcl8.4.18/unix/configure --- tcl8.4.18/unix/configure.orig 2007-09-21 19:07:02 +0200 +++ tcl8.4.18/unix/configure 2007-12-22 10:09:33 +0100 @ 1.4 log @modifying package: expect-5.43.0 20080101 -> 20080105 @ text @d1 3 a3 3 Index: tcl8.4.17/unix/configure --- tcl8.4.17/unix/configure.orig 2007-09-21 19:07:02 +0200 +++ tcl8.4.17/unix/configure 2007-12-22 10:09:33 +0100 @ 1.3 log @unbreak under Tcl 8.5 world order and at the same time finally get rid of the link-time vs. run-time issue; also fix name of manual page @ text @d1 3 a3 3 Index: tcl8.4.16/unix/configure --- tcl8.4.16/unix/configure.orig 2007-09-21 19:07:02 +0200 +++ tcl8.4.16/unix/configure 2007-12-22 10:09:33 +0100 @ 1.2 log @modifying package: expect-5.39.0 20030911 -> 20031211 @ text @d1 6 a6 5 --- tcl8.4.4/unix/Makefile.in.dist 2003-07-22 10:32:06.000000000 +0200 +++ tcl8.4.4/unix/Makefile.in 2003-07-22 10:33:10.000000000 +0200 @@@@ -1343,12 +1343,15 @@@@ # TOOL_DIR. # d8 4 a11 14 -html-tcl: EXTRA_HTML_ARGS=--tcl -html-tk: EXTRA_HTML_ARGS=--tk - -html html-tcl html-tk: +html: + $(TCL_EXE) $(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(DISTDIR)/html \ + --srcdir=$(TOP_DIR)/.. +html-tcl: + $(TCL_EXE) $(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(DISTDIR)/html \ + --srcdir=$(TOP_DIR)/.. --tcl +html-tk: $(TCL_EXE) $(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(DISTDIR)/html \ - --srcdir=$(TOP_DIR)/.. $(EXTRA_HTML_ARGS) + --srcdir=$(TOP_DIR)/.. --tk a12 2 # # Target to create a Macintosh version of the distribution. This will @ 1.1 log @pull in tcl-patch: fix Makefile to be compatible with standard make @ text @@ 1.1.4.1 log @MFS: changes since last merge @ text @@ 1.1.2.1 log @MFC: changes since last merge @ text @@