diff options
Diffstat (limited to 'dev-db/postgresql-client/files')
22 files changed, 0 insertions, 1436 deletions
diff --git a/dev-db/postgresql-client/files/digest-postgresql-client-7.3.21 b/dev-db/postgresql-client/files/digest-postgresql-client-7.3.21 deleted file mode 100644 index acc9f8c..0000000 --- a/dev-db/postgresql-client/files/digest-postgresql-client-7.3.21 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 e0068d0de0540a2d7247749ea830833f postgresql-7.3.21.tar.bz2 9284558 -RMD160 f9de4676b4fbe3d96e6d1462b8bc3c05600d6525 postgresql-7.3.21.tar.bz2 9284558 -SHA256 bf44e0ac259e9f6e14ac102f2977496b6996ecea2fd227fbdcea5fa70e342888 postgresql-7.3.21.tar.bz2 9284558 diff --git a/dev-db/postgresql-client/files/digest-postgresql-client-7.4.19 b/dev-db/postgresql-client/files/digest-postgresql-client-7.4.19 deleted file mode 100644 index fb3a431..0000000 --- a/dev-db/postgresql-client/files/digest-postgresql-client-7.4.19 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 0be8c193fb73113930d043c60200598b postgresql-7.4.19.tar.bz2 10307396 -RMD160 c9a1c7dc8e7bf9ce93c3b4f061af0563b1cc2627 postgresql-7.4.19.tar.bz2 10307396 -SHA256 447ac7070aa0a547f17a307e842734fc27e2716cb4a251fa9a810b178d44c389 postgresql-7.4.19.tar.bz2 10307396 diff --git a/dev-db/postgresql-client/files/digest-postgresql-client-8.0.15 b/dev-db/postgresql-client/files/digest-postgresql-client-8.0.15 deleted file mode 100644 index e7881b8..0000000 --- a/dev-db/postgresql-client/files/digest-postgresql-client-8.0.15 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 3ee548b3643e0a0a4b76493e81b336f3 postgresql-8.0.15.tar.bz2 11253897 -RMD160 6aff5c63dce73eea609f0b6e013cd043ae8b7a37 postgresql-8.0.15.tar.bz2 11253897 -SHA256 59408a00db1c73e638a11af10438a827507b7a72b53916d58f2d44c477718714 postgresql-8.0.15.tar.bz2 11253897 diff --git a/dev-db/postgresql-client/files/digest-postgresql-client-8.1.11 b/dev-db/postgresql-client/files/digest-postgresql-client-8.1.11 deleted file mode 100644 index 86701fa..0000000 --- a/dev-db/postgresql-client/files/digest-postgresql-client-8.1.11 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 48922512bcf683d5ea22a99df5eaaecd postgresql-8.1.11.tar.bz2 11735420 -RMD160 9fb98eadc4f1015205970f26b31b68ea0378bda9 postgresql-8.1.11.tar.bz2 11735420 -SHA256 3e91cdfc1353fa9c6416d9fc8ae9d6ab3171565f00aeb6c882214c2f08a03e2e postgresql-8.1.11.tar.bz2 11735420 diff --git a/dev-db/postgresql-client/files/digest-postgresql-client-8.2.6 b/dev-db/postgresql-client/files/digest-postgresql-client-8.2.6 deleted file mode 100644 index eb9626c..0000000 --- a/dev-db/postgresql-client/files/digest-postgresql-client-8.2.6 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 17b9049b4fcad42ee95410833c1db228 postgresql-8.2.6.tar.bz2 12559117 -RMD160 fa12ce310919cb52be3558d38a7e329bc73bbe33 postgresql-8.2.6.tar.bz2 12559117 -SHA256 ee41327e821f933de2894d6e0c319edc4b63e80cb902e673b490b7eaf4ead114 postgresql-8.2.6.tar.bz2 12559117 diff --git a/dev-db/postgresql-client/files/digest-postgresql-client-8.3_rc1 b/dev-db/postgresql-client/files/digest-postgresql-client-8.3_rc1 deleted file mode 100644 index 9e44c24..0000000 --- a/dev-db/postgresql-client/files/digest-postgresql-client-8.3_rc1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c0994ab0d16aa7410d05102344f819fe postgresql-8.3RC1.tar.bz2 13801207 -RMD160 5be543b40dcac92ad1153bb5527b0b069c98d246 postgresql-8.3RC1.tar.bz2 13801207 -SHA256 a05953dffa0e62288364cc17e96e0be351106ada128dc76a8b0c54e16c730a0a postgresql-8.3RC1.tar.bz2 13801207 diff --git a/dev-db/postgresql-client/files/pg_autovacuum.conf-7.4 b/dev-db/postgresql-client/files/pg_autovacuum.conf-7.4 deleted file mode 100644 index 304977e..0000000 --- a/dev-db/postgresql-client/files/pg_autovacuum.conf-7.4 +++ /dev/null @@ -1,18 +0,0 @@ -# Logfile path (NOTE: This must be owned by the uid/gid of $PGUSER!) -PG_AUTOVACUUM_LOG="/var/lib/postgresql/7.4/data/pg_autovacuum.log" - -# PostgreSQL user -PGUSER="postgres" - -# See the pg_autovacuum documentation for the details of how these -# parameters affect pg_autovacuum's aggressiveness. - -VACUUM_BASE="1000" -VACUUM_SCALE="2" - -SLEEP_BASE="300" -SLEEP_SCALE="2" - -# Add more options to pg_autovacuum, for instance -H to specify host or -# -p to specify port -PG_AUTOVACUUM_OPTS="" diff --git a/dev-db/postgresql-client/files/pg_autovacuum.conf-8.0 b/dev-db/postgresql-client/files/pg_autovacuum.conf-8.0 deleted file mode 100644 index 6d87e27..0000000 --- a/dev-db/postgresql-client/files/pg_autovacuum.conf-8.0 +++ /dev/null @@ -1,18 +0,0 @@ -# Logfile path (NOTE: This must be owned by the uid/gid of $PGUSER!) -PG_AUTOVACUUM_LOG="/var/lib/postgresql/8.0/data/pg_autovacuum.log" - -# PostgreSQL user -PGUSER="postgres" - -# See the pg_autovacuum documentation for the details of how these -# parameters affect pg_autovacuum's aggressiveness. - -VACUUM_BASE="1000" -VACUUM_SCALE="2" - -SLEEP_BASE="300" -SLEEP_SCALE="2" - -# Add more options to pg_autovacuum, for instance -H to specify host or -# -p to specify port -PG_AUTOVACUUM_OPTS="" diff --git a/dev-db/postgresql-client/files/pg_autovacuum.init-7.4 b/dev-db/postgresql-client/files/pg_autovacuum.init-7.4 deleted file mode 100644 index cf4d80a..0000000 --- a/dev-db/postgresql-client/files/pg_autovacuum.init-7.4 +++ /dev/null @@ -1,54 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -depend() { - use postgresql-7.4 - need logger -} - -start() { - ebegin "Starting pg_autovacuum" - - echo - echo -n "Waiting max. 20 sec. for PostgreSQL to start " - CONTINUE=0 - TOO_LONG=0 - while [ "$CONTINUE" -eq 0 ] && [ $TOO_LONG -lt 20 ] - do - psql -U $PGUSER -d template1 -c "SELECT 1" 1> /dev/null 2> /dev/null - if [ "$?" -eq 0 ] - then - CONTINUE=1 - else - echo -n "." - TOO_LONG=`expr $TOO_LONG + 1` - sleep 1 - fi - done - - start-stop-daemon -o --chuid $PGUSER --start --quiet --exec /usr/lib/postgresql-7.4/bin/pg_autovacuum -- -D -v $VACUUM_BASE -V $VACUUM_SCALE -s $SLEEP_BASE -S $SLEEP_SCALE -L $PG_AUTOVACUUM_LOG $PG_AUTOVACUUM_OPTS - - sleep 1 - pidof /usr/lib/postgresql-7.4/bin/pg_autovacuum > /dev/null - if [ $? -eq 0 ] ; then - eend 0 - else - eerror - eerror "Please check the $PG_AUTOVACUUM_LOG log file for errors." - eerror "You may need to add the following lines to /var/lib/postgresql/data/postgresql.conf and restart PostgreSQL." - eerror " stats_start_collector = true" - eerror " stats_row_level = true" - eerror - eerror "Please read ___DOCDIR___/contrib/README.pg_autovacuum for details!" - eerror - eend 1 - fi -} - -stop() { - ebegin "Stopping pg_autovacuum" - start-stop-daemon --stop --quiet --exec /usr/lib/postgresql-7.4/bin/pg_autovacuum - eend $? -} diff --git a/dev-db/postgresql-client/files/pg_autovacuum.init-8.0 b/dev-db/postgresql-client/files/pg_autovacuum.init-8.0 deleted file mode 100644 index a3b6ffe..0000000 --- a/dev-db/postgresql-client/files/pg_autovacuum.init-8.0 +++ /dev/null @@ -1,54 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -depend() { - use postgresql-8.0 - need logger -} - -start() { - ebegin "Starting pg_autovacuum" - - echo - echo -n "Waiting max. 20 sec. for PostgreSQL to start " - CONTINUE=0 - TOO_LONG=0 - while [ "$CONTINUE" -eq 0 ] && [ $TOO_LONG -lt 20 ] - do - psql -U $PGUSER -d template1 -c "SELECT 1" 1> /dev/null 2> /dev/null - if [ "$?" -eq 0 ] - then - CONTINUE=1 - else - echo -n "." - TOO_LONG=`expr $TOO_LONG + 1` - sleep 1 - fi - done - - start-stop-daemon -o --chuid $PGUSER --start --quiet --exec /usr/lib/postgresql-8.0/bin/pg_autovacuum -- -D -v $VACUUM_BASE -V $VACUUM_SCALE -s $SLEEP_BASE -S $SLEEP_SCALE -L $PG_AUTOVACUUM_LOG $PG_AUTOVACUUM_OPTS - - sleep 1 - pidof /usr/lib/postgresql-8.0/bin/pg_autovacuum > /dev/null - if [ $? -eq 0 ] ; then - eend 0 - else - eerror - eerror "Please check the $PG_AUTOVACUUM_LOG log file for errors." - eerror "You may need to add the following lines to /var/lib/postgresql/data/postgresql.conf and restart PostgreSQL." - eerror " stats_start_collector = true" - eerror " stats_row_level = true" - eerror - eerror "Please read ___DOCDIR___/contrib/README.pg_autovacuum for details!" - eerror - eend 1 - fi -} - -stop() { - ebegin "Stopping pg_autovacuum" - start-stop-daemon --stop --quiet --exec /usr/lib/postgresql-8.0/bin/pg_autovacuum - eend $? -} diff --git a/dev-db/postgresql-client/files/postgresql-7.3-client.patch b/dev-db/postgresql-client/files/postgresql-7.3-client.patch deleted file mode 100644 index a8ca94f..0000000 --- a/dev-db/postgresql-client/files/postgresql-7.3-client.patch +++ /dev/null @@ -1,174 +0,0 @@ -diff --git a/contrib/Makefile b/contrib/Makefile -index 66753e8..dd73c03 100644 ---- a/contrib/Makefile -+++ b/contrib/Makefile -@@ -5,40 +5,10 @@ top_builddir = .. - include $(top_builddir)/src/Makefile.global - - WANTED_DIRS = \ -- array \ -- btree_gist \ -- chkpass \ -- cube \ -- dbase \ -- dblink \ -- dbmirror \ -- dbsize \ -- earthdistance \ - findoidjoins \ -- fulltextindex \ -- fuzzystrmatch \ -- intagg \ -- intarray \ -- isbn_issn \ -- lo \ -- ltree \ -- miscutil \ -- noupdate \ - oid2name \ - pg_dumplo \ -- pg_logger \ - pgbench \ -- pgcrypto \ -- pgstattuple \ -- rserv \ -- rtree_gist \ -- seg \ -- spi \ -- string \ -- tablefunc \ -- tips \ -- tsearch \ -- userlock \ - vacuumlo - - # Missing: -diff --git a/src/Makefile b/src/Makefile -index cd6e5e6..e7b6f6e 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -16,14 +16,9 @@ include Makefile.global - all install installdirs uninstall dep depend distprep: - $(MAKE) -C port $@ - $(MAKE) -C backend $@ -- $(MAKE) -C backend/utils/mb/conversion_procs $@ -- $(MAKE) -C include $@ -- $(MAKE) -C interfaces $@ - $(MAKE) -C bin $@ -- $(MAKE) -C pl $@ - - install-all-headers: -- $(MAKE) -C include $@ - - clean: - $(MAKE) -C port $@ -diff --git a/src/Makefile.global.in b/src/Makefile.global.in -index e0fd91d..88b8f46 100644 ---- a/src/Makefile.global.in -+++ b/src/Makefile.global.in -@@ -282,11 +282,11 @@ endif - # Some variables needed to find some client interfaces - - libpq_srcdir = $(top_srcdir)/src/interfaces/libpq --libpq_builddir = $(top_builddir)/src/interfaces/libpq --libpq = -L$(libpq_builddir) -lpq -+libpq_builddir = /usr/include/postgresql-${SLOT}/libpq -+libpq = -L/usr/lib/postgresql-${SLOT}/lib -lpq - - submake-libpq: -- $(MAKE) -C $(libpq_builddir) all -+ @true $(MAKE) -C $(libpq_builddir) all - - submake-libpgport: - $(MAKE) -C $(top_builddir)/src/port all -diff --git a/src/backend/Makefile b/src/backend/Makefile -index 5cdfeca..651b6d8 100644 ---- a/src/backend/Makefile -+++ b/src/backend/Makefile -@@ -29,7 +29,7 @@ endif - - ########################################################################## - --all: submake-libpgport postgres $(POSTGRES_IMP) -+all: someheaders - - ifneq ($(PORTNAME), win) - -@@ -78,8 +78,7 @@ $(OBJS): $(DIRS:%=%-recursive) ; - - .PHONY: $(DIRS:%=%-recursive) - # Update the commonly used headers before building the subdirectories --$(DIRS:%=%-recursive): $(top_builddir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h -- $(MAKE) -C $(subst -recursive,,$@) all -+someheaders $(DIRS:%=%-recursive): $(top_builddir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h - - - $(DLLINIT): $(DLLINIT:%.o=%.c) -@@ -125,16 +124,7 @@ distprep: - - ########################################################################## - --install: all installdirs install-bin --ifeq ($(PORTNAME), win) --ifeq ($(MAKE_DLL), true) -- $(INSTALL_DATA) libpostgres.a $(DESTDIR)$(libdir)/libpostgres.a --endif --endif -- $(MAKE) -C catalog install-bki -- $(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample $(DESTDIR)$(datadir)/pg_hba.conf.sample -- $(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample $(DESTDIR)$(datadir)/pg_ident.conf.sample -- $(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample $(DESTDIR)$(datadir)/postgresql.conf.sample -+install: - - install-bin: postgres $(POSTGRES_IMP) installdirs - $(INSTALL_PROGRAM) postgres$(X) $(DESTDIR)$(bindir)/postgres$(X) -diff --git a/src/bin/Makefile b/src/bin/Makefile -index 3035f61..fb889fb 100644 ---- a/src/bin/Makefile -+++ b/src/bin/Makefile -@@ -13,9 +13,8 @@ subdir = src/bin - top_builddir = ../.. - include $(top_builddir)/src/Makefile.global - --DIRS := initdb initlocation ipcclean pg_ctl pg_dump pg_id \ -- psql scripts pg_config pg_controldata pg_resetxlog \ -- pg_encoding -+DIRS := pg_dump \ -+ psql scripts - - ifeq ($(with_tcl), yes) - DIRS += pgtclsh -diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile -index f18280b..839296f 100644 ---- a/src/bin/pg_dump/Makefile -+++ b/src/bin/pg_dump/Makefile -@@ -24,13 +24,13 @@ override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) -DBINDIR=\"$(bindir)\" - - all: submake-libpq submake-libpgport submake-backend pg_dump pg_restore pg_dumpall - --pg_dump: pg_dump.o common.o $(OBJS) $(libpq_builddir)/libpq.a -+pg_dump: pg_dump.o common.o $(OBJS) - $(CC) $(CFLAGS) pg_dump.o common.o $(OBJS) $(EXTRA_OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@ - --pg_restore: pg_restore.o $(OBJS) $(libpq_builddir)/libpq.a -+pg_restore: pg_restore.o $(OBJS) - $(CC) $(CFLAGS) pg_restore.o $(OBJS) $(EXTRA_OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@ - --pg_dumpall: pg_dumpall.o $(libpq_builddir)/libpq.a -+pg_dumpall: pg_dumpall.o - $(CC) $(CFLAGS) pg_dumpall.o dumputils.o sprompt.o $(EXTRA_OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@ - - .PHONY: submake-backend -diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile -index dbaa583..3726aa4 100644 ---- a/src/bin/psql/Makefile -+++ b/src/bin/psql/Makefile -@@ -23,7 +23,7 @@ OBJS=command.o common.o help.o input.o stringutils.o mainloop.o copy.o \ - - all: submake-libpq submake-libpgport psql - --psql: $(OBJS) $(libpq_builddir)/libpq.a -+psql: $(OBJS) - $(CC) $(CFLAGS) $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@ - - help.o: $(srcdir)/sql_help.h diff --git a/dev-db/postgresql-client/files/postgresql-7.3.21-autoconf.patch b/dev-db/postgresql-client/files/postgresql-7.3.21-autoconf.patch deleted file mode 100644 index 0b526b2..0000000 --- a/dev-db/postgresql-client/files/postgresql-7.3.21-autoconf.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/config/programs.m4 b/config/programs.m4 -index 35d9e2b..c681983 100644 ---- a/config/programs.m4 -+++ b/config/programs.m4 -@@ -153,13 +153,13 @@ AC_DEFUN([PGAC_CHECK_GETTEXT], - dnl FIXME: We should probably check for version >=0.10.36. - AC_CHECK_PROGS(XGETTEXT, xgettext) - -- # Note: share/locale is always the default, independent of $datadir -- localedir='${prefix}/share/locale' -- if test x"$prefix" = x"NONE"; then -- exp_localedir="$ac_default_prefix/share/locale" -- else -- exp_localedir="$prefix/share/locale" -- fi -+ # Note: share/locale *WAS* always the default, independent of $datadir -+ AC_ARG_WITH([locale-dir], -+ AC_HELP_STRING([--with-locale-dir],[Set path to locale files]), -+ [ localedir="${withval}" ], -+ [ localedir='${prefix}/share/locale' ] -+ ) -+ exp_localedir="${localedir}" - - AC_SUBST(localedir) - AC_DEFINE_UNQUOTED(LOCALEDIR, ["$exp_localedir"], -diff --git a/configure.in b/configure.in -index 07cc529..37fdded 100644 ---- a/configure.in -+++ b/configure.in -@@ -19,17 +19,8 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros - dnl - dnl The GNU folks apparently haven't heard that some people don't use - dnl Texinfo. Use this sorcery to use "docdir" instead of "infodir". --m4_define([info], [doc]) --m4_define([infodir], [docdir]) - AC_INIT([PostgreSQL], [7.3.21], [pgsql-bugs@postgresql.org]) --m4_undefine([infodir]) --m4_undefine([info]) --AC_SUBST(docdir) -- --m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.53], [], [m4_fatal([Autoconf version 2.59 is required. --Untested combinations of 'autoconf' and PostgreSQL versions are not --recommended. You can remove the check from 'configure.in' but it is then --your responsibility whether the result works or not.])]) -+ - AC_COPYRIGHT([Copyright 2002 PostgreSQL Global Development Group]) - AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) - AC_CONFIG_AUX_DIR(config) -@@ -626,7 +617,7 @@ AC_CHECK_LIB(PW, main) - AC_CHECK_LIB(resolv, main) - AC_SEARCH_LIBS(getopt_long, [getopt gnugetopt]) - # QNX: --AC_CHECK_LIB([[unix]], main) -+AC_CHECK_LIB([unix], main) - AC_SEARCH_LIBS(crypt, crypt) - # BeOS: - AC_CHECK_LIB(bind, __inet_ntoa) diff --git a/dev-db/postgresql-client/files/postgresql-7.4-client.patch b/dev-db/postgresql-client/files/postgresql-7.4-client.patch deleted file mode 100644 index 59008c6..0000000 --- a/dev-db/postgresql-client/files/postgresql-7.4-client.patch +++ /dev/null @@ -1,155 +0,0 @@ -diff --git a/contrib/Makefile b/contrib/Makefile -index 74310cf..7d7da92 100644 ---- a/contrib/Makefile -+++ b/contrib/Makefile -@@ -5,41 +5,11 @@ top_builddir = .. - include $(top_builddir)/src/Makefile.global - - WANTED_DIRS = \ -- btree_gist \ -- chkpass \ -- cube \ -- dbase \ -- dblink \ -- dbmirror \ -- dbsize \ -- earthdistance \ - findoidjoins \ -- fulltextindex \ -- fuzzystrmatch \ -- intagg \ -- intarray \ -- isbn_issn \ -- lo \ -- ltree \ -- miscutil \ -- noupdate \ - oid2name \ - pg_autovacuum \ - pg_dumplo \ -- pg_logger \ - pgbench \ -- pgcrypto \ -- pgstattuple \ -- rserv \ -- rtree_gist \ -- seg \ -- spi \ -- string \ -- tablefunc \ -- tips \ -- tsearch \ -- tsearch2 \ -- userlock \ - vacuumlo - - # Missing: -diff --git a/src/Makefile b/src/Makefile -index cd6e5e6..f0bee6f 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -14,16 +14,9 @@ include Makefile.global - - - all install installdirs uninstall dep depend distprep: -- $(MAKE) -C port $@ -- $(MAKE) -C backend $@ -- $(MAKE) -C backend/utils/mb/conversion_procs $@ -- $(MAKE) -C include $@ -- $(MAKE) -C interfaces $@ - $(MAKE) -C bin $@ -- $(MAKE) -C pl $@ - - install-all-headers: -- $(MAKE) -C include $@ - - clean: - $(MAKE) -C port $@ -diff --git a/src/Makefile.global.in b/src/Makefile.global.in -index 19c49d1..af4af77 100644 ---- a/src/Makefile.global.in -+++ b/src/Makefile.global.in -@@ -287,14 +287,16 @@ endif - # Some variables needed to find some client interfaces - - libpq_srcdir = $(top_srcdir)/src/interfaces/libpq --libpq_builddir = $(top_builddir)/src/interfaces/libpq --libpq = -L$(libpq_builddir) -lpq -+#libpq_builddir = $(top_builddir)/src/interfaces/libpq -+libpq_builddir = -I/usr/include/postgresql-${SLOT}/libpq -+#libpq = -L$(libpq_builddir) -lpq -+libpq = -L/usr/lib/postgresql-${SLOT}/lib -lpq - - submake-libpq: -- $(MAKE) -C $(libpq_builddir) all -+ @true $(MAKE) -C $(libpq_builddir) all - - submake-libpgport: -- $(MAKE) -C $(top_builddir)/src/port all -+ @true $(MAKE) -C $(top_builddir)/src/port all - - .PHONY: submake-libpq submake-libpgport - -diff --git a/src/backend/parser/Makefile b/src/backend/parser/Makefile -index b6698d2..81fa31c 100644 ---- a/src/backend/parser/Makefile -+++ b/src/backend/parser/Makefile -@@ -10,7 +10,7 @@ subdir = src/backend/parser - top_builddir = ../../.. - include $(top_builddir)/src/Makefile.global - --override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -+override CPPFLAGS := -I. -I.. $(CPPFLAGS) - - OBJS= analyze.o gram.o keywords.o parser.o parse_agg.o parse_clause.o \ - parse_expr.o parse_func.o parse_node.o parse_oper.o parse_relation.o \ -diff --git a/src/bin/Makefile b/src/bin/Makefile -index 3035f61..fb889fb 100644 ---- a/src/bin/Makefile -+++ b/src/bin/Makefile -@@ -13,9 +13,8 @@ subdir = src/bin - top_builddir = ../.. - include $(top_builddir)/src/Makefile.global - --DIRS := initdb initlocation ipcclean pg_ctl pg_dump pg_id \ -- psql scripts pg_config pg_controldata pg_resetxlog \ -- pg_encoding -+DIRS := pg_dump \ -+ psql scripts - - ifeq ($(with_tcl), yes) - DIRS += pgtclsh -diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile -index 5594593..927d367 100644 ---- a/src/bin/pg_dump/Makefile -+++ b/src/bin/pg_dump/Makefile -@@ -24,13 +24,13 @@ override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) -DBINDIR=\"$(bindir)\" - - all: submake-libpq submake-libpgport submake-backend pg_dump pg_restore pg_dumpall - --pg_dump: pg_dump.o common.o $(OBJS) $(libpq_builddir)/libpq.a -+pg_dump: pg_dump.o common.o $(OBJS) - $(CC) $(CFLAGS) pg_dump.o common.o $(OBJS) $(EXTRA_OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@ - --pg_restore: pg_restore.o $(OBJS) $(libpq_builddir)/libpq.a -+pg_restore: pg_restore.o $(OBJS) - $(CC) $(CFLAGS) pg_restore.o $(OBJS) $(EXTRA_OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@ - --pg_dumpall: pg_dumpall.o $(libpq_builddir)/libpq.a -+pg_dumpall: pg_dumpall.o - $(CC) $(CFLAGS) pg_dumpall.o dumputils.o $(EXTRA_OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@ - - .PHONY: submake-backend -diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile -index e8afcf6..e70a8bf 100644 ---- a/src/bin/psql/Makefile -+++ b/src/bin/psql/Makefile -@@ -23,7 +23,7 @@ OBJS= command.o common.o help.o input.o stringutils.o mainloop.o copy.o \ - - all: submake-libpq submake-libpgport psql - --psql: $(OBJS) $(libpq_builddir)/libpq.a -+psql: $(OBJS) - $(CC) $(CFLAGS) $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@ - - help.o: $(srcdir)/sql_help.h diff --git a/dev-db/postgresql-client/files/postgresql-7.4.19-autoconf.patch b/dev-db/postgresql-client/files/postgresql-7.4.19-autoconf.patch deleted file mode 100644 index 3913a0b..0000000 --- a/dev-db/postgresql-client/files/postgresql-7.4.19-autoconf.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/config/programs.m4 b/config/programs.m4 -index ae3b91a..6af24d2 100644 ---- a/config/programs.m4 -+++ b/config/programs.m4 -@@ -153,13 +153,13 @@ AC_DEFUN([PGAC_CHECK_GETTEXT], - dnl FIXME: We should probably check for version >=0.10.36. - AC_CHECK_PROGS(XGETTEXT, xgettext) - -- # Note: share/locale is always the default, independent of $datadir -- localedir='${prefix}/share/locale' -- if test x"$prefix" = x"NONE"; then -- exp_localedir="$ac_default_prefix/share/locale" -- else -- exp_localedir="$prefix/share/locale" -- fi -+ # Note: share/locale *WAS* always the default, independent of $datadir -+ AC_ARG_WITH([locale-dir], -+ AC_HELP_STRING([--with-locale-dir],[Set path to locale files]), -+ [ localedir="${withval}" ], -+ [ localedir='${prefix}/share/locale' ] -+ ) -+ exp_localedir="${localedir}" - - AC_SUBST(localedir) - AC_DEFINE_UNQUOTED(LOCALEDIR, ["$exp_localedir"], -diff --git a/configure.in b/configure.in -index f7bdec3..c8b5b7e 100644 ---- a/configure.in -+++ b/configure.in -@@ -19,17 +19,8 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros - dnl - dnl The GNU folks apparently haven't heard that some people don't use - dnl Texinfo. Use this sorcery to use "docdir" instead of "infodir". --m4_define([info], [doc]) --m4_define([infodir], [docdir]) - AC_INIT([PostgreSQL], [7.4.19], [pgsql-bugs@postgresql.org]) --m4_undefine([infodir]) --m4_undefine([info]) --AC_SUBST(docdir) -- --m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.53], [], [m4_fatal([Autoconf version 2.59 is required. --Untested combinations of 'autoconf' and PostgreSQL versions are not --recommended. You can remove the check from 'configure.in' but it is then --your responsibility whether the result works or not.])]) -+ - AC_COPYRIGHT([Copyright 2004 PostgreSQL Global Development Group]) - AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) - AC_CONFIG_AUX_DIR(config) diff --git a/dev-db/postgresql-client/files/postgresql-8.0-client.patch b/dev-db/postgresql-client/files/postgresql-8.0-client.patch deleted file mode 100644 index 7438cf0..0000000 --- a/dev-db/postgresql-client/files/postgresql-8.0-client.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff --git a/GNUmakefile.in b/GNUmakefile.in -index c451bd6..a048ce7 100644 ---- a/GNUmakefile.in -+++ b/GNUmakefile.in -@@ -11,19 +11,16 @@ include $(top_builddir)/src/Makefile.global - all: - $(MAKE) -C doc all - $(MAKE) -C src all -- $(MAKE) -C config all - @echo "All of PostgreSQL successfully made. Ready to install." - - install: - $(MAKE) -C doc $@ - $(MAKE) -C src $@ -- $(MAKE) -C config $@ - @echo "PostgreSQL installation complete." - - installdirs uninstall distprep: - $(MAKE) -C doc $@ - $(MAKE) -C src $@ -- $(MAKE) -C config $@ - - # clean, distclean, etc should apply to contrib too, even though - # it's not built by default -diff --git a/contrib/Makefile b/contrib/Makefile -index 166ed86..cf189eb 100644 ---- a/contrib/Makefile -+++ b/contrib/Makefile -@@ -5,41 +5,12 @@ top_builddir = .. - include $(top_builddir)/src/Makefile.global - - WANTED_DIRS = \ -- btree_gist \ -- chkpass \ -- cube \ -- dbase \ -- dblink \ -- dbmirror \ -- dbsize \ -- earthdistance \ - findoidjoins \ -- fulltextindex \ -- fuzzystrmatch \ -- intagg \ -- intarray \ -- isbn_issn \ -- lo \ -- ltree \ -- miscutil \ - mysql \ -- noupdate \ - oid2name \ - pg_autovacuum \ - pg_dumplo \ -- pg_trgm \ - pgbench \ -- pgcrypto \ -- pgstattuple \ -- rtree_gist \ -- seg \ -- spi \ -- string \ -- tablefunc \ -- tips \ -- tsearch \ -- tsearch2 \ -- userlock \ - vacuumlo - - # Missing: -diff --git a/contrib/pg_autovacuum/Makefile b/contrib/pg_autovacuum/Makefile -index c512d18..e822063 100644 ---- a/contrib/pg_autovacuum/Makefile -+++ b/contrib/pg_autovacuum/Makefile -@@ -18,5 +18,5 @@ include $(top_builddir)/src/Makefile.global - include $(top_srcdir)/contrib/contrib-global.mk - endif - --dllist.c: $(top_srcdir)/src/backend/lib/dllist.c -+dllist.c: ../../src/backend/lib/dllist.c - rm -f $@ && $(LN_S) $< . -diff --git a/src/Makefile b/src/Makefile -index 0963f88..155323c 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -14,18 +14,9 @@ include Makefile.global - - - all install installdirs uninstall dep depend distprep: -- $(MAKE) -C port $@ -- $(MAKE) -C timezone $@ -- $(MAKE) -C backend $@ -- $(MAKE) -C backend/utils/mb/conversion_procs $@ -- $(MAKE) -C include $@ -- $(MAKE) -C interfaces $@ - $(MAKE) -C bin $@ -- $(MAKE) -C pl $@ -- $(MAKE) -C makefiles $@ -- $(MAKE) -C utils $@ - --install: install-local -+install: - - install-local: installdirs-local - $(INSTALL_DATA) Makefile.global $(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global -diff --git a/src/Makefile.global.in b/src/Makefile.global.in -index e57265e..e081618 100644 ---- a/src/Makefile.global.in -+++ b/src/Makefile.global.in -@@ -336,10 +336,10 @@ endif - - - submake-libpq: -- $(MAKE) -C $(libpq_builddir) all -+ @true $(MAKE) -C $(libpq_builddir) all - - submake-libpgport: -- $(MAKE) -C $(top_builddir)/src/port all -+ @true $(MAKE) -C $(top_builddir)/src/port all - - .PHONY: submake-libpq submake-libpgport - -diff --git a/src/bin/Makefile b/src/bin/Makefile -index 8309db1..7c1c47f 100644 ---- a/src/bin/Makefile -+++ b/src/bin/Makefile -@@ -13,8 +13,8 @@ subdir = src/bin - top_builddir = ../.. - include $(top_builddir)/src/Makefile.global - --DIRS := initdb ipcclean pg_ctl pg_dump \ -- psql scripts pg_config pg_controldata pg_resetxlog -+DIRS := pg_dump \ -+ psql scripts - ifeq ($(PORTNAME), win32) - DIRS+=pgevent - endif diff --git a/dev-db/postgresql-client/files/postgresql-8.0-common.patch b/dev-db/postgresql-client/files/postgresql-8.0-common.patch deleted file mode 100644 index 40932ec..0000000 --- a/dev-db/postgresql-client/files/postgresql-8.0-common.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/config/programs.m4 b/config/programs.m4 -index 3f87396..9c7fbf0 100644 ---- a/config/programs.m4 -+++ b/config/programs.m4 -@@ -153,13 +153,13 @@ AC_DEFUN([PGAC_CHECK_GETTEXT], - dnl FIXME: We should probably check for version >=0.10.36. - AC_CHECK_PROGS(XGETTEXT, xgettext) - -- # Note: share/locale is always the default, independent of $datadir -- localedir='${prefix}/share/locale' -- if test x"$prefix" = x"NONE"; then -- exp_localedir="$ac_default_prefix/share/locale" -- else -- exp_localedir="$prefix/share/locale" -- fi -+ # Note: share/locale *WAS* always the default, independent of $datadir -+ AC_ARG_WITH([locale-dir], -+ AC_HELP_STRING([--with-locale-dir],[Set path to locale files]), -+ [ localedir="${withval}" ], -+ [ localedir='${prefix}/share/locale' ] -+ ) -+ exp_localedir="${localedir}" - - AC_SUBST(localedir) - AC_DEFINE_UNQUOTED(LOCALEDIR, ["$exp_localedir"], -diff --git a/configure.in b/configure.in -index c71b175..674036a 100644 ---- a/configure.in -+++ b/configure.in -@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros - - AC_INIT([PostgreSQL], [8.0.15], [pgsql-bugs@postgresql.org]) - --m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.53], [], [m4_fatal([Autoconf version 2.59 is required. --Untested combinations of 'autoconf' and PostgreSQL versions are not --recommended. You can remove the check from 'configure.in' but it is then --your responsibility whether the result works or not.])]) - AC_COPYRIGHT([Copyright (c) 1996-2005, PostgreSQL Global Development Group]) - AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) - AC_CONFIG_AUX_DIR(config) -diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h -index 0c2dff0..d548d4d 100644 ---- a/src/include/storage/s_lock.h -+++ b/src/include/storage/s_lock.h -@@ -239,6 +239,31 @@ tas(volatile slock_t *lock) - #endif /* __s390__ || __s390x__ */ - - -+#if defined(__sh__) -+#define HAS_TEST_AND_SET -+ -+typedef unsigned char slock_t; -+ -+#define TAS(lock) tas(lock) -+ -+static __inline__ int -+tas(volatile slock_t *lock) -+{ -+ register int _res = 1; -+ -+ __asm__ __volatile__( -+ "tas.b @%1\n\t" -+ "movt %0\n\t" -+ "xor #1,%0" -+: "=z"(_res) -+: "r"(lock) -+: "t","memory"); -+ return _res; -+} -+ -+#endif /* __sh__ */ -+ -+ - #if defined(__sparc__) - #define HAS_TEST_AND_SET - diff --git a/dev-db/postgresql-client/files/postgresql-8.1-client.patch b/dev-db/postgresql-client/files/postgresql-8.1-client.patch deleted file mode 100644 index 5e87355..0000000 --- a/dev-db/postgresql-client/files/postgresql-8.1-client.patch +++ /dev/null @@ -1,117 +0,0 @@ -diff --git a/GNUmakefile.in b/GNUmakefile.in -index 0216527..7ed3520 100644 ---- a/GNUmakefile.in -+++ b/GNUmakefile.in -@@ -11,19 +11,16 @@ include $(top_builddir)/src/Makefile.global - all: - $(MAKE) -C doc all - $(MAKE) -C src all -- $(MAKE) -C config all - @echo "All of PostgreSQL successfully made. Ready to install." - - install: - $(MAKE) -C doc $@ - $(MAKE) -C src $@ -- $(MAKE) -C config $@ - @echo "PostgreSQL installation complete." - - installdirs uninstall distprep: - $(MAKE) -C doc $@ - $(MAKE) -C src $@ -- $(MAKE) -C config $@ - - # clean, distclean, etc should apply to contrib too, even though - # it's not built by default -diff --git a/contrib/Makefile b/contrib/Makefile -index 7367163..fa2a5c6 100644 ---- a/contrib/Makefile -+++ b/contrib/Makefile -@@ -5,32 +5,8 @@ top_builddir = .. - include $(top_builddir)/src/Makefile.global - - WANTED_DIRS = \ -- btree_gist \ -- chkpass \ -- cube \ -- dbase \ -- dblink \ -- dbmirror \ -- earthdistance \ -- fulltextindex \ -- fuzzystrmatch \ -- intagg \ -- intarray \ -- isbn_issn \ -- lo \ -- ltree \ - oid2name \ -- pg_buffercache \ -- pg_trgm \ - pgbench \ -- pgcrypto \ -- pgstattuple \ -- seg \ -- spi \ -- tablefunc \ -- tips \ -- tsearch2 \ -- userlock \ - vacuumlo - - # Missing: -diff --git a/src/Makefile b/src/Makefile -index 0963f88..155323c 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -14,18 +14,9 @@ include Makefile.global - - - all install installdirs uninstall dep depend distprep: -- $(MAKE) -C port $@ -- $(MAKE) -C timezone $@ -- $(MAKE) -C backend $@ -- $(MAKE) -C backend/utils/mb/conversion_procs $@ -- $(MAKE) -C include $@ -- $(MAKE) -C interfaces $@ - $(MAKE) -C bin $@ -- $(MAKE) -C pl $@ -- $(MAKE) -C makefiles $@ -- $(MAKE) -C utils $@ - --install: install-local -+install: - - install-local: installdirs-local - $(INSTALL_DATA) Makefile.global $(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global -diff --git a/src/Makefile.global.in b/src/Makefile.global.in -index 20d7a1d..12533a2 100644 ---- a/src/Makefile.global.in -+++ b/src/Makefile.global.in -@@ -360,10 +360,10 @@ endif - - - submake-libpq: -- $(MAKE) -C $(libpq_builddir) all -+ @true $(MAKE) -C $(libpq_builddir) all - - submake-libpgport: -- $(MAKE) -C $(top_builddir)/src/port all -+ @true $(MAKE) -C $(top_builddir)/src/port all - - .PHONY: submake-libpq submake-libpgport - -diff --git a/src/bin/Makefile b/src/bin/Makefile -index 8309db1..7c1c47f 100644 ---- a/src/bin/Makefile -+++ b/src/bin/Makefile -@@ -13,8 +13,8 @@ subdir = src/bin - top_builddir = ../.. - include $(top_builddir)/src/Makefile.global - --DIRS := initdb ipcclean pg_ctl pg_dump \ -- psql scripts pg_config pg_controldata pg_resetxlog -+DIRS := pg_dump \ -+ psql scripts - ifeq ($(PORTNAME), win32) - DIRS+=pgevent - endif diff --git a/dev-db/postgresql-client/files/postgresql-8.1-common.patch b/dev-db/postgresql-client/files/postgresql-8.1-common.patch deleted file mode 100644 index 56704f0..0000000 --- a/dev-db/postgresql-client/files/postgresql-8.1-common.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff --git a/config/programs.m4 b/config/programs.m4 -index 3f87396..9c7fbf0 100644 ---- a/config/programs.m4 -+++ b/config/programs.m4 -@@ -153,13 +153,13 @@ AC_DEFUN([PGAC_CHECK_GETTEXT], - dnl FIXME: We should probably check for version >=0.10.36. - AC_CHECK_PROGS(XGETTEXT, xgettext) - -- # Note: share/locale is always the default, independent of $datadir -- localedir='${prefix}/share/locale' -- if test x"$prefix" = x"NONE"; then -- exp_localedir="$ac_default_prefix/share/locale" -- else -- exp_localedir="$prefix/share/locale" -- fi -+ # Note: share/locale *WAS* always the default, independent of $datadir -+ AC_ARG_WITH([locale-dir], -+ AC_HELP_STRING([--with-locale-dir],[Set path to locale files]), -+ [ localedir="${withval}" ], -+ [ localedir='${prefix}/share/locale' ] -+ ) -+ exp_localedir="${localedir}" - - AC_SUBST(localedir) - AC_DEFINE_UNQUOTED(LOCALEDIR, ["$exp_localedir"], -diff --git a/configure.in b/configure.in -index d071f00..b203648 100644 ---- a/configure.in -+++ b/configure.in -@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros - - AC_INIT([PostgreSQL], [8.1.11], [pgsql-bugs@postgresql.org]) - --m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required. --Untested combinations of 'autoconf' and PostgreSQL versions are not --recommended. You can remove the check from 'configure.in' but it is then --your responsibility whether the result works or not.])]) - AC_COPYRIGHT([Copyright (c) 1996-2005, PostgreSQL Global Development Group]) - AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) - AC_CONFIG_AUX_DIR(config) -diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h -index c5731fd..8ec70b4 100644 ---- a/src/include/storage/s_lock.h -+++ b/src/include/storage/s_lock.h -@@ -299,6 +299,29 @@ tas(volatile slock_t *lock) - - #endif /* __s390__ || __s390x__ */ - -+#if defined(__sh__) -+#define HAS_TEST_AND_SET -+ -+typedef unsigned char slock_t; -+ -+#define TAS(lock) tas(lock) -+ -+static __inline__ int -+tas(volatile slock_t *lock) -+{ -+ register int _res = 1; -+ -+ __asm__ __volatile__( -+ "tas.b @%1\n\t" -+ "movt %0\n\t" -+ "xor #1,%0" -+: "=z"(_res) -+: "r"(lock) -+: "t","memory"); -+ return _res; -+} -+ -+#endif /* __sh__ */ - - #if defined(__sparc__) - #define HAS_TEST_AND_SET diff --git a/dev-db/postgresql-client/files/postgresql-8.2-client.patch b/dev-db/postgresql-client/files/postgresql-8.2-client.patch deleted file mode 100644 index 3250484..0000000 --- a/dev-db/postgresql-client/files/postgresql-8.2-client.patch +++ /dev/null @@ -1,122 +0,0 @@ -diff --git a/GNUmakefile.in b/GNUmakefile.in -index 16f9057..0f6cee7 100644 ---- a/GNUmakefile.in -+++ b/GNUmakefile.in -@@ -11,19 +11,16 @@ include $(top_builddir)/src/Makefile.global - all: - $(MAKE) -C doc all - $(MAKE) -C src all -- $(MAKE) -C config all - @echo "All of PostgreSQL successfully made. Ready to install." - - install: - $(MAKE) -C doc $@ - $(MAKE) -C src $@ -- $(MAKE) -C config $@ - @echo "PostgreSQL installation complete." - - installdirs uninstall: - $(MAKE) -C doc $@ - $(MAKE) -C src $@ -- $(MAKE) -C config $@ - - distprep: - $(MAKE) -C doc $@ -diff --git a/contrib/Makefile b/contrib/Makefile -index 1787a1b..26610d8 100644 ---- a/contrib/Makefile -+++ b/contrib/Makefile -@@ -5,37 +5,10 @@ top_builddir = .. - include $(top_builddir)/src/Makefile.global - - WANTED_DIRS = \ -- adminpack \ -- btree_gist \ -- chkpass \ -- cube \ -- dblink \ -- earthdistance \ -- fuzzystrmatch \ -- hstore \ -- intagg \ -- intarray \ -- isn \ -- lo \ -- ltree \ - oid2name \ -- pg_buffercache \ -- pg_freespacemap \ -- pg_trgm \ - pgbench \ -- pgcrypto \ -- pgrowlocks \ -- pgstattuple \ -- seg \ -- spi \ -- tablefunc \ -- tsearch2 \ - vacuumlo - --ifeq ($(with_openssl),yes) --WANTED_DIRS += sslinfo --endif -- - # Missing: - # start-scripts \ (does not have a makefile) - # xml2 \ (requires libxml installed) -diff --git a/src/Makefile b/src/Makefile -index 6d9043a..5099025 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -14,18 +14,9 @@ include Makefile.global - - - all install installdirs uninstall dep depend distprep: -- $(MAKE) -C port $@ -- $(MAKE) -C timezone $@ -- $(MAKE) -C backend $@ -- $(MAKE) -C backend/utils/mb/conversion_procs $@ -- $(MAKE) -C include $@ -- $(MAKE) -C interfaces $@ - $(MAKE) -C bin $@ -- $(MAKE) -C pl $@ -- $(MAKE) -C makefiles $@ -- $(MAKE) -C test/regress $@ - --install: install-local -+install: - - install-local: installdirs-local - $(INSTALL_DATA) Makefile.global '$(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global' -diff --git a/src/Makefile.global.in b/src/Makefile.global.in -index 820dfd5..2619acd 100644 ---- a/src/Makefile.global.in -+++ b/src/Makefile.global.in -@@ -365,10 +365,10 @@ endif - - - submake-libpq: -- $(MAKE) -C $(libpq_builddir) all -+ @true $(MAKE) -C $(libpq_builddir) all - - submake-libpgport: -- $(MAKE) -C $(top_builddir)/src/port all -+ @true $(MAKE) -C $(top_builddir)/src/port all - - .PHONY: submake-libpq submake-libpgport - -diff --git a/src/bin/Makefile b/src/bin/Makefile -index 0d86213..5dba7c8 100644 ---- a/src/bin/Makefile -+++ b/src/bin/Makefile -@@ -13,8 +13,8 @@ subdir = src/bin - top_builddir = ../.. - include $(top_builddir)/src/Makefile.global - --DIRS := initdb ipcclean pg_ctl pg_dump \ -- psql scripts pg_config pg_controldata pg_resetxlog -+DIRS := pg_dump \ -+ psql scripts - ifeq ($(PORTNAME), win32) - DIRS+=pgevent - endif diff --git a/dev-db/postgresql-client/files/postgresql-8.2-common.patch b/dev-db/postgresql-client/files/postgresql-8.2-common.patch deleted file mode 100644 index e6e8e46..0000000 --- a/dev-db/postgresql-client/files/postgresql-8.2-common.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff --git a/config/programs.m4 b/config/programs.m4 -index fb9793f..3510942 100644 ---- a/config/programs.m4 -+++ b/config/programs.m4 -@@ -162,8 +162,12 @@ AC_DEFUN([PGAC_CHECK_GETTEXT], - dnl FIXME: We should probably check for version >=0.10.36. - AC_CHECK_PROGS(XGETTEXT, xgettext) - -- # Note: share/locale is always the default, independent of $datadir -- localedir='${prefix}/share/locale' -+ # Note: share/locale *WAS* always the default, independent of $datadir -+ AC_ARG_WITH([locale-dir], -+ AC_HELP_STRING([--with-locale-dir],[Set path to locale files]), -+ [ localedir="${withval}" ], -+ [ localedir='${prefix}/share/locale' ] -+ ) - AC_SUBST(localedir) - ])# PGAC_CHECK_GETTEXT - -diff --git a/configure.in b/configure.in -index 908a1ae..30dd3bb 100644 ---- a/configure.in -+++ b/configure.in -@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros - - AC_INIT([PostgreSQL], [8.2.6], [pgsql-bugs@postgresql.org]) - --m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required. --Untested combinations of 'autoconf' and PostgreSQL versions are not --recommended. You can remove the check from 'configure.in' but it is then --your responsibility whether the result works or not.])]) - AC_COPYRIGHT([Copyright (c) 1996-2006, PostgreSQL Global Development Group]) - AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) - AC_CONFIG_AUX_DIR(config) -diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h -index 23f4cc9..707c303 100644 ---- a/src/include/storage/s_lock.h -+++ b/src/include/storage/s_lock.h -@@ -298,6 +298,29 @@ tas(volatile slock_t *lock) - - #endif /* __s390__ || __s390x__ */ - -+#if defined(__sh__) -+#define HAS_TEST_AND_SET -+ -+typedef unsigned char slock_t; -+ -+#define TAS(lock) tas(lock) -+ -+static __inline__ int -+tas(volatile slock_t *lock) -+{ -+ register int _res = 1; -+ -+ __asm__ __volatile__( -+ "tas.b @%1\n\t" -+ "movt %0\n\t" -+ "xor #1,%0" -+: "=z"(_res) -+: "r"(lock) -+: "t","memory"); -+ return _res; -+} -+ -+#endif /* __sh__ */ - - #if defined(__sparc__) /* Sparc */ - #define HAS_TEST_AND_SET -diff --git a/src/makefiles/Makefile.darwin b/src/makefiles/Makefile.darwin -index 9f761d4..83b2974 100644 ---- a/src/makefiles/Makefile.darwin -+++ b/src/makefiles/Makefile.darwin -@@ -5,7 +5,15 @@ DLSUFFIX = .so - CFLAGS_SL = - - ifdef PGXS -+ifdef PGXS_IN_SERVER -+ifndef PGXS_WITH_SERVER -+BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres -+else -+BE_DLLLIBS= -bundle_loader ${PGXS_WITH_SERVER} -+endif -+else - BE_DLLLIBS= -bundle_loader $(bindir)/postgres -+endif - else - BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres - endif diff --git a/dev-db/postgresql-client/files/postgresql-8.3-client.patch b/dev-db/postgresql-client/files/postgresql-8.3-client.patch deleted file mode 100644 index 9345184..0000000 --- a/dev-db/postgresql-client/files/postgresql-8.3-client.patch +++ /dev/null @@ -1,138 +0,0 @@ -diff --git a/GNUmakefile.in b/GNUmakefile.in -index f7bcc67..ec8fcf1 100644 ---- a/GNUmakefile.in -+++ b/GNUmakefile.in -@@ -11,19 +11,16 @@ include $(top_builddir)/src/Makefile.global - all: - $(MAKE) -C doc all - $(MAKE) -C src all -- $(MAKE) -C config all - @echo "All of PostgreSQL successfully made. Ready to install." - - install: - $(MAKE) -C doc $@ - $(MAKE) -C src $@ -- $(MAKE) -C config $@ - @echo "PostgreSQL installation complete." - - installdirs uninstall: - $(MAKE) -C doc $@ - $(MAKE) -C src $@ -- $(MAKE) -C config $@ - - distprep: - $(MAKE) -C doc $@ -diff --git a/contrib/Makefile b/contrib/Makefile -index c55c95c..81bfdeb 100644 ---- a/contrib/Makefile -+++ b/contrib/Makefile -@@ -5,52 +5,9 @@ top_builddir = .. - include $(top_builddir)/src/Makefile.global - - WANTED_DIRS = \ -- adminpack \ -- btree_gist \ -- chkpass \ -- cube \ -- dblink \ -- dict_int \ -- dict_xsyn \ -- earthdistance \ -- fuzzystrmatch \ -- hstore \ -- intagg \ -- intarray \ -- isn \ -- lo \ -- ltree \ -- oid2name \ -- pageinspect \ -- pg_buffercache \ -- pg_freespacemap \ -- pg_standby \ -- pg_trgm \ - pgbench \ -- pgcrypto \ -- pgrowlocks \ -- pgstattuple \ -- seg \ -- spi \ -- tablefunc \ -- test_parser \ -- tsearch2 \ - vacuumlo - --ifeq ($(with_openssl),yes) --WANTED_DIRS += sslinfo --endif -- --ifeq ($(with_ossp_uuid),yes) --WANTED_DIRS += uuid-ossp --endif -- --ifeq ($(with_libxml),yes) --ifeq ($(with_libxslt),yes) --WANTED_DIRS += xml2 --endif --endif -- - # Missing: - # start-scripts \ (does not have a makefile) - -diff --git a/src/Makefile b/src/Makefile -index 8d66bf6..8db6434 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -13,20 +13,10 @@ top_builddir = .. - include Makefile.global - - --all install installdirs uninstall distprep: -- $(MAKE) -C port $@ -- $(MAKE) -C timezone $@ -- $(MAKE) -C backend $@ -- $(MAKE) -C backend/utils/mb/conversion_procs $@ -- $(MAKE) -C backend/snowball $@ -- $(MAKE) -C include $@ -- $(MAKE) -C interfaces $@ -+all install installdirs uninstall dep depend distprep: - $(MAKE) -C bin $@ -- $(MAKE) -C pl $@ -- $(MAKE) -C makefiles $@ -- $(MAKE) -C test/regress $@ - --install: install-local -+install: - - install-local: installdirs-local - $(INSTALL_DATA) Makefile.global '$(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global' -diff --git a/src/Makefile.global.in b/src/Makefile.global.in -index aa41ee9..6f64051 100644 ---- a/src/Makefile.global.in -+++ b/src/Makefile.global.in -@@ -373,10 +373,8 @@ endif - - - submake-libpq: -- $(MAKE) -C $(libpq_builddir) all - - submake-libpgport: -- $(MAKE) -C $(top_builddir)/src/port all - - .PHONY: submake-libpq submake-libpgport - -diff --git a/src/bin/Makefile b/src/bin/Makefile -index ec8f7ce..366a412 100644 ---- a/src/bin/Makefile -+++ b/src/bin/Makefile -@@ -13,8 +13,8 @@ subdir = src/bin - top_builddir = ../.. - include $(top_builddir)/src/Makefile.global - --DIRS = initdb ipcclean pg_ctl pg_dump \ -- psql scripts pg_config pg_controldata pg_resetxlog -+DIRS = pg_dump \ -+ psql scripts - ifeq ($(PORTNAME), win32) - DIRS+=pgevent - endif diff --git a/dev-db/postgresql-client/files/postgresql-8.3-common.patch b/dev-db/postgresql-client/files/postgresql-8.3-common.patch deleted file mode 100644 index c9f2ad2..0000000 --- a/dev-db/postgresql-client/files/postgresql-8.3-common.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff --git a/config/programs.m4 b/config/programs.m4 -index 9434113..d72b35c 100644 ---- a/config/programs.m4 -+++ b/config/programs.m4 -@@ -202,8 +202,12 @@ AC_DEFUN([PGAC_CHECK_GETTEXT], - dnl FIXME: We should probably check for version >=0.10.36. - AC_CHECK_PROGS(XGETTEXT, xgettext) - -- # Note: share/locale is always the default, independent of $datadir -- localedir='${prefix}/share/locale' -+ # Note: share/locale *WAS* always the default, independent of $datadir -+ AC_ARG_WITH([locale-dir], -+ AC_HELP_STRING([--with-locale-dir],[Set path to locale files]), -+ [ localedir="${withval}" ], -+ [ localedir='${prefix}/share/locale' ] -+ ) - AC_SUBST(localedir) - ])# PGAC_CHECK_GETTEXT - -diff --git a/configure.in b/configure.in -index 58cc61c..07ffc38 100644 ---- a/configure.in -+++ b/configure.in -@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros - - AC_INIT([PostgreSQL], [8.3RC1], [pgsql-bugs@postgresql.org]) - --m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required. --Untested combinations of 'autoconf' and PostgreSQL versions are not --recommended. You can remove the check from 'configure.in' but it is then --your responsibility whether the result works or not.])]) - AC_COPYRIGHT([Copyright (c) 1996-2008, PostgreSQL Global Development Group]) - AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) - AC_CONFIG_AUX_DIR(config) -diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h -index 7d9448f..07799bc 100644 ---- a/src/include/storage/s_lock.h -+++ b/src/include/storage/s_lock.h -@@ -298,6 +298,29 @@ tas(volatile slock_t *lock) - - #endif /* __s390__ || __s390x__ */ - -+#if defined(__sh__) -+#define HAS_TEST_AND_SET -+ -+typedef unsigned char slock_t; -+ -+#define TAS(lock) tas(lock) -+ -+static __inline__ int -+tas(volatile slock_t *lock) -+{ -+ register int _res = 1; -+ -+ __asm__ __volatile__( -+ "tas.b @%1\n\t" -+ "movt %0\n\t" -+ "xor #1,%0" -+: "=z"(_res) -+: "r"(lock) -+: "t","memory"); -+ return _res; -+} -+ -+#endif /* __sh__ */ - - #if defined(__sparc__) /* Sparc */ - #define HAS_TEST_AND_SET -diff --git a/src/makefiles/Makefile.darwin b/src/makefiles/Makefile.darwin -index 9f761d4..83b2974 100644 ---- a/src/makefiles/Makefile.darwin -+++ b/src/makefiles/Makefile.darwin -@@ -5,7 +5,15 @@ DLSUFFIX = .so - CFLAGS_SL = - - ifdef PGXS -+ifdef PGXS_IN_SERVER -+ifndef PGXS_WITH_SERVER -+BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres -+else -+BE_DLLLIBS= -bundle_loader ${PGXS_WITH_SERVER} -+endif -+else - BE_DLLLIBS= -bundle_loader $(bindir)/postgres -+endif - else - BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres - endif |