pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/databases Several changes to the postgresql80-* packages:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/cef98eeeaf9a
branches:  trunk
changeset: 497840:cef98eeeaf9a
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Aug 05 19:43:44 2005 +0000

description:
Several changes to the postgresql80-* packages:

* Become maintainer for the postgresql80-* packages (ok'd by recht)

* Libtoolize postgresql80 build so that the shared libraries and
  loadable shared modules are built using libtool.  This should make
  PostgreSQL 8.0.x in pkgsrc build correctly on more pkgsrc-supported
  platforms.  This is accomplished with the Makefile.libtool file
  which replaces the Makefile.shlib file in the PostgreSQL distribution.

* Add libltdl modifications from the postgresql74-* packages so that
  this can work on Interix (untested).

* Fix some mismatches between static function declarations and their
  subsesquent definitions in the src/timezone module.  Fixes provided
  by Georg Schwarz.

* Convert PGSQL_USE_HIER into the PKG_OPTION "pgsql-hier-query", and
  teach both postgresql80-client and postgresql80-server to use it.

* Use BUILDLINK_TRANSFORM's "rm" action to remove unwanted compiler
  flags.

* Remove zlib/buildlink3.mk from postgresql80-client/buildlink3.mk
  as zlib is only used by the pg_dump client.

* Convert some files in files/* into patches that can be fed back
  to the PostgreSQL team.

* Install data and documentation files into share/postgresql instead
  of share/postgresql80 -- it's only possible to install one PostgreSQL
  version at a time in pkgsrc, and the new paths more closely match
  the rest of the installation paths.

* Add more mirrors to the MASTER_SITES list, and add a new variable
  POSTGRESQL_MIRRORS_SORT that has the same syntax as MASTER_SORT that
  can help people pick a nearby mirror.

* Nuke references to libpgtcl which is no longer distributed as part
  of a standard PostgreSQL installation as of version 8.0.

* Provide better documentation for Makefile.custom.

* Avoid linking in the pthread library in the correct way on NetBSD
  by setting DLOPEN_REQUIRE_PTHREADS=no.  Also, provide better
  documentation on why we can't enable thread-safety in the PostgreSQL
  libraries on NetBSD (at least for now).

* Preliminary support for installing postgresql80-* into a separate
  subdirectory under ${LOCALBASE} so possibly allow for multiple
  installations of PostgreSQL on the same machine.  Note that THIS
  DOES NOT WORK YET.

* Update the hierarchical-queries patch to "8.0.3-0.5.5" which fixes
  a bug which was crashing the backend when PRIOR was used in the
  target list.  The _level_ column is no longer automatically added
  to target list.  This makes it possible to use hierarchical queries
  as IN subqueries.  To get _level_ back you just have to explicitly
  mention it in target list.

Bump the following PKGREVISIONs:

        postgresql80-client     -> 2
        postgresql80-server     -> 2
        postgresql80            -> 1

diffstat:

 databases/postgresql80-client/Makefile            |   139 +-
 databases/postgresql80-client/PLIST               |  2752 ++++++++++----------
 databases/postgresql80-client/buildlink3.mk       |    13 +-
 databases/postgresql80-server/Makefile            |    84 +-
 databases/postgresql80-server/PLIST               |  1274 ++++----
 databases/postgresql80-server/files/pgsql.sh      |     8 +-
 databases/postgresql80/Makefile                   |     7 +-
 databases/postgresql80/Makefile.common            |   113 +-
 databases/postgresql80/Makefile.mirrors           |   101 +
 databases/postgresql80/distinfo                   |    19 +-
 databases/postgresql80/files/GNUmakefile.libpgtcl |    20 -
 databases/postgresql80/files/Makefile.custom      |    38 +-
 databases/postgresql80/files/Makefile.libtool     |   120 +
 databases/postgresql80/files/dynloader-ltdl.h     |    17 +
 databases/postgresql80/files/netbsd.c             |    73 -
 databases/postgresql80/files/netbsd.h             |    45 -
 databases/postgresql80/options.mk                 |    26 +
 databases/postgresql80/patches/patch-aa           |    42 +-
 databases/postgresql80/patches/patch-ab           |    85 +-
 databases/postgresql80/patches/patch-ac           |    45 +
 databases/postgresql80/patches/patch-ad           |     9 +
 databases/postgresql80/patches/patch-ae           |     7 +
 databases/postgresql80/patches/patch-af           |    31 +
 databases/postgresql80/patches/patch-ag           |    15 +
 databases/postgresql80/patches/patch-ah           |    13 +
 databases/postgresql80/patches/patch-ai           |    80 +
 26 files changed, 2804 insertions(+), 2372 deletions(-)

diffs (truncated from 5453 to 300 lines):

diff -r 5e8cef79e7bf -r cef98eeeaf9a databases/postgresql80-client/Makefile
--- a/databases/postgresql80-client/Makefile    Fri Aug 05 19:31:50 2005 +0000
+++ b/databases/postgresql80-client/Makefile    Fri Aug 05 19:43:44 2005 +0000
@@ -1,79 +1,84 @@
-# $NetBSD: Makefile,v 1.5 2005/07/05 23:53:47 grant Exp $
+# $NetBSD: Makefile,v 1.6 2005/08/05 19:43:45 jlam Exp $
 
-PKGNAME=               postgresql80-client-${BASE_VERS}
-PKGREVISION=           1
-COMMENT=               PostgreSQL database client programs
+PKGNAME=       postgresql80-client-${BASE_VERS}
+PKGREVISION=   2
+COMMENT=       PostgreSQL database client programs
 
 .include "../../databases/postgresql80/Makefile.common"
 
+USE_TOOLS+=            gzip tar
+USE_LIBTOOL=           yes
+CONFIGURE_ARGS+=       --with-openssl
+CONFIGURE_ARGS+=       --with-readline
+CONFIGURE_ARGS+=       --with-zlib
+
+# The thread-safety test in ${WRSRC}/src/tools/thread does not pass on
+# NetBSD.
+#
+.if ${OPSYS} == "NetBSD"
+PGSQL_THREAD_SAFETY?=  no
+.endif
+PGSQL_THREAD_SAFETY?=  yes
+BUILD_DEFS+=           PGSQL_THREAD_SAFETY
+
+.if !empty(PGSQL_THREAD_SAFETY:M[yY][eE][sS])
+.  include "../../mk/pthread.buildlink3.mk"
+.  if (${PTHREAD_TYPE} == "native")
+CONFIGURE_ARGS+=       --enable-thread-safety
+.  endif
+.endif
+
+INSTALL_DIRS=  ${WRKSRC}/src/include
+INSTALL_DIRS+= ${WRKSRC}/src/interfaces
+INSTALL_DIRS+= ${WRKSRC}/src/bin
+INSTALL_DIRS+= ${WRKSRC}/doc
+
+BUILD_DIRS=    ${INSTALL_DIRS}
+
+# Without this, the Darwin build fails (related to -bundle_loader).
+BUILD_DIRS+=   ${WRKSRC}/src/backend
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.postgresql80-client
+.include "../../databases/postgresql80/options.mk"
+
+USE_PKGINSTALL=        yes
+.for _file_ in pg_service.conf psqlrc
+CONF_FILES+=   ${PG_DATA_DIR}/${_file_}.sample ${PG_ETC_DIR}/${_file_}
+.endfor
+.if !empty(PG_SUBPREFIX)
+OWN_DIRS+=     ${PG_PREFIX}
+.endif
+
 # XXX work around core dumps with the native libedit
 USE_GNU_READLINE=      yes
-USE_PKGINSTALL=                yes
-
-CONFIGURE_ARGS+=       --with-openssl
-CONFIGURE_ARGS+=       --with-zlib
-CONFIGURE_ARGS+=       --with-readline
-
-.include "../../mk/bsd.prefs.mk"
-
-BUILD_DIRS=            ${WRKSRC}/src/include
-BUILD_DIRS+=           ${WRKSRC}/src/interfaces
-BUILD_DIRS+=           ${WRKSRC}/src/bin
-BUILD_DIRS+=           ${WRKSRC}/doc
-
-# without this the Darwin build fails
-# (-bundle_loader related)
-BUILD_DIRS+=           ${WRKSRC}/src/backend
-
-INSTALL_DIRS=          ${WRKSRC}/src/bin
-INSTALL_DIRS+=         ${WRKSRC}/src/include
-INSTALL_DIRS+=         ${WRKSRC}/src/interfaces
-INSTALL_DIRS+=         ${WRKSRC}/doc
-
-# As told by Josh Berkus
-.include "../../mk/pthread.buildlink3.mk"
-.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "native" \
-       && ${OPSYS} != "NetBSD"
-CONFIGURE_ARGS+=       --enable-thread-safety
-.endif
-
-# handle additional headers installed by hierarchical queries patch
-.if defined(PGSQL_USE_HIER) && !empty(PGSQL_USE_HIER:M[yY][eE][sS])
-PLIST_SUBST+=          PG_HIER=
-.else
-PLIST_SUBST+=          PG_HIER="@comment "
-.endif
-
-CONF_FILES=    ${PG_DATA_DIR}/pg_service.conf.sample ${PKG_SYSCONFDIR}/pg_service.conf
-CONF_FILES+=   ${PG_DATA_DIR}/psqlrc.sample ${PKG_SYSCONFDIR}/psqlrc
-
-post-buildlink:
-#
-# 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
-
-pre-build:
-       ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${WRKSRC}/src/backend && \
-       ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} \
-               ../../src/include/parser/parse.h ../../src/include/utils/fmgroids.h
-
-post-install:
-       ${INSTALL_DATA_DIR} ${PG_DOC_DIR}/TODO.detail
-       cd ${WRKSRC}/doc; for file in                                   \
-               FAQ* KNOWN_BUGS MISSING_FEATURES README.* TODO          \
-               bug.template;                                           \
-       do                                                              \
-               ${INSTALL_DATA} $${file} ${PG_DOC_DIR}/$${file};        \
-       done
-       cd ${WRKSRC}/doc/TODO.detail && \
-               ${PAX} -rwppm . ${PG_DOC_DIR}/TODO.detail
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 
+# On Solaris, avoid conflicts between "${SSLBASE}/include/openssl/des.h"
+# and "/usr/include/crypt.h" -- we want the definitions in the former.
+#
+.if ${OPSYS} == "SunOS"
+post-wrapper:
+       ${TOUCH} ${BUILDLINK_DIR}/include/crypt.h
+.endif
+
+pre-build:
+       ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}                       \
+       cd ${WRKSRC}/src/backend &&                                     \
+       ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}       \
+               ../../src/include/parser/parse.h                        \
+               ../../src/include/utils/fmgroids.h
+
+post-install:
+       cd ${WRKSRC}/doc; for file in                                   \
+               FAQ* KNOWN_BUGS MISSING_FEATURES README.* TODO          \
+               bug.template;                                           \
+       do                                                              \
+               ${INSTALL_DATA} $$file ${PG_DOC_DIR}/$$file;            \
+        done
+       ${CP} -R ${WRKSRC}/doc/TODO.detail ${PG_DOC_DIR}
+       ${CHOWN} -R ${DOCOWN}:${DOCGRP} ${PG_DOC_DIR}/TODO.detail
+
 .include "../../mk/bsd.pkg.mk"
diff -r 5e8cef79e7bf -r cef98eeeaf9a databases/postgresql80-client/PLIST
--- a/databases/postgresql80-client/PLIST       Fri Aug 05 19:31:50 2005 +0000
+++ b/databases/postgresql80-client/PLIST       Fri Aug 05 19:43:44 2005 +0000
@@ -1,1382 +1,1370 @@
-@comment $NetBSD: PLIST,v 1.4 2005/07/05 09:47:04 grant Exp $
-bin/clusterdb
-bin/createdb
-bin/createlang
-bin/createuser
-bin/dropdb
-bin/droplang
-bin/dropuser
-bin/ecpg
-bin/initdb
-bin/ipcclean
-bin/pg_config
-bin/pg_controldata
-bin/pg_ctl
-bin/pg_dump
-bin/pg_dumpall
-bin/pg_resetxlog
-bin/pg_restore
-bin/psql
-bin/vacuumdb
-include/ecpg_informix.h
-include/ecpgerrno.h
-include/ecpglib.h
-include/ecpgtype.h
-include/libpq-fe.h
-include/libpq/libpq-fs.h
-include/pg_config.h
-include/pg_config_manual.h
-include/pg_config_os.h
-include/pgtypes_date.h
-include/pgtypes_error.h
-include/pgtypes_interval.h
-include/pgtypes_numeric.h
-include/pgtypes_timestamp.h
-include/postgres_ext.h
-include/postgresql/informix/esql/datetime.h
-include/postgresql/informix/esql/decimal.h
-include/postgresql/informix/esql/sqlda.h
-include/postgresql/informix/esql/sqltypes.h
-include/postgresql/internal/c.h
-include/postgresql/internal/libpq-int.h
-include/postgresql/internal/libpq/pqcomm.h
-include/postgresql/internal/port.h
-include/postgresql/internal/postgres_fe.h
-include/postgresql/internal/pqexpbuffer.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/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/slru.h
-include/postgresql/server/access/subtrans.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/xlog_internal.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_tablespace.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/alter.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/tablespace.h
-include/postgresql/server/commands/trigger.h
-include/postgresql/server/commands/typecmds.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



Home | Main Index | Thread Index | Old Index