diff options
| author | jlam <jlam@pkgsrc.org> | 2003-01-05 20:12:07 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2003-01-05 20:12:07 +0000 |
| commit | 4ec712783e2eb6ec0ee1c259ba86d37331e80721 (patch) | |
| tree | 8842dbd7cb62a42e6ad7ce2170133b6607b61bc2 /databases | |
| parent | 173c3b193c8ddd3fdee51968222c54ce4d90e0ae (diff) | |
| download | pkgsrc-4ec712783e2eb6ec0ee1c259ba86d37331e80721.tar.gz | |
Updated databases/postgresql to 7.3.1.
==================================================================
| NOTE: A dump-and-restore is required to update your databases |
| if you wish to update postgresql-server. If your |
| application examines the system catalogs, additional |
| changes will be required due to the introduction of |
| schemas in 7.3; for more information, see: |
| |
| http://www.ca.postgresql.org/docs/momjian/upgrade_tips_7.3 |
==================================================================
Major changes from version 7.2.3 include:
Schemas
Schemas allow users to create objects in separate namespaces,
so two people or applications can have tables with the same
name. There is also a public schema for shared tables.
Table/index creation can be restricted by removing permissions
on the public schema.
Drop Column
PostgreSQL now supports the ALTER TABLE ... DROP COLUMN
functionality.
Table Functions
Functions returning multiple rows and/or multiple columns are
now much easier to use than before. You can call such a "table
function" in the SELECT FROM clause, treating its output like a
table. Also, PL/pgSQL functions can now return sets.
Prepared Queries
PostgreSQL now supports prepared queries, for improved
performance.
Dependency Tracking
PostgreSQL now records object dependencies, which allows
improvements in many areas. "DROP" statements now take either
CASCADE or RESTRICT to control whether dependent objects are
also dropped.
Privileges
Functions and procedural languages now have privileges, and
functions can be defined to run with the privileges of their
creator.
Internationalization
Both multibyte and locale support are now always enabled.
Logging
A variety of logging options have been enhanced.
Interfaces
A large number of interfaces have been moved to
http://gborg.postgresql.org where they can be developed and
released independently.
Functions/Identifiers
By default, functions can now take up to 32 parameters, and
identifiers can be up to 63 bytes long. Also, OPAQUE is now
deprecated: there are specific "pseudo-datatypes" to represent
each of the former meanings of OPAQUE in function argument and
result types.
Diffstat (limited to 'databases')
30 files changed, 642 insertions, 914 deletions
diff --git a/databases/postgresql-client/Makefile b/databases/postgresql-client/Makefile index 7568f82dbe2..55d9e674598 100644 --- a/databases/postgresql-client/Makefile +++ b/databases/postgresql-client/Makefile @@ -1,28 +1,33 @@ -# $NetBSD: Makefile,v 1.16 2002/10/24 16:25:32 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2003/01/05 20:12:21 jlam Exp $ PKGNAME= postgresql-client-${BASE_VERS} COMMENT= PostgreSQL database client programs -USE_BUILDLINK2= # defined - -.include "../../databases/postgresql/Makefile.common" +.include "../postgresql/Makefile.common" CONFIGURE_ARGS+= --with-openssl=${SSLBASE} -CONFIGURE_ARGS+= --enable-readline +CONFIGURE_ARGS+= --with-zlib +CONFIGURE_ARGS+= --with-readline MAKE_ENV+= INSTALLED_LIBPQ=1 BUILD_DIRS= ${WRKSRC}/src/bin pre-build: cd ${WRKSRC}/src/bin/psql && \ - ${RM} -f pqsignal.h && \ - ${LN} -sf ../../interfaces/libpq/pqsignal.h pqsignal.h + ${RM} -f pqsignal.h && \ + ${LN} -sf ${BUILDLINK_DIR}/include/postgresql/server/libpq/pqsignal.h pqsignal.h + for file in parser/parse.h utils/fmgroids.h; do \ + src="${BUILDLINK_DIR}/include/postgresql/server/$$file"; \ + dest="${WRKSRC}/src/include/$$file"; \ + ${RM} -f $$dest; \ + ${LN} -sf $$src $$dest; \ + done post-install: cd ${PREFIX}/man && \ ${PAX} -crzf ${WRKSRC}/doc/man.tar.gz `${GREP} -v ^# ${FILESDIR}/exclude` -.include "../../databases/postgresql-lib/buildlink2.mk" +.include "../postgresql-lib/buildlink2.mk" .include "../../devel/readline/buildlink2.mk" .include "../../devel/zlib/buildlink2.mk" diff --git a/databases/postgresql-client/PLIST b/databases/postgresql-client/PLIST index 4769e6ef0b5..5e6084d4860 100644 --- a/databases/postgresql-client/PLIST +++ b/databases/postgresql-client/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.2 2002/04/04 07:41:00 jlam Exp $ +@comment $NetBSD: PLIST,v 1.3 2003/01/05 20:12:21 jlam Exp $ +bin/clusterdb bin/createdb bin/createlang bin/createuser @@ -9,15 +10,17 @@ bin/initdb bin/initlocation bin/ipcclean bin/pg_config +bin/pg_controldata bin/pg_ctl bin/pg_dump bin/pg_dumpall bin/pg_encoding bin/pg_id -bin/pg_passwd +bin/pg_resetxlog bin/pg_restore bin/psql bin/vacuumdb +man/man1/clusterdb.1 man/man1/createdb.1 man/man1/createlang.1 man/man1/createuser.1 @@ -28,16 +31,19 @@ man/man1/initdb.1 man/man1/initlocation.1 man/man1/ipcclean.1 man/man1/pg_config.1 +man/man1/pg_controldata.1 man/man1/pg_ctl.1 man/man1/pg_dump.1 man/man1/pg_dumpall.1 -man/man1/pg_passwd.1 +man/man1/pg_resetxlog.1 man/man1/pg_restore.1 man/man1/psql.1 man/man1/vacuumdb.1 man/manl/abort.l +man/manl/alter_database.l man/manl/alter_group.l man/manl/alter_table.l +man/manl/alter_trigger.l man/manl/alter_user.l man/manl/analyze.l man/manl/begin.l @@ -48,31 +54,42 @@ man/manl/comment.l man/manl/commit.l man/manl/copy.l man/manl/create_aggregate.l +man/manl/create_cast.l man/manl/create_constraint_trigger.l +man/manl/create_conversion.l man/manl/create_database.l +man/manl/create_domain.l man/manl/create_function.l man/manl/create_group.l man/manl/create_index.l man/manl/create_language.l man/manl/create_operator.l +man/manl/create_operator_class.l man/manl/create_rule.l +man/manl/create_schema.l man/manl/create_sequence.l -man/manl/create_table_as.l man/manl/create_table.l +man/manl/create_table_as.l man/manl/create_trigger.l man/manl/create_type.l man/manl/create_user.l man/manl/create_view.l +man/manl/deallocate.l man/manl/declare.l man/manl/delete.l man/manl/drop_aggregate.l +man/manl/drop_cast.l +man/manl/drop_conversion.l man/manl/drop_database.l +man/manl/drop_domain.l man/manl/drop_function.l man/manl/drop_group.l man/manl/drop_index.l man/manl/drop_language.l man/manl/drop_operator.l +man/manl/drop_operator_class.l man/manl/drop_rule.l +man/manl/drop_schema.l man/manl/drop_sequence.l man/manl/drop_table.l man/manl/drop_trigger.l @@ -80,6 +97,7 @@ man/manl/drop_type.l man/manl/drop_user.l man/manl/drop_view.l man/manl/end.l +man/manl/execute.l man/manl/explain.l man/manl/fetch.l man/manl/grant.l @@ -89,17 +107,19 @@ man/manl/load.l man/manl/lock.l man/manl/move.l man/manl/notify.l +man/manl/prepare.l man/manl/reindex.l man/manl/reset.l man/manl/revoke.l man/manl/rollback.l -man/manl/select_into.l man/manl/select.l +man/manl/select_into.l +man/manl/set.l man/manl/set_constraints.l man/manl/set_session_authorization.l -man/manl/set.l man/manl/set_transaction.l man/manl/show.l +man/manl/start_transaction.l man/manl/truncate.l man/manl/unlisten.l man/manl/update.l diff --git a/databases/postgresql-client/files/exclude b/databases/postgresql-client/files/exclude index eeeb5d5a96b..01293b119f4 100644 --- a/databases/postgresql-client/files/exclude +++ b/databases/postgresql-client/files/exclude @@ -1,7 +1,6 @@ -# $NetBSD: exclude,v 1.1.1.1 2001/05/14 14:45:36 jlam Exp $ +# $NetBSD: exclude,v 1.2 2003/01/05 20:12:22 jlam Exp $ # man1/ecpg.1 -man1/pgaccess.1 man1/pgtclsh.1 man1/pgtksh.1 man1/postgres.1 diff --git a/databases/postgresql-docs/Makefile b/databases/postgresql-docs/Makefile index b4e3254bf43..f80c7f3444d 100644 --- a/databases/postgresql-docs/Makefile +++ b/databases/postgresql-docs/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.4 2002/10/19 03:03:50 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2003/01/05 20:12:22 jlam Exp $ PKGNAME= postgresql-docs-${BASE_VERS} COMMENT= PostgreSQL database system documentation -USE_BUILDLINK2= # defined - -.include "../../databases/postgresql/Makefile.common" +.include "../postgresql/Makefile.common" BUILD_DIRS= ${WRKSRC}/doc DOCDIR= ${PREFIX}/share/doc/postgresql diff --git a/databases/postgresql-docs/PLIST b/databases/postgresql-docs/PLIST index 327e5543e06..ec8c7a17d1d 100644 --- a/databases/postgresql-docs/PLIST +++ b/databases/postgresql-docs/PLIST @@ -1,5 +1,7 @@ -@comment $NetBSD: PLIST,v 1.3 2002/04/06 09:41:03 taca Exp $ +@comment $NetBSD: PLIST,v 1.4 2003/01/05 20:12:23 jlam Exp $ +share/doc/html/postgresql/admin-preface.html share/doc/html/postgresql/admin.html +share/doc/html/postgresql/app-clusterdb.html share/doc/html/postgresql/app-createdb.html share/doc/html/postgresql/app-createlang.html share/doc/html/postgresql/app-createuser.html @@ -12,10 +14,10 @@ share/doc/html/postgresql/app-initlocation.html share/doc/html/postgresql/app-ipcclean.html share/doc/html/postgresql/app-pg-ctl.html share/doc/html/postgresql/app-pg-dumpall.html -share/doc/html/postgresql/app-pg-passwd.html -share/doc/html/postgresql/app-pgaccess.html share/doc/html/postgresql/app-pgconfig.html +share/doc/html/postgresql/app-pgcontroldata.html share/doc/html/postgresql/app-pgdump.html +share/doc/html/postgresql/app-pgresetxlog.html share/doc/html/postgresql/app-pgrestore.html share/doc/html/postgresql/app-pgtclsh.html share/doc/html/postgresql/app-pgtksh.html @@ -35,10 +37,17 @@ share/doc/html/postgresql/bki-example.html share/doc/html/postgresql/bki.html share/doc/html/postgresql/bug-reporting.html share/doc/html/postgresql/catalog-pg-aggregate.html +share/doc/html/postgresql/catalog-pg-am.html +share/doc/html/postgresql/catalog-pg-amop.html +share/doc/html/postgresql/catalog-pg-amproc.html share/doc/html/postgresql/catalog-pg-attrdef.html share/doc/html/postgresql/catalog-pg-attribute.html +share/doc/html/postgresql/catalog-pg-cast.html share/doc/html/postgresql/catalog-pg-class.html +share/doc/html/postgresql/catalog-pg-constraint.html +share/doc/html/postgresql/catalog-pg-conversion.html share/doc/html/postgresql/catalog-pg-database.html +share/doc/html/postgresql/catalog-pg-depend.html share/doc/html/postgresql/catalog-pg-description.html share/doc/html/postgresql/catalog-pg-group.html share/doc/html/postgresql/catalog-pg-index.html @@ -46,9 +55,10 @@ share/doc/html/postgresql/catalog-pg-inherits.html share/doc/html/postgresql/catalog-pg-language.html share/doc/html/postgresql/catalog-pg-largeobject.html share/doc/html/postgresql/catalog-pg-listener.html +share/doc/html/postgresql/catalog-pg-namespace.html +share/doc/html/postgresql/catalog-pg-opclass.html share/doc/html/postgresql/catalog-pg-operator.html share/doc/html/postgresql/catalog-pg-proc.html -share/doc/html/postgresql/catalog-pg-relcheck.html share/doc/html/postgresql/catalog-pg-rewrite.html share/doc/html/postgresql/catalog-pg-shadow.html share/doc/html/postgresql/catalog-pg-statistic.html @@ -74,26 +84,46 @@ share/doc/html/postgresql/datatype-datetime.html share/doc/html/postgresql/datatype-geometric.html share/doc/html/postgresql/datatype-money.html share/doc/html/postgresql/datatype-net-types.html +share/doc/html/postgresql/datatype-oid.html +share/doc/html/postgresql/datatype-pseudo.html share/doc/html/postgresql/datatype.html share/doc/html/postgresql/datetime-appendix.html -share/doc/html/postgresql/db-accessing.html -share/doc/html/postgresql/db-destroy.html +share/doc/html/postgresql/ddl-alter.html +share/doc/html/postgresql/ddl-constraints.html +share/doc/html/postgresql/ddl-depend.html +share/doc/html/postgresql/ddl-inherit.html +share/doc/html/postgresql/ddl-others.html +share/doc/html/postgresql/ddl-priv.html +share/doc/html/postgresql/ddl-schemas.html +share/doc/html/postgresql/ddl-system-columns.html +share/doc/html/postgresql/ddl.html share/doc/html/postgresql/developer.html +share/doc/html/postgresql/disk-full.html +share/doc/html/postgresql/diskusage.html +share/doc/html/postgresql/dml-delete.html +share/doc/html/postgresql/dml-update.html +share/doc/html/postgresql/dml.html share/doc/html/postgresql/doc-build.html share/doc/html/postgresql/doc-sources.html +share/doc/html/postgresql/doc-style.html share/doc/html/postgresql/doc-toolsets.html share/doc/html/postgresql/docguide.html -share/doc/html/postgresql/ecpg-concept.html +share/doc/html/postgresql/ecpg-commands.html +share/doc/html/postgresql/ecpg-connect.html share/doc/html/postgresql/ecpg-develop.html -share/doc/html/postgresql/ecpg-limitations.html +share/doc/html/postgresql/ecpg-disconnect.html +share/doc/html/postgresql/ecpg-errors.html +share/doc/html/postgresql/ecpg-include.html +share/doc/html/postgresql/ecpg-library.html share/doc/html/postgresql/ecpg-porting.html -share/doc/html/postgresql/ecpg-use.html +share/doc/html/postgresql/ecpg-process.html +share/doc/html/postgresql/ecpg-variables.html share/doc/html/postgresql/ecpg.html share/doc/html/postgresql/executor.html share/doc/html/postgresql/explicit-joins.html +share/doc/html/postgresql/explicit-locking.html share/doc/html/postgresql/extend.html -share/doc/html/postgresql/failure-disk-failed.html -share/doc/html/postgresql/failure.html +share/doc/html/postgresql/features.html share/doc/html/postgresql/functions-aggregate.html share/doc/html/postgresql/functions-binarystring.html share/doc/html/postgresql/functions-comparison.html @@ -126,7 +156,6 @@ share/doc/html/postgresql/indexes-partial.html share/doc/html/postgresql/indexes-types.html share/doc/html/postgresql/indexes-unique.html share/doc/html/postgresql/indexes.html -share/doc/html/postgresql/inherit.html share/doc/html/postgresql/install-getsource.html share/doc/html/postgresql/install-post.html share/doc/html/postgresql/install-procedure.html @@ -135,6 +164,7 @@ share/doc/html/postgresql/install-upgrading.html share/doc/html/postgresql/install-win32.html share/doc/html/postgresql/installation.html share/doc/html/postgresql/jdbc-binary-data.html +share/doc/html/postgresql/jdbc-datasource.html share/doc/html/postgresql/jdbc-ddl.html share/doc/html/postgresql/jdbc-ext.html share/doc/html/postgresql/jdbc-query.html @@ -144,7 +174,6 @@ share/doc/html/postgresql/jdbc-update.html share/doc/html/postgresql/jdbc-use.html share/doc/html/postgresql/jdbc.html share/doc/html/postgresql/kernel-resources.html -share/doc/html/postgresql/keys.html share/doc/html/postgresql/largeobjects.html share/doc/html/postgresql/libpgtcl-loading.html share/doc/html/postgresql/libpgtcl-ref.html @@ -157,35 +186,33 @@ share/doc/html/postgresql/libpq-envars.html share/doc/html/postgresql/libpq-example.html share/doc/html/postgresql/libpq-exec.html share/doc/html/postgresql/libpq-fastpath.html +share/doc/html/postgresql/libpq-files.html share/doc/html/postgresql/libpq-notify.html share/doc/html/postgresql/libpq-threading.html share/doc/html/postgresql/libpq-trace.html share/doc/html/postgresql/libpq.html -share/doc/html/postgresql/libpqplusplus.html -share/doc/html/postgresql/libpqpp-classes.html -share/doc/html/postgresql/libpqpp-connect.html -share/doc/html/postgresql/libpqpp-copy.html -share/doc/html/postgresql/libpqpp-exec.html -share/doc/html/postgresql/libpqpp-init.html -share/doc/html/postgresql/libpqpp-notify.html -share/doc/html/postgresql/ln13560.html -share/doc/html/postgresql/ln19374.html +share/doc/html/postgresql/ln17902.html +share/doc/html/postgresql/ln24595.html share/doc/html/postgresql/ln25.html -share/doc/html/postgresql/ln31728.html -share/doc/html/postgresql/ln43811.html -share/doc/html/postgresql/ln650.html +share/doc/html/postgresql/ln37022.html +share/doc/html/postgresql/ln51737.html +share/doc/html/postgresql/ln659.html +share/doc/html/postgresql/ln8.html share/doc/html/postgresql/lo-funcs.html share/doc/html/postgresql/lo-implementation.html share/doc/html/postgresql/lo-interfaces.html share/doc/html/postgresql/lo-libpq.html share/doc/html/postgresql/locking-indexes.html -share/doc/html/postgresql/locking-tables.html share/doc/html/postgresql/logfile-maintenance.html share/doc/html/postgresql/maintenance.html +share/doc/html/postgresql/manage-ag-alternate-locs.html +share/doc/html/postgresql/manage-ag-config.html +share/doc/html/postgresql/manage-ag-createdb.html share/doc/html/postgresql/manage-ag-dropdb.html -share/doc/html/postgresql/manage.html +share/doc/html/postgresql/manage-ag-templatedbs.html share/doc/html/postgresql/managing-databases.html share/doc/html/postgresql/migration.html +share/doc/html/postgresql/monitoring-locks.html share/doc/html/postgresql/monitoring-stats.html share/doc/html/postgresql/monitoring.html share/doc/html/postgresql/multibyte.html @@ -193,22 +220,17 @@ share/doc/html/postgresql/mvcc.html share/doc/html/postgresql/nls-programmer.html share/doc/html/postgresql/nls.html share/doc/html/postgresql/notation.html -share/doc/html/postgresql/odbc-applixware.html -share/doc/html/postgresql/odbc-config.html -share/doc/html/postgresql/odbc-install.html -share/doc/html/postgresql/odbc-windows.html -share/doc/html/postgresql/odbc.html share/doc/html/postgresql/overview.html share/doc/html/postgresql/page.html share/doc/html/postgresql/parser-stage.html share/doc/html/postgresql/performance-tips.html share/doc/html/postgresql/perm-functions.html share/doc/html/postgresql/pg-system-catalogs.html -share/doc/html/postgresql/pgeasy.html share/doc/html/postgresql/pgtcl-pgconndefaults.html share/doc/html/postgresql/pgtcl-pgconnect.html share/doc/html/postgresql/pgtcl-pgdisconnect.html share/doc/html/postgresql/pgtcl-pgexec.html +share/doc/html/postgresql/pgtcl-pgexecute.html share/doc/html/postgresql/pgtcl-pglisten.html share/doc/html/postgresql/pgtcl-pgloclose.html share/doc/html/postgresql/pgtcl-pglocreat.html @@ -220,13 +242,16 @@ share/doc/html/postgresql/pgtcl-pgloread.html share/doc/html/postgresql/pgtcl-pglotell.html share/doc/html/postgresql/pgtcl-pglounlink.html share/doc/html/postgresql/pgtcl-pglowrite.html +share/doc/html/postgresql/pgtcl-pgon-connection-loss.html share/doc/html/postgresql/pgtcl-pgresult.html share/doc/html/postgresql/pgtcl-pgselect.html share/doc/html/postgresql/pgtcl.html share/doc/html/postgresql/planner-optimizer.html share/doc/html/postgresql/planner-stats.html -share/doc/html/postgresql/plperl-description.html -share/doc/html/postgresql/plperl-install.html +share/doc/html/postgresql/plperl-data.html +share/doc/html/postgresql/plperl-database.html +share/doc/html/postgresql/plperl-missing.html +share/doc/html/postgresql/plperl-trusted.html share/doc/html/postgresql/plperl.html share/doc/html/postgresql/plpgsql-control-structures.html share/doc/html/postgresql/plpgsql-cursors.html @@ -239,18 +264,19 @@ share/doc/html/postgresql/plpgsql-statements.html share/doc/html/postgresql/plpgsql-structure.html share/doc/html/postgresql/plpgsql-trigger.html share/doc/html/postgresql/plpgsql.html -share/doc/html/postgresql/plpython-install.html -share/doc/html/postgresql/plpython-using.html +share/doc/html/postgresql/plpython-database.html +share/doc/html/postgresql/plpython-trigger.html +share/doc/html/postgresql/plpython-trusted.html share/doc/html/postgresql/plpython.html share/doc/html/postgresql/pltcl-description.html share/doc/html/postgresql/pltcl.html share/doc/html/postgresql/populate.html share/doc/html/postgresql/postmaster-shutdown.html share/doc/html/postgresql/postmaster-start.html -share/doc/html/postgresql/preface.html share/doc/html/postgresql/privileges.html share/doc/html/postgresql/programmer-client.html share/doc/html/postgresql/programmer-pl.html +share/doc/html/postgresql/programmer-preface.html share/doc/html/postgresql/programmer-server.html share/doc/html/postgresql/programmer.html share/doc/html/postgresql/protocol-message-formats.html @@ -259,7 +285,6 @@ share/doc/html/postgresql/protocol-protocol.html share/doc/html/postgresql/protocol.html share/doc/html/postgresql/pygresql-close.html share/doc/html/postgresql/pygresql-connect.html -share/doc/html/postgresql/pygresql-db-api.html share/doc/html/postgresql/pygresql-db-clear.html share/doc/html/postgresql/pygresql-db-delete.html share/doc/html/postgresql/pygresql-db-get-attnames.html @@ -357,13 +382,19 @@ share/doc/html/postgresql/release-7-1-1.html share/doc/html/postgresql/release-7-1-2.html share/doc/html/postgresql/release-7-1-3.html share/doc/html/postgresql/release-7-1.html +share/doc/html/postgresql/release-7-2-1.html +share/doc/html/postgresql/release-7-2-2.html +share/doc/html/postgresql/release-7-2-3.html share/doc/html/postgresql/release-7-2.html +share/doc/html/postgresql/release-7-3.html share/doc/html/postgresql/release.html share/doc/html/postgresql/resources.html +share/doc/html/postgresql/routine-reindex.html share/doc/html/postgresql/routine-vacuuming.html share/doc/html/postgresql/rule-system.html share/doc/html/postgresql/rules-insert.html share/doc/html/postgresql/rules-permissions.html +share/doc/html/postgresql/rules-status.html share/doc/html/postgresql/rules-triggers.html share/doc/html/postgresql/rules-views.html share/doc/html/postgresql/rules.html @@ -405,8 +436,10 @@ share/doc/html/postgresql/spi-spisaveplan.html share/doc/html/postgresql/spi-visibility.html share/doc/html/postgresql/spi.html share/doc/html/postgresql/sql-abort.html +share/doc/html/postgresql/sql-alterdatabase.html share/doc/html/postgresql/sql-altergroup.html share/doc/html/postgresql/sql-altertable.html +share/doc/html/postgresql/sql-altertrigger.html share/doc/html/postgresql/sql-alteruser.html share/doc/html/postgresql/sql-analyze.html share/doc/html/postgresql/sql-begin.html @@ -418,14 +451,19 @@ share/doc/html/postgresql/sql-comment.html share/doc/html/postgresql/sql-commit.html share/doc/html/postgresql/sql-copy.html share/doc/html/postgresql/sql-createaggregate.html +share/doc/html/postgresql/sql-createcast.html share/doc/html/postgresql/sql-createconstraint.html +share/doc/html/postgresql/sql-createconversion.html share/doc/html/postgresql/sql-createdatabase.html +share/doc/html/postgresql/sql-createdomain.html share/doc/html/postgresql/sql-createfunction.html share/doc/html/postgresql/sql-creategroup.html share/doc/html/postgresql/sql-createindex.html share/doc/html/postgresql/sql-createlanguage.html +share/doc/html/postgresql/sql-createopclass.html share/doc/html/postgresql/sql-createoperator.html share/doc/html/postgresql/sql-createrule.html +share/doc/html/postgresql/sql-createschema.html share/doc/html/postgresql/sql-createsequence.html share/doc/html/postgresql/sql-createtable.html share/doc/html/postgresql/sql-createtableas.html @@ -433,16 +471,22 @@ share/doc/html/postgresql/sql-createtrigger.html share/doc/html/postgresql/sql-createtype.html share/doc/html/postgresql/sql-createuser.html share/doc/html/postgresql/sql-createview.html +share/doc/html/postgresql/sql-deallocate.html share/doc/html/postgresql/sql-declare.html share/doc/html/postgresql/sql-delete.html share/doc/html/postgresql/sql-dropaggregate.html +share/doc/html/postgresql/sql-dropcast.html +share/doc/html/postgresql/sql-dropconversion.html share/doc/html/postgresql/sql-dropdatabase.html +share/doc/html/postgresql/sql-dropdomain.html share/doc/html/postgresql/sql-dropfunction.html share/doc/html/postgresql/sql-dropgroup.html share/doc/html/postgresql/sql-dropindex.html share/doc/html/postgresql/sql-droplanguage.html +share/doc/html/postgresql/sql-dropopclass.html share/doc/html/postgresql/sql-dropoperator.html share/doc/html/postgresql/sql-droprule.html +share/doc/html/postgresql/sql-dropschema.html share/doc/html/postgresql/sql-dropsequence.html share/doc/html/postgresql/sql-droptable.html share/doc/html/postgresql/sql-droptrigger.html @@ -450,6 +494,7 @@ share/doc/html/postgresql/sql-droptype.html share/doc/html/postgresql/sql-dropuser.html share/doc/html/postgresql/sql-dropview.html share/doc/html/postgresql/sql-end.html +share/doc/html/postgresql/sql-execute.html share/doc/html/postgresql/sql-explain.html share/doc/html/postgresql/sql-expressions.html share/doc/html/postgresql/sql-fetch.html @@ -461,7 +506,7 @@ share/doc/html/postgresql/sql-load.html share/doc/html/postgresql/sql-lock.html share/doc/html/postgresql/sql-move.html share/doc/html/postgresql/sql-notify.html -share/doc/html/postgresql/sql-precedence.html +share/doc/html/postgresql/sql-prepare.html share/doc/html/postgresql/sql-reindex.html share/doc/html/postgresql/sql-reset.html share/doc/html/postgresql/sql-revoke.html @@ -473,7 +518,7 @@ share/doc/html/postgresql/sql-set-session-authorization.html share/doc/html/postgresql/sql-set-transaction.html share/doc/html/postgresql/sql-set.html share/doc/html/postgresql/sql-show.html -share/doc/html/postgresql/sql-syntax-columns.html +share/doc/html/postgresql/sql-start-transaction.html share/doc/html/postgresql/sql-syntax.html share/doc/html/postgresql/sql-truncate.html share/doc/html/postgresql/sql-unlisten.html @@ -481,10 +526,8 @@ share/doc/html/postgresql/sql-update.html share/doc/html/postgresql/sql-vacuum.html share/doc/html/postgresql/ssh-tunnels.html share/doc/html/postgresql/ssl-tcp.html -share/doc/html/postgresql/storage.html share/doc/html/postgresql/stylesheet.css share/doc/html/postgresql/supported-platforms.html -share/doc/html/postgresql/timezones.html share/doc/html/postgresql/transaction-iso.html share/doc/html/postgresql/trigger-datachanges.html share/doc/html/postgresql/trigger-examples.html @@ -502,6 +545,7 @@ share/doc/html/postgresql/tutorial-fk.html share/doc/html/postgresql/tutorial-inheritance.html share/doc/html/postgresql/tutorial-join.html share/doc/html/postgresql/tutorial-populate.html +share/doc/html/postgresql/tutorial-preface.html share/doc/html/postgresql/tutorial-select.html share/doc/html/postgresql/tutorial-sql.html share/doc/html/postgresql/tutorial-start.html @@ -509,23 +553,25 @@ share/doc/html/postgresql/tutorial-table.html share/doc/html/postgresql/tutorial-transactions.html share/doc/html/postgresql/tutorial-update.html share/doc/html/postgresql/tutorial-views.html -share/doc/html/postgresql/tutorial-welcome.html share/doc/html/postgresql/tutorial.html share/doc/html/postgresql/type-system.html share/doc/html/postgresql/typeconv-func.html share/doc/html/postgresql/typeconv-oper.html -share/doc/html/postgresql/typeconv-overview.html share/doc/html/postgresql/typeconv-query.html share/doc/html/postgresql/typeconv-union-case.html share/doc/html/postgresql/typeconv.html share/doc/html/postgresql/units-history.html +share/doc/html/postgresql/unsupported-features-sql99.html +share/doc/html/postgresql/user-attributes.html share/doc/html/postgresql/user-manag.html +share/doc/html/postgresql/user-preface-thisbook.html +share/doc/html/postgresql/user-preface.html share/doc/html/postgresql/user.html share/doc/html/postgresql/wal-configuration.html share/doc/html/postgresql/wal-implementation.html share/doc/html/postgresql/wal.html -share/doc/html/postgresql/xact-read-committed.html -share/doc/html/postgresql/xact-serializable.html +share/doc/html/postgresql/x11875.html +share/doc/html/postgresql/x1779.html share/doc/html/postgresql/xaggr.html share/doc/html/postgresql/xfunc-c.html share/doc/html/postgresql/xfunc-internal.html @@ -533,8 +579,10 @@ share/doc/html/postgresql/xfunc-overload.html share/doc/html/postgresql/xfunc-pl.html share/doc/html/postgresql/xfunc-plhandler.html share/doc/html/postgresql/xfunc-sql.html +share/doc/html/postgresql/xfunc-tablefunctions.html share/doc/html/postgresql/xfunc.html share/doc/html/postgresql/xindex-am.html +share/doc/html/postgresql/xindex-opclass-features.html share/doc/html/postgresql/xindex-opclass.html share/doc/html/postgresql/xindex-operators.html share/doc/html/postgresql/xindex-strategies.html @@ -546,7 +594,6 @@ share/doc/html/postgresql/xoper.html share/doc/html/postgresql/xplang-install.html share/doc/html/postgresql/xplang.html share/doc/html/postgresql/xtypes.html -share/doc/html/postgresql/y2k.html share/doc/postgresql/FAQ share/doc/postgresql/FAQ_AIX share/doc/postgresql/FAQ_DEV @@ -558,6 +605,7 @@ share/doc/postgresql/FAQ_SCO share/doc/postgresql/FAQ_Solaris share/doc/postgresql/FAQ_german share/doc/postgresql/FAQ_japanese +share/doc/postgresql/FAQ_polish share/doc/postgresql/FAQ_russian share/doc/postgresql/KNOWN_BUGS share/doc/postgresql/MISSING_FEATURES diff --git a/databases/postgresql-lib/Makefile b/databases/postgresql-lib/Makefile index 481f613098a..5e55edb1280 100644 --- a/databases/postgresql-lib/Makefile +++ b/databases/postgresql-lib/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.7 2002/10/19 03:03:50 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2003/01/05 20:12:23 jlam Exp $ PKGNAME= postgresql-lib-${BASE_VERS} COMMENT= PostgreSQL database headers and libraries -USE_BUILDLINK2= # defined - -.include "../../databases/postgresql/Makefile.common" +.include "../postgresql/Makefile.common" CONFIGURE_ARGS+= --with-openssl=${SSLBASE} BUILD_DIRS= ${WRKSRC}/src/include @@ -28,6 +26,8 @@ post-install: ${MAKE_PROGRAM} install-all-headers ${GTAR} zxCf ${PREFIX}/man ${WRKSRC}/doc/man.tar.gz \ `${SED} -e "s|^#.*||" ${FILESDIR}/man.lib` + ${RM} -f ${PREFIX}/include/pgsql + ${LN} -sf postgresql ${PREFIX}/include/pgsql .include "../../security/openssl/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/postgresql-lib/PLIST b/databases/postgresql-lib/PLIST index d71b6c6d694..ef4d0f8548f 100644 --- a/databases/postgresql-lib/PLIST +++ b/databases/postgresql-lib/PLIST @@ -1,373 +1,370 @@ -@comment $NetBSD: PLIST,v 1.3 2002/04/04 07:41:03 jlam Exp $ +@comment $NetBSD: PLIST,v 1.4 2003/01/05 20:12:24 jlam Exp $ bin/ecpg -include/pgsql/ecpgerrno.h -include/pgsql/ecpglib.h -include/pgsql/ecpgtype.h -include/pgsql/internal/c.h -include/pgsql/internal/lib/dllist.h -include/pgsql/internal/libpq-int.h -include/pgsql/internal/libpq/pqcomm.h -include/pgsql/internal/postgres_fe.h -include/pgsql/internal/pqexpbuffer.h -include/pgsql/libpgeasy.h -include/pgsql/libpq++.h -include/pgsql/libpq++/pgconnection.h -include/pgsql/libpq++/pgcursordb.h -include/pgsql/libpq++/pgdatabase.h -include/pgsql/libpq++/pglobject.h -include/pgsql/libpq++/pgtransdb.h -include/pgsql/libpq-fe.h -include/pgsql/libpq/libpq-fs.h -include/pgsql/pg_config.h -include/pgsql/pg_config_os.h -include/pgsql/postgres_ext.h -include/pgsql/server/access/attnum.h -include/pgsql/server/access/clog.h -include/pgsql/server/access/genam.h -include/pgsql/server/access/gist.h -include/pgsql/server/access/gistscan.h -include/pgsql/server/access/hash.h -include/pgsql/server/access/heapam.h -include/pgsql/server/access/hio.h -include/pgsql/server/access/htup.h -include/pgsql/server/access/ibit.h -include/pgsql/server/access/iqual.h -include/pgsql/server/access/istrat.h -include/pgsql/server/access/itup.h -include/pgsql/server/access/nbtree.h -include/pgsql/server/access/printtup.h -include/pgsql/server/access/relscan.h -include/pgsql/server/access/rmgr.h -include/pgsql/server/access/rtree.h -include/pgsql/server/access/rtscan.h -include/pgsql/server/access/sdir.h -include/pgsql/server/access/skey.h -include/pgsql/server/access/strat.h -include/pgsql/server/access/transam.h -include/pgsql/server/access/tupdesc.h -include/pgsql/server/access/tupmacs.h -include/pgsql/server/access/tuptoaster.h -include/pgsql/server/access/valid.h -include/pgsql/server/access/xact.h -include/pgsql/server/access/xlog.h -include/pgsql/server/access/xlogdefs.h -include/pgsql/server/access/xlogutils.h -include/pgsql/server/bootstrap/bootstrap.h -include/pgsql/server/c.h -include/pgsql/server/catalog/catalog.h -include/pgsql/server/catalog/catname.h -include/pgsql/server/catalog/catversion.h -include/pgsql/server/catalog/heap.h -include/pgsql/server/catalog/index.h -include/pgsql/server/catalog/indexing.h -include/pgsql/server/catalog/pg_aggregate.h -include/pgsql/server/catalog/pg_am.h -include/pgsql/server/catalog/pg_amop.h -include/pgsql/server/catalog/pg_amproc.h -include/pgsql/server/catalog/pg_attrdef.h -include/pgsql/server/catalog/pg_attribute.h -include/pgsql/server/catalog/pg_class.h -include/pgsql/server/catalog/pg_control.h -include/pgsql/server/catalog/pg_database.h -include/pgsql/server/catalog/pg_description.h -include/pgsql/server/catalog/pg_group.h -include/pgsql/server/catalog/pg_index.h -include/pgsql/server/catalog/pg_inherits.h -include/pgsql/server/catalog/pg_language.h -include/pgsql/server/catalog/pg_largeobject.h -include/pgsql/server/catalog/pg_listener.h -include/pgsql/server/catalog/pg_opclass.h -include/pgsql/server/catalog/pg_operator.h -include/pgsql/server/catalog/pg_proc.h -include/pgsql/server/catalog/pg_relcheck.h -include/pgsql/server/catalog/pg_rewrite.h -include/pgsql/server/catalog/pg_shadow.h -include/pgsql/server/catalog/pg_statistic.h -include/pgsql/server/catalog/pg_trigger.h -include/pgsql/server/catalog/pg_type.h -include/pgsql/server/catalog/pg_version.h -include/pgsql/server/commands/async.h -include/pgsql/server/commands/cluster.h -include/pgsql/server/commands/command.h -include/pgsql/server/commands/comment.h -include/pgsql/server/commands/copy.h -include/pgsql/server/commands/creatinh.h -include/pgsql/server/commands/dbcommands.h -include/pgsql/server/commands/defrem.h -include/pgsql/server/commands/explain.h -include/pgsql/server/commands/proclang.h -include/pgsql/server/commands/rename.h -include/pgsql/server/commands/sequence.h -include/pgsql/server/commands/trigger.h -include/pgsql/server/commands/user.h -include/pgsql/server/commands/vacuum.h -include/pgsql/server/commands/variable.h -include/pgsql/server/commands/version.h -include/pgsql/server/commands/view.h -include/pgsql/server/dynloader.h -include/pgsql/server/executor/execFlatten.h -include/pgsql/server/executor/execdebug.h -include/pgsql/server/executor/execdefs.h -include/pgsql/server/executor/execdesc.h -include/pgsql/server/executor/executor.h -include/pgsql/server/executor/functions.h -include/pgsql/server/executor/hashjoin.h -include/pgsql/server/executor/instrument.h -include/pgsql/server/executor/nodeAgg.h -include/pgsql/server/executor/nodeAppend.h -include/pgsql/server/executor/nodeGroup.h -include/pgsql/server/executor/nodeHash.h -include/pgsql/server/executor/nodeHashjoin.h -include/pgsql/server/executor/nodeIndexscan.h -include/pgsql/server/executor/nodeLimit.h -include/pgsql/server/executor/nodeMaterial.h -include/pgsql/server/executor/nodeMergejoin.h -include/pgsql/server/executor/nodeNestloop.h -include/pgsql/server/executor/nodeResult.h -include/pgsql/server/executor/nodeSeqscan.h -include/pgsql/server/executor/nodeSetOp.h -include/pgsql/server/executor/nodeSort.h -include/pgsql/server/executor/nodeSubplan.h -include/pgsql/server/executor/nodeSubqueryscan.h -include/pgsql/server/executor/nodeTidscan.h -include/pgsql/server/executor/nodeUnique.h -include/pgsql/server/executor/spi.h -include/pgsql/server/executor/spi_priv.h -include/pgsql/server/executor/tuptable.h -include/pgsql/server/fmgr.h -include/pgsql/server/lib/dllist.h -include/pgsql/server/lib/lispsort.h -include/pgsql/server/lib/stringinfo.h -include/pgsql/server/libpq/auth.h -include/pgsql/server/libpq/be-fsstubs.h -include/pgsql/server/libpq/crypt.h -include/pgsql/server/libpq/hba.h -include/pgsql/server/libpq/libpq-be.h -include/pgsql/server/libpq/libpq-fs.h -include/pgsql/server/libpq/libpq.h -include/pgsql/server/libpq/password.h -include/pgsql/server/libpq/pqcomm.h -include/pgsql/server/libpq/pqformat.h -include/pgsql/server/libpq/pqsignal.h -include/pgsql/server/mb/pg_wchar.h -include/pgsql/server/miscadmin.h -include/pgsql/server/nodes/execnodes.h -include/pgsql/server/nodes/makefuncs.h -include/pgsql/server/nodes/memnodes.h -include/pgsql/server/nodes/nodeFuncs.h -include/pgsql/server/nodes/nodes.h -include/pgsql/server/nodes/params.h -include/pgsql/server/nodes/parsenodes.h -include/pgsql/server/nodes/pg_list.h -include/pgsql/server/nodes/plannodes.h -include/pgsql/server/nodes/primnodes.h -include/pgsql/server/nodes/print.h -include/pgsql/server/nodes/readfuncs.h -include/pgsql/server/nodes/relation.h -include/pgsql/server/optimizer/clauses.h -include/pgsql/server/optimizer/cost.h -include/pgsql/server/optimizer/geqo.h -include/pgsql/server/optimizer/geqo_copy.h -include/pgsql/server/optimizer/geqo_gene.h -include/pgsql/server/optimizer/geqo_misc.h -include/pgsql/server/optimizer/geqo_mutation.h -include/pgsql/server/optimizer/geqo_pool.h -include/pgsql/server/optimizer/geqo_random.h -include/pgsql/server/optimizer/geqo_recombination.h -include/pgsql/server/optimizer/geqo_selection.h -include/pgsql/server/optimizer/joininfo.h -include/pgsql/server/optimizer/pathnode.h -include/pgsql/server/optimizer/paths.h -include/pgsql/server/optimizer/plancat.h -include/pgsql/server/optimizer/planmain.h -include/pgsql/server/optimizer/planner.h -include/pgsql/server/optimizer/prep.h -include/pgsql/server/optimizer/restrictinfo.h -include/pgsql/server/optimizer/subselect.h -include/pgsql/server/optimizer/tlist.h -include/pgsql/server/optimizer/var.h -include/pgsql/server/parser/analyze.h -include/pgsql/server/parser/gramparse.h -include/pgsql/server/parser/keywords.h -include/pgsql/server/parser/parse_agg.h -include/pgsql/server/parser/parse_clause.h -include/pgsql/server/parser/parse_coerce.h -include/pgsql/server/parser/parse_expr.h -include/pgsql/server/parser/parse_func.h -include/pgsql/server/parser/parse_node.h -include/pgsql/server/parser/parse_oper.h -include/pgsql/server/parser/parse_relation.h -include/pgsql/server/parser/parse_target.h -include/pgsql/server/parser/parse_type.h -include/pgsql/server/parser/parser.h -include/pgsql/server/parser/parsetree.h -include/pgsql/server/parser/scansup.h -include/pgsql/server/pg_config.h -include/pgsql/server/pg_config_os.h -include/pgsql/server/pgstat.h -include/pgsql/server/port/aix.h -include/pgsql/server/port/beos.h -include/pgsql/server/port/bsdi.h -include/pgsql/server/port/darwin.h -include/pgsql/server/port/dgux.h -include/pgsql/server/port/freebsd.h -include/pgsql/server/port/hpux.h -include/pgsql/server/port/irix5.h -include/pgsql/server/port/linux.h -include/pgsql/server/port/netbsd.h -include/pgsql/server/port/nextstep.h -include/pgsql/server/port/openbsd.h -include/pgsql/server/port/osf.h -include/pgsql/server/port/qnx4.h -include/pgsql/server/port/sco.h -include/pgsql/server/port/solaris.h -include/pgsql/server/port/sunos4.h -include/pgsql/server/port/svr4.h -include/pgsql/server/port/ultrix4.h -include/pgsql/server/port/univel.h -include/pgsql/server/port/unixware.h -include/pgsql/server/port/win.h -include/pgsql/server/port/win32.h -include/pgsql/server/postgres.h -include/pgsql/server/postgres_ext.h -include/pgsql/server/postgres_fe.h -include/pgsql/server/regex/cclass.h -include/pgsql/server/regex/cname.h -include/pgsql/server/regex/regex.h -include/pgsql/server/regex/regex2.h -include/pgsql/server/regex/utils.h -include/pgsql/server/rewrite/prs2lock.h -include/pgsql/server/rewrite/rewriteDefine.h -include/pgsql/server/rewrite/rewriteHandler.h -include/pgsql/server/rewrite/rewriteManip.h -include/pgsql/server/rewrite/rewriteRemove.h -include/pgsql/server/rewrite/rewriteSupport.h -include/pgsql/server/rusagestub.h -include/pgsql/server/storage/backendid.h -include/pgsql/server/storage/block.h -include/pgsql/server/storage/buf.h -include/pgsql/server/storage/buf_internals.h -include/pgsql/server/storage/buffile.h -include/pgsql/server/storage/bufmgr.h -include/pgsql/server/storage/bufpage.h -include/pgsql/server/storage/fd.h -include/pgsql/server/storage/freespace.h -include/pgsql/server/storage/ipc.h -include/pgsql/server/storage/item.h -include/pgsql/server/storage/itemid.h -include/pgsql/server/storage/itempos.h -include/pgsql/server/storage/itemptr.h -include/pgsql/server/storage/large_object.h -include/pgsql/server/storage/lmgr.h -include/pgsql/server/storage/lock.h -include/pgsql/server/storage/lwlock.h -include/pgsql/server/storage/off.h -include/pgsql/server/storage/page.h -include/pgsql/server/storage/pmsignal.h -include/pgsql/server/storage/pos.h -include/pgsql/server/storage/proc.h -include/pgsql/server/storage/relfilenode.h -include/pgsql/server/storage/s_lock.h -include/pgsql/server/storage/shmem.h -include/pgsql/server/storage/sinval.h -include/pgsql/server/storage/sinvaladt.h -include/pgsql/server/storage/smgr.h -include/pgsql/server/storage/spin.h -include/pgsql/server/strdup.h -include/pgsql/server/tcop/dest.h -include/pgsql/server/tcop/fastpath.h -include/pgsql/server/tcop/pquery.h -include/pgsql/server/tcop/tcopdebug.h -include/pgsql/server/tcop/tcopprot.h -include/pgsql/server/tcop/utility.h -include/pgsql/server/utils/acl.h -include/pgsql/server/utils/array.h -include/pgsql/server/utils/ascii.h -include/pgsql/server/utils/bit.h -include/pgsql/server/utils/builtins.h -include/pgsql/server/utils/cash.h -include/pgsql/server/utils/catcache.h -include/pgsql/server/utils/date.h -include/pgsql/server/utils/datetime.h -include/pgsql/server/utils/datum.h -include/pgsql/server/utils/dynahash.h -include/pgsql/server/utils/dynamic_loader.h -include/pgsql/server/utils/elog.h -include/pgsql/server/utils/exc.h -include/pgsql/server/utils/excid.h -include/pgsql/server/utils/fcache.h -include/pgsql/server/utils/fmgrtab.h -include/pgsql/server/utils/formatting.h -include/pgsql/server/utils/geo_decls.h -include/pgsql/server/utils/guc.h -include/pgsql/server/utils/hsearch.h -include/pgsql/server/utils/inet.h -include/pgsql/server/utils/int8.h -include/pgsql/server/utils/inval.h -include/pgsql/server/utils/logtape.h -include/pgsql/server/utils/lsyscache.h -include/pgsql/server/utils/memutils.h -include/pgsql/server/utils/nabstime.h -include/pgsql/server/utils/numeric.h -include/pgsql/server/utils/palloc.h -include/pgsql/server/utils/pg_crc.h -include/pgsql/server/utils/pg_locale.h -include/pgsql/server/utils/pg_lzcompress.h -include/pgsql/server/utils/portal.h -include/pgsql/server/utils/ps_status.h -include/pgsql/server/utils/rel.h -include/pgsql/server/utils/relcache.h -include/pgsql/server/utils/selfuncs.h -include/pgsql/server/utils/sets.h -include/pgsql/server/utils/syscache.h -include/pgsql/server/utils/temprel.h -include/pgsql/server/utils/timestamp.h -include/pgsql/server/utils/tqual.h -include/pgsql/server/utils/tuplesort.h -include/pgsql/server/utils/tuplestore.h -include/pgsql/server/utils/varbit.h -include/pgsql/sql3types.h -include/pgsql/sqlca.h +include/postgresql/ecpgerrno.h +include/postgresql/ecpglib.h +include/postgresql/ecpgtype.h +include/postgresql/internal/c.h +include/postgresql/internal/lib/dllist.h +include/postgresql/internal/libpq-int.h +include/postgresql/internal/libpq/pqcomm.h +include/postgresql/internal/postgres_fe.h +include/postgresql/internal/pqexpbuffer.h +include/postgresql/libpq-fe.h +include/postgresql/libpq/libpq-fs.h +include/postgresql/pg_config.h +include/postgresql/pg_config_os.h +include/postgresql/postgres_ext.h +include/postgresql/server/access/attnum.h +include/postgresql/server/access/clog.h +include/postgresql/server/access/genam.h +include/postgresql/server/access/gist.h +include/postgresql/server/access/gistscan.h +include/postgresql/server/access/hash.h +include/postgresql/server/access/heapam.h +include/postgresql/server/access/hio.h +include/postgresql/server/access/htup.h +include/postgresql/server/access/ibit.h +include/postgresql/server/access/iqual.h +include/postgresql/server/access/istrat.h +include/postgresql/server/access/itup.h +include/postgresql/server/access/nbtree.h +include/postgresql/server/access/printtup.h +include/postgresql/server/access/relscan.h +include/postgresql/server/access/rmgr.h +include/postgresql/server/access/rtree.h +include/postgresql/server/access/rtscan.h +include/postgresql/server/access/sdir.h +include/postgresql/server/access/skey.h +include/postgresql/server/access/strat.h +include/postgresql/server/access/transam.h +include/postgresql/server/access/tupdesc.h +include/postgresql/server/access/tupmacs.h +include/postgresql/server/access/tuptoaster.h +include/postgresql/server/access/valid.h +include/postgresql/server/access/xact.h +include/postgresql/server/access/xlog.h +include/postgresql/server/access/xlogdefs.h +include/postgresql/server/access/xlogutils.h +include/postgresql/server/bootstrap/bootstrap.h +include/postgresql/server/c.h +include/postgresql/server/catalog/catalog.h +include/postgresql/server/catalog/catname.h +include/postgresql/server/catalog/catversion.h +include/postgresql/server/catalog/dependency.h +include/postgresql/server/catalog/heap.h +include/postgresql/server/catalog/index.h +include/postgresql/server/catalog/indexing.h +include/postgresql/server/catalog/namespace.h +include/postgresql/server/catalog/pg_aggregate.h +include/postgresql/server/catalog/pg_am.h +include/postgresql/server/catalog/pg_amop.h +include/postgresql/server/catalog/pg_amproc.h +include/postgresql/server/catalog/pg_attrdef.h +include/postgresql/server/catalog/pg_attribute.h +include/postgresql/server/catalog/pg_cast.h +include/postgresql/server/catalog/pg_class.h +include/postgresql/server/catalog/pg_constraint.h +include/postgresql/server/catalog/pg_control.h +include/postgresql/server/catalog/pg_conversion.h +include/postgresql/server/catalog/pg_database.h +include/postgresql/server/catalog/pg_depend.h +include/postgresql/server/catalog/pg_description.h +include/postgresql/server/catalog/pg_group.h +include/postgresql/server/catalog/pg_index.h +include/postgresql/server/catalog/pg_inherits.h +include/postgresql/server/catalog/pg_language.h +include/postgresql/server/catalog/pg_largeobject.h +include/postgresql/server/catalog/pg_listener.h +include/postgresql/server/catalog/pg_namespace.h +include/postgresql/server/catalog/pg_opclass.h +include/postgresql/server/catalog/pg_operator.h +include/postgresql/server/catalog/pg_proc.h +include/postgresql/server/catalog/pg_rewrite.h +include/postgresql/server/catalog/pg_shadow.h +include/postgresql/server/catalog/pg_statistic.h +include/postgresql/server/catalog/pg_trigger.h +include/postgresql/server/catalog/pg_type.h +include/postgresql/server/catalog/pg_version.h +include/postgresql/server/commands/async.h +include/postgresql/server/commands/cluster.h +include/postgresql/server/commands/comment.h +include/postgresql/server/commands/conversioncmds.h +include/postgresql/server/commands/copy.h +include/postgresql/server/commands/dbcommands.h +include/postgresql/server/commands/defrem.h +include/postgresql/server/commands/explain.h +include/postgresql/server/commands/lockcmds.h +include/postgresql/server/commands/portalcmds.h +include/postgresql/server/commands/prepare.h +include/postgresql/server/commands/proclang.h +include/postgresql/server/commands/schemacmds.h +include/postgresql/server/commands/sequence.h +include/postgresql/server/commands/tablecmds.h +include/postgresql/server/commands/trigger.h +include/postgresql/server/commands/user.h +include/postgresql/server/commands/vacuum.h +include/postgresql/server/commands/variable.h +include/postgresql/server/commands/version.h +include/postgresql/server/commands/view.h +include/postgresql/server/dynloader.h +include/postgresql/server/executor/execdebug.h +include/postgresql/server/executor/execdefs.h +include/postgresql/server/executor/execdesc.h +include/postgresql/server/executor/executor.h +include/postgresql/server/executor/functions.h +include/postgresql/server/executor/hashjoin.h +include/postgresql/server/executor/instrument.h +include/postgresql/server/executor/nodeAgg.h +include/postgresql/server/executor/nodeAppend.h +include/postgresql/server/executor/nodeFunctionscan.h +include/postgresql/server/executor/nodeGroup.h +include/postgresql/server/executor/nodeHash.h +include/postgresql/server/executor/nodeHashjoin.h +include/postgresql/server/executor/nodeIndexscan.h +include/postgresql/server/executor/nodeLimit.h +include/postgresql/server/executor/nodeMaterial.h +include/postgresql/server/executor/nodeMergejoin.h +include/postgresql/server/executor/nodeNestloop.h +include/postgresql/server/executor/nodeResult.h +include/postgresql/server/executor/nodeSeqscan.h +include/postgresql/server/executor/nodeSetOp.h +include/postgresql/server/executor/nodeSort.h +include/postgresql/server/executor/nodeSubplan.h +include/postgresql/server/executor/nodeSubqueryscan.h +include/postgresql/server/executor/nodeTidscan.h +include/postgresql/server/executor/nodeUnique.h +include/postgresql/server/executor/spi.h +include/postgresql/server/executor/spi_priv.h +include/postgresql/server/executor/tuptable.h +include/postgresql/server/fmgr.h +include/postgresql/server/funcapi.h +include/postgresql/server/lib/dllist.h +include/postgresql/server/lib/lispsort.h +include/postgresql/server/lib/stringinfo.h +include/postgresql/server/libpq/auth.h +include/postgresql/server/libpq/be-fsstubs.h +include/postgresql/server/libpq/crypt.h +include/postgresql/server/libpq/hba.h +include/postgresql/server/libpq/libpq-be.h +include/postgresql/server/libpq/libpq-fs.h +include/postgresql/server/libpq/libpq.h +include/postgresql/server/libpq/password.h +include/postgresql/server/libpq/pqcomm.h +include/postgresql/server/libpq/pqformat.h +include/postgresql/server/libpq/pqsignal.h +include/postgresql/server/mb/pg_wchar.h +include/postgresql/server/miscadmin.h +include/postgresql/server/nodes/execnodes.h +include/postgresql/server/nodes/makefuncs.h +include/postgresql/server/nodes/memnodes.h +include/postgresql/server/nodes/nodeFuncs.h +include/postgresql/server/nodes/nodes.h +include/postgresql/server/nodes/params.h +include/postgresql/server/nodes/parsenodes.h +include/postgresql/server/nodes/pg_list.h +include/postgresql/server/nodes/plannodes.h +include/postgresql/server/nodes/primnodes.h +include/postgresql/server/nodes/print.h +include/postgresql/server/nodes/readfuncs.h +include/postgresql/server/nodes/relation.h +include/postgresql/server/optimizer/clauses.h +include/postgresql/server/optimizer/cost.h +include/postgresql/server/optimizer/geqo.h +include/postgresql/server/optimizer/geqo_copy.h +include/postgresql/server/optimizer/geqo_gene.h +include/postgresql/server/optimizer/geqo_misc.h +include/postgresql/server/optimizer/geqo_mutation.h +include/postgresql/server/optimizer/geqo_pool.h +include/postgresql/server/optimizer/geqo_random.h +include/postgresql/server/optimizer/geqo_recombination.h +include/postgresql/server/optimizer/geqo_selection.h +include/postgresql/server/optimizer/joininfo.h +include/postgresql/server/optimizer/pathnode.h +include/postgresql/server/optimizer/paths.h +include/postgresql/server/optimizer/plancat.h +include/postgresql/server/optimizer/planmain.h +include/postgresql/server/optimizer/planner.h +include/postgresql/server/optimizer/prep.h +include/postgresql/server/optimizer/restrictinfo.h +include/postgresql/server/optimizer/subselect.h +include/postgresql/server/optimizer/tlist.h +include/postgresql/server/optimizer/var.h +include/postgresql/server/parser/analyze.h +include/postgresql/server/parser/gramparse.h +include/postgresql/server/parser/keywords.h +include/postgresql/server/parser/parse.h +include/postgresql/server/parser/parse_agg.h +include/postgresql/server/parser/parse_clause.h +include/postgresql/server/parser/parse_coerce.h +include/postgresql/server/parser/parse_expr.h +include/postgresql/server/parser/parse_func.h +include/postgresql/server/parser/parse_node.h +include/postgresql/server/parser/parse_oper.h +include/postgresql/server/parser/parse_relation.h +include/postgresql/server/parser/parse_target.h +include/postgresql/server/parser/parse_type.h +include/postgresql/server/parser/parser.h +include/postgresql/server/parser/parsetree.h +include/postgresql/server/parser/scansup.h +include/postgresql/server/pg_config.h +include/postgresql/server/pg_config_os.h +include/postgresql/server/pgstat.h +include/postgresql/server/port/aix.h +include/postgresql/server/port/beos.h +include/postgresql/server/port/bsdi.h +include/postgresql/server/port/darwin.h +include/postgresql/server/port/dgux.h +include/postgresql/server/port/freebsd.h +include/postgresql/server/port/hpux.h +include/postgresql/server/port/irix5.h +include/postgresql/server/port/linux.h +include/postgresql/server/port/netbsd.h +include/postgresql/server/port/nextstep.h +include/postgresql/server/port/openbsd.h +include/postgresql/server/port/osf.h +include/postgresql/server/port/qnx4.h +include/postgresql/server/port/sco.h +include/postgresql/server/port/solaris.h +include/postgresql/server/port/sunos4.h +include/postgresql/server/port/svr4.h +include/postgresql/server/port/ultrix4.h +include/postgresql/server/port/univel.h +include/postgresql/server/port/unixware.h +include/postgresql/server/port/win.h +include/postgresql/server/port/win32.h +include/postgresql/server/postgres.h +include/postgresql/server/postgres_ext.h +include/postgresql/server/postgres_fe.h +include/postgresql/server/regex/cclass.h +include/postgresql/server/regex/cname.h +include/postgresql/server/regex/regex.h +include/postgresql/server/regex/regex2.h +include/postgresql/server/regex/utils.h +include/postgresql/server/rewrite/prs2lock.h +include/postgresql/server/rewrite/rewriteDefine.h +include/postgresql/server/rewrite/rewriteHandler.h +include/postgresql/server/rewrite/rewriteManip.h +include/postgresql/server/rewrite/rewriteRemove.h +include/postgresql/server/rewrite/rewriteSupport.h +include/postgresql/server/rusagestub.h +include/postgresql/server/storage/backendid.h +include/postgresql/server/storage/block.h +include/postgresql/server/storage/buf.h +include/postgresql/server/storage/buf_internals.h +include/postgresql/server/storage/buffile.h +include/postgresql/server/storage/bufmgr.h +include/postgresql/server/storage/bufpage.h +include/postgresql/server/storage/fd.h +include/postgresql/server/storage/freespace.h +include/postgresql/server/storage/ipc.h +include/postgresql/server/storage/item.h +include/postgresql/server/storage/itemid.h +include/postgresql/server/storage/itempos.h +include/postgresql/server/storage/itemptr.h +include/postgresql/server/storage/large_object.h +include/postgresql/server/storage/lmgr.h +include/postgresql/server/storage/lock.h +include/postgresql/server/storage/lwlock.h +include/postgresql/server/storage/off.h +include/postgresql/server/storage/page.h +include/postgresql/server/storage/pg_sema.h +include/postgresql/server/storage/pg_shmem.h +include/postgresql/server/storage/pmsignal.h +include/postgresql/server/storage/pos.h +include/postgresql/server/storage/proc.h +include/postgresql/server/storage/relfilenode.h +include/postgresql/server/storage/s_lock.h +include/postgresql/server/storage/shmem.h +include/postgresql/server/storage/sinval.h +include/postgresql/server/storage/sinvaladt.h +include/postgresql/server/storage/smgr.h +include/postgresql/server/storage/spin.h +include/postgresql/server/strdup.h +include/postgresql/server/tcop/dest.h +include/postgresql/server/tcop/fastpath.h +include/postgresql/server/tcop/pquery.h +include/postgresql/server/tcop/tcopdebug.h +include/postgresql/server/tcop/tcopprot.h +include/postgresql/server/tcop/utility.h +include/postgresql/server/utils/acl.h +include/postgresql/server/utils/array.h +include/postgresql/server/utils/ascii.h +include/postgresql/server/utils/bit.h +include/postgresql/server/utils/builtins.h +include/postgresql/server/utils/cash.h +include/postgresql/server/utils/catcache.h +include/postgresql/server/utils/date.h +include/postgresql/server/utils/datetime.h +include/postgresql/server/utils/datum.h +include/postgresql/server/utils/dynahash.h +include/postgresql/server/utils/dynamic_loader.h +include/postgresql/server/utils/elog.h +include/postgresql/server/utils/fcache.h +include/postgresql/server/utils/fmgroids.h +include/postgresql/server/utils/fmgrtab.h +include/postgresql/server/utils/formatting.h +include/postgresql/server/utils/geo_decls.h +include/postgresql/server/utils/guc.h +include/postgresql/server/utils/hsearch.h +include/postgresql/server/utils/inet.h +include/postgresql/server/utils/int8.h +include/postgresql/server/utils/inval.h +include/postgresql/server/utils/logtape.h +include/postgresql/server/utils/lsyscache.h +include/postgresql/server/utils/memutils.h +include/postgresql/server/utils/nabstime.h +include/postgresql/server/utils/numeric.h +include/postgresql/server/utils/palloc.h +include/postgresql/server/utils/pg_crc.h +include/postgresql/server/utils/pg_locale.h +include/postgresql/server/utils/pg_lzcompress.h +include/postgresql/server/utils/portal.h +include/postgresql/server/utils/ps_status.h +include/postgresql/server/utils/rel.h +include/postgresql/server/utils/relcache.h +include/postgresql/server/utils/selfuncs.h +include/postgresql/server/utils/sets.h +include/postgresql/server/utils/syscache.h +include/postgresql/server/utils/timestamp.h +include/postgresql/server/utils/tqual.h +include/postgresql/server/utils/tuplesort.h +include/postgresql/server/utils/tuplestore.h +include/postgresql/server/utils/varbit.h +include/postgresql/sql3types.h +include/postgresql/sqlca.h lib/libecpg.a lib/libecpg.so lib/libecpg.so.3 -lib/libecpg.so.3.3 -lib/libpgeasy.a -lib/libpgeasy.so -lib/libpgeasy.so.2 -lib/libpgeasy.so.2.2 -lib/libpq++.a -lib/libpq++.so -lib/libpq++.so.4 -lib/libpq++.so.4.0 +lib/libecpg.so.3.4 lib/libpq.a lib/libpq.so -lib/libpq.so.2 -lib/libpq.so.2.2 +lib/libpq.so.3 +lib/libpq.so.3.0 lib/postgresql/plpgsql.so man/man1/ecpg.1 -@dirrm include/pgsql/server/utils -@dirrm include/pgsql/server/tcop -@dirrm include/pgsql/server/storage -@dirrm include/pgsql/server/rewrite -@dirrm include/pgsql/server/regex -@dirrm include/pgsql/server/port -@dirrm include/pgsql/server/parser -@dirrm include/pgsql/server/optimizer -@dirrm include/pgsql/server/nodes -@dirrm include/pgsql/server/mb -@dirrm include/pgsql/server/libpq -@dirrm include/pgsql/server/lib -@dirrm include/pgsql/server/executor -@dirrm include/pgsql/server/commands -@dirrm include/pgsql/server/catalog -@dirrm include/pgsql/server/bootstrap -@dirrm include/pgsql/server/access -@dirrm include/pgsql/server -@dirrm include/pgsql/internal/libpq -@dirrm include/pgsql/internal/lib -@dirrm include/pgsql/internal -@dirrm include/pgsql/libpq -@dirrm include/pgsql/libpq++ @dirrm lib/postgresql -@unexec ${RMDIR} -p %D/include/pgsql 2>/dev/null || ${TRUE} +@dirrm include/postgresql/server/utils +@dirrm include/postgresql/server/tcop +@dirrm include/postgresql/server/storage +@dirrm include/postgresql/server/rewrite +@dirrm include/postgresql/server/regex +@dirrm include/postgresql/server/port +@dirrm include/postgresql/server/parser +@dirrm include/postgresql/server/optimizer +@dirrm include/postgresql/server/nodes +@dirrm include/postgresql/server/mb +@dirrm include/postgresql/server/libpq +@dirrm include/postgresql/server/lib +@dirrm include/postgresql/server/executor +@dirrm include/postgresql/server/commands +@dirrm include/postgresql/server/catalog +@dirrm include/postgresql/server/bootstrap +@dirrm include/postgresql/server/access +@dirrm include/postgresql/server +@dirrm include/postgresql/libpq +@dirrm include/postgresql/internal/libpq +@dirrm include/postgresql/internal/lib +@dirrm include/postgresql/internal +@dirrm include/postgresql +@exec ${RM} -f %D/include/pgsql; ${LN} -sf postgresql %D/include/pgsql || ${TRUE} +@unexec ${RM} -f %D/include/pgsql || ${TRUE} diff --git a/databases/postgresql-lib/buildlink2.mk b/databases/postgresql-lib/buildlink2.mk index 6134cbf6e07..972b8aed8e8 100644 --- a/databases/postgresql-lib/buildlink2.mk +++ b/databases/postgresql-lib/buildlink2.mk @@ -1,20 +1,21 @@ -# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:25 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.3 2003/01/05 20:12:24 jlam Exp $ .if !defined(POSTGRESQL_LIB_BUILDLINK2_MK) POSTGRESQL_LIB_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= postgresql-lib -BUILDLINK_DEPENDS.postgresql-lib?= postgresql-{6.5.3*,7.0*,lib-*} +BUILDLINK_DEPENDS.postgresql-lib?= postgresql-lib>=7.3.1 BUILDLINK_PKGSRCDIR.postgresql-lib?= ../../databases/postgresql-lib EVAL_PREFIX+= BUILDLINK_PREFIX.postgresql-lib=postgresql-lib BUILDLINK_PREFIX.postgresql-lib_DEFAULT= ${LOCALBASE} -BUILDLINK_FILES.postgresql-lib= include/pgsql/*/*/*.h +BUILDLINK_FILES.postgresql-lib= include/postgresql/*/*/*.h +BUILDLINK_FILES.postgresql-lib+= include/postgresql/*/*.h +BUILDLINK_FILES.postgresql-lib+= include/postgresql/*.h +BUILDLINK_FILES.postgresql-lib+= include/pgsql/*/*/*.h BUILDLINK_FILES.postgresql-lib+= include/pgsql/*/*.h BUILDLINK_FILES.postgresql-lib+= include/pgsql/*.h BUILDLINK_FILES.postgresql-lib+= lib/libecpg.* -BUILDLINK_FILES.postgresql-lib+= lib/libpgeasy.* -BUILDLINK_FILES.postgresql-lib+= lib/libpq++.* BUILDLINK_FILES.postgresql-lib+= lib/libpq.* .include "../../security/openssl/buildlink2.mk" diff --git a/databases/postgresql-plperl/Makefile b/databases/postgresql-plperl/Makefile index 5d9ba41e275..8229959ed1a 100644 --- a/databases/postgresql-plperl/Makefile +++ b/databases/postgresql-plperl/Makefile @@ -1,13 +1,11 @@ -# $NetBSD: Makefile,v 1.8 2002/10/19 03:03:50 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2003/01/05 20:12:25 jlam Exp $ PKGNAME= postgresql-plperl-${BASE_VERS} COMMENT= PL/Perl procedural language for the PostgreSQL backend DEPENDS+= postgresql-server>=${BASE_VERS}:../../databases/postgresql-server -USE_BUILDLINK2= # defined - -.include "../../databases/postgresql/Makefile.common" +.include "../postgresql/Makefile.common" CONFIGURE_ARGS+= --with-openssl=${SSLBASE} CONFIGURE_ARGS+= --with-perl @@ -16,7 +14,7 @@ CONFIGURE_ENV+= PERL="${PERL5}" BUILD_DIRS= ${WRKSRC}/src/pl/plperl MAKEFILE= GNUmakefile -.include "../../databases/postgresql-lib/buildlink2.mk" +.include "../postgresql-lib/buildlink2.mk" .include "../../lang/libperl/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/postgresql-pltcl/Makefile b/databases/postgresql-pltcl/Makefile index c0f82cf36b4..8e1878c1579 100644 --- a/databases/postgresql-pltcl/Makefile +++ b/databases/postgresql-pltcl/Makefile @@ -1,13 +1,11 @@ -# $NetBSD: Makefile,v 1.6 2002/10/19 03:03:51 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2003/01/05 20:12:26 jlam Exp $ PKGNAME= postgresql-pltcl-${BASE_VERS} COMMENT= PL/Tcl procedural language for the PostgreSQL backend DEPENDS+= postgresql-server>=${BASE_VERS}:../../databases/postgresql-server -USE_BUILDLINK2= # defined - -.include "../../databases/postgresql/Makefile.common" +.include "../postgresql/Makefile.common" CONFIGURE_ARGS+= --with-openssl=${SSLBASE} CONFIGURE_ARGS+= --with-tcl @@ -17,7 +15,7 @@ TCLSH= ${LOCALBASE}/bin/tclsh BUILD_DIRS= ${WRKSRC}/src/pl/tcl -.include "../../databases/postgresql-lib/buildlink2.mk" +.include "../postgresql-lib/buildlink2.mk" .include "../../lang/tcl/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/postgresql-pltcl/PLIST b/databases/postgresql-pltcl/PLIST index c00f3440f3a..bd95b359da0 100644 --- a/databases/postgresql-pltcl/PLIST +++ b/databases/postgresql-pltcl/PLIST @@ -1,2 +1,6 @@ -@comment $NetBSD: PLIST,v 1.2 2002/04/04 07:41:04 jlam Exp $ +@comment $NetBSD: PLIST,v 1.3 2003/01/05 20:12:26 jlam Exp $ +bin/pltcl_delmod +bin/pltcl_listmod +bin/pltcl_loadmod lib/postgresql/pltcl.so +share/postgresql/unknown.pltcl diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile index 8f68de04f53..834b03e7232 100644 --- a/databases/postgresql-server/Makefile +++ b/databases/postgresql-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2002/10/19 19:03:59 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2003/01/05 20:12:27 jlam Exp $ PKGNAME= postgresql-server-${BASE_VERS} COMMENT= PostgreSQL database server programs @@ -8,9 +8,7 @@ DEPENDS+= postgresql-client>=${BASE_VERS}:../../databases/postgresql-client # mips has no TAS implementation NOT_FOR_PLATFORM= *-*-mips -USE_BUILDLINK2= # defined - -.include "../../databases/postgresql/Makefile.common" +.include "../postgresql/Makefile.common" CONFIGURE_ARGS+= --with-openssl=${SSLBASE} BUILD_DIRS= ${WRKSRC}/src/backend @@ -64,6 +62,6 @@ post-install: ${GTAR} zxCf ${PREFIX}/man ${WRKSRC}/doc/man.tar.gz \ `${SED} -e "s|^#.*||" ${FILESDIR}/man.server` -.include "../../databases/postgresql-lib/buildlink2.mk" +.include "../postgresql-lib/buildlink2.mk" .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/postgresql/Makefile b/databases/postgresql/Makefile index 23c5d9951a8..db046e6ded4 100644 --- a/databases/postgresql/Makefile +++ b/databases/postgresql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.68 2002/10/19 04:01:22 jlam Exp $ +# $NetBSD: Makefile,v 1.69 2003/01/05 20:12:07 jlam Exp $ PKGNAME= postgresql-${BASE_VERS} COMMENT= Robust, next generation, object-relational DBMS @@ -7,10 +7,9 @@ DEPENDS+= postgresql-client>=${BASE_VERS}:../../databases/postgresql-client DEPENDS+= postgresql-server>=${BASE_VERS}:../../databases/postgresql-server DEPENDS+= postgresql-docs>=${BASE_VERS}:../../databases/postgresql-docs -.include "../../databases/postgresql/Makefile.common" +.include "Makefile.common" EXTRACT_ONLY= # empty -USE_BUILDLINK2= YES NO_CHECKSUM= YES NO_PATCH= YES NO_CONFIGURE= YES diff --git a/databases/postgresql/Makefile.common b/databases/postgresql/Makefile.common index e8a00e6807b..3360454d3c0 100644 --- a/databases/postgresql/Makefile.common +++ b/databases/postgresql/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.31 2002/10/19 03:03:49 jlam Exp $ +# $NetBSD: Makefile.common,v 1.32 2003/01/05 20:12:08 jlam Exp $ # # This Makefile fragment is included by all PostgreSQL packages built from # the main sources of the PostgreSQL distribution except jdbc-postgresql. @@ -25,55 +25,47 @@ HOMEPAGE?= http://www.postgresql.org/ CONFLICTS+= postgresql-[0-6]* postgresql-7.0* -DISTINFO_FILE?= ${.CURDIR}/../../databases/postgresql/distinfo -COMMON_FILESDIR?= ${.CURDIR}/../../databases/postgresql/files -PATCHDIR?= ${.CURDIR}/../../databases/postgresql/patches +DISTINFO_FILE?= ${.CURDIR}/../postgresql/distinfo +COMMON_FILESDIR?= ${.CURDIR}/../postgresql/files +PATCHDIR?= ${.CURDIR}/../postgresql/patches # Version numbering scheme: # # DIST_VERS version number on the postgresql distfile # BASE_VERS pkgsrc-mangled version number (convert pl -> .) # -DIST_VERS?= 7.2.3 +DIST_VERS?= 7.3.1 BASE_VERS?= ${DIST_VERS} BUILDLINK_DEPENDS.postgresql-lib?= postgresql-lib>=${BASE_VERS} BUILDLINK_DEPENDS.tcl-postgresql?= tcl-postgresql>=${BASE_VERS} +USE_BUILDLINK2= YES USE_GMAKE= YES GNU_CONFIGURE= YES +PKG_SYSCONFSUBDIR= postgresql .include "../../mk/bsd.prefs.mk" -# PG_MB_ENCODING may be set to any of: -# -# SQL_ASCII, EUC_JP, EUC_CN, EUC_KR, EUC_TW, UNICODE, MULE_INTERNAL, -# LATIN1, LATIN2, LATIN3, LATIN4, LATIN5, KOI8, WIN, ALT -# -# This variable controls the language encoding on the backend process. - -.if defined(PG_MB_ENCODING) -CONFIGURE_ARGS+= --enable-multibyte=${PG_MB_ENCODING} -.else -CONFIGURE_ARGS+= --enable-multibyte # accept default +PGSQL_TEMPLATE.SunOS= solaris +.if !defined(PGSQL_TEMPLATE.${OPSYS}) +PGSQL_TEMPLATE.${OPSYS}= ${LOWER_OPSYS} .endif -CONFIGURE_ARGS+= --disable-odbc +CONFIGURE_ARGS+= --with-template="${PGSQL_TEMPLATE.${OPSYS}}" +CONFIGURE_ARGS+= --without-readline +CONFIGURE_ARGS+= --without-zlib + +CONFIGURE_ARGS+= --includedir=${PREFIX}/include/postgresql +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --with-htmldir=${PREFIX}/share/doc/html/postgresql + CONFIGURE_ARGS+= --without-java CONFIGURE_ARGS+= --without-perl CONFIGURE_ARGS+= --without-python CONFIGURE_ARGS+= --without-tcl CONFIGURE_ARGS+= --without-tk -CONFIGURE_ARGS+= --includedir=${PREFIX}/include/pgsql -CONFIGURE_ARGS+= --with-htmldir=${PREFIX}/share/doc/html/postgresql - -CONFIGURE_ARGS+= --disable-readline -CONFIGURE_ARGS+= --enable-locale -CONFIGURE_ARGS+= --enable-syslog -CONFIGURE_ARGS+= --with-CXX -CONFIGURE_ARGS+= --with-template="${LOWER_OPSYS}" - post-extract: if [ -d ${WRKSRC}/src ]; then \ ${RM} -f ${WRKSRC}/src/Makefile.custom; \ @@ -85,3 +77,13 @@ post-extract: ${CP} -f ${COMMON_FILESDIR}/GNUmakefile.libpq \ ${WRKSRC}/src/interfaces/libpq/GNUmakefile; \ fi + if [ -d ${WRKSRC}/src/interfaces/libpgtcl ]; then \ + ${RM} -f ${WRKSRC}/src/interfaces/libpgtcl/GNUmakefile; \ + ${CP} -f ${COMMON_FILESDIR}/GNUmakefile.libpgtcl \ + ${WRKSRC}/src/interfaces/libpgtcl/GNUmakefile; \ + fi + +pre-configure: + cd ${WRKSRC} && ${AUTOCONF} + +.include "../../mk/autoconf.mk" diff --git a/databases/postgresql/distinfo b/databases/postgresql/distinfo index 6e729a0d0d8..dea47041e00 100644 --- a/databases/postgresql/distinfo +++ b/databases/postgresql/distinfo @@ -1,14 +1,10 @@ -$NetBSD: distinfo,v 1.13 2002/10/19 03:03:50 jlam Exp $ +$NetBSD: distinfo,v 1.14 2003/01/05 20:12:09 jlam Exp $ -SHA1 (postgresql-7.2.3.tar.gz) = f98acadb3b06ea0f09f82857ca880ec198e3c791 -Size (postgresql-7.2.3.tar.gz) = 9244039 bytes -SHA1 (patch-aa) = 598f14b74b0dc54680ed85f4c26b6396898f5a7e -SHA1 (patch-ab) = 0d1dee0d7c8b3bbff8507e18b9561c0b198f409f -SHA1 (patch-ac) = eaed6eaeb65e3bb394252c5cb97a306bffb3e503 -SHA1 (patch-ad) = 581a5311c9197efd4fbd4182a2c9d906fbac3074 -SHA1 (patch-ae) = ea4f680544bbdae36945b6393f50a0c15df38046 -SHA1 (patch-af) = fb4994293ee5fa5aeb06cd0d9463b3b11ae0747e -SHA1 (patch-ah) = 1c25241c808c70a59c93ef4536aa962c91957b3b -SHA1 (patch-ai) = 02b84f52941e7cb939388137392df18d53eecfb2 -SHA1 (patch-al) = 3479fe6f0077cd9db7e13f6e3443209007342550 -SHA1 (patch-am) = 22a73cc84e28a0d45923311aa5fb3d57cdd0d8e5 +SHA1 (postgresql-7.3.1.tar.gz) = 428757df30ab4acad3c87254d4c75140f0a3406d +Size (postgresql-7.3.1.tar.gz) = 11171551 bytes +SHA1 (patch-aa) = df84b28c7074ba396ece0ea070277bcda9287a87 +SHA1 (patch-ac) = 5a647cc31873ae81a5bd5a6cf4ec6f44a43448e7 +SHA1 (patch-ad) = 90a1e22fbb09774e852e08e7779650c6fc24e9ee +SHA1 (patch-ae) = 5b46ea9782da574ee0c4b1c02534e0f74d640559 +SHA1 (patch-af) = 874e6733bef527054aaa34dcc2114c6d4ca98f12 +SHA1 (patch-ag) = 6d12184b8401e63b8a05c620beb27f28248c22da diff --git a/databases/postgresql/patches/patch-aa b/databases/postgresql/patches/patch-aa index 9efab02b180..200562b5a14 100644 --- a/databases/postgresql/patches/patch-aa +++ b/databases/postgresql/patches/patch-aa @@ -1,60 +1,21 @@ -$NetBSD: patch-aa,v 1.9 2002/04/04 07:48:24 jlam Exp $ +$NetBSD: patch-aa,v 1.10 2003/01/05 20:12:10 jlam Exp $ ---- configure.in.orig Sun Feb 3 16:04:12 2002 +--- configure.in.orig Tue Dec 17 21:07:20 2002 +++ configure.in -@@ -150,6 +150,25 @@ +@@ -330,6 +330,16 @@ IFS=$ac_save_IFS # +# Location for HTML documentation +# +htmldir='${docdir}/html' -+PGAC_ARG_REQ(with, htmldir, -+ [ --with-htmldir=DIR HTML documentation in DIR], -+ [htmldir=$withval]) -+AC_SUBST(htmldir) ++AC_MSG_CHECKING([where to install HTML documentation]) ++PGAC_ARG_REQ(with, htmldir, [ --with-htmldir=DIR install HTML documentation into DIR], [htmldir=$withval]) ++AC_MSG_RESULT([$htmldir]) ++AC_SUBST([htmldir]) + + +# -+# Readline support -+# -+AC_MSG_CHECKING([whether to build with readline support]) -+PGAC_ARG_BOOL(enable, readline, yes, -+ [ --disable-readline disable readline support]) -+AC_MSG_RESULT([$enable_readline]) -+ -+ -+# - # Locale (--enable-locale) + # Tcl/Tk # - AC_MSG_CHECKING([whether to build with locale support]) -@@ -398,6 +417,18 @@ - AC_MSG_RESULT([$with_python]) - AC_SUBST(with_python) - -+# If python is enabled (above), then optionally byte-compile the modules. -+AC_MSG_CHECKING([whether to byte-compile Python modules]) -+if test "$with_python" = yes; then -+ PGAC_ARG_BOOL(with, python_compile, no, -+ [ --with-python-compile byte-compile modules if Python is enabled]) -+else -+ with_python_compile=no -+fi -+AC_MSG_RESULT([$with_python_compile]) -+AC_SUBST([with_python_compile]) -+ -+ - # - # Optionally build the Java/JDBC tools - # -@@ -682,8 +713,10 @@ - ## Libraries - ## - -+if test "$enable_readline" = yes; then - PGAC_CHECK_READLINE - AC_SEARCH_LIBS(using_history, history, [AC_DEFINE(HAVE_HISTORY_FUNCTIONS)]) -+fi - - if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha" - then + AC_MSG_CHECKING([whether to build with Tcl]) diff --git a/databases/postgresql/patches/patch-ab b/databases/postgresql/patches/patch-ab deleted file mode 100644 index 69e25287260..00000000000 --- a/databases/postgresql/patches/patch-ab +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-ab,v 1.13 2002/04/04 07:48:24 jlam Exp $ - ---- config/programs.m4.orig Tue Aug 28 10:59:11 2001 -+++ config/programs.m4 -@@ -80,6 +80,14 @@ - [AC_REQUIRE([AC_CANONICAL_HOST]) - AC_MSG_CHECKING([for readline]) - -+case $host_os in netbsd* | openbsd* ) -+ if echo __ELF__ | $CPP - 2>/dev/null | grep __ELF__ >/dev/null; then -+ objformat=a.out -+ else -+ objformat=ELF -+ fi -+esac -+ - AC_CACHE_VAL([pgac_cv_check_readline], - [pgac_cv_check_readline=no - for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do -@@ -87,12 +95,14 @@ - pgac_save_LIBS=$LIBS - LIBS="${pgac_rllib}${pgac_lib} $LIBS" - AC_TRY_LINK_FUNC([readline], [[ -- # NetBSD and OpenBSD have a broken linker that does not -+ # NetBSD and OpenBSD have a broken a.out linker that does not - # recognize dependent libraries - case $host_os in netbsd* | openbsd* ) -- case $pgac_lib in -- *curses*) ;; -- *) pgac_lib=" -lcurses" ;; -+ case $objformat in a.out ) -+ case $pgac_lib in -+ *curses*) ;; -+ *) pgac_lib=" -lcurses" ;; -+ esac - esac - esac - diff --git a/databases/postgresql/patches/patch-ac b/databases/postgresql/patches/patch-ac index ca7c34cf317..8f84b146c40 100644 --- a/databases/postgresql/patches/patch-ac +++ b/databases/postgresql/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.11 2002/04/05 16:27:28 jlam Exp $ +$NetBSD: patch-ac,v 1.12 2003/01/05 20:12:13 jlam Exp $ ---- doc/Makefile.orig Thu Feb 7 04:29:35 2002 +--- doc/Makefile.orig Wed Nov 27 18:21:20 2002 +++ doc/Makefile -@@ -70,7 +70,7 @@ +@@ -70,7 +70,7 @@ endif # found_man install: all installdirs ifdef found_html @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.11 2002/04/05 16:27:28 jlam Exp $ endif ifdef found_man for file in man1/*.1 man$(sqlmansectnum)/*.$(sqlmansect) ; do \ -@@ -81,7 +81,7 @@ +@@ -81,7 +81,7 @@ endif installdirs: ifdef found_html @@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.11 2002/04/05 16:27:28 jlam Exp $ endif ifdef found_man $(mkinstalldirs) $(addprefix $(DESTDIR)$(mandir)/man, 1 $(sqlmansectnum)) -@@ -90,7 +90,7 @@ +@@ -90,7 +90,7 @@ endif uninstall: ifdef found_html diff --git a/databases/postgresql/patches/patch-ad b/databases/postgresql/patches/patch-ad index 1ed06912a80..ea92b4d8c8f 100644 --- a/databases/postgresql/patches/patch-ad +++ b/databases/postgresql/patches/patch-ad @@ -1,37 +1,40 @@ -$NetBSD: patch-ad,v 1.11 2002/04/04 07:48:25 jlam Exp $ +$NetBSD: patch-ad,v 1.12 2003/01/05 20:12:13 jlam Exp $ ---- src/Makefile.global.in.orig Thu Dec 20 16:23:05 2001 +--- src/Makefile.global.in.orig Wed Sep 4 18:54:18 2002 +++ src/Makefile.global.in -@@ -107,6 +107,13 @@ +@@ -111,6 +111,13 @@ override docdir := $(docdir)/postgresql endif endif +htmldir := @htmldir@ +ifeq "$(findstring pgsql, $(htmldir))" "" +ifeq "$(findstring postgres, $(htmldir))" "" -+override htmldir := $(htmldir)/postgresql ++override htmldir := $(docdir)/postgresql +endif +endif + - odbcinst_ini_dir = @odbcinst_ini_dir@ - javadir := $(DESTDIR)$(datadir)/java -@@ -123,6 +130,7 @@ - with_java = @with_java@ - with_perl = @with_perl@ - with_python = @with_python@ -+with_python_compile = @with_python_compile@ - with_tcl = @with_tcl@ - with_tk = @with_tk@ - enable_odbc = @enable_odbc@ -@@ -279,6 +287,10 @@ - libpq_srcdir = $(top_srcdir)/src/interfaces/libpq + localedir := @localedir@ + +@@ -285,13 +292,20 @@ libpq_srcdir = $(top_srcdir)/src/interfa libpq_builddir = $(top_builddir)/src/interfaces/libpq libpq = -L$(libpq_builddir) -lpq -+ + +libpgtcl_srcdir = $(top_srcdir)/src/interfaces/libpgtcl +libpgtcl_builddir = $(top_builddir)/src/interfaces/libpgtcl +libpgtcl = -L$(libpgtcl_builddir) -lpgtcl ++ + submake-libpq: + $(MAKE) -C $(libpq_builddir) all + + submake-libpgport: + $(MAKE) -C $(top_builddir)/src/port all + +-.PHONY: submake-libpq submake-libpgport ++submake-libpgtcl: ++ $(MAKE) -C $(libpgtcl_builddir) all ++ ++.PHONY: submake-libpq submake-libpgport submake-libpgtcl ########################################################################## diff --git a/databases/postgresql/patches/patch-ae b/databases/postgresql/patches/patch-ae index 66a6216fdf3..446e8c093a2 100644 --- a/databases/postgresql/patches/patch-ae +++ b/databases/postgresql/patches/patch-ae @@ -1,10 +1,10 @@ -$NetBSD: patch-ae,v 1.13 2001/05/14 14:52:38 jlam Exp $ +$NetBSD: patch-ae,v 1.14 2003/01/05 20:12:13 jlam Exp $ ---- src/bin/pgtclsh/Makefile.orig Fri Feb 23 13:12:17 2001 +--- src/bin/pgtclsh/Makefile.orig Thu Jun 20 16:29:42 2002 +++ src/bin/pgtclsh/Makefile -@@ -22,19 +22,17 @@ - -include Makefile.tkdefs - endif +@@ -15,19 +15,17 @@ top_builddir = ../../.. + include $(top_builddir)/src/Makefile.global + -libpgtcl_srcdir = $(top_srcdir)/src/interfaces/libpgtcl -libpgtcl_builddir = $(top_builddir)/src/interfaces/libpgtcl @@ -15,26 +15,27 @@ $NetBSD: patch-ae,v 1.13 2001/05/14 14:52:38 jlam Exp $ # If we are here then Tcl is available PROGRAMS = pgtclsh -+INSTALL_TARGET = install-tcl ++INSTALL_TARGETS = install-tcl # Add Tk targets if Tk is available ifeq ($(with_tk), yes) PROGRAMS += pgtksh -+INSTALL_TARGET += install-tk ++INSTALL_TARGETS += install-tk endif all: submake $(PROGRAMS) -@@ -49,8 +47,12 @@ +@@ -42,9 +40,13 @@ pgtksh: pgtkAppInit.o submake: $(MAKE) -C $(libpgtcl_builddir) all -install: all installdirs -+install: $(INSTALL_TARGET) ++install: $(INSTALL_TARGETS) + -+install-tcl: installdirs pgtclsh ++install-tcl: pgtclsh installdirs $(INSTALL_PROGRAM) pgtclsh $(DESTDIR)$(bindir)/pgtclsh + -+install-tk: installdirs pgtksh ifeq ($(with_tk), yes) ++install-tk: pgtksh installdirs $(INSTALL_PROGRAM) pgtksh $(DESTDIR)$(bindir)/pgtksh endif + diff --git a/databases/postgresql/patches/patch-af b/databases/postgresql/patches/patch-af index 29d5c876c27..7481852960a 100644 --- a/databases/postgresql/patches/patch-af +++ b/databases/postgresql/patches/patch-af @@ -1,13 +1,13 @@ -$NetBSD: patch-af,v 1.14 2002/04/04 07:48:26 jlam Exp $ +$NetBSD: patch-af,v 1.15 2003/01/05 20:12:14 jlam Exp $ ---- src/interfaces/ecpg/lib/Makefile.orig Fri Feb 23 13:12:20 2001 +--- src/interfaces/ecpg/lib/Makefile.orig Tue Dec 10 23:08:04 2002 +++ src/interfaces/ecpg/lib/Makefile -@@ -14,7 +14,7 @@ +@@ -14,7 +14,7 @@ include $(top_builddir)/src/Makefile.glo NAME= ecpg SO_MAJOR_VERSION= 3 --SO_MINOR_VERSION= 3.0 -+SO_MINOR_VERSION= 3 +-SO_MINOR_VERSION= 4.1 ++SO_MINOR_VERSION= 4 override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdir) $(CPPFLAGS) diff --git a/databases/postgresql/patches/patch-ag b/databases/postgresql/patches/patch-ag new file mode 100644 index 00000000000..a1309dad55d --- /dev/null +++ b/databases/postgresql/patches/patch-ag @@ -0,0 +1,16 @@ +$NetBSD: patch-ag,v 1.10 2003/01/05 20:12:14 jlam Exp $ + +--- src/include/Makefile.orig Tue Aug 28 10:20:28 2001 ++++ src/include/Makefile +@@ -15,7 +15,10 @@ top_builddir = ../.. + include $(top_builddir)/src/Makefile.global + + +-all: pg_config.h pg_config_os.h ++all: pg_config.h pg_config_os.h utils/fmgroids.h parser/parse.h ++ ++utils/fmgroids.h parser/parse.h: ++ $(MAKE) -C $(top_builddir)/src/backend $(top_builddir)/src/include/$@ + + + # Install only selected headers diff --git a/databases/postgresql/patches/patch-ah b/databases/postgresql/patches/patch-ah deleted file mode 100644 index 0c3cafeed44..00000000000 --- a/databases/postgresql/patches/patch-ah +++ /dev/null @@ -1,43 +0,0 @@ -$NetBSD: patch-ah,v 1.10 2002/04/04 07:48:28 jlam Exp $ - ---- src/interfaces/python/GNUmakefile.orig Thu Dec 13 18:39:04 2001 -+++ src/interfaces/python/GNUmakefile Tue Feb 12 17:37:45 2002 -@@ -19,7 +19,14 @@ - - override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) $(python_includespec) - --all: all-lib -+PY_SCRIPTS = pg.py pgdb.py -+ifeq ($(with_python_compile), yes) -+PY_COMPILED_SCRIPTS = $(PY_SCRIPTS:%.py=%.pyc) $(PY_SCRIPTS:%.py=%.pyo) -+else -+PY_COMPILED_SCRIPTS = -+endif -+ -+all: all-lib $(PY_COMPILED_SCRIPTS) - - all-lib: libpq-all - -@@ -27,6 +34,12 @@ - libpq-all: - $(MAKE) -C $(libpq_builddir) all - -+%.pyc: %.py -+ $(PYTHON) -c "import py_compile; py_compile.compile(\"$<\")" -+ -+%.pyo: %.py -+ $(PYTHON) -O -c "import py_compile; py_compile.compile(\"$<\")" -+ - install-warning-msg := { \ - echo "*** Skipping the installation of the Python interface module for lack"; \ - echo "*** of permissions. To install it, change to the directory"; \ -@@ -35,6 +48,9 @@ - - install: all installdirs - @if test -w $(DESTDIR)$(python_moduleexecdir) && test -w $(DESTDIR)$(python_moduledir); then \ -+ for i in $(PY_SCRIPTS) $(PY_COMPILED_SCRIPTS); do \ -+ $(INSTALL_DATA) $$i $(python_moduledir) ; \ -+ done ; \ - echo "$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(python_moduleexecdir)/_pgmodule$(DLSUFFIX)"; \ - $(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(python_moduleexecdir)/_pgmodule$(DLSUFFIX); \ - \ diff --git a/databases/postgresql/patches/patch-ai b/databases/postgresql/patches/patch-ai deleted file mode 100644 index e1687e7dd4f..00000000000 --- a/databases/postgresql/patches/patch-ai +++ /dev/null @@ -1,9 +0,0 @@ -$NetBSD: patch-ai,v 1.8 2001/05/14 14:52:38 jlam Exp $ - ---- src/interfaces/python/Setup.in.raw.orig Sun Apr 1 15:17:33 2001 -+++ src/interfaces/python/Setup.in.raw -@@ -1,3 +1,3 @@ - *shared* - --_pg pgmodule.c -I@libpq_srcdir@ @INCLUDES@ -L@libpq_builddir@ -lpq @EXTRA_LIBS@ -+_pg pgmodule.c -I@libpq_srcdir@ @INCLUDES@ @libpq@ @EXTRA_LIBS@ diff --git a/databases/postgresql/patches/patch-al b/databases/postgresql/patches/patch-al deleted file mode 100644 index f0701eb56cd..00000000000 --- a/databases/postgresql/patches/patch-al +++ /dev/null @@ -1,182 +0,0 @@ -$NetBSD: patch-al,v 1.6 2002/04/04 07:48:30 jlam Exp $ - ---- configure.orig Sun Feb 3 16:04:11 2002 -+++ configure -@@ -19,6 +19,10 @@ - ac_help="$ac_help - --with-libs=DIRS alternative spelling of --with-libraries" - ac_help="$ac_help -+ --with-htmldir=DIR HTML documentation in DIR" -+ac_help="$ac_help -+ --disable-readline disable readline support" -+ac_help="$ac_help - --enable-locale enable locale support" - ac_help="$ac_help - --enable-recode enable character set recode support" -@@ -53,6 +57,8 @@ - ac_help="$ac_help - --with-python build Python interface module" - ac_help="$ac_help -+ --with-python-compile byte-compile modules if Python is enabled" -+ac_help="$ac_help - --with-java build JDBC interface and Java tools" - ac_help="$ac_help - --with-krb4[=DIR] build with Kerberos 4 support [/usr/athena]" -@@ -817,6 +823,54 @@ - - - # -+# Location for HTML documentation -+# -+htmldir='${docdir}/html' -+# Check whether --with-htmldir was given -+if test x"${with_htmldir+set}" = xset; then -+ case $with_htmldir in -+ yes) -+ { echo "configure: error: argument required for --with-htmldir option" 1>&2; exit 1; } -+ ;; -+ no) -+ { echo "configure: error: argument required for --with-htmldir option" 1>&2; exit 1; } -+ ;; -+ *) -+ withval=$with_htmldir -+ htmldir=$withval -+ ;; -+ esac # $with_htmldir -+fi -+ -+ -+ -+# -+# Readline support -+# -+echo $ac_n "checking whether to build with readline support""... $ac_c" 1>&6 -+echo "configure:852: checking whether to build with readline support" >&5 -+# Check whether --enable-readline was given -+if test x"${enable_readline+set}" = xset; then -+ case $enable_readline in -+ yes) -+ : -+ ;; -+ no) -+ : -+ ;; -+ *) -+ enableval=$enable_readline -+ { echo "configure: error: no argument expected for --enable-readline option" 1>&2; exit 1; } -+ ;; -+ esac # $enable_readline -+else -+ enable_readline=yes -+ -+fi -+echo "$ac_t""$enable_readline" 1>&6 -+ -+ -+# - # Locale (--enable-locale) - # - echo $ac_n "checking whether to build with locale support""... $ac_c" 1>&6 -@@ -1859,6 +1913,35 @@ - echo "$ac_t""$with_python" 1>&6 - - -+# If python is enabled (above), then optionally byte-compile the modules. -+echo $ac_n "checking whether to byte-compile Python modules""... $ac_c" 1>&6 -+echo "configure:1919: checking whether to byte-compile Python modules" >&5 -+if test "$with_python" = yes; then -+ # Check whether --with-python_compile was given -+if test x"${with_python_compile+set}" = xset; then -+ case $with_python_compile in -+ yes) -+ : -+ ;; -+ no) -+ : -+ ;; -+ *) -+ withval=$with_python_compile -+ { echo "configure: error: no argument expected for --with-python_compile option" 1>&2; exit 1; } -+ ;; -+ esac # $with_python_compile -+else -+ with_python_compile=no -+ -+fi -+else -+ with_python_compile=no -+fi -+echo "$ac_t""$with_python_compile" 1>&6 -+ -+ -+ - # - # Optionally build the Java/JDBC tools - # -@@ -3282,9 +3365,18 @@ - ## Libraries - ## - -+if test "$enable_readline" = yes; then - - echo $ac_n "checking for readline""... $ac_c" 1>&6 --echo "configure:3288: checking for readline" >&5 -+echo "configure:3372: checking for readline" >&5 -+ -+case $host_os in netbsd* | openbsd* ) -+ if echo __ELF__ | $CPP - 2>/dev/null | grep __ELF__ >/dev/null; then -+ objformat=a.out -+ else -+ objformat=ELF -+ fi -+esac - - if eval "test \"`echo '$''{'pgac_cv_check_readline'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3306,15 +3398,17 @@ - readline() - ; return 0; } - EOF --if { (eval echo configure:3310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - -- # NetBSD and OpenBSD have a broken linker that does not -+ # NetBSD and OpenBSD have a broken a.out linker that does not - # recognize dependent libraries - case $host_os in netbsd* | openbsd* ) -- case $pgac_lib in -- *curses*) ;; -- *) pgac_lib=" -lcurses" ;; -+ case $objformat in a.out ) -+ case $pgac_lib in -+ *termcap*) ;; -+ *) pgac_lib=" -ltermcap" ;; -+ esac - esac - esac - -@@ -3408,6 +3502,7 @@ - else : - - fi -+fi - - if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha" - then -@@ -8991,6 +9086,7 @@ - s%@host_os@%$host_os%g - s%@PORTNAME@%$PORTNAME%g - s%@TAS@%$TAS%g -+s%@htmldir@%$htmldir%g - s%@MULTIBYTE@%$MULTIBYTE%g - s%@enable_nls@%$enable_nls%g - s%@WANTED_LANGUAGES@%$WANTED_LANGUAGES%g -@@ -9007,6 +9103,7 @@ - s%@with_tk@%$with_tk%g - s%@with_perl@%$with_perl%g - s%@with_python@%$with_python%g -+s%@with_python_compile@%$with_python_compile%g - s%@ANT@%$ANT%g - s%@with_java@%$with_java%g - s%@with_krb4@%$with_krb4%g diff --git a/databases/postgresql/patches/patch-am b/databases/postgresql/patches/patch-am deleted file mode 100644 index 289868dcb07..00000000000 --- a/databases/postgresql/patches/patch-am +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-am,v 1.7 2002/04/04 07:48:31 jlam Exp $ - ---- src/interfaces/python/pgmodule.c.orig Mon Dec 3 04:39:44 2001 -+++ src/interfaces/python/pgmodule.c -@@ -343,7 +343,7 @@ - PQclear(self->last_result); - - Py_XDECREF(self->pgcnx); -- PyMem_DEL(self); -+ PyObject_DEL(self); - } - - /* closes object */ -@@ -990,7 +990,7 @@ - lo_close(self->pgcnx->cnx, self->lo_fd); - - Py_XDECREF(self->pgcnx); -- PyMem_DEL(self); -+ PyObject_DEL(self); - } - - /* opens large object */ -@@ -1546,7 +1546,7 @@ - if (self->cnx) - PQfinish(self->cnx); - -- PyMem_DEL(self); -+ PyObject_DEL(self); - } - - /* close without deleting */ -@@ -1579,7 +1579,7 @@ - if (self->last_result) - PQclear(self->last_result); - -- PyMem_DEL(self); -+ PyObject_DEL(self); - } - - /* resets connection */ diff --git a/databases/tcl-postgresql/Makefile b/databases/tcl-postgresql/Makefile index 27eb03d749d..3bf2bbb3fc4 100644 --- a/databases/tcl-postgresql/Makefile +++ b/databases/tcl-postgresql/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.13 2002/10/19 03:03:51 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2003/01/05 20:12:28 jlam Exp $ PKGNAME= tcl-postgresql-${BASE_VERS} COMMENT= Tcl interface to PostgreSQL -USE_BUILDLINK2= # defined - -.include "../../databases/postgresql/Makefile.common" +.include "../postgresql/Makefile.common" CONFIGURE_ARGS+= --with-openssl=${SSLBASE} CONFIGURE_ARGS+= --with-tcl @@ -21,7 +19,7 @@ post-install: ${GTAR} zxCf ${PREFIX}/man ${WRKSRC}/doc/man.tar.gz \ `${SED} -e "s|#.*||" ${FILESDIR}/man.tcl` -.include "../../databases/postgresql-lib/buildlink2.mk" +.include "../postgresql-lib/buildlink2.mk" .include "../../lang/tcl/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/tcl-postgresql/PLIST b/databases/tcl-postgresql/PLIST index 2ff92d34fcc..2db28b7c46c 100644 --- a/databases/tcl-postgresql/PLIST +++ b/databases/tcl-postgresql/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.2 2002/04/04 07:41:06 jlam Exp $ +@comment $NetBSD: PLIST,v 1.3 2003/01/05 20:12:29 jlam Exp $ bin/pgtclsh -include/pgsql/libpgtcl.h +include/postgresql/libpgtcl.h lib/libpgtcl.a lib/libpgtcl.so lib/libpgtcl.so.2 -lib/libpgtcl.so.2.2 +lib/libpgtcl.so.2.3 man/man1/pgtclsh.1 diff --git a/databases/tcl-postgresql/buildlink2.mk b/databases/tcl-postgresql/buildlink2.mk index e93e70613d3..73a6f65a92f 100644 --- a/databases/tcl-postgresql/buildlink2.mk +++ b/databases/tcl-postgresql/buildlink2.mk @@ -1,10 +1,10 @@ -# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:12 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.3 2003/01/05 20:12:29 jlam Exp $ .if !defined(TCL_POSTGRESQL_BUILDLINK2_MK) TCL_POSTGRESQL_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= tcl-postgresql -BUILDLINK_DEPENDS.tcl-postgresql?= tcl-postgresql>=7.0 +BUILDLINK_DEPENDS.tcl-postgresql?= tcl-postgresql>=7.3.1 BUILDLINK_PKGSRCDIR.tcl-postgresql?= ../../databases/tcl-postgresql EVAL_PREFIX+= BUILDLINK_PREFIX.tcl-postgresql=tcl-postgresql diff --git a/databases/tk-postgresql/Makefile b/databases/tk-postgresql/Makefile index fc084c90394..1b36f8778a5 100644 --- a/databases/tk-postgresql/Makefile +++ b/databases/tk-postgresql/Makefile @@ -1,13 +1,11 @@ -# $NetBSD: Makefile,v 1.14 2002/10/19 03:03:51 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2003/01/05 20:12:30 jlam Exp $ PKGNAME= tk-postgresql-${BASE_VERS} COMMENT= Tk interface to PostgreSQL -USE_BUILDLINK2= # defined -USE_X11= # defined - -.include "../../databases/postgresql/Makefile.common" +.include "../postgresql/Makefile.common" +USE_X11= YES CONFIGURE_ARGS+= --with-openssl=${SSLBASE} CONFIGURE_ARGS+= --with-tcl CONFIGURE_ARGS+= --with-tk @@ -25,8 +23,8 @@ post-install: ${GTAR} zxCf ${PREFIX}/man ${WRKSRC}/doc/man.tar.gz \ `${SED} -e "s|#.*||" ${FILESDIR}/man.tk` -.include "../../databases/postgresql-lib/buildlink2.mk" -.include "../../databases/tcl-postgresql/buildlink2.mk" +.include "../postgresql-lib/buildlink2.mk" +.include "../tcl-postgresql/buildlink2.mk" .include "../../x11/tk/buildlink2.mk" .include "../../mk/bsd.pkg.mk" |