head	1.19;
access;
symbols
	REL7_4_29:1.16
	REL8_0_25:1.18
	REL7_4_28:1.16
	REL8_0_24:1.18
	REL7_4_27:1.16
	REL8_0_23:1.18
	REL7_4_26:1.16
	REL8_0_22:1.18
	REL7_4_25:1.16
	REL8_0_21:1.18
	REL7_4_24:1.16
	REL8_0_20:1.18
	REL7_4_23:1.16
	REL8_0_19:1.18
	REL7_4_22:1.16
	REL8_0_18:1.18
	REL7_4_21:1.16
	REL8_0_17:1.18
	REL7_4_20:1.16
	REL8_0_16:1.18
	REL7_3_21:1.16
	REL7_4_19:1.16
	REL8_0_15:1.18
	REL7_3_20:1.16
	REL7_4_18:1.16
	REL8_0_14:1.18
	REL7_3_19:1.16
	REL7_4_17:1.16
	REL8_0_13:1.18
	REL8_0_12:1.18
	REL7_3_18:1.16
	REL7_4_16:1.16
	REL8_0_11:1.18
	REL8_0_10:1.18
	REL7_4_15:1.16
	REL7_3_17:1.16
	REL8_0_9:1.18
	REL7_4_14:1.16
	REL7_3_16:1.16
	REL7_3_15:1.16
	REL7_4_13:1.16
	REL8_0_8:1.18
	REL7_3_14:1.16
	REL7_4_12:1.16
	REL8_0_7:1.18
	REL7_3_13:1.16
	REL7_4_11:1.16
	REL8_0_6:1.18
	REL7_3_12:1.16
	REL7_4_10:1.16
	REL8_0_5:1.18
	REL7_3_11:1.16
	REL7_4_9:1.16
	REL8_0_4:1.18
	REL7_2_8:1.16
	REL7_3_10:1.16
	REL7_4_8:1.16
	REL8_0_3:1.18
	REL8_0_2:1.18
	REL7_2_7:1.16
	REL7_3_9:1.16
	REL7_4_7:1.16
	REL8_0_1:1.18
	REL8_0_STABLE:1.18.0.4
	REL8_0_0:1.18.0.2
	REL8_0_0RC5:1.18
	REL8_0_0RC4:1.18
	REL8_0_0RC3:1.18
	REL8_0_0RC2:1.18
	REL8_0_0RC1:1.18
	REL8_0_0BETA5:1.18
	REL8_0_0BETA4:1.18
	REL7_4_6:1.16
	REL7_3_8:1.16
	REL7_2_6:1.16
	REL8_0_0BETA3:1.18
	REL8_0_0BETA2:1.18
	REL7_2_5:1.16
	REL7_4_5:1.16
	REL7_3_7:1.16
	REL7_4_4:1.16
	REL8_0_0BETA1:1.17
	REL7_4_3:1.16
	REL7_4_2:1.16
	REL7_3_6:1.16
	REL7_4_1:1.16
	REL7_3_5:1.16
	REL7_4:1.16
	REL7_4_RC2:1.16
	REL7_4_STABLE:1.16.0.8
	REL7_4_RC1:1.16
	REL7_4_BETA5:1.16
	REL7_4_BETA4:1.16
	REL7_4_BETA3:1.16
	REL7_4_BETA2:1.16
	WIN32_DEV:1.16.0.6
	REL7_4_BETA1:1.16
	REL7_3_4:1.16
	REL7_3_2:1.16
	REL7_2_4:1.16
	REL7_3_STABLE:1.16.0.4
	REL7_2_3:1.16
	REL7_2_STABLE:1.16.0.2
	REL7_2:1.16
	REL7_2_RC2:1.16
	REL7_2_RC1:1.16
	REL7_2_BETA5:1.16
	REL7_2_BETA4:1.16
	REL7_2_BETA3:1.16
	REL7_2_BETA2:1.16
	REL7_2_BETA1:1.16
	REL7_1_2:1.14
	REL7_1_STABLE:1.14.0.2
	REL7_1_BETA:1.13
	REL7_1_BETA3:1.13
	REL7_1_BETA2:1.13
	REL7_1:1.14
	REL7_0_PATCHES:1.6.0.2
	REL7_0:1.6
	REL6_5_PATCHES:1.4.0.2
	REL6_5:1.4
	REL6_4:1.3.0.2
	release-6-3:1.1;
locks; strict;
comment	@# @;


1.19
date	2005.06.22.22.56.26;	author tgl;	state dead;
branches;
next	1.18;

1.18
date	2004.08.20.20.13.05;	author momjian;	state Exp;
branches;
next	1.17;

1.17
date	2003.11.29.19.51.35;	author pgsql;	state Exp;
branches;
next	1.16;

1.16
date	2001.09.06.10.49.29;	author petere;	state Exp;
branches;
next	1.15;

1.15
date	2001.06.18.21.38.01;	author momjian;	state Exp;
branches;
next	1.14;

1.14
date	2001.02.20.19.20.27;	author petere;	state Exp;
branches;
next	1.13;

1.13
date	2000.10.20.21.03.21;	author petere;	state Exp;
branches;
next	1.12;

1.12
date	2000.07.09.13.13.20;	author petere;	state Exp;
branches;
next	1.11;

1.11
date	2000.07.04.16.16.59;	author momjian;	state Exp;
branches;
next	1.10;

1.10
date	2000.06.19.13.53.47;	author momjian;	state Exp;
branches;
next	1.9;

1.9
date	2000.06.16.18.58.55;	author momjian;	state Exp;
branches;
next	1.8;

1.8
date	2000.06.15.18.55.01;	author momjian;	state Exp;
branches;
next	1.7;

1.7
date	2000.05.29.05.44.27;	author tgl;	state Exp;
branches;
next	1.6;

1.6
date	2000.02.13.18.59.48;	author momjian;	state Exp;
branches;
next	1.5;

1.5
date	99.09.27.20.04.03;	author momjian;	state Exp;
branches;
next	1.4;

1.4
date	99.06.05.19.09.38;	author momjian;	state Exp;
branches;
next	1.3;

1.3
date	98.08.30.19.37.32;	author scrappy;	state Exp;
branches;
next	1.2;

1.2
date	98.04.22.04.14.56;	author scrappy;	state Exp;
branches;
next	1.1;

1.1
date	97.11.05.21.37.44;	author momjian;	state Exp;
branches;
next	;


desc
@@


1.19
log
@Remove contrib modules that have been agreed to be obsolete.
(There are more that will be removed once they've been copied to
pgfoundry.org.)
@
text
@# $PostgreSQL: pgsql/contrib/miscutil/Makefile,v 1.18 2004/08/20 20:13:05 momjian Exp $

MODULES = misc_utils
DATA_built = misc_utils.sql
DOCS = README.misc_utils

ifdef USE_PGXS
PGXS = $(shell pg_config --pgxs)
include $(PGXS)
else
subdir = contrib/miscutil
top_builddir = ../..
include $(top_builddir)/src/Makefile.global
include $(top_srcdir)/contrib/contrib-global.mk
endif
@


1.18
log
@> Please find enclose a submission to fix these problems.
>
> The patch adds missing the "libpgport.a" file to the installation under
> "install-all-headers". It is needed by some contribs. I install the
> library in "pkglibdir", but I was wondering whether it should be "libdir"?
> I was wondering also whether it would make sense to have a "libpgport.so"?
>
> It fixes various macros which are used by contrib makefiles, especially
> libpq_*dir and LDFLAGS when used under PGXS. It seems to me that they are
> needed to
>
> It adds the ability to test and use PGXS with contribs, with "make
> USE_PGXS=1". Without the macro, this is exactly as before, there should be
> no difference, esp. wrt the vpath feature that seemed broken by previous
> submission. So it should not harm anybody, and it is useful at least to me.
>
> It fixes some inconsistencies in various contrib makefiles
> (useless override, ":=" instead of "=").

Fabien COELHO
@
text
@d1 1
a1 1
# $PostgreSQL: pgsql-server/contrib/miscutil/Makefile,v 1.17 2003/11/29 19:51:35 pgsql Exp $
@


1.17
log
@
$Header: -> $PostgreSQL Changes ...
@
text
@d1 1
a1 5
# $PostgreSQL: /cvsroot/pgsql-server/contrib/miscutil/Makefile,v 1.16 2001/09/06 10:49:29 petere Exp $

subdir = contrib/miscutil
top_builddir = ../..
include $(top_builddir)/src/Makefile.global
d7 7
d15 1
@


1.16
log
@To fix the perpetually broken makefiles in the contrib tree, I have
written a generic framework of rules that the contrib makefiles can
use instead of writing their own each time.  You only need to set a few
variables and off you go.
@
text
@d1 1
a1 1
# $Header: /home/projects/pgsql/cvsroot/pgsql/contrib/miscutil/Makefile,v 1.15 2001/06/18 21:38:01 momjian Exp $
@


