Update of /cvsroot/fink/experimental/crypto/rangerrick/finkinfo
In directory sc8-pr-cvs1:/tmp/cvs-serv13282
Modified Files:
postgresql-ssl-7.3.1-1.info postgresql-ssl-7.3.1-1.patch
Log Message:
updated postgresql bits
Index: postgresql-ssl-7.3.1-1.info
===================================================================
RCS file:
/cvsroot/fink/experimental/crypto/rangerrick/finkinfo/postgresql-ssl-7.3.1-1.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- postgresql-ssl-7.3.1-1.info 31 Dec 2002 20:40:06 -0000 1.1
+++ postgresql-ssl-7.3.1-1.info 3 Jan 2003 22:09:55 -0000 1.2
@@ -7,7 +7,7 @@
Source3: ftp://gborg.postgresql.org/pub/libpqpp/stable/libpq++-4.0.tar.gz
Source4: ftp://gborg.postgresql.org/pub/libpqxx/stable/libpqxx-1.2.6.tar.gz
Source5: ftp://gborg.postgresql.org/pub/pgeasy/stable/pgeasy-3.0.1.tar.gz
-BuildDepends: readline, openssl-dev
+BuildDepends: readline, openssl-dev, autoconf25
Depends: openssl-shlibs, readline-shlibs (>= 4.3-5), passwd, daemonic (>=
20010902-1), %N73-shlibs (>= %v-%r)
Conflicts: postgresql
Replaces: postgresql, postgresql-python (<< 7.3), postgresql-ssl-python (<< 7.3),
postgresql-perl (<< 7.3), postgresql-ssl-perl (<< 7.3)
@@ -20,34 +20,33 @@
export LDFLAGS="-L%i/lib -L%p/lib"
# postgresql
- ./configure %c
- make
- # have to install twice, for build purposes :P
- make install includedir=%p/include/postgresql
includedir_internal=%p/include/postgresql/internal
includedir_server=%p/include/postgresql DESTDIR=%d INSTALLSITEMAN3DIR=%i/share/man/man3
- make install-all-headers includedir=%p/include/postgresql
includedir_internal=%p/include/postgresql/internal
includedir_server=%p/include/postgresql DESTDIR=%d
+ autoconf && \
+ ./configure %c && \
+ make && \
+ make install install-all-headers includedir=%p/include/postgresql
+includedir_internal=%p/include/postgresql/internal
+includedir_server=%p/include/postgresql DESTDIR=%d
+INSTALLSITEMAN3DIR=%i/share/man/man3 || exit 1
# libpq++
pushd ../libpq++-4.0
patch -p1 < %a/%N-libpqpp-%v-%r.patch
- make DESTDIR=%d
+ make DESTDIR=%d || exit 2
popd
# libpqxx
pushd ../libpqxx-1.2.6
- ./configure --prefix=%p --with-postgres-include=%i/include/postgresql
--with-postgres-lib=%p/lib
- make
+ ./configure --prefix=%p --with-postgres-include=%i/include/postgresql
+--with-postgres-lib=%p/lib && \
+ make || exit 3
popd
# pgeasy
pushd ../pgeasy-3.0.1
patch -p1 < %a/%N-libpgeasy-%v-%r.patch
- make DESTDIR=%d
+ make DESTDIR=%d || exit 4
popd
# odbc
pushd ../psqlodbc-7.2.5
- ./configure --enable-pthreads --prefix=%p --with-pic
- make
+ ./configure --enable-pthreads --prefix=%p --with-pic && \
+ make || exit 5
popd
<<
@@ -55,29 +54,28 @@
#!/bin/sh
# postgresql
- make install includedir=%p/include/postgresql
includedir_internal=%p/include/postgresql/internal
includedir_server=%p/include/postgresql DESTDIR=%d INSTALLSITEMAN3DIR=%i/share/man/man3
- make install-all-headers includedir=%p/include/postgresql
includedir_internal=%p/include/postgresql/internal
includedir_server=%p/include/postgresql DESTDIR=%d
+ make install install-all-headers includedir=%p/include/postgresql
+includedir_internal=%p/include/postgresql/internal
+includedir_server=%p/include/postgresql DESTDIR=%d
+INSTALLSITEMAN3DIR=%i/share/man/man3 || exit 10
mv %i/share/doc/postgresql %i/share/doc/%N >/dev/null 2>&1
# libpq++
pushd ../libpq++-4.0
- make install DESTDIR=%d
+ make install DESTDIR=%d || exit 11
popd
# libpqxx
pushd ../libpqxx-1.2.6
- make install DESTDIR=%d includedir=%p/include/postgresql/pqxx
+ make install DESTDIR=%d includedir=%p/include/postgresql/pqxx || exit 12
popd
# pgeasy
pushd ../pgeasy-3.0.1
- make install DESTDIR=%d
+ make install DESTDIR=%d || exit 13
popd
# odbc
pushd ../psqlodbc-7.2.5
- make install DESTDIR=%d
+ make install DESTDIR=%d || exit 14
popd
ranlib %i/lib/*.a
@@ -116,7 +114,9 @@
</service>
<<
PreInstScript: <<
+rm -rf /tmp/postgresql-status
die () {
+ echo "failed" > /tmp/postgresql-status
echo "failed"
echo ""
echo "*** bailing because an error ocurred:"
@@ -214,6 +214,9 @@
}
pg_createdb () {
+ # initdb quietly creates a bad database with the wrong locale otherwise :P
+ export LANG=C
+
echo -e "- making postgresql directories: \c"
mkdir -p %p/var/postgresql/data %p/var/log/postgresql
chown -R pgsql %p/var/postgresql %p/var/log/postgresql
@@ -224,6 +227,10 @@
sudo -u pgsql %p/bin/initdb -D %p/var/postgresql/data >/dev/null 2>&1 || die
"couldn't initialize database"
echo "ok"
}
+
+if [ `cat /tmp/postgresql-status` = "failed" ]; then
+ die "pre-install failed!"
+fi
if [ -d %p/var/postgresql/data ]; then
if grep -q automatic '%p/var/tmp/pg_upgradetype' >/dev/null 2>&1; then
Index: postgresql-ssl-7.3.1-1.patch
===================================================================
RCS file:
/cvsroot/fink/experimental/crypto/rangerrick/finkinfo/postgresql-ssl-7.3.1-1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- postgresql-ssl-7.3.1-1.patch 31 Dec 2002 20:40:06 -0000 1.1
+++ postgresql-ssl-7.3.1-1.patch 3 Jan 2003 22:09:55 -0000 1.2
@@ -1,6 +1,173 @@
-diff -uNbr postgresql-7.3.1/configure postgresql-7.3.1-new/configure
+diff -uNbr postgresql-7.3.1/configure.in postgresql-7.3.1-patched/configure.in
+--- postgresql-7.3.1/configure.in Tue Dec 17 21:07:20 2002
++++ postgresql-7.3.1-patched/configure.in Thu Jan 2 16:08:23 2003
+@@ -724,7 +724,12 @@
+ fi
+
+ if test "$with_pam" = yes ; then
+- AC_CHECK_HEADER([security/pam_appl.h], [], [AC_MSG_ERROR([header file
+<security/pam_appl.h> is required for PAM])])
++ AC_CHECK_HEADERS([security/pam_appl.h], [], [
++ AC_CHECK_HEADERS([pam/pam_appl.h], [
++ AC_DEFINE([HAVE_PAM_PAM_APPL_H], 1, [Define if pam_appl.h is in pam/ instead
+of security/])
++ ], [AC_MSG_ERROR([header file <security/pam_appl.h> or <pam/pam_appl.h> is
+required for PAM])]
++ )
++ ])
+ fi
+
+
+diff -uNbr postgresql-7.3.1/src/backend/libpq/auth.c
+postgresql-7.3.1-patched/src/backend/libpq/auth.c
+--- postgresql-7.3.1/src/backend/libpq/auth.c Wed Sep 4 19:31:34 2002
++++ postgresql-7.3.1-patched/src/backend/libpq/auth.c Thu Jan 2 16:08:35 2003
+@@ -42,7 +42,12 @@
+ char *pg_krb_server_keyfile;
+
+ #ifdef USE_PAM
++
++#ifdef HAVE_PAM_PAM_APPL_H
++#include <pam/pam_appl.h>
++#else
+ #include <security/pam_appl.h>
++#endif
+
+ #define PGSQL_PAM_SERVICE "postgresql" /* Service name passed to PAM */
+
+diff -uNbr postgresql-7.3.1/src/backend/utils/mb/conversion_procs/proc.mk
+postgresql-7.3.1-patched/src/backend/utils/mb/conversion_procs/proc.mk
+--- postgresql-7.3.1/src/backend/utils/mb/conversion_procs/proc.mk Thu Sep 5
+14:28:46 2002
++++ postgresql-7.3.1-patched/src/backend/utils/mb/conversion_procs/proc.mk Thu
+Jan 2 14:20:33 2003
+@@ -1,6 +1,7 @@
+ SRCS += $(NAME).c
+ OBJS += $(NAME).o
+
++DLTYPE = bundle
+ SHLIB_LINK := $(BE_DLLLIBS)
+
+ SO_MAJOR_VERSION := 0
+diff -uNbr postgresql-7.3.1/src/include/pg_config.h.in
+postgresql-7.3.1-patched/src/include/pg_config.h.in
+--- postgresql-7.3.1/src/include/pg_config.h.in Fri Nov 8 00:23:09 2002
++++ postgresql-7.3.1-patched/src/include/pg_config.h.in Thu Jan 2 16:11:37
+2003
+@@ -57,6 +57,9 @@
+ /* Define to build with PAM Support */
+ #undef USE_PAM
+
++/* Define if pam_appl.h is in pam/ instead of security/ */
++#undef HAVE_PAM_PAM_APPL_H
++
+ /*
+ * DEF_PGPORT is the TCP port number on which the Postmaster listens and
+ * which clients will try to connect to. This is just a default value;
+diff -uNbr postgresql-7.3.1/src/interfaces/libpgtcl/Makefile
+postgresql-7.3.1-patched/src/interfaces/libpgtcl/Makefile
+--- postgresql-7.3.1/src/interfaces/libpgtcl/Makefile Tue Dec 10 23:08:05 2002
++++ postgresql-7.3.1-patched/src/interfaces/libpgtcl/Makefile Thu Jan 2 17:23:24
+2003
+@@ -20,7 +20,7 @@
+
+ OBJS= pgtcl.o pgtclCmds.o pgtclId.o
+
+-SHLIB_LINK = $(libpq)
++SHLIB_LINK = $(libpq) $(TCL_LIB_SPEC)
+
+ # If crypt is a separate library, rather than part of libc, it may need
+ # to be referenced separately to keep (broken) linkers happy. (This is
+diff -uNbr postgresql-7.3.1/src/interfaces/python/GNUmakefile
+postgresql-7.3.1-patched/src/interfaces/python/GNUmakefile
+--- postgresql-7.3.1/src/interfaces/python/GNUmakefile Thu Dec 13 13:39:04 2001
++++ postgresql-7.3.1-patched/src/interfaces/python/GNUmakefile Thu Jan 2 17:18:17
+2003
+@@ -13,10 +13,13 @@
+ override CPPFLAGS += -DUSE_DL_IMPORT
+ SHLIB_LINK += $(python_libspec)
+ endif
+-
++ifeq ($(PORTNAME), darwin)
++SHLIB_LINK += $(python_libspec)
++endif
+
+ include $(top_srcdir)/src/Makefile.shlib
+
++DLTYPE = bundle
+ override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) $(python_includespec)
+
+ all: all-lib
+diff -uNbr postgresql-7.3.1/src/makefiles/Makefile.darwin
+postgresql-7.3.1-patched/src/makefiles/Makefile.darwin
+--- postgresql-7.3.1/src/makefiles/Makefile.darwin Fri Oct 5 17:15:38 2001
++++ postgresql-7.3.1-patched/src/makefiles/Makefile.darwin Thu Jan 2 14:27:38
+2003
+@@ -1,13 +1,18 @@
+ AROPT = cr
+ AWK= awk
+
+-DLSUFFIX = .so
++DLSUFFIX = .dylib
+ CFLAGS_SL =
++CFLAGS += -fno-common
+ ifeq (,$(filter $(host_os), darwin1.0 darwin1.1 darwin1.2))
+-DARWIN_NAMESPACE_SPEC = -flat_namespace
++ MULTIPLY_DEFINED=
++else
++ MULTIPLY_DEFINED=-multiply_defined suppress
+ endif
+
+ %.so: %.o
+- $(CC) $(DARWIN_NAMESPACE_SPEC) -bundle -undefined suppress -o $@ $<
++ $(CC) -bundle $(MULTIPLY_DEFINED) -o $@ $<
++%.dylib: %.o
++ $(CC) -dynamiclib $(MULTIPLY_DEFINED) -o $@ $<
+
+ sqlmansect = 7
+diff -uNbr postgresql-7.3.1/src/pl/plperl/GNUmakefile
+postgresql-7.3.1-patched/src/pl/plperl/GNUmakefile
+--- postgresql-7.3.1/src/pl/plperl/GNUmakefile Tue May 28 12:57:53 2002
++++ postgresql-7.3.1-patched/src/pl/plperl/GNUmakefile Thu Jan 2 17:24:22 2003
+@@ -20,10 +20,10 @@
+
+ override CPPFLAGS := -I$(srcdir) -I$(perl_archlibexp)/CORE $(CPPFLAGS)
+
+-
+ NAME = plperl
+ SO_MAJOR_VERSION = 0
+ SO_MINOR_VERSION = 0
++DLTYPE = bundle
+
+ OBJS = plperl.o eloglvl.o SPI.o
+ SHLIB_LINK = $(perl_embed_ldflags) $(BE_DLLLIBS)
+diff -uNbr postgresql-7.3.1/src/pl/plpgsql/src/Makefile
+postgresql-7.3.1-patched/src/pl/plpgsql/src/Makefile
+--- postgresql-7.3.1/src/pl/plpgsql/src/Makefile Fri Nov 1 17:52:34 2002
++++ postgresql-7.3.1-patched/src/pl/plpgsql/src/Makefile Thu Jan 2 14:31:13
+2003
+@@ -18,6 +18,7 @@
+ NAME= plpgsql
+ SO_MAJOR_VERSION= 1
+ SO_MINOR_VERSION= 0
++DLTYPE = bundle
+
+ override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
+ SHLIB_LINK = $(BE_DLLLIBS)
+diff -uNbr postgresql-7.3.1/src/pl/plpython/Makefile
+postgresql-7.3.1-patched/src/pl/plpython/Makefile
+--- postgresql-7.3.1/src/pl/plpython/Makefile Thu Sep 5 14:28:46 2002
++++ postgresql-7.3.1-patched/src/pl/plpython/Makefile Thu Jan 2 14:33:37 2003
+@@ -22,6 +22,7 @@
+ NAME = plpython
+ SO_MAJOR_VERSION = 0
+ SO_MINOR_VERSION = 0
++DLTYPE = bundle
+ OBJS = plpython.o
+
+ SHLIB_LINK = $(BE_DLLLIBS) $(python_libspec)
+diff -uNbr postgresql-7.3.1/src/pl/tcl/Makefile
+postgresql-7.3.1-patched/src/pl/tcl/Makefile
+--- postgresql-7.3.1/src/pl/tcl/Makefile Fri May 24 14:10:17 2002
++++ postgresql-7.3.1-patched/src/pl/tcl/Makefile Thu Jan 2 17:24:41 2003
+@@ -25,7 +25,6 @@
+ endif
+ endif
+
+-
+ # The following attempts to figure out what libraries need to be
+ # linked with pltcl. The information comes from the tclConfig.sh
+ # file, but it's mostly bogus. This just might work.
+@@ -48,6 +47,7 @@
+ NAME = pltcl
+ SO_MAJOR_VERSION = 2
+ SO_MINOR_VERSION = 0
++DLTYPE = bundle
+ OBJS = pltcl.o
+
+ include $(top_srcdir)/src/Makefile.shlib
--- postgresql-7.3.1/configure Tue Dec 17 21:07:17 2002
-+++ postgresql-7.3.1-new/configure Mon Dec 30 23:55:09 2002
++++ postgresql-7.3.1-new/configure Thu Jan 2 14:09:20 2003
@@ -8330,8 +8330,8 @@
if test "$with_pam" = yes ; then
@@ -89,128 +256,173 @@
{ (exit 1); exit 1; }; }
fi
-diff -uNbr postgresql-7.3.1/src/Makefile.shlib postgresql-7.3.1-new/src/Makefile.shlib
--- postgresql-7.3.1/src/Makefile.shlib Wed Oct 9 12:21:54 2002
-+++ postgresql-7.3.1-new/src/Makefile.shlib Mon Dec 30 23:27:58 2002
-@@ -81,8 +81,16 @@
++++ postgresql-7.3.1-patched/src/Makefile.shlib Thu Jan 2 22:23:10 2003
+@@ -81,8 +81,23 @@
endif
ifeq ($(PORTNAME), darwin)
- shlib :=
lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
- LINK.shared = $(COMPILER) $(DARWIN_NAMESPACE_SPEC) -bundle -undefined
suppress
++ ifeq (,$(filter $(host_os), darwin1.0 darwin1.1 darwin1.2))
++ MULTIPLY_DEFINED =
++ else
++ MULTIPLY_DEFINED = -multiply_defined suppress
++ endif
++
+ shlib :=
+lib$(NAME).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)$(DLSUFFIX)
+ ifneq ($(SO_MAJOR_VERSION), 0)
+ version_link := -compatibility_version $(SO_MAJOR_VERSION) -current_version
+$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+ endif
-+ ifeq ($(DLSUFFIX), .so)
-+ LINK.shared = $(COMPILER) $(DARWIN_NAMESPACE_SPEC) -bundle
-multiply_defined suppress
++ ifeq ($(DLTYPE), bundle)
++ DLSUFFIX = .so
++ LINK.shared = $(COMPILER) $(DARWIN_NAMESPACE_SPEC) -bundle
+-undefined suppress -flat_namespace
+ else
-+ LINK.shared = $(COMPILER) $(DARWIN_NAMESPACE_SPEC) -install_name
$(libdir)/lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX) $(version_link) -dynamiclib
-multiply_defined suppress
++ LINK.shared = $(COMPILER) $(DARWIN_NAMESPACE_SPEC) -install_name
+$(libdir)/lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX) $(version_link) -dynamiclib
+$(MULTIPLY_DEFINED)
+ endif
+ SHLIB_LINK := -L$(libpq_builddir) $(SHLIB_LINK)
endif
ifeq ($(PORTNAME), openbsd)
-@@ -252,9 +260,9 @@
+@@ -247,6 +262,7 @@
+ ifneq ($(PORTNAME), beos)
+ ifneq ($(PORTNAME), win)
+ ifneq ($(PORTNAME), aix)
++ifneq ($(PORTNAME), darwin)
+
+ # Normal case
$(shlib): $(OBJS)
- $(LINK.shared) $(OBJS) $(SHLIB_LINK) -o $@
- # If we're using major and minor versions, then make a symlink to major-version-only.
--ifneq ($(shlib), lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION))
-- rm -f lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
-- $(LN_S) $(shlib) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
+@@ -262,6 +278,25 @@
+ $(LN_S) $(shlib) lib$(NAME)$(DLSUFFIX)
+ endif
+
++else # PORTNAME == darwin
++
++# Darwin case
++# (same as normal case, but libfoo.version.suffix)
++
++$(shlib): $(OBJS)
++ $(LINK.shared) $(OBJS) $(SHLIB_LINK) -o $@
+ifneq ($(shlib), lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX))
+ rm -f lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)
+ $(LN_S) $(shlib) lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)
- endif
- # Make sure we have a link to a name without any version numbers
- ifneq ($(shlib), lib$(NAME)$(DLSUFFIX))
-@@ -310,10 +318,10 @@
++endif
++
++ifneq ($(shlib), lib$(NAME)$(DLSUFFIX))
++ rm -f lib$(NAME)$(DLSUFFIX)
++ $(LN_S) $(shlib) lib$(NAME)$(DLSUFFIX)
++endif
++
++endif # PORTNAME == darwin
++
+ else # PORTNAME == aix
+
+ # AIX case
+@@ -309,7 +344,10 @@
+ ifeq ($(enable_shared), yes)
install-lib-shared: $(shlib)
$(INSTALL_SHLIB) $< $(DESTDIR)$(libdir)/$(shlib)
++
ifneq ($(PORTNAME), win)
--ifneq ($(shlib), lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION))
-+ifneq ($(shlib), lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX))
++ifneq ($(PORTNAME), darwin)
++
+ ifneq ($(shlib), lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION))
cd $(DESTDIR)$(libdir) && \
-- rm -f lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) && \
-- $(LN_S) $(shlib) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
-+ rm -f lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX) && \
-+ $(LN_S) $(shlib) lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)
+ rm -f lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) && \
+@@ -321,7 +359,23 @@
+ $(LN_S) $(shlib) lib$(NAME)$(DLSUFFIX)
endif
- ifneq ($(shlib), lib$(NAME)$(DLSUFFIX))
- cd $(DESTDIR)$(libdir) && \
-diff -uNbr postgresql-7.3.1/src/backend/libpq/auth.c
postgresql-7.3.1-new/src/backend/libpq/auth.c
---- postgresql-7.3.1/src/backend/libpq/auth.c Wed Sep 4 19:31:34 2002
-+++ postgresql-7.3.1-new/src/backend/libpq/auth.c Mon Dec 30 23:55:30 2002
-@@ -42,7 +42,7 @@
- char *pg_krb_server_keyfile;
-
- #ifdef USE_PAM
--#include <security/pam_appl.h>
-+#include <pam/pam_appl.h>
-
- #define PGSQL_PAM_SERVICE "postgresql" /* Service name passed to PAM */
-diff -uNbr postgresql-7.3.1/src/backend/utils/mb/conversion_procs/proc.mk
postgresql-7.3.1-new/src/backend/utils/mb/conversion_procs/proc.mk
---- postgresql-7.3.1/src/backend/utils/mb/conversion_procs/proc.mk Thu Sep 5
14:28:46 2002
-+++ postgresql-7.3.1-new/src/backend/utils/mb/conversion_procs/proc.mk Mon Dec 30
23:27:58 2002
-@@ -1,7 +1,8 @@
- SRCS += $(NAME).c
- OBJS += $(NAME).o
+-endif # not win
++else # PORTNAME == darwin
++
++ifneq ($(shlib), lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX))
++ cd $(DESTDIR)$(libdir) && \
++ rm -f lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX) && \
++ $(LN_S) $(shlib) lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)
++endif
++ifneq ($(shlib), lib$(NAME)$(DLSUFFIX))
++ cd $(DESTDIR)$(libdir) && \
++ rm -f lib$(NAME)$(DLSUFFIX) && \
++ $(LN_S) $(shlib) lib$(NAME)$(DLSUFFIX)
++endif
++
++endif # PORTNAME == darwin
++
++endif # PORTNAME == win
++
+ endif # enable_shared
--SHLIB_LINK := $(BE_DLLLIBS)
-+override DLSUFFIX = .so
-+SHLIB_LINK := $(BE_DLLLIBS) -undefined suppress -flat_namespace
- SO_MAJOR_VERSION := 0
- SO_MINOR_VERSION := 0
+@@ -335,7 +389,9 @@
+ ifeq ($(enable_shared), yes)
+ rm -f $(DESTDIR)$(libdir)/lib$(NAME)$(DLSUFFIX) \
+ $(DESTDIR)$(libdir)/lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) \
+-
+$(DESTDIR)$(libdir)/lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
++
+$(DESTDIR)$(libdir)/lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) \
++ $(DESTDIR)$(libdir)/lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX) \
++
+$(DESTDIR)$(libdir)/lib$(NAME).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)$(DLSUFFIX)
+ endif # enable_shared
+
+
+@@ -347,7 +403,7 @@
+ clean-lib:
+ rm -f lib$(NAME).a
+ ifeq ($(enable_shared), yes)
+- rm -f lib$(NAME)$(DLSUFFIX) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
+lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
++ rm -f lib$(NAME)$(DLSUFFIX) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
+lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)
+lib$(NAME).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)$(DLSUFFIX)
+ ifdef EXPSUFF
+ rm -f lib$(NAME)$(EXPSUFF)
+ endif
diff -uNbr postgresql-7.3.1/src/backend/utils/misc/guc.c
postgresql-7.3.1-new/src/backend/utils/misc/guc.c
---- postgresql-7.3.1/src/backend/utils/misc/guc.c Mon Dec 2 00:21:02 2002
-+++ postgresql-7.3.1-new/src/backend/utils/misc/guc.c Mon Dec 30 23:27:58 2002
+--- postgresql-7.3.1/src/backend/utils/misc/guc.c Mon Dec 2 00:21:02 2002
++++ postgresql-7.3.1-new/src/backend/utils/misc/guc.c Mon Dec 30 23:27:58 2002
@@ -834,12 +834,12 @@
-
- {
- {"unix_socket_group", PGC_POSTMASTER}, &Unix_socket_group,
-- "", NULL, NULL
-+ "pgsql", NULL, NULL
- },
-
- {
- {"unix_socket_directory", PGC_POSTMASTER}, &UnixSocketDir,
-- "", NULL, NULL
-+ "/tmp", NULL, NULL
- },
-
- {
-diff -uNbr postgresql-7.3.1/src/backend/utils/misc/postgresql.conf.sample
postgresql-7.3.1-new/src/backend/utils/misc/postgresql.conf.sample
---- postgresql-7.3.1/src/backend/utils/misc/postgresql.conf.sample Mon Sep 2
01:42:54 2002
-+++ postgresql-7.3.1-new/src/backend/utils/misc/postgresql.conf.sample Mon Dec 30
23:27:58 2002
+
+ {
+ {"unix_socket_group", PGC_POSTMASTER}, &Unix_socket_group,
+- "", NULL, NULL
++ "pgsql", NULL, NULL
+ },
+
+ {
+ {"unix_socket_directory", PGC_POSTMASTER}, &UnixSocketDir,
+- "", NULL, NULL
++ "/tmp", NULL, NULL
+ },
+
+ {
+diff -uNbr postgresql-7.3.1/src/backend/utils/misc/postgresql.conf.sample
+postgresql-7.3.1-new/src/backend/utils/misc/postgre
+sql.conf.sample
+--- postgresql-7.3.1/src/backend/utils/misc/postgresql.conf.sample Mon Sep 2
+01:42:54 2002
++++ postgresql-7.3.1-new/src/backend/utils/misc/postgresql.conf.sample Mon Dec 30
+23:27:58 2002
@@ -27,18 +27,18 @@
#
- # Connection Parameters
+ # Connection Parameters
#
-#tcpip_socket = false
-#ssl = false
+tcpip_socket = true
+ssl = false
-
+
-#max_connections = 32
+max_connections = 32
#superuser_reserved_connections = 2
-
- #port = 5432
+
+ #port = 5432
#hostname_lookup = false
#show_source_port = false
-
+
-#unix_socket_directory = ''
-#unix_socket_group = ''
+unix_socket_directory = '/tmp'
+unix_socket_group = 'pgsql'
- #unix_socket_permissions = 0777 # octal
-
+ #unix_socket_permissions = 0777 # octal
+
#virtual_host = ''
diff -uNbr postgresql-7.3.1/src/bin/initdb/initdb.sh
postgresql-7.3.1-new/src/bin/initdb/initdb.sh
---- postgresql-7.3.1/src/bin/initdb/initdb.sh Mon Nov 25 16:42:11 2002
-+++ postgresql-7.3.1-new/src/bin/initdb/initdb.sh Mon Dec 30 23:27:58 2002
+--- postgresql-7.3.1/src/bin/initdb/initdb.sh Mon Nov 25 16:42:11 2002
++++ postgresql-7.3.1-new/src/bin/initdb/initdb.sh Mon Dec 30 23:27:58 2002
@@ -1091,11 +1091,8 @@
echo
echo "Success. You can now start the database server using:"
@@ -224,15 +436,15 @@
+echo " sudo -u root sudo -u pgsql $PGPATH/pg_ctl \\"
+echo " -D $PGDATA -l /sw/var/log/postgresql/logfile start"
+echo ""
-
+
exit 0
diff -uNbr postgresql-7.3.1/src/bin/pg_ctl/pg_ctl.sh
postgresql-7.3.1-new/src/bin/pg_ctl/pg_ctl.sh
---- postgresql-7.3.1/src/bin/pg_ctl/pg_ctl.sh Fri Oct 18 18:05:35 2002
-+++ postgresql-7.3.1-new/src/bin/pg_ctl/pg_ctl.sh Mon Dec 30 23:27:58 2002
+--- postgresql-7.3.1/src/bin/pg_ctl/pg_ctl.sh Fri Oct 18 18:05:35 2002
++++ postgresql-7.3.1-new/src/bin/pg_ctl/pg_ctl.sh Mon Dec 30 23:27:58 2002
@@ -14,6 +14,10 @@
-
+
CMDNAME=`basename $0`
-
+
+ulimit -d 24000 >/dev/null 2>&1
+ulimit -n 512 >/dev/null 2>&1
+ulimit -s 4096 >/dev/null 2>&1
@@ -240,156 +452,3 @@
help="\
$CMDNAME is a utility to start, stop, restart, reload configuration files,
or report the status of a PostgreSQL server.
-diff -uNbr postgresql-7.3.1/src/interfaces/ecpg/lib/Makefile
postgresql-7.3.1-new/src/interfaces/ecpg/lib/Makefile
---- postgresql-7.3.1/src/interfaces/ecpg/lib/Makefile Tue Dec 10 23:08:04 2002
-+++ postgresql-7.3.1-new/src/interfaces/ecpg/lib/Makefile Mon Dec 30 23:27:58
2002
-@@ -17,7 +17,7 @@
- SO_MINOR_VERSION= 4.1
-
- override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdir)
$(CPPFLAGS)
--
-+override LDFLAGS := -L$(libpq_builddir) $(LDFLAGS)
-
- OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \
- connect.o misc.o
-diff -uNbr postgresql-7.3.1/src/interfaces/libpgtcl/Makefile
postgresql-7.3.1-new/src/interfaces/libpgtcl/Makefile
---- postgresql-7.3.1/src/interfaces/libpgtcl/Makefile Tue Dec 10 23:08:05 2002
-+++ postgresql-7.3.1-new/src/interfaces/libpgtcl/Makefile Mon Dec 30 23:27:58
2002
-@@ -17,10 +17,11 @@
- SO_MINOR_VERSION= 3
-
- override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
-+override LDFLAGS := -L$(libpq_builddir) $(LDFLAGS)
-
- OBJS= pgtcl.o pgtclCmds.o pgtclId.o
-
--SHLIB_LINK = $(libpq)
-+SHLIB_LINK = $(libpq) -ltcl
-
- # If crypt is a separate library, rather than part of libc, it may need
- # to be referenced separately to keep (broken) linkers happy. (This is
-diff -uNbr postgresql-7.3.1/src/interfaces/python/GNUmakefile
postgresql-7.3.1-new/src/interfaces/python/GNUmakefile
---- postgresql-7.3.1/src/interfaces/python/GNUmakefile Thu Dec 13 13:39:04 2001
-+++ postgresql-7.3.1-new/src/interfaces/python/GNUmakefile Mon Dec 30 23:27:58
2002
-@@ -17,7 +17,9 @@
-
- include $(top_srcdir)/src/Makefile.shlib
-
-+override DLSUFFIX := .so
- override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) $(python_includespec)
-+override SHLIB_LINK := -undefined suppress -flat_namespace -L$(libpq_builddir)
$(SHLIB_LINK)
-
- all: all-lib
-
-diff -uNbr postgresql-7.3.1/src/makefiles/Makefile.darwin
postgresql-7.3.1-new/src/makefiles/Makefile.darwin
---- postgresql-7.3.1/src/makefiles/Makefile.darwin Fri Oct 5 17:15:38 2001
-+++ postgresql-7.3.1-new/src/makefiles/Makefile.darwin Mon Dec 30 23:27:58 2002
-@@ -1,13 +1,16 @@
- AROPT = cr
- AWK= awk
-
--DLSUFFIX = .so
-+DLSUFFIX = .dylib
- CFLAGS_SL =
--ifeq (,$(filter $(host_os), darwin1.0 darwin1.1 darwin1.2))
--DARWIN_NAMESPACE_SPEC = -flat_namespace
--endif
-+CFLAGS += -fno-common
-+#ifeq (,$(filter $(host_os), darwin1.0 darwin1.1 darwin1.2))
-+#DARWIN_NAMESPACE_SPEC = -flat_namespace
-+#endif
-
- %.so: %.o
-- $(CC) $(DARWIN_NAMESPACE_SPEC) -bundle -undefined suppress -o $@ $<
-+ $(CC) $(DARWIN_NAMESPACE_SPEC) -bundle -multiply_defined suppress -o $@ $<
-+%.dylib: %.o
-+ $(CC) $(DARWIN_NAMESPACE_SPEC) -dynamiclib -multiply_defined suppress -o $@ $<
-
- sqlmansect = 7
-diff -uNbr postgresql-7.3.1/src/pl/plperl/GNUmakefile
postgresql-7.3.1-new/src/pl/plperl/GNUmakefile
---- postgresql-7.3.1/src/pl/plperl/GNUmakefile Tue May 28 12:57:53 2002
-+++ postgresql-7.3.1-new/src/pl/plperl/GNUmakefile Mon Dec 30 23:27:58 2002
-@@ -19,14 +19,14 @@
- endif
-
- override CPPFLAGS := -I$(srcdir) -I$(perl_archlibexp)/CORE $(CPPFLAGS)
--
-+override DLSUFFIX = .so
-
- NAME = plperl
- SO_MAJOR_VERSION = 0
- SO_MINOR_VERSION = 0
-
- OBJS = plperl.o eloglvl.o SPI.o
--SHLIB_LINK = $(perl_embed_ldflags) $(BE_DLLLIBS)
-+SHLIB_LINK = $(perl_embed_ldflags) $(BE_DLLLIBS) -undefined suppress -flat_namespace
-
- include $(top_srcdir)/src/Makefile.shlib
-
-diff -uNbr postgresql-7.3.1/src/pl/plpgsql/src/Makefile
postgresql-7.3.1-new/src/pl/plpgsql/src/Makefile
---- postgresql-7.3.1/src/pl/plpgsql/src/Makefile Fri Nov 1 17:52:34 2002
-+++ postgresql-7.3.1-new/src/pl/plpgsql/src/Makefile Mon Dec 30 23:27:58 2002
-@@ -19,11 +19,12 @@
- SO_MAJOR_VERSION= 1
- SO_MINOR_VERSION= 0
-
-+override DLSUFFIX = .so
- override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
--SHLIB_LINK = $(BE_DLLLIBS)
-+SHLIB_LINK = $(BE_DLLLIBS) -undefined suppress -flat_namespace
- rpath :=
-
--OBJS = pl_gram.o pl_handler.o pl_comp.o pl_exec.o pl_funcs.o
-+OBJS = pl_gram.o pl_handler.o pl_comp.o pl_exec.o pl_funcs.o
$(top_builddir)/src/backend/executor/SUBSYS.o
-
- ifneq ($(PORTNAME), qnx4)
- all: all-lib
-diff -uNbr postgresql-7.3.1/src/pl/plpython/Makefile
postgresql-7.3.1-new/src/pl/plpython/Makefile
---- postgresql-7.3.1/src/pl/plpython/Makefile Thu Sep 5 14:28:46 2002
-+++ postgresql-7.3.1-new/src/pl/plpython/Makefile Mon Dec 30 23:27:58 2002
-@@ -8,14 +8,13 @@
- # On some platforms we can only build PL/Python if libpython is a
- # shared library. Since there is no official way to determine this,
- # we see if there is a file that is named like a shared library.
--ifneq (,$(wildcard $(python_configdir)/libpython*$(DLSUFFIX)*))
-+ifneq (,$(wildcard $(python_configdir)/libpython*.dylib*))
- shared_libpython = yes
- endif
-
- # If we don't have a shared library and the platform doesn't allow it
- # to work without, we have to skip it.
- ifneq (,$(findstring yes, $(shared_libpython)$(allow_nonpic_in_shlib)))
--
- override CPPFLAGS := -I$(srcdir) $(python_includespec) $(CPPFLAGS)
- rpath :=
-
-@@ -24,7 +23,8 @@
- SO_MINOR_VERSION = 0
- OBJS = plpython.o
-
--SHLIB_LINK = $(BE_DLLLIBS) $(python_libspec)
-+SHLIB_LINK = $(BE_DLLLIBS) $(python_libspec) -undefined suppress -flat_namespace
-+override DLSUFFIX = .so
-
- include $(top_srcdir)/src/Makefile.shlib
-
-diff -uNbr postgresql-7.3.1/src/pl/tcl/Makefile
postgresql-7.3.1-new/src/pl/tcl/Makefile
---- postgresql-7.3.1/src/pl/tcl/Makefile Fri May 24 14:10:17 2002
-+++ postgresql-7.3.1-new/src/pl/tcl/Makefile Mon Dec 30 23:30:56 2002
-@@ -25,6 +25,7 @@
- endif
- endif
-
-+override DLSUFFIX = .so
-
- # The following attempts to figure out what libraries need to be
- # linked with pltcl. The information comes from the tclConfig.sh
-@@ -32,7 +33,7 @@
-
- ifneq ($(TCL_SHLIB_LD_LIBS),)
- # link command for a shared lib must mention shared libs it uses
--SHLIB_LINK = $(TCL_LIB_SPEC) $(TCL_LIBS) -lc
-+SHLIB_LINK = $(TCL_LIB_SPEC) $(TCL_LIBS) -lc -undefined suppress -flat_namespace
- else
- ifeq ($(PORTNAME), hpux)
- # link command for a shared lib must mention shared libs it uses,
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
