diff options
| author | jlam <jlam> | 2002-04-04 07:41:00 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-04-04 07:41:00 +0000 |
| commit | 0a430e777c8269883068ad456ffe9ac99ae45262 (patch) | |
| tree | 92dcf0303639c882d862f45ae23a442870d0b85c /databases | |
| parent | eeb8845c0a3dfb2e82e5b0675b93a8c323c246a0 (diff) | |
| download | pkgsrc-0a430e777c8269883068ad456ffe9ac99ae45262.tar.gz | |
Update postgresql and related packages to 7.2. Thanks to Michael Graff
<explorer@flame.org> for most of the work on this update.
Pkgsrc changes from the previous version include removing Makefile.ssl and
some patches that have been integrated into this release of PostgreSQL. We
leave open the question of when to byte-compile the Python modules for the
PyGreSQL interface and just do it as before, although we should consider
doing the compilation as a post-install step to ensure that the timestamps
are correct. We also reorder some lines in the Makefile to include
Makefile.common below certain definitions (GNU_CONFIGURE, USE_BUILDLINK_ONLY)
as they may possibly trigger different portions of Makefile.common.
*** Please note that a dump/restore is required to migrate an existing ***
*** PostgreSQL installation to 7.2. ***
Major changes from version 7.1.3 are geared toward improving use in
high-volume applications and include:
VACUUM
Vacuuming no longer locks tables, thus allowing normal user access
during the vacuum. A new "VACUUM FULL" command does old-style
vacuum by locking the table and shrinking the on-disk copy of the
table.
Transactions
There is no longer a problem with installations that exceed four
billion transactions.
OID's
OID's are now optional. Users can now create tables without OID's
for cases where OID usage is excessive.
Optimizer
The system now computes histogram column statistics during
"ANALYZE", allowing much better optimizer choices.
Security
A new MD5 encryption option allows more secure storage and
transfer of passwords. A new Unix-domain socket authentication
option is available on Linux and BSD systems. PAM authentication
is also available.
Statistics
Administrators can use the new table access statistics module to
get fine-grained information about table and index usage.
Diffstat (limited to 'databases')
30 files changed, 804 insertions, 955 deletions
diff --git a/databases/postgresql-client/Makefile b/databases/postgresql-client/Makefile index d2489f81114..1097281592a 100644 --- a/databases/postgresql-client/Makefile +++ b/databases/postgresql-client/Makefile @@ -1,17 +1,15 @@ -# $NetBSD: Makefile,v 1.11 2001/12/31 20:53:53 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2002/04/04 07:41:00 jlam Exp $ -.include "../../databases/postgresql/Makefile.common" -.include "../../databases/postgresql/Makefile.ssl" - -PKGNAME= postgresql-client-${PG_BASE_VERS} +PKGNAME= postgresql-client-${BASE_VERS} COMMENT= PostgreSQL database client programs -USE_BUILDLINK_ONLY= # defined -BUILDLINK_DEPENDS.postgresql-lib= postgresql-lib>=${PG_BASE_VERS} +USE_BUILDLINK_ONLY= YES + +.include "../../databases/postgresql/Makefile.common" +CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_DIR} CONFIGURE_ARGS+= --enable-readline MAKE_ENV+= INSTALLED_LIBPQ=1 -LIBS+= ${LIBGETOPT} DIRS_TO_BUILD= src/bin @@ -36,7 +34,7 @@ post-install: ${SED} -e "s|^#.*||" ${FILESDIR}/exclude \ | ${GTAR} zxCXf ${PREFIX}/man - ${WRKSRC}/doc/man.tar.gz +.include "../../databases/postgresql-lib/buildlink.mk" .include "../../devel/readline/buildlink.mk" .include "../../devel/zlib/buildlink.mk" -.include "../../databases/postgresql-lib/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/postgresql-client/PLIST b/databases/postgresql-client/PLIST index b9ce69b06df..4769e6ef0b5 100644 --- a/databases/postgresql-client/PLIST +++ b/databases/postgresql-client/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:12:35 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/04/04 07:41:00 jlam Exp $ bin/createdb bin/createlang bin/createuser @@ -39,6 +39,7 @@ man/manl/abort.l man/manl/alter_group.l man/manl/alter_table.l man/manl/alter_user.l +man/manl/analyze.l man/manl/begin.l man/manl/checkpoint.l man/manl/close.l @@ -95,6 +96,7 @@ man/manl/rollback.l man/manl/select_into.l man/manl/select.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 diff --git a/databases/postgresql-docs/Makefile b/databases/postgresql-docs/Makefile index bd86434b15c..116bc578fe3 100644 --- a/databases/postgresql-docs/Makefile +++ b/databases/postgresql-docs/Makefile @@ -1,31 +1,33 @@ -# $NetBSD: Makefile,v 1.2 2001/12/03 08:06:26 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2002/04/04 07:41:01 jlam Exp $ -.include "../../databases/postgresql/Makefile.common" - -PKGNAME= postgresql-docs-${PG_BASE_VERS} +PKGNAME= postgresql-docs-${BASE_VERS} COMMENT= PostgreSQL database system documentation -DOC_DIR= doc +USE_BUILDLINK_ONLY= YES + +.include "../../databases/postgresql/Makefile.common" + DOCDIR= ${PREFIX}/share/doc/postgresql # The manpage documentation is installed with the relevant packages. pre-build: - cd ${WRKSRC}/${DOC_DIR} && ${RM} -f man.tar.gz + cd ${WRKSRC}/doc && ${RM} -f man.tar.gz do-build: - cd ${WRKSRC}/${DOC_DIR} && \ - ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${ALL_TARGET} + cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} \ + ${MAKE_PROGRAM} ${ALL_TARGET} do-install: - cd ${WRKSRC}/${DOC_DIR} && \ - ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${INSTALL_TARGET} + cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} \ + ${MAKE_PROGRAM} ${INSTALL_TARGET} post-install: ${INSTALL_DATA_DIR} ${DOCDIR} - cd ${WRKSRC}/${DOC_DIR}; \ - ${INSTALL_DATA} \ + cd ${WRKSRC}/doc; for file in \ FAQ* KNOWN_BUGS MISSING_FEATURES README.* TODO \ - bug.template internals.ps \ - ${DOCDIR} + bug.template; \ + do \ + ${INSTALL_DATA} $${file} ${DOCDIR}/$${file}; \ + done .include "../../mk/bsd.pkg.mk" diff --git a/databases/postgresql-docs/PLIST b/databases/postgresql-docs/PLIST index 1af76ff69d9..089524727d0 100644 --- a/databases/postgresql-docs/PLIST +++ b/databases/postgresql-docs/PLIST @@ -1,7 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:12:36 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/04/04 07:41:01 jlam Exp $ share/doc/html/postgresql/admin.html -share/doc/html/postgresql/advanced.html -share/doc/html/postgresql/altern-locations.html share/doc/html/postgresql/app-createdb.html share/doc/html/postgresql/app-createlang.html share/doc/html/postgresql/app-createuser.html @@ -16,7 +14,6 @@ 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-pgadmin.html share/doc/html/postgresql/app-pgconfig.html share/doc/html/postgresql/app-pgdump.html share/doc/html/postgresql/app-pgrestore.html @@ -28,7 +25,6 @@ share/doc/html/postgresql/app-psql.html share/doc/html/postgresql/app-vacuumdb.html share/doc/html/postgresql/applevel-consistency.html share/doc/html/postgresql/arch-pg.html -share/doc/html/postgresql/arch.html share/doc/html/postgresql/arrays.html share/doc/html/postgresql/auth-methods.html share/doc/html/postgresql/backup-file.html @@ -48,17 +44,21 @@ share/doc/html/postgresql/catalog-pg-group.html share/doc/html/postgresql/catalog-pg-index.html 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-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 +share/doc/html/postgresql/catalog-pg-trigger.html share/doc/html/postgresql/catalog-pg-type.html share/doc/html/postgresql/catalogs.gif share/doc/html/postgresql/catalogs.html share/doc/html/postgresql/charset.html share/doc/html/postgresql/client-authentication-problems.html share/doc/html/postgresql/client-authentication.html -share/doc/html/postgresql/clientserver.gif share/doc/html/postgresql/compiler.html share/doc/html/postgresql/connect-estab.html share/doc/html/postgresql/connections.gif @@ -66,6 +66,7 @@ share/doc/html/postgresql/creating-cluster.html share/doc/html/postgresql/cvs-tree.html share/doc/html/postgresql/cvs.html share/doc/html/postgresql/cvsup.html +share/doc/html/postgresql/datatype-binary.html share/doc/html/postgresql/datatype-bit.html share/doc/html/postgresql/datatype-boolean.html share/doc/html/postgresql/datatype-character.html @@ -91,7 +92,10 @@ share/doc/html/postgresql/ecpg.html share/doc/html/postgresql/executor.html share/doc/html/postgresql/explicit-joins.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/functions-aggregate.html +share/doc/html/postgresql/functions-binarystring.html share/doc/html/postgresql/functions-comparison.html share/doc/html/postgresql/functions-conditional.html share/doc/html/postgresql/functions-datetime.html @@ -101,8 +105,11 @@ share/doc/html/postgresql/functions-matching.html share/doc/html/postgresql/functions-math.html share/doc/html/postgresql/functions-misc.html share/doc/html/postgresql/functions-net.html +share/doc/html/postgresql/functions-sequence.html share/doc/html/postgresql/functions-string.html +share/doc/html/postgresql/functions-subquery.html share/doc/html/postgresql/functions.html +share/doc/html/postgresql/geqo-biblio.html share/doc/html/postgresql/geqo-intro2.html share/doc/html/postgresql/geqo-pg-intro.html share/doc/html/postgresql/geqo.html @@ -111,12 +118,14 @@ share/doc/html/postgresql/groups.html share/doc/html/postgresql/history.html share/doc/html/postgresql/index.html share/doc/html/postgresql/indexcost.html -share/doc/html/postgresql/indices-functional.html -share/doc/html/postgresql/indices-multicolumn.html -share/doc/html/postgresql/indices-opclass.html -share/doc/html/postgresql/indices-types.html -share/doc/html/postgresql/indices-unique.html -share/doc/html/postgresql/indices.html +share/doc/html/postgresql/indexes-examine.html +share/doc/html/postgresql/indexes-functional.html +share/doc/html/postgresql/indexes-multicolumn.html +share/doc/html/postgresql/indexes-opclass.html +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 @@ -125,8 +134,9 @@ share/doc/html/postgresql/install-requirements.html 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-ddl.html share/doc/html/postgresql/jdbc-ext.html -share/doc/html/postgresql/jdbc-lo.html share/doc/html/postgresql/jdbc-query.html share/doc/html/postgresql/jdbc-reading.html share/doc/html/postgresql/jdbc-thread.html @@ -136,9 +146,11 @@ 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-examples.html +share/doc/html/postgresql/libpgtcl-loading.html share/doc/html/postgresql/libpgtcl-ref.html share/doc/html/postgresql/libpq-async.html +share/doc/html/postgresql/libpq-build.html +share/doc/html/postgresql/libpq-connect.html share/doc/html/postgresql/libpq-control.html share/doc/html/postgresql/libpq-copy.html share/doc/html/postgresql/libpq-envars.html @@ -154,46 +166,46 @@ 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/lisp.html -share/doc/html/postgresql/ln11330.html -share/doc/html/postgresql/ln1274.html -share/doc/html/postgresql/ln15181.html -share/doc/html/postgresql/ln24.html -share/doc/html/postgresql/ln25010.html -share/doc/html/postgresql/ln37176.html +share/doc/html/postgresql/ln13544.html +share/doc/html/postgresql/ln19341.html +share/doc/html/postgresql/ln25.html +share/doc/html/postgresql/ln31695.html +share/doc/html/postgresql/ln43726.html +share/doc/html/postgresql/ln650.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/lo-sample.html -share/doc/html/postgresql/locking-indices.html +share/doc/html/postgresql/locking-indexes.html share/doc/html/postgresql/locking-tables.html -share/doc/html/postgresql/manage-ag-accessdb.html +share/doc/html/postgresql/logfile-maintenance.html +share/doc/html/postgresql/maintenance.html share/doc/html/postgresql/manage-ag-dropdb.html share/doc/html/postgresql/manage.html share/doc/html/postgresql/managing-databases.html share/doc/html/postgresql/migration.html -share/doc/html/postgresql/more-advanced.html +share/doc/html/postgresql/monitoring-stats.html +share/doc/html/postgresql/monitoring.html share/doc/html/postgresql/multibyte.html share/doc/html/postgresql/mvcc.html -share/doc/html/postgresql/non-atomic-values.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/organization.html share/doc/html/postgresql/overview.html share/doc/html/postgresql/page.html share/doc/html/postgresql/parser-stage.html -share/doc/html/postgresql/partial-index.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-chapter.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 @@ -213,17 +225,27 @@ 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/plperl-use.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.html -share/doc/html/postgresql/plpgsql-description.html +share/doc/html/postgresql/plpgsql-control-structures.html +share/doc/html/postgresql/plpgsql-cursors.html +share/doc/html/postgresql/plpgsql-declarations.html +share/doc/html/postgresql/plpgsql-errors-and-messages.html share/doc/html/postgresql/plpgsql-examples.html +share/doc/html/postgresql/plpgsql-expressions.html share/doc/html/postgresql/plpgsql-porting.html +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.html share/doc/html/postgresql/pltcl-description.html share/doc/html/postgresql/pltcl.html share/doc/html/postgresql/populate.html -share/doc/html/postgresql/postgres.html share/doc/html/postgresql/postmaster-shutdown.html share/doc/html/postgresql/postmaster-start.html share/doc/html/postgresql/preface.html @@ -293,24 +315,18 @@ share/doc/html/postgresql/pygresql.html share/doc/html/postgresql/queries-limit.html share/doc/html/postgresql/queries-order.html share/doc/html/postgresql/queries-select-lists.html +share/doc/html/postgresql/queries-table-expressions.html share/doc/html/postgresql/queries-union.html share/doc/html/postgresql/queries.html -share/doc/html/postgresql/query-agg.html -share/doc/html/postgresql/query-concepts.html -share/doc/html/postgresql/query-delete.html -share/doc/html/postgresql/query-join.html -share/doc/html/postgresql/query-populate.html -share/doc/html/postgresql/query-query.html -share/doc/html/postgresql/query-selectinto.html -share/doc/html/postgresql/query-table.html -share/doc/html/postgresql/query-update.html -share/doc/html/postgresql/query.html +share/doc/html/postgresql/querytree.html share/doc/html/postgresql/recode.html -share/doc/html/postgresql/recovery.html share/doc/html/postgresql/reference-client.html +share/doc/html/postgresql/reference-preface.html share/doc/html/postgresql/reference-server.html share/doc/html/postgresql/reference.html +share/doc/html/postgresql/regress-evaluation.html share/doc/html/postgresql/regress-platform.html +share/doc/html/postgresql/regress-run.html share/doc/html/postgresql/regress.html share/doc/html/postgresql/release-0-01.html share/doc/html/postgresql/release-0-02.html @@ -338,13 +354,13 @@ share/doc/html/postgresql/release-7-0-1.html share/doc/html/postgresql/release-7-0-2.html share/doc/html/postgresql/release-7-0-3.html share/doc/html/postgresql/release-7-0.html -share/doc/html/postgresql/release-7-1.html 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.html -share/doc/html/postgresql/relmodel-formal.html -share/doc/html/postgresql/relmodel-oper.html share/doc/html/postgresql/resources.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 @@ -353,17 +369,28 @@ share/doc/html/postgresql/rules-views.html share/doc/html/postgresql/rules.html share/doc/html/postgresql/runtime-config.html share/doc/html/postgresql/runtime.html +share/doc/html/postgresql/setindex.html share/doc/html/postgresql/source.html share/doc/html/postgresql/spi-examples.html share/doc/html/postgresql/spi-interface-support.html share/doc/html/postgresql/spi-memory.html share/doc/html/postgresql/spi-spiconnect.html share/doc/html/postgresql/spi-spicopytuple.html +share/doc/html/postgresql/spi-spicopytupledesc.html +share/doc/html/postgresql/spi-spicopytupleintoslot.html +share/doc/html/postgresql/spi-spicursor-close.html +share/doc/html/postgresql/spi-spicursor-fetch.html +share/doc/html/postgresql/spi-spicursor-find.html +share/doc/html/postgresql/spi-spicursor-move.html +share/doc/html/postgresql/spi-spicursor-open.html share/doc/html/postgresql/spi-spiexec.html share/doc/html/postgresql/spi-spiexecp.html share/doc/html/postgresql/spi-spifinish.html share/doc/html/postgresql/spi-spifname.html share/doc/html/postgresql/spi-spifnumber.html +share/doc/html/postgresql/spi-spifreeplan.html +share/doc/html/postgresql/spi-spifreetuple.html +share/doc/html/postgresql/spi-spifreetuptable.html share/doc/html/postgresql/spi-spigetbinval.html share/doc/html/postgresql/spi-spigetrelname.html share/doc/html/postgresql/spi-spigettype.html @@ -381,6 +408,7 @@ share/doc/html/postgresql/sql-abort.html share/doc/html/postgresql/sql-altergroup.html share/doc/html/postgresql/sql-altertable.html share/doc/html/postgresql/sql-alteruser.html +share/doc/html/postgresql/sql-analyze.html share/doc/html/postgresql/sql-begin.html share/doc/html/postgresql/sql-checkpoint.html share/doc/html/postgresql/sql-close.html @@ -428,7 +456,6 @@ share/doc/html/postgresql/sql-fetch.html share/doc/html/postgresql/sql-grant.html share/doc/html/postgresql/sql-insert.html share/doc/html/postgresql/sql-keywords-appendix.html -share/doc/html/postgresql/sql-language.html share/doc/html/postgresql/sql-listen.html share/doc/html/postgresql/sql-load.html share/doc/html/postgresql/sql-lock.html @@ -442,6 +469,7 @@ share/doc/html/postgresql/sql-rollback.html share/doc/html/postgresql/sql-select.html share/doc/html/postgresql/sql-selectinto.html share/doc/html/postgresql/sql-set-constraints.html +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 @@ -451,24 +479,42 @@ share/doc/html/postgresql/sql-truncate.html share/doc/html/postgresql/sql-unlisten.html share/doc/html/postgresql/sql-update.html share/doc/html/postgresql/sql-vacuum.html -share/doc/html/postgresql/sql.html share/doc/html/postgresql/ssh-tunnels.html share/doc/html/postgresql/ssl-tcp.html -share/doc/html/postgresql/start-manage-db.html -share/doc/html/postgresql/start-psql.html -share/doc/html/postgresql/start.html share/doc/html/postgresql/storage.html +share/doc/html/postgresql/stylesheet.css share/doc/html/postgresql/supported-platforms.html -share/doc/html/postgresql/timing-results.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 share/doc/html/postgresql/trigger-manager.html share/doc/html/postgresql/triggers.html +share/doc/html/postgresql/tutorial-accessdb.html +share/doc/html/postgresql/tutorial-advanced.html +share/doc/html/postgresql/tutorial-agg.html +share/doc/html/postgresql/tutorial-arch.html +share/doc/html/postgresql/tutorial-concepts.html +share/doc/html/postgresql/tutorial-conclusion.html +share/doc/html/postgresql/tutorial-createdb.html +share/doc/html/postgresql/tutorial-delete.html +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-select.html +share/doc/html/postgresql/tutorial-sql.html +share/doc/html/postgresql/tutorial-start.html +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 @@ -485,9 +531,19 @@ share/doc/html/postgresql/xfunc-c.html share/doc/html/postgresql/xfunc-internal.html 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.html +share/doc/html/postgresql/xindex-am.html +share/doc/html/postgresql/xindex-opclass.html +share/doc/html/postgresql/xindex-operators.html +share/doc/html/postgresql/xindex-strategies.html +share/doc/html/postgresql/xindex-support.html share/doc/html/postgresql/xindex.html +share/doc/html/postgresql/xoper-example.html +share/doc/html/postgresql/xoper-optimization.html 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 @@ -495,6 +551,7 @@ share/doc/postgresql/FAQ share/doc/postgresql/FAQ_AIX share/doc/postgresql/FAQ_DEV share/doc/postgresql/FAQ_HPUX +share/doc/postgresql/FAQ_IRIX share/doc/postgresql/FAQ_MSWIN share/doc/postgresql/FAQ_QNX4 share/doc/postgresql/FAQ_SCO @@ -507,6 +564,5 @@ share/doc/postgresql/README.mb.big5 share/doc/postgresql/README.mb.jp share/doc/postgresql/TODO share/doc/postgresql/bug.template -share/doc/postgresql/internals.ps @dirrm share/doc/postgresql @dirrm share/doc/html/postgresql diff --git a/databases/postgresql-lib/Makefile b/databases/postgresql-lib/Makefile index bd159a3eccd..5b86fdef8cc 100644 --- a/databases/postgresql-lib/Makefile +++ b/databases/postgresql-lib/Makefile @@ -1,20 +1,22 @@ -# $NetBSD: Makefile,v 1.4 2001/12/03 08:06:26 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2002/04/04 07:41:02 jlam Exp $ -.include "../../databases/postgresql/Makefile.common" -.include "../../databases/postgresql/Makefile.ssl" - -PKGNAME= postgresql-lib-${PG_BASE_VERS} +PKGNAME= postgresql-lib-${BASE_VERS} COMMENT= PostgreSQL database headers and libraries -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK_ONLY= YES + +.include "../../databases/postgresql/Makefile.common" +CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_DIR} DIRS_TO_BUILD= src/include src/interfaces src/pl .include "../../mk/bsd.prefs.mk" do-build: -# Avoid conflict between "/usr/include/crypt.h" and -# "${LOCALBASE}/include/openssl/des.h". +# +# Avoid conflict between "${LOCALBASE}/include/openssl/des.h" and +# "/usr/include/crypt.h" -- we want the definitions in the former. +# .if (${OPSYS} == "SunOS") ${TOUCH} ${BUILDLINK_DIR}/include/crypt.h .endif @@ -35,4 +37,5 @@ post-install: ${GTAR} zxCf ${PREFIX}/man ${WRKSRC}/doc/man.tar.gz \ `${SED} -e "s|^#.*||" ${FILESDIR}/man.lib` +.include "../../security/openssl/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/postgresql-lib/PLIST b/databases/postgresql-lib/PLIST index 68a6d813794..d71b6c6d694 100644 --- a/databases/postgresql-lib/PLIST +++ b/databases/postgresql-lib/PLIST @@ -1,131 +1,14 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:33 skrll Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/04/04 07:41:03 jlam Exp $ bin/ecpg -include/pgsql/access/attnum.h -include/pgsql/access/genam.h -include/pgsql/access/gist.h -include/pgsql/access/gistscan.h -include/pgsql/access/giststrat.h -include/pgsql/access/hash.h -include/pgsql/access/heapam.h -include/pgsql/access/hio.h -include/pgsql/access/htup.h -include/pgsql/access/ibit.h -include/pgsql/access/iqual.h -include/pgsql/access/istrat.h -include/pgsql/access/itup.h -include/pgsql/access/nbtree.h -include/pgsql/access/printtup.h -include/pgsql/access/relscan.h -include/pgsql/access/rmgr.h -include/pgsql/access/rtree.h -include/pgsql/access/rtscan.h -include/pgsql/access/rtstrat.h -include/pgsql/access/sdir.h -include/pgsql/access/skey.h -include/pgsql/access/strat.h -include/pgsql/access/transam.h -include/pgsql/access/tupdesc.h -include/pgsql/access/tupmacs.h -include/pgsql/access/tuptoaster.h -include/pgsql/access/valid.h -include/pgsql/access/xact.h -include/pgsql/access/xlog.h -include/pgsql/access/xlogdefs.h -include/pgsql/access/xlogutils.h -include/pgsql/bootstrap/bootstrap.h -include/pgsql/c.h -include/pgsql/catalog/catalog.h -include/pgsql/catalog/catname.h -include/pgsql/catalog/catversion.h -include/pgsql/catalog/heap.h -include/pgsql/catalog/index.h -include/pgsql/catalog/indexing.h -include/pgsql/catalog/pg_aggregate.h -include/pgsql/catalog/pg_am.h -include/pgsql/catalog/pg_amop.h -include/pgsql/catalog/pg_amproc.h -include/pgsql/catalog/pg_attrdef.h -include/pgsql/catalog/pg_attribute.h -include/pgsql/catalog/pg_class.h -include/pgsql/catalog/pg_control.h -include/pgsql/catalog/pg_database.h -include/pgsql/catalog/pg_description.h -include/pgsql/catalog/pg_group.h -include/pgsql/catalog/pg_index.h -include/pgsql/catalog/pg_inheritproc.h -include/pgsql/catalog/pg_inherits.h -include/pgsql/catalog/pg_ipl.h -include/pgsql/catalog/pg_language.h -include/pgsql/catalog/pg_largeobject.h -include/pgsql/catalog/pg_listener.h -include/pgsql/catalog/pg_log.h -include/pgsql/catalog/pg_opclass.h -include/pgsql/catalog/pg_operator.h -include/pgsql/catalog/pg_proc.h -include/pgsql/catalog/pg_relcheck.h -include/pgsql/catalog/pg_rewrite.h -include/pgsql/catalog/pg_shadow.h -include/pgsql/catalog/pg_statistic.h -include/pgsql/catalog/pg_trigger.h -include/pgsql/catalog/pg_type.h -include/pgsql/catalog/pg_variable.h -include/pgsql/catalog/pg_version.h -include/pgsql/commands/async.h -include/pgsql/commands/cluster.h -include/pgsql/commands/command.h -include/pgsql/commands/comment.h -include/pgsql/commands/copy.h -include/pgsql/commands/creatinh.h -include/pgsql/commands/dbcommands.h -include/pgsql/commands/defrem.h -include/pgsql/commands/explain.h -include/pgsql/commands/proclang.h -include/pgsql/commands/rename.h -include/pgsql/commands/sequence.h -include/pgsql/commands/trigger.h -include/pgsql/commands/user.h -include/pgsql/commands/vacuum.h -include/pgsql/commands/variable.h -include/pgsql/commands/version.h -include/pgsql/commands/view.h -include/pgsql/config.h -include/pgsql/dynloader.h include/pgsql/ecpgerrno.h include/pgsql/ecpglib.h include/pgsql/ecpgtype.h -include/pgsql/executor/execFlatten.h -include/pgsql/executor/execdebug.h -include/pgsql/executor/execdefs.h -include/pgsql/executor/execdesc.h -include/pgsql/executor/executor.h -include/pgsql/executor/functions.h -include/pgsql/executor/hashjoin.h -include/pgsql/executor/nodeAgg.h -include/pgsql/executor/nodeAppend.h -include/pgsql/executor/nodeGroup.h -include/pgsql/executor/nodeHash.h -include/pgsql/executor/nodeHashjoin.h -include/pgsql/executor/nodeIndexscan.h -include/pgsql/executor/nodeLimit.h -include/pgsql/executor/nodeMaterial.h -include/pgsql/executor/nodeMergejoin.h -include/pgsql/executor/nodeNestloop.h -include/pgsql/executor/nodeResult.h -include/pgsql/executor/nodeSeqscan.h -include/pgsql/executor/nodeSetOp.h -include/pgsql/executor/nodeSort.h -include/pgsql/executor/nodeSubplan.h -include/pgsql/executor/nodeSubqueryscan.h -include/pgsql/executor/nodeTidscan.h -include/pgsql/executor/nodeUnique.h -include/pgsql/executor/spi.h -include/pgsql/executor/spi_priv.h -include/pgsql/executor/tuptable.h -include/pgsql/fmgr.h -include/pgsql/lib/dllist.h -include/pgsql/lib/hasht.h -include/pgsql/lib/lispsort.h -include/pgsql/lib/stringinfo.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 @@ -134,228 +17,357 @@ include/pgsql/libpq++/pgdatabase.h include/pgsql/libpq++/pglobject.h include/pgsql/libpq++/pgtransdb.h include/pgsql/libpq-fe.h -include/pgsql/libpq-int.h -include/pgsql/libpq/auth.h -include/pgsql/libpq/be-fsstubs.h -include/pgsql/libpq/crypt.h -include/pgsql/libpq/hba.h -include/pgsql/libpq/libpq-be.h include/pgsql/libpq/libpq-fs.h -include/pgsql/libpq/libpq.h -include/pgsql/libpq/password.h -include/pgsql/libpq/pqcomm.h -include/pgsql/libpq/pqformat.h -include/pgsql/libpq/pqsignal.h -include/pgsql/mb/pg_wchar.h -include/pgsql/miscadmin.h -include/pgsql/nodes/execnodes.h -include/pgsql/nodes/makefuncs.h -include/pgsql/nodes/memnodes.h -include/pgsql/nodes/nodeFuncs.h -include/pgsql/nodes/nodes.h -include/pgsql/nodes/params.h -include/pgsql/nodes/parsenodes.h -include/pgsql/nodes/pg_list.h -include/pgsql/nodes/plannodes.h -include/pgsql/nodes/primnodes.h -include/pgsql/nodes/print.h -include/pgsql/nodes/readfuncs.h -include/pgsql/nodes/relation.h -include/pgsql/optimizer/clauses.h -include/pgsql/optimizer/cost.h -include/pgsql/optimizer/geqo.h -include/pgsql/optimizer/geqo_copy.h -include/pgsql/optimizer/geqo_gene.h -include/pgsql/optimizer/geqo_misc.h -include/pgsql/optimizer/geqo_mutation.h -include/pgsql/optimizer/geqo_pool.h -include/pgsql/optimizer/geqo_random.h -include/pgsql/optimizer/geqo_recombination.h -include/pgsql/optimizer/geqo_selection.h -include/pgsql/optimizer/joininfo.h -include/pgsql/optimizer/pathnode.h -include/pgsql/optimizer/paths.h -include/pgsql/optimizer/plancat.h -include/pgsql/optimizer/planmain.h -include/pgsql/optimizer/planner.h -include/pgsql/optimizer/prep.h -include/pgsql/optimizer/restrictinfo.h -include/pgsql/optimizer/subselect.h -include/pgsql/optimizer/tlist.h -include/pgsql/optimizer/var.h -include/pgsql/os.h -include/pgsql/parser/analyze.h -include/pgsql/parser/gramparse.h -include/pgsql/parser/keywords.h -include/pgsql/parser/parse_agg.h -include/pgsql/parser/parse_clause.h -include/pgsql/parser/parse_coerce.h -include/pgsql/parser/parse_expr.h -include/pgsql/parser/parse_func.h -include/pgsql/parser/parse_node.h -include/pgsql/parser/parse_oper.h -include/pgsql/parser/parse_relation.h -include/pgsql/parser/parse_target.h -include/pgsql/parser/parse_type.h -include/pgsql/parser/parser.h -include/pgsql/parser/parsetree.h -include/pgsql/parser/scansup.h -include/pgsql/port/aix.h -include/pgsql/port/beos.h -include/pgsql/port/bsdi.h -include/pgsql/port/darwin.h -include/pgsql/port/dgux.h -include/pgsql/port/freebsd.h -include/pgsql/port/hpux.h -include/pgsql/port/irix5.h -include/pgsql/port/linux.h -include/pgsql/port/netbsd.h -include/pgsql/port/nextstep.h -include/pgsql/port/openbsd.h -include/pgsql/port/osf.h -include/pgsql/port/qnx4.h -include/pgsql/port/sco.h -include/pgsql/port/solaris.h -include/pgsql/port/sunos4.h -include/pgsql/port/svr4.h -include/pgsql/port/ultrix4.h -include/pgsql/port/univel.h -include/pgsql/port/unixware.h -include/pgsql/port/win.h -include/pgsql/port/win32.h -include/pgsql/postgres.h +include/pgsql/pg_config.h +include/pgsql/pg_config_os.h include/pgsql/postgres_ext.h -include/pgsql/postgres_fe.h -include/pgsql/pqexpbuffer.h -include/pgsql/regex/cclass.h -include/pgsql/regex/cname.h -include/pgsql/regex/regex.h -include/pgsql/regex/regex2.h -include/pgsql/regex/utils.h -include/pgsql/rewrite/prs2lock.h -include/pgsql/rewrite/rewriteDefine.h -include/pgsql/rewrite/rewriteHandler.h -include/pgsql/rewrite/rewriteManip.h -include/pgsql/rewrite/rewriteRemove.h -include/pgsql/rewrite/rewriteSupport.h -include/pgsql/rusagestub.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/pgsql/storage/backendid.h -include/pgsql/storage/block.h -include/pgsql/storage/buf.h -include/pgsql/storage/buf_internals.h -include/pgsql/storage/buffile.h -include/pgsql/storage/bufmgr.h -include/pgsql/storage/bufpage.h -include/pgsql/storage/fd.h -include/pgsql/storage/ipc.h -include/pgsql/storage/item.h -include/pgsql/storage/itemid.h -include/pgsql/storage/itempos.h -include/pgsql/storage/itemptr.h -include/pgsql/storage/large_object.h -include/pgsql/storage/lmgr.h -include/pgsql/storage/lock.h -include/pgsql/storage/multilev.h -include/pgsql/storage/off.h -include/pgsql/storage/page.h -include/pgsql/storage/pagenum.h -include/pgsql/storage/pos.h -include/pgsql/storage/proc.h -include/pgsql/storage/relfilenode.h -include/pgsql/storage/s_lock.h -include/pgsql/storage/shmem.h -include/pgsql/storage/sinval.h -include/pgsql/storage/sinvaladt.h -include/pgsql/storage/smgr.h -include/pgsql/storage/spin.h -include/pgsql/strdup.h -include/pgsql/tcop/dest.h -include/pgsql/tcop/fastpath.h -include/pgsql/tcop/pquery.h -include/pgsql/tcop/tcopdebug.h -include/pgsql/tcop/tcopprot.h -include/pgsql/tcop/utility.h -include/pgsql/utils/acl.h -include/pgsql/utils/array.h -include/pgsql/utils/ascii.h -include/pgsql/utils/bit.h -include/pgsql/utils/builtins.h -include/pgsql/utils/cash.h -include/pgsql/utils/catcache.h -include/pgsql/utils/date.h -include/pgsql/utils/datetime.h -include/pgsql/utils/datum.h -include/pgsql/utils/dynahash.h -include/pgsql/utils/dynamic_loader.h -include/pgsql/utils/elog.h -include/pgsql/utils/exc.h -include/pgsql/utils/excid.h -include/pgsql/utils/fcache.h -include/pgsql/utils/fmgrtab.h -include/pgsql/utils/formatting.h -include/pgsql/utils/geo_decls.h -include/pgsql/utils/guc.h -include/pgsql/utils/hsearch.h -include/pgsql/utils/inet.h -include/pgsql/utils/int8.h -include/pgsql/utils/inval.h -include/pgsql/utils/logtape.h -include/pgsql/utils/lsyscache.h -include/pgsql/utils/memutils.h -include/pgsql/utils/nabstime.h -include/pgsql/utils/numeric.h -include/pgsql/utils/palloc.h -include/pgsql/utils/pg_crc.h -include/pgsql/utils/pg_locale.h -include/pgsql/utils/pg_lzcompress.h -include/pgsql/utils/portal.h -include/pgsql/utils/ps_status.h -include/pgsql/utils/rel.h -include/pgsql/utils/relcache.h -include/pgsql/utils/sets.h -include/pgsql/utils/syscache.h -include/pgsql/utils/temprel.h -include/pgsql/utils/timestamp.h -include/pgsql/utils/tqual.h -include/pgsql/utils/tuplesort.h -include/pgsql/utils/tuplestore.h -include/pgsql/utils/varbit.h lib/libecpg.a lib/libecpg.so lib/libecpg.so.3 -lib/libecpg.so.3.2 +lib/libecpg.so.3.3 lib/libpgeasy.a lib/libpgeasy.so lib/libpgeasy.so.2 -lib/libpgeasy.so.2.1 +lib/libpgeasy.so.2.2 lib/libpq++.a lib/libpq++.so -lib/libpq++.so.3 -lib/libpq++.so.3.1 +lib/libpq++.so.4 +lib/libpq++.so.4.0 lib/libpq.a lib/libpq.so lib/libpq.so.2 -lib/libpq.so.2.1 -lib/plpgsql.so +lib/libpq.so.2.2 +lib/postgresql/plpgsql.so man/man1/ecpg.1 -@dirrm include/pgsql/utils -@dirrm include/pgsql/tcop -@dirrm include/pgsql/storage -@dirrm include/pgsql/rewrite -@dirrm include/pgsql/regex -@dirrm include/pgsql/port -@dirrm include/pgsql/parser -@dirrm include/pgsql/optimizer -@dirrm include/pgsql/nodes -@dirrm include/pgsql/mb -@dirrm include/pgsql/libpq++ +@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/lib -@dirrm include/pgsql/executor -@dirrm include/pgsql/commands -@dirrm include/pgsql/catalog -@dirrm include/pgsql/bootstrap -@dirrm include/pgsql/access -@unexec ${RMDIR} -p %D/include/pgsql 2>/dev/null || true +@dirrm include/pgsql/libpq++ +@dirrm lib/postgresql +@unexec ${RMDIR} -p %D/include/pgsql 2>/dev/null || ${TRUE} diff --git a/databases/postgresql-plperl/Makefile b/databases/postgresql-plperl/Makefile index 29d8fd10b68..e50ba79a25c 100644 --- a/databases/postgresql-plperl/Makefile +++ b/databases/postgresql-plperl/Makefile @@ -1,27 +1,20 @@ -# $NetBSD: Makefile,v 1.5 2001/12/03 08:06:27 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2002/04/04 07:41:03 jlam Exp $ -.include "../../databases/postgresql/Makefile.common" -.include "../../databases/postgresql/Makefile.ssl" - -PKGNAME= postgresql-plperl-${PG_BASE_VERS} +PKGNAME= postgresql-plperl-${BASE_VERS} COMMENT= PL/Perl procedural language for the PostgreSQL backend -BUILDLINK_DEPENDS.postgresql-lib= postgresql-lib>=${PG_BASE_VERS} -DEPENDS+= postgresql-server>=${PG_BASE_VERS}:../../databases/postgresql-server +DEPENDS+= postgresql-server>=${BASE_VERS}:../../databases/postgresql-server DEPENDS+= libperl>=${LIBPERL5_REQD}:../../lang/libperl -USE_BUILDLINK_ONLY= YES LIBPERL5_REQD= ${PERL5_REQD} +USE_BUILDLINK_ONLY= YES +.include "../../databases/postgresql/Makefile.common" + +CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_DIR} CONFIGURE_ARGS+= --with-perl CONFIGURE_ENV+= PERL="${PERL5}" -.if (${OBJECT_FMT} == "ELF") -MAKE_ENV+= RPATH_LDFLAGS="-Wl,-R${PERL5_ARCHLIB}/CORE" -.else -MAKE_ENV+= RPATH_LDFLAGS="-R${PERL5_ARCHLIB}/CORE" -.endif - DIRS_TO_BUILD= src/pl/plperl do-build: diff --git a/databases/postgresql-plperl/PLIST b/databases/postgresql-plperl/PLIST index b4e24f883c4..23b0a546aac 100644 --- a/databases/postgresql-plperl/PLIST +++ b/databases/postgresql-plperl/PLIST @@ -1,2 +1,2 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:12:39 zuntum Exp $ -lib/plperl.so +@comment $NetBSD: PLIST,v 1.2 2002/04/04 07:41:03 jlam Exp $ +lib/postgresql/plperl.so diff --git a/databases/postgresql-pltcl/Makefile b/databases/postgresql-pltcl/Makefile index 150e056469c..4a73f504910 100644 --- a/databases/postgresql-pltcl/Makefile +++ b/databases/postgresql-pltcl/Makefile @@ -1,16 +1,15 @@ -# $NetBSD: Makefile,v 1.4 2001/12/03 08:06:27 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2002/04/04 07:41:04 jlam Exp $ -.include "../../databases/postgresql/Makefile.common" -.include "../../databases/postgresql/Makefile.ssl" - -PKGNAME= postgresql-pltcl-${PG_BASE_VERS} +PKGNAME= postgresql-pltcl-${BASE_VERS} COMMENT= PL/Tcl procedural language for the PostgreSQL backend -USE_BUILDLINK_ONLY= # defined -BUILDLINK_DEPENDS.postgresql-lib= postgresql-lib>=${PG_BASE_VERS} +DEPENDS+= postgresql-server>=${BASE_VERS}:../../databases/postgresql-server -DEPENDS+= postgresql-server>=${PG_BASE_VERS}:../../databases/postgresql-server +USE_BUILDLINK_ONLY= YES + +.include "../../databases/postgresql/Makefile.common" +CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_DIR} CONFIGURE_ARGS+= --with-tcl CONFIGURE_ARGS+= --with-tclconfig="${BUILDLINK_DIR}/lib" CONFIGURE_ENV+= TCLSH="${TCLSH}" diff --git a/databases/postgresql-pltcl/PLIST b/databases/postgresql-pltcl/PLIST index 5106f591b42..c00f3440f3a 100644 --- a/databases/postgresql-pltcl/PLIST +++ b/databases/postgresql-pltcl/PLIST @@ -1,2 +1,2 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:12:40 zuntum Exp $ -lib/pltcl.so +@comment $NetBSD: PLIST,v 1.2 2002/04/04 07:41:04 jlam Exp $ +lib/postgresql/pltcl.so diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile index 761b486a483..b1b4eda92e4 100644 --- a/databases/postgresql-server/Makefile +++ b/databases/postgresql-server/Makefile @@ -1,23 +1,25 @@ -# $NetBSD: Makefile,v 1.18 2001/12/31 20:53:53 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2002/04/04 07:41:05 jlam Exp $ -.include "../../databases/postgresql/Makefile.common" -.include "../../databases/postgresql/Makefile.ssl" - -PKGNAME= postgresql-server-${PG_BASE_VERS} +PKGNAME= postgresql-server-${BASE_VERS} COMMENT= PostgreSQL database server programs -USE_BUILDLINK_ONLY= # defined -BUILDLINK_DEPENDS.postgresql-lib= postgresql-lib>=${PG_BASE_VERS} - -DEPENDS+= postgresql-client>=${PG_BASE_VERS}:../../databases/postgresql-client - -LIBS+= ${LIBGETOPT} +DEPENDS+= postgresql-client>=${BASE_VERS}:../../databases/postgresql-client # mips has no TAS implementation NOT_FOR_PLATFORM= *-*-mips +USE_BUILDLINK_ONLY= YES + +.include "../../databases/postgresql/Makefile.common" + +CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_DIR} DIRS_TO_BUILD= src/backend +.if defined(USE_PAM) +.include "../../security/PAM/buildlink.mk" +CONFIGURE_ARGS+= --with-pam +.endif + # PGUSER username of the database administrator # PGGROUP group of the database administrator # PGHOME home directory of the database administrator and location of diff --git a/databases/postgresql-server/PLIST b/databases/postgresql-server/PLIST index da1135b4623..7cbb75391d2 100644 --- a/databases/postgresql-server/PLIST +++ b/databases/postgresql-server/PLIST @@ -1,14 +1,12 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:34 skrll Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/04/04 07:41:05 jlam Exp $ bin/postgres bin/postmaster etc/rc.d/pgsql man/man1/postgres.1 man/man1/postmaster.1 -share/postgresql/global.bki -share/postgresql/global.description +share/postgresql/postgres.bki +share/postgresql/postgres.description share/postgresql/pg_hba.conf.sample share/postgresql/pg_ident.conf.sample share/postgresql/postgresql.conf.sample -share/postgresql/template1.bki -share/postgresql/template1.description -@unexec ${RMDIR} -p %D/share/postgresql 2>/dev/null || true +@unexec ${RMDIR} -p %D/share/postgresql 2>/dev/null || ${TRUE} diff --git a/databases/postgresql/Makefile b/databases/postgresql/Makefile index 5ec2a774c1c..b4475ccc4ec 100644 --- a/databases/postgresql/Makefile +++ b/databases/postgresql/Makefile @@ -1,19 +1,19 @@ -# $NetBSD: Makefile,v 1.66 2001/12/03 08:06:25 jlam Exp $ +# $NetBSD: Makefile,v 1.67 2002/04/04 07:48:18 jlam Exp $ -.include "../../databases/postgresql/Makefile.common" - -PKGNAME= postgresql-${PG_BASE_VERS} +PKGNAME= postgresql-${BASE_VERS} COMMENT= Robust, next generation, object-relational DBMS -DEPENDS+= postgresql-client>=${PG_BASE_VERS}:../../databases/postgresql-client -DEPENDS+= postgresql-server>=${PG_BASE_VERS}:../../databases/postgresql-server -DEPENDS+= postgresql-docs>=${PG_BASE_VERS}:../../databases/postgresql-docs +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" EXTRACT_ONLY= # empty -NO_CHECKSUM= # defined -NO_PATCH= # defined -NO_CONFIGURE= # defined -NO_BUILD= # defined +NO_CHECKSUM= YES +NO_PATCH= YES +NO_CONFIGURE= YES +NO_BUILD= YES do-install: # empty diff --git a/databases/postgresql/Makefile.common b/databases/postgresql/Makefile.common index 1d9bef42b98..9a95df20435 100644 --- a/databases/postgresql/Makefile.common +++ b/databases/postgresql/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.25 2002/03/12 22:09:35 tv Exp $ +# $NetBSD: Makefile.common,v 1.26 2002/04/04 07:48:20 jlam Exp $ # # This Makefile fragment is included by all PostgreSQL packages built from # the main sources of the PostgreSQL distribution. @@ -9,36 +9,40 @@ # <lang>-postgresql client-side interface to PostgreSQL # postgresql-<lang> server-side module for PostgreSQL backend -DISTNAME= postgresql-${PG_DIST_VERS} +DISTNAME?= postgresql-${DIST_VERS} CATEGORIES+= databases -MASTER_SITES= http://www.postgresql.org/ftpsite/source/v${PG_DIST_VERS}/ \ - ftp://ftp.PostgreSQL.org/pub/source/v${PG_DIST_VERS}/ \ - ftp://ftp.de.postgresql.org/pub/source/v${PG_DIST_VERS}/ \ - ftp://ch.postgresql.org/mirror/postgresql/source/v${PG_DIST_VERS}/ \ - ftp://gd.tuwien.ac.at/db/www.postgresql.org/pub/source/v${PG_DIST_VERS}/ \ - ftp://looking-glass.usask.ca/pub/postgresql/source/v${PG_DIST_VERS}/ \ - ftp://ftp.sunsite.auc.dk/mirrors/postgresql/source/v${PG_DIST_VERS}/ \ - ftp://ftp.jaist.ac.jp/pub/dbms/postgres95/source/v${PG_DIST_VERS}/ +PGSQL_SITES= http://www.postgresql.org/ftpsite/ \ + ftp://ftp.postgresql.org/pub/ \ + ftp://ftp.de.postgresql.org/pub/ \ + ftp://ch.postgresql.org/mirror/postgresql/ \ + ftp://gd.tuwien.ac.at/db/www.postgresql.org/pub/ \ + ftp://looking-glass.usask.ca/pub/postgresql/ \ + ftp://ftp.sunsite.auc.dk/mirrors/postgresql/ \ + ftp://ftp.jaist.ac.jp/pub/dbms/postgres95/ +MASTER_SITES?= ${PGSQL_SITES:=source/v${DIST_VERS}/} -MAINTAINER= jlam@netbsd.org -HOMEPAGE= http://www.postgresql.org/ +MAINTAINER?= jlam@netbsd.org +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}/../../databases/postgresql/distinfo +COMMON_FILESDIR?= ${.CURDIR}/../../databases/postgresql/files +PATCHDIR?= ${.CURDIR}/../../databases/postgresql/patches # Version numbering scheme: # -# PG_DIST_VERS version number on the postgresql distfile -# PG_BASE_VERS pkgsrc-mangled version number (convert pl -> .) +# DIST_VERS version number on the postgresql distfile +# BASE_VERS pkgsrc-mangled version number (convert pl -> .) # -PG_DIST_VERS= 7.1.3 -PG_BASE_VERS= ${PG_DIST_VERS} +DIST_VERS?= 7.2 +BASE_VERS?= ${DIST_VERS} -USE_GMAKE= # defined -GNU_CONFIGURE= # defined +BUILDLINK_DEPENDS.postgresql-lib?= postgresql-lib>=${BASE_VERS} +BUILDLINK_DEPENDS.tcl-postgresql?= tcl-postgresql>=${BASE_VERS} + +USE_GMAKE= YES +GNU_CONFIGURE= YES .include "../../mk/bsd.prefs.mk" @@ -63,7 +67,7 @@ CONFIGURE_ARGS+= --without-tcl CONFIGURE_ARGS+= --without-tk CONFIGURE_ARGS+= --includedir=${PREFIX}/include/pgsql -CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/html/postgresql +CONFIGURE_ARGS+= --with-htmldir=${PREFIX}/share/doc/html/postgresql CONFIGURE_ARGS+= --disable-readline CONFIGURE_ARGS+= --enable-locale @@ -71,8 +75,6 @@ CONFIGURE_ARGS+= --enable-syslog CONFIGURE_ARGS+= --with-CXX CONFIGURE_ARGS+= --with-template="${LOWER_OPSYS}" -MAKE_ENV+= CUSTOM_COPT="${CFLAGS}" - post-extract: if [ -d ${WRKSRC}/src ]; then \ ${RM} -f ${WRKSRC}/src/Makefile.custom; \ diff --git a/databases/postgresql/Makefile.ssl b/databases/postgresql/Makefile.ssl deleted file mode 100644 index 774b6a3f891..00000000000 --- a/databases/postgresql/Makefile.ssl +++ /dev/null @@ -1,10 +0,0 @@ -# $NetBSD: Makefile.ssl,v 1.2 2001/06/21 21:40:07 jlam Exp $ -# -# This Makefile fragment *must* be included by PostgreSQL packages built from -# the main sources of the PostgreSQL distribution that use the PostgreSQL -# libraries. - -USE_SSL= # defined -CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_DIR} - -.include "../../security/openssl/buildlink.mk" diff --git a/databases/postgresql/distinfo b/databases/postgresql/distinfo index be522152181..f68792c23cb 100644 --- a/databases/postgresql/distinfo +++ b/databases/postgresql/distinfo @@ -1,17 +1,14 @@ -$NetBSD: distinfo,v 1.9 2001/12/06 03:46:21 jlam Exp $ +$NetBSD: distinfo,v 1.10 2002/04/04 07:48:23 jlam Exp $ -SHA1 (postgresql-7.1.3.tar.gz) = d969d73af499e87a7ad052cab5efe6ca9d1d7085 -Size (postgresql-7.1.3.tar.gz) = 8124455 bytes -SHA1 (patch-aa) = e3b4c556c2a389ae5a27d4ecfe3809652faf4c8f -SHA1 (patch-ab) = 5e83cfb8825b700782405504d56ec87016caf0ff -SHA1 (patch-ac) = feb9ea73626e131ed9bdb926a36ba312de1d6890 -SHA1 (patch-ad) = 0c55c66003603c688d727ca7de8fb73fdfdc88ac +SHA1 (postgresql-7.2.tar.gz) = eddf80bd8dae48aaa766d70fb7c2be6de314855f +Size (postgresql-7.2.tar.gz) = 9180168 bytes +SHA1 (patch-aa) = 598f14b74b0dc54680ed85f4c26b6396898f5a7e +SHA1 (patch-ab) = 0d1dee0d7c8b3bbff8507e18b9561c0b198f409f +SHA1 (patch-ac) = af1b49f846031aa86b9e37a679bafc1ef170e149 +SHA1 (patch-ad) = 581a5311c9197efd4fbd4182a2c9d906fbac3074 SHA1 (patch-ae) = ea4f680544bbdae36945b6393f50a0c15df38046 -SHA1 (patch-af) = 79f9153c463e6ea81bacc0ec8ba941b0e96e2745 -SHA1 (patch-ag) = 64279ce6b8677563e5b6c200fb22c46d5f964f42 -SHA1 (patch-ah) = 7b280f06009bb5b64526bbf50950ff62abd31766 +SHA1 (patch-af) = fb4994293ee5fa5aeb06cd0d9463b3b11ae0747e +SHA1 (patch-ah) = 1c25241c808c70a59c93ef4536aa962c91957b3b SHA1 (patch-ai) = 02b84f52941e7cb939388137392df18d53eecfb2 -SHA1 (patch-aj) = 251c0f20ca90f6d613f37c0a31d80f3bf38f2bdc -SHA1 (patch-ak) = 96f555cfb72a7f263f763afad0120ab45e50d6b6 -SHA1 (patch-al) = d1da4a0bd321b5dd683dadaaf0edc452c2292d0b -SHA1 (patch-am) = c2c01409b56c7c14ccaf66b7f1bdd809bb879062 +SHA1 (patch-al) = 3479fe6f0077cd9db7e13f6e3443209007342550 +SHA1 (patch-am) = 22a73cc84e28a0d45923311aa5fb3d57cdd0d8e5 diff --git a/databases/postgresql/patches/patch-aa b/databases/postgresql/patches/patch-aa index 408707ae336..9efab02b180 100644 --- a/databases/postgresql/patches/patch-aa +++ b/databases/postgresql/patches/patch-aa @@ -1,11 +1,21 @@ -$NetBSD: patch-aa,v 1.8 2001/05/14 14:52:38 jlam Exp $ +$NetBSD: patch-aa,v 1.9 2002/04/04 07:48:24 jlam Exp $ ---- configure.in.orig Sat May 5 16:05:37 2001 +--- configure.in.orig Sun Feb 3 16:04:12 2002 +++ configure.in -@@ -150,6 +150,15 @@ +@@ -150,6 +150,25 @@ # ++# Location for HTML documentation ++# ++htmldir='${docdir}/html' ++PGAC_ARG_REQ(with, htmldir, ++ [ --with-htmldir=DIR HTML documentation in DIR], ++ [htmldir=$withval]) ++AC_SUBST(htmldir) ++ ++ ++# +# Readline support +# +AC_MSG_CHECKING([whether to build with readline support]) @@ -18,8 +28,8 @@ $NetBSD: patch-aa,v 1.8 2001/05/14 14:52:38 jlam Exp $ # Locale (--enable-locale) # AC_MSG_CHECKING([whether to build with locale support]) -@@ -401,6 +410,18 @@ - [AC_MSG_RESULT(no)]) +@@ -398,6 +417,18 @@ + AC_MSG_RESULT([$with_python]) AC_SUBST(with_python) +# If python is enabled (above), then optionally byte-compile the modules. @@ -37,7 +47,7 @@ $NetBSD: patch-aa,v 1.8 2001/05/14 14:52:38 jlam Exp $ # # Optionally build the Java/JDBC tools # -@@ -649,8 +670,10 @@ +@@ -682,8 +713,10 @@ ## Libraries ## diff --git a/databases/postgresql/patches/patch-ab b/databases/postgresql/patches/patch-ab index 3d8a389c9bd..69e25287260 100644 --- a/databases/postgresql/patches/patch-ab +++ b/databases/postgresql/patches/patch-ab @@ -1,13 +1,38 @@ -$NetBSD: patch-ab,v 1.12 2001/07/27 17:52:33 jlam Exp $ +$NetBSD: patch-ab,v 1.13 2002/04/04 07:48:24 jlam Exp $ ---- config/programs.m4.orig Sat Feb 10 14:31:42 2001 +--- config/programs.m4.orig Tue Aug 28 10:59:11 2001 +++ config/programs.m4 -@@ -85,7 +85,7 @@ - for pgac_rllib in -lreadline -ledit ; do +@@ -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], [pgac_cv_check_readline="${pgac_rllib}${pgac_lib}"; break 2]) -+ AC_TRY_LINK_FUNC([readline], AC_TRY_RUN([int main() { return 0; }], [pgac_cv_check_readline="${pgac_rllib}${pgac_lib}"; break 2])) - LIBS=$pgac_save_LIBS - done - done + 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 472864c350d..09cd925f186 100644 --- a/databases/postgresql/patches/patch-ac +++ b/databases/postgresql/patches/patch-ac @@ -1,33 +1,31 @@ -$NetBSD: patch-ac,v 1.9 2001/05/14 14:52:38 jlam Exp $ +$NetBSD: patch-ac,v 1.10 2002/04/04 07:48:25 jlam Exp $ ---- doc/Makefile.orig Sat Jan 6 21:03:22 2001 +--- doc/Makefile.orig Wed Aug 29 15:14:39 2001 +++ doc/Makefile -@@ -37,7 +37,7 @@ +@@ -68,7 +68,7 @@ install: all installdirs ifdef found_html - gzip -d -c postgres.tar.gz | ( cd $(DESTDIR)$(docdir)/html && $(TAR) xf - ) -+ gzip -d -c postgres.tar.gz | ( cd $(DESTDIR)$(docdir) && $(TAR) xf - ) ++ gzip -d -c postgres.tar.gz | ( cd $(DESTDIR)$(htmldir) && $(TAR) xf - ) endif ifdef found_man - gzip -d -c man.tar.gz | ( cd $(DESTDIR)$(mandir) && $(TAR) xf - ) -@@ -45,12 +45,17 @@ - + for file in man1/*.1 man$(sqlmansectnum)/*.$(sqlmansect) ; do \ +@@ -79,7 +79,7 @@ installdirs: -- $(mkinstalldirs) $(DESTDIR)$(mandir) $(DESTDIR)$(docdir)/html -+ifdef found_html -+ $(mkinstalldirs) $(DESTDIR)$(docdir) -+endif -+ifdef found_man -+ $(mkinstalldirs) $(DESTDIR)$(mandir) -+endif - + ifdef found_html +- $(mkinstalldirs) $(DESTDIR)$(docdir)/html ++ $(mkinstalldirs) $(DESTDIR)$(htmldir) + endif + ifdef found_man + $(mkinstalldirs) $(addprefix $(DESTDIR)$(mandir)/man, 1 $(sqlmansectnum)) +@@ -88,7 +88,7 @@ uninstall: ifdef found_html - -rm -f $(addprefix $(DESTDIR)$(docdir)/html/, $(shell gunzip -c $(srcdir)/postgres.tar.gz | tar tf -)) -+ -rm -f $(addprefix $(DESTDIR)$(docdir)/, $(shell gunzip -c $(srcdir)/postgres.tar.gz | tar tf -)) ++ -rm -f $(addprefix $(DESTDIR)$(htmldir)/, $(shell gunzip -c $(srcdir)/postgres.tar.gz | tar tf -)) endif ifdef found_man - -rm -f $(addprefix $(DESTDIR)$(mandir)/, $(shell gunzip -c $(srcdir)/man.tar.gz | tar tf -)) + -rm -f $(addprefix $(DESTDIR)$(mandir)/, $(shell gunzip -c $(srcdir)/man.tar.gz | tar tf - | sed -e 's,man$(sqlmansect_dummy)/,man$(sqlmansectnum)/,' -e 's/.$(sqlmansect_dummy)$$/.$(sqlmansect)/')) diff --git a/databases/postgresql/patches/patch-ad b/databases/postgresql/patches/patch-ad index 902087cf339..1ed06912a80 100644 --- a/databases/postgresql/patches/patch-ad +++ b/databases/postgresql/patches/patch-ad @@ -1,8 +1,22 @@ -$NetBSD: patch-ad,v 1.10 2001/05/14 14:52:38 jlam Exp $ +$NetBSD: patch-ad,v 1.11 2002/04/04 07:48:25 jlam Exp $ ---- src/Makefile.global.in.orig Fri Mar 16 16:50:39 2001 +--- src/Makefile.global.in.orig Thu Dec 20 16:23:05 2001 +++ src/Makefile.global.in -@@ -110,6 +110,7 @@ +@@ -107,6 +107,13 @@ + endif + endif + ++htmldir := @htmldir@ ++ifeq "$(findstring pgsql, $(htmldir))" "" ++ifeq "$(findstring postgres, $(htmldir))" "" ++override htmldir := $(htmldir)/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@ @@ -10,7 +24,7 @@ $NetBSD: patch-ad,v 1.10 2001/05/14 14:52:38 jlam Exp $ with_tcl = @with_tcl@ with_tk = @with_tk@ enable_odbc = @enable_odbc@ -@@ -242,6 +243,10 @@ +@@ -279,6 +287,10 @@ libpq_srcdir = $(top_srcdir)/src/interfaces/libpq libpq_builddir = $(top_builddir)/src/interfaces/libpq libpq = -L$(libpq_builddir) -lpq diff --git a/databases/postgresql/patches/patch-af b/databases/postgresql/patches/patch-af index b860340095a..29d5c876c27 100644 --- a/databases/postgresql/patches/patch-af +++ b/databases/postgresql/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.13 2001/05/14 14:52:38 jlam Exp $ +$NetBSD: patch-af,v 1.14 2002/04/04 07:48:26 jlam Exp $ --- src/interfaces/ecpg/lib/Makefile.orig Fri Feb 23 13:12:20 2001 +++ src/interfaces/ecpg/lib/Makefile @@ -6,8 +6,8 @@ $NetBSD: patch-af,v 1.13 2001/05/14 14:52:38 jlam Exp $ NAME= ecpg SO_MAJOR_VERSION= 3 --SO_MINOR_VERSION= 2.0 -+SO_MINOR_VERSION= 2 +-SO_MINOR_VERSION= 3.0 ++SO_MINOR_VERSION= 3 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 deleted file mode 100644 index fc87f0fdcbc..00000000000 --- a/databases/postgresql/patches/patch-ag +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ag,v 1.8 2001/05/14 14:52:38 jlam Exp $ - ---- src/interfaces/odbc/GNUmakefile.orig Sun Apr 1 15:17:32 2001 -+++ src/interfaces/odbc/GNUmakefile -@@ -44,7 +44,6 @@ - - install: all installdirs - for i in $(odbc_headers); do $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(odbc_includedir)/$$i || exit 1; done -- $(INSTALL_DATA) $(srcdir)/odbcinst.ini $(DESTDIR)$(odbcinst_ini_dir)/odbcinst.ini - $(INSTALL_DATA) $(srcdir)/odbc.sql $(DESTDIR)$(datadir)/odbc.sql - $(MAKE) install-lib - diff --git a/databases/postgresql/patches/patch-ah b/databases/postgresql/patches/patch-ah index 8ecc7335556..0c3cafeed44 100644 --- a/databases/postgresql/patches/patch-ah +++ b/databases/postgresql/patches/patch-ah @@ -1,12 +1,12 @@ -$NetBSD: patch-ah,v 1.9 2001/12/06 03:46:22 jlam Exp $ +$NetBSD: patch-ah,v 1.10 2002/04/04 07:48:28 jlam Exp $ ---- src/interfaces/python/GNUmakefile.orig Sun Mar 25 14:44:03 2001 -+++ src/interfaces/python/GNUmakefile -@@ -12,9 +12,22 @@ - top_builddir = ../../.. - include $(top_builddir)/src/Makefile.global +--- 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 @@ --all: Makefile pgmodule.c libpq-all + 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) @@ -14,8 +14,13 @@ $NetBSD: patch-ah,v 1.9 2001/12/06 03:46:22 jlam Exp $ +PY_COMPILED_SCRIPTS = +endif + -+all: Makefile pgmodule.c libpq-all $(PY_COMPILED_SCRIPTS) - $(MAKE) -f Makefile ++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(\"$<\")" @@ -23,25 +28,16 @@ $NetBSD: patch-ah,v 1.9 2001/12/06 03:46:22 jlam Exp $ +%.pyo: %.py + $(PYTHON) -O -c "import py_compile; py_compile.compile(\"$<\")" + - .PHONY: libpq-all - libpq-all: - $(MAKE) -C $(libpq_builddir) all -@@ -28,13 +41,16 @@ - Setup.in: Setup.in.raw - sed -e 's,@libpq_srcdir@,$(libpq_srcdir),g' \ - -e 's,@libpq_builddir@,$(libpq_builddir),g' \ -- -e 's%@EXTRA_LIBS@%$(filter -L%, $(LDFLAGS)) $(LIBS)%g' \ -+ -e 's,@libpq@,$(libpq),g' \ -+ -e 's%@EXTRA_LIBS@%$(filter -L%, $(LDFLAGS)) $(filter -Wl%, $(LDFLAGS)) $(LIBS)%g' \ - -e 's%@INCLUDES@%$(filter -I%, $(CPPFLAGS))%g' \ - $< > $@ + 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 - @echo "Installing Python module" -- @if ( $(INSTALL_DATA) pg.py $(python_moduledir) && \ -+ @if ( ( for i in $(PY_SCRIPTS) $(PY_COMPILED_SCRIPTS); do \ -+ $(INSTALL_DATA) $$i $(python_moduledir); \ -+ done ) && \ - $(MAKE) -f Makefile install ); then : ; else \ - echo "*****" ;\ - echo "* Skipping the installation of the Python interface module for lack"; \ + 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-aj b/databases/postgresql/patches/patch-aj deleted file mode 100644 index 0048f137589..00000000000 --- a/databases/postgresql/patches/patch-aj +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aj,v 1.10 2001/09/07 08:49:10 jlam Exp $ - ---- src/makefiles/Makefile.netbsd.orig Sat Dec 16 13:14:25 2000 -+++ src/makefiles/Makefile.netbsd Fri Sep 7 03:04:28 2001 -@@ -3,7 +3,9 @@ - ifdef ELF_SYSTEM - export_dynamic = -Wl,-E - rpath = -Wl,-R$(libdir) --shlib_symbolic = -Wl,-Bsymbolic -+shlib_symbolic = -Wl,-Bsymbolic -lc -+else -+rpath = -R$(libdir) - endif - - DLSUFFIX = .so diff --git a/databases/postgresql/patches/patch-ak b/databases/postgresql/patches/patch-ak deleted file mode 100644 index 99e7c4c2b50..00000000000 --- a/databases/postgresql/patches/patch-ak +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ak,v 1.5 2001/09/07 08:49:10 jlam Exp $ - ---- src/pl/plperl/Makefile.PL.orig Sat Jun 10 14:02:12 2000 -+++ src/pl/plperl/Makefile.PL -@@ -52,7 +52,7 @@ - - } - --my $perllib = "-L$Config{archlibexp}/CORE -lperl"; -+my $perllib = "-L$Config{archlibexp}/CORE \${RPATH_LDFLAGS} -lperl"; - - WriteMakefile( 'NAME' => 'plperl', - dynamic_lib => { 'OTHERLDFLAGS' => "$opcode $perllib" } , diff --git a/databases/postgresql/patches/patch-al b/databases/postgresql/patches/patch-al index 74896304f8f..f0701eb56cd 100644 --- a/databases/postgresql/patches/patch-al +++ b/databases/postgresql/patches/patch-al @@ -1,17 +1,19 @@ -$NetBSD: patch-al,v 1.5 2001/07/27 17:52:33 jlam Exp $ +$NetBSD: patch-al,v 1.6 2002/04/04 07:48:30 jlam Exp $ ---- configure.orig Thu May 10 18:35:47 2001 +--- configure.orig Sun Feb 3 16:04:11 2002 +++ configure -@@ -19,6 +19,8 @@ +@@ -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 +55,8 @@ +@@ -53,6 +57,8 @@ ac_help="$ac_help --with-python build Python interface module" ac_help="$ac_help @@ -20,14 +22,36 @@ $NetBSD: patch-al,v 1.5 2001/07/27 17:52:33 jlam Exp $ --with-java build JDBC interface and Java tools" ac_help="$ac_help --with-krb4[=DIR] build with Kerberos 4 support [/usr/athena]" -@@ -811,10 +815,36 @@ +@@ -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:822: checking whether to build with readline support" >&5 ++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 @@ -53,18 +77,13 @@ $NetBSD: patch-al,v 1.5 2001/07/27 17:52:33 jlam Exp $ # Locale (--enable-locale) # echo $ac_n "checking whether to build with locale support""... $ac_c" 1>&6 --echo "configure:818: checking whether to build with locale support" >&5 -+echo "configure:848: checking whether to build with locale support" >&5 - # Check whether --enable-locale was given - if test x"${enable_locale+set}" = xset; then - case $enable_locale in -@@ -1905,11 +1935,40 @@ - fi +@@ -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:1941: checking whether to byte-compile Python modules" >&5 ++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 @@ -94,56 +113,50 @@ $NetBSD: patch-al,v 1.5 2001/07/27 17:52:33 jlam Exp $ # # Optionally build the Java/JDBC tools # - echo $ac_n "checking whether to build Java/JDBC tools""... $ac_c" 1>&6 --echo "configure:1913: checking whether to build Java/JDBC tools" >&5 -+echo "configure:1972: checking whether to build Java/JDBC tools" >&5 - # Check whether --with-java was given - if test x"${with_java+set}" = xset; then - case $with_java in -@@ -3095,8 +3154,9 @@ +@@ -3282,9 +3365,18 @@ ## Libraries ## +if test "$enable_readline" = yes; then + echo $ac_n "checking for readline""... $ac_c" 1>&6 --echo "configure:3100: checking for readline" >&5 -+echo "configure:3160: checking for readline" >&5 +-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 -@@ -3118,13 +3178,30 @@ +@@ -3306,15 +3398,17 @@ readline() ; return 0; } EOF --if { (eval echo configure:3122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-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* -+ if test "$cross_compiling" = yes; then -+ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } -+else -+ cat > conftest.$ac_ext <<EOF -+#line 3188 "configure" -+#include "confdefs.h" -+int main() { return 0; } -+EOF -+if { (eval echo configure:3192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then - pgac_cv_check_readline="${pgac_rllib}${pgac_lib}"; break 2 - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - fi -+rm -fr conftest* -+fi -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+fi - rm -f conftest* - LIBS=$pgac_save_LIBS - done -@@ -3208,11 +3285,12 @@ + +- # 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 @@ -151,15 +164,17 @@ $NetBSD: patch-al,v 1.5 2001/07/27 17:52:33 jlam Exp $ if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha" then - echo $ac_n "checking for main in -lbsd""... $ac_c" 1>&6 --echo "configure:3216: checking for main in -lbsd" >&5 -+echo "configure:3294: checking for main in -lbsd" >&5 - ac_lib_var=`echo bsd'_'main | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -8103,6 +8181,7 @@ - s%@python_moduledir@%$python_moduledir%g - s%@python_extmakefile@%$python_extmakefile%g +@@ -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 diff --git a/databases/postgresql/patches/patch-am b/databases/postgresql/patches/patch-am index 4644e44acca..289868dcb07 100644 --- a/databases/postgresql/patches/patch-am +++ b/databases/postgresql/patches/patch-am @@ -1,258 +1,40 @@ -$NetBSD: patch-am,v 1.6 2001/11/04 21:25:48 darcy Exp $ +$NetBSD: patch-am,v 1.7 2002/04/04 07:48:31 jlam Exp $ ---- src/interfaces/python/pgmodule.c.orig Thu Aug 16 14:36:44 2001 +--- src/interfaces/python/pgmodule.c.orig Mon Dec 3 04:39:44 2001 +++ src/interfaces/python/pgmodule.c -@@ -27,25 +27,16 @@ - */ +@@ -343,7 +343,7 @@ + PQclear(self->last_result); - #include <Python.h> --#include <postgres.h> --#include <libpq-fe.h> --#include <libpq/libpq-fs.h> -+#include "postgres.h" -+#include "libpq-fe.h" -+#include "libpq/libpq-fs.h" -+#include "catalog/pg_type.h" - #include <stdio.h> - #include <stdlib.h> - #include <string.h> - --/* really bad stuff here - I'm so naughty */ --/* If you need to you can run mkdefines to get */ --/* current defines but it should not have changed */ --#define INT2OID 21 --#define INT4OID 23 --#define OIDOID 26 --#define FLOAT4OID 700 --#define FLOAT8OID 701 --#define CASHOID 790 -- - static PyObject *PGError; --static const char *PyPgVersion = "3.1"; -+static const char *PyPgVersion = "3.2"; - - /* taken from fileobject.c */ - #define BUF(v) PyString_AS_STRING((PyStringObject *)(v)) -@@ -103,14 +94,16 @@ - - static PyObject *pg_default_host; /* default database host */ - static PyObject *pg_default_base; /* default database name */ --static PyObject *pg_default_opt;/* default connection options */ --static PyObject *pg_default_tty;/* default debug tty */ -+static PyObject *pg_default_opt; /* default connection options */ -+static PyObject *pg_default_tty; /* default debug tty */ - static PyObject *pg_default_port; /* default connection port */ - static PyObject *pg_default_user; /* default username */ - static PyObject *pg_default_passwd; /* default password */ -- - #endif /* DEFAULT_VARS */ - -+DL_EXPORT(void) init_pg(void); -+int *get_type_array(PGresult *result, int nfields); -+ - /* --------------------------------------------------------------------- */ - /* OBJECTS DECLARATION */ - -@@ -242,7 +235,6 @@ - - return 1; + Py_XDECREF(self->pgcnx); +- PyMem_DEL(self); ++ PyObject_DEL(self); } -- - #endif /* LARGE_OBJECTS */ - - /* checks source object validity */ -@@ -292,12 +284,14 @@ - { - case INT2OID: - case INT4OID: -+ case INT8OID: - case OIDOID: - typ[j] = 1; - break; - - case FLOAT4OID: - case FLOAT8OID: -+ case NUMERICOID: - typ[j] = 2; - break; - -@@ -484,7 +478,6 @@ - pgsource_oidstatus(pgsourceobject * self, PyObject * args) - { - long oid; -- const char *status; - - /* checks validity */ - if (!check_source_obj(self, CHECK_RESULT)) -@@ -566,6 +559,7 @@ - } - - PyList_Append(reslist, rowtuple); -+ Py_DECREF(rowtuple); - self->current_row++; - } - -@@ -947,11 +941,7 @@ - - /* query type definition */ - staticforward PyTypeObject PgSourceType = { --#ifndef MS_WIN32 -- PyObject_HEAD_INIT(&PyType_Type) --#else - PyObject_HEAD_INIT(NULL) --#endif - - 0, /* ob_size */ - "pgsourceobject", /* tp_name */ -@@ -1460,7 +1450,6 @@ - 0, /* tp_as_mapping */ - 0, /* tp_hash */ - }; -- - #endif /* LARGE_OBJECTS */ - -@@ -1803,12 +1792,14 @@ - { - case INT2OID: - case INT4OID: -+ case INT8OID: - case OIDOID: - typ[j] = 1; - break; + /* closes object */ +@@ -990,7 +990,7 @@ + lo_close(self->pgcnx->cnx, self->lo_fd); - case FLOAT4OID: - case FLOAT8OID: -+ case NUMERICOID: - typ[j] = 2; - break; - -@@ -1853,21 +1844,33 @@ - val = PyFloat_FromDouble(strtod(s, NULL)); - break; - -- case 3: /* get rid of the '$' and commas */ -- if (*s == '$') /* there's talk of getting rid of -- * it */ -+ case 3: -+ { -+ int mult = 1; -+ -+ if (*s == '$') /* there's talk of getting -+ * rid of it */ - s++; - -- if ((s[0] == '-' || s[0] == '(') && s[1] == '$') -- *(++s) = '-'; -+ if (*s == '-' || *s == '(') -+ { -+ s++; -+ mult = -1; -+ } -+ -+ /* get rid of the '$' and commas */ -+ if (*s == '$') /* Just in case we exposed -+ * one */ -+ s++; - - for (k = 0; *s; s++) - if (*s != ',') - cashbuf[k++] = *s; - - cashbuf[k] = 0; -- val = PyFloat_FromDouble(strtod(cashbuf, NULL)); -+ val = PyFloat_FromDouble(strtod(cashbuf, NULL) * mult); - break; -+ } - - default: - val = PyString_FromString(s); -@@ -1938,12 +1941,14 @@ - { - case INT2OID: - case INT4OID: -+ case INT8OID: - case OIDOID: - typ[j] = 1; - break; - - case FLOAT4OID: - case FLOAT8OID: -+ case NUMERICOID: - typ[j] = 2; - break; - -@@ -1988,21 +1993,33 @@ - val = PyFloat_FromDouble(strtod(s, NULL)); - break; - -- case 3: /* get rid of the '$' and commas */ -- if (*s == '$') /* there's talk of getting rid of -- * it */ -+ case 3: -+ { -+ int mult = 1; -+ -+ if (*s == '$') /* there's talk of getting -+ * rid of it */ - s++; - -- if ((s[0] == '-' || s[0] == '(') && s[1] == '$') -- *(++s) = '-'; -+ if (*s == '-' || *s == '(') -+ { -+ s++; -+ mult = -1; -+ } -+ -+ /* get rid of the '$' and commas */ -+ if (*s == '$') /* Just in case we exposed -+ * one */ -+ s++; - - for (k = 0; *s; s++) - if (*s != ',') - cashbuf[k++] = *s; - - cashbuf[k] = 0; -- val = PyFloat_FromDouble(strtod(cashbuf, NULL)); -+ val = PyFloat_FromDouble(strtod(cashbuf, NULL) * mult); - break; -+ } - - default: - val = PyString_FromString(s); -@@ -2318,7 +2335,6 @@ - Py_INCREF(Py_None); - return Py_None; + Py_XDECREF(self->pgcnx); +- PyMem_DEL(self); ++ PyObject_DEL(self); } -- - #endif /* DIRECT_ACCESS */ - -@@ -2622,7 +2638,6 @@ - static PyObject * - pg_getattr(pgobject * self, char *name) - { -- - /* - * Although we could check individually, there are only a few - * attributes that don't require a live connection and unless someone -@@ -3104,7 +3119,6 @@ + /* opens large object */ +@@ -1546,7 +1546,7 @@ + if (self->cnx) + PQfinish(self->cnx); - return old; +- PyMem_DEL(self); ++ PyObject_DEL(self); } -- - #endif /* DEFAULT_VARS */ - /* List of functions defined in the module */ -@@ -3141,7 +3155,8 @@ - *v; + /* close without deleting */ +@@ -1579,7 +1579,7 @@ + if (self->last_result) + PQclear(self->last_result); - /* Initialize here because some WIN platforms get confused otherwise */ -- PglargeType.ob_type = PgType.ob_type = PgQueryType.ob_type = &PyType_Type; -+ PglargeType.ob_type = PgType.ob_type = PgQueryType.ob_type = -+ PgSourceType.ob_type = &PyType_Type; +- PyMem_DEL(self); ++ PyObject_DEL(self); + } - /* Create the module and add the functions */ - mod = Py_InitModule4("_pg", pg_methods, pg__doc__, NULL, PYTHON_API_VERSION); + /* resets connection */ diff --git a/databases/tcl-postgresql/Makefile b/databases/tcl-postgresql/Makefile index cf2464b57ef..577f251ed2b 100644 --- a/databases/tcl-postgresql/Makefile +++ b/databases/tcl-postgresql/Makefile @@ -1,20 +1,18 @@ -# $NetBSD: Makefile,v 1.10 2001/12/03 08:06:28 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2002/04/04 07:41:05 jlam Exp $ -.include "../../databases/postgresql/Makefile.common" -.include "../../databases/postgresql/Makefile.ssl" - -PKGNAME= tcl-postgresql-${PG_BASE_VERS} +PKGNAME= tcl-postgresql-${BASE_VERS} COMMENT= Tcl interface to PostgreSQL -USE_BUILDLINK_ONLY= # defined -BUILDLINK_DEPENDS.postgresql-lib= postgresql-lib>=${PG_BASE_VERS} +USE_BUILDLINK_ONLY= YES -MAKE_ENV+= INSTALLED_LIBPQ=1 +.include "../../databases/postgresql/Makefile.common" +CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_DIR} CONFIGURE_ARGS+= --with-tcl CONFIGURE_ARGS+= --with-tclconfig="${BUILDLINK_DIR}/lib" CONFIGURE_ENV+= TCLSH="${TCLSH}" TCLSH= ${LOCALBASE}/bin/tclsh +MAKE_ENV+= INSTALLED_LIBPQ=1 DIRS_TO_BUILD= src/interfaces/libpgtcl src/bin/pgtclsh diff --git a/databases/tcl-postgresql/PLIST b/databases/tcl-postgresql/PLIST index 1424431c976..2ff92d34fcc 100644 --- a/databases/tcl-postgresql/PLIST +++ b/databases/tcl-postgresql/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:12:54 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/04/04 07:41:06 jlam Exp $ bin/pgtclsh include/pgsql/libpgtcl.h lib/libpgtcl.a lib/libpgtcl.so lib/libpgtcl.so.2 -lib/libpgtcl.so.2.1 +lib/libpgtcl.so.2.2 man/man1/pgtclsh.1 diff --git a/databases/tk-postgresql/Makefile b/databases/tk-postgresql/Makefile index abb7cb44f08..3b0833836c2 100644 --- a/databases/tk-postgresql/Makefile +++ b/databases/tk-postgresql/Makefile @@ -1,23 +1,20 @@ -# $NetBSD: Makefile,v 1.11 2001/12/03 08:06:28 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2002/04/04 07:41:07 jlam Exp $ -.include "../../databases/postgresql/Makefile.common" -.include "../../databases/postgresql/Makefile.ssl" - -PKGNAME= tk-postgresql-${PG_BASE_VERS} +PKGNAME= tk-postgresql-${BASE_VERS} COMMENT= Tk interface to PostgreSQL -USE_BUILDLINK_ONLY= # defined -BUILDLINK_DEPENDS.postgresql-lib= postgresql-lib>=${PG_BASE_VERS} -BUILDLINK_DEPENDS.tcl-postgresql= tcl-postgresql>=${PG_BASE_VERS} +USE_BUILDLINK_ONLY= YES -MAKE_ENV+= INSTALLED_LIBPQ=1 INSTALLED_LIBPGTCL=1 +.include "../../databases/postgresql/Makefile.common" +CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_DIR} CONFIGURE_ARGS+= --with-tcl CONFIGURE_ARGS+= --with-tk -CONFIGURE_ARGS+= --with-tclconfig="${BUILDLINK_DIR}/lib" -CONFIGURE_ARGS+= --with-tkconfig="${BUILDLINK_DIR}/lib" +CONFIGURE_ARGS+= --with-tclconfig=${BUILDLINK_DIR}/lib +CONFIGURE_ARGS+= --with-tkconfig=${BUILDLINK_DIR}/lib CONFIGURE_ENV+= TCLSH="${TCLSH}" TCLSH= ${LOCALBASE}/bin/tclsh +MAKE_ENV+= INSTALLED_LIBPQ=1 INSTALLED_LIBPGTCL=1 DIRS_TO_BUILD= src/bin/pgtclsh ALL_TARGET= pgtksh |