Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/database
In directory vz-cvs-3.sog:/tmp/cvs-serv25634/10.7/stable/main/finkinfo/database
Modified Files:
postgresql90.info postgresql90.patch
Added Files:
postgis.info postgis.patch
Log Message:
to 10.7
Index: postgresql90.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/database/postgresql90.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- postgresql90.info 21 Jul 2011 02:29:38 -0000 1.2
+++ postgresql90.info 21 Jul 2011 16:23:37 -0000 1.3
@@ -34,7 +34,7 @@
Source-MD5: 80390514d568a7af5ab61db1cda27e29
PatchScript: sed -e 's|@BUILDDIR@|%b|g' -e 's|@INSTPREFIX@|%p|g' <
%{PatchFile} | patch -p1
PatchFile: %n.patch
-PatchFile-MD5: 3a631636c02956ab807bd4b08eef5e00
+PatchFile-MD5: 7c9ccbc8a0c66027b7bf6d0f5df6ad5a
SetCPPFLAGS: -I%p/lib/system-openssl/include -DHAVE_OPTRESET -fno-common
SetLDFLAGS: -L%p/lib/system-openssl/lib -F/System/Library/Frameworks
Index: postgresql90.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/database/postgresql90.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- postgresql90.patch 20 Jul 2011 21:52:29 -0000 1.1
+++ postgresql90.patch 21 Jul 2011 16:23:37 -0000 1.2
@@ -1,6 +1,6 @@
-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
+diff -Nurd postgresql-9.0.4/pgsql.sh postgresql-9.0.4-new/pgsql.sh
+--- postgresql-9.0.4/pgsql.sh 1969-12-31 19:00:00.000000000 -0500
++++ postgresql-9.0.4-new/pgsql.sh 2011-07-21 11:38:27.000000000 -0400
@@ -0,0 +1,83 @@
+#!/bin/sh
+
@@ -85,9 +85,18 @@
+ $PG_COMMAND -D "$DATADIR" -m fast stop
+ ;;
+esac
-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
+diff -Nurd postgresql-9.0.4/src/Makefile.global.in
postgresql-9.0.4-new/src/Makefile.global.in
+--- postgresql-9.0.4/src/Makefile.global.in 2011-04-14 23:15:53.000000000
-0400
++++ postgresql-9.0.4-new/src/Makefile.global.in 2011-07-21
11:39:12.000000000 -0400
+@@ -196,7 +196,7 @@
+
+ # Compilers
+
+-CPP = @CPP@
++CPP = $(CC) -E
+ CPPFLAGS = @CPPFLAGS@
+
+ ifdef PGXS
@@ -243,7 +243,7 @@
ifdef PGXS
LDFLAGS = -L$(libdir)
@@ -97,9 +106,9 @@
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
+diff -Nurd postgresql-9.0.4/src/backend/utils/misc/postgresql.conf.sample
postgresql-9.0.4-new/src/backend/utils/misc/postgresql.conf.sample
+--- postgresql-9.0.4/src/backend/utils/misc/postgresql.conf.sample
2011-04-14 23:15:53.000000000 -0400
++++ postgresql-9.0.4-new/src/backend/utils/misc/postgresql.conf.sample
2011-07-21 11:38:27.000000000 -0400
@@ -77,7 +77,7 @@
# - Security and Authentication -
@@ -109,9 +118,9 @@
#ssl_ciphers = 'ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH' # allowed SSL ciphers
# (change requires restart)
#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
+diff -Nurd postgresql-9.0.4/src/bin/initdb/initdb.c
postgresql-9.0.4-new/src/bin/initdb/initdb.c
+--- postgresql-9.0.4/src/bin/initdb/initdb.c 2011-04-14 23:15:53.000000000
-0400
++++ postgresql-9.0.4-new/src/bin/initdb/initdb.c 2011-07-21
11:38:27.000000000 -0400
@@ -114,7 +114,7 @@
/* defaults */
@@ -121,9 +130,9 @@
/*
* Warning messages for authentication methods
-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
+diff -Nurd postgresql-9.0.4/src/interfaces/ecpg/compatlib/Makefile
postgresql-9.0.4-new/src/interfaces/ecpg/compatlib/Makefile
+--- postgresql-9.0.4/src/interfaces/ecpg/compatlib/Makefile 2011-04-14
23:15:53.000000000 -0400
++++ postgresql-9.0.4-new/src/interfaces/ecpg/compatlib/Makefile
2011-07-21 11:38:27.000000000 -0400
@@ -21,6 +21,7 @@
-I$(libpq_srcdir) -I$(top_srcdir)/src/include/utils $(CPPFLAGS)
override CFLAGS += $(PTHREAD_CFLAGS)
@@ -132,9 +141,9 @@
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
+diff -Nurd postgresql-9.0.4/src/interfaces/ecpg/ecpglib/Makefile
postgresql-9.0.4-new/src/interfaces/ecpg/ecpglib/Makefile
+--- postgresql-9.0.4/src/interfaces/ecpg/ecpglib/Makefile 2011-04-14
23:15:53.000000000 -0400
++++ postgresql-9.0.4-new/src/interfaces/ecpg/ecpglib/Makefile 2011-07-21
11:38:27.000000000 -0400
@@ -33,6 +33,7 @@
OBJS += thread.o
endif
@@ -143,9 +152,9 @@
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
+diff -Nurd postgresql-9.0.4/src/makefiles/Makefile.darwin
postgresql-9.0.4-new/src/makefiles/Makefile.darwin
+--- postgresql-9.0.4/src/makefiles/Makefile.darwin 2011-04-14
23:15:53.000000000 -0400
++++ postgresql-9.0.4-new/src/makefiles/Makefile.darwin 2011-07-21
11:38:27.000000000 -0400
@@ -10,4 +10,4 @@
# Rule for building a shared library from a single .o file
--- NEW FILE: postgis.patch ---
diff -Nurd postgis-1.5.3/postgis/Makefile.in
postgis-1.5.3-new/postgis/Makefile.in
--- postgis-1.5.3/postgis/Makefile.in 2010-01-08 17:48:29.000000000 -0500
+++ postgis-1.5.3-new/postgis/Makefile.in 2011-07-21 12:07:54.000000000
-0400
@@ -19,6 +19,7 @@
# SQL objects (files requiring C pre-processing)
SQL_OBJS=postgis.sql.in uninstall_postgis.sql.in
+SQL_CPP=$(CPP)
# PostgreSQL objects
PG_OBJS=lwgeom_pg.o \
@@ -68,8 +69,8 @@
# to an existing liblwgeom.so in the PostgreSQL $libdir supplied by an
# older version of PostGIS, rather than with the static liblwgeom.a
# supplied with newer versions of PostGIS
-PG_CPPFLAGS+=@CPPFLAGS@ -I../liblwgeom
-SHLIB_LINK+=@SHLIB_LINK@ ../liblwgeom/liblwgeom.a
+PG_CPPFLAGS+=@CPPFLAGS@ @PGSQL_FE_CPPFLAGS@ -I../liblwgeom
+SHLIB_LINK+=@SHLIB_LINK@ @PGSQL_FE_LDFLAGS@ ../liblwgeom/liblwgeom.a
# Extra files to remove during 'make clean'
EXTRA_CLEAN=$(SQL_OBJS)
@@ -116,5 +117,5 @@
# Generate any .sql.in files from .sql.in.c files by running them through the
C pre-processor
$(SQL_OBJS): %.in: %.in.c
- $(CPP) -traditional-cpp $< | grep -v '^#' > $@
+ $(SQL_CPP) -traditional-cpp $< | grep -v '^#' > $@
diff -Nurd postgis-1.5.3/topology/Makefile.in
postgis-1.5.3-new/topology/Makefile.in
--- postgis-1.5.3/topology/Makefile.in 2008-11-06 10:15:06.000000000 -0500
+++ postgis-1.5.3-new/topology/Makefile.in 2011-07-21 12:08:01.000000000
-0400
@@ -7,6 +7,7 @@
# SQL objects (files requiring C pre-processing)
SQL_OBJS=topology.sql.in
+SQL_CPP=$(CPP)
# Extra files to remove during 'make clean'
EXTRA_CLEAN=$(SQL_OBJS)
@@ -24,5 +25,5 @@
# Generate any .sql.in files from .sql.in.c files by running them through the
C pre-processor
$(SQL_OBJS): %.in: %.in.c
- $(CPP) -traditional-cpp $< | grep -v '^#' > $@
+ $(SQL_CPP) -traditional-cpp $< | grep -v '^#' > $@
--- NEW FILE: postgis.info ---
Info4: <<
Package: postgis%type_pkg[postgresql]
Version: 1.5.3
Revision: 31
Distribution: <<
(%type_pkg[postgresql] = 84) 10.4, (%type_pkg[postgresql] = 84) 10.5,
(%type_pkg[postgresql] = 84) 10.6,
(%type_pkg[postgresql] = 90) 10.4, (%type_pkg[postgresql] = 90) 10.5,
(%type_pkg[postgresql] = 90) 10.6, (%type_pkg[postgresql] = 90) 10.7
<<
Description: PostgreSQL geographic object support
Type: postgresql (8.4 9.0)
License: BSD
Maintainer: Benjamin Reed <post...@fink.raccoonfink.com>
Depends: <<
libgeos3.3.0-shlibs (>= 3.3.0-1),
libxml2-shlibs,
postgresql%type_pkg[postgresql]-shlibs (>= 9.0.4-34),
proj-shlibs
<<
BuildDepends: <<
fink (>= 0.30.0-1),
jts,
libgeos3.3.0 (>= 3.3.0-1),
libiconv-dev,
libxml2,
postgresql%type_pkg[postgresql]-dev (>= 9.0.4-34),
postgresql-java (>= %type_raw[postgresql]-31),
proj,
system-openssl-dev,
system-java (>= 1.5-1)
<<
GCC: 4.0
Source: http://postgis.refractions.net/download/postgis-%v.tar.gz
Source-MD5: 05a61df5e1b78bf51c9ce98bea5526fc
PatchFile: postgis.patch
PatchFile-MD5: 57494eeeb1e9036ca4ca1d994f880230
SetCPPFLAGS: -I%p/lib/system-openssl/include -DHAVE_OPTRESET -fno-common
SetLDFLAGS: -L%p/lib/system-openssl/lib
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
UseMaxBuildJobs: false
ConfigureParams:
--with-pgconfig=%p/opt/postgresql-%type_raw[postgresql]/bin/pg_config
--with-geosconfig=%p/opt/libgeos3.3.0/bin/geos-config --with-projdir=%p
--with-xml2config=%p/bin/xml2-config
CompileScript: <<
#!/bin/sh -ev
if [ -x /usr/bin/gcc-4.2 ]; then
SQL_CPP="gcc-4.2 -E"
else
SQL_CPP="gcc -E"
fi
export lt_cv_sys_max_cmd_len=65536
export
JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home"
export
PATH="/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home/bin:$PATH"
./configure %c
make SQL_CPP="$SQL_CPP"
pushd java/jdbc
make
popd
<<
InstallScript: <<
#!/bin/sh -ev
make -j1 install DESTDIR=%d datadir=%p/share/doc/%N
<<
DocFiles: COPYING CREDITS ChangeLog NEWS README* TODO
SplitOff: <<
Package: %N-java
Depends: <<
jts,
postgresql-java (>= %type_raw[postgresql]-31)
<<
JarFiles: java/jdbc/postgis.jar java/pljava/postgis_pljava.jar
<<
PostInstScript: <<
for file in pgsql2shp shp2pgsql; do
%p/sbin/update-alternatives --install "%p/bin/$file" "$file"
"%p/opt/postgresql-%type_raw[postgresql]/bin/$file" %type_pkg[postgresql]
done
cat <<EOF
Note: This package does not do anything until you add it's schema to
your database!
If this is the first time you're using PostGIS in a particular database,
you must install the schema like so:
sudo %p/bin/pgsql.sh-%type_raw[postgresql] start
sudo -u postgres %p/opt/postgresql-%type_raw[postgresql]/bin/psql -f
%p/share/doc/%N/contrib/postgis-1.5/postgis.sql -d <your_spatial_database>
If you are upgrading your database from a previous PostGIS version, you
need to upgrade the schema like so:
sudo %p/bin/pgsql.sh-%type_raw[postgresql] start
sudo -u postgres %p/opt/postgresql-%type_raw[postgresql]/bin/psql -f
%p/share/doc/%N/contrib/postgis-1.5/postgis_upgrade_XX_to_15.sql -d
<your_spatial_database>
EOF
<<
PreRmScript: <<
if [ "$1" != "upgrade" ]; then
for file in pgsql2shp shp2pgsql; do
%p/sbin/update-alternatives --remove "$file"
"%p/bin/$file-%type_raw[postgresql]"
done
fi
<<
Homepage: http://postgis.refractions.net/
DescDetail: <<
PostGIS adds support for geographic objects to the PostgreSQL
object-relational database. In effect, PostGIS "spatially enables" the
PostgreSQL server, allowing it to be used as a backend spatial database for
geographic information systems (GIS), much like ESRI's SDE or Oracle's Spatial
extension. PostGIS follows the OpenGIS "Simple Features Specification for
SQL" and has been certified as compliant with the "Types and Functions"
profile.
<<
DescUsage: <<
Note: This package does not do anything until you add it's schema to
your database!
If this is the first time you're using PostGIS in a particular database,
you must install the schema like so:
sudo %p/bin/pgsql.sh-%type_raw[postgresql] start
sudo -u postgres %p/opt/postgresql-%type_raw[postgresql]/bin/psql \
-f %p/share/doc/%N/contrib/postgis-1.5/postgis.sql \
-d <your_spatial_database>
If you are upgrading your database from a previous PostGIS version, you
need to upgrade the schema like so:
sudo %p/bin/pgsql.sh-%type_raw[postgresql] start
sudo -u postgres %p/opt/postgresql-%type_raw[postgresql]/bin/psql \
-f
%p/share/doc/%N/contrib/postgis-1.5/postgis_upgrade_XX_to_15.sql \
-d <your_spatial_database>
<<
<<
------------------------------------------------------------------------------
5 Ways to Improve & Secure Unified Communications
Unified Communications promises greater efficiencies for business. UC can
improve internal communications as well as offer faster, more efficient ways
to interact with customers and streamline customer service. Learn more!
http://www.accelacomm.com/jaw/sfnl/114/51426253/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
