Hi,

I have updated my contrib code for version 6.5. In the attachment you will
find the directories array, datetime, miscutil, string, tools and userlocks
which replace the corresponding directories under contrib.

In contrib/tools you will find some developement scripts which I use while
hacking the sources. I hope they will be useful for some other people.

I have also added a contrib/Makefile which tries to compile and install all
the contribs. Unfortunately many of them don't have a Makefile or don't
compile cleanly.

--
Massimo Dal Zotto

4 files changed, 16 insertions, 13 deletions

diff --git a/contrib/userlock/Makefile b/contrib/userlock/Makefile
index ab43f6e388c..e6cc6c37aff 100644
--- a/contrib/userlock/Makefile
+++ b/contrib/userlock/Makefile
@@ -1,6 +1,7 @@
 #-------------------------------------------------------------------------
 #
 # Makefile --
+#
 #    Makefile for the user_locks module.
 #
 #-------------------------------------------------------------------------
@@ -19,6 +20,8 @@ CFLAGS += $(INCLUDE_OPT) $(CFLAGS_SL)
 
 MODNAME =	user_locks
 
+SQLDEFS =	$(MODNAME).sql
+
 MODULE =	$(MODNAME)$(DLSUFFIX)
 
 MODDIR =	$(LIBDIR)/modules
@@ -29,12 +32,12 @@ all:		module sql
 
 module:		$(MODULE)
 
-sql:		$(MODNAME).sql
+sql:		$(SQLDEFS)
 
-install:	$(MODULE) $(MODDIR) $(SQLDIR)
+install:	$(MODULE) $(SQLDEFS) $(MODDIR) $(SQLDIR)
 		cp -p $(MODULE) $(MODDIR)/
 		strip $(MODDIR)/$(MODULE)
-		cp -p $(MODNAME).sql $(SQLDIR)/
+		cp -p $(SQLDEFS) $(SQLDIR)/
 
 $(MODDIR):
 		mkdir -p $@
diff --git a/contrib/userlock/user_locks.c b/contrib/userlock/user_locks.c
index 27415dabb90..8631d2f6067 100644
--- a/contrib/userlock/user_locks.c
+++ b/contrib/userlock/user_locks.c
@@ -95,9 +95,9 @@ user_unlock_all()
 /* end of file */
 
 /*
- * Local variables:
- *	tab-width: 4
- *	c-indent-level: 4
- *	c-basic-offset: 4
+ * Local Variables:
+ *  tab-width: 4
+ *  c-indent-level: 4
+ *  c-basic-offset: 4
  * End:
  */
diff --git a/contrib/userlock/user_locks.doc b/contrib/userlock/user_locks.doc
index 87c474bd1cf..c7a4321dec7 100644
--- a/contrib/userlock/user_locks.doc
+++ b/contrib/userlock/user_locks.doc
@@ -33,8 +33,8 @@ a long period because other transactions would block completely.
 
 The generic user locks use two values, group and id, to identify a lock,
 which correspond to ip_posid and ip_blkid of an ItemPointerData.
-Group is a 16 bit value while id is a 32 bit integer which can also
-contain an oid. The oid user lock function, which take an oid as argument,
+Group is a 16 bit value while id is a 32 bit integer which could also be
+an oid. The oid user lock functions, which take only an oid as argument,
 use a group equal to 0.
 
 The meaning of group and id is defined by the application. The user
diff --git a/contrib/userlock/user_locks.h b/contrib/userlock/user_locks.h
index ae77839f37d..3f0449e7e45 100644
--- a/contrib/userlock/user_locks.h
+++ b/contrib/userlock/user_locks.h
@@ -12,9 +12,9 @@ int			user_unlock_all(void);
 #endif
 
 /*
- * Local variables:
- *	tab-width: 4
- *	c-indent-level: 4
- *	c-basic-offset: 4
+ * Local Variables:
+ *  tab-width: 4
+ *  c-indent-level: 4
+ *  c-basic-offset: 4
  * End:
  */