summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/postgresql82-adminpack/Makefile3
-rw-r--r--databases/postgresql82-client/Makefile5
-rw-r--r--databases/postgresql82-client/PLIST4
-rw-r--r--databases/postgresql82-plperl/Makefile3
-rw-r--r--databases/postgresql82-plpython/Makefile3
-rw-r--r--databases/postgresql82-pltcl/Makefile3
-rw-r--r--databases/postgresql82-server/Makefile3
-rw-r--r--databases/postgresql82-server/PLIST5
-rw-r--r--databases/postgresql82-tsearch2/Makefile3
-rw-r--r--databases/postgresql82/Makefile.common76
-rw-r--r--databases/postgresql82/distinfo10
-rw-r--r--databases/postgresql82/patches/patch-ad78
-rw-r--r--databases/postgresql82/patches/patch-ae45
13 files changed, 39 insertions, 202 deletions
diff --git a/databases/postgresql82-adminpack/Makefile b/databases/postgresql82-adminpack/Makefile
index 7ee6c20cd42..7415650b322 100644
--- a/databases/postgresql82-adminpack/Makefile
+++ b/databases/postgresql82-adminpack/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2010/01/17 12:02:10 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2010/04/12 09:48:48 adam Exp $
PKGNAME= postgresql82-adminpack-${BASE_VERS}
-PKGREVISION= 1
COMMENT= Admin pack module for pgAdmin management
DEPENDS+= postgresql82-server>=${BASE_VERS}:../../databases/postgresql82-server
diff --git a/databases/postgresql82-client/Makefile b/databases/postgresql82-client/Makefile
index 4e8620b926b..3eafe2e3815 100644
--- a/databases/postgresql82-client/Makefile
+++ b/databases/postgresql82-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2010/01/17 12:02:10 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2010/04/12 09:48:48 adam Exp $
PKGNAME= postgresql82-client-${BASE_VERS}
-PKGREVISION= 1
COMMENT= PostgreSQL database client programs
PKG_DESTDIR_SUPPORT= user-destdir
@@ -20,7 +19,6 @@ CONFLICTS+= postgresql82-docs-[0-9]*
# 1. The thread-safety test in ${WRSRC}/src/tools/thread does not pass on
# NetBSD earler than 4.0 or DragonFly.
# 2. configure with --enable-thread-safety fails on OpenBSD.
-#
.if (${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[0-3].*)) || \
${OPSYS} == "DragonFly" || ${OPSYS} == "OpenBSD"
PGSQL_THREAD_SAFETY?= no
@@ -83,7 +81,6 @@ PG_PGXS_FILES+= src/nls-global.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
diff --git a/databases/postgresql82-client/PLIST b/databases/postgresql82-client/PLIST
index ec0195c0396..64c7dc0e5f2 100644
--- a/databases/postgresql82-client/PLIST
+++ b/databases/postgresql82-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2009/12/16 21:18:31 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2010/04/12 09:48:48 adam Exp $
${PG_SUBPREFIX}${PKGLOCALEDIR}/locale/af/LC_MESSAGES/libpq.mo
${PG_SUBPREFIX}${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/initdb.mo
${PG_SUBPREFIX}${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/libpq.mo
@@ -1544,7 +1544,7 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/wal-intro.html
${PG_SUBPREFIX}share/doc/postgresql/html/wal-reliability.html
${PG_SUBPREFIX}share/doc/postgresql/html/wal.html
${PG_SUBPREFIX}share/doc/postgresql/html/warm-standby.html
-${PG_SUBPREFIX}share/doc/postgresql/html/x71223.html
+${PG_SUBPREFIX}share/doc/postgresql/html/x71236.html
${PG_SUBPREFIX}share/doc/postgresql/html/xaggr.html
${PG_SUBPREFIX}share/doc/postgresql/html/xfunc-c.html
${PG_SUBPREFIX}share/doc/postgresql/html/xfunc-internal.html
diff --git a/databases/postgresql82-plperl/Makefile b/databases/postgresql82-plperl/Makefile
index 76835612cb9..d2374718979 100644
--- a/databases/postgresql82-plperl/Makefile
+++ b/databases/postgresql82-plperl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2010/01/17 12:02:10 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/04/12 09:48:48 adam Exp $
PKGNAME= postgresql82-plperl-${BASE_VERS}
-PKGREVISION= 1
COMMENT= PL/Perl procedural language for the PostgreSQL backend
DEPENDS+= postgresql82-server>=${BASE_VERS}:../../databases/postgresql82-server
diff --git a/databases/postgresql82-plpython/Makefile b/databases/postgresql82-plpython/Makefile
index f7e0717f154..5a911865ca6 100644
--- a/databases/postgresql82-plpython/Makefile
+++ b/databases/postgresql82-plpython/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2010/02/10 19:17:34 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2010/04/12 09:48:49 adam Exp $
PKGNAME= postgresql82-plpython-${BASE_VERS}
-PKGREVISION= 2
COMMENT= PL/Python procedural language for the PostgreSQL backend
DEPENDS+= postgresql82-server>=${BASE_VERS}:../../databases/postgresql82-server
diff --git a/databases/postgresql82-pltcl/Makefile b/databases/postgresql82-pltcl/Makefile
index f66b40ca9a4..34f46c13547 100644
--- a/databases/postgresql82-pltcl/Makefile
+++ b/databases/postgresql82-pltcl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2010/01/17 12:02:10 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2010/04/12 09:48:49 adam Exp $
PKGNAME= postgresql82-pltcl-${BASE_VERS}
-PKGREVISION= 1
COMMENT= PL/Tcl procedural language for the PostgreSQL backend
DEPENDS+= postgresql82-server>=${BASE_VERS}:../../databases/postgresql82-server
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index 08c0c681c61..d529f18a5ef 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2010/01/22 20:12:11 adam Exp $
+# $NetBSD: Makefile,v 1.11 2010/04/12 09:48:49 adam Exp $
PKGNAME= postgresql82-server-${BASE_VERS}
-PKGREVISION= 1
COMMENT= PostgreSQL database server programs
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/databases/postgresql82-server/PLIST b/databases/postgresql82-server/PLIST
index a8836e7e50c..2ec4c8abb30 100644
--- a/databases/postgresql82-server/PLIST
+++ b/databases/postgresql82-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/12/16 21:18:31 adam Exp $
+@comment $NetBSD: PLIST,v 1.12 2010/04/12 09:48:49 adam Exp $
${PG_SUBPREFIX}bin/postgres
${PG_SUBPREFIX}bin/postmaster
${PG_SUBPREFIX}lib/postgresql/ascii_and_mic.la
@@ -204,6 +204,7 @@ ${PG_SUBPREFIX}share/postgresql/timezone/America/Managua
${PG_SUBPREFIX}share/postgresql/timezone/America/Manaus
${PG_SUBPREFIX}share/postgresql/timezone/America/Marigot
${PG_SUBPREFIX}share/postgresql/timezone/America/Martinique
+${PG_SUBPREFIX}share/postgresql/timezone/America/Matamoros
${PG_SUBPREFIX}share/postgresql/timezone/America/Mazatlan
${PG_SUBPREFIX}share/postgresql/timezone/America/Mendoza
${PG_SUBPREFIX}share/postgresql/timezone/America/Menominee
@@ -222,6 +223,7 @@ ${PG_SUBPREFIX}share/postgresql/timezone/America/Nome
${PG_SUBPREFIX}share/postgresql/timezone/America/Noronha
${PG_SUBPREFIX}share/postgresql/timezone/America/North_Dakota/Center
${PG_SUBPREFIX}share/postgresql/timezone/America/North_Dakota/New_Salem
+${PG_SUBPREFIX}share/postgresql/timezone/America/Ojinaga
${PG_SUBPREFIX}share/postgresql/timezone/America/Panama
${PG_SUBPREFIX}share/postgresql/timezone/America/Pangnirtung
${PG_SUBPREFIX}share/postgresql/timezone/America/Paramaribo
@@ -240,6 +242,7 @@ ${PG_SUBPREFIX}share/postgresql/timezone/America/Rio_Branco
${PG_SUBPREFIX}share/postgresql/timezone/America/Rosario
${PG_SUBPREFIX}share/postgresql/timezone/America/Santarem
${PG_SUBPREFIX}share/postgresql/timezone/America/Santiago
+${PG_SUBPREFIX}share/postgresql/timezone/America/Santa_Isabel
${PG_SUBPREFIX}share/postgresql/timezone/America/Santo_Domingo
${PG_SUBPREFIX}share/postgresql/timezone/America/Sao_Paulo
${PG_SUBPREFIX}share/postgresql/timezone/America/Scoresbysund
diff --git a/databases/postgresql82-tsearch2/Makefile b/databases/postgresql82-tsearch2/Makefile
index d234403bf44..fa03703dcd7 100644
--- a/databases/postgresql82-tsearch2/Makefile
+++ b/databases/postgresql82-tsearch2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2010/01/17 12:02:11 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2010/04/12 09:48:49 adam Exp $
PKGNAME= postgresql82-tsearch2-${BASE_VERS}
-PKGREVISION= 1
COMMENT= Tsearch2 contrib module for fulltext indexing in PostgreSQL
DEPENDS+= postgresql82-server>=${BASE_VERS}:../../databases/postgresql82-server
diff --git a/databases/postgresql82/Makefile.common b/databases/postgresql82/Makefile.common
index 392c4d3f344..ace3910e76e 100644
--- a/databases/postgresql82/Makefile.common
+++ b/databases/postgresql82/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2009/12/16 21:18:31 adam Exp $
+# $NetBSD: Makefile.common,v 1.19 2010/04/12 09:48:48 adam Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -32,13 +32,10 @@ COMMON_FILESDIR?= ${.CURDIR}/../postgresql82/files
PATCHDIR?= ${.CURDIR}/../postgresql82/patches
# Version numbering scheme:
-#
# DIST_VERS version number on the postgresql distfile
# BASE_VERS pkgsrc-mangled version number (convert pl -> .)
-#
# Note: Do not forget jdbc-postgresql82 when updating version
-#
-DIST_VERS?= 8.2.15
+DIST_VERS?= 8.2.16
BASE_VERS?= ${DIST_VERS}
BUILDLINK_API_DEPENDS.postgresql82-client+= postgresql82-client>=${BASE_VERS}
@@ -56,9 +53,10 @@ SUBST_SED.pglocale= -e 's|\( localedir[ :]*=\).*|\1${PG_LOCALE_DIR}|'
.include "../../mk/bsd.prefs.mk"
-PGSQL_TEMPLATE.SunOS= solaris
-.if !defined(PGSQL_TEMPLATE.${OPSYS})
-PGSQL_TEMPLATE.${OPSYS}= ${LOWER_OPSYS}
+PG_TEMPLATE.SunOS= solaris
+PG_TEMPLATE.IRIX= irix5
+.if !defined(PG_TEMPLATE.${OPSYS})
+PG_TEMPLATE.${OPSYS}= ${LOWER_OPSYS}
.endif
PG_SUBPREFIX= # empty
@@ -80,7 +78,7 @@ GNU_CONFIGURE_PREFIX= ${PG_PREFIX}
CONFIGURE_ARGS+= --sysconfdir=${PG_ETC_DIR}
CONFIGURE_ARGS+= --datadir=${PG_DATA_DIR}
CONFIGURE_ARGS+= --with-docdir=${PG_DOC_DIR}
-CONFIGURE_ARGS+= --with-template=${PGSQL_TEMPLATE.${OPSYS}}
+CONFIGURE_ARGS+= --with-template=${PG_TEMPLATE.${OPSYS}}
CONFIGURE_ARGS+= --without-readline
CONFIGURE_ARGS+= --without-zlib
CONFIGURE_ARGS+= --enable-nls
@@ -100,7 +98,6 @@ BUILDLINK_TRANSFORM+= rm:-ffast-math
# USE_LIBLTDL is "yes" or "no" depending on whether we're using libltdl
# to provide "dlopen" functionality for the PostgreSQL backend.
-#
.if ${OPSYS} == "Interix"
USE_LIBLTDL?= yes
.endif
@@ -111,58 +108,29 @@ FILES_SUBST+= PG_PREFIX=${PG_PREFIX:Q}
.include "../../devel/gettext-lib/buildlink3.mk"
post-extract:
- if ${TEST} -d ${WRKSRC}/src; then \
- rm -f ${WRKSRC}/src/Makefile.custom; \
- cp -f ${COMMON_FILESDIR}/Makefile.custom \
- ${WRKSRC}/src/Makefile.custom; \
- rm -f ${WRKSRC}/src/Makefile.shlib; \
- cp -f ${COMMON_FILESDIR}/Makefile.libtool \
- ${WRKSRC}/src/Makefile.shlib; \
- fi
- if ${TEST} -d ${WRKSRC}/src/interfaces/libpq; then \
- rm -f ${WRKSRC}/src/interfaces/libpq/GNUmakefile; \
- cp -f ${COMMON_FILESDIR}/GNUmakefile.libpq \
- ${WRKSRC}/src/interfaces/libpq/GNUmakefile; \
- fi
- if ${TEST} -d ${WRKSRC}/src/interfaces/libpgtcl; then \
- rm -f ${WRKSRC}/src/interfaces/libpgtcl/GNUmakefile; \
- cp -f ${COMMON_FILESDIR}/GNUmakefile.libpgtcl \
- ${WRKSRC}/src/interfaces/libpgtcl/GNUmakefile; \
- fi
+ cp -f ${COMMON_FILESDIR}/Makefile.custom ${WRKSRC}/src/Makefile.custom
+ cp -f ${COMMON_FILESDIR}/Makefile.libtool ${WRKSRC}/src/Makefile.shlib
.if !empty(USE_LIBLTDL:M[yY][eE][sS])
- if ${TEST} -d ${WRKSRC}/src/backend/port/dynloader; then \
- template=${PGSQL_TEMPLATE.${OPSYS}:Q}; \
- rm -f ${WRKSRC}/src/backend/port/dynloader/$$template.[ch]; \
- cp -f ${COMMON_FILESDIR}/dynloader-ltdl.h \
- ${WRKSRC}/src/backend/port/dynloader/$$template.h; \
- ${ECHO} "static int dummy = 0;" \
- >${WRKSRC}/src/backend/port/dynloader/$$template.c
- fi
+ cp -f ${COMMON_FILESDIR}/dynloader-ltdl.h \
+ ${WRKSRC}/src/backend/port/dynloader/${PG_TEMPLATE.${OPSYS}:Q}.h
+ ${ECHO} "static int dummy = 0;" \
+ > ${WRKSRC}/src/backend/port/dynloader/${PG_TEMPLATE.${OPSYS}:Q}.c
.endif
- if ${TEST} -d ${WRKSRC}/src/template; then \
- touch ${WRKSRC}/src/template/dragonfly; \
- fi
- if ${TEST} -d ${WRKSRC}/src/backend/port/dynloader; then \
- cp ${WRKSRC}/src/backend/port/dynloader/freebsd.c \
- ${WRKSRC}/src/backend/port/dynloader/dragonfly.c; \
- cp ${WRKSRC}/src/backend/port/dynloader/freebsd.h \
- ${WRKSRC}/src/backend/port/dynloader/dragonfly.h; \
- fi
- if ${TEST} -d ${WRKSRC}/src/include/port; then \
- cp ${WRKSRC}/src/include/port/freebsd.h \
- ${WRKSRC}/src/include/port/dragonfly.h; \
- fi
- if ${TEST} -d ${WRKSRC}/src/makefiles; then \
- cp ${WRKSRC}/src/makefiles/Makefile.freebsd \
- ${WRKSRC}/src/makefiles/Makefile.dragonfly; \
- fi
+ touch ${WRKSRC}/src/template/dragonfly
+ cp ${WRKSRC}/src/backend/port/dynloader/freebsd.c \
+ ${WRKSRC}/src/backend/port/dynloader/dragonfly.c
+ cp ${WRKSRC}/src/backend/port/dynloader/freebsd.h \
+ ${WRKSRC}/src/backend/port/dynloader/dragonfly.h
+ cp ${WRKSRC}/src/include/port/freebsd.h \
+ ${WRKSRC}/src/include/port/dragonfly.h
+ cp ${WRKSRC}/src/makefiles/Makefile.freebsd \
+ ${WRKSRC}/src/makefiles/Makefile.dragonfly
# PGSQL_BLCKSZ is the size in bytes of a PostgreSQL disk page or block.
# This also limits the size of a tuple. The valid values are powers
# of 2 up to 32768, and the default size is 8196 (hardcoded in the
# PostgreSQL sources). Please don't change this value unless you know
# what you are doing.
-#
BUILD_DEFS+= PGSQL_BLCKSZ
.if defined(PGSQL_BLCKSZ)
diff --git a/databases/postgresql82/distinfo b/databases/postgresql82/distinfo
index ae8b68483f4..48889b505f4 100644
--- a/databases/postgresql82/distinfo
+++ b/databases/postgresql82/distinfo
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.18 2009/12/16 21:18:31 adam Exp $
+$NetBSD: distinfo,v 1.19 2010/04/12 09:48:48 adam Exp $
-SHA1 (postgresql-8.2.15.tar.bz2) = 4de199b3223dba2164a9e56d998f6deb708f0f74
-RMD160 (postgresql-8.2.15.tar.bz2) = ae2556833810e6a8d28f8e101edc94e190b67536
-Size (postgresql-8.2.15.tar.bz2) = 12653038 bytes
+SHA1 (postgresql-8.2.16.tar.bz2) = 092e95438b6db24b65469433439c05dc6435d335
+RMD160 (postgresql-8.2.16.tar.bz2) = 5d3fe8ab522f3f0d744f902b3d31b2eab514e0f4
+Size (postgresql-8.2.16.tar.bz2) = 12637799 bytes
SHA1 (patch-aa) = 850a02acbd718a01d3597a99e929e3b3f663f07c
SHA1 (patch-ab) = d09e44921e9dd005e1b1dfbb5da4e56737ea05ab
SHA1 (patch-ac) = cbd302a60d43171854c37171b57ee7bbf1194ad9
-SHA1 (patch-ad) = 84ce70fa661b44f267a502ea73fe01b84776c91c
-SHA1 (patch-ae) = 8b3e47320dfe05d94b769c9b079fd7ca6d26f5d6
SHA1 (patch-af) = 89cb9318946cb7c34ad79dbae107ce66bd1c5022
SHA1 (patch-ag) = 402d5d211af99efdfa35677299c97e91e14ed85d
SHA1 (patch-ah) = 3640573195f66a46c37d9fca2648d6be39f5593b
diff --git a/databases/postgresql82/patches/patch-ad b/databases/postgresql82/patches/patch-ad
deleted file mode 100644
index 46fd11c5049..00000000000
--- a/databases/postgresql82/patches/patch-ad
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2008/04/05 16:40:08 adam Exp $
-
---- src/backend/port/dynloader/netbsd.c.orig 2008-04-05 11:33:08.000000000 +0200
-+++ src/backend/port/dynloader/netbsd.c
-@@ -46,64 +46,30 @@ static char sccsid[] = "@(#)dl.c 5.4 (Be
-
- #include "dynloader.h"
-
--static char error_message[BUFSIZ];
-+#ifndef HAVE_DLOPEN
-
- char *
--BSD44_derived_dlerror(void)
-+pg_dlerror(void)
- {
-- static char ret[BUFSIZ];
--
-- strcpy(ret, error_message);
-- error_message[0] = 0;
-- return (ret[0] == 0) ? NULL : ret;
-+ return "dynaloader unsupported";
- }
-
- void *
--BSD44_derived_dlopen(const char *file, int num)
-+pg_dlopen(const char *file, int num)
- {
--#if !defined(HAVE_DLOPEN)
-- snprintf(error_message, sizeof(error_message),
-- "dlopen (%s) not supported", file);
-+ elog(ERROR, "dynamic load not supported");
- return NULL;
--#else
-- void *vp;
--
-- if ((vp = dlopen((char *) file, num)) == NULL)
-- snprintf(error_message, sizeof(error_message),
-- "dlopen (%s) failed: %s", file, dlerror());
-- return vp;
--#endif
- }
-
- void *
--BSD44_derived_dlsym(void *handle, const char *name)
-+pg_dlsym(void *handle, const char *name)
- {
--#if !defined(HAVE_DLOPEN)
-- snprintf(error_message, sizeof(error_message),
-- "dlsym (%s) failed", name);
- return NULL;
--#elif defined(__ELF__)
-- return dlsym(handle, name);
--#else
-- void *vp;
-- char buf[BUFSIZ];
--
-- if (*name != '_')
-- {
-- snprintf(buf, sizeof(buf), "_%s", name);
-- name = buf;
-- }
-- if ((vp = dlsym(handle, (char *) name)) == NULL)
-- snprintf(error_message, sizeof(error_message),
-- "dlsym (%s) failed", name);
-- return vp;
--#endif
- }
-
- void
--BSD44_derived_dlclose(void *handle)
-+pg_dlclose(void *handle)
- {
--#if defined(HAVE_DLOPEN)
-- dlclose(handle);
--#endif
- }
-+
-+#endif /* ! HAVE_DLOPEN */
diff --git a/databases/postgresql82/patches/patch-ae b/databases/postgresql82/patches/patch-ae
deleted file mode 100644
index 5c0bb2f65d4..00000000000
--- a/databases/postgresql82/patches/patch-ae
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2006/12/09 15:34:13 adam Exp $
-
---- src/backend/port/dynloader/netbsd.h.orig 2005-01-01 07:00:32.000000000 +0900
-+++ src/backend/port/dynloader/netbsd.h
-@@ -21,19 +21,7 @@
-
- #include "utils/dynamic_loader.h"
-
--/*
-- * Dynamic Loader on NetBSD 1.0.
-- *
-- * this dynamic loader uses the system dynamic loading interface for shared
-- * libraries (ie. dlopen/dlsym/dlclose). The user must specify a shared
-- * library as the file to be dynamically loaded.
-- *
-- * agc - I know this is all a bit crufty, but it does work, is fairly
-- * portable, and works (the stipulation that the d.l. function must
-- * begin with an underscore is fairly tricky, and some versions of
-- * NetBSD (like 1.0, and 1.0A pre June 1995) have no dlerror.)
-- */
--
-+#ifdef HAVE_DLOPEN
- /*
- * In some older systems, the RTLD_NOW flag isn't defined and the mode
- * argument to dlopen must always be 1. The RTLD_GLOBAL flag is wanted
-@@ -47,14 +35,11 @@
- #define RTLD_GLOBAL 0
- #endif
-
--#define pg_dlopen(f) BSD44_derived_dlopen((f), RTLD_NOW | RTLD_GLOBAL)
--#define pg_dlsym BSD44_derived_dlsym
--#define pg_dlclose BSD44_derived_dlclose
--#define pg_dlerror BSD44_derived_dlerror
-+#define pg_dlopen(f) dlopen((f), RTLD_NOW | RTLD_GLOBAL)
-+#define pg_dlsym dlsym
-+#define pg_dlclose dlclose
-+#define pg_dlerror dlerror
-
--char *BSD44_derived_dlerror(void);
--void *BSD44_derived_dlopen(const char *filename, int num);
--void *BSD44_derived_dlsym(void *handle, const char *name);
--void BSD44_derived_dlclose(void *handle);
-+#endif /* HAVE_DLOPEN */
-
- #endif /* PORT_PROTOS_H */