diff options
author | Tiziano Müller <dev-zero@gentoo.org> | 2008-04-15 09:23:35 +0000 |
---|---|---|
committer | Tiziano Müller <dev-zero@gentoo.org> | 2008-04-15 09:23:35 +0000 |
commit | cd1fd1292b5af5fdeeab01473395e0f38dfdb596 (patch) | |
tree | 084a7bd080a29264c23093d109b25f08ddb316ce | |
parent | Added pg-intdatime USE-flag for dev-db/postgresql-base (diff) | |
download | gentoo-2-cd1fd1292b5af5fdeeab01473395e0f38dfdb596.tar.gz gentoo-2-cd1fd1292b5af5fdeeab01473395e0f38dfdb596.tar.bz2 gentoo-2-cd1fd1292b5af5fdeeab01473395e0f38dfdb596.zip |
Moved into the tree. Thanks to Michael Krelin (polyonymous).
(Portage version: 2.1.5_rc2)
24 files changed, 2446 insertions, 0 deletions
diff --git a/dev-db/postgresql-base/ChangeLog b/dev-db/postgresql-base/ChangeLog new file mode 100644 index 000000000000..94a01ed83a7b --- /dev/null +++ b/dev-db/postgresql-base/ChangeLog @@ -0,0 +1,126 @@ +# ChangeLog for dev-db/postgresql-base +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.1 2008/04/15 09:23:34 dev-zero Exp $ + +*postgresql-base-8.3.1 (15 Apr 2008) +*postgresql-base-8.2.7 (15 Apr 2008) +*postgresql-base-8.1.11 (15 Apr 2008) +*postgresql-base-8.0.15 (15 Apr 2008) +*postgresql-base-7.4.19 (15 Apr 2008) +*postgresql-base-7.3.21 (15 Apr 2008) + + 15 Apr 2008; Tiziano Müller <dev-zero@gentoo.org> + +files/postgresql-7.3.21-autoconf.patch, +files/postgresql-7.3-base.patch, + +files/postgresql-7.4.19-autoconf.patch, +files/postgresql-7.4-base.patch, + +files/postgresql-7.4-common.patch, +files/postgresql-7.4-hppa.patch, + +files/postgresql-8.0-base.patch, +files/postgresql-8.0-common.patch, + +files/postgresql-8.1-base.patch, +files/postgresql-8.1-common.patch, + +files/postgresql-8.2-base.patch, +files/postgresql-8.2-common.patch, + +files/postgresql-8.3-base.patch, +files/postgresql-8.3-common.patch, + +files/postgresql-8.x-relax_ssl_perms.patch, +metadata.xml, + +postgresql-base-7.3.21.ebuild, +postgresql-base-7.4.19.ebuild, + +postgresql-base-8.0.15.ebuild, +postgresql-base-8.1.11.ebuild, + +postgresql-base-8.2.7.ebuild, +postgresql-base-8.3.1.ebuild: + Moved into the tree. Thanks to Michael Krelin (polyonymous). + + 10 Apr 2008; Tiziano Müller <dev-zero@gentoo.org> + postgresql-base-7.3.21.ebuild, postgresql-base-7.4.19.ebuild, + postgresql-base-8.0.15.ebuild, postgresql-base-8.1.11.ebuild, + postgresql-base-8.2.7.ebuild, postgresql-base-8.3.1.ebuild: + slot-files should be kept in /etc/eselect/postgresql/slots as from now. + + 07 Apr 2008; Tiziano Müller <dev-zero@gentoo.org> + postgresql-base-8.0.15.ebuild, postgresql-base-8.1.11.ebuild, + postgresql-base-8.2.7.ebuild, postgresql-base-8.3.1.ebuild, + +files/postgresql-8.x-relax_ssl_perms.patch: + Added patch to relax strict permission check on ssl key files (bug #210938). + + 07 Apr 2008; Tiziano Müller <dev-zero@gentoo.org> + files/postgresql-7.3-base.patch, files/postgresql-7.4-base.patch, + files/postgresql-8.0-base.patch, files/postgresql-8.1-base.patch, + files/postgresql-8.2-base.patch, files/postgresql-8.3-base.patch: + Standard location for unix domain socket changed to /var/run/postgresql + + 30 Mar 2008; Tiziano Müller <dev-zero@gentoo.org> + postgresql-base-8.0.15.ebuild, postgresql-base-8.1.11.ebuild, + postgresql-base-8.2.7.ebuild, postgresql-base-8.3.1.ebuild: + Added --with-thread-safety-force when building with threading-support to + skip the thread-safety-tests which randomly segfaults within the sandbox + (guessing that the case that someone has a strange system which reports + pthread-availability but in reality it isn't available is much less common + than that someone hits the mentioned bug). Added the option to use libedit + instead of readline for postgresql >=8.2. + + 27 Mar 2008; Tiziano Müller <dev-zero@gentoo.org> + postgresql-base-8.3.1.ebuild: + Added $(use_with kerberos gssapi) + + 19 Mar 2008; Tiziano Müller <dev-zero@gentoo.org> + postgresql-base-7.3.21.ebuild, postgresql-base-7.4.19.ebuild, + postgresql-base-8.0.15.ebuild, postgresql-base-8.1.11.ebuild, + postgresql-base-8.2.7.ebuild, postgresql-base-8.3.1.ebuild: + Changed deps again to allow libpq-99.99.99 + + 19 Mar 2008; Tiziano Müller <dev-zero@gentoo.org> + -postgresql-base-8.2.6.ebuild, +postgresql-base-8.2.7.ebuild, + -postgresql-base-8.3.0.ebuild, +postgresql-base-8.3.1.ebuild: + Version bump. + + 15 Mar 2008; Tiziano Müller <dev-zero@gentoo.org> + postgresql-base-7.3.21.ebuild, files/postgresql-7.3-base.patch, + postgresql-base-7.4.19.ebuild, files/postgresql-7.4-base.patch, + -files/postgresql-7.4-libs.patch, postgresql-base-8.0.15.ebuild, + postgresql-base-8.1.11.ebuild, postgresql-base-8.3.0.ebuild: + Fixed the names of the env.d-files. Fixed postgresql-7.4-base by really + using the -base.patch now instead of -libs.patch which made the tests for + postgresql-7.4-server fail. + + 10 Mar 2008; Tiziano Müller <dev-zero@gentoo.org> + postgresql-base-7.3.21.ebuild, files/postgresql-7.3-base.patch, + postgresql-base-7.4.19.ebuild, files/postgresql-7.4-base.patch: + Removed initlocation manpage and pg_id. + + 10 Mar 2008; Tiziano Müller <dev-zero@gentoo.org> + files/postgresql-7.3-base.patch: + Fixed the patch. + + 10 Mar 2008; Tiziano Müller <dev-zero@gentoo.org> +metadata.xml: + Added metadata.xml + + 10 Mar 2008; Tiziano Müller <dev-zero@gentoo.org> + +postgresql-base-7.3.21.ebuild, +files/postgresql-7.3.21-autoconf.patch, + +files/postgresql-7.3-base.patch, postgresql-base-7.4.19.ebuild, + postgresql-base-8.0.15.ebuild, postgresql-base-8.1.11.ebuild, + postgresql-base-8.2.6.ebuild, postgresql-base-8.3.0.ebuild: + Added 7.3.21. Changed descriptions. + + 07 Mar 2008; Tiziano Müller <dev-zero@gentoo.org> + postgresql-base-7.4.19.ebuild, postgresql-base-8.0.15.ebuild, + postgresql-base-8.1.11.ebuild, postgresql-base-8.2.6.ebuild, + postgresql-base-8.3.0.ebuild: + Added blockers for various packages. Removed docs installation again (will + be done in dev-db/postgresql-docs). + + 05 Mar 2008; Tiziano Müller <dev-zero@gentoo.org> + postgresql-base-7.4.19.ebuild, postgresql-base-8.0.15.ebuild, + postgresql-base-8.1.11.ebuild, postgresql-base-8.2.6.ebuild, + postgresql-base-8.3.0.ebuild: + Added blockers for all kinds of postgresql-ebuilds (in-tree and overlay). + + 02 Mar 2008; Tiziano Müller <dev-zero@gentoo.org> + +files/postgresql-7.4.19-autoconf.patch, +files/postgresql-7.4-base.patch, + +files/postgresql-7.4-common.patch, +files/postgresql-7.4-hppa.patch, + +files/postgresql-7.4-libs.patch, +files/postgresql-8.0-base.patch, + +files/postgresql-8.0-common.patch, +files/postgresql-8.1-base.patch, + +files/postgresql-8.1-common.patch, files/postgresql-8.2-base.patch, + +files/postgresql-8.3-base.patch, +files/postgresql-8.3-common.patch, + +postgresql-base-7.4.19.ebuild, +postgresql-base-8.0.15.ebuild, + +postgresql-base-8.1.11.ebuild, postgresql-base-8.2.6.ebuild, + +postgresql-base-8.3.0.ebuild: + Added patches and ebuilds for 7.4, 8.0, 8.1 and 8.2. Still untested though. + + 24 Jan 2008; Tiziano Müller <dev-zero@gentoo.org> + +files/postgresql-8.2-base.patch, +files/postgresql-8.2-common.patch, + +postgresql-base-8.2.6.ebuild: + Initial commit. + diff --git a/dev-db/postgresql-base/Manifest b/dev-db/postgresql-base/Manifest new file mode 100644 index 000000000000..57b198a50367 --- /dev/null +++ b/dev-db/postgresql-base/Manifest @@ -0,0 +1,29 @@ +AUX postgresql-7.3-base.patch 3599 RMD160 eb858855aa5d29a9993d0387b5e554fbb00cfeb8 SHA1 5c73b367989f9d77e69dbcd052fd4d7568fd9a0d SHA256 1bb7aa4dda3f5c7c1c403d7a8e6b18d2a7a90891c44940cfd13ec3c0a984bff3 +AUX postgresql-7.3.21-autoconf.patch 2141 RMD160 3bff01abeeeb094f04469960d4725c977657fb1c SHA1 aceb7ebafde14fde0efe6eefc68115fd8b4cb95a SHA256 9444af9ac2908f18fc69ef2db6fe78584384a46d28dd4c8af10740f9138796a8 +AUX postgresql-7.4-base.patch 3666 RMD160 4e638b8af36565518234c92f13eb28a078d36021 SHA1 2ed85ec46df174e11d29b75a0da496c62fe652a8 SHA256 5a8ac202dbb71d9987550c002d071db824bbe7de4d8a4329dd5af3b10fca7997 +AUX postgresql-7.4-common.patch 2640 RMD160 b25ba915d5d6ad9c12c1d51426363c196b830923 SHA1 7b946d57bfed34e2e7e1338c3ab3004341d7ab12 SHA256 36ca9cb4f26424c302fdd704b7c1a268e87612afa3006bf008d4594dabe080f8 +AUX postgresql-7.4-hppa.patch 1433 RMD160 4c4021ab6654d4c131704d6def2b2d689df7f527 SHA1 2234eff32e0ae4bdecd4b21eb9f6c7be33023652 SHA256 4424694fecd4f16655cd5ff9603489fa644175ab344498040f2c88cb0962aa6b +AUX postgresql-7.4.19-autoconf.patch 1870 RMD160 92e49d3bc82ebfce6c798b4d56008da5c8f46d33 SHA1 a42d03a9c4d7b5df7a69a3d23c9e527c6d901eba SHA256 dccd9553b9cfdc88ffe98e445e27d1714426b4f1e6f405af438243ba06b93b6e +AUX postgresql-8.0-base.patch 3974 RMD160 c0f775009c6ac981959647fb6f223c84bba12ac1 SHA1 d40dc40c61f9357d096f2fa14717e95e60f49205 SHA256 0a5379ee350a591c2a094b7145d411a39fbf2294e6ca74bfbc037ba805cc2b76 +AUX postgresql-8.0-common.patch 2294 RMD160 4f0028f6b5e95d74328f2c3981aa558420739181 SHA1 be649bf09bd5082e6e2af58c44cc470456e37780 SHA256 eca25d56bd157a3a7883d4c4305e4e0b7d22b8dd0cbca93da88add24da28b681 +AUX postgresql-8.1-base.patch 3846 RMD160 93f3b396158a03a7d4c9c2dc098491b349d24a91 SHA1 45e4a43039cfb683012653e6bf343e89f9d86415 SHA256 a4877b46d6c4f3421d8593973196862cf1790d7dce8485f207e0563531118d12 +AUX postgresql-8.1-common.patch 2290 RMD160 ba1f803b045a8d3f430231b0c22b8817e2eb8cf6 SHA1 facf27b2c396fe9f2347eb4cec3b2714a8587b70 SHA256 f80c8dd5a31b88df330c15de4331db1600ae078a789650ab28d61620f27056f5 +AUX postgresql-8.2-base.patch 4045 RMD160 3cad669ba0db500cd97b17dba376a554617670c4 SHA1 abd2e55ebd6b6d4c342a662b2f8772d02f8f6ed2 SHA256 4402e9d809bf0c994bcc1dea1f20002239799b626f7e494d4c38e6470a7e4010 +AUX postgresql-8.2-common.patch 2640 RMD160 b25ba915d5d6ad9c12c1d51426363c196b830923 SHA1 7b946d57bfed34e2e7e1338c3ab3004341d7ab12 SHA256 36ca9cb4f26424c302fdd704b7c1a268e87612afa3006bf008d4594dabe080f8 +AUX postgresql-8.3-base.patch 4130 RMD160 53cf20e4161ac9a9abd14c1a834f2e4508c5b44a SHA1 f58dbfde59f1543c8bd87527a1dfc3356c06db90 SHA256 a3bb8eca2d472a22d744a23d47d829b9931cd5bae2206e90d7e0fac4399927a5 +AUX postgresql-8.3-common.patch 2641 RMD160 0822bf1512457e91d5f32f9d192de6f197db9c55 SHA1 e4bdbd5eee1023e8f0b42ef408b34b57495d1e2b SHA256 e416c26d9c3d266b306ddbc0a2b648054739b7ace35e2b4e449fbdaf094bc197 +AUX postgresql-8.x-relax_ssl_perms.patch 764 RMD160 d1ce5164779c0b0c9229dc13d2eebe6b8c960616 SHA1 f28af41e549bbe3a0b4b8669a2762f71bf3e8a9e SHA256 98bc99954521db083320bd9a6b3a0a5d6eb960af3699527c16e53c567e22394a +DIST postgresql-7.3.21.tar.bz2 9284558 RMD160 f9de4676b4fbe3d96e6d1462b8bc3c05600d6525 SHA1 bdfa3bddc483c6642cc2ee271d076bfaa4c20c92 SHA256 bf44e0ac259e9f6e14ac102f2977496b6996ecea2fd227fbdcea5fa70e342888 +DIST postgresql-7.4.19.tar.bz2 10307396 RMD160 c9a1c7dc8e7bf9ce93c3b4f061af0563b1cc2627 SHA1 19c563d47b0d5deeef03b5ca7707c9f1917853ce SHA256 447ac7070aa0a547f17a307e842734fc27e2716cb4a251fa9a810b178d44c389 +DIST postgresql-8.0.15.tar.bz2 11253897 RMD160 6aff5c63dce73eea609f0b6e013cd043ae8b7a37 SHA1 66a6fef7749afb91471200005511c04fc1ac2706 SHA256 59408a00db1c73e638a11af10438a827507b7a72b53916d58f2d44c477718714 +DIST postgresql-8.1.11.tar.bz2 11735420 RMD160 9fb98eadc4f1015205970f26b31b68ea0378bda9 SHA1 73c0f09754fc8e3c7f8d7de49d70244b76927416 SHA256 3e91cdfc1353fa9c6416d9fc8ae9d6ab3171565f00aeb6c882214c2f08a03e2e +DIST postgresql-8.2.7.tar.bz2 12576126 RMD160 96700e91c3b9e733c686b0fe377c7ba661710942 SHA1 0be0dbaa488810ebcba77ac7246180c5b2a9b669 SHA256 39528d1ba50f5abc51569e8b9bdeb47d0d4650d289a2c2e465621864b1ff3584 +DIST postgresql-8.3.1.tar.bz2 13995572 RMD160 075efb67126f2b308d2a5fe4f9097fdbfbe94c89 SHA1 7397e0d8fd3c420ee845d9ae4995ae347bfaea1d SHA256 7ccf1e5c987920e4d6eb98b8589939e29d3a361d285055d5af35ddd8e1a2d992 +EBUILD postgresql-base-7.3.21.ebuild 4080 RMD160 2029117cb97fed77162b43965fe58212c7184a8c SHA1 889eb558d54851a3aaea87811bfff9c5ceeb66a6 SHA256 73618a4898483ab9192d9e24cf0877d54097768388754eceb03464848cecc3e2 +EBUILD postgresql-base-7.4.19.ebuild 4269 RMD160 10af0933b41c80735503f27c575f9ae887341923 SHA1 79f439e70eac94cc91565411b540ce365fb7775f SHA256 e51513d672ec158948eee0a9e42d54b4df2e90bed153be9fd7d02d98ebadc403 +EBUILD postgresql-base-8.0.15.ebuild 4353 RMD160 8c6a0db9f2aba6518af4946ae94b43855de4a850 SHA1 98d8eceefac95d909f887a22e151c06213ecd271 SHA256 77bb09f95debb0d61a44433eaa1b3a2c1eeae0a2689822448e257721dc7870ad +EBUILD postgresql-base-8.1.11.ebuild 4353 RMD160 031847c72051c1dda64bf90124f185dee64fcf10 SHA1 53c1cf4c2c4b063ece9d35d3020d39efd6e70795 SHA256 3941c759d29e02017e2d7d61d5b56230d001f90b87131e74e7e3f578b04d1571 +EBUILD postgresql-base-8.2.7.ebuild 4909 RMD160 61c7b7f90a48a257b729e8d3541d8e729eee0d50 SHA1 8e2352e1a109bdf933aad2c50cf615ba31f33297 SHA256 a81618f72534dfc5d7108474285d68017f05aea4b0fcb85f13a6b415ebb54293 +EBUILD postgresql-base-8.3.1.ebuild 4941 RMD160 d1b7085cfa223fc455702da2aee2e17156d56649 SHA1 9e47b0e7e37287e1970c98a9364e94ded70d6f67 SHA256 4a23e81eac5d0922df777bb692965814ed299489df7df99707999d543f389302 +MISC ChangeLog 6211 RMD160 a084399e7f7974ced437c3a9e59a9d7f1cb41c80 SHA1 b5c40b5659da1adf90925e1ffab39169a171cafd SHA256 8bb09524be30e46f35df7c0b663972b9b7ff7fe708021e0f19dea884b1a213c2 +MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b diff --git a/dev-db/postgresql-base/files/postgresql-7.3-base.patch b/dev-db/postgresql-base/files/postgresql-7.3-base.patch new file mode 100644 index 000000000000..b26ec669bea4 --- /dev/null +++ b/dev-db/postgresql-base/files/postgresql-7.3-base.patch @@ -0,0 +1,130 @@ +=== contrib/Makefile +================================================================== +--- contrib/Makefile (revision 12) ++++ contrib/Makefile (local) +@@ -5,40 +5,9 @@ + 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: +=== src/Makefile +================================================================== +--- src/Makefile (revision 12) ++++ src/Makefile (local) +@@ -16,11 +16,9 @@ + 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 $@ +=== src/backend/Makefile +================================================================== +--- src/backend/Makefile (revision 12) ++++ src/backend/Makefile (local) +@@ -29,7 +29,7 @@ + + ########################################################################## + +-all: submake-libpgport postgres $(POSTGRES_IMP) ++all: someheaders + + ifneq ($(PORTNAME), win) + +@@ -78,8 +78,7 @@ + + .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 @@ + + ########################################################################## + +-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) +=== src/bin/Makefile +================================================================== +--- src/bin/Makefile (revision 12) ++++ src/bin/Makefile (local) +@@ -13,8 +13,8 @@ + 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 \ ++DIRS := pg_dump \ ++ psql scripts pg_config \ + pg_encoding + + ifeq ($(with_tcl), yes) +=== src/include/pg_config.h.in +================================================================== +--- src/include/pg_config.h.in (revision 12) ++++ src/include/pg_config.h.in (local) +@@ -244,7 +244,7 @@ + * just hate the idea of sockets in /tmp, here's where to twiddle it. + * You can also override this at runtime with the postmaster's -k switch. + */ +-#define DEFAULT_PGSOCKET_DIR "/tmp" ++#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql" + + + /* diff --git a/dev-db/postgresql-base/files/postgresql-7.3.21-autoconf.patch b/dev-db/postgresql-base/files/postgresql-7.3.21-autoconf.patch new file mode 100644 index 000000000000..0b526b208831 --- /dev/null +++ b/dev-db/postgresql-base/files/postgresql-7.3.21-autoconf.patch @@ -0,0 +1,57 @@ +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-base/files/postgresql-7.4-base.patch b/dev-db/postgresql-base/files/postgresql-7.4-base.patch new file mode 100644 index 000000000000..bfff12375186 --- /dev/null +++ b/dev-db/postgresql-base/files/postgresql-7.4-base.patch @@ -0,0 +1,131 @@ +=== contrib/Makefile +================================================================== +--- contrib/Makefile (revision 10) ++++ contrib/Makefile (local) +@@ -5,41 +5,9 @@ + 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: +=== src/Makefile +================================================================== +--- src/Makefile (revision 10) ++++ src/Makefile (local) +@@ -16,11 +16,9 @@ + 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 $@ +=== src/backend/Makefile +================================================================== +--- src/backend/Makefile (revision 10) ++++ src/backend/Makefile (local) +@@ -29,7 +29,7 @@ + + ########################################################################## + +-all: submake-libpgport postgres $(POSTGRES_IMP) ++all: someheaders + + ifneq ($(PORTNAME), cygwin) + +@@ -78,8 +78,7 @@ + + .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 @@ + + ########################################################################## + +-install: all installdirs install-bin +-ifeq ($(PORTNAME), cygwin) +-ifeq ($(MAKE_DLL), true) +- $(INSTALL_DATA) libpostgres.a $(DESTDIR)$(libdir)/libpostgres.a +-endif +-endif +- $(MAKE) -C catalog install-data +- $(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) +=== src/bin/Makefile +================================================================== +--- src/bin/Makefile (revision 10) ++++ src/bin/Makefile (local) +@@ -13,8 +13,8 @@ + 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 \ ++DIRS := pg_dump \ ++ psql scripts pg_config \ + pg_encoding + + ifeq ($(with_tcl), yes) +=== src/include/pg_config_manual.h +================================================================== +--- src/include/pg_config_manual.h (revision 10) ++++ src/include/pg_config_manual.h (local) +@@ -165,7 +165,7 @@ + * here's where to twiddle it. You can also override this at runtime + * with the postmaster's -k switch. + */ +-#define DEFAULT_PGSOCKET_DIR "/tmp" ++#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql" + + /* + * Defining this will make float4 and float8 operations faster by diff --git a/dev-db/postgresql-base/files/postgresql-7.4-common.patch b/dev-db/postgresql-base/files/postgresql-7.4-common.patch new file mode 100644 index 000000000000..e6e8e46f3a0b --- /dev/null +++ b/dev-db/postgresql-base/files/postgresql-7.4-common.patch @@ -0,0 +1,88 @@ +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-base/files/postgresql-7.4-hppa.patch b/dev-db/postgresql-base/files/postgresql-7.4-hppa.patch new file mode 100644 index 000000000000..f19eb385371b --- /dev/null +++ b/dev-db/postgresql-base/files/postgresql-7.4-hppa.patch @@ -0,0 +1,54 @@ +diff --git a/src/include/port/linux.h b/src/include/port/linux.h +index 159db31..bef4c9e 100644 +--- a/src/include/port/linux.h ++++ b/src/include/port/linux.h +@@ -3,6 +3,11 @@ typedef unsigned char slock_t; + + #define HAS_TEST_AND_SET + ++#elif defined(__hppa__) ++typedef struct { int sema[4]; } slock_t; ++ ++#define HAS_TEST_AND_SET ++ + #elif defined(__sparc__) + typedef unsigned char slock_t; + +diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h +index 578d8cf..ceed34a 100644 +--- a/src/include/storage/s_lock.h ++++ b/src/include/storage/s_lock.h +@@ -112,6 +112,33 @@ tas(volatile slock_t *lock) + + #endif /* __i386__ || __x86_64__ */ + ++#if defined(__hppa__) || defined(__hppa) ++#define TAS(lock) tas(lock) ++ ++#define __ldcw(a) ({ \ ++ unsigned int __ret; \ ++ __asm__ __volatile__("ldcw 0(%2),%0" \ ++ : "=r" (__ret), "=m" (*(a)) : "r" (a)); \ ++ __ret; \ ++}) ++ ++#define __PA_LDCW_ALIGNMENT 16 ++#define __ldcw_align(a) ({ \ ++ volatile unsigned int __ret = (unsigned int) a; \ ++ if ((__ret & ~(__PA_LDCW_ALIGNMENT - 1)) < (unsigned int) a) \ ++ __ret = (__ret & ~(__PA_LDCW_ALIGNMENT - 1)) + __PA_LDCW_ALIGNMENT; \ ++ (unsigned int *) __ret; \ ++}) ++ ++static __inline__ int ++tas(volatile slock_t *lock) ++{ ++ volatile unsigned int *a = __ldcw_align (lock); ++ return (__ldcw(a) == 0); ++} ++ ++#endif /* __hppa__ || __hppa */ ++ + + /* Intel Itanium */ + #if defined(__ia64__) || defined(__ia64) diff --git a/dev-db/postgresql-base/files/postgresql-7.4.19-autoconf.patch b/dev-db/postgresql-base/files/postgresql-7.4.19-autoconf.patch new file mode 100644 index 000000000000..3913a0b86a52 --- /dev/null +++ b/dev-db/postgresql-base/files/postgresql-7.4.19-autoconf.patch @@ -0,0 +1,48 @@ +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-base/files/postgresql-8.0-base.patch b/dev-db/postgresql-base/files/postgresql-8.0-base.patch new file mode 100644 index 000000000000..20259695be71 --- /dev/null +++ b/dev-db/postgresql-base/files/postgresql-8.0-base.patch @@ -0,0 +1,141 @@ +=== contrib/Makefile +================================================================== +--- contrib/Makefile (revision 10) ++++ contrib/Makefile (local) +@@ -5,41 +5,8 @@ + 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: +=== src/Makefile +================================================================== +--- src/Makefile (revision 10) ++++ src/Makefile (local) +@@ -15,15 +15,11 @@ + + 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 + +=== src/backend/Makefile +================================================================== +--- src/backend/Makefile (revision 10) ++++ src/backend/Makefile (local) +@@ -34,7 +34,7 @@ + + ########################################################################## + +-all: submake-libpgport postgres $(POSTGRES_IMP) ++all: someheaders + + ifneq ($(PORTNAME), cygwin) + ifneq ($(PORTNAME), win32) +@@ -104,8 +104,7 @@ + + .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) +@@ -151,22 +150,7 @@ + + ########################################################################## + +-install: all installdirs install-bin +-ifeq ($(PORTNAME), cygwin) +-ifeq ($(MAKE_DLL), true) +- $(INSTALL_DATA) libpostgres.a $(DESTDIR)$(libdir)/libpostgres.a +-endif +-endif +-ifeq ($(PORTNAME), win32) +-ifeq ($(MAKE_DLL), true) +- $(INSTALL_DATA) libpostgres.a $(DESTDIR)$(libdir)/libpostgres.a +-endif +-endif +- $(MAKE) -C catalog install-data +- $(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_DATA) $(srcdir)/access/transam/recovery.conf.sample $(DESTDIR)$(datadir)/recovery.conf.sample ++install: + + install-bin: postgres $(POSTGRES_IMP) installdirs + $(INSTALL_PROGRAM) postgres$(X) $(DESTDIR)$(bindir)/postgres$(X) +=== src/bin/Makefile +================================================================== +--- src/bin/Makefile (revision 10) ++++ src/bin/Makefile (local) +@@ -13,8 +13,8 @@ + 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 pg_config + ifeq ($(PORTNAME), win32) + DIRS+=pgevent + endif +=== src/include/pg_config_manual.h +================================================================== +--- src/include/pg_config_manual.h (revision 10) ++++ src/include/pg_config_manual.h (local) +@@ -160,7 +160,7 @@ + * here's where to twiddle it. You can also override this at runtime + * with the postmaster's -k switch. + */ +-#define DEFAULT_PGSOCKET_DIR "/tmp" ++#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql" + + /* + * The random() function is expected to yield values between 0 and diff --git a/dev-db/postgresql-base/files/postgresql-8.0-common.patch b/dev-db/postgresql-base/files/postgresql-8.0-common.patch new file mode 100644 index 000000000000..40932ecf4bc7 --- /dev/null +++ b/dev-db/postgresql-base/files/postgresql-8.0-common.patch @@ -0,0 +1,76 @@ +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-base/files/postgresql-8.1-base.patch b/dev-db/postgresql-base/files/postgresql-8.1-base.patch new file mode 100644 index 000000000000..d84514f285a1 --- /dev/null +++ b/dev-db/postgresql-base/files/postgresql-8.1-base.patch @@ -0,0 +1,132 @@ +=== contrib/Makefile +================================================================== +--- contrib/Makefile (revision 10) ++++ contrib/Makefile (local) +@@ -5,32 +5,8 @@ + 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: +=== src/Makefile +================================================================== +--- src/Makefile (revision 10) ++++ src/Makefile (local) +@@ -15,15 +15,11 @@ + + 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 + +=== src/backend/Makefile +================================================================== +--- src/backend/Makefile (revision 10) ++++ src/backend/Makefile (local) +@@ -34,7 +34,7 @@ + + ########################################################################## + +-all: submake-libpgport postgres $(POSTGRES_IMP) ++all: someheaders + + ifneq ($(PORTNAME), cygwin) + ifneq ($(PORTNAME), win32) +@@ -106,8 +106,7 @@ + + .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) +@@ -153,22 +152,7 @@ + + ########################################################################## + +-install: all installdirs install-bin +-ifeq ($(PORTNAME), cygwin) +-ifeq ($(MAKE_DLL), true) +- $(INSTALL_DATA) libpostgres.a $(DESTDIR)$(libdir)/libpostgres.a +-endif +-endif +-ifeq ($(PORTNAME), win32) +-ifeq ($(MAKE_DLL), true) +- $(INSTALL_DATA) libpostgres.a $(DESTDIR)$(libdir)/libpostgres.a +-endif +-endif +- $(MAKE) -C catalog install-data +- $(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_DATA) $(srcdir)/access/transam/recovery.conf.sample $(DESTDIR)$(datadir)/recovery.conf.sample ++install: + + install-bin: postgres $(POSTGRES_IMP) installdirs + $(INSTALL_PROGRAM) postgres$(X) $(DESTDIR)$(bindir)/postgres$(X) +=== src/bin/Makefile +================================================================== +--- src/bin/Makefile (revision 10) ++++ src/bin/Makefile (local) +@@ -13,8 +13,8 @@ + 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 pg_config + ifeq ($(PORTNAME), win32) + DIRS+=pgevent + endif +=== src/include/pg_config_manual.h +================================================================== +--- src/include/pg_config_manual.h (revision 10) ++++ src/include/pg_config_manual.h (local) +@@ -175,7 +175,7 @@ + * here's where to twiddle it. You can also override this at runtime + * with the postmaster's -k switch. + */ +-#define DEFAULT_PGSOCKET_DIR "/tmp" ++#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql" + + /* + * The random() function is expected to yield values between 0 and diff --git a/dev-db/postgresql-base/files/postgresql-8.1-common.patch b/dev-db/postgresql-base/files/postgresql-8.1-common.patch new file mode 100644 index 000000000000..56704f0c5afa --- /dev/null +++ b/dev-db/postgresql-base/files/postgresql-8.1-common.patch @@ -0,0 +1,74 @@ +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-base/files/postgresql-8.2-base.patch b/dev-db/postgresql-base/files/postgresql-8.2-base.patch new file mode 100644 index 000000000000..a4881ed4f4c0 --- /dev/null +++ b/dev-db/postgresql-base/files/postgresql-8.2-base.patch @@ -0,0 +1,137 @@ +=== contrib/Makefile +================================================================== +--- contrib/Makefile (revision 10) ++++ contrib/Makefile (local) +@@ -5,37 +5,10 @@ + 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) +=== src/Makefile +================================================================== +--- src/Makefile (revision 10) ++++ src/Makefile (local) +@@ -15,15 +15,11 @@ + + 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 + +=== src/backend/Makefile +================================================================== +--- src/backend/Makefile (revision 10) ++++ src/backend/Makefile (local) +@@ -33,7 +33,7 @@ + + ########################################################################## + +-all: submake-libpgport postgres $(POSTGRES_IMP) ++all: someheaders + + ifneq ($(PORTNAME), cygwin) + ifneq ($(PORTNAME), win32) +@@ -105,8 +105,7 @@ + + .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 + + + # The postgres.o target is needed by the rule in Makefile.global that +@@ -153,22 +152,7 @@ + + ########################################################################## + +-install: all installdirs install-bin +-ifeq ($(PORTNAME), cygwin) +-ifeq ($(MAKE_DLL), true) +- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a' +-endif +-endif +-ifeq ($(PORTNAME), win32) +-ifeq ($(MAKE_DLL), true) +- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a' +-endif +-endif +- $(MAKE) -C catalog install-data +- $(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_DATA) $(srcdir)/access/transam/recovery.conf.sample '$(DESTDIR)$(datadir)/recovery.conf.sample' ++install: + + install-bin: postgres $(POSTGRES_IMP) installdirs + $(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)' +=== src/bin/Makefile +================================================================== +--- src/bin/Makefile (revision 10) ++++ src/bin/Makefile (local) +@@ -13,8 +13,8 @@ + 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 pg_config + ifeq ($(PORTNAME), win32) + DIRS+=pgevent + endif +=== src/include/pg_config_manual.h +================================================================== +--- src/include/pg_config_manual.h (revision 10) ++++ src/include/pg_config_manual.h (local) +@@ -175,7 +175,7 @@ + * here's where to twiddle it. You can also override this at runtime + * with the postmaster's -k switch. + */ +-#define DEFAULT_PGSOCKET_DIR "/tmp" ++#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql" + + /* + * The random() function is expected to yield values between 0 and diff --git a/dev-db/postgresql-base/files/postgresql-8.2-common.patch b/dev-db/postgresql-base/files/postgresql-8.2-common.patch new file mode 100644 index 000000000000..e6e8e46f3a0b --- /dev/null +++ b/dev-db/postgresql-base/files/postgresql-8.2-common.patch @@ -0,0 +1,88 @@ +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-base/files/postgresql-8.3-base.patch b/dev-db/postgresql-base/files/postgresql-8.3-base.patch new file mode 100644 index 000000000000..582e59983f9e --- /dev/null +++ b/dev-db/postgresql-base/files/postgresql-8.3-base.patch @@ -0,0 +1,143 @@ +=== contrib/Makefile +================================================================== +--- contrib/Makefile (revision 2) ++++ contrib/Makefile (local) +@@ -5,41 +5,10 @@ + 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 +=== src/Makefile +================================================================== +--- src/Makefile (revision 2) ++++ src/Makefile (local) +@@ -15,16 +15,11 @@ + + 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 $@ + $(MAKE) -C bin $@ +- $(MAKE) -C pl $@ + $(MAKE) -C makefiles $@ +- $(MAKE) -C test/regress $@ + + install: install-local + +=== src/backend/Makefile +================================================================== +--- src/backend/Makefile (revision 2) ++++ src/backend/Makefile (local) +@@ -34,7 +34,7 @@ + + ########################################################################## + +-all: submake-libpgport postgres $(POSTGRES_IMP) ++all: someheaders + + ifneq ($(PORTNAME), cygwin) + ifneq ($(PORTNAME), win32) +@@ -107,8 +107,7 @@ + + .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 + + + # The postgres.o target is needed by the rule in Makefile.global that +@@ -155,23 +154,7 @@ + + ########################################################################## + +-install: all installdirs install-bin +-ifeq ($(PORTNAME), cygwin) +-ifeq ($(MAKE_DLL), true) +- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a' +-endif +-endif +-ifeq ($(PORTNAME), win32) +-ifeq ($(MAKE_DLL), true) +- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a' +-endif +-endif +- $(MAKE) -C catalog install-data +- $(MAKE) -C tsearch install-data +- $(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_DATA) $(srcdir)/access/transam/recovery.conf.sample '$(DESTDIR)$(datadir)/recovery.conf.sample' ++install: + + install-bin: postgres $(POSTGRES_IMP) installdirs + $(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)' +=== src/bin/Makefile +================================================================== +--- src/bin/Makefile (revision 2) ++++ src/bin/Makefile (local) +@@ -13,8 +13,8 @@ + 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 pg_config + ifeq ($(PORTNAME), win32) + DIRS+=pgevent + endif +=== src/include/pg_config_manual.h +================================================================== +--- src/include/pg_config_manual.h (revision 2) ++++ src/include/pg_config_manual.h (local) +@@ -184,7 +184,7 @@ + * here's where to twiddle it. You can also override this at runtime + * with the postmaster's -k switch. + */ +-#define DEFAULT_PGSOCKET_DIR "/tmp" ++#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql" + + /* + * The random() function is expected to yield values between 0 and diff --git a/dev-db/postgresql-base/files/postgresql-8.3-common.patch b/dev-db/postgresql-base/files/postgresql-8.3-common.patch new file mode 100644 index 000000000000..c9f2ad22052a --- /dev/null +++ b/dev-db/postgresql-base/files/postgresql-8.3-common.patch @@ -0,0 +1,88 @@ +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 diff --git a/dev-db/postgresql-base/files/postgresql-8.x-relax_ssl_perms.patch b/dev-db/postgresql-base/files/postgresql-8.x-relax_ssl_perms.patch new file mode 100644 index 000000000000..242aa33e0812 --- /dev/null +++ b/dev-db/postgresql-base/files/postgresql-8.x-relax_ssl_perms.patch @@ -0,0 +1,14 @@ +diff -ur postgresql-8.0.15.orig/src/backend/libpq/be-secure.c postgresql-8.0.15/src/backend/libpq/be-secure.c +--- postgresql-8.0.15.orig/src/backend/libpq/be-secure.c 2008-02-21 04:06:04.334289203 +0100 ++++ postgresql-8.0.15/src/backend/libpq/be-secure.c 2008-02-21 04:08:47.309426324 +0100 +@@ -737,8 +737,8 @@ + * data directory permission check in postmaster.c) + */ + #if !defined(WIN32) && !defined(__CYGWIN__) +- if (!S_ISREG(buf.st_mode) || (buf.st_mode & (S_IRWXG | S_IRWXO)) || +- buf.st_uid != geteuid()) ++ if (!S_ISREG(buf.st_mode) || (buf.st_mode & (S_IWGRP | S_IRWXO)) || ++ (buf.st_uid != geteuid()) && buf.st_uid != 0) + ereport(FATAL, + (errcode(ERRCODE_CONFIG_FILE_ERROR), + errmsg("unsafe permissions on private key file \"%s\"", diff --git a/dev-db/postgresql-base/metadata.xml b/dev-db/postgresql-base/metadata.xml new file mode 100644 index 000000000000..d06e452b35af --- /dev/null +++ b/dev-db/postgresql-base/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>postgresql</herd> +</pkgmetadata> diff --git a/dev-db/postgresql-base/postgresql-base-7.3.21.ebuild b/dev-db/postgresql-base/postgresql-base-7.3.21.ebuild new file mode 100644 index 000000000000..bbe9f7acea71 --- /dev/null +++ b/dev-db/postgresql-base/postgresql-base-7.3.21.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-7.3.21.ebuild,v 1.1 2008/04/15 09:23:34 dev-zero Exp $ + +EAPI="1" + +WANT_AUTOCONF="latest" +WANT_AUTOMAKE="none" + +inherit eutils multilib toolchain-funcs versionator autotools + +KEYWORDS="~amd64 ~x86" + +DESCRIPTION="PostgreSQL libraries and clients" +HOMEPAGE="http://www.postgresql.org/" +SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2" +LICENSE="POSTGRESQL" +SLOT="$(get_version_component_range 1-2)" +IUSE_LINGUAS=" + linguas_cs linguas_de linguas_es linguas_fr linguas_hr linguas_hu + linguas_pt_BR linguas_ru linguas_sv linguas_tr linguas_zh_CN + linguas_zh_TW" +IUSE="doc kerberos nls pam pg-intdatetime readline ssl threads zlib ${IUSE_LINGUAS}" +RESTRICT="test" + +wanted_languages() { + for u in ${IUSE_LINGUAS} ; do + use $u && echo ${u#linguas_} + done +} + +RDEPEND="kerberos? ( virtual/krb5 ) + pam? ( virtual/pam ) + readline? ( >=sys-libs/readline-4.1 ) + ssl? ( >=dev-libs/openssl-0.9.6-r1 ) + zlib? ( >=sys-libs/zlib-1.1.3 ) + >=app-admin/eselect-postgresql-0.3 + !dev-db/postgresql-libs + !dev-db/postgresql-client + !dev-db/libpq + !dev-db/postgresql" +DEPEND="${RDEPEND} + >=sys-devel/bison-1.875 + nls? ( sys-devel/gettext )" +PDEPEND="doc? ( dev-db/postgresql-docs:${SLOT} )" + +S="${WORKDIR}/postgresql-${PV}" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/postgresql-${PV}-autoconf.patch" \ + "${FILESDIR}/postgresql-${SLOT}-base.patch" + + # to avoid collision - it only should be installed by server + rm "${S}/src/backend/nls.mk" + + eautoconf +} + +src_compile() { + econf --prefix=/usr/$(get_libdir)/postgresql-${SLOT} \ + --datadir=/usr/share/postgresql-${SLOT} \ + --sysconfdir=/etc/postgresql-${SLOT} \ + --includedir=/usr/include/postgresql-${SLOT} \ + --with-locale-dir=/usr/share/postgresql-${SLOT}/locale \ + --mandir=/usr/share/postgresql-${SLOT}/man \ + --host=${CHOST} \ + --with-docdir=/usr/share/doc/${PF} \ + --without-tcl \ + --without-perl \ + --without-python \ + $(use_with kerberos krb5) \ + "$(use_enable nls nls "$(wanted_languages)")" \ + $(use_with pam) \ + $(use_enable pg-intdatetime integer-datetimes ) \ + $(use_with readline) \ + $(use_with ssl openssl) \ + $(use_enable threads thread-safety ) \ + $(use_with zlib) \ + || die "configure failed" + + emake LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "emake failed" + + cd "${S}/contrib" + emake LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + insinto /usr/include/postgresql-${SLOT}/postmaster + doins "${S}"/src/include/postmaster/*.h + dodir /usr/share/postgresql-${SLOT}/man/man1 + tar -zxf "${S}/doc/man.tar.gz" -C "${D}"/usr/share/postgresql-${SLOT}/man man1/{ecpg,pg_config}.1 + + rm "${D}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,initlocation,ipcclean,pg_controldata,pg_ctl,pg_resetxlog,pg_restore,postgres,postmaster}.1 + dodoc README HISTORY doc/{README.*,TODO,bug.template} + + cd "${S}/contrib" + emake DESTDIR="${D}" install || die "emake install failed" + cd "${S}" + + dodir /etc/eselect/postgresql/slots/${SLOT} + + IDIR="/usr/include/postgresql-${SLOT}" + cat > "${D}/etc/eselect/postgresql/slots/${SLOT}/base" <<-__EOF__ +postgres_ebuilds="\${postgres_ebuilds} ${PF}" +postgres_prefix=/usr/$(get_libdir)/postgresql-${SLOT} +postgres_datadir=/usr/share/postgresql-${SLOT} +postgres_bindir=/usr/$(get_libdir)/postgresql-${SLOT}/bin +postgres_symlinks=( + ${IDIR} /usr/include/postgresql + ${IDIR}/libpq-fe.h /usr/include/libpq-fe.h + ${IDIR}/libpq /usr/include/libpq + ${IDIR}/postgres_ext.h /usr/include/postgres_ext.h +) +__EOF__ + + cat >"${T}/50postgresql-99-${SLOT}" <<-__EOF__ + LDPATH=/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir) + MANPATH=/usr/share/postgresql-${SLOT}/man + __EOF__ + doenvd "${T}/50postgresql-99-${SLOT}" + + keepdir /etc/postgresql-${SLOT} +} + +pkg_postinst() { + eselect postgresql update + [[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT} + elog "If you need a global psqlrc-file, you can place it in '${ROOT}/etc/postgresql-${SLOT}/'." +} + +pkg_postrm() { + eselect postgresql update +} diff --git a/dev-db/postgresql-base/postgresql-base-7.4.19.ebuild b/dev-db/postgresql-base/postgresql-base-7.4.19.ebuild new file mode 100644 index 000000000000..e324c782c476 --- /dev/null +++ b/dev-db/postgresql-base/postgresql-base-7.4.19.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-7.4.19.ebuild,v 1.1 2008/04/15 09:23:34 dev-zero Exp $ + +EAPI="1" + +WANT_AUTOCONF="latest" +WANT_AUTOMAKE="none" + +inherit eutils multilib toolchain-funcs versionator autotools + +KEYWORDS="~amd64 ~x86" + +DESCRIPTION="PostgreSQL libraries and clients" +HOMEPAGE="http://www.postgresql.org/" +SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2" +LICENSE="POSTGRESQL" +SLOT="$(get_version_component_range 1-2)" +IUSE_LINGUAS=" + linguas_cs linguas_de linguas_es linguas_fr linguas_hr linguas_hu + linguas_it linguas_nb linguas_pt_BR linguas_ru linguas_sl linguas_sv + linguas_tr linguas_zh_CN linguas_zh_TW" +IUSE="doc kerberos nls pam pg-intdatetime readline ssl threads zlib ${IUSE_LINGUAS}" +RESTRICT="test" + +wanted_languages() { + for u in ${IUSE_LINGUAS} ; do + use $u && echo ${u#linguas_} + done +} + +RDEPEND="kerberos? ( virtual/krb5 ) + pam? ( virtual/pam ) + readline? ( >=sys-libs/readline-4.1 ) + ssl? ( >=dev-libs/openssl-0.9.6-r1 ) + zlib? ( >=sys-libs/zlib-1.1.3 ) + >=app-admin/eselect-postgresql-0.3 + !dev-db/postgresql-libs + !dev-db/postgresql-client + !dev-db/libpq + !dev-db/postgresql" +DEPEND="${RDEPEND} + >=sys-devel/bison-1.875 + nls? ( sys-devel/gettext )" +PDEPEND="doc? ( dev-db/postgresql-docs:${SLOT} )" + +S="${WORKDIR}/postgresql-${PV}" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/postgresql-${PV}-autoconf.patch" \ + "${FILESDIR}/postgresql-${SLOT}-hppa.patch" \ + "${FILESDIR}/postgresql-${SLOT}-base.patch" + + # to avoid collision - it only should be installed by server + rm "${S}/src/backend/nls.mk" + + # because psql/help.c includes the file + ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" + + eautoreconf +} + +src_compile() { + econf --prefix=/usr/$(get_libdir)/postgresql-${SLOT} \ + --datadir=/usr/share/postgresql-${SLOT} \ + --sysconfdir=/etc/postgresql-${SLOT} \ + --includedir=/usr/include/postgresql-${SLOT} \ + --with-locale-dir=/usr/share/postgresql-${SLOT}/locale \ + --mandir=/usr/share/postgresql-${SLOT}/man \ + --host=${CHOST} \ + --with-docdir=/usr/share/doc/${PF} \ + --without-tcl \ + --without-perl \ + --without-python \ + $(use_with kerberos krb5) \ + "$(use_enable nls nls "$(wanted_languages)")" \ + $(use_with pam) \ + $(use_enable pg-intdatetime integer-datetimes ) \ + $(use_with readline) \ + $(use_with ssl openssl) \ + $(use_enable threads thread-safety ) \ + $(use_with zlib) \ + || die "configure failed" + + emake LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "emake failed" + + cd "${S}/contrib" + emake LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + insinto /usr/include/postgresql-${SLOT}/postmaster + doins "${S}"/src/include/postmaster/*.h + dodir /usr/share/postgresql-${SLOT}/man/man1 + tar -zxf "${S}/doc/man.tar.gz" -C "${D}"/usr/share/postgresql-${SLOT}/man man1/{ecpg,pg_config}.1 + + rm "${D}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,initlocation,ipcclean,pg_controldata,pg_ctl,pg_resetxlog,pg_restore,postgres,postmaster}.1 + dodoc README HISTORY doc/{README.*,TODO,bug.template} + + cd "${S}/contrib" + emake DESTDIR="${D}" install || die "emake install failed" + cd "${S}" + + dodir /etc/eselect/postgresql/slots/${SLOT} + + IDIR="/usr/include/postgresql-${SLOT}" + cat > "${D}/etc/eselect/postgresql/slots/${SLOT}/base" <<-__EOF__ +postgres_ebuilds="\${postgres_ebuilds} ${PF}" +postgres_prefix=/usr/$(get_libdir)/postgresql-${SLOT} +postgres_datadir=/usr/share/postgresql-${SLOT} +postgres_bindir=/usr/$(get_libdir)/postgresql-${SLOT}/bin +postgres_symlinks=( + ${IDIR} /usr/include/postgresql + ${IDIR}/libpq-fe.h /usr/include/libpq-fe.h + ${IDIR}/libpq /usr/include/libpq + ${IDIR}/postgres_ext.h /usr/include/postgres_ext.h +) +__EOF__ + + cat >"${T}/50postgresql-98-${SLOT}" <<-__EOF__ + LDPATH=/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir) + MANPATH=/usr/share/postgresql-${SLOT}/man + __EOF__ + doenvd "${T}/50postgresql-98-${SLOT}" + + keepdir /etc/postgresql-${SLOT} +} + +pkg_postinst() { + eselect postgresql update + [[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT} + elog "If you need a global psqlrc-file, you can place it in '${ROOT}/etc/postgresql-${SLOT}/'." +} + +pkg_postrm() { + eselect postgresql update +} diff --git a/dev-db/postgresql-base/postgresql-base-8.0.15.ebuild b/dev-db/postgresql-base/postgresql-base-8.0.15.ebuild new file mode 100644 index 000000000000..05ae31048cf7 --- /dev/null +++ b/dev-db/postgresql-base/postgresql-base-8.0.15.ebuild @@ -0,0 +1,142 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.0.15.ebuild,v 1.1 2008/04/15 09:23:34 dev-zero Exp $ + +EAPI="1" + +WANT_AUTOCONF="latest" +WANT_AUTOMAKE="none" + +inherit eutils multilib toolchain-funcs versionator autotools + +KEYWORDS="~amd64 ~x86" + +DESCRIPTION="PostgreSQL libraries and clients" +HOMEPAGE="http://www.postgresql.org/" +SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2" +LICENSE="POSTGRESQL" +SLOT="$(get_version_component_range 1-2)" +IUSE_LINGUAS=" + linguas_af linguas_cs linguas_de linguas_es linguas_fa linguas_fr + linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl + linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv + linguas_tr linguas_zh_CN linguas_zh_TW" +IUSE="doc kerberos nls pam pg-intdatetime readline ssl threads zlib ${IUSE_LINGUAS}" +RESTRICT="test" + +wanted_languages() { + for u in ${IUSE_LINGUAS} ; do + use $u && echo ${u#linguas_} + done +} + +RDEPEND="kerberos? ( virtual/krb5 ) + pam? ( virtual/pam ) + readline? ( >=sys-libs/readline-4.1 ) + ssl? ( >=dev-libs/openssl-0.9.6-r1 ) + zlib? ( >=sys-libs/zlib-1.1.3 ) + >=app-admin/eselect-postgresql-0.3 + !dev-db/postgresql-libs + !dev-db/postgresql-client + !dev-db/libpq + !dev-db/postgresql" +DEPEND="${RDEPEND} + >=sys-devel/bison-1.875 + nls? ( sys-devel/gettext )" +PDEPEND="doc? ( dev-db/postgresql-docs:${SLOT} )" + +S="${WORKDIR}/postgresql-${PV}" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/postgresql-${SLOT}-common.patch" \ + "${FILESDIR}/postgresql-${SLOT}-base.patch" \ + "${FILESDIR}/postgresql-8.x-relax_ssl_perms.patch" + + # to avoid collision - it only should be installed by server + rm "${S}/src/backend/nls.mk" + + # because psql/help.c includes the file + ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" + + eautoconf +} + +src_compile() { + econf --prefix=/usr/$(get_libdir)/postgresql-${SLOT} \ + --datadir=/usr/share/postgresql-${SLOT} \ + --sysconfdir=/etc/postgresql-${SLOT} \ + --includedir=/usr/include/postgresql-${SLOT} \ + --with-locale-dir=/usr/share/postgresql-${SLOT}/locale \ + --mandir=/usr/share/postgresql-${SLOT}/man \ + --with-docdir=/usr/share/doc/${PF} \ + --without-tcl \ + --without-perl \ + --without-python \ + $(use_with kerberos krb5) \ + "$(use_enable nls nls "$(wanted_languages)")" \ + $(use_with pam) \ + $(use_enable pg-intdatetime integer-datetimes ) \ + $(use_with readline) \ + $(use_with ssl openssl) \ + $(use_enable threads thread-safety) \ + $(use_enable threads thread-safety-force) \ + $(use_with zlib) \ + || die "configure failed" + + emake LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "emake failed" + + cd "${S}/contrib" + emake LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + insinto /usr/include/postgresql-${SLOT}/postmaster + doins "${S}"/src/include/postmaster/*.h + dodir /usr/share/postgresql-${SLOT}/man/man1 + tar -zxf "${S}/doc/man.tar.gz" -C "${D}"/usr/share/postgresql-${SLOT}/man man1/{ecpg,pg_config}.1 + + rm "${D}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,ipcclean,pg_controldata,pg_ctl,pg_resetxlog,pg_restore,postgres,postmaster}.1 + dodoc README HISTORY doc/{README.*,TODO,bug.template} + + cd "${S}/contrib" + emake DESTDIR="${D}" install || die "emake install failed" + cd "${S}" + + dodir /etc/eselect/postgresql/slots/${SLOT} + + IDIR="/usr/include/postgresql-${SLOT}" + cat > "${D}/etc/eselect/postgresql/slots/${SLOT}/base" <<-__EOF__ +postgres_ebuilds="\${postgres_ebuilds} ${PF}" +postgres_prefix=/usr/$(get_libdir)/postgresql-${SLOT} +postgres_datadir=/usr/share/postgresql-${SLOT} +postgres_bindir=/usr/$(get_libdir)/postgresql-${SLOT}/bin +postgres_symlinks=( + ${IDIR} /usr/include/postgresql + ${IDIR}/libpq-fe.h /usr/include/libpq-fe.h + ${IDIR}/libpq /usr/include/libpq + ${IDIR}/postgres_ext.h /usr/include/postgres_ext.h +) +__EOF__ + + cat >"${T}/50postgresql-97-${SLOT}" <<-__EOF__ + LDPATH=/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir) + MANPATH=/usr/share/postgresql-${SLOT}/man + __EOF__ + doenvd "${T}/50postgresql-97-${SLOT}" + + keepdir /etc/postgresql-${SLOT} +} + +pkg_postinst() { + eselect postgresql update + [[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT} + elog "If you need a global psqlrc-file, you can place it in '${ROOT}/etc/postgresql-${SLOT}/'." +} + +pkg_postrm() { + eselect postgresql update +} diff --git a/dev-db/postgresql-base/postgresql-base-8.1.11.ebuild b/dev-db/postgresql-base/postgresql-base-8.1.11.ebuild new file mode 100644 index 000000000000..4d28fe3814c3 --- /dev/null +++ b/dev-db/postgresql-base/postgresql-base-8.1.11.ebuild @@ -0,0 +1,142 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.1.11.ebuild,v 1.1 2008/04/15 09:23:34 dev-zero Exp $ + +EAPI="1" + +WANT_AUTOCONF="latest" +WANT_AUTOMAKE="none" + +inherit eutils multilib toolchain-funcs versionator autotools + +KEYWORDS="~amd64 ~x86" + +DESCRIPTION="PostgreSQL libraries and clients" +HOMEPAGE="http://www.postgresql.org/" +SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2" +LICENSE="POSTGRESQL" +SLOT="$(get_version_component_range 1-2)" +IUSE_LINGUAS=" + linguas_af linguas_cs linguas_de linguas_es linguas_fa linguas_fr + linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl + linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv + linguas_tr linguas_zh_CN linguas_zh_TW" +IUSE="doc kerberos nls pam pg-intdatetime readline ssl threads zlib ${IUSE_LINGUAS}" +RESTRICT="test" + +wanted_languages() { + for u in ${IUSE_LINGUAS} ; do + use $u && echo ${u#linguas_} + done +} + +RDEPEND="kerberos? ( virtual/krb5 ) + pam? ( virtual/pam ) + readline? ( >=sys-libs/readline-4.1 ) + ssl? ( >=dev-libs/openssl-0.9.6-r1 ) + zlib? ( >=sys-libs/zlib-1.1.3 ) + >=app-admin/eselect-postgresql-0.3 + !dev-db/postgresql-libs + !dev-db/postgresql-client + !dev-db/libpq + !dev-db/postgresql" +DEPEND="${RDEPEND} + >=sys-devel/bison-1.875 + nls? ( sys-devel/gettext )" +PDEPEND="doc? ( dev-db/postgresql-docs:${SLOT} )" + +S="${WORKDIR}/postgresql-${PV}" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/postgresql-${SLOT}-common.patch" \ + "${FILESDIR}/postgresql-${SLOT}-base.patch" \ + "${FILESDIR}/postgresql-8.x-relax_ssl_perms.patch" + + # to avoid collision - it only should be installed by server + rm "${S}/src/backend/nls.mk" + + # because psql/help.c includes the file + ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" + + eautoconf +} + +src_compile() { + econf --prefix=/usr/$(get_libdir)/postgresql-${SLOT} \ + --datadir=/usr/share/postgresql-${SLOT} \ + --sysconfdir=/etc/postgresql-${SLOT} \ + --includedir=/usr/include/postgresql-${SLOT} \ + --with-locale-dir=/usr/share/postgresql-${SLOT}/locale \ + --mandir=/usr/share/postgresql-${SLOT}/man \ + --with-docdir=/usr/share/doc/${PF} \ + --without-tcl \ + --without-perl \ + --without-python \ + $(use_with kerberos krb5) \ + "$(use_enable nls nls "$(wanted_languages)")" \ + $(use_with pam) \ + $(use_enable pg-intdatetime integer-datetimes ) \ + $(use_with readline) \ + $(use_with ssl openssl) \ + $(use_enable threads thread-safety) \ + $(use_enable threads thread-safety-force) \ + $(use_with zlib) \ + || die "configure failed" + + emake LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "emake failed" + + cd "${S}/contrib" + emake LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + insinto /usr/include/postgresql-${SLOT}/postmaster + doins "${S}"/src/include/postmaster/*.h + dodir /usr/share/postgresql-${SLOT}/man/man1 + tar -zxf "${S}/doc/man.tar.gz" -C "${D}"/usr/share/postgresql-${SLOT}/man man1/{ecpg,pg_config}.1 + + rm "${D}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,ipcclean,pg_controldata,pg_ctl,pg_resetxlog,pg_restore,postgres,postmaster}.1 + dodoc README HISTORY doc/{README.*,TODO,bug.template} + + cd "${S}/contrib" + emake DESTDIR="${D}" install || die "emake install failed" + cd "${S}" + + dodir /etc/eselect/postgresql/slots/${SLOT} + + IDIR="/usr/include/postgresql-${SLOT}" + cat > "${D}/etc/eselect/postgresql/slots/${SLOT}/base" <<-__EOF__ +postgres_ebuilds="\${postgres_ebuilds} ${PF}" +postgres_prefix=/usr/$(get_libdir)/postgresql-${SLOT} +postgres_datadir=/usr/share/postgresql-${SLOT} +postgres_bindir=/usr/$(get_libdir)/postgresql-${SLOT}/bin +postgres_symlinks=( + ${IDIR} /usr/include/postgresql + ${IDIR}/libpq-fe.h /usr/include/libpq-fe.h + ${IDIR}/libpq /usr/include/libpq + ${IDIR}/postgres_ext.h /usr/include/postgres_ext.h +) +__EOF__ + + cat >"${T}/50postgresql-96-${SLOT}" <<-__EOF__ + LDPATH=/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir) + MANPATH=/usr/share/postgresql-${SLOT}/man + __EOF__ + doenvd "${T}/50postgresql-96-${SLOT}" + + keepdir /etc/postgresql-${SLOT} +} + +pkg_postinst() { + eselect postgresql update + [[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT} + elog "If you need a global psqlrc-file, you can place it in '${ROOT}/etc/postgresql-${SLOT}/'." +} + +pkg_postrm() { + eselect postgresql update +} diff --git a/dev-db/postgresql-base/postgresql-base-8.2.7.ebuild b/dev-db/postgresql-base/postgresql-base-8.2.7.ebuild new file mode 100644 index 000000000000..3df209596a4a --- /dev/null +++ b/dev-db/postgresql-base/postgresql-base-8.2.7.ebuild @@ -0,0 +1,161 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.2.7.ebuild,v 1.1 2008/04/15 09:23:34 dev-zero Exp $ + +EAPI="1" + +WANT_AUTOCONF="latest" +WANT_AUTOMAKE="none" + +inherit eutils multilib toolchain-funcs versionator autotools + +KEYWORDS="~amd64 ~x86" + +DESCRIPTION="PostgreSQL libraries and clients" +HOMEPAGE="http://www.postgresql.org/" +SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2" +LICENSE="POSTGRESQL" +SLOT="$(get_version_component_range 1-2)" +IUSE_LINGUAS=" + linguas_af linguas_cs linguas_de linguas_es linguas_fa linguas_fr + linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl + linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv + linguas_tr linguas_zh_CN linguas_zh_TW" +IUSE="doc kerberos libedit nls pam pg-intdatetime readline ssl threads zlib ldap ${IUSE_LINGUAS}" +RESTRICT="test" + +wanted_languages() { + for u in ${IUSE_LINGUAS} ; do + use $u && echo ${u#linguas_} + done +} + +RDEPEND="kerberos? ( virtual/krb5 ) + pam? ( virtual/pam ) + readline? ( !libedit? ( >=sys-libs/readline-4.1 ) ) + libedit? ( dev-libs/libedit ) + ssl? ( >=dev-libs/openssl-0.9.6-r1 ) + zlib? ( >=sys-libs/zlib-1.1.3 ) + >=app-admin/eselect-postgresql-0.3 + !dev-db/postgresql-libs + !dev-db/postgresql-client + !dev-db/libpq + !dev-db/postgresql + ldap? ( net-nds/openldap )" +DEPEND="${RDEPEND} + >=sys-devel/bison-1.875 + nls? ( sys-devel/gettext )" +PDEPEND="doc? ( dev-db/postgresql-docs:${SLOT} )" + +S="${WORKDIR}/postgresql-${PV}" + +pkg_setup() { + if use readline && use libedit ; then + ewarn "PostgreSQL can use libedit OR readline but not both, libedit" + ewarn "will be used. If that is not what you want, please stop the" + ewarn "merge and unset the 'libedit' USE-flag for ${PN}." + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/postgresql-${SLOT}-common.patch" \ + "${FILESDIR}/postgresql-${SLOT}-base.patch" \ + "${FILESDIR}/postgresql-8.x-relax_ssl_perms.patch" + + # to avoid collision - it only should be installed by server + rm "${S}/src/backend/nls.mk" + + # because psql/help.c includes the file + ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" + + eautoconf +} + +src_compile() { + local myconf + if use readline || use libedit ; then + myconf="${myconf} --with-readline $(use_with libedit libedit-preferred)" + else + myconf="${myconf} --without-readline" + fi + + econf --prefix=/usr/$(get_libdir)/postgresql-${SLOT} \ + --datadir=/usr/share/postgresql-${SLOT} \ + --sysconfdir=/etc/postgresql-${SLOT} \ + --includedir=/usr/include/postgresql-${SLOT} \ + --with-locale-dir=/usr/share/postgresql-${SLOT}/locale \ + --mandir=/usr/share/postgresql-${SLOT}/man \ + --with-docdir=/usr/share/doc/${PF} \ + --enable-depend \ + --without-tcl \ + --without-perl \ + --without-python \ + $(use_with kerberos krb5) \ + "$(use_enable nls nls "$(wanted_languages)")" \ + $(use_with pam) \ + $(use_enable pg-intdatetime integer-datetimes ) \ + $(use_with ssl openssl) \ + $(use_enable threads thread-safety) \ + $(use_enable threads thread-safety-force) \ + $(use_with zlib) \ + $(use_with ldap) \ + ${myconf} \ + || die "configure failed" + + emake LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "emake failed" + + cd "${S}/contrib" + emake LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + insinto /usr/include/postgresql-${SLOT}/postmaster + doins "${S}"/src/include/postmaster/*.h + dodir /usr/share/postgresql-${SLOT}/man/man1 + tar -zxf "${S}/doc/man.tar.gz" -C "${D}"/usr/share/postgresql-${SLOT}/man man1/{ecpg,pg_config}.1 + + rm "${D}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,ipcclean,pg_controldata,pg_ctl,pg_resetxlog,pg_restore,postgres,postmaster}.1 + dodoc README HISTORY doc/{README.*,TODO,bug.template} + + cd "${S}/contrib" + emake DESTDIR="${D}" install || die "emake install failed" + cd "${S}" + + dodir /etc/eselect/postgresql/slots/${SLOT} + + IDIR="/usr/include/postgresql-${SLOT}" + cat > "${D}/etc/eselect/postgresql/slots/${SLOT}/base" <<-__EOF__ +postgres_ebuilds="\${postgres_ebuilds} ${PF}" +postgres_prefix=/usr/$(get_libdir)/postgresql-${SLOT} +postgres_datadir=/usr/share/postgresql-${SLOT} +postgres_bindir=/usr/$(get_libdir)/postgresql-${SLOT}/bin +postgres_symlinks=( + ${IDIR} /usr/include/postgresql + ${IDIR}/libpq-fe.h /usr/include/libpq-fe.h + ${IDIR}/libpq /usr/include/libpq + ${IDIR}/postgres_ext.h /usr/include/postgres_ext.h +) +__EOF__ + + cat >"${T}/50postgresql-95-${SLOT}" <<-__EOF__ + LDPATH=/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir) + MANPATH=/usr/share/postgresql-${SLOT}/man + __EOF__ + doenvd "${T}/50postgresql-95-${SLOT}" + + keepdir /etc/postgresql-${SLOT} +} + +pkg_postinst() { + eselect postgresql update + [[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT} + elog "If you need a global psqlrc-file, you can place it in '${ROOT}/etc/postgresql-${SLOT}/'." +} + +pkg_postrm() { + eselect postgresql update +} diff --git a/dev-db/postgresql-base/postgresql-base-8.3.1.ebuild b/dev-db/postgresql-base/postgresql-base-8.3.1.ebuild new file mode 100644 index 000000000000..1611e7690109 --- /dev/null +++ b/dev-db/postgresql-base/postgresql-base-8.3.1.ebuild @@ -0,0 +1,162 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.3.1.ebuild,v 1.1 2008/04/15 09:23:34 dev-zero Exp $ + +EAPI="1" + +WANT_AUTOCONF="latest" +WANT_AUTOMAKE="none" + +inherit eutils multilib toolchain-funcs versionator autotools + +KEYWORDS="~amd64 ~x86" + +DESCRIPTION="PostgreSQL libraries and clients" +HOMEPAGE="http://www.postgresql.org/" +SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2" +LICENSE="POSTGRESQL" +SLOT="$(get_version_component_range 1-2)" +IUSE_LINGUAS=" + linguas_af linguas_cs linguas_de linguas_es linguas_fa linguas_fr + linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl + linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv + linguas_tr linguas_zh_CN linguas_zh_TW" +IUSE="doc kerberos libedit nls pam pg-intdatetime readline ssl threads zlib ldap ${IUSE_LINGUAS}" +RESTRICT="test" + +wanted_languages() { + for u in ${IUSE_LINGUAS} ; do + use $u && echo ${u#linguas_} + done +} + +RDEPEND="kerberos? ( virtual/krb5 ) + pam? ( virtual/pam ) + readline? ( !libedit? ( >=sys-libs/readline-4.1 ) ) + libedit? ( dev-libs/libedit ) + ssl? ( >=dev-libs/openssl-0.9.6-r1 ) + zlib? ( >=sys-libs/zlib-1.1.3 ) + >=app-admin/eselect-postgresql-0.3 + !dev-db/postgresql-libs + !dev-db/postgresql-client + !dev-db/libpq + !dev-db/postgresql + ldap? ( net-nds/openldap )" +DEPEND="${RDEPEND} + >=sys-devel/bison-1.875 + nls? ( sys-devel/gettext )" +PDEPEND="doc? ( dev-db/postgresql-docs:${SLOT} )" + +S="${WORKDIR}/postgresql-${PV}" + +pkg_setup() { + if use readline && use libedit ; then + ewarn "PostgreSQL can use libedit OR readline but not both, libedit" + ewarn "will be used. If that is not what you want, please stop the" + ewarn "merge and unset the 'libedit' USE-flag for ${PN}." + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/postgresql-${SLOT}-common.patch" \ + "${FILESDIR}/postgresql-${SLOT}-base.patch" \ + "${FILESDIR}/postgresql-8.x-relax_ssl_perms.patch" + + # to avoid collision - it only should be installed by server + rm "${S}/src/backend/nls.mk" + + # because psql/help.c includes the file + ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" + + eautoconf +} + +src_compile() { + local myconf + if use readline || use libedit ; then + myconf="${myconf} --with-readline $(use_with libedit libedit-preferred)" + else + myconf="${myconf} --without-readline" + fi + + econf --prefix=/usr/$(get_libdir)/postgresql-${SLOT} \ + --datadir=/usr/share/postgresql-${SLOT} \ + --sysconfdir=/etc/postgresql-${SLOT} \ + --includedir=/usr/include/postgresql-${SLOT} \ + --with-locale-dir=/usr/share/postgresql-${SLOT}/locale \ + --mandir=/usr/share/postgresql-${SLOT}/man \ + --with-docdir=/usr/share/doc/${PF} \ + --enable-depend \ + --without-tcl \ + --without-perl \ + --without-python \ + $(use_with kerberos krb5) \ + $(use_with kerberos gssapi) \ + "$(use_enable nls nls "$(wanted_languages)")" \ + $(use_with pam) \ + $(use_enable pg-intdatetime integer-datetimes ) \ + $(use_with ssl openssl) \ + $(use_enable threads thread-safety) \ + $(use_enable threads thread-safety-force) \ + $(use_with zlib) \ + $(use_with ldap) \ + ${myconf} \ + || die "configure failed" + + emake LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "emake failed" + + cd "${S}/contrib" + emake LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + insinto /usr/include/postgresql-${SLOT}/postmaster + doins "${S}"/src/include/postmaster/*.h + dodir /usr/share/postgresql-${SLOT}/man/man1 + tar -zxf "${S}/doc/man.tar.gz" -C "${D}"/usr/share/postgresql-${SLOT}/man man1/{ecpg,pg_config}.1 + + rm "${D}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,ipcclean,pg_controldata,pg_ctl,pg_resetxlog,pg_restore,postgres,postmaster}.1 + dodoc README HISTORY doc/{README.*,TODO,bug.template} + + cd "${S}/contrib" + emake DESTDIR="${D}" install || die "emake install failed" + cd "${S}" + + dodir /etc/eselect/postgresql/slots/${SLOT} + + IDIR="/usr/include/postgresql-${SLOT}" + cat > "${D}/etc/eselect/postgresql/slots/${SLOT}/base" <<-__EOF__ +postgres_ebuilds="\${postgres_ebuilds} ${PF}" +postgres_prefix=/usr/$(get_libdir)/postgresql-${SLOT} +postgres_datadir=/usr/share/postgresql-${SLOT} +postgres_bindir=/usr/$(get_libdir)/postgresql-${SLOT}/bin +postgres_symlinks=( + ${IDIR} /usr/include/postgresql + ${IDIR}/libpq-fe.h /usr/include/libpq-fe.h + ${IDIR}/libpq /usr/include/libpq + ${IDIR}/postgres_ext.h /usr/include/postgres_ext.h +) +__EOF__ + + cat >"${T}/50postgresql-94-${SLOT}" <<-__EOF__ + LDPATH=/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir) + MANPATH=/usr/share/postgresql-${SLOT}/man + __EOF__ + doenvd "${T}/50postgresql-94-${SLOT}" + + keepdir /etc/postgresql-${SLOT} +} + +pkg_postinst() { + eselect postgresql update + [[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT} + elog "If you need a global psqlrc-file, you can place it in '${ROOT}/etc/postgresql-${SLOT}/'." +} + +pkg_postrm() { + eselect postgresql update +} |