Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/database
In directory
sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv4228/main/finkinfo/database
Modified Files:
postgresql90.info postgresql90.patch
Log Message:
PostgreSQL 9.0 beta3, you will need to delete your data directory before
upgrading!
Index: postgresql90.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/database/postgresql90.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- postgresql90.info 3 May 2010 15:24:11 -0000 1.1
+++ postgresql90.info 28 Jul 2010 03:50:13 -0000 1.2
@@ -1,7 +1,7 @@
Info4: <<
Package: postgresql90
Version: 9.0.0
-Revision: 0.beta1.1
+Revision: 0.beta3.1
Description: PostgreSQL open-source database
License: BSD
Maintainer: Benjamin Reed <postgresq...@fink.raccoonfink.com>
@@ -40,49 +40,49 @@
<<
<<
-Source: mirror:postgresql:source/v9.0beta1/postgresql-9.0beta1.tar.bz2
-Source-MD5: b7447f48cdb0a97e62de7046acbc041b
+Source: mirror:postgresql:source/v9.0beta3/postgresql-9.0beta3.tar.bz2
+Source-MD5: 135c1bdeb42e93f93db30bf75002ce4b
PatchScript: sed -e 's|@BUILDDIR@|%b|g' -e 's|@INSTPREFIX@|%p|g' <
%{PatchFile} | patch -p1
PatchFile: %n.patch
-PatchFile-MD5: baa1051c28ba4bfaf84eb71634035d34
+PatchFile-MD5: 0dd214f6cb16477770be69ac3d804b33
SetCPPFLAGS: -I%p/lib/system-openssl/include -DHAVE_OPTRESET -fno-common
SetLDFLAGS: -L%p/lib/system-openssl/lib -F/System/Library/Frameworks
UseMaxBuildJobs: true
CompileScript: <<
-#!/bin/sh -xe
-
+ #!/bin/sh -xe
+
if [ -x /usr/bin/gcc-4.2 ]; then
- export CC=gcc-4.2
- export CXX=g++-4.2
+ export CC=gcc-4.2
+ export CXX=g++-4.2
fi
-
+
export PERL=/usr/bin/perl
export PYTHON=/usr/bin/python
-
+
./configure \
- --prefix='%p/opt/postgresql-9.0' \
- --docdir='%p/share/doc/%N' \
- --mandir='${prefix}/share/man' \
- --infodir='${prefix}/share/info' \
- --with-libraries=%p/lib \
- --with-includes=%p/include \
- \
- --with-perl \
- --with-python \
- --with-tcl \
- --with-tclconfig=%p/lib \
- \
- --enable-thread-safety \
- --with-openssl \
- --with-pam \
- --with-bonjour \
- --with-krb5 \
- --with-gssapi \
- \
- --with-libxml \
- --with-libxslt
-
+ --prefix='%p/opt/postgresql-9.0' \
+ --docdir='%p/share/doc/%N' \
+ --mandir='${prefix}/share/man' \
+ --infodir='${prefix}/share/info' \
+ --with-libraries=%p/lib \
+ --with-includes=%p/include \
+ \
+ --with-perl \
+ --with-python \
+ --with-tcl \
+ --with-tclconfig=%p/lib \
+ \
+ --enable-thread-safety \
+ --with-openssl \
+ --with-pam \
+ --with-bonjour \
+ --with-krb5 \
+ --with-gssapi \
+ \
+ --with-libxml \
+ --with-libxslt
+
perl -pi -e 's,-arch x86_64,,g; s,-arch i386,,g; s,-arch ppc,,g'
src/Makefile.global
make
make -C contrib
@@ -212,6 +212,14 @@
echo "asks if you want to update your users."
exit 1
fi
+if [ -d "%p/var/postgresql-9.0/data" ]; then
+ if [ `%p/bin/dpkg -s postgresql90 | grep -c 9.0.0-0.beta1` -gt 0 ]; then
+ echo "Error! The PostgreSQL 9.0 on-disk format has changed
since 9.0 beta1."
+ echo "You must remove %p/var/postgresql-9.0/data before
proceeding."
+ echo "You should probably back up with pg_dump if there's
anything important. ;)"
+ exit 1
+ fi
+fi
<<
PostInstScript: [ -x %p/var/postgresql-9.0/update-alternatives.sh ] &&
%p/var/postgresql-9.0/update-alternatives.sh
PreRmScript: [ -x %p/var/postgresql-9.0/remove-alternatives.sh ] &&
%p/var/postgresql-9.0/remove-alternatives.sh
@@ -231,7 +239,17 @@
%p/opt/postgresql-9.0/lib/libpgtypes.3.dylib 3.0.0
postgresql90-shlibs (>= 9.0.0-1)
%p/opt/postgresql-9.0/lib/libpq.5.dylib 5.0.0
postgresql90-shlibs (>= 9.0.0-1)
<<
- PostInstScript: [ -x %p/var/postgresql-9.0/update-alternatives.sh ] &&
%p/var/postgresql-9.0/update-alternatives.sh
+ PostInstScript: <<
+[ -x %p/var/postgresql-9.0/update-alternatives.sh ] &&
%p/var/postgresql-9.0/update-alternatives.sh
+if [ -d "%p/var/postgresql-9.0/data" ]; then
+ if [ `%p/bin/dpkg -s postgresql90 | grep -c 9.0.0-0.beta1` -gt 0 ]; then
+ echo "Error! The PostgreSQL 9.0 on-disk format has changed
since 9.0 beta1."
+ echo "You must remove %p/var/postgresql-9.0/data before
proceeding."
+ echo "You should probably back up with pg_dump if there's
anything important. ;)"
+ exit 1
+ fi
+fi
+ <<
PreRmScript: [ -x %p/var/postgresql-9.0/remove-alternatives.sh ] &&
%p/var/postgresql-9.0/remove-alternatives.sh
<<
@@ -243,6 +261,14 @@
echo "asks if you want to update your users."
exit 1
fi
+if [ -d "%p/var/postgresql-9.0/data" ]; then
+ if [ `%p/bin/dpkg -s postgresql90 | grep -c 9.0.0-0.beta1` -gt 0 ]; then
+ echo "Error! The PostgreSQL 9.0 on-disk format has changed
since 9.0 beta1."
+ echo "You must remove %p/var/postgresql-9.0/data before
proceeding."
+ echo "You should probably back up with pg_dump if there's
anything important. ;)"
+ exit 1
+ fi
+fi
<<
PostInstScript: <<
INSTALL_PHASE="$1"
Index: postgresql90.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/database/postgresql90.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- postgresql90.patch 3 May 2010 15:24:11 -0000 1.1
+++ postgresql90.patch 28 Jul 2010 03:50:13 -0000 1.2
@@ -1,6 +1,6 @@
-diff -Nurd postgresql-9.0.0/pgsql.sh postgresql-9.0.0-patched/pgsql.sh
---- postgresql-9.0.0/pgsql.sh 1969-12-31 19:00:00.000000000 -0500
-+++ postgresql-9.0.0-patched/pgsql.sh 2009-07-17 14:14:41.000000000 -0400
+diff -Nurd postgresql-9.0beta3/pgsql.sh postgresql-9.0beta3-new/pgsql.sh
+--- postgresql-9.0beta3/pgsql.sh 1969-12-31 18:00:00.000000000 -0600
++++ postgresql-9.0beta3-new/pgsql.sh 2010-07-26 11:06:05.000000000 -0500
@@ -0,0 +1,83 @@
+#!/bin/sh
+
@@ -85,10 +85,22 @@
+ $PG_COMMAND -D "$DATADIR" -m fast stop
+ ;;
+esac
-diff -Nurd postgresql-9.0.0/src/backend/utils/misc/postgresql.conf.sample
postgresql-9.0.0-patched/src/backend/utils/misc/postgresql.conf.sample
---- postgresql-9.0.0/src/backend/utils/misc/postgresql.conf.sample
2009-04-22 20:23:45.000000000 -0400
-+++ postgresql-9.0.0-patched/src/backend/utils/misc/postgresql.conf.sample
2009-07-17 08:25:21.000000000 -0400
-@@ -75,7 +75,7 @@
+diff -Nurd postgresql-9.0beta3/src/Makefile.global.in
postgresql-9.0beta3-new/src/Makefile.global.in
+--- postgresql-9.0beta3/src/Makefile.global.in 2010-07-06 17:03:05.000000000
-0500
++++ postgresql-9.0beta3-new/src/Makefile.global.in 2010-07-26
14:14:55.000000000 -0500
+@@ -243,7 +243,7 @@
+ ifdef PGXS
+ LDFLAGS = -L$(libdir)
+ else
+- LDFLAGS = -L$(top_builddir)/src/port
++ LDFLAGS = -L$(top_builddir)/src/port -L$(top_builddir)/src/interfaces/libpq
-L$(top_builddir)/src/interfaces/ecpg/ecpglib
-L$(top_builddir)/src/interfaces/ecpg/pgtypeslib
-L$(top_builddir)/src/interfaces/ecpg/compatlib
+ endif
+ LDFLAGS += @LDFLAGS@
+
+diff -Nurd postgresql-9.0beta3/src/backend/utils/misc/postgresql.conf.sample
postgresql-9.0beta3-new/src/backend/utils/misc/postgresql.conf.sample
+--- postgresql-9.0beta3/src/backend/utils/misc/postgresql.conf.sample
2010-07-03 16:23:58.000000000 -0500
++++ postgresql-9.0beta3-new/src/backend/utils/misc/postgresql.conf.sample
2010-07-26 11:06:05.000000000 -0500
+@@ -77,7 +77,7 @@
# - Security and Authentication -
#authentication_timeout = 1min # 1s-600s
@@ -96,10 +108,10 @@
+ssl = off # (change requires restart)
#ssl_ciphers = 'ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH' # allowed SSL ciphers
# (change requires restart)
- #password_encryption = on
-diff -Nurd postgresql-9.0.0/src/bin/initdb/initdb.c
postgresql-9.0.0-patched/src/bin/initdb/initdb.c
---- postgresql-9.0.0/src/bin/initdb/initdb.c 2009-06-11 10:49:07.000000000
-0400
-+++ postgresql-9.0.0-patched/src/bin/initdb/initdb.c 2009-07-17
08:25:55.000000000 -0400
+ #ssl_renegotiation_limit = 512MB # amount of data between renegotiations
+diff -Nurd postgresql-9.0beta3/src/bin/initdb/initdb.c
postgresql-9.0beta3-new/src/bin/initdb/initdb.c
+--- postgresql-9.0beta3/src/bin/initdb/initdb.c 2010-02-25
20:01:15.000000000 -0600
++++ postgresql-9.0beta3-new/src/bin/initdb/initdb.c 2010-07-26
11:06:05.000000000 -0500
@@ -114,7 +114,7 @@
/* defaults */
@@ -109,18 +121,40 @@
/*
* Warning messages for authentication methods
-diff -Nurd postgresql-9.0.0/src/makefiles/Makefile.darwin
postgresql-9.0.0-patched/src/makefiles/Makefile.darwin
---- postgresql-9.0.0/src/makefiles/Makefile.darwin 2008-11-14
05:22:47.000000000 -0500
-+++ postgresql-9.0.0-patched/src/makefiles/Makefile.darwin 2009-07-17
08:26:25.000000000 -0400
-@@ -13,4 +13,4 @@
- # Rule for building shared libs (currently used only for regression test
- # shlib ... should go away, since this is not really enough knowledge)
+diff -Nurd postgresql-9.0beta3/src/interfaces/ecpg/compatlib/Makefile
postgresql-9.0beta3-new/src/interfaces/ecpg/compatlib/Makefile
+--- postgresql-9.0beta3/src/interfaces/ecpg/compatlib/Makefile 2010-01-02
10:58:10.000000000 -0600
++++ postgresql-9.0beta3-new/src/interfaces/ecpg/compatlib/Makefile
2010-07-26 13:54:16.000000000 -0500
+@@ -21,6 +21,7 @@
+ -I$(libpq_srcdir) -I$(top_srcdir)/src/include/utils $(CPPFLAGS)
+ override CFLAGS += $(PTHREAD_CFLAGS)
+
++LDFLAGS := -L../ecpglib -L../pgtypeslib $(LDFLAGS)
+ SHLIB_LINK = -L../ecpglib -lecpg -L../pgtypeslib -lpgtypes $(libpq) \
+ $(filter -lintl -lm, $(LIBS)) $(PTHREAD_LIBS)
+
+diff -Nurd postgresql-9.0beta3/src/interfaces/ecpg/ecpglib/Makefile
postgresql-9.0beta3-new/src/interfaces/ecpg/ecpglib/Makefile
+--- postgresql-9.0beta3/src/interfaces/ecpg/ecpglib/Makefile 2010-01-05
10:38:23.000000000 -0600
++++ postgresql-9.0beta3-new/src/interfaces/ecpg/ecpglib/Makefile
2010-07-26 13:54:28.000000000 -0500
+@@ -33,6 +33,7 @@
+ OBJS += thread.o
+ endif
+
++LDFLAGS := -L../pgtypeslib $(LDFLAGS)
+ SHLIB_LINK = -L../pgtypeslib -lpgtypes $(libpq) $(filter -lintl -lm, $(LIBS))
$(PTHREAD_LIBS)
+
+ SHLIB_EXPORTS = exports.txt
+diff -Nurd postgresql-9.0beta3/src/makefiles/Makefile.darwin
postgresql-9.0beta3-new/src/makefiles/Makefile.darwin
+--- postgresql-9.0beta3/src/makefiles/Makefile.darwin 2010-07-05
18:15:56.000000000 -0500
++++ postgresql-9.0beta3-new/src/makefiles/Makefile.darwin 2010-07-26
11:06:31.000000000 -0500
+@@ -10,4 +10,4 @@
+
+ # Rule for building a shared library from a single .o file
%.so: %.o
-- $(CC) $(CFLAGS) -bundle -o $@ $< $(BE_DLLLIBS)
-+ $(CXX) $(CFLAGS) -bundle -undefined dynamic_lookup -o $@ $<
$(BE_DLLLIBS)
-diff -Nurd postgresql-9.0.0/src/template/darwin
postgresql-9.0.0-patched/src/template/darwin
---- postgresql-9.0.0/src/template/darwin 2007-09-25 20:32:46.000000000
-0400
-+++ postgresql-9.0.0-patched/src/template/darwin 2009-07-17
08:26:37.000000000 -0400
+- $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -bundle $(BE_DLLLIBS) -o $@ $<
++ $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -bundle $(BE_DLLLIBS)
-undefined dynamic_lookup -o $@ $<
+diff -Nurd postgresql-9.0beta3/src/template/darwin
postgresql-9.0beta3-new/src/template/darwin
+--- postgresql-9.0beta3/src/template/darwin 2007-09-25 19:32:46.000000000
-0500
++++ postgresql-9.0beta3-new/src/template/darwin 2010-07-26
11:06:05.000000000 -0500
@@ -1,9 +1,5 @@
# $PostgreSQL: pgsql/src/template/darwin,v 1.11 2007/09/26 00:32:46 tgl Exp $
------------------------------------------------------------------------------
The Palm PDK Hot Apps Program offers developers who use the
Plug-In Development Kit to bring their C/C++ apps to Palm for a share
of $1 Million in cash or HP Products. Visit us here for more details:
http://ad.doubleclick.net/clk;226879339;13503038;l?
http://clk.atdmt.com/CRS/go/247765532/direct/01/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
