Author: ranger
Date: Wed Dec 12 15:20:45 2007
New Revision: 1075
URL:
http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1075&repname=user%3a+ranger
Log:
various database package updates
Removed:
trunk/experimental/common/main/finkinfo/database/postgresql73-unified.info
trunk/experimental/common/main/finkinfo/database/postgresql73-unified.patch
Modified:
trunk/experimental/10.4/main/finkinfo/database/postgis.info
trunk/experimental/10.4/main/finkinfo/database/postgis.patch
trunk/experimental/10.4/main/finkinfo/database/postgresql74-unified.info
trunk/experimental/10.4/main/finkinfo/database/postgresql80-unified.info
trunk/experimental/10.4/main/finkinfo/database/postgresql81.info
trunk/experimental/10.4/main/finkinfo/database/postgresql82.info
trunk/experimental/common/main/finkinfo/database/postgis.info
trunk/experimental/common/main/finkinfo/database/postgis.patch
trunk/experimental/common/main/finkinfo/database/postgresql74-unified.info
trunk/experimental/common/main/finkinfo/database/postgresql80-unified.info
trunk/experimental/common/main/finkinfo/database/postgresql81.info
trunk/experimental/common/main/finkinfo/database/postgresql82.info
Modified: trunk/experimental/10.4/main/finkinfo/database/postgis.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/database/postgis.info&rev=1075&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/database/postgis.info (original)
+++ trunk/experimental/10.4/main/finkinfo/database/postgis.info Wed Dec 12
15:20:45 2007
@@ -1,6 +1,6 @@
Info2: <<
Package: postgis%type_pkg[postgresql]
-Version: 1.3.1
+Version: 1.3.2
Revision: 1
Description: PostgreSQL geographic object support
Type: postgresql (7.4 8.0 8.1 8.2)
@@ -32,7 +32,7 @@
GCC: 4.0
Source: http://postgis.refractions.net/download/postgis-%v.tar.gz
-Source-MD5: dd90f80072fc3e32d3a3eb580542bda1
+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
Modified: trunk/experimental/10.4/main/finkinfo/database/postgis.patch
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/database/postgis.patch&rev=1075&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/database/postgis.patch (original)
+++ trunk/experimental/10.4/main/finkinfo/database/postgis.patch Wed Dec 12
15:20:45 2007
@@ -1,99 +1,87 @@
---- postgis-1.3.1/extras/template_gis/Makefile 2007-03-01 03:31:44.000000000
-0500
-+++ postgis-1.3.1-new/extras/template_gis/Makefile 2007-09-18
10:46:24.000000000 -0400
-@@ -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)
-
-@@ -42,7 +41,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.3.1/extras/template_gis/createdb.postgis.1 2006-05-31
02:43:12.000000000 -0400
-+++ postgis-1.3.1-new/extras/template_gis/createdb.postgis.1 2007-09-18
10:46:24.000000000 -0400
+--- 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 @@
+
+ So, as postgres run:
+
+- createlang plpgsql yourdatabase
+- psql -f lwpostgis.sql -d your_database
++ [EMAIL PROTECTED]@ plpgsql yourdatabase
++ [EMAIL PROTECTED]@ -f lwpostgis.sql -d your_database
+
+ 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.3.1/extras/template_gis/createdb.postgis.in 2006-05-31
02:43:12.000000000 -0400
-+++ postgis-1.3.1-new/extras/template_gis/createdb.postgis.in 2007-09-18
10:46:24.000000000 -0400
-@@ -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.3.1/extras/template_gis/mktemplate_gis.1 2006-05-31
02:43:12.000000000 -0400
-+++ postgis-1.3.1-new/extras/template_gis/mktemplate_gis.1 2007-09-18
10:46:24.000000000 -0400
+--- 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.3.1/extras/template_gis/mktemplate_gis.in 2006-05-31
02:43:12.000000000 -0400
-+++ postgis-1.3.1-new/extras/template_gis/mktemplate_gis.in 2007-09-18
10:46:24.000000000 -0400
-@@ -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.3.1/extras/template_gis/mktemplate_gis.sh.in 2006-05-31
02:43:12.000000000 -0400
-+++ postgis-1.3.1-new/extras/template_gis/mktemplate_gis.sh.in 2007-09-18
10:46:24.000000000 -0400
-@@ -6,7 +6,7 @@
-
- cd /tmp
-
--source @bindir@/postgres_lib.sh
-+source @bindir@/[EMAIL PROTECTED]@
-
- check_dba $DBAUSER
- template_rm $TDB
---- postgis-1.3.1/extras/template_gis/postgis_env.sh.in 2006-05-31
02:43:12.000000000 -0400
-+++ postgis-1.3.1-new/extras/template_gis/postgis_env.sh.in 2007-09-18
10:46:24.000000000 -0400
+--- 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
@@ -112,8 +100,8 @@
fi
fi
---- postgis-1.3.1/extras/template_gis/postgres_lib.sh.in 2006-05-31
02:43:12.000000000 -0400
-+++ postgis-1.3.1-new/extras/template_gis/postgres_lib.sh.in 2007-09-18
10:46:24.000000000 -0400
+--- 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
@@ -208,77 +196,32 @@
else
echo "$db_create"
fi
---- postgis-1.3.1/extras/template_gis/profile 2006-06-09 02:03:59.000000000
-0400
-+++ postgis-1.3.1-new/extras/template_gis/profile 2007-09-18
10:46:24.000000000 -0400
+--- 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.3.1/extras/template_gis/rmtemplate_gis.1 2006-05-31
02:43:12.000000000 -0400
-+++ postgis-1.3.1-new/extras/template_gis/rmtemplate_gis.1 2007-09-18
10:46:24.000000000 -0400
+--- 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.3.1/extras/template_gis/rmtemplate_gis.in 2006-05-31
02:43:12.000000000 -0400
-+++ postgis-1.3.1-new/extras/template_gis/rmtemplate_gis.in 2007-09-18
10:46:24.000000000 -0400
-@@ -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.3.1/extras/template_gis/rmtemplate_gis.sh.in 2006-05-31
02:43:12.000000000 -0400
-+++ postgis-1.3.1-new/extras/template_gis/rmtemplate_gis.sh.in 2007-09-18
10:46:24.000000000 -0400
-@@ -6,7 +6,7 @@
-
- cd /tmp
-
--source @bindir@/postgres_lib.sh
-+source @bindir@/[EMAIL PROTECTED]@
-
- check_dba $DBAUSER
- template_rm $TDB
---- postgis-1.3.1/java/jdbc/Makefile 2007-01-18 13:51:15.000000000 -0500
-+++ postgis-1.3.1-new/java/jdbc/Makefile 2007-09-18 10:46:24.000000000
-0400
-@@ -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.3.1/lwgeom/lwgeom_gml.c 2007-06-08 06:28:52.000000000 -0400
-+++ postgis-1.3.1-new/lwgeom/lwgeom_gml.c 2007-09-18 10:46:24.000000000
-0400
-@@ -38,10 +38,10 @@
-
- #define DEF_PRECISION 15
+--- 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);
+
/* Add dot, sign, exponent sign, 'e', exponent digits */
-#define SHOW_DIGS (precision + 8)
+#define SHOW_DIGS (gml_precision + 8)
@@ -289,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 @@
-
- /* Get precision (if provided) */
- if ( PG_NARGS() > 1 && ! PG_ARGISNULL(1) )
-- precision = PG_GETARG_INT32(1);
-+ gml_precision = PG_GETARG_INT32(1);
-
+@@ -85,8 +85,8 @@
+ geom = (PG_LWGEOM *)PG_DETOAST_DATUM(PG_GETARG_DATUM(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",
@@ -321,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",
@@ -334,9 +267,33 @@
}
}
---- postgis-1.3.1/lwgeom/lwgeom_kml.c 2007-06-08 06:28:52.000000000 -0400
-+++ postgis-1.3.1-new/lwgeom/lwgeom_kml.c 2007-09-18 10:46:24.000000000
-0400
-@@ -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 */
@@ -349,7 +306,7 @@
/**
-@@ -58,7 +58,7 @@
+@@ -60,7 +60,7 @@
char *srs;
int SRID;
@@ -358,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) )
@@ -370,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",
@@ -381,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",
@@ -394,9 +351,46 @@
}
}
---- postgis-1.3.1/utils/postgis_restore.pl 2006-11-20 07:59:55.000000000
-0500
-+++ postgis-1.3.1-new/utils/postgis_restore.pl 2007-09-18 10:49:49.000000000
-0400
-@@ -690,7 +690,7 @@
+--- 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
#
Modified:
trunk/experimental/10.4/main/finkinfo/database/postgresql74-unified.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/database/postgresql74-unified.info&rev=1075&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/database/postgresql74-unified.info
(original)
+++ trunk/experimental/10.4/main/finkinfo/database/postgresql74-unified.info
Wed Dec 12 15:20:45 2007
@@ -1,11 +1,12 @@
Package: postgresql74-unified
Version: 7.4.18
-Revision: 2
+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,
@@ -334,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,
@@ -345,7 +349,8 @@
postgresql80-ssl-dev,
postgresql80-unified-dev,
postgresql81-dev,
- postgresql82-dev
+ postgresql82-dev,
+ postgresql83-dev
<<
Replaces: <<
postgresql73-dev,
@@ -358,7 +363,8 @@
postgresql80-unified-dev,
%N (<< %v-%r),
postgresql81-dev,
- postgresql82-dev
+ postgresql82-dev,
+ postgresql83-dev
<<
BuildDependsOnly: true
Files: <<
Modified:
trunk/experimental/10.4/main/finkinfo/database/postgresql80-unified.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/database/postgresql80-unified.info&rev=1075&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/database/postgresql80-unified.info
(original)
+++ trunk/experimental/10.4/main/finkinfo/database/postgresql80-unified.info
Wed Dec 12 15:20:45 2007
@@ -1,6 +1,6 @@
Package: postgresql80-unified
Version: 8.0.14
-Revision: 2
+Revision: 1022
Description: PostgreSQL open-source database
License: BSD
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
@@ -358,7 +358,8 @@
postgresql80-dev (<< %v-%r),
postgresql80-ssl-dev (<< %v-%r),
postgresql81-dev,
- postgresql82-dev
+ postgresql82-dev,
+ postgresql83-dev
<<
Replaces: <<
postgresql-dev,
@@ -376,7 +377,8 @@
postgresql74-ssl-shlibs,
postgresql74-unified-shlibs,
postgresql81-dev,
- postgresql82-dev
+ postgresql82-dev,
+ postgresql83-dev
<<
BuildDependsOnly: true
Files: <<
Modified: trunk/experimental/10.4/main/finkinfo/database/postgresql81.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/database/postgresql81.info&rev=1075&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/database/postgresql81.info (original)
+++ trunk/experimental/10.4/main/finkinfo/database/postgresql81.info Wed Dec 12
15:20:45 2007
@@ -1,6 +1,6 @@
Package: postgresql81
Version: 8.1.10
-Revision: 2
+Revision: 1022
Description: PostgreSQL open-source database
License: BSD
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
@@ -344,7 +344,8 @@
postgresql80-dev,
postgresql80-ssl-dev,
postgresql80-unified-dev,
- postgresql82-dev
+ postgresql82-dev,
+ postgresql83-dev
<<
Replaces: <<
postgresql73-dev,
@@ -357,7 +358,8 @@
postgresql80-ssl-dev,
postgresql80-unified-dev,
%N (<< %v-%r),
- postgresql82-dev
+ postgresql82-dev,
+ postgresql83-dev
<<
BuildDependsOnly: true
Files: <<
Modified: trunk/experimental/10.4/main/finkinfo/database/postgresql82.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/database/postgresql82.info&rev=1075&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/database/postgresql82.info (original)
+++ trunk/experimental/10.4/main/finkinfo/database/postgresql82.info Wed Dec 12
15:20:45 2007
@@ -1,6 +1,6 @@
Package: postgresql82
Version: 8.2.5
-Revision: 2
+Revision: 1022
Description: PostgreSQL open-source database
License: BSD
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
@@ -341,7 +341,8 @@
postgresql80-dev,
postgresql80-ssl-dev,
postgresql80-unified-dev,
- postgresql81-dev
+ postgresql81-dev,
+ postgresql83-dev
<<
Replaces: <<
postgresql73-dev,
@@ -353,7 +354,8 @@
postgresql80-dev,
postgresql80-ssl-dev,
postgresql80-unified-dev,
- postgresql81-dev
+ postgresql81-dev,
+ postgresql83-dev
<<
BuildDependsOnly: true
Files: <<
Modified: trunk/experimental/common/main/finkinfo/database/postgis.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/database/postgis.info&rev=1075&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/database/postgis.info (original)
+++ trunk/experimental/common/main/finkinfo/database/postgis.info Wed Dec 12
15:20:45 2007
@@ -1,11 +1,11 @@
Info2: <<
Package: postgis%type_pkg[postgresql]
-Version: 1.3.1
+Version: 1.3.2
Revision: 1
GCC: 3.3
Type: postgresql (7.4 8.0 8.1 8.2)
Source: http://postgis.refractions.net/download/postgis-%v.tar.gz
-Source-MD5: dd90f80072fc3e32d3a3eb580542bda1
+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
BuildDepends: <<
jts,
Modified: trunk/experimental/common/main/finkinfo/database/postgis.patch
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/database/postgis.patch&rev=1075&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/database/postgis.patch (original)
+++ trunk/experimental/common/main/finkinfo/database/postgis.patch Wed Dec 12
15:20:45 2007
@@ -1,105 +1,90 @@
-diff -uNr postgis-1.3.1/extras/template_gis/Makefile
postgis-1.3.1-new/extras/template_gis/Makefile
---- postgis-1.3.1/extras/template_gis/Makefile 2007-03-01 03:31:44.000000000
-0500
-+++ postgis-1.3.1-new/extras/template_gis/Makefile 2007-09-18
10:46:24.000000000 -0400
-@@ -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)
-
-@@ -42,7 +41,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
-diff -uNr postgis-1.3.1/extras/template_gis/createdb.postgis.1
postgis-1.3.1-new/extras/template_gis/createdb.postgis.1
---- postgis-1.3.1/extras/template_gis/createdb.postgis.1 2006-05-31
02:43:12.000000000 -0400
-+++ postgis-1.3.1-new/extras/template_gis/createdb.postgis.1 2007-09-18
10:46:24.000000000 -0400
+diff -uNr postgis-1.3.2/README.postgis postgis-1.3.2-new/README.postgis
+--- 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 @@
+
+ So, as postgres run:
+
+- createlang plpgsql yourdatabase
+- psql -f lwpostgis.sql -d your_database
++ [EMAIL PROTECTED]@ plpgsql yourdatabase
++ [EMAIL PROTECTED]@ -f lwpostgis.sql -d your_database
+
+ 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
+diff -uNr postgis-1.3.2/extras/template_gis/createdb.postgis.1
postgis-1.3.2-new/extras/template_gis/createdb.postgis.1
+--- 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
-diff -uNr postgis-1.3.1/extras/template_gis/createdb.postgis.in
postgis-1.3.1-new/extras/template_gis/createdb.postgis.in
---- postgis-1.3.1/extras/template_gis/createdb.postgis.in 2006-05-31
02:43:12.000000000 -0400
-+++ postgis-1.3.1-new/extras/template_gis/createdb.postgis.in 2007-09-18
10:46:24.000000000 -0400
-@@ -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
-diff -uNr postgis-1.3.1/extras/template_gis/mktemplate_gis.1
postgis-1.3.1-new/extras/template_gis/mktemplate_gis.1
---- postgis-1.3.1/extras/template_gis/mktemplate_gis.1 2006-05-31
02:43:12.000000000 -0400
-+++ postgis-1.3.1-new/extras/template_gis/mktemplate_gis.1 2007-09-18
10:46:24.000000000 -0400
+diff -uNr postgis-1.3.2/extras/template_gis/mktemplate_gis.1
postgis-1.3.2-new/extras/template_gis/mktemplate_gis.1
+--- 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
-diff -uNr postgis-1.3.1/extras/template_gis/mktemplate_gis.in
postgis-1.3.1-new/extras/template_gis/mktemplate_gis.in
---- postgis-1.3.1/extras/template_gis/mktemplate_gis.in 2006-05-31
02:43:12.000000000 -0400
-+++ postgis-1.3.1-new/extras/template_gis/mktemplate_gis.in 2007-09-18
10:46:24.000000000 -0400
-@@ -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]@"
-diff -uNr postgis-1.3.1/extras/template_gis/mktemplate_gis.sh.in
postgis-1.3.1-new/extras/template_gis/mktemplate_gis.sh.in
---- postgis-1.3.1/extras/template_gis/mktemplate_gis.sh.in 2006-05-31
02:43:12.000000000 -0400
-+++ postgis-1.3.1-new/extras/template_gis/mktemplate_gis.sh.in 2007-09-18
10:46:24.000000000 -0400
-@@ -6,7 +6,7 @@
-
- cd /tmp
-
--source @bindir@/postgres_lib.sh
-+source @bindir@/[EMAIL PROTECTED]@
-
- check_dba $DBAUSER
- template_rm $TDB
-diff -uNr postgis-1.3.1/extras/template_gis/postgis_env.sh.in
postgis-1.3.1-new/extras/template_gis/postgis_env.sh.in
---- postgis-1.3.1/extras/template_gis/postgis_env.sh.in 2006-05-31
02:43:12.000000000 -0400
-+++ postgis-1.3.1-new/extras/template_gis/postgis_env.sh.in 2007-09-18
10:46:24.000000000 -0400
+diff -uNr postgis-1.3.2/extras/template_gis/postgis_env.sh.in
postgis-1.3.2-new/extras/template_gis/postgis_env.sh.in
+--- 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
@@ -118,9 +103,9 @@
fi
fi
-diff -uNr postgis-1.3.1/extras/template_gis/postgres_lib.sh.in
postgis-1.3.1-new/extras/template_gis/postgres_lib.sh.in
---- postgis-1.3.1/extras/template_gis/postgres_lib.sh.in 2006-05-31
02:43:12.000000000 -0400
-+++ postgis-1.3.1-new/extras/template_gis/postgres_lib.sh.in 2007-09-18
10:46:24.000000000 -0400
+diff -uNr postgis-1.3.2/extras/template_gis/postgres_lib.sh.in
postgis-1.3.2-new/extras/template_gis/postgres_lib.sh.in
+--- 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
@@ -215,83 +200,35 @@
else
echo "$db_create"
fi
-diff -uNr postgis-1.3.1/extras/template_gis/profile
postgis-1.3.1-new/extras/template_gis/profile
---- postgis-1.3.1/extras/template_gis/profile 2006-06-09 02:03:59.000000000
-0400
-+++ postgis-1.3.1-new/extras/template_gis/profile 2007-09-18
10:46:24.000000000 -0400
+diff -uNr postgis-1.3.2/extras/template_gis/profile
postgis-1.3.2-new/extras/template_gis/profile
+--- 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
-diff -uNr postgis-1.3.1/extras/template_gis/rmtemplate_gis.1
postgis-1.3.1-new/extras/template_gis/rmtemplate_gis.1
---- postgis-1.3.1/extras/template_gis/rmtemplate_gis.1 2006-05-31
02:43:12.000000000 -0400
-+++ postgis-1.3.1-new/extras/template_gis/rmtemplate_gis.1 2007-09-18
10:46:24.000000000 -0400
+diff -uNr postgis-1.3.2/extras/template_gis/rmtemplate_gis.1
postgis-1.3.2-new/extras/template_gis/rmtemplate_gis.1
+--- 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
-diff -uNr postgis-1.3.1/extras/template_gis/rmtemplate_gis.in
postgis-1.3.1-new/extras/template_gis/rmtemplate_gis.in
---- postgis-1.3.1/extras/template_gis/rmtemplate_gis.in 2006-05-31
02:43:12.000000000 -0400
-+++ postgis-1.3.1-new/extras/template_gis/rmtemplate_gis.in 2007-09-18
10:46:24.000000000 -0400
-@@ -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]@"
-diff -uNr postgis-1.3.1/extras/template_gis/rmtemplate_gis.sh.in
postgis-1.3.1-new/extras/template_gis/rmtemplate_gis.sh.in
---- postgis-1.3.1/extras/template_gis/rmtemplate_gis.sh.in 2006-05-31
02:43:12.000000000 -0400
-+++ postgis-1.3.1-new/extras/template_gis/rmtemplate_gis.sh.in 2007-09-18
10:46:24.000000000 -0400
-@@ -6,7 +6,7 @@
-
- cd /tmp
-
--source @bindir@/postgres_lib.sh
-+source @bindir@/[EMAIL PROTECTED]@
-
- check_dba $DBAUSER
- template_rm $TDB
-diff -uNr postgis-1.3.1/java/jdbc/Makefile postgis-1.3.1-new/java/jdbc/Makefile
---- postgis-1.3.1/java/jdbc/Makefile 2007-01-18 13:51:15.000000000 -0500
-+++ postgis-1.3.1-new/java/jdbc/Makefile 2007-09-18 10:46:24.000000000
-0400
-@@ -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
-diff -uNr postgis-1.3.1/lwgeom/lwgeom_gml.c
postgis-1.3.1-new/lwgeom/lwgeom_gml.c
---- postgis-1.3.1/lwgeom/lwgeom_gml.c 2007-06-08 06:28:52.000000000 -0400
-+++ postgis-1.3.1-new/lwgeom/lwgeom_gml.c 2007-09-18 10:46:24.000000000
-0400
-@@ -38,10 +38,10 @@
-
- #define DEF_PRECISION 15
+diff -uNr postgis-1.3.2/lwgeom/lwgeom_gml.c
postgis-1.3.2-new/lwgeom/lwgeom_gml.c
+--- 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);
+
/* Add dot, sign, exponent sign, 'e', exponent digits */
-#define SHOW_DIGS (precision + 8)
+#define SHOW_DIGS (gml_precision + 8)
@@ -302,28 +239,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 @@
-
- /* Get precision (if provided) */
- if ( PG_NARGS() > 1 && ! PG_ARGISNULL(1) )
-- precision = PG_GETARG_INT32(1);
-+ gml_precision = PG_GETARG_INT32(1);
-
+@@ -85,8 +85,8 @@
+ geom = (PG_LWGEOM *)PG_DETOAST_DATUM(PG_GETARG_DATUM(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",
@@ -334,7 +261,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",
@@ -347,10 +274,34 @@
}
}
-diff -uNr postgis-1.3.1/lwgeom/lwgeom_kml.c
postgis-1.3.1-new/lwgeom/lwgeom_kml.c
---- postgis-1.3.1/lwgeom/lwgeom_kml.c 2007-06-08 06:28:52.000000000 -0400
-+++ postgis-1.3.1-new/lwgeom/lwgeom_kml.c 2007-09-18 10:46:24.000000000
-0400
-@@ -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);
+ }
+ }
+
+diff -uNr postgis-1.3.2/lwgeom/lwgeom_kml.c
postgis-1.3.2-new/lwgeom/lwgeom_kml.c
+--- 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 */
@@ -363,7 +314,7 @@
/**
-@@ -58,7 +58,7 @@
+@@ -60,7 +60,7 @@
char *srs;
int SRID;
@@ -372,7 +323,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) )
@@ -384,7 +335,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",
@@ -395,7 +346,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",
@@ -408,10 +359,47 @@
}
}
-diff -uNr postgis-1.3.1/utils/postgis_restore.pl
postgis-1.3.1-new/utils/postgis_restore.pl
---- postgis-1.3.1/utils/postgis_restore.pl 2006-11-20 07:59:55.000000000
-0500
-+++ postgis-1.3.1-new/utils/postgis_restore.pl 2007-09-18 10:49:49.000000000
-0400
-@@ -690,7 +690,7 @@
+diff -uNr postgis-1.3.2/utils/postgis_restore.pl
postgis-1.3.2-new/utils/postgis_restore.pl
+--- 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
#
Modified:
trunk/experimental/common/main/finkinfo/database/postgresql74-unified.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/database/postgresql74-unified.info&rev=1075&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/database/postgresql74-unified.info
(original)
+++ trunk/experimental/common/main/finkinfo/database/postgresql74-unified.info
Wed Dec 12 15:20:45 2007
@@ -1,6 +1,6 @@
Package: postgresql74-unified
Version: 7.4.18
-Revision: 2
+Revision: 1022
CustomMirror: <<
afr-ZA: ftp://ftp.za.postgresql.org/mirror/ftp.postgresql.org
asi-CN: ftp://ftp.cn.postgresql.org/ftp.postgresql.org
@@ -111,6 +111,7 @@
postgresql74-ssl (<< %v-%r)
<<
Depends: <<
+ fink-obsolete-packages,
daemonic (>= 20010902-1),
libxml2-shlibs,
libxslt-shlibs,
@@ -327,9 +328,9 @@
SplitOff: <<
Description: PostgreSQL development headers and libraries
Package: %N-dev
- Depends: %N (>= %v-%r)
- Conflicts: postgresql73-dev, postgresql73-ssl-dev,
postgresql73-unified-dev, postgresql74-dev (<< %v-%r), postgresql74-ssl-dev (<<
%v-%r), postgresql80-dev, postgresql80-ssl-dev, postgresql80-unified-dev,
postgresql81-dev, postgresql82-dev
- Replaces: postgresql73-dev, postgresql73-ssl-dev,
postgresql73-unified-dev, postgresql74-dev, postgresql74-ssl-dev,
postgresql80-dev, postgresql80-ssl-dev, postgresql80-unified-dev, %N (<<
%v-%r), postgresql81-dev, postgresql82-dev
+ Depends: %N (>= %v-%r), fink-obsolete-packages
+ Conflicts: postgresql73-dev, postgresql73-ssl-dev,
postgresql73-unified-dev, postgresql74-dev (<< %v-%r), postgresql74-ssl-dev (<<
%v-%r), postgresql80-dev, postgresql80-ssl-dev, postgresql80-unified-dev,
postgresql81-dev, postgresql82-dev, postgresql83-dev
+ Replaces: postgresql73-dev, postgresql73-ssl-dev,
postgresql73-unified-dev, postgresql74-dev, postgresql74-ssl-dev,
postgresql80-dev, postgresql80-ssl-dev, postgresql80-unified-dev, %N (<<
%v-%r), postgresql81-dev, postgresql82-dev, postgresql83-dev
BuildDependsOnly: true
Files: <<
bin/pg_config*
Modified:
trunk/experimental/common/main/finkinfo/database/postgresql80-unified.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/database/postgresql80-unified.info&rev=1075&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/database/postgresql80-unified.info
(original)
+++ trunk/experimental/common/main/finkinfo/database/postgresql80-unified.info
Wed Dec 12 15:20:45 2007
@@ -1,6 +1,6 @@
Package: postgresql80-unified
Version: 8.0.14
-Revision: 2
+Revision: 1022
CustomMirror: <<
afr-ZA: ftp://ftp.za.postgresql.org/mirror/ftp.postgresql.org
asi-CN: ftp://ftp.cn.postgresql.org/ftp.postgresql.org
@@ -338,8 +338,8 @@
Description: PostgreSQL development headers and libraries
Package: %N-dev
Depends: %N (= %v-%r)
- Conflicts: postgresql-dev, postgresql-ssl-dev, postgresql (<< %v-%r),
postgresql-ssl (<< %v-%r), postgresql73-dev, postgresql73-ssl-dev,
postgresql73-unified-dev, postgresql74-dev, postgresql74-ssl-dev,
postgresql74-unified-dev, postgresql80-dev (<< %v-%r), postgresql80-ssl-dev (<<
%v-%r), postgresql81-dev, postgresql82-dev
- Replaces: postgresql-dev, postgresql-ssl-dev, postgresql73-dev,
postgresql73-ssl-dev, postgresql73-unified-dev, postgresql74-dev,
postgresql74-ssl-dev, postgresql74-unified-dev, postgresql80-dev,
postgresql80-ssl-dev, %N, postgresql74-shlibs, postgresql74-ssl-shlibs,
postgresql74-unified-shlibs, postgresql81-dev, postgresql82-dev
+ Conflicts: postgresql-dev, postgresql-ssl-dev, postgresql (<< %v-%r),
postgresql-ssl (<< %v-%r), postgresql73-dev, postgresql73-ssl-dev,
postgresql73-unified-dev, postgresql74-dev, postgresql74-ssl-dev,
postgresql74-unified-dev, postgresql80-dev (<< %v-%r), postgresql80-ssl-dev (<<
%v-%r), postgresql81-dev, postgresql82-dev, postgresql83-dev
+ Replaces: postgresql-dev, postgresql-ssl-dev, postgresql73-dev,
postgresql73-ssl-dev, postgresql73-unified-dev, postgresql74-dev,
postgresql74-ssl-dev, postgresql74-unified-dev, postgresql80-dev,
postgresql80-ssl-dev, %N, postgresql74-shlibs, postgresql74-ssl-shlibs,
postgresql74-unified-shlibs, postgresql81-dev, postgresql82-dev,
postgresql83-dev
BuildDependsOnly: true
Files: <<
bin/pg_config*
Modified: trunk/experimental/common/main/finkinfo/database/postgresql81.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/database/postgresql81.info&rev=1075&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/database/postgresql81.info
(original)
+++ trunk/experimental/common/main/finkinfo/database/postgresql81.info Wed Dec
12 15:20:45 2007
@@ -1,6 +1,6 @@
Package: postgresql81
Version: 8.1.10
-Revision: 2
+Revision: 1022
CustomMirror: <<
afr-ZA: ftp://ftp.za.postgresql.org/mirror/ftp.postgresql.org
asi-CN: ftp://ftp.cn.postgresql.org/ftp.postgresql.org
@@ -327,8 +327,8 @@
Description: PostgreSQL development headers and libraries
Package: %N-dev
Depends: %N (>= %v-%r)
- Conflicts: postgresql73-dev, postgresql73-ssl-dev,
postgresql73-unified-dev, postgresql74-dev, postgresql74-ssl-dev,
postgresql74-unified-dev, postgresql80-dev, postgresql80-ssl-dev,
postgresql80-unified-dev, postgresql82-dev
- Replaces: postgresql73-dev, postgresql73-ssl-dev,
postgresql73-unified-dev, postgresql74-dev, postgresql74-ssl-dev,
postgresql74-unified-dev, postgresql80-dev, postgresql80-ssl-dev,
postgresql80-unified-dev, %N (<< %v-%r), postgresql82-dev
+ Conflicts: postgresql73-dev, postgresql73-ssl-dev,
postgresql73-unified-dev, postgresql74-dev, postgresql74-ssl-dev,
postgresql74-unified-dev, postgresql80-dev, postgresql80-ssl-dev,
postgresql80-unified-dev, postgresql82-dev, postgresql83-dev
+ Replaces: postgresql73-dev, postgresql73-ssl-dev,
postgresql73-unified-dev, postgresql74-dev, postgresql74-ssl-dev,
postgresql74-unified-dev, postgresql80-dev, postgresql80-ssl-dev,
postgresql80-unified-dev, %N (<< %v-%r), postgresql82-dev, postgresql83-dev
BuildDependsOnly: true
Files: <<
bin/pg_config*
Modified: trunk/experimental/common/main/finkinfo/database/postgresql82.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/database/postgresql82.info&rev=1075&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/database/postgresql82.info
(original)
+++ trunk/experimental/common/main/finkinfo/database/postgresql82.info Wed Dec
12 15:20:45 2007
@@ -1,6 +1,6 @@
Package: postgresql82
Version: 8.2.5
-Revision: 2
+Revision: 1022
CustomMirror: <<
afr-ZA: ftp://ftp.za.postgresql.org/mirror/ftp.postgresql.org
asi-CN: ftp://ftp.cn.postgresql.org/ftp.postgresql.org
@@ -324,8 +324,8 @@
Description: PostgreSQL development headers and libraries
Package: %N-dev
Depends: %N (>= %v-%r)
- Conflicts: postgresql73-dev, postgresql73-ssl-dev,
postgresql73-unified-dev, postgresql74-dev, postgresql74-ssl-dev,
postgresql74-unified-dev, postgresql80-dev, postgresql80-ssl-dev,
postgresql80-unified-dev, postgresql81-dev
- Replaces: postgresql73-dev, postgresql73-ssl-dev,
postgresql73-unified-dev, postgresql74-dev, postgresql74-ssl-dev,
postgresql74-unified-dev, postgresql80-dev, postgresql80-ssl-dev,
postgresql80-unified-dev, postgresql81-dev
+ Conflicts: postgresql73-dev, postgresql73-ssl-dev,
postgresql73-unified-dev, postgresql74-dev, postgresql74-ssl-dev,
postgresql74-unified-dev, postgresql80-dev, postgresql80-ssl-dev,
postgresql80-unified-dev, postgresql81-dev, postgresql83-dev
+ Replaces: postgresql73-dev, postgresql73-ssl-dev,
postgresql73-unified-dev, postgresql74-dev, postgresql74-ssl-dev,
postgresql74-unified-dev, postgresql80-dev, postgresql80-ssl-dev,
postgresql80-unified-dev, postgresql81-dev, postgresql83-dev
BuildDependsOnly: true
Files: <<
bin/pg_config*
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
