Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/database
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv26253
Modified Files:
postgis.info postgis.patch postgresql-java.info
postgresql-perl.info postgresql-python-py.info
postgresql-tcl.info postgresql74-unified.info
postgresql80-unified.info postgresql81.info postgresql82.info
postgresql82.patch
Log Message:
merge from unstable
Index: postgresql81.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/database/postgresql81.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- postgresql81.info 9 Aug 2007 21:58:23 -0000 1.2
+++ postgresql81.info 15 Jan 2008 14:48:22 -0000 1.3
@@ -1,6 +1,6 @@
Package: postgresql81
-Version: 8.1.9
-Revision: 1021
+Version: 8.1.10
+Revision: 1022
Description: PostgreSQL open-source database
License: BSD
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
@@ -22,6 +22,7 @@
readline5,
system-openssl-dev
<<
+Provides: postgresql-server
Conflicts: <<
postgresql (<< %v-%r),
postgresql-ssl (<< %v-%r)
@@ -121,7 +122,7 @@
nam-US: ftp://ftp22.us.postgresql.org/mirrors/ftp.postgresql.org
<<
Source: mirror:custom:source/v%v/postgresql-%v.tar.bz2
-Source-MD5: a8a3bd5cb45c4c2747d5218912a82cfc
+Source-MD5: b3f29251035d2ee03f66e3114cf6f095
PatchScript: <<
sed -e 's|@BUILDDIR@|%b|g' -e 's|@INSTPREFIX@|%p|g' < %a/%n.patch |
patch -p1
perl -pi -e 's,^enum,static enum,' contrib/pgcrypto/pgp.h
@@ -343,7 +344,8 @@
postgresql80-dev,
postgresql80-ssl-dev,
postgresql80-unified-dev,
- postgresql82-dev
+ postgresql82-dev,
+ postgresql83-dev
<<
Replaces: <<
postgresql73-dev,
@@ -356,7 +358,8 @@
postgresql80-ssl-dev,
postgresql80-unified-dev,
%N (<< %v-%r),
- postgresql82-dev
+ postgresql82-dev,
+ postgresql83-dev
<<
BuildDependsOnly: true
Files: <<
Index: postgis.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/database/postgis.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- postgis.info 9 Aug 2007 21:58:23 -0000 1.1
+++ postgis.info 15 Jan 2008 14:48:21 -0000 1.2
@@ -1,7 +1,7 @@
Info2: <<
Package: postgis%type_pkg[postgresql]
-Version: 1.2.1
-Revision: 1024
+Version: 1.3.2
+Revision: 1
Description: PostgreSQL geographic object support
Type: postgresql (7.4 8.0 8.1 8.2)
License: BSD
@@ -23,7 +23,7 @@
(%type_raw[postgresql] = 8.0)
postgresql%type_pkg[postgresql]-unified-dev,
(%type_raw[postgresql] = 8.1) postgresql%type_pkg[postgresql]-dev,
(%type_raw[postgresql] = 8.2) postgresql%type_pkg[postgresql]-dev,
- postgresql-java (>= %type_raw[postgresql]-1021),
+ postgresql-java (>= %type_raw[postgresql]-1),
proj,
system-openssl-dev,
system-java (>= 1.4-1)
@@ -32,7 +32,7 @@
GCC: 4.0
Source: http://postgis.refractions.net/download/postgis-%v.tar.gz
-Source-MD5: 95430ee371c64a992ebcd8ddf2801acf
+Source-MD5: b0d52c2c23c316fc9884632a80b380a5
PatchScript: sed -e 's,@FINKPREFIX@,%p,g;
s,@FINKPGRAWVERSION@,%type_raw[postgresql],g;
s,@FINKPGVERSION@,%type_pkg[postgresql],g' %a/%{Ni}.patch | patch -p1
SetCPPFLAGS: -I%p/include/postgresql -I%p/include -fno-common
@@ -57,32 +57,33 @@
#!/bin/sh -ev
make -j1 install DESTDIR=%d
libdir=%p/lib/postgresql-%type_raw[postgresql]
LPATH="%p/lib/postgresql-%type_raw[postgresql]" datadir=%p/share/doc/%N
- mv %i/etc/postgis %i/etc/%N
- for file in createdb.postgis mktemplate_gis mktemplate_gis.sh pgsql2shp
postgis_env.sh postgres_lib.sh rmtemplate_gis rmtemplate_gis.sh shp2pgsql; do
+ for file in pgsql2shp shp2pgsql; do
mv %i/bin/$file %i/bin/$file-%type_raw[postgresql]
done
- for file in createdb.postgis.1 mktemplate_gis.1 rmtemplate_gis.1; do
- mv %I/share/man/man1/$file
%i/share/man/man1/$file-%type_raw[postgresql]
- done
<<
DocFiles: COPYING CREDITS ChangeLog NEWS README* TODO
SplitOff: <<
Package: %N-java
Depends: <<
jts,
- postgresql-java (>= %type_raw[postgresql]-1021)
+ postgresql-java (>= %type_raw[postgresql]-1)
<<
JarFiles: java/jdbc/postgis.jar java/pljava/postgis_pljava.jar
<<
PostInstScript: <<
- for file in createdb.postgis mktemplate_gis mktemplate_gis.sh pgsql2shp
postgis_env.sh postgres_lib.sh rmtemplate_gis rmtemplate_gis.sh shp2pgsql; do
+ for file in pgsql2shp shp2pgsql; do
%p/sbin/update-alternatives --install "%p/bin/$file" "$file"
"%p/bin/$file-%type_raw[postgresql]" %type_pkg[postgresql]
done
+
+ # obsolete, from the old package
+ for file in createdb.postgis mktemplate_gis mktemplate_gis.sh
postgis_env.sh postgres_lib.sh rmtemplate_gis rmtemplate_gis.sh; do
+ %p/sbin/update-alternatives --remove "$file"
"%p/bin/$file-%type_raw[postgresql]"
+ done
for file in createdb.postgis.1 mktemplate_gis.1 rmtemplate_gis.1; do
- %p/sbin/update-alternatives --install "%p/share/man/man1/$file"
"$file" "%p/bin/$file-%type_raw[postgresql]" %type_pkg[postgresql]
+ %p/sbin/update-alternatives --remove "$file"
"%p/bin/$file-%type_raw[postgresql]"
done
- %p/sbin/update-alternatives --install "%p/etc/%N" "postgis-default"
"%p/etc/%N" %type_pkg[postgresql]
+ %p/sbin/update-alternatives --remove "postgis-default" "%p/etc/%N"
cat <<EOF
Note: This package does not do anything until you add it's schema to
your database!
@@ -103,13 +104,9 @@
<<
PreRmScript: <<
if [ "$1" != "upgrade" ]; then
- for file in createdb.postgis mktemplate_gis mktemplate_gis.sh
pgsql2shp postgis_env.sh postgres_lib.sh rmtemplate_gis rmtemplate_gis.sh
shp2pgsql; do
+ for file in pgsql2shp shp2pgsql; do
%p/sbin/update-alternatives --remove "$file"
"%p/bin/$file-%type_raw[postgresql]"
done
- for file in createdb.postgis.1 mktemplate_gis.1
rmtemplate_gis.1; do
- %p/sbin/update-alternatives --remove "$file"
"%p/share/man/man1/$file-%type_raw[postgresql]"
- done
- %p/sbin/update-alternatives --remove "postgis-default"
"%p/etc/%N"
fi
<<
Index: postgresql82.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/database/postgresql82.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- postgresql82.patch 9 Aug 2007 21:58:23 -0000 1.1
+++ postgresql82.patch 15 Jan 2008 14:48:22 -0000 1.2
@@ -1,6 +1,6 @@
---- postgresql-8.2.2/contrib/Makefile 2006-09-09 00:07:51.000000000 -0400
-+++ postgresql-8.2.2-new/contrib/Makefile 2007-02-05 11:20:25.000000000
-0500
+--- postgresql-8.2.5/contrib/Makefile 2006-09-09 00:07:51.000000000 -0400
++++ postgresql-8.2.5-new/contrib/Makefile 2007-09-15 11:21:55.000000000
-0400
@@ -30,7 +30,8 @@
spi \
tablefunc \
@@ -11,8 +11,8 @@
ifeq ($(with_openssl),yes)
WANTED_DIRS += sslinfo
---- postgresql-8.2.2/pgsql.sh 1969-12-31 19:00:00.000000000 -0500
-+++ postgresql-8.2.2-new/pgsql.sh 2007-02-05 11:20:25.000000000 -0500
+--- postgresql-8.2.5/pgsql.sh 1969-12-31 19:00:00.000000000 -0500
++++ postgresql-8.2.5-new/pgsql.sh 2007-09-15 11:21:55.000000000 -0400
@@ -0,0 +1,52 @@
+#!/bin/sh
+
@@ -66,8 +66,8 @@
+ unset LC_ALL; LANG=C sudo -u postgres
"${PREFIX}/bin/pg_ctl-8.2" stop -D "$DATADIR" -m fast
+ ;;
+esac
---- postgresql-8.2.2/src/Makefile.global.in 2006-10-08 13:15:33.000000000
-0400
-+++ postgresql-8.2.2-new/src/Makefile.global.in 2007-02-05
11:20:25.000000000 -0500
+--- postgresql-8.2.5/src/Makefile.global.in 2006-10-08 13:15:33.000000000
-0400
++++ postgresql-8.2.5-new/src/Makefile.global.in 2007-09-15
11:21:55.000000000 -0400
@@ -73,14 +73,14 @@
datadir := @datadir@
ifeq "$(findstring pgsql, $(datadir))" ""
@@ -103,8 +103,8 @@
endif
endif
endif
---- postgresql-8.2.2/src/Makefile.shlib 2006-09-19 11:36:07.000000000
-0400
-+++ postgresql-8.2.2-new/src/Makefile.shlib 2007-02-05 11:20:25.000000000
-0500
+--- postgresql-8.2.5/src/Makefile.shlib 2006-09-19 11:36:07.000000000
-0400
++++ postgresql-8.2.5-new/src/Makefile.shlib 2007-09-15 11:21:55.000000000
-0400
@@ -107,11 +107,11 @@
ifeq ($(DLTYPE), library)
# linkable library
@@ -119,8 +119,8 @@
endif
shlib =
lib$(NAME).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)$(DLSUFFIX)
shlib_major = lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)
---- postgresql-8.2.2/src/backend/storage/file/fd.c 2006-11-06
12:10:22.000000000 -0500
-+++ postgresql-8.2.2-new/src/backend/storage/file/fd.c 2007-02-05
11:20:25.000000000 -0500
+--- postgresql-8.2.5/src/backend/storage/file/fd.c 2006-11-06
12:10:22.000000000 -0500
++++ postgresql-8.2.5-new/src/backend/storage/file/fd.c 2007-09-15
11:21:55.000000000 -0400
@@ -51,6 +51,7 @@
#include "storage/fd.h"
#include "storage/ipc.h"
@@ -151,8 +151,8 @@
thisfd = dup(0);
if (thisfd < 0)
{
---- postgresql-8.2.2/src/backend/utils/misc/postgresql.conf.sample
2007-01-20 16:42:06.000000000 -0500
-+++ postgresql-8.2.2-new/src/backend/utils/misc/postgresql.conf.sample
2007-02-05 11:20:25.000000000 -0500
+--- postgresql-8.2.5/src/backend/utils/misc/postgresql.conf.sample
2007-01-20 16:42:06.000000000 -0500
++++ postgresql-8.2.5-new/src/backend/utils/misc/postgresql.conf.sample
2007-09-15 11:21:55.000000000 -0400
@@ -73,7 +73,7 @@
# - Security & Authentication -
@@ -162,8 +162,8 @@
#password_encryption = on
#db_user_namespace = off
---- postgresql-8.2.2/src/bin/initdb/initdb.c 2006-10-04 14:58:08.000000000
-0400
-+++ postgresql-8.2.2-new/src/bin/initdb/initdb.c 2007-02-05
11:20:25.000000000 -0500
+--- postgresql-8.2.5/src/bin/initdb/initdb.c 2006-10-04 14:58:08.000000000
-0400
++++ postgresql-8.2.5-new/src/bin/initdb/initdb.c 2007-09-15
11:21:55.000000000 -0400
@@ -119,7 +119,7 @@
/* defaults */
@@ -211,18 +211,9 @@
QUOTE_PATH, bin_dir, (strlen(bin_dir) > 0) ? DIR_SEP : "",
QUOTE_PATH,
QUOTE_PATH, pg_data_native, QUOTE_PATH,
QUOTE_PATH, bin_dir, (strlen(bin_dir) > 0) ? DIR_SEP : "",
QUOTE_PATH,
---- postgresql-8.2.2/src/bin/pg_ctl/pg_ctl.c 2006-10-12 01:14:49.000000000
-0400
-+++ postgresql-8.2.2-new/src/bin/pg_ctl/pg_ctl.c 2007-02-05
11:20:25.000000000 -0500
-@@ -457,7 +457,7 @@
- for (i = 0; i < wait_seconds; i++)
- {
- if ((conn = PQsetdbLogin(NULL, portstr, NULL, NULL,
-- "postgres",
NULL, NULL)) != NULL &&
-+
"postgres-8.2", NULL, NULL)) != NULL &&
- (PQstatus(conn) == CONNECTION_OK ||
- (strcmp(PQerrorMessage(conn),
- PQnoPasswordSupplied) == 0)))
-@@ -557,7 +557,7 @@
+--- postgresql-8.2.5/src/bin/pg_ctl/pg_ctl.c 2007-07-02 17:58:38.000000000
-0400
++++ postgresql-8.2.5-new/src/bin/pg_ctl/pg_ctl.c 2007-09-15
11:21:55.000000000 -0400
+@@ -600,7 +600,7 @@
postmaster_path = pg_malloc(MAXPGPATH);
@@ -231,7 +222,7 @@
postmaster_path)) < 0)
{
char full_path[MAXPGPATH];
-@@ -566,13 +566,13 @@
+@@ -609,13 +609,13 @@
StrNCpy(full_path, progname, MAXPGPATH);
if (ret == -1)
@@ -247,7 +238,7 @@
"but was not the
same version as %s.\n"
"Check your
installation.\n"),
full_path, progname);
-@@ -913,10 +913,10 @@
+@@ -956,10 +956,10 @@
}
else
{
@@ -260,8 +251,8 @@
exit(1);
}
}
---- postgresql-8.2.2/src/interfaces/ecpg/compatlib/Makefile 2006-09-10
18:07:02.000000000 -0400
-+++ postgresql-8.2.2-new/src/interfaces/ecpg/compatlib/Makefile
2007-02-05 11:20:25.000000000 -0500
+--- postgresql-8.2.5/src/interfaces/ecpg/compatlib/Makefile 2006-09-10
18:07:02.000000000 -0400
++++ postgresql-8.2.5-new/src/interfaces/ecpg/compatlib/Makefile
2007-09-15 11:21:55.000000000 -0400
@@ -20,6 +20,7 @@
override CPPFLAGS := -I../include -I$(top_srcdir)/src/interfaces/ecpg/include
\
-I$(libpq_srcdir) -I$(top_srcdir)/src/include/utils $(CPPFLAGS)
@@ -270,8 +261,8 @@
SHLIB_LINK = -L../ecpglib -lecpg -L../pgtypeslib -lpgtypes $(libpq) -lm \
$(PTHREAD_LIBS)
---- postgresql-8.2.2/src/interfaces/ecpg/ecpglib/Makefile 2006-09-28
10:48:45.000000000 -0400
-+++ postgresql-8.2.2-new/src/interfaces/ecpg/ecpglib/Makefile 2007-02-05
11:20:25.000000000 -0500
+--- postgresql-8.2.5/src/interfaces/ecpg/ecpglib/Makefile 2006-09-28
10:48:45.000000000 -0400
++++ postgresql-8.2.5-new/src/interfaces/ecpg/ecpglib/Makefile 2007-09-15
11:21:55.000000000 -0400
@@ -20,6 +20,7 @@
override CPPFLAGS := -DFRONTEND \
-I../include -I$(top_srcdir)/src/interfaces/ecpg/include \
@@ -280,8 +271,8 @@
override CFLAGS += $(PTHREAD_CFLAGS)
# Need to recompile any libpgport object files
---- postgresql-8.2.2/src/interfaces/ecpg/test/Makefile.regress 2006-09-19
11:36:08.000000000 -0400
-+++ postgresql-8.2.2-new/src/interfaces/ecpg/test/Makefile.regress
2007-02-05 11:20:25.000000000 -0500
+--- postgresql-8.2.5/src/interfaces/ecpg/test/Makefile.regress 2006-09-19
11:36:08.000000000 -0400
++++ postgresql-8.2.5-new/src/interfaces/ecpg/test/Makefile.regress
2007-09-15 11:21:55.000000000 -0400
@@ -2,7 +2,7 @@
-I$(libpq_srcdir) $(CPPFLAGS)
override CFLAGS += $(PTHREAD_CFLAGS)
@@ -291,8 +282,8 @@
override LIBS := -lecpg -lpgtypes $(libpq) $(LIBS) $(PTHREAD_LIBS)
ECPG = ../../preproc/ecpg -I$(srcdir)/../../include
---- postgresql-8.2.2/src/makefiles/Makefile.darwin 2006-11-28
00:45:43.000000000 -0500
-+++ postgresql-8.2.2-new/src/makefiles/Makefile.darwin 2007-02-05
11:20:25.000000000 -0500
+--- postgresql-8.2.5/src/makefiles/Makefile.darwin 2006-11-28
00:45:43.000000000 -0500
++++ postgresql-8.2.5-new/src/makefiles/Makefile.darwin 2007-09-15
11:21:55.000000000 -0400
@@ -13,6 +13,6 @@
# Rule for building shared libs (currently used only for regression test
# shlib ... should go away, since this is not really enough knowledge)
@@ -301,8 +292,8 @@
+ $(CXX) $(CFLAGS) -bundle -undefined dynamic_lookup -o $@ $<
$(BE_DLLLIBS)
sqlmansect = 7
---- postgresql-8.2.2/src/template/darwin 2006-03-10 23:38:40.000000000
-0500
-+++ postgresql-8.2.2-new/src/template/darwin 2007-02-05 11:21:18.000000000
-0500
+--- postgresql-8.2.5/src/template/darwin 2006-03-10 23:38:40.000000000
-0500
++++ postgresql-8.2.5-new/src/template/darwin 2007-09-15 11:21:55.000000000
-0400
@@ -1,8 +1,5 @@
# $PostgreSQL: pgsql/src/template/darwin,v 1.10 2006/03/11 04:38:40 momjian
Exp $
Index: postgresql-java.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/database/postgresql-java.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- postgresql-java.info 9 Aug 2007 21:58:23 -0000 1.4
+++ postgresql-java.info 15 Jan 2008 14:48:22 -0000 1.5
@@ -1,6 +1,6 @@
Package: postgresql-java
Version: 8.2
-Revision: 1022
+Revision: 1023
Description: PostgreSQL Java library
Type: java(1.4)
License: BSD
@@ -24,16 +24,16 @@
<<
Recommends: postgresql82
-Source: http://jdbc.postgresql.org/download/postgresql-jdbc-%v-505.src.tar.gz
-Source-MD5: 2dc5f3b2204f1b47372f21da9f81920a
-SourceDirectory: postgresql-jdbc-%v-505.src
-PatchScript: perl -pi -e 's,<javac,<javac target="1.4" source="1.4",g'
build.xml
+Source: http://jdbc.postgresql.org/download/postgresql-jdbc-%v-506.src.tar.gz
+Source-MD5: 03a70fa9be032a63155982514590e9b4
+SourceDirectory: postgresql-jdbc-%v-506.src
+PatchScript: perl -pi -e 's,<javac,<javac target="1.4",g' build.xml
CompileScript: <<
#!/bin/sh -ev
export CLASSPATH=`pwd`/jars/postgresql.jar
- ant all publicapi privateapi
+ ant -Djava.specification.version=1.4 all publicapi privateapi
<<
InstallScript: <<
Index: postgresql-tcl.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/database/postgresql-tcl.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- postgresql-tcl.info 21 Oct 2007 16:00:52 -0000 1.5
+++ postgresql-tcl.info 15 Jan 2008 14:48:22 -0000 1.6
@@ -1,5 +1,5 @@
Package: postgresql-tcl
-Version: 8.2.4
+Version: 8.2.5
Revision: 1021
Description: PostgreSQL TCL tools
License: BSD
@@ -105,7 +105,7 @@
nam-US: ftp://ftp22.us.postgresql.org/mirrors/ftp.postgresql.org
<<
Source: mirror:custom:source/v%v/postgresql-%v.tar.bz2
-Source-MD5: af7ec100a33c41bfb8d87b5e0ec2f44a
+Source-MD5: bb1cd309ea72f070cb964736f5755847
Source2: http://gborg.postgresql.org/download/pgtclng/stable/pgtcl1.5.2.tar.gz
Source2-MD5: d19dfdcb54c334495d32456a043e0232
PatchScript: sed 's|@INSTPREFIX@|%p|g' < %a/postgresql82.patch | patch -p1
Index: postgresql74-unified.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/database/postgresql74-unified.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- postgresql74-unified.info 22 Jun 2007 21:24:48 -0000 1.2
+++ postgresql74-unified.info 15 Jan 2008 14:48:22 -0000 1.3
@@ -1,11 +1,12 @@
Package: postgresql74-unified
-Version: 7.4.17
-Revision: 1021
+Version: 7.4.18
+Revision: 1022
Description: PostgreSQL open-source database
License: BSD
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Depends: <<
+ fink-obsolete-packages,
daemonic (>= 20010902-1),
libxml2-shlibs,
libxslt-shlibs,
@@ -23,6 +24,7 @@
readline5,
system-openssl-dev
<<
+Provides: postgresql-server
Conflicts: <<
postgresql (<< %v-%r),
postgresql-ssl (<< %v-%r)
@@ -122,7 +124,7 @@
nam-US: ftp://ftp22.us.postgresql.org/mirrors/ftp.postgresql.org
<<
Source: mirror:custom:source/v%v/postgresql-%v.tar.bz2
-Source-MD5: cdb4b2cd37e9c26773cddeebfa960675
+Source-MD5: 94888d24c92c7a9f9d3f29e92e3cb926
PatchScript: sed -e 's|@BUILDDIR@|%b|g' -e 's|@INSTPREFIX@|%p|g' < %a/%n.patch
| patch -p1
SetMAKEFLAGS: -j1
@@ -333,7 +335,10 @@
SplitOff: <<
Package: %N-dev
Description: PostgreSQL development headers and libraries
- Depends: %N (>= %v-%r)
+ Depends: <<
+ %N (>= %v-%r),
+ fink-obsolete-packages
+ <<
Conflicts: <<
postgresql73-dev,
postgresql73-ssl-dev,
@@ -344,7 +349,8 @@
postgresql80-ssl-dev,
postgresql80-unified-dev,
postgresql81-dev,
- postgresql82-dev
+ postgresql82-dev,
+ postgresql83-dev
<<
Replaces: <<
postgresql73-dev,
@@ -357,7 +363,8 @@
postgresql80-unified-dev,
%N (<< %v-%r),
postgresql81-dev,
- postgresql82-dev
+ postgresql82-dev,
+ postgresql83-dev
<<
BuildDependsOnly: true
Files: <<
@@ -412,6 +419,23 @@
fink-obsolete-packages
<<
DocFiles: COPYRIGHT HISTORY INSTALL README
+ DescUsage: <<
+The package runs initdb on installation as the user 'postgres'.
+
+The best way to run it is using the supplied pgsql.sh script, i.e.
+'sudo pgsql.sh start'. Or, you can run
+'sudo daemonic enable %N' as root to create a
+StartupItem for it.
+
+Unless you set up admin users in the database, the easiest way to
+run psql commands with administrator access is to prefix them with
+the command "sudo -u postgres". This will ask you your administrator
+password, and then run the command as the postgres user.
+
+For example, to create a new database, you would run:
+
+ sudo -u postgres createdb mydb
+ <<
<<
SplitOff4: <<
Package: postgresql74-shlibs
@@ -443,6 +467,23 @@
fink-obsolete-packages
<<
DocFiles: COPYRIGHT HISTORY INSTALL README
+ DescUsage: <<
+The package runs initdb on installation as the user 'postgres'.
+
+The best way to run it is using the supplied pgsql.sh script, i.e.
+'sudo pgsql.sh start'. Or, you can run
+'sudo daemonic enable %N' as root to create a
+StartupItem for it.
+
+Unless you set up admin users in the database, the easiest way to
+run psql commands with administrator access is to prefix them with
+the command "sudo -u postgres". This will ask you your administrator
+password, and then run the command as the postgres user.
+
+For example, to create a new database, you would run:
+
+ sudo -u postgres createdb mydb
+ <<
<<
SplitOff7: <<
Package: postgresql74-ssl-shlibs
Index: postgresql-python-py.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/database/postgresql-python-py.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- postgresql-python-py.info 9 Aug 2007 21:58:23 -0000 1.10
+++ postgresql-python-py.info 15 Jan 2008 14:48:22 -0000 1.11
@@ -1,6 +1,6 @@
Info2: <<
Package: postgresql-python-py%type_pkg[python]
-Version: 8.2.4
+Version: 8.2.5
Revision: 1021
Distribution: (%type_pkg[python] = 23) 10.3, (%type_pkg[python] = 23) 10.4
Description: PostgreSQL Python tools
@@ -114,7 +114,7 @@
nam-US: ftp://ftp22.us.postgresql.org/mirrors/ftp.postgresql.org
<<
Source: mirror:custom:source/v%v/postgresql-%v.tar.bz2
-Source-MD5: af7ec100a33c41bfb8d87b5e0ec2f44a
+Source-MD5: bb1cd309ea72f070cb964736f5755847
Source2: ftp://ftp.druid.net/pub/distrib/PyGreSQL-3.8.1.tgz
Source2-MD5: 5575979dac93c9c5795d7693a8f91c86
PatchScript: sed -e 's|@INSTPREFIX@|%p|g' -e
's|python2.1|python%type_raw[python]|g' < %a/postgresql82.patch | patch -p1
Index: postgresql82.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/database/postgresql82.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- postgresql82.info 9 Aug 2007 21:58:23 -0000 1.1
+++ postgresql82.info 15 Jan 2008 14:48:22 -0000 1.2
@@ -1,6 +1,6 @@
Package: postgresql82
-Version: 8.2.4
-Revision: 1021
+Version: 8.2.5
+Revision: 1022
Description: PostgreSQL open-source database
License: BSD
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
@@ -22,6 +22,7 @@
readline5,
system-openssl-dev
<<
+Provides: postgresql-server
Conflicts: <<
postgresql (<< %v-%r),
postgresql-ssl (<< %v-%r)
@@ -121,7 +122,7 @@
nam-US: ftp://ftp22.us.postgresql.org/mirrors/ftp.postgresql.org
<<
Source: mirror:custom:source/v%v/postgresql-%v.tar.bz2
-Source-MD5: af7ec100a33c41bfb8d87b5e0ec2f44a
+Source-MD5: bb1cd309ea72f070cb964736f5755847
PatchScript: <<
sed -e 's|@BUILDDIR@|%b|g' -e 's|@INSTPREFIX@|%p|g' < %a/%n.patch |
patch -p1
perl -pi -e 's,^enum,static enum,' contrib/pgcrypto/pgp.h
@@ -340,7 +341,8 @@
postgresql80-dev,
postgresql80-ssl-dev,
postgresql80-unified-dev,
- postgresql81-dev
+ postgresql81-dev,
+ postgresql83-dev
<<
Replaces: <<
postgresql73-dev,
@@ -352,7 +354,8 @@
postgresql80-dev,
postgresql80-ssl-dev,
postgresql80-unified-dev,
- postgresql81-dev
+ postgresql81-dev,
+ postgresql83-dev
<<
BuildDependsOnly: true
Files: <<
Index: postgresql80-unified.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/database/postgresql80-unified.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- postgresql80-unified.info 9 Aug 2007 21:58:23 -0000 1.5
+++ postgresql80-unified.info 15 Jan 2008 14:48:22 -0000 1.6
@@ -1,6 +1,6 @@
Package: postgresql80-unified
-Version: 8.0.13
-Revision: 1021
+Version: 8.0.14
+Revision: 1022
Description: PostgreSQL open-source database
License: BSD
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
@@ -23,6 +23,7 @@
readline5,
system-openssl-dev
<<
+Provides: postgresql-server
Conflicts: <<
postgresql (<< %v-%r),
postgresql-ssl (<< %v-%r),
@@ -130,7 +131,7 @@
nam-US: ftp://ftp22.us.postgresql.org/mirrors/ftp.postgresql.org
<<
Source: mirror:custom:source/v%v/postgresql-%v.tar.bz2
-Source-MD5: cf613b96cd04137f2f5fe1be9141ad49
+Source-MD5: 64aaa4415e8022366e7ec82aa76ab2f2
PatchScript: sed -e 's|@BUILDDIR@|%b|g' -e 's|@INSTPREFIX@|%p|g' < %a/%n.patch
| patch -p1
SetMAKEFLAGS: -j1
@@ -357,7 +358,8 @@
postgresql80-dev (<< %v-%r),
postgresql80-ssl-dev (<< %v-%r),
postgresql81-dev,
- postgresql82-dev
+ postgresql82-dev,
+ postgresql83-dev
<<
Replaces: <<
postgresql-dev,
@@ -375,7 +377,8 @@
postgresql74-ssl-shlibs,
postgresql74-unified-shlibs,
postgresql81-dev,
- postgresql82-dev
+ postgresql82-dev,
+ postgresql83-dev
<<
BuildDependsOnly: true
Files: <<
@@ -433,6 +436,23 @@
fink-obsolete-packages
<<
DocFiles: COPYRIGHT HISTORY INSTALL README
+ DescUsage: <<
+The package runs initdb on installation as the user 'postgres'.
+
+The best way to run it is using the supplied pgsql.sh script, i.e.
+'sudo pgsql.sh start'. Or, you can run
+'sudo daemonic enable %N' as root to create a
+StartupItem for it.
+
+Unless you set up admin users in the database, the easiest way to
+run psql commands with administrator access is to prefix them with
+the command "sudo -u postgres". This will ask you your administrator
+password, and then run the command as the postgres user.
+
+For example, to create a new database, you would run:
+
+ sudo -u postgres createdb mydb
+ <<
<<
SplitOff4: <<
Package: postgresql80-dev
@@ -464,6 +484,23 @@
fink-obsolete-packages
<<
DocFiles: COPYRIGHT HISTORY INSTALL README
+ DescUsage: <<
+The package runs initdb on installation as the user 'postgres'.
+
+The best way to run it is using the supplied pgsql.sh script, i.e.
+'sudo pgsql.sh start'. Or, you can run
+'sudo daemonic enable %N' as root to create a
+StartupItem for it.
+
+Unless you set up admin users in the database, the easiest way to
+run psql commands with administrator access is to prefix them with
+the command "sudo -u postgres". This will ask you your administrator
+password, and then run the command as the postgres user.
+
+For example, to create a new database, you would run:
+
+ sudo -u postgres createdb mydb
+ <<
<<
SplitOff7: <<
Package: postgresql80-ssl-dev
Index: postgis.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/database/postgis.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- postgis.patch 9 Aug 2007 21:58:23 -0000 1.1
+++ postgis.patch 15 Jan 2008 14:48:22 -0000 1.2
@@ -1,108 +1,87 @@
---- postgis-1.2.1/extras/template_gis/Makefile 2007-01-04 19:52:57.000000000
-0500
-+++ postgis-1.2.1-new/extras/template_gis/Makefile 2007-02-05
16:51:50.000000000 -0500
-@@ -19,8 +19,7 @@
- SCRIPT_INSTALL=$(INSTALL_BIN) $(SCRIPT) $(SCRIPT_TARGET)
- SCRIPT_LINKDIR=$(DESTDIR)$(prefix)/bin
- SCRIPT_LINK=$(SCRIPT_LINKDIR)/$(SCRIPT)
--SCRIPT_DOLINK=rm -f $(SCRIPT_LINK); \
-- $(LN_S) $(SCRIPT_TARGET) $(SCRIPT_LINKDIR)
-+SCRIPT_DOLINK= install -c -m 755 $(SCRIPT_LINK) $(SCRIPT_TARGETDIR)
- SCRIPT_UNINSTALL=rm -f $(SCRIPT_TARGET)
- SCRIPT_UNLINK=rm -f $(SCRIPT_LINK)
+--- postgis-1.3.2/README.postgis 2007-12-02 15:37:13.000000000 -0500
++++ postgis-1.3.2-new/README.postgis 2007-12-12 08:50:57.000000000 -0500
+@@ -143,8 +143,8 @@
-@@ -31,7 +30,7 @@
- MAN1_INSTALL=$(INSTALL_DATA) $(MAN1) $(MAN1_TARGET)
- MAN1_UNINSTALL=rm -f $(MAN1_TARGET)
+ So, as postgres run:
--DEFAULTS_DIR=$(DESTDIR)/etc/default
-+DEFAULTS_DIR=$(DESTDIR)@FINKPREFIX@/etc
- SCRIPT_DEFAULTS=$(DEFAULTS_DIR)/postgis
+- createlang plpgsql yourdatabase
+- psql -f lwpostgis.sql -d your_database
++ [EMAIL PROTECTED]@ plpgsql yourdatabase
++ [EMAIL PROTECTED]@ -f lwpostgis.sql -d your_database
- all: $(SCRIPTS_IN)
-@@ -41,7 +40,6 @@
- @mkdir -p $(SCRIPT_TARGETDIR)
- @mkdir -p $(SCRIPT_LINKDIR)
- $(foreach SCRIPT, $(SCRIPTS), $(SCRIPT_INSTALL);)
-- $(foreach SCRIPT, $(PUBLIC_SCRIPTS), $(SCRIPT_DOLINK);)
- @mkdir -p $(DEFAULTS_DIR)
- cp profile $(SCRIPT_DEFAULTS)
- rm -f $(SCRIPT_TARGETDIR)/profile
---- postgis-1.2.1/extras/template_gis/createdb.postgis.1 2006-05-31
02:43:12.000000000 -0400
-+++ postgis-1.2.1-new/extras/template_gis/createdb.postgis.1 2007-02-05
15:57:32.000000000 -0500
+ Your database should now be spatially enabled.
+
+@@ -166,7 +166,7 @@
+ Soft upgrade consists of sourcing the lwpostgis_upgrade.sql
+ script in your spatial database:
+
+- psql -f lwpostgis_upgrade.sql -d your_spatial_database
++ [EMAIL PROTECTED]@ -f lwpostgis_upgrade.sql -d your_spatial_database
+
+ If a soft upgrade is not possible the script will abort and
+ you will be warned about HARD UPGRADE being required,
+@@ -187,7 +187,7 @@
+
+ # Create a "custom-format" dump of the database you want
+ # to upgrade (let's call it "olddb")
+- $ pg_dump -Fc olddb olddb.dump
++ $ [EMAIL PROTECTED]@ -Fc olddb olddb.dump
+
+ # Restore the dump while upgrading postgis into
+ # a new database.
+@@ -204,9 +204,9 @@
+ # drop the attrelid, varattnum and stats columns in the geometry_columns
+ # table, which are no-more needed. Keeping them won't hurt.
+ # !!! DROPPING THEM WHEN REALLY NEEDED WILL DO HARM !!!!
+- $ psql newdb -c "ALTER TABLE geometry_columns DROP attrelid"
+- $ psql newdb -c "ALTER TABLE geometry_columns DROP varattnum"
+- $ psql newdb -c "ALTER TABLE geometry_columns DROP stats"
++ $ [EMAIL PROTECTED]@ newdb -c "ALTER TABLE geometry_columns DROP
attrelid"
++ $ [EMAIL PROTECTED]@ newdb -c "ALTER TABLE geometry_columns DROP
varattnum"
++ $ [EMAIL PROTECTED]@ newdb -c "ALTER TABLE geometry_columns DROP stats"
+
+ # The spatial_ref_sys table is restored from the dump, to
+ # ensure your custom additions are kept, but the distributed
+@@ -214,7 +214,7 @@
+ # entries, drop the table and source the new one.
+ # If you did make additions we assume you know how to backup them before
+ # upgrading the table. Replace it with the new like this:
+- $ psql newdb
++ $ [EMAIL PROTECTED]@ newdb
+ newdb=> DELETE FROM spatial_ref_sys;
+ DROP
+ newdb=> \i spatial_ref_sys.sql
+--- postgis-1.3.2/extras/template_gis/createdb.postgis.1 2006-05-31
02:43:12.000000000 -0400
++++ postgis-1.3.2-new/extras/template_gis/createdb.postgis.1 2007-12-12
08:46:50.000000000 -0500
@@ -43,7 +43,7 @@
.LP
The environment variables for template_gis creation, removal and usage may be
stored in files, as follows:
.TP
-.B /etc/default/postgis
-+.B @FINKPREFIX@/etc/postgis
++.B @FINKPREFIX@/etc/default/postgis
will designate default values for the whole system.
.TP
.B $HOME/.postgis/profile
---- postgis-1.2.1/extras/template_gis/createdb.postgis.in 2006-05-31
02:43:12.000000000 -0400
-+++ postgis-1.2.1-new/extras/template_gis/createdb.postgis.in 2007-02-05
16:23:01.000000000 -0500
-@@ -5,7 +5,7 @@
- # but the specified owner will not have
- # extra privileges on objects in the template. see createdb.postgis(1)
-
--source @bindir@/postgis_env.sh
-+source @bindir@/[EMAIL PROTECTED]@
-
- for ARGVN in $1 $2 ; do
- if [ `expr substr $ARGVN 1 11` = "--template=" ]; then
---- postgis-1.2.1/extras/template_gis/mktemplate_gis.1 2006-05-31
02:43:12.000000000 -0400
-+++ postgis-1.2.1-new/extras/template_gis/mktemplate_gis.1 2007-02-05
15:57:36.000000000 -0500
+--- postgis-1.3.2/extras/template_gis/mktemplate_gis.1 2006-05-31
02:43:12.000000000 -0400
++++ postgis-1.3.2-new/extras/template_gis/mktemplate_gis.1 2007-12-12
08:46:43.000000000 -0500
@@ -89,7 +89,7 @@
.LP
The environment variables for template_gis creation, removal and usage may be
stored in files, as follows:
.TP
-.B /etc/default/postgis
-+.B @FINKPREFIX@/etc/postgis
++.B @FINKPREFIX@/etc/default/postgis
will designate default values for the whole system.
.TP
.B $HOME/.postgis/profile
---- postgis-1.2.1/extras/template_gis/mktemplate_gis.in 2006-05-31
02:43:12.000000000 -0400
-+++ postgis-1.2.1-new/extras/template_gis/mktemplate_gis.in 2007-02-05
16:23:17.000000000 -0500
-@@ -3,7 +3,7 @@
- #create a template database, named template_gis by default,
- #and grant ownership or full privileges to the postgis tables to a user,
postgres by default
-
--source @bindir@/postgis_env.sh
-+source @bindir@/[EMAIL PROTECTED]@
-
- for ARGVN in $1 $2 $3 $4 $5 $6 ; do
- if [ `expr substr $ARGVN 1 7` = "--user=" ]; then
-@@ -59,9 +59,9 @@
- SCRIPTS="${SCRIPTS} ${TMPTOPO}"
- fi
-
--source @bindir@/postgres_lib.sh
-+source @bindir@/[EMAIL PROTECTED]@
-
- sudo_dba DBAUSER
-
- export SCRIPTS GRTABLES GRSCHEMAS GRUSER DBAUSER TDB
--$SUDO -c "@bindir@/mktemplate_gis.sh"
-+$SUDO -c "@bindir@/[EMAIL PROTECTED]@"
---- postgis-1.2.1/extras/template_gis/mktemplate_gis.sh.in 2006-05-31
02:43:12.000000000 -0400
-+++ postgis-1.2.1-new/extras/template_gis/mktemplate_gis.sh.in 2007-02-05
16:23:22.000000000 -0500
-@@ -6,7 +6,7 @@
-
- cd /tmp
-
--source @bindir@/postgres_lib.sh
-+source @bindir@/[EMAIL PROTECTED]@
-
- check_dba $DBAUSER
- template_rm $TDB
---- postgis-1.2.1/extras/template_gis/postgis_env.sh.in 2006-05-31
02:43:12.000000000 -0400
-+++ postgis-1.2.1-new/extras/template_gis/postgis_env.sh.in 2007-02-05
16:23:30.000000000 -0500
+--- postgis-1.3.2/extras/template_gis/postgis_env.sh.in 2006-05-31
02:43:12.000000000 -0400
++++ postgis-1.3.2-new/extras/template_gis/postgis_env.sh.in 2007-12-12
08:46:32.000000000 -0500
@@ -3,7 +3,7 @@
# environment variables for postgis
#read optional configuration files. last prevails
-for file in "/etc/default/postgis" "$HOME/.postgis/profile" ; do
-+for file in "@FINKPREFIX@/etc/[EMAIL PROTECTED]@" "@FINKPREFIX@/etc/postgis"
"$HOME/.postgis/profile" ; do
++for file in "@FINKPREFIX@/etc/default/postgis" "$HOME/.postgis/profile" ; do
if [ -f "$file" ]; then
tmpval=`grep "^TEMPLATEDB=" $file | cut -d= -f2`
if [ -n "$tmpval" ]; then
@@ -121,8 +100,8 @@
fi
fi
---- postgis-1.2.1/extras/template_gis/postgres_lib.sh.in 2006-05-31
02:43:12.000000000 -0400
-+++ postgis-1.2.1-new/extras/template_gis/postgres_lib.sh.in 2007-02-05
16:25:51.000000000 -0500
+--- postgis-1.3.2/extras/template_gis/postgres_lib.sh.in 2006-05-31
02:43:12.000000000 -0400
++++ postgis-1.3.2-new/extras/template_gis/postgres_lib.sh.in 2007-12-12
08:51:30.000000000 -0500
@@ -39,9 +39,9 @@
echo "you may be not allowed to do so (maybe wrong password)."
exit 1
@@ -217,77 +196,32 @@
else
echo "$db_create"
fi
---- postgis-1.2.1/extras/template_gis/profile 2006-06-09 02:03:59.000000000
-0400
-+++ postgis-1.2.1-new/extras/template_gis/profile 2007-02-05
15:57:22.000000000 -0500
+--- postgis-1.3.2/extras/template_gis/profile 2006-06-09 02:03:59.000000000
-0400
++++ postgis-1.3.2-new/extras/template_gis/profile 2007-12-12
08:43:29.000000000 -0500
@@ -1,6 +1,6 @@
#those are the default variables for postgresql-postgis.
-#this file will be scanned from /etc/default/postgis,
-+#this file will be scanned from @FINKPREFIX@/etc/postgis,
++#this file will be scanned from @FINKPREFIX@/etc/default/postgis,
#and then from $HOME/postgis/profile
#values should NOT be in quotes
---- postgis-1.2.1/extras/template_gis/rmtemplate_gis.1 2006-05-31
02:43:12.000000000 -0400
-+++ postgis-1.2.1-new/extras/template_gis/rmtemplate_gis.1 2007-02-05
15:58:13.000000000 -0500
+--- postgis-1.3.2/extras/template_gis/rmtemplate_gis.1 2006-05-31
02:43:12.000000000 -0400
++++ postgis-1.3.2-new/extras/template_gis/rmtemplate_gis.1 2007-12-12
08:43:15.000000000 -0500
@@ -45,7 +45,7 @@
.LP
The environment variables for template_gis creation, removal and usage may be
stored in files, as follows:
.TP
-.B /etc/default/postgis
-+.B @FINKPREFIX@/etc/postgis
++.B @FINKPREFIX@/etc/default/postgis
will designate default values for the whole system.
.TP
.B $HOME/.postgis/profile
---- postgis-1.2.1/extras/template_gis/rmtemplate_gis.in 2006-05-31
02:43:12.000000000 -0400
-+++ postgis-1.2.1-new/extras/template_gis/rmtemplate_gis.in 2007-02-05
16:26:10.000000000 -0500
-@@ -3,7 +3,7 @@
- #drop template_gis
- #it may be used to drop any postgresql template, by supplying argument
-
--source @bindir@/postgis_env.sh
-+source @bindir@/[EMAIL PROTECTED]@
-
- for ARGVN in $1 $2 $3 $4 ; do
- if [ `expr substr $ARGVN 1 11` = "--template=" ]; then
-@@ -21,9 +21,9 @@
- fi
- done
-
--source @bindir@/postgres_lib.sh
-+source @bindir@/[EMAIL PROTECTED]@
-
- sudo_dba $DBAUSER
-
- export DBAUSER TDB
--$SUDO -c "@bindir@/rmtemplate_gis.sh"
-+$SUDO -c "@bindir@/[EMAIL PROTECTED]@"
---- postgis-1.2.1/extras/template_gis/rmtemplate_gis.sh.in 2006-05-31
02:43:12.000000000 -0400
-+++ postgis-1.2.1-new/extras/template_gis/rmtemplate_gis.sh.in 2007-02-05
16:26:15.000000000 -0500
-@@ -6,7 +6,7 @@
-
- cd /tmp
-
--source @bindir@/postgres_lib.sh
-+source @bindir@/[EMAIL PROTECTED]@
-
- check_dba $DBAUSER
- template_rm $TDB
---- postgis-1.2.1/java/jdbc/Makefile 2007-01-08 05:12:01.000000000 -0500
-+++ postgis-1.2.1-new/java/jdbc/Makefile 2007-02-05 14:22:41.000000000
-0500
-@@ -27,7 +27,7 @@
-
- # Configure the helper executables used during build.
-
--JAVAC?=javac -target 1.2 -source 1.2
-+JAVAC?=javac -target 1.4 -source 1.2
- JAVA?=java
- JAR?=jar
- MKDIR?=mkdir -p
---- postgis-1.2.1/lwgeom/lwgeom_gml.c 2006-01-09 10:55:55.000000000 -0500
-+++ postgis-1.2.1-new/lwgeom/lwgeom_gml.c 2007-02-05 14:25:59.000000000
-0500
-@@ -38,10 +38,10 @@
+--- postgis-1.3.2/lwgeom/lwgeom_gml.c 2007-10-10 17:27:51.000000000 -0400
++++ postgis-1.3.2-new/lwgeom/lwgeom_gml.c 2007-12-12 09:15:30.000000000
-0500
+@@ -51,10 +51,10 @@
+ static char *getSRSbySRID(int SRID);
- #define DEF_PRECISION 15
/* Add dot, sign, exponent sign, 'e', exponent digits */
-#define SHOW_DIGS (precision + 8)
+#define SHOW_DIGS (gml_precision + 8)
@@ -298,28 +232,18 @@
/**
-@@ -58,7 +58,7 @@
- char *srs;
- int SRID;
-
-- precision = DEF_PRECISION;
-+ gml_precision = DEF_PRECISION;
-
- if ( PG_ARGISNULL(0) ) PG_RETURN_NULL();
-
-@@ -66,9 +66,9 @@
+@@ -85,8 +85,8 @@
+ geom = (PG_LWGEOM *)PG_DETOAST_DATUM(PG_GETARG_DATUM(1));
- /* Get precision (if provided) */
- if ( PG_NARGS() > 1 && ! PG_ARGISNULL(1) )
-- precision = PG_GETARG_INT32(1);
-+ gml_precision = PG_GETARG_INT32(1);
-
+ /* Get precision */
+- precision = PG_GETARG_INT32(2);
- if ( precision < 1 || precision > 15 )
++ gml_precision = PG_GETARG_INT32(2);
+ if ( gml_precision < 1 || gml_precision > 15 )
{
elog(ERROR, "Precision out of range 1..15");
PG_RETURN_NULL();
-@@ -424,8 +424,8 @@
+@@ -440,8 +440,8 @@
getPoint2d_p(pa, i, &pt);
if ( i ) ptr += sprintf(ptr, " ");
ptr += sprintf(ptr, "%.*g,%.*g",
@@ -330,7 +254,7 @@
}
}
else
-@@ -436,9 +436,9 @@
+@@ -452,9 +452,9 @@
getPoint4d_p(pa, i, &pt);
if ( i ) ptr += sprintf(ptr, " ");
ptr += sprintf(ptr, "%.*g,%.*g,%.*g",
@@ -343,9 +267,33 @@
}
}
---- postgis-1.2.1/lwgeom/lwgeom_kml.c 2006-12-15 05:48:56.000000000 -0500
-+++ postgis-1.2.1-new/lwgeom/lwgeom_kml.c 2007-02-05 14:25:32.000000000
-0500
-@@ -38,10 +38,10 @@
+@@ -798,8 +798,8 @@
+ getPoint2d_p(pa, i, &pt);
+ if ( i ) ptr += sprintf(ptr, " ");
+ ptr += sprintf(ptr, "%.*g %.*g",
+- precision, pt.x,
+- precision, pt.y);
++ gml_precision, pt.x,
++ gml_precision, pt.y);
+ }
+ }
+ else
+@@ -810,9 +810,9 @@
+ getPoint4d_p(pa, i, &pt);
+ if ( i ) ptr += sprintf(ptr, " ");
+ ptr += sprintf(ptr, "%.*g %.*g,%.*g",
+- precision, pt.x,
+- precision, pt.y,
+- precision, pt.z);
++ gml_precision, pt.x,
++ gml_precision, pt.y,
++ gml_precision, pt.z);
+ }
+ }
+
+--- postgis-1.3.2/lwgeom/lwgeom_kml.c 2007-10-22 20:19:54.000000000 -0400
++++ postgis-1.3.2-new/lwgeom/lwgeom_kml.c 2007-12-12 09:14:49.000000000
-0500
+@@ -40,10 +40,10 @@
#define DEF_PRECISION 15
/* Add dot, sign, exponent sign, 'e', exponent digits */
@@ -358,7 +306,7 @@
/**
-@@ -58,7 +58,7 @@
+@@ -60,7 +60,7 @@
char *srs;
int SRID;
@@ -367,7 +315,7 @@
if ( PG_ARGISNULL(0) ) PG_RETURN_NULL();
-@@ -66,9 +66,9 @@
+@@ -68,9 +68,9 @@
/* Get precision (if provided) */
if ( PG_NARGS() > 1 && ! PG_ARGISNULL(1) )
@@ -379,7 +327,7 @@
{
elog(ERROR, "Precision out of range 1..15");
PG_RETURN_NULL();
-@@ -409,8 +409,8 @@
+@@ -411,8 +411,8 @@
getPoint2d_p(pa, i, &pt);
if ( i ) ptr += sprintf(ptr, " ");
ptr += sprintf(ptr, "%.*g,%.*g,0",
@@ -390,7 +338,7 @@
}
}
else
-@@ -421,9 +421,9 @@
+@@ -423,9 +423,9 @@
getPoint4d_p(pa, i, &pt);
if ( i ) ptr += sprintf(ptr, " ");
ptr += sprintf(ptr, "%.*g,%.*g,%.*g",
@@ -403,3 +351,57 @@
}
}
+--- postgis-1.3.2/utils/postgis_restore.pl 2006-11-20 07:59:55.000000000
-0500
++++ postgis-1.3.2-new/utils/postgis_restore.pl 2007-12-12 08:48:53.000000000
-0500
+@@ -375,7 +375,7 @@
+ #
+ print "Scanning $dump list\n";
+ open( OUTPUT, ">$dumplist") || die "Can't write to ".$dump.".list\n";
+-open( INPUT, "pg_restore -l $dump |") || die "Couldn't run pg_restore -l
$dump\n";
++open( INPUT, "[EMAIL PROTECTED]@ -l $dump |") || die "Couldn't run [EMAIL
PROTECTED]@ -l $dump\n";
+ while( my $line = <INPUT> )
+ {
+ next if $line =~ /^;/;
+@@ -613,7 +613,7 @@
+ close(OUTPUT);
+
+ print "Producing ascii dump $dumpascii\n";
+-open( INPUT, "pg_restore -L $dumplist $dump |") || die "Can't run
pg_restore\n";
++open( INPUT, "[EMAIL PROTECTED]@ -L $dumplist $dump |") || die "Can't run
pg_restore\n";
+ open( OUTPUT, ">$dumpascii") || die "Can't write to $dumpascii\n";
+ while( my $line = <INPUT> )
+ {
+@@ -673,7 +673,7 @@
+ # when implemented operators skip must be disabled
+ # in the first scan of ToC
+ }
+-close(INPUT) || die "pg_restore call failed\n";
++close(INPUT) || die "[EMAIL PROTECTED]@ call failed\n";
+ close(OUTPUT);
+
+ #exit(1);
+@@ -682,15 +682,15 @@
+ # Create the new db and install plpgsql language
+ #
+ print "Creating db ($dbname)\n";
+-`createdb $createdb_opt $dbname`;
[EMAIL PROTECTED]@ $createdb_opt $dbname`;
+ die "Database creation failed\n" if ($?);
+ print "Adding plpgsql\n";
+-`createlang plpgsql $dbname`;
[EMAIL PROTECTED]@ plpgsql $dbname`;
+
+ #
+ # Open a pipe to the SQL monitor
+ #
+-open( PSQL, "| psql -a $dbname") || die "Can't run psql\n";
++open( PSQL, "| [EMAIL PROTECTED]@ -a $dbname") || die "Can't run psql\n";
+
+ #
+ # Source new postgis.sql
+@@ -717,4 +717,4 @@
+ open(INPUT, "<$dumpascii") || die "Can't read $postgissql\n";
+ while(<INPUT>) { print PSQL; }
+ close(INPUT);
+-close(PSQL) || die "psql run failed\n"
++close(PSQL) || die "[EMAIL PROTECTED]@ run failed\n"
Index: postgresql-perl.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/database/postgresql-perl.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- postgresql-perl.info 9 Aug 2007 21:58:23 -0000 1.7
+++ postgresql-perl.info 15 Jan 2008 14:48:22 -0000 1.8
@@ -1,6 +1,6 @@
Info2: <<
Package: postgresql-perl-%type_pkg[perl]
-Version: 8.2.4
+Version: 8.2.5
Revision: 1021
Architecture: (%type_pkg[perl] = 581) powerpc, (%type_pkg[perl] = 584) powerpc
Distribution: (%type_pkg[perl] = 581) 10.3, (%type_pkg[perl] = 581) 10.4,
(%type_pkg[perl] = 584) 10.3, (%type_pkg[perl] = 584) 10.4
@@ -113,7 +113,7 @@
nam-US: ftp://ftp22.us.postgresql.org/mirrors/ftp.postgresql.org
<<
Source: mirror:custom:source/v%v/postgresql-%v.tar.bz2
-Source-MD5: af7ec100a33c41bfb8d87b5e0ec2f44a
+Source-MD5: bb1cd309ea72f070cb964736f5755847
Source2: ftp://gborg.postgresql.org/pub/pgperl/stable/Pg-2.1.1.tar.gz
Source2-MD5: c11c0abd99b8e1f50ba5dbdb922c2e61
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
