On 09/26/14 10:46, Stuart Cassoff wrote:
> On 09/16/14 21:48, Stuart Cassoff wrote:
>> On 07/11/14 06:22, Stuart Henderson wrote:
>>> On 2014/07/10 23:44, Stuart Cassoff wrote:
>>>> eh? meh?
>>>
>>> You need a subst variable with the actual path not just the version
>>> number, otherwise you're still going to be hand modifying PLISTs all
>>> over the place.
>>>
>>> So something like:
>>>
>>> MODTCL_MINVERSION?= 8.5
>>> MODTCL_MODPATH= lib/tcl/${MODTCL_MINVERSION}
>>> SUBST_VARS+= MODTCL_MODPATH MODTCL_VERSION MODTCL_BIN
>>>
>>> It would help clarify things to show a diff with a port that has
>>> been modified to use this method, too.
>>>
>>
>> Here are diffs for everything concerned.
>> Added missing modtcl vars and did a bit of rearranging in port-modules.5.
>> Described MODTCL_MINVERSION and MODTCL_MODPATH.
>> Removed the rest package from tcllib; it needs tDOM which we don't currently
>> have.
>> Saves installing 51 directories and 51 pkgIndex.tcl files.
>>
>
> Another way to do this would be to change the Tcl module
> dirs to be like modules/85 instead of modules/8.5, then
> the MODTCL_MODPATH stuff wouldn't be needed.
>
Here are the diffs for doint it this way. Simpler.
Also simplified the existing layout Tcl itself:
removes a couple of dirs, shortens module path.
Also a fix for TkCon.
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/tcl/8.5/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile 22 Sep 2014 16:54:11 -0000 1.32
+++ Makefile 12 Oct 2014 16:43:55 -0000
@@ -4,6 +4,7 @@ COMMENT = Tool Command Language
DISTNAME = tcl8.5.16
PKGNAME = tcl-8.5.16
+REVISION = 0
SHARED_LIBS = tcl85 1.6
CATEGORIES = lang lang/tcl
HOMEPAGE = http://www.tcl.tk/
Index: patches/patch-library_tm_tcl
===================================================================
RCS file: /cvs/ports/lang/tcl/8.5/patches/patch-library_tm_tcl,v
retrieving revision 1.3
diff -u -p -r1.3 patch-library_tm_tcl
--- patches/patch-library_tm_tcl 20 Sep 2013 10:09:08 -0000 1.3
+++ patches/patch-library_tm_tcl 12 Oct 2014 16:43:55 -0000
@@ -11,8 +11,8 @@ $OpenBSD: patch-library_tm_tcl,v 1.3 201
- ]
+
+ # OpenBSD layout
-+ add [file join [info library] modules [info tclversion]] \
-+ [file join [file dirname [info library]] modules [info tclversion]]
++ add [file join [info library] modules] \
++ [file join [lindex $::tcl_pkgPath 0] modules 85]
if {$tcl_platform(platform) eq "windows"} {
set sep ";"
Index: patches/patch-unix_Makefile_in
===================================================================
RCS file: /cvs/ports/lang/tcl/8.5/patches/patch-unix_Makefile_in,v
retrieving revision 1.13
diff -u -p -r1.13 patch-unix_Makefile_in
--- patches/patch-unix_Makefile_in 22 Sep 2014 16:54:11 -0000 1.13
+++ patches/patch-unix_Makefile_in 12 Oct 2014 16:43:55 -0000
@@ -34,7 +34,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.13
fi; \
done;
- @for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.4
../tcl8/8.4/platform ../tcl8/8.5; \
-+ @for i in opt0.4 http1.0 encoding modules modules/8.5
modules/8.5/platform ../modules/8.5; \
++ @for i in opt0.4 http1.0 encoding modules modules/platform
../modules/85; \
do \
if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
@@ -43,7 +43,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.13
done;
@echo "Installing package http 2.7.13 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl
"$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.13.tm;
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl
"$(SCRIPT_INSTALL_DIR)"/modules/8.5/http-2.7.13.tm;
++ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl
"$(SCRIPT_INSTALL_DIR)"/modules/http-2.7.13.tm;
@echo "Installing package opt0.4 files to
$(SCRIPT_INSTALL_DIR)/opt0.4/";
@for i in $(TOP_DIR)/library/opt/*.tcl ; \
do \
@@ -51,17 +51,17 @@ $OpenBSD: patch-unix_Makefile_in,v 1.13
done;
@echo "Installing package msgcat 1.5.2 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl
"$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.5.2.tm;
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl
"$(SCRIPT_INSTALL_DIR)"/modules/8.5/msgcat-1.5.2.tm;
++ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl
"$(SCRIPT_INSTALL_DIR)"/modules/msgcat-1.5.2.tm;
@echo "Installing package tcltest 2.3.8 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl
"$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.8.tm;
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl
"$(SCRIPT_INSTALL_DIR)"/modules/8.5/tcltest-2.3.8.tm;
++ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl
"$(SCRIPT_INSTALL_DIR)"/modules/tcltest-2.3.8.tm;
@echo "Installing package platform 1.0.13 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl
"$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.13.tm;
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl
"$(SCRIPT_INSTALL_DIR)"/modules/8.5/platform-1.0.13.tm;
++ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl
"$(SCRIPT_INSTALL_DIR)"/modules/platform-1.0.13.tm;
@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl
"$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.4.tm;
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl
"$(SCRIPT_INSTALL_DIR)"/modules/8.5/platform/shell-1.1.4.tm;
++ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl
"$(SCRIPT_INSTALL_DIR)"/modules/platform/shell-1.1.4.tm;
@echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
@for i in $(TOP_DIR)/library/encoding/*.enc ; do \
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/tcl/8.5/pkg/PLIST,v
retrieving revision 1.16
diff -u -p -r1.16 PLIST
--- pkg/PLIST 22 Sep 2014 16:54:11 -0000 1.16
+++ pkg/PLIST 12 Oct 2014 16:43:56 -0000
@@ -20,7 +20,7 @@ lib/libtclstub85.a
lib/pkgconfig/tcl85.pc
lib/tcl/
lib/tcl/modules/
-lib/tcl/modules/8.5/
+lib/tcl/modules/85/
lib/tcl/tcl8.5/
lib/tcl/tcl8.5/auto.tcl
lib/tcl/tcl8.5/clock.tcl
@@ -808,13 +808,12 @@ lib/tcl/tcl8.5/man/mann/
@man lib/tcl/tcl8.5/man/mann/vwait.n
@man lib/tcl/tcl8.5/man/mann/while.n
lib/tcl/tcl8.5/modules/
-lib/tcl/tcl8.5/modules/8.5/
-lib/tcl/tcl8.5/modules/8.5/http-2.7.13.tm
-lib/tcl/tcl8.5/modules/8.5/msgcat-1.5.2.tm
-lib/tcl/tcl8.5/modules/8.5/platform/
-lib/tcl/tcl8.5/modules/8.5/platform-1.0.13.tm
-lib/tcl/tcl8.5/modules/8.5/platform/shell-1.1.4.tm
-lib/tcl/tcl8.5/modules/8.5/tcltest-2.3.8.tm
+lib/tcl/tcl8.5/modules/http-2.7.13.tm
+lib/tcl/tcl8.5/modules/msgcat-1.5.2.tm
+lib/tcl/tcl8.5/modules/platform/
+lib/tcl/tcl8.5/modules/platform-1.0.13.tm
+lib/tcl/tcl8.5/modules/platform/shell-1.1.4.tm
+lib/tcl/tcl8.5/modules/tcltest-2.3.8.tm
lib/tcl/tcl8.5/msgs/
lib/tcl/tcl8.5/msgs/af.msg
lib/tcl/tcl8.5/msgs/af_za.msg
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/tcl/8.6/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile 7 Sep 2014 18:49:13 -0000 1.11
+++ Makefile 12 Oct 2014 16:44:05 -0000
@@ -4,6 +4,7 @@ COMMENT = Tool Command Language
DISTNAME = tcl8.6.2
PKGNAME = tcl-8.6.2
+REVISION = 0
SHARED_LIBS = tcl86 1.1
CATEGORIES = lang lang/tcl
HOMEPAGE = http://www.tcl.tk/
Index: patches/patch-library_tm_tcl
===================================================================
RCS file: /cvs/ports/lang/tcl/8.6/patches/patch-library_tm_tcl,v
retrieving revision 1.2
diff -u -p -r1.2 patch-library_tm_tcl
--- patches/patch-library_tm_tcl 22 Sep 2013 10:33:13 -0000 1.2
+++ patches/patch-library_tm_tcl 12 Oct 2014 16:44:05 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-library_tm_tcl,v 1.2 2013/09/22 10:33:13 stu Exp $
---- library/tm.tcl.orig Tue Sep 17 08:14:11 2013
-+++ library/tm.tcl Tue Sep 17 20:54:45 2013
-@@ -316,10 +316,13 @@ proc ::tcl::tm::Defaults {} {
+--- library/tm.tcl.orig Mon Jul 28 10:43:55 2014
++++ library/tm.tcl Sat Oct 11 14:16:12 2014
+@@ -316,10 +316,11 @@ proc ::tcl::tm::Defaults {} {
# Note that we're using [::list], not [list] because [list] means
# something other than [::list] in this namespace.
@@ -11,11 +11,9 @@ $OpenBSD: patch-library_tm_tcl,v 1.2 201
- ]
+
+ # OpenBSD layout
-+ foreach dir [::list [info library] [file dirname [info library]]] {
-+ foreach ver [::list [info tclversion] 8.5] {
-+ add [file join $dir modules $ver]
-+ }
-+ }
++ add [file join [info library] modules] \
++ [file join [lindex $::tcl_pkgPath 0] modules 86] \
++ [file join [lindex $::tcl_pkgPath 0] modules 85]
if {$tcl_platform(platform) eq "windows"} {
set sep ";"
Index: patches/patch-unix_Makefile_in
===================================================================
RCS file: /cvs/ports/lang/tcl/8.6/patches/patch-unix_Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-unix_Makefile_in
--- patches/patch-unix_Makefile_in 7 Sep 2014 18:49:13 -0000 1.3
+++ patches/patch-unix_Makefile_in 12 Oct 2014 16:44:05 -0000
@@ -34,7 +34,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.3 2
fi; \
done;
- @for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.4
../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6; \
-+ @for i in opt0.4 http1.0 encoding modules/8.5/platform modules/8.6
../modules/8.5 ../modules/8.6; \
++ @for i in opt0.4 http1.0 encoding modules modules/platform
../modules/85 ../modules/86; \
do \
if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
@@ -43,7 +43,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.3 2
done;
@echo "Installing package http 2.8.8 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl
"$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.8.tm;
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl
"$(SCRIPT_INSTALL_DIR)"/modules/8.6/http-2.8.8.tm;
++ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl
"$(SCRIPT_INSTALL_DIR)"/modules/http-2.8.8.tm;
@echo "Installing package opt0.4 files to
$(SCRIPT_INSTALL_DIR)/opt0.4/";
@for i in $(TOP_DIR)/library/opt/*.tcl ; \
do \
@@ -51,17 +51,17 @@ $OpenBSD: patch-unix_Makefile_in,v 1.3 2
done;
@echo "Installing package msgcat 1.5.2 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl
"$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.5.2.tm;
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl
"$(SCRIPT_INSTALL_DIR)"/modules/8.5/msgcat-1.5.2.tm;
++ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl
"$(SCRIPT_INSTALL_DIR)"/modules/msgcat-1.5.2.tm;
@echo "Installing package tcltest 2.3.8 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl
"$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.8.tm;
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl
"$(SCRIPT_INSTALL_DIR)"/modules/8.5/tcltest-2.3.8.tm;
++ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl
"$(SCRIPT_INSTALL_DIR)"/modules/tcltest-2.3.8.tm;
@echo "Installing package platform 1.0.13 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl
"$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.13.tm;
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl
"$(SCRIPT_INSTALL_DIR)"/modules/8.5/platform-1.0.13.tm;
++ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl
"$(SCRIPT_INSTALL_DIR)"/modules/platform-1.0.13.tm;
@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl
"$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.4.tm;
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl
"$(SCRIPT_INSTALL_DIR)"/modules/8.5/platform/shell-1.1.4.tm;
++ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl
"$(SCRIPT_INSTALL_DIR)"/modules/platform/shell-1.1.4.tm;
@echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
@for i in $(TOP_DIR)/library/encoding/*.enc ; do \
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/tcl/8.6/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 7 Sep 2014 18:49:13 -0000 1.5
+++ pkg/PLIST 12 Oct 2014 16:44:06 -0000
@@ -24,8 +24,8 @@ lib/libtclstub86.a
lib/pkgconfig/tcl86.pc
lib/tcl/
lib/tcl/modules/
-lib/tcl/modules/8.5/
-lib/tcl/modules/8.6/
+lib/tcl/modules/85/
+lib/tcl/modules/86/
lib/tcl/tcl8.6/
lib/tcl/tcl8.6/auto.tcl
lib/tcl/tcl8.6/clock.tcl
@@ -927,14 +927,12 @@ lib/tcl/tcl8.6/man/mann/
@man lib/tcl/tcl8.6/man/mann/yieldto.n
@man lib/tcl/tcl8.6/man/mann/zlib.n
lib/tcl/tcl8.6/modules/
-lib/tcl/tcl8.6/modules/8.5/
-lib/tcl/tcl8.6/modules/8.5/msgcat-1.5.2.tm
-lib/tcl/tcl8.6/modules/8.5/platform/
-lib/tcl/tcl8.6/modules/8.5/platform-1.0.13.tm
-lib/tcl/tcl8.6/modules/8.5/platform/shell-1.1.4.tm
-lib/tcl/tcl8.6/modules/8.5/tcltest-2.3.8.tm
-lib/tcl/tcl8.6/modules/8.6/
-lib/tcl/tcl8.6/modules/8.6/http-2.8.8.tm
+lib/tcl/tcl8.6/modules/http-2.8.8.tm
+lib/tcl/tcl8.6/modules/msgcat-1.5.2.tm
+lib/tcl/tcl8.6/modules/platform/
+lib/tcl/tcl8.6/modules/platform-1.0.13.tm
+lib/tcl/tcl8.6/modules/platform/shell-1.1.4.tm
+lib/tcl/tcl8.6/modules/tcltest-2.3.8.tm
lib/tcl/tcl8.6/msgs/
lib/tcl/tcl8.6/msgs/af.msg
lib/tcl/tcl8.6/msgs/af_za.msg
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/tcllib/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile 1 Sep 2014 03:15:22 -0000 1.22
+++ Makefile 12 Oct 2014 16:43:24 -0000
@@ -3,6 +3,7 @@
COMMENT = Tcl Standard Library
DISTNAME = tcllib-1.16pl0
+REVISION = 0
CATEGORIES = devel lang/tcl
HOMEPAGE = http://sourceforge.net/projects/tcllib/
MAINTAINER = Stuart Cassoff <s...@users.sourceforge.net>
@@ -27,6 +28,7 @@ do-install:
-nroff-path ${PREFIX}/man/mann \
-example-path ${PREFIX}/share/examples/tcllib \
-app-path ${PREFIX}/share/examples/tcllib/apps \
+ -mp ${DESTDIR}${MODTCL_MODDIR}/85 \
-csb ${PREFIX}/share/doc \
-tclsh ${MODTCL_BIN} \
-descr "`cat ${PKGDIR}/DESCR`"
Index: patches/patch-installer_tcl
===================================================================
RCS file: /cvs/ports/devel/tcllib/patches/patch-installer_tcl,v
retrieving revision 1.5
diff -u -p -r1.5 patch-installer_tcl
--- patches/patch-installer_tcl 10 Sep 2014 23:09:31 -0000 1.5
+++ patches/patch-installer_tcl 12 Oct 2014 16:43:24 -0000
@@ -3,8 +3,8 @@ $OpenBSD: patch-installer_tcl,v 1.5 2014
Install everything nicely.
Generate tcllib.n.
---- installer.tcl.orig Thu Nov 7 16:13:19 2013
-+++ installer.tcl Fri Nov 8 15:46:54 2013
+--- installer.tcl.orig Fri Aug 29 18:30:12 2014
++++ installer.tcl Tue Sep 16 19:52:47 2014
@@ -84,16 +84,24 @@ if {![package vsatisfies [package provide Tcl] 8.0]} {
proc xcopyfile {src dest} {
@@ -46,7 +46,7 @@ Generate tcllib.n.
return
}
-@@ -209,12 +217,16 @@ proc ainstall {} {
+@@ -209,18 +217,23 @@ proc ainstall {} {
set aexe [file join $distribution apps $a]
set adst [file join $config(app,path) ${a}$ext]
@@ -68,7 +68,22 @@ Generate tcllib.n.
}
return
}
-@@ -236,20 +248,21 @@ proc doinstall {} {
+
+ proc doinstall {} {
+ global config package_version distribution package_name modules excluded
++ global pkgs
+
+ if {!$config(no-exclude)} {
+ foreach p $excluded {
+@@ -230,26 +243,29 @@ proc doinstall {} {
+ }
+ }
+
++ array set pkgs [exec [info nameofexecutable] [file join $distribution
sak.tcl] provided]
++
+ if {$config(doc,nroff)} {
+ set config(man.macros) [string trim [get_input \
+ [file join $distribution support installation man.macros]]]
}
if {$config(pkg)} {
xinstall pkg $config(pkg,path)
@@ -93,18 +108,18 @@ Generate tcllib.n.
log ""
return
}
-@@ -511,6 +524,10 @@ proc processargs {} {
+@@ -511,6 +527,10 @@ proc processargs {} {
set config(exa,path) [lindex $argv 1]
set argv [lrange $argv 1 end]
}
-+ -csb - -tclsh - -descr {
++ -csb - -descr - -mp - -tclsh {
+ set config([string range [lindex $argv 0] 1 end]) [lindex $argv
1]
+ set argv [lrange $argv 1 end]
+ }
-help -
default {
puts stderr "usage: $argv0 ?-dry-run/-simulate? ?-no-wait?
?-no-gui? ?-html|-no-html? ?-nroff|-no-nroff? ?-examples|-no-examples?
?-pkgs|-no-pkgs? ?-pkg-path path? ?-apps|-no-apps? ?-app-path path?
?-nroff-path path? ?-html-path path? ?-example-path path?"
-@@ -566,6 +583,40 @@ proc wait {} {
+@@ -566,6 +586,40 @@ proc wait {} {
exit 0
}
return
Index: patches/patch-support_installation_actions_tcl
===================================================================
RCS file:
/cvs/ports/devel/tcllib/patches/patch-support_installation_actions_tcl,v
retrieving revision 1.5
diff -u -p -r1.5 patch-support_installation_actions_tcl
--- patches/patch-support_installation_actions_tcl 10 Sep 2014 23:09:31
-0000 1.5
+++ patches/patch-support_installation_actions_tcl 12 Oct 2014 16:43:24
-0000
@@ -3,9 +3,9 @@ $OpenBSD: patch-support_installation_act
Retrieve module info from man pages.
Perform shebang adjustments.
---- support/installation/actions.tcl.orig Sun Aug 17 11:21:16 2014
-+++ support/installation/actions.tcl Sun Aug 17 17:43:03 2014
-@@ -90,23 +90,105 @@ proc _trt {module libdir} {
+--- support/installation/actions.tcl.orig Fri Aug 29 18:30:12 2014
++++ support/installation/actions.tcl Tue Sep 16 19:54:45 2014
+@@ -90,23 +90,113 @@ proc _trt {module libdir} {
return
}
@@ -50,7 +50,14 @@ Perform shebang adjustments.
- [file join $distribution examples $actual] \
- [file join $exadir $module] \
- 1
-- return
++proc _tcm {module libdir} {
++ global distribution config pkgs
++ file mkdir $config(mp)
++ xcopyfile [file join $distribution modules $module $module.tcl] \
++ [file join $config(mp) $module-$pkgs($module).tm]
+ return
++}
++
+proc _exafile {fn dfn tclsh} {
+ set f [open $fn]
+ set d [read $f 2]
Index: patches/patch-support_installation_modules_tcl
===================================================================
RCS file:
/cvs/ports/devel/tcllib/patches/patch-support_installation_modules_tcl,v
retrieving revision 1.5
diff -u -p -r1.5 patch-support_installation_modules_tcl
--- patches/patch-support_installation_modules_tcl 14 Nov 2013 09:21:18
-0000 1.5
+++ patches/patch-support_installation_modules_tcl 12 Oct 2014 16:43:25
-0000
@@ -1,44 +1,169 @@
$OpenBSD: patch-support_installation_modules_tcl,v 1.5 2013/11/14 09:21:18 stu
Exp $
---- support/installation/modules.tcl.orig Wed Nov 6 04:44:56 2013
-+++ support/installation/modules.tcl Wed Nov 6 04:45:00 2013
-@@ -40,7 +40,7 @@ Module asn _tcl _man _null
+--- support/installation/modules.tcl.orig Fri Aug 29 18:30:12 2014
++++ support/installation/modules.tcl Tue Sep 16 21:18:57 2014
+@@ -32,28 +32,29 @@ array set guide {}
+
+ Exclude calendar
+ Exclude exif
++Exclude rest ;# Needs tDOM
+
+ # name pkg doc example
+-Module aes _tcl _man _null
++Module aes _tcm _man _null
+ Module amazon-s3 _tcl _man _null
+-Module asn _tcl _man _null
++Module asn _tcm _man _null
Module base32 _tcl _man _null
Module base64 _tcl _man _null
- Module bee _tcl _man _null
+-Module bee _tcl _man _null
-Module bench _tcl _null _null
+-Module bibtex _tcl _man _exa
+-Module blowfish _tcl _man _null
++Module bee _tcm _man _null
+Module bench _tcl _man _null
- Module bibtex _tcl _man _exa
- Module blowfish _tcl _man _null
++Module bibtex _tcm _man _exa
++Module blowfish _tcm _man _null
Module cache _tcl _man _null
-@@ -49,11 +49,11 @@ Module clock _tcl _man _null
- Module cmdline _tcl _man _null
- Module comm _tcl _man _null
+ Module calendar _tci _man _null
+ Module clock _tcl _man _null
+-Module cmdline _tcl _man _null
+-Module comm _tcl _man _null
++Module cmdline _tcm _man _null
++Module comm _tcm _man _null
Module control _tci _man _null
-Module coroutine _tcl _null _null
+-Module counter _tcl _man _null
+Module coroutine _tcl _man _null
- Module counter _tcl _man _null
++Module counter _tcm _man _null
Module crc _tcl _man _null
- Module csv _tcl _man _exa
+-Module csv _tcl _man _exa
-Module debug _tcl _null _null
++Module csv _tcm _man _exa
+Module debug _tcl _man _null
Module des _tcl _man _null
Module dns _msg _man _exa
Module docstrip _tcl _man _null
-@@ -68,7 +68,7 @@ Module ftp _tcl _man _exa
- Module ftpd _tcl _man _exa
+@@ -61,90 +62,90 @@ Module doctools _doc _man _exa
+ Module doctools2base _tcl _man _null
+ Module doctools2idx _tcl _man _null
+ Module doctools2toc _tcl _man _null
+-Module dtplite _tcl _man _null
++Module dtplite _tcm _man _null
+ Module exif _tcl _man _null
+ Module fileutil _tcl _man _null
+ Module ftp _tcl _man _exa
+-Module ftpd _tcl _man _exa
++Module ftpd _tcm _man _exa
Module fumagic _tcl _man _null
Module generator _tcl _man _null
-Module gpx _tcl _null _null
-+Module gpx _tcl _man _null
++Module gpx _tcm _man _null
Module grammar_aycock _tcl _man _null
Module grammar_fa _tcl _man _null
Module grammar_me _tcl _man _null
-@@ -140,7 +140,7 @@ Module uev _tcl _man _null
- Module units _tcl _man _null
+ Module grammar_peg _tcl _man _null
+-Module hook _tcl _man _null
+-Module html _tcl _man _null
+-Module htmlparse _tcl _man _exa
++Module hook _tcm _man _null
++Module html _tcm _man _null
++Module htmlparse _tcm _man _exa
+ Module http _tcl _man _null
+-Module ident _tcl _man _null
+-Module imap4 _tcl _man _null
++Module ident _tcm _man _null
++Module imap4 _tcm _man _null
+ Module inifile _tcl _man _null
+ Module interp _tcl _man _null
+ Module irc _tcl _man _exa
+-Module javascript _tcl _man _null
+-Module jpeg _tcl _man _null
++Module javascript _tcm _man _null
++Module jpeg _tcm _man _null
+ Module json _tcl _man _null
+-Module lambda _tcl _man _null
++Module lambda _tcm _man _null
+ Module ldap _tcl _man _exa
+ Module log _msg _man {_exax logger}
+ Module map _tcl _man _null
+-Module mapproj _tcl _man _exa
++Module mapproj _tcm _man _exa
+ Module math _tci _man _exa
+ Module md4 _tcl _man _null
+ Module md5 _tcl _man _null
+ Module md5crypt _tcl _man _null
+ Module mime _tcl _man _exa
+-Module multiplexer _tcl _man _null
+-Module namespacex _tcl _man _null
+-Module ncgi _tcl _man _null
+-Module nmea _tcl _man _null
++Module multiplexer _tcm _man _null
++Module namespacex _tcm _man _null
++Module ncgi _tcm _man _null
++Module nmea _tcm _man _null
+ Module nns _tcl _man _null
+-Module nntp _tcl _man _exa
++Module nntp _tcm _man _exa
+ Module ntp _tcl _man _exa
+ Module ooutil _tcl _man _null
+-Module otp _tcl _man _null
++Module otp _tcm _man _null
+ Module page _trt _man _null
+-Module pki _tcl _man _null
+-Module pluginmgr _tcl _man _null
+-Module png _tcl _man _null
+-Module pop3 _tcl _man _null
++Module pki _tcm _man _null
++Module pluginmgr _tcm _man _null
++Module png _tcm _man _null
++Module pop3 _tcm _man _null
+ Module pop3d _tcl _man _null
+-Module profiler _tcl _man _null
++Module profiler _tcm _man _null
+ Module pt _rde _man _null
+ Module rc4 _tcl _man _null
+-Module rcs _tcl _man _null
+-Module report _tcl _man _null
++Module rcs _tcm _man _null
++Module report _tcm _man _null
+ Module rest _tcl _man _null
+ Module ripemd _tcl _man _null
+ Module sasl _tcl _man _exa
+ Module sha1 _tcl _man _null
+ Module simulation _tcl _man _null
+-Module smtpd _tcl _man _exa
++Module smtpd _tcm _man _exa
+ Module snit _tcl _man _null
+-Module soundex _tcl _man _null
++Module soundex _tcm _man _null
+ Module stooop _tcl _man _null
+ Module string _tcl _man _null
+ Module stringprep _tcl _man _null
+ Module struct _tcl _man _exa
+-Module tar _tcl _man _null
++Module tar _tcm _man _null
+ Module tepam _tcl _man _exa
+ Module term _tcr _man _exa
+ Module textutil _tex _man _null
+ Module tie _tcl _man _exa
+-Module tiff _tcl _man _null
++Module tiff _tcm _man _null
+ Module transfer _tcl _man _null
+ Module treeql _tcl _man _null
+ Module try _tcl _man _null
+ Module uev _tcl _man _null
+-Module units _tcl _man _null
++Module units _tcm _man _null
Module uri _tcl _man _null
- Module uuid _tcl _man _null
+-Module uuid _tcl _man _null
-Module valtype _tcl _null _null
++Module uuid _tcm _man _null
+Module valtype _tcl _man _null
Module virtchannel_base _tcl _man _null
Module virtchannel_core _tcl _man _null
Module virtchannel_transform _tcl _man _null
+-Module websocket _tcl _man _null
++Module websocket _tcm _man _null
+ Module wip _tcl _man _null
+ Module yaml _tcl _man _null
+ Module zip _tcl _null _null
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/tcllib/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST
--- pkg/PLIST 1 Sep 2014 03:15:22 -0000 1.13
+++ pkg/PLIST 12 Oct 2014 16:43:25 -0000
@@ -1,15 +1,9 @@
@comment $OpenBSD: PLIST,v 1.13 2014/09/01 03:15:22 stu Exp $
bin/dtplite
-lib/tcl/aes/
-lib/tcl/aes/aes.tcl
-lib/tcl/aes/pkgIndex.tcl
lib/tcl/amazon-s3/
lib/tcl/amazon-s3/S3.tcl
lib/tcl/amazon-s3/pkgIndex.tcl
lib/tcl/amazon-s3/xsxp.tcl
-lib/tcl/asn/
-lib/tcl/asn/asn.tcl
-lib/tcl/asn/pkgIndex.tcl
lib/tcl/base32/
lib/tcl/base32/base32.tcl
lib/tcl/base32/base32_c.tcl
@@ -26,9 +20,6 @@ lib/tcl/base64/base64c.tcl
lib/tcl/base64/pkgIndex.tcl
lib/tcl/base64/uuencode.tcl
lib/tcl/base64/yencode.tcl
-lib/tcl/bee/
-lib/tcl/bee/bee.tcl
-lib/tcl/bee/pkgIndex.tcl
lib/tcl/bench/
lib/tcl/bench/bench.tcl
lib/tcl/bench/bench_read.tcl
@@ -36,12 +27,6 @@ lib/tcl/bench/bench_wcsv.tcl
lib/tcl/bench/bench_wtext.tcl
lib/tcl/bench/libbench.tcl
lib/tcl/bench/pkgIndex.tcl
-lib/tcl/bibtex/
-lib/tcl/bibtex/bibtex.tcl
-lib/tcl/bibtex/pkgIndex.tcl
-lib/tcl/blowfish/
-lib/tcl/blowfish/blowfish.tcl
-lib/tcl/blowfish/pkgIndex.tcl
lib/tcl/cache/
lib/tcl/cache/async.tcl
lib/tcl/cache/pkgIndex.tcl
@@ -49,12 +34,6 @@ lib/tcl/clock/
lib/tcl/clock/iso8601.tcl
lib/tcl/clock/pkgIndex.tcl
lib/tcl/clock/rfc2822.tcl
-lib/tcl/cmdline/
-lib/tcl/cmdline/cmdline.tcl
-lib/tcl/cmdline/pkgIndex.tcl
-lib/tcl/comm/
-lib/tcl/comm/comm.tcl
-lib/tcl/comm/pkgIndex.tcl
lib/tcl/control/
lib/tcl/control/ascaller.tcl
lib/tcl/control/assert.tcl
@@ -67,9 +46,6 @@ lib/tcl/coroutine/
lib/tcl/coroutine/coro_auto.tcl
lib/tcl/coroutine/coroutine.tcl
lib/tcl/coroutine/pkgIndex.tcl
-lib/tcl/counter/
-lib/tcl/counter/counter.tcl
-lib/tcl/counter/pkgIndex.tcl
lib/tcl/crc/
lib/tcl/crc/cksum.tcl
lib/tcl/crc/crc16.tcl
@@ -77,9 +53,6 @@ lib/tcl/crc/crc32.tcl
lib/tcl/crc/crcc.tcl
lib/tcl/crc/pkgIndex.tcl
lib/tcl/crc/sum.tcl
-lib/tcl/csv/
-lib/tcl/csv/csv.tcl
-lib/tcl/csv/pkgIndex.tcl
lib/tcl/debug/
lib/tcl/debug/caller.tcl
lib/tcl/debug/debug.tcl
@@ -199,9 +172,6 @@ lib/tcl/doctools2toc/msgcat_fr.tcl
lib/tcl/doctools2toc/parse.tcl
lib/tcl/doctools2toc/pkgIndex.tcl
lib/tcl/doctools2toc/structure.tcl
-lib/tcl/dtplite/
-lib/tcl/dtplite/dtplite.tcl
-lib/tcl/dtplite/pkgIndex.tcl
lib/tcl/fileutil/
lib/tcl/fileutil/decode.tcl
lib/tcl/fileutil/fileutil.tcl
@@ -213,9 +183,6 @@ lib/tcl/ftp/
lib/tcl/ftp/ftp.tcl
lib/tcl/ftp/ftp_geturl.tcl
lib/tcl/ftp/pkgIndex.tcl
-lib/tcl/ftpd/
-lib/tcl/ftpd/ftpd.tcl
-lib/tcl/ftpd/pkgIndex.tcl
lib/tcl/fumagic/
lib/tcl/fumagic/cfront.tcl
lib/tcl/fumagic/cgen.tcl
@@ -226,9 +193,6 @@ lib/tcl/fumagic/rtcore.tcl
lib/tcl/generator/
lib/tcl/generator/generator.tcl
lib/tcl/generator/pkgIndex.tcl
-lib/tcl/gpx/
-lib/tcl/gpx/gpx.tcl
-lib/tcl/gpx/pkgIndex.tcl
lib/tcl/grammar_aycock/
lib/tcl/grammar_aycock/aycock-build.tcl
lib/tcl/grammar_aycock/aycock-debug.tcl
@@ -251,24 +215,9 @@ lib/tcl/grammar_peg/
lib/tcl/grammar_peg/peg.tcl
lib/tcl/grammar_peg/peg_interp.tcl
lib/tcl/grammar_peg/pkgIndex.tcl
-lib/tcl/hook/
-lib/tcl/hook/hook.tcl
-lib/tcl/hook/pkgIndex.tcl
-lib/tcl/html/
-lib/tcl/html/html.tcl
-lib/tcl/html/pkgIndex.tcl
-lib/tcl/htmlparse/
-lib/tcl/htmlparse/htmlparse.tcl
-lib/tcl/htmlparse/pkgIndex.tcl
lib/tcl/http/
lib/tcl/http/autoproxy.tcl
lib/tcl/http/pkgIndex.tcl
-lib/tcl/ident/
-lib/tcl/ident/ident.tcl
-lib/tcl/ident/pkgIndex.tcl
-lib/tcl/imap4/
-lib/tcl/imap4/imap4.tcl
-lib/tcl/imap4/pkgIndex.tcl
lib/tcl/inifile/
lib/tcl/inifile/ini.tcl
lib/tcl/inifile/pkgIndex.tcl
@@ -281,21 +230,12 @@ lib/tcl/irc/
lib/tcl/irc/irc.tcl
lib/tcl/irc/picoirc.tcl
lib/tcl/irc/pkgIndex.tcl
-lib/tcl/javascript/
-lib/tcl/javascript/javascript.tcl
-lib/tcl/javascript/pkgIndex.tcl
-lib/tcl/jpeg/
-lib/tcl/jpeg/jpeg.tcl
-lib/tcl/jpeg/pkgIndex.tcl
lib/tcl/json/
lib/tcl/json/json.tcl
lib/tcl/json/json_tcl.tcl
lib/tcl/json/json_write.tcl
lib/tcl/json/jsonc.tcl
lib/tcl/json/pkgIndex.tcl
-lib/tcl/lambda/
-lib/tcl/lambda/lambda.tcl
-lib/tcl/lambda/pkgIndex.tcl
lib/tcl/ldap/
lib/tcl/ldap/ldap.tcl
lib/tcl/ldap/ldapx.tcl
@@ -314,9 +254,6 @@ lib/tcl/map/map_slippy.tcl
lib/tcl/map/map_slippy_cache.tcl
lib/tcl/map/map_slippy_fetcher.tcl
lib/tcl/map/pkgIndex.tcl
-lib/tcl/mapproj/
-lib/tcl/mapproj/mapproj.tcl
-lib/tcl/mapproj/pkgIndex.tcl
lib/tcl/math/
lib/tcl/math/bessel.tcl
lib/tcl/math/bigfloat.tcl
@@ -372,36 +309,59 @@ lib/tcl/mime/
lib/tcl/mime/mime.tcl
lib/tcl/mime/pkgIndex.tcl
lib/tcl/mime/smtp.tcl
-lib/tcl/multiplexer/
-lib/tcl/multiplexer/multiplexer.tcl
-lib/tcl/multiplexer/pkgIndex.tcl
-lib/tcl/namespacex/
-lib/tcl/namespacex/namespacex.tcl
-lib/tcl/namespacex/pkgIndex.tcl
-lib/tcl/ncgi/
-lib/tcl/ncgi/ncgi.tcl
-lib/tcl/ncgi/pkgIndex.tcl
-lib/tcl/nmea/
-lib/tcl/nmea/nmea.tcl
-lib/tcl/nmea/pkgIndex.tcl
+lib/tcl/modules/85/aes-1.1.1.tm
+lib/tcl/modules/85/asn-0.8.4.tm
+lib/tcl/modules/85/bee-0.1.tm
+lib/tcl/modules/85/bibtex-0.5.tm
+lib/tcl/modules/85/blowfish-1.0.4.tm
+lib/tcl/modules/85/cmdline-1.3.3.tm
+lib/tcl/modules/85/comm-4.6.3.1.tm
+lib/tcl/modules/85/counter-2.0.4.tm
+lib/tcl/modules/85/csv-0.8.tm
+lib/tcl/modules/85/dtplite-1.2.tm
+lib/tcl/modules/85/ftpd-1.2.6.tm
+lib/tcl/modules/85/gpx-1.tm
+lib/tcl/modules/85/hook-0.1.tm
+lib/tcl/modules/85/html-1.4.3.tm
+lib/tcl/modules/85/htmlparse-1.2.1.tm
+lib/tcl/modules/85/ident-0.42.tm
+lib/tcl/modules/85/imap4-0.5.2.tm
+lib/tcl/modules/85/javascript-1.0.2.tm
+lib/tcl/modules/85/jpeg-0.5.tm
+lib/tcl/modules/85/lambda-1.tm
+lib/tcl/modules/85/mapproj-1.0.tm
+lib/tcl/modules/85/multiplexer-0.2.tm
+lib/tcl/modules/85/namespacex-0.1.tm
+lib/tcl/modules/85/ncgi-1.4.3.tm
+lib/tcl/modules/85/nmea-1.0.0.tm
+lib/tcl/modules/85/nntp-0.2.1.tm
+lib/tcl/modules/85/otp-1.0.0.tm
+lib/tcl/modules/85/pki-0.6.tm
+lib/tcl/modules/85/pluginmgr-0.3.tm
+lib/tcl/modules/85/png-0.2.tm
+lib/tcl/modules/85/pop3-1.9.tm
+lib/tcl/modules/85/profiler-0.3.tm
+lib/tcl/modules/85/rcs-0.1.tm
+lib/tcl/modules/85/report-0.3.2.tm
+lib/tcl/modules/85/smtpd-1.5.tm
+lib/tcl/modules/85/soundex-1.0.tm
+lib/tcl/modules/85/tar-0.10.tm
+lib/tcl/modules/85/tiff-0.2.1.tm
+lib/tcl/modules/85/units-2.1.1.tm
+lib/tcl/modules/85/uuid-1.0.4.tm
+lib/tcl/modules/85/websocket-1.3.1.tm
lib/tcl/nns/
lib/tcl/nns/common.tcl
lib/tcl/nns/nns.tcl
lib/tcl/nns/nns_auto.tcl
lib/tcl/nns/pkgIndex.tcl
lib/tcl/nns/server.tcl
-lib/tcl/nntp/
-lib/tcl/nntp/nntp.tcl
-lib/tcl/nntp/pkgIndex.tcl
lib/tcl/ntp/
lib/tcl/ntp/pkgIndex.tcl
lib/tcl/ntp/time.tcl
lib/tcl/ooutil/
lib/tcl/ooutil/ooutil.tcl
lib/tcl/ooutil/pkgIndex.tcl
-lib/tcl/otp/
-lib/tcl/otp/otp.tcl
-lib/tcl/otp/pkgIndex.tcl
lib/tcl/page/
lib/tcl/page/analysis_peg_emodes.tcl
lib/tcl/page/analysis_peg_minimize.tcl
@@ -449,26 +409,11 @@ lib/tcl/page/util_norm_lemon.tcl
lib/tcl/page/util_norm_peg.tcl
lib/tcl/page/util_peg.tcl
lib/tcl/page/util_quote.tcl
-lib/tcl/pki/
-lib/tcl/pki/pkgIndex.tcl
-lib/tcl/pki/pki.tcl
-lib/tcl/pluginmgr/
-lib/tcl/pluginmgr/pkgIndex.tcl
-lib/tcl/pluginmgr/pluginmgr.tcl
-lib/tcl/png/
-lib/tcl/png/pkgIndex.tcl
-lib/tcl/png/png.tcl
-lib/tcl/pop3/
-lib/tcl/pop3/pkgIndex.tcl
-lib/tcl/pop3/pop3.tcl
lib/tcl/pop3d/
lib/tcl/pop3d/pkgIndex.tcl
lib/tcl/pop3d/pop3d.tcl
lib/tcl/pop3d/pop3d_dbox.tcl
lib/tcl/pop3d/pop3d_udb.tcl
-lib/tcl/profiler/
-lib/tcl/profiler/pkgIndex.tcl
-lib/tcl/profiler/profiler.tcl
lib/tcl/pt/
lib/tcl/pt/char.tcl
lib/tcl/pt/configuration.tcl
@@ -533,15 +478,6 @@ lib/tcl/rc4/
lib/tcl/rc4/pkgIndex.tcl
lib/tcl/rc4/rc4.tcl
lib/tcl/rc4/rc4c.tcl
-lib/tcl/rcs/
-lib/tcl/rcs/pkgIndex.tcl
-lib/tcl/rcs/rcs.tcl
-lib/tcl/report/
-lib/tcl/report/pkgIndex.tcl
-lib/tcl/report/report.tcl
-lib/tcl/rest/
-lib/tcl/rest/pkgIndex.tcl
-lib/tcl/rest/rest.tcl
lib/tcl/ripemd/
lib/tcl/ripemd/pkgIndex.tcl
lib/tcl/ripemd/ripemd128.tcl
@@ -564,9 +500,6 @@ lib/tcl/simulation/annealing.tcl
lib/tcl/simulation/montecarlo.tcl
lib/tcl/simulation/pkgIndex.tcl
lib/tcl/simulation/random.tcl
-lib/tcl/smtpd/
-lib/tcl/smtpd/pkgIndex.tcl
-lib/tcl/smtpd/smtpd.tcl
lib/tcl/snit/
lib/tcl/snit/main1.tcl
lib/tcl/snit/main1_83.tcl
@@ -576,9 +509,6 @@ lib/tcl/snit/snit.tcl
lib/tcl/snit/snit2.tcl
lib/tcl/snit/snit_tcl83_utils.tcl
lib/tcl/snit/validate.tcl
-lib/tcl/soundex/
-lib/tcl/soundex/pkgIndex.tcl
-lib/tcl/soundex/soundex.tcl
lib/tcl/stooop/
lib/tcl/stooop/mkpkgidx.tcl
lib/tcl/stooop/pkgIndex.tcl
@@ -627,9 +557,6 @@ lib/tcl/struct/tree.tcl
lib/tcl/struct/tree1.tcl
lib/tcl/struct/tree_c.tcl
lib/tcl/struct/tree_tcl.tcl
-lib/tcl/tar/
-lib/tcl/tar/pkgIndex.tcl
-lib/tcl/tar/tar.tcl
lib/tcl/tepam/
lib/tcl/tepam/pkgIndex.tcl
lib/tcl/tepam/tepam.tcl
@@ -672,9 +599,6 @@ lib/tcl/tie/tie_file.tcl
lib/tcl/tie/tie_growfile.tcl
lib/tcl/tie/tie_log.tcl
lib/tcl/tie/tie_rarray.tcl
-lib/tcl/tiff/
-lib/tcl/tiff/pkgIndex.tcl
-lib/tcl/tiff/tiff.tcl
lib/tcl/transfer/
lib/tcl/transfer/connect.tcl
lib/tcl/transfer/copyops.tcl
@@ -696,16 +620,10 @@ lib/tcl/uev/
lib/tcl/uev/pkgIndex.tcl
lib/tcl/uev/uevent.tcl
lib/tcl/uev/uevent_onidle.tcl
-lib/tcl/units/
-lib/tcl/units/pkgIndex.tcl
-lib/tcl/units/units.tcl
lib/tcl/uri/
lib/tcl/uri/pkgIndex.tcl
lib/tcl/uri/uri.tcl
lib/tcl/uri/urn-scheme.tcl
-lib/tcl/uuid/
-lib/tcl/uuid/pkgIndex.tcl
-lib/tcl/uuid/uuid.tcl
lib/tcl/valtype/
lib/tcl/valtype/cc_amex.tcl
lib/tcl/valtype/cc_discover.tcl
@@ -757,9 +675,6 @@ lib/tcl/virtchannel_transform/pkgIndex.t
lib/tcl/virtchannel_transform/rot.tcl
lib/tcl/virtchannel_transform/spacer.tcl
lib/tcl/virtchannel_transform/zlib.tcl
-lib/tcl/websocket/
-lib/tcl/websocket/pkgIndex.tcl
-lib/tcl/websocket/websocket.tcl
lib/tcl/wip/
lib/tcl/wip/pkgIndex.tcl
lib/tcl/wip/wip.tcl
@@ -1065,7 +980,6 @@ lib/tcl/zip/pkgIndex.tcl
@man man/mann/record.n
@man man/mann/repeat.n
@man man/mann/report.n
-@man man/mann/rest.n
@man man/mann/rfc2822.n
@man man/mann/ripemd128.n
@man man/mann/ripemd160.n
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/tklib/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile 30 Aug 2014 17:32:34 -0000 1.12
+++ Makefile 12 Oct 2014 16:43:40 -0000
@@ -3,6 +3,7 @@
COMMENT = Tk Standard Library
DISTNAME = tklib-0.6pl1
+REVISION = 0
CATEGORIES = devel x11/tk
HOMEPAGE = http://core.tcl.tk/tklib/home
MAINTAINER = Stuart Cassoff <s...@users.sourceforge.net>
@@ -33,6 +34,7 @@ do-install:
-pkg-path ${DESTDIR}${MODTCL_TCLDIR} \
-nroff-path ${PREFIX}/man/mann \
-example-path ${PREFIX}/share/examples/tklib \
+ -mp ${DESTDIR}${MODTCL_MODDIR}/85 \
-app-path ${PREFIX}/share/examples/tklib/apps \
-csb ${PREFIX}/share/doc \
-tclsh ${MODTCL_BIN} \
Index: patches/patch-installer_tcl
===================================================================
RCS file: /cvs/ports/devel/tklib/patches/patch-installer_tcl,v
retrieving revision 1.4
diff -u -p -r1.4 patch-installer_tcl
--- patches/patch-installer_tcl 10 Sep 2014 23:10:04 -0000 1.4
+++ patches/patch-installer_tcl 12 Oct 2014 16:43:40 -0000
@@ -3,8 +3,8 @@ $OpenBSD: patch-installer_tcl,v 1.4 2014
Install everything nicely.
Generate tcllib.n.
---- installer.tcl.orig Wed Oct 30 14:44:52 2013
-+++ installer.tcl Fri Nov 8 15:44:59 2013
+--- installer.tcl.orig Mon Aug 11 01:25:55 2014
++++ installer.tcl Tue Sep 16 17:20:00 2014
@@ -84,16 +84,24 @@ if {![package vsatisfies [package provide Tcl] 8.0]} {
proc xcopyfile {src dest} {
@@ -46,7 +46,7 @@ Generate tcllib.n.
return
}
-@@ -209,12 +217,16 @@ proc ainstall {} {
+@@ -209,18 +217,23 @@ proc ainstall {} {
set aexe [file join $distribution apps $a]
set adst [file join $config(app,path) ${a}$ext]
@@ -68,7 +68,22 @@ Generate tcllib.n.
}
return
}
-@@ -236,20 +248,27 @@ proc doinstall {} {
+
+ proc doinstall {} {
+ global config package_version distribution package_name modules excluded
++ global pkgs
+
+ if {!$config(no-exclude)} {
+ foreach p $excluded {
+@@ -230,26 +243,35 @@ proc doinstall {} {
+ }
+ }
+
++ array set pkgs [exec [info nameofexecutable] [file join $distribution
sak.tcl] provided]
++
+ if {$config(doc,nroff)} {
+ set config(man.macros) [string trim [get_input \
+ [file join $distribution support installation man.macros]]]
}
if {$config(pkg)} {
xinstall pkg $config(pkg,path)
@@ -99,18 +114,18 @@ Generate tcllib.n.
log ""
return
}
-@@ -511,6 +530,10 @@ proc processargs {} {
+@@ -511,6 +533,10 @@ proc processargs {} {
set config(exa,path) [lindex $argv 1]
set argv [lrange $argv 1 end]
}
-+ -csb - -tclsh - -descr {
++ -csb - -descr - -mp - -tclsh {
+ set config([string range [lindex $argv 0] 1 end]) [lindex $argv
1]
+ set argv [lrange $argv 1 end]
+ }
-help -
default {
puts stderr "usage: $argv0 ?-dry-run/-simulate? ?-no-wait?
?-no-gui? ?-html|-no-html? ?-nroff|-no-nroff? ?-examples|-no-examples?
?-pkgs|-no-pkgs? ?-pkg-path path? ?-apps|-no-apps? ?-app-path path?
?-nroff-path path? ?-html-path path? ?-example-path path?"
-@@ -566,6 +589,40 @@ proc wait {} {
+@@ -566,6 +592,40 @@ proc wait {} {
exit 0
}
return
Index: patches/patch-support_installation_actions_tcl
===================================================================
RCS file:
/cvs/ports/devel/tklib/patches/patch-support_installation_actions_tcl,v
retrieving revision 1.2
diff -u -p -r1.2 patch-support_installation_actions_tcl
--- patches/patch-support_installation_actions_tcl 10 Sep 2014 23:10:04
-0000 1.2
+++ patches/patch-support_installation_actions_tcl 12 Oct 2014 16:43:40
-0000
@@ -3,9 +3,9 @@ $OpenBSD: patch-support_installation_act
Retrieve module info from man pages.
Perform shebang adjustments.
---- support/installation/actions.tcl.orig Wed Oct 30 14:44:52 2013
-+++ support/installation/actions.tcl Fri Nov 8 15:05:31 2013
-@@ -108,15 +108,98 @@ proc _tci {module libdir} {
+--- support/installation/actions.tcl.orig Mon Aug 11 01:25:55 2014
++++ support/installation/actions.tcl Tue Sep 16 17:25:20 2014
+@@ -108,15 +108,106 @@ proc _tci {module libdir} {
return
}
@@ -46,7 +46,14 @@ Perform shebang adjustments.
- [file join $distribution examples $module] \
- [file join $exadir $module] \
- 1
-- return
++proc _tcm {module libdir} {
++ global distribution config pkgs
++ file mkdir $config(mp)
++ xcopyfile [file join $distribution modules $module $module.tcl] \
++ [file join $config(mp) $module-$pkgs($module).tm]
+ return
++}
++
+proc _exafile {fn dfn tclsh} {
+ set f [open $fn]
+ set d [read $f 2]
Index: patches/patch-support_installation_modules_tcl
===================================================================
RCS file:
/cvs/ports/devel/tklib/patches/patch-support_installation_modules_tcl,v
retrieving revision 1.1
diff -u -p -r1.1 patch-support_installation_modules_tcl
--- patches/patch-support_installation_modules_tcl 14 Nov 2013 09:43:09
-0000 1.1
+++ patches/patch-support_installation_modules_tcl 12 Oct 2014 16:43:40
-0000
@@ -1,12 +1,41 @@
$OpenBSD: patch-support_installation_modules_tcl,v 1.1 2013/11/14 09:43:09 stu
Exp $
---- support/installation/modules.tcl.orig Wed Oct 30 14:44:52 2013
-+++ support/installation/modules.tcl Wed Nov 6 21:47:52 2013
-@@ -32,7 +32,7 @@ array set guide {}
+--- support/installation/modules.tcl.orig Mon Aug 11 01:25:55 2014
++++ support/installation/modules.tcl Tue Sep 16 17:49:55 2014
+@@ -31,26 +31,26 @@ array set guide {}
+ # @@ Registration START
# name pkg doc example
- Module autoscroll _tcl _man _null
+-Module autoscroll _tcl _man _null
-Module canvas _tcl _man _null
+-Module chatwidget _tcl _man _null
++Module autoscroll _tcm _man _null
+Module canvas _tcl _man _exa
- Module chatwidget _tcl _man _null
++Module chatwidget _tcm _man _null
Module controlwidget _tcl _man _exa
- Module ctext _ctxt _man _null
+-Module ctext _ctxt _man _null
+-Module cursor _tcl _man _null
+-Module crosshair _tcl _man _null
+-Module datefield _tcl _man _null
++Module ctext _tcm _man _null
++Module cursor _tcm _man _null
++Module crosshair _tcm _man _null
++Module datefield _tcm _man _null
+ Module diagrams _tcl _man _null
+ Module getstring _tcl _man _null
+-Module history _tcl _man _null
++Module history _tcm _man _null
+ Module ico _tcl _man _null
+-Module ipentry _tcl _man _null
++Module ipentry _tcm _man _null
+ Module khim _tclm _man _null
+ Module mentry _tab _null _exa
+ Module menubar _tcl _man _exa
+-Module ntext _tcl _man _exa
++Module ntext _tcm _man _exa
+ Module plotchart _tcl _man _exa
+ Module style _tcl _man _null
+-Module swaplist _tcl _man _null
++Module swaplist _tcm _man _null
+ Module tablelist _tab _null _exa
+ Module tkpiechart _tcl _man _exa
+ Module tooltip _tcl _man _null
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/tklib/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 30 Aug 2014 17:32:34 -0000 1.4
+++ pkg/PLIST 12 Oct 2014 16:43:40 -0000
@@ -3,9 +3,6 @@
@conflict wcb-*
@pkgpath devel/mentry
@pkgpath devel/wcb
-lib/tcl/autoscroll/
-lib/tcl/autoscroll/autoscroll.tcl
-lib/tcl/autoscroll/pkgIndex.tcl
lib/tcl/canvas/
lib/tcl/canvas/canvas_drag.tcl
lib/tcl/canvas/canvas_epoints.tcl
@@ -20,9 +17,6 @@ lib/tcl/canvas/canvas_tags.tcl
lib/tcl/canvas/canvas_trlines.tcl
lib/tcl/canvas/canvas_zoom.tcl
lib/tcl/canvas/pkgIndex.tcl
-lib/tcl/chatwidget/
-lib/tcl/chatwidget/chatwidget.tcl
-lib/tcl/chatwidget/pkgIndex.tcl
lib/tcl/controlwidget/
lib/tcl/controlwidget/bindDown.tcl
lib/tcl/controlwidget/controlwidget.tcl
@@ -33,18 +27,6 @@ lib/tcl/controlwidget/rdial.tcl
lib/tcl/controlwidget/tachometer.tcl
lib/tcl/controlwidget/vertical_meter.tcl
lib/tcl/controlwidget/voltmeter.tcl
-lib/tcl/crosshair/
-lib/tcl/crosshair/crosshair.tcl
-lib/tcl/crosshair/pkgIndex.tcl
-lib/tcl/ctext/
-lib/tcl/ctext/ctext.tcl
-lib/tcl/ctext/pkgIndex.tcl
-lib/tcl/cursor/
-lib/tcl/cursor/cursor.tcl
-lib/tcl/cursor/pkgIndex.tcl
-lib/tcl/datefield/
-lib/tcl/datefield/datefield.tcl
-lib/tcl/datefield/pkgIndex.tcl
lib/tcl/diagrams/
lib/tcl/diagrams/application.tcl
lib/tcl/diagrams/attributes.tcl
@@ -59,16 +41,10 @@ lib/tcl/diagrams/point.tcl
lib/tcl/getstring/
lib/tcl/getstring/pkgIndex.tcl
lib/tcl/getstring/tk_getString.tcl
-lib/tcl/history/
-lib/tcl/history/history.tcl
-lib/tcl/history/pkgIndex.tcl
lib/tcl/ico/
lib/tcl/ico/ico.tcl
lib/tcl/ico/ico0.tcl
lib/tcl/ico/pkgIndex.tcl
-lib/tcl/ipentry/
-lib/tcl/ipentry/ipentry.tcl
-lib/tcl/ipentry/pkgIndex.tcl
lib/tcl/khim/
lib/tcl/khim/ROOT.msg
lib/tcl/khim/cs.msg
@@ -101,9 +77,16 @@ lib/tcl/menubar/menubar.tcl
lib/tcl/menubar/node.tcl
lib/tcl/menubar/pkgIndex.tcl
lib/tcl/menubar/tree.tcl
-lib/tcl/ntext/
-lib/tcl/ntext/ntext.tcl
-lib/tcl/ntext/pkgIndex.tcl
+lib/tcl/modules/85/autoscroll-1.1.tm
+lib/tcl/modules/85/chatwidget-1.1.0.tm
+lib/tcl/modules/85/crosshair-1.2.tm
+lib/tcl/modules/85/ctext-3.3.tm
+lib/tcl/modules/85/cursor-0.3.1.tm
+lib/tcl/modules/85/datefield-0.2.tm
+lib/tcl/modules/85/history-0.1.tm
+lib/tcl/modules/85/ipentry-0.3.tm
+lib/tcl/modules/85/ntext-0.81.tm
+lib/tcl/modules/85/swaplist-0.2.tm
lib/tcl/plotchart/
lib/tcl/plotchart/pkgIndex.tcl
lib/tcl/plotchart/plot3d.tcl
@@ -131,9 +114,6 @@ lib/tcl/style/as.tcl
lib/tcl/style/lobster.tcl
lib/tcl/style/pkgIndex.tcl
lib/tcl/style/style.tcl
-lib/tcl/swaplist/
-lib/tcl/swaplist/pkgIndex.tcl
-lib/tcl/swaplist/swaplist.tcl
lib/tcl/tablelist/
lib/tcl/tablelist/pkgIndex.tcl
lib/tcl/tablelist/scripts/
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/tkcon/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile 9 Feb 2014 12:26:00 -0000 1.10
+++ Makefile 12 Oct 2014 16:43:06 -0000
@@ -3,7 +3,7 @@
COMMENT = enhanced Tk console
DISTNAME = tkcon-2.5
-REVISION = 3
+REVISION = 4
CATEGORIES = x11 x11/tk
HOMEPAGE = http://sourceforge.net/projects/tkcon/
MAINTAINER = Stuart Cassoff <s...@users.sourceforge.net>
@@ -21,7 +21,7 @@ NO_TEST = Yes
PKG_ARCH = *
DOCDIR = ${PREFIX}/share/doc/tkcon
-MODDIR = ${DESTDIR}${MODTCL_MODDIR}/${MODTCL_VERSION}
+MODDIR = ${DESTDIR}${MODTCL_MODDIR}/85
# Conflicts with observe.n in Tcllib
BADMAN = ${WRKSRC}/docs/observe.n.man
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/tkcon/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 9 Feb 2014 12:26:00 -0000 1.5
+++ pkg/PLIST 12 Oct 2014 16:43:06 -0000
@@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.5 2014/02/09 12:26:00 stu Exp $
bin/tkcon
-lib/tcl/modules/${MODTK_VERSION}/tkcon-2.5.tm
+lib/tcl/modules/85/tkcon-2.5.tm
@man man/man1/tkcon.1
@man man/man5/tkconrc.5
@man man/mann/dump.n
