Applied patch #1589278 to include the template vfs files in the install

diff --git a/ChangeLog b/ChangeLog
index a7cb356c9f2d740f9b022d265fc273fc45f1ccc3..5f4169150535a3f42e347486eee44bf32ad56fc5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-13  Pat Thoyts  <patthoyts@users.sourceforge.net>
+
+       * Makefile.in:     Applied patch #1589278 to include the template
+       * pkgIndex.tcl.in: vfs files in the install.
+
 2007-04-05  Pat Thoyts  <patthoyts@users.sourceforge.net>
 
        * Makefile.in: Was failing install the pkgIndex.tcl file

diff --git a/Makefile.in b/Makefile.in
index 6d8eb84f629306e837a08da24e4ccf52fd6ae129..1711fb2c3f2610075d9c4e5599bb16b8d9b25226 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -41,7 +41,12 @@ PKG_TCL_SOURCES = @PKG_TCL_SOURCES@ \
                  tarvfs.tcl tclprocvfs.tcl testvfs.tcl \
                  vfsUrl.tcl vfsUtils.tcl vfslib.tcl \
                  webdavvfs.tcl zipvfs.tcl tclIndex \
-                 tkvfs.tcl
+                 tkvfs.tcl \
+                 template/collatevfs.tcl template/deltavfs.tcl \
+                 template/fishvfs.tcl template/globfind.tcl \
+                 template/quotavfs.tcl template/tdelta.tcl \
+                 template/templatevfs.tcl template/versionvfs.tcl
+
 
 #========================================================================
 # This is a list of public header files to be installed, if any.
@@ -319,9 +324,10 @@ install-lib-binaries:
        @echo "Installing library files in $(DESTDIR)$(pkglibdir)";
        @list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
          if test -f $(srcdir)/library/$$p; then \
-           destp=`basename $$p`; \
-           echo "    $$destp"; \
-           $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkglibdir)/$$destp; \
+           destd=`dirname $$p`; \
+           echo "    $$p"; \
+           mkdir -p $(DESTDIR)$(pkglibdir)/$$destd; \
+           $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkglibdir)/$$p; \
          fi; \
        done
        @if test "x$(SHARED_BUILD)" = "x1"; then \

diff --git a/pkgIndex.tcl.in b/pkgIndex.tcl.in
index 04a58ff6cf1d1c8306deb6433754fc23aba13c1b..30a4c2f71b6e68c4f950ae9fb685f993014b03da 100644 (file)
--- a/pkgIndex.tcl.in
+++ b/pkgIndex.tcl.in
@@ -38,7 +38,7 @@ package ifneeded zipvfs       1.0 [list source [file join $dir zipvfs.tcl]]
 
 # New
 package ifneeded vfs::ftp     1.0 [list source [file join $dir ftpvfs.tcl]]
-package ifneeded vfs::http    0.5 [list source [file join $dir httpvfs.tcl]]
+package ifneeded vfs::http    0.6 [list source [file join $dir httpvfs.tcl]]
 package ifneeded vfs::mk4     1.10 [list source [file join $dir mk4vfs.tcl]]
 package ifneeded vfs::ns      0.5 [list source [file join $dir tclprocvfs.tcl]]
 package ifneeded vfs::tar     0.9 [list source [file join $dir tarvfs.tcl]]
@@ -47,3 +47,17 @@ package ifneeded vfs::urltype 1.0 [list source [file join $dir vfsUrl.tcl]]
 package ifneeded vfs::webdav  0.1 [list source [file join $dir webdavvfs.tcl]]
 package ifneeded vfs::zip     1.0 [list source [file join $dir zipvfs.tcl]]
 package ifneeded vfs::tk      0.5 [list source [file join $dir tkvfs.tcl]]
+#
+# Virtual filesystems based on the template vfs:
+#
+package ifneeded vfs::template::collate 1.0 [list source [file join $dir template collatevfs.tcl]]
+package ifneeded vfs::template::version 1.0 [list source [file join $dir template versionvfs.tcl]]
+package ifneeded vfs::template::version::delta 1.0 [list source [file join $dir template deltavfs.tcl]]
+package ifneeded vfs::template::fish 1.0 [list source [file join $dir template fishvfs.tcl]]
+package ifneeded vfs::template::quota 1.0 [list source [file join $dir template quotavfs.tcl]]
+package ifneeded vfs::template 1.0 [list source [file join $dir template templatevfs.tcl]]
+#
+# Helpers
+#
+package ifneeded globfind 1.0 [list source [file join $dir template globfind.tcl]]
+package ifneeded trsync 1.0 [list source [file join $dir template tdelta.tcl]]