Update of /cvsroot/fink/dists/10.2/unstable/crypto/finkinfo
In directory sc8-pr-cvs1:/tmp/cvs-serv2557
Added Files:
postgresql-ssl-7.2.3-2.info postgresql-ssl-7.2.3-2.patch
postgresql-ssl-python-7.2.3-2.info
postgresql-ssl-tcl-7.2.3-2.info
Removed Files:
postgresql-ssl-7.2.3-1.info postgresql-ssl-7.2.3-1.patch
postgresql-ssl-python-7.2.3-1.info
postgresql-ssl-tcl-7.2.3-1.info
Log Message:
fixed postgresql upgrades from 7.2.2
--- NEW FILE: postgresql-ssl-7.2.3-2.info ---
Package: postgresql-ssl
Version: 7.2.3
Revision: 2
GCC: 3.1
Source: http://www.postgresql.org/ftpsite/source/v%v/postgresql-%v.tar.gz
BuildDepends: readline
Depends: readline-shlibs (>= 4.3-5), passwd, daemonic (>= 20010902-1), %N-shlibs (>=
%v-%r)
NoSetCPPFLAGS: true
SetCPPFLAGS: -I/sw/include
NoSetLDFLAGS: true
SetLIBS: -L/sw/lib
Conflicts: postgresql
Replaces: postgresql, postgresql-python, postgresql-ssl-python
PatchScript: sed 's|@PREFIX@|%p|g' < %a/%f.patch | patch -p1
ConfigureParams: --prefix=%p --docdir=%p/share/doc --mandir=%p/share/man
--enable-multibyte --enable-recode --with-CXX --with-perl --without-python
--with-openssl --with-libraries=%p/lib --with-includes=%p/include --without-tcl
--without-java --enable-odbc
InstallScript: <<
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
ranlib %i/lib/*.a
<<
SplitOff: <<
Description: PostgreSQL Perl module (with SSL)
Package: %N-perl
Depends: %N-shlibs (>= %v)
Conflicts: postgresql-perl
Replaces: postgresql (<< %v), postgresql-perl
BuildDependsOnly: true
Files: lib/perl5 lib/postgresql/plperl* share/man/man3/Pg.3
share/doc/postgresql/html/plperl*
<<
SplitOff2: <<
Description: PostgreSQL development headers and libraries (with SSL)
Package: %N-dev
Depends: %N-shlibs (>= %v-%r)
Conflicts: postgresql-dev
Replaces: postgresql (<< %v), postgresql-dev
BuildDependsOnly: true
Files: bin/pg_config include lib/*.a lib/libecpg.dylib lib/libpgeasy.dylib
lib/libpq++.dylib lib/libpq.dylib
<<
SplitOff3: <<
Description: PostgreSQL shared libraries (with SSL)
Package: %N-shlibs
Conflicts: postgresql-shlibs
Replaces: postgresql (<< %v), postgresql-shlibs
BuildDependsOnly: true
Files: lib/*.dylib
<<
DocFiles: COPYRIGHT HISTORY INSTALL README register.txt
DaemonicFile: <<
<service>
<description>PostgreSQL database server</description>
<message> PostgreSQL database server</message>
<daemon name="postgresql">
<executable background="no">/usr/bin/sudo</executable>
<parameters>-u pgsql %p/bin/pg_ctl -D %p/var/postgresql/data start -l
%p/var/log/postgresql/logfile</parameters>
</daemon>
</service>
<<
PostInstScript: <<
# create initial database
if [ ! -d %p/var/postgresql/data ]; then
mkdir -p %p/var/postgresql/data %p/var/log/postgresql
chown -R pgsql %p/var/postgresql %p/var/log/postgresql
chmod 700 %p/var/postgresql
sudo -u pgsql %p/bin/initdb -D %p/var/postgresql/data
fi
# update daemonic init script if necessary
daemonic install %N
<<
PreRmScript: <<
# clean up
if [ $1 != "upgrade" ]; then
daemonic remove %N
fi
<<
Description: PostgreSQL open-source database (with SSL)
DescUsage: <<
The package runs initdb on installation as the user 'pgsql'.
You can start the PostgreSQL server manually using 'postmaster' as pgsql (since
pgsql has a shell of /dev/null by default, you must run it as sudo -u pgsql
postmaster) or you can run 'daemonic enable postgresql' as root to create a
StartupItem for it
<<
DescPackaging: <<
IMPORTANT: The location of the data files has changed from earlier
revisions of this package. If you're upgrading from an earlier
revision, note that this one expects the data files to be installed
at <prefex>/var/postgresql/data.
When run from the startup script, logs output to
<prefix>/var/log/postgresql/logfile
<<
DescPort: <<
Rearranged a lot of the PostgreSQL build to be more "correct" on
Darwin, including making proper dylibs (instead of bundles, which
ended up creating static binaries).
<<
License: BSD
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Homepage: http://www.postgresql.org/
--- NEW FILE: postgresql-ssl-7.2.3-2.patch ---
diff -uNbr postgresql-7.2.3/src/Makefile.shlib postgresql-7.2.3-new/src/Makefile.shlib
--- postgresql-7.2.3/src/Makefile.shlib Sun Nov 11 14:20:53 2001
+++ postgresql-7.2.3-new/src/Makefile.shlib Sun Nov 17 19:12:54 2002
@@ -112,8 +112,16 @@
endif
ifeq ($(PORTNAME), darwin)
- shlib :=
lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
- LINK.shared = $(COMPILER) $(DARWIN_NAMESPACE_SPEC) -bundle -undefined
suppress
+ shlib :=
+lib$(NAME).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)$(DLSUFFIX)
+ ifneq ($(SO_MAJOR_VERSION), 0)
+ version_link := -compatibility_version
+$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) -current_version
+$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+ endif
+ ifeq ($(DLSUFFIX), .so)
+ LINK.shared = $(COMPILER) $(DARWIN_NAMESPACE_SPEC) -bundle
+-multiply_defined suppress
+ else
+ LINK.shared = $(COMPILER) $(DARWIN_NAMESPACE_SPEC) -install_name
+$(libdir)/$(shlib) $(version_link) -dynamiclib -multiply_defined suppress
+ endif
+ SHLIB_LINK := -L$(libpq_builddir) $(SHLIB_LINK)
endif
ifeq ($(PORTNAME), openbsd)
@@ -305,9 +313,9 @@
$(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)
+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))
@@ -363,10 +371,10 @@
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))
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)
endif
ifneq ($(shlib), lib$(NAME)$(DLSUFFIX))
cd $(DESTDIR)$(libdir) && \
diff -uNbr postgresql-7.2.3/src/backend/bootstrap/bootscanner.c
postgresql-7.2.3-new/src/backend/bootstrap/bootscanner.c
--- postgresql-7.2.3/src/backend/bootstrap/bootscanner.c Wed Oct 2 20:42:47
2002
+++ postgresql-7.2.3-new/src/backend/bootstrap/bootscanner.c Sun Nov 17 21:32:18
+2002
@@ -2,7 +2,6 @@
/* Scanner skeleton version:
* $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
- * $FreeBSD: src/usr.bin/lex/flex.skl,v 1.4 1999/10/27 07:56:44 obrien Exp $
*/
#define FLEX_SCANNER
@@ -547,10 +546,10 @@
#undef Int_yywrap
#endif /* Int_yywrap */
-YYSTYPE Int_yylval;
+/* YYSTYPE Int_yylval; */
int Int_yyline; /* keep track of the line number for error reporting */
-#line 554 "lex.Int_yy.c"
+#line 553 "lex.Int_yy.c"
/* Macros after this point can all be overridden by user definitions in
* section 1.
@@ -707,7 +706,7 @@
#line 64 "bootscanner.l"
-#line 711 "lex.Int_yy.c"
+#line 710 "lex.Int_yy.c"
if ( Int_yy_init )
{
@@ -961,7 +960,7 @@
#line 132 "bootscanner.l"
ECHO;
YY_BREAK
-#line 965 "lex.Int_yy.c"
+#line 964 "lex.Int_yy.c"
case YY_STATE_EOF(INITIAL):
Int_yyterminate();
diff -uNbr postgresql-7.2.3/src/backend/port/darwin/Makefile
postgresql-7.2.3-new/src/backend/port/darwin/Makefile
--- postgresql-7.2.3/src/backend/port/darwin/Makefile Wed Nov 7 23:24:03 2001
+++ postgresql-7.2.3-new/src/backend/port/darwin/Makefile Sun Nov 17 18:47:38
+2002
@@ -4,7 +4,7 @@
# Makefile for port/darwin
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql-server/src/backend/port/darwin/Makefile,v 1.2 2001/11/08
04:24:03 tgl Exp $
+# $Header: /cvsroot/pgsql-server/src/backend/port/darwin/Makefile,v 1.3 2002/05/05
+01:03:26 tgl Exp $
#
#-------------------------------------------------------------------------
@@ -12,7 +12,7 @@
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
-OBJS = sem.o system.o
+OBJS = system.o
all: SUBSYS.o
diff -uNbr postgresql-7.2.3/src/backend/storage/ipc/ipc.c
postgresql-7.2.3-new/src/backend/storage/ipc/ipc.c
--- postgresql-7.2.3/src/backend/storage/ipc/ipc.c Mon Nov 5 12:46:28 2001
+++ postgresql-7.2.3-new/src/backend/storage/ipc/ipc.c Sun Nov 17 16:39:52 2002
@@ -44,10 +44,6 @@
#include <kernel/OS.h>
#endif
-#if defined(__darwin__)
-#include "port/darwin/sem.h"
-#endif
-
#include "miscadmin.h"
#include "utils/memutils.h"
#include "libpq/libpq.h"
diff -uNbr postgresql-7.2.3/src/backend/storage/lmgr/proc.c
postgresql-7.2.3-new/src/backend/storage/lmgr/proc.c
--- postgresql-7.2.3/src/backend/storage/lmgr/proc.c Mon Sep 30 16:18:59 2002
+++ postgresql-7.2.3-new/src/backend/storage/lmgr/proc.c Sun Nov 17 16:40:06
+2002
@@ -57,10 +57,6 @@
#include <sys/sem.h>
#endif
-#if defined(__darwin__)
-#include "port/darwin/sem.h"
-#endif
-
#include "miscadmin.h"
#include "access/xact.h"
#include "storage/proc.h"
diff -uNbr postgresql-7.2.3/src/backend/storage/lmgr/spin.c
postgresql-7.2.3-new/src/backend/storage/lmgr/spin.c
--- postgresql-7.2.3/src/backend/storage/lmgr/spin.c Mon Nov 5 12:46:28 2001
+++ postgresql-7.2.3-new/src/backend/storage/lmgr/spin.c Sun Nov 17 16:40:13
+2002
@@ -29,10 +29,6 @@
#include <sys/sem.h>
#endif
-#if defined(__darwin__)
-#include "port/darwin/sem.h"
-#endif
-
#include "storage/lwlock.h"
#include "storage/proc.h"
#include "storage/spin.h"
diff -uNbr postgresql-7.2.3/src/backend/utils/misc/guc.c
postgresql-7.2.3-new/src/backend/utils/misc/guc.c
--- postgresql-7.2.3/src/backend/utils/misc/guc.c Tue Oct 30 00:38:56 2001
+++ postgresql-7.2.3-new/src/backend/utils/misc/guc.c Sun Nov 17 16:40:51 2002
@@ -576,12 +576,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.2.3/src/backend/utils/misc/postgresql.conf.sample
postgresql-7.2.3-new/src/backend/utils/misc/postgresql.conf.sample
--- postgresql-7.2.3/src/backend/utils/misc/postgresql.conf.sample Fri Jan 4
00:50:25 2002
+++ postgresql-7.2.3-new/src/backend/utils/misc/postgresql.conf.sample Sun Nov 17
+16:41:39 2002
@@ -23,17 +23,17 @@
#
# Connection Parameters
#
-#tcpip_socket = false
-#ssl = false
+tcpip_socket = true
+ssl = false
-#max_connections = 32
+max_connections = 32
#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
#virtual_host = ''
diff -uNbr postgresql-7.2.3/src/bin/initdb/initdb.sh
postgresql-7.2.3-new/src/bin/initdb/initdb.sh
--- postgresql-7.2.3/src/bin/initdb/initdb.sh Sun Nov 25 17:19:30 2001
+++ postgresql-7.2.3-new/src/bin/initdb/initdb.sh Sun Nov 17 16:42:32 2002
@@ -873,11 +873,8 @@
echo
echo "Success. You can now start the database server using:"
echo ""
-echo " $PGPATH/postmaster -D $PGDATA"
-echo "or"
-# (Advertise -l option here, otherwise we have a background
-# process writing to the terminal.)
-echo " $PGPATH/pg_ctl -D $PGDATA -l logfile start"
-echo
+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.2.3/src/bin/pg_ctl/pg_ctl.sh
postgresql-7.2.3-new/src/bin/pg_ctl/pg_ctl.sh
--- postgresql-7.2.3/src/bin/pg_ctl/pg_ctl.sh Fri Sep 28 23:09:32 2001
+++ postgresql-7.2.3-new/src/bin/pg_ctl/pg_ctl.sh Sun Nov 17 16:43:08 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
+
help="\
$CMDNAME is a utility to start, stop, restart, reload configuration files,
or report the status of a PostgreSQL server.
diff -uNbr postgresql-7.2.3/src/interfaces/ecpg/lib/Makefile
postgresql-7.2.3-new/src/interfaces/ecpg/lib/Makefile
--- postgresql-7.2.3/src/interfaces/ecpg/lib/Makefile Tue Jan 8 15:41:26 2002
+++ postgresql-7.2.3-new/src/interfaces/ecpg/lib/Makefile Sun Nov 17 18:47:39
+2002
@@ -17,7 +17,7 @@
SO_MINOR_VERSION= 3.0
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.2.3/src/interfaces/libpgeasy/Makefile
postgresql-7.2.3-new/src/interfaces/libpgeasy/Makefile
--- postgresql-7.2.3/src/interfaces/libpgeasy/Makefile Thu May 10 21:46:33 2001
+++ postgresql-7.2.3-new/src/interfaces/libpgeasy/Makefile Sun Nov 17 18:47:39
+2002
@@ -17,6 +17,7 @@
SO_MINOR_VERSION= 2
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
+override LDFLAGS := -L$(libpq_builddir) $(LDFLAGS)
OBJS= libpgeasy.o halt.o
diff -uNbr postgresql-7.2.3/src/interfaces/libpgtcl/Makefile
postgresql-7.2.3-new/src/interfaces/libpgtcl/Makefile
--- postgresql-7.2.3/src/interfaces/libpgtcl/Makefile Thu May 10 21:46:33 2001
+++ postgresql-7.2.3-new/src/interfaces/libpgtcl/Makefile Sun Nov 17 18:47:39
+2002
@@ -17,10 +17,11 @@
SO_MINOR_VERSION= 2
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.2.3/src/interfaces/libpq++/Makefile
postgresql-7.2.3-new/src/interfaces/libpq++/Makefile
--- postgresql-7.2.3/src/interfaces/libpq++/Makefile Tue May 22 07:24:28 2001
+++ postgresql-7.2.3-new/src/interfaces/libpq++/Makefile Sun Nov 17 18:47:40
+2002
@@ -17,6 +17,7 @@
SO_MINOR_VERSION= 0
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
+override LDFLAGS := -L$(libpq_builddir) $(LDFLAGS)
OBJS = pgconnection.o pgdatabase.o pgtransdb.o pgcursordb.o pglobject.o
diff -uNbr postgresql-7.2.3/src/interfaces/perl5/GNUmakefile
postgresql-7.2.3-new/src/interfaces/perl5/GNUmakefile
--- postgresql-7.2.3/src/interfaces/perl5/GNUmakefile Sun Aug 26 18:28:04 2001
+++ postgresql-7.2.3-new/src/interfaces/perl5/GNUmakefile Sun Nov 17 16:45:59
+2002
@@ -12,13 +12,9 @@
.NOTPARALLEL:
-# This would allow a non-root install of the Perl module, but it's not
-# quite implemented yet.
-ifeq ($(mysterious_feature),yes)
-perl_installsitearch = $(pkglibdir)
-perl_installsitelib = $(pkglibdir)
-perl_installman3dir = $(mandir)/man3
-endif
+perl_installsitearch = $(prefix)/lib/perl5/darwin
+perl_installsitelib = $(prefix)/lib/perl5
+perl_installman3dir = $(prefix)/share/man/man3
all: Makefile libpq-all
diff -uNbr postgresql-7.2.3/src/interfaces/python/GNUmakefile
postgresql-7.2.3-new/src/interfaces/python/GNUmakefile
--- postgresql-7.2.3/src/interfaces/python/GNUmakefile Thu Dec 13 13:39:04 2001
+++ postgresql-7.2.3-new/src/interfaces/python/GNUmakefile Sun Nov 17 20:16:16
+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.2.3/src/makefiles/Makefile.darwin
postgresql-7.2.3-new/src/makefiles/Makefile.darwin
--- postgresql-7.2.3/src/makefiles/Makefile.darwin Fri Oct 5 17:15:38 2001
+++ postgresql-7.2.3-new/src/makefiles/Makefile.darwin Sun Nov 17 18:47:40 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.2.3/src/pl/plpgsql/src/Makefile
postgresql-7.2.3-new/src/pl/plpgsql/src/Makefile
--- postgresql-7.2.3/src/pl/plpgsql/src/Makefile Fri Nov 16 11:32:33 2001
+++ postgresql-7.2.3-new/src/pl/plpgsql/src/Makefile Sun Nov 17 18:47:40 2002
@@ -19,11 +19,13 @@
SO_MAJOR_VERSION= 1
SO_MINOR_VERSION= 0
+SHLIB_LINK += -undefined suppress -flat_namespace
+override DLSUFFIX = .so
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS)
rpath :=
-OBJS = pl_gram.o pl_scan.o pl_handler.o pl_comp.o pl_exec.o pl_funcs.o
+OBJS = pl_gram.o pl_scan.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
@@ -36,7 +38,6 @@
# Shared library stuff
include $(top_srcdir)/src/Makefile.shlib
-
# In order to use Makefile.shlib, we allow it to build a static
# library libplpgsql.a, which we just ignore, as well as a shared
diff -uNbr postgresql-7.2.3/src/pl/plpython/Makefile
postgresql-7.2.3-new/src/pl/plpython/Makefile
--- postgresql-7.2.3/src/pl/plpython/Makefile Sun Sep 16 12:11:11 2001
+++ postgresql-7.2.3-new/src/pl/plpython/Makefile Sun Nov 17 18:47:40 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)
override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS)
rpath :=
@@ -25,7 +24,8 @@
SO_MINOR_VERSION = 0
OBJS = plpython.o
-SHLIB_LINK += $(python_libspec)
+SHLIB_LINK += $(python_libspec) -undefined suppress -flat_namespace
+override DLSUFFIX = .so
include $(top_srcdir)/src/Makefile.shlib
diff -uNbr postgresql-7.2.3/src/pl/tcl/Makefile
postgresql-7.2.3-new/src/pl/tcl/Makefile
--- postgresql-7.2.3/src/pl/tcl/Makefile Wed Jan 23 13:45:41 2002
+++ postgresql-7.2.3-new/src/pl/tcl/Makefile Sun Nov 17 18:47:40 2002
@@ -26,7 +26,6 @@
endif
endif
-
# Change following to how shared library that contains references to
# libtcl must get built on your system. Since these definitions come
# from the tclConfig.sh script, they should work if the shared build
@@ -37,20 +36,28 @@
ifneq ($(TCL_SHLIB_LD_LIBS),)
# link command for a shared lib must mention shared libs it uses
+SHLIB_EXTRA_LDFLAGS=
SHLIB_EXTRA_LIBS=$(TCL_LIBS) -lc
else
ifeq ($(PORTNAME), hpux)
# link command for a shared lib must mention shared libs it uses,
# even though Tcl doesn't think so...
+SHLIB_EXTRA_LDFLAGS=
SHLIB_EXTRA_LIBS=$(TCL_LIBS) -lc
else
+ifeq ($(PORTNAME), darwin)
+SHLIB_EXTRA_LIBS=
+SHLIB_EXTRA_LDFLAGS=-undefined suppress -flat_namespace
+else
# link command for a shared lib must NOT mention shared libs it uses
+SHLIB_EXTRA_LDFLAGS=
SHLIB_EXTRA_LIBS=
endif
endif
+endif
%$(TCL_SHLIB_SUFFIX): %.o
- $(TCL_SHLIB_LD) -o $@ $< $(TCL_LIB_SPEC) $(SHLIB_EXTRA_LIBS)
+ $(TCL_SHLIB_LD) $(SHLIB_EXTRA_LDFLAGS) -o $@ $< $(TCL_LIB_SPEC)
+$(SHLIB_EXTRA_LIBS)
CC = $(TCL_CC)
--- NEW FILE: postgresql-ssl-python-7.2.3-2.info ---
Package: postgresql-ssl-python
Version: 7.2.3
Revision: 2
GCC: 3.1
Source: http://www.postgresql.org/ftpsite/source/v%v/postgresql-%v.tar.gz
BuildDepends: postgresql-ssl-dev (>= %v), python (>= 2.2.1-5) | python-nox (>= 2.2.1-5)
Depends: postgresql-ssl-shlibs (>= %v), python (>= 2.2.1-5) | python-nox (>= 2.2.1-5)
NoSetCPPFLAGS: true
SetCPPFLAGS: -I/sw/include
NoSetLDFLAGS: true
SetLIBS: -L/sw/lib
Conflicts: postgresql-python
Replaces: postgresql-python
PatchScript: sed 's|@PREFIX@|%p|g' < %a/postgresql-ssl-%v-%r.patch | patch -p1
ConfigureParams: --prefix=%p --docdir=%p/share/doc --mandir=%p/share/man
--enable-multibyte --enable-recode --with-CXX --without-perl --with-python
--with-openssl --with-libraries=%p/lib --with-includes=%p/include --without-tcl
--without-java --enable-odbc
CompileScript: <<
./configure %c
(cd src/interfaces/python; make)
(cd src/pl/plpython; make)
<<
InstallScript: <<
(cd src/interfaces/python; make install DESTDIR=%d
INSTALLSITEMAN3DIR=%i/share/man/man3)
(cd src/pl/plpython; make install DESTDIR=%d
INSTALLSITEMAN3DIR=%i/share/man/man3)
<<
DocFiles: COPYRIGHT HISTORY INSTALL README register.txt
Description: PostgreSQL Python tools (with SSL)
License: BSD
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Homepage: http://www.postgresql.org/
--- NEW FILE: postgresql-ssl-tcl-7.2.3-2.info ---
Package: postgresql-ssl-tcl
Version: 7.2.3
Revision: 2
GCC: 3.1
Source: http://www.postgresql.org/ftpsite/source/v%v/postgresql-%v.tar.gz
BuildDepends: tcltk, tcltk-dev, postgresql-ssl-dev (>= %v)
Depends: postgresql-ssl-shlibs (>= %v), python (>= 2.2.1-5) | python-nox (>= 2.2.1-5)
NoSetCPPFLAGS: true
SetCPPFLAGS: -I/sw/include
NoSetLDFLAGS: true
SetLIBS: -L/sw/lib
Conflicts: postgresql-tcl
Replaces: postgresql-tcl
PatchScript: sed 's|@PREFIX@|%p|g' < %a/postgresql-ssl-%v-%r.patch | patch -p1
ConfigureParams: --prefix=%p --docdir=%p/share/doc --mandir=%p/share/man
--enable-multibyte --enable-recode --with-CXX --without-perl --without-python
--with-openssl --with-libraries=%p/lib --with-includes=%p/include --with-tcl
--with-tclconfig=%p/lib --with-tkconfig=%p/lib --without-java --enable-odbc
CompileScript: <<
./configure %c
(cd src/interfaces/libpgtcl; make)
(cd src/pl/tcl; make)
<<
InstallScript: <<
(cd src/bin/pgaccess; make install DESTDIR=%d
INSTALLSITEMAN3DIR=%i/share/man/man3)
(cd src/bin/pgtclsh; make install DESTDIR=%d
INSTALLSITEMAN3DIR=%i/share/man/man3)
(cd src/pl/tcl; make install DESTDIR=%d
INSTALLSITEMAN3DIR=%i/share/man/man3)
(cd src/interfaces/libpgtcl; make install DESTDIR=%d
INSTALLSITEMAN3DIR=%i/share/man/man3)
ranlib %i/lib/*.a
<<
DocFiles: COPYRIGHT HISTORY INSTALL README register.txt
Description: PostgreSQL TCL tools (with SSL support)
License: BSD
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Homepage: http://www.postgresql.org/
--- postgresql-ssl-7.2.3-1.info DELETED ---
--- postgresql-ssl-7.2.3-1.patch DELETED ---
--- postgresql-ssl-python-7.2.3-1.info DELETED ---
--- postgresql-ssl-tcl-7.2.3-1.info DELETED ---
-------------------------------------------------------
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