1.15
log
@The attached patch enables the contrib subtree to build cleanly under
Cygwin with the possible exception of mSQL-interface.  Since I don't
have mSQL installed, I skipped this tool.

Except for dealing with a missing getopt.h (oid2name) and HUGE (seg),
the bulk of the patch uses the standard PostgreSQL approach to deal with
Windows DLL issues.

I tested the build aspect of this patch under Cygwin and Linux without
any ill affects.  Note that I did not actually attempt to test the code
for functionality.

The procedure to apply the patch is as follows:

    $ # save the attachment as /tmp/contrib.patch
    $ # change directory to the top of the PostgreSQL source tree
    $ patch -p0 </tmp/contrib.patch

Jason
@
text
@d1 1
a1 3
#
# $Header: /home/projects/pgsql/cvsroot/pgsql/contrib/miscutil/Makefile,v 1.14 2001/02/20 19:20:27 petere Exp $
#
d7 3
a9 2
NAME	:= misc_utils
SONAME	:= $(NAME)$(DLSUFFIX)
d11 1
a11 29
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
override CFLAGS += $(CFLAGS_SL)
override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS)

all: $(SONAME) $(NAME).sql

$(NAME).sql: $(NAME).sql.in
	sed -e 's:MODULE_PATHNAME:$(libdir)/contrib/$(SONAME):g' < $< > $@@

install: all installdirs
	$(INSTALL_SHLIB) $(SONAME)	$(libdir)/contrib
	$(INSTALL_DATA) $(NAME).sql	$(datadir)/contrib
	$(INSTALL_DATA) README.$(NAME)	$(docdir)/contrib

installdirs:
	$(mkinstalldirs) $(libdir)/contrib $(datadir)/contrib $(docdir)/contrib

uninstall:
	rm -f $(libdir)/contrib/$(SONAME) $(datadir)/contrib/$(NAME).sql $(docdir)/contrib/README.$(NAME)

clean distclean maintainer-clean:
	rm -f $(SONAME) $(NAME).sql

depend dep:
	$(CC) -MM -MG $(CFLAGS) *.c > depend

ifeq (depend,$(wildcard depend))
include depend
endif
@


1.14
log
@Make sure -L and -I's for our source tree are always before system include
or library directories on the command line.
@
text
@d2 1
a2 1
# $Header: /home/projects/pgsql/cvsroot/pgsql/contrib/miscutil/Makefile,v 1.13 2000/10/20 21:03:21 petere Exp $
d14 1
@


1.13
log
@Add support for VPATH builds, that is, building somewhere else than in the
source directory.  This involves mostly makefiles using $(srcdir) when they
might have used ".".  (Regression tests don't work with this, yet.)

Sort out usage of CPPFLAGS, CFLAGS (and CXXFLAGS).  Add "override" keyword
in most places, to preserve necessary flags even when the user overrode the
flags.
@
text
@d2 1
a2 1
# $Header: /home/projects/pgsql/cvsroot/pgsql/contrib/miscutil/Makefile,v 1.12 2000/07/09 13:13:20 petere Exp $
d12 1
a12 1
override CPPFLAGS += -I$(srcdir)
@


1.12
log
@Another round of those unportable config/build changes :-/

* Add option to build with OpenSSL out of the box. Fix thusly exposed
  bit rot. Although it compiles now, getting this to do something
  useful is left as an exercise.

* Fix Kerberos options to defer checking for required libraries until
  all the other libraries are checked for.

* Change default odbcinst.ini and krb5.srvtab path to PREFIX/etc.

* Install work around for Autoconf's install-sh relative path anomaly.
  Get rid of old INSTL_*_OPTS variables, now that we don't need them
  anymore.

* Use `gunzip -c' instead of g?zcat. Reportedly broke on AIX.

* Look for only one of readline.h or readline/readline.h, not both.

* Make check for PS_STRINGS cacheable. Don't test for the header files
  separately.

* Disable fcntl(F_SETLK) test on Linux.

* Substitute the standard GCC warnings set into CFLAGS in configure,
  don't add it on in Makefile.global.

* Sweep through contrib tree to teach makefiles standard semantics.

... and in completely unrelated news:

* Make postmaster.opts arbitrary options-aware. I still think we need to
  save the environment as well.
@
text
@d2 1
a2 1
# $Header: /home/projects/pgsql/cvsroot/pgsql/contrib/miscutil/Makefile,v 1.11 2000/07/04 16:16:59 momjian Exp $
d7 1
a7 1
include ../../src/Makefile.global
d12 2
a13 1
CFLAGS += -I. $(CFLAGS_SL)
@


1.11
log
@Makefile cleanup from Karel.
@
text
@d2 1
a2 1
# $Header: /home/projects/pgsql/cvsroot/pgsql/contrib/miscutil/Makefile,v 1.10 2000/06/19 13:53:47 momjian Exp $
d5 3
a7 1
TOPDIR=../..
d9 2
a10 11
include ../Makefile.global

NAME	= misc_utils

PROGRAM	= 
OBJS	= $(NAME).o
DOCS	= README.$(NAME)
SQLS	= $(NAME).sql
BINS	=
EXAMPLES=
MODS	= $(NAME)$(DLSUFFIX)
d14 1
a14 1
OTHER_CLEAN = $(SQLS)
d16 2
a17 1
all: $(MODS) $(SQLS)
d19 4
a22 2
%.sql: %.sql.in
	$(SED) "s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$(@@:.sql=$(DLSUFFIX))|" < $< > $@@
d24 2
a25 1
install: install_doc install_sql install_mod
d27 2
a28 4
install_doc:
	for inst_file in $(DOCS); do \
		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
	done
d30 2
a31 9
install_sql:
	for inst_file in $(SQLS); do \
		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \
	done

install_mod:
	for inst_file in $(MODS); do \
		$(INSTALL) $(INSTL_SHLIB_OPTS) $$inst_file $(CONTRIB_MODDIR); \
	done
a34 3

clean:
	$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
@


1.10
log
@Update to /contrib from Karel.
@
text
@d2 1
a2 1
# $Header$
d26 1
a26 1
	$(SED) "s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$@@|" < $< > $@@
@


1.9
log
@Cleanup README Makefile installs.
@
text
@d2 1
a2 1
# $Header: /home/projects/pgsql/cvsroot/pgsql/contrib/miscutil/Makefile,v 1.8 2000/06/15 18:55:01 momjian Exp $
d13 1
a13 1
DOCS	= README
d32 1
a32 1
		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR)/$(DOCS).$(NAME); \
@


1.8
log
@/contrib patch from Karel.
@
text
@d2 1
a2 1
# $Header$
d13 1
a13 1
DOCS	= $(NAME).doc
d32 1
a32 1
		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
@


1.7
log
@Generated header files parse.h and fmgroids.h are now copied into
the src/include tree, so that -I backend is no longer necessary anywhere.
Also, clean up some bit rot in contrib tree.
@
text
@a0 1
#-------------------------------------------------------------------------
d2 1
a2 1
# Makefile --
a3 3
#    Makefile for the misc_util module.
#
#-------------------------------------------------------------------------
d5 1
a5 2
PGDIR = ../..
SRCDIR = $(PGDIR)/src
d7 1
a7 1
include $(SRCDIR)/Makefile.global
d9 1
a9 1
CFLAGS += -I. $(CFLAGS_SL)
d11 7
a17 1
MODNAME =	misc_utils
d19 1
a19 25
SQLDEFS =	$(MODNAME).sql

MODULE =	$(MODNAME)$(DLSUFFIX)

MODDIR =	$(LIBDIR)/modules

SQLDIR =	$(LIBDIR)/sql

all:		module sql

module:		$(MODULE)

sql:		$(SQLDEFS)

install:	$(MODULE) $(SQLDEFS) $(MODDIR) $(SQLDIR)
		cp -p $(MODULE) $(MODDIR)/
		strip $(MODDIR)/$(MODULE)
		cp -p $(SQLDEFS) $(SQLDIR)/

install-doc:	
		if [ -d "$(DOCDIR)" ]; then \
		    cp -p *.doc $(DOCDIR); \
		else \
		    cp -p *.doc $(SQLDIR); \
		fi
d21 1
a21 2
$(MODDIR):
		mkdir -p $@@
d23 1
a23 2
$(SQLDIR):
		mkdir -p $@@
d26 1
a26 1
		sed "s|MODULE_PATHNAME|$(MODDIR)/$(MODULE)|" < $< > $@@
d28 1
a28 1
.SUFFIXES: $(DLSUFFIX)
d30 14
a43 2
%$(DLSUFFIX): %.c
		$(CC) $(CFLAGS) -shared -o $@@ $<
d46 1
a46 1
		$(CC) -MM $(CFLAGS) *.c >depend
d49 1
a49 1
		rm -f *~ $(MODULE) $(MODNAME).sql
@


1.6
log
@contrib-array.patch

        this is an old patch which I have already submitted and never seen
        in the sources. It corrects the datatype oids used in some iterator
        functions. This bug has been reported to me by many other people.

contrib-datetime.patch

        some code contributed by Reiner Dassing <dassing@@wettzell.ifag.de>

contrib-makefiles.patch

        fixes all my contrib makefiles which don't work with some compilers,
        as reported to me by another user.

contrib-miscutil.patch

        an old patch for one of my old contribs.

contrib-string.patch

        a small change to the c-like text output functions. Now the '{'
        is escaped only at the beginning of the string to distinguish it
        from arrays, and the '}' is no more escaped.

elog-lineno.patch

        adds the current lineno of CopyFrom to elog messages. This is very
        useful when you load a 1 million tuples table from an external file
        and there is a bad value somehere. Currently you get an error message
        but you can't know where is the bad data. The patch uses a variable
        which was declared static in copy.c. The variable is now exported
        and initialized to 0. It is always cleared at the end of the copy
        or at the first elog message or when the copy is canceled.
        I know this is very ugly but I can't find any better way of knowing
        where the copy fails and I have this problem quite often.

plperl-makefile.patch

        fixes a typo in a makefile, but the error must be elsewhere because
        it is a file generated automatically. Please have a look.

tprintf-timestamp.patch

        restores the original 2-digit year format, assuming that the two
        century digits don't carry much information and that '000202' is
        easier to read than 20000202. Being only a log file it shouldn't
        break anything.

Please apply the patches before the next scheduled code freeze.

I also noticed that some of the contribs don't compile correcly. Should we
ask people to fix their code or rename their makefiles so that they are
ignored by the top makefile?

--
Massimo Dal Zotto
@
text
@d14 1
a14 6
INCLUDE_OPT =	-I./ \
		-I$(SRCDIR)/ \
		-I$(SRCDIR)/include \
		-I$(SRCDIR)/port/$(PORTNAME)

CFLAGS += $(INCLUDE_OPT) $(CFLAGS_SL)
d59 1
a59 1
		$(CC) -MM $(INCLUDE_OPT) *.c >depend
@


1.5
log
@Apply contrib patch from Massimo
@
text
@d14 4
a17 4
INCLUDE_OPT =	-I ./ \
		-I $(SRCDIR)/ \
		-I $(SRCDIR)/include \
		-I $(SRCDIR)/port/$(PORTNAME)
@


1.4
log
@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
@
text
@d42 7
@


1.3
log
@
From: Massimo Dal Zotto <dz@@cs.unitn.it>

Here is a tar file the new directories, which substitute the old ones
in contrib. Please remove the old directories array, datetime, miscutil,
string and userlock before unpacking the tar file in contrib.

Note that as the modules are now installed in lib/modules I install all
my sql code in lib/sql. In my opinion also the other contributors should
follow these rules.
@
text
@d23 2
d35 1
a35 1
sql:		$(MODNAME).sql
d37 1
a37 1
install:	$(MODULE) $(MODDIR) $(SQLDIR)
d40 1
a40 1
		cp -p $(MODNAME).sql $(SQLDIR)/
@


1.2
log
@From: Jun Kuwamura <juk@@rccm.co.jp>

  This patch fix the Makefiles in contrib/{pginterface, spi,
miscutil, int8, ip_and_mac, sequence, soundex, string, userlock,
array, datetime} to install their modules in one directory(lib/modules/).
@
text
@d3 3
a5 2
# Makefile--
#    Makefile for array iterator functions.
d19 1
a19 13
CFLAGS += $(INCLUDE_OPT)

ifeq ($(PORTNAME), linux)
  ifdef LINUX_ELF
    ifeq ($(CC), gcc)
      CFLAGS += -fPIC
    endif
  endif
endif

ifeq ($(PORTNAME), i386_solaris)
  CFLAGS+= -fPIC
endif
d25 4
d35 10
a44 3
install:	$(MODULE)
		cp -p $(MODULE) $(LIBDIR)/modules
		cd $(LIBDIR)/modules; strip $(MODULE)
d47 1
a47 1
		sed "s|MODULE_PATHNAME|$(LIBDIR)/modules/$(MODULE)|" < $< > $@@
d58 1
a58 1
		rm -f $(MODULE) $(MODNAME).sql assert_test.so
@


1.1
log
@Update of contrib stuff from massimo.
@
text
@d43 2
a44 2
		cp -p $(MODULE) $(LIBDIR)
		cd $(LIBDIR); strip $(MODULE)
d47 1
a47 1
		sed "s|MODULE_PATHNAME|$(LIBDIR)/$(MODULE)|" < $< > $@@
d52 1
a52 1
		cc $(CFLAGS) -shared -o $@@ $<
@
