Bug 144378 - [maintainer-update] databases/postgis: Update to 1.5.0
Summary: [maintainer-update] databases/postgis: Update to 1.5.0
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Wen Heping
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-02-28 22:30 UTC by Anderson S. Ferreira
Modified: 2010-03-26 03:10 UTC (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Anderson S. Ferreira 2010-02-28 22:30:01 UTC
Postgis update to 1.5.0

This is a major release adding a significant number of new features including:

    * New "geography" type for managing geodetic (lat/lon) data
    * Performance-enhanced distance calculations
    * GML and KML format readers
    * And more! 

For a complete list of new features, see http://postgis.refractions.net/news/20100204/

Fix: 

---
Aviso de confidencialidade:

Esta mensagem da Empresa Brasileira de Pesquisa Agropecuária (Embrapa), 
empresa pública federal regida pelo disposto na Lei Federal nº 5.851, 
de 7 de dezembro de 1972, é enviada exclusivamente a seu destinatário 
e pode conter informações confidenciais, protegidas por sigilo profissional. 
Sua utilização desautorizada é ilegal e sujeita o infrator às penas da lei. 
Se você a recebeu indevidamente, queira, por gentileza, reenviá-la ao emitente, 
esclarecendo o equívoco.

Confidentiality note:

This message from Empresa Brasileira de Pesquisa Agropecuária (Embrapa), 
a government company established under Brazilian law (5.851/72), 
is directed exclusively to its addressee and may contain confidential data, 
protected under professional secrecy rules. Its unauthorized use is illegal 
and may subject the transgressor to the law's penalties. 
If you are not the addressee, please send it back, elucidating the failure.--G9dJSubkLtAWiHnqnMShYZ8fdSN1cxlSNkvSX3aL8Dk4WyUT
Content-Type: text/plain; name="postgis.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="postgis.patch"

diff -Nur postgis.old/Makefile postgis/Makefile
--- postgis.old/Makefile	2010-02-01 12:43:46.000000000 -0200
+++ postgis/Makefile	2010-02-28 18:50:44.000000000 -0300
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postgis
-PORTVERSION=	1.4.1
+PORTVERSION=	1.5.0
 CATEGORIES=	databases geography
 MASTER_SITES=	http://postgis.refractions.net/download/ \
   		http://www.postgis.org/download/
diff -Nur postgis.old/distinfo postgis/distinfo
--- postgis.old/distinfo	2010-02-01 12:43:46.000000000 -0200
+++ postgis/distinfo	2010-02-28 18:51:59.000000000 -0300
@@ -1,3 +1,3 @@
-MD5 (postgis-1.4.1.tar.gz) = 78d13c4294f3336502ad35c8a30e5583
-SHA256 (postgis-1.4.1.tar.gz) = 17d96c59e1653d7441c98ba0762b55cae3dc22f51e897294d3262dee22ba0a50
-SIZE (postgis-1.4.1.tar.gz) = 3273182
+MD5 (postgis-1.5.0.tar.gz) = 8c0d291296033deee4d7f545e5d8218f
+SHA256 (postgis-1.5.0.tar.gz) = f79e8f740d48367e5481183c33e09b860c2c4466b196ea99c5601db287e2d324
+SIZE (postgis-1.5.0.tar.gz) = 3752211
diff -Nur postgis.old/files/patch-doc-Makefile.in postgis/files/patch-doc-Makefile.in
--- postgis.old/files/patch-doc-Makefile.in	2009-10-07 11:10:58.000000000 -0300
+++ postgis/files/patch-doc-Makefile.in	2010-02-28 18:50:26.000000000 -0300
@@ -1,6 +1,24 @@
---- doc/Makefile.in.orig	2009-07-08 12:16:53.000000000 -0300
-+++ doc/Makefile.in	2009-09-20 10:12:53.000000000 -0300
-@@ -135,12 +135,12 @@
+--- doc/Makefile.in.orig	2010-01-11 23:00:56.000000000 -0200
++++ doc/Makefile.in	2010-02-28 17:04:05.000000000 -0300
+@@ -111,14 +111,14 @@
+ 	doxygen $<
+ 
+ images: 
+-	make -C html/image_src images
++
+ 	
+ clean:
+-	make -C html/image_src clean
++	gmake -C html/image_src clean
+ 	@rm -f postgis-out.xml postgis_aggs_mm.xml
+ 
+ maintainer-clean: clean
+-	make -C html/image_src clean
++	gmake -C html/image_src clean
+ 	@rm -f html/*.html \
+ 		postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.pdf
+ 
+@@ -131,12 +131,13 @@
  	rm -f $(PGSQL_SHAREDIR)/contrib/postgis_comments.sql
  
  install: html/postgis.html man/shp2pgsql.1 man/pgsql2shp.1
@@ -16,6 +34,7 @@
 +	cp ../README.postgis $(DOCSDIR)/README.postgis
 +	cp man/pgsql2shp.1 $(PREFIX)/man/man1/pgsql2shp.1
 +	cp man/shp2pgsql.1 $(PREFIX)/man/man1/shp2pgsql.1
++	gmake -C html/image_src install
  
  uninstall:
  	rm -f $(PGSQL_DOCDIR)/postgis/postgis.html
diff -Nur postgis.old/files/patch-doc-html-image_src-Makefile.in postgis/files/patch-doc-html-image_src-Makefile.in
--- postgis.old/files/patch-doc-html-image_src-Makefile.in	1969-12-31 21:00:00.000000000 -0300
+++ postgis/files/patch-doc-html-image_src-Makefile.in	2010-02-28 18:50:26.000000000 -0300
@@ -0,0 +1,33 @@
+--- doc/html/image_src/Makefile.in.orig	2010-01-11 15:31:49.000000000 -0200
++++ doc/html/image_src/Makefile.in	2010-02-28 17:43:56.000000000 -0300
+@@ -83,7 +83,17 @@
+ 	../images/st_touches04.png \
+ 	../images/st_touches05.png \
+ 	../images/st_touches06.png \
+-	../images/st_within01.png
++	../images/st_within01.png \
++	../images/caution.png \
++	../images/check.png \
++	../images/important.png \
++	../images/note.png \
++	../images/tip.png \
++	../images/warning.png \
++	../images/matrix_autocast.png \
++	../images/matrix_transform.png \
++	../images/matrix_checkmark.png
++
+ 
+ # Images that are created with dimensions 100x100
+ IMAGES_RESIZED= \
+@@ -132,5 +139,10 @@
+ clean:
+ 	@rm -f $(OBJS)
+ 	@rm -f generator
+-	@rm -f tmp[0-9].png
++	@rm -f tmp[0-9].png'
++
++install:
++	@mkdir -p $(DOCSDIR)/images
++	cp $(IMAGES) $(DOCSDIR)/images
++
+ 
diff -Nur postgis.old/files/patch-postgis-Makefile.in postgis/files/patch-postgis-Makefile.in
--- postgis.old/files/patch-postgis-Makefile.in	2010-02-01 12:43:46.000000000 -0200
+++ postgis/files/patch-postgis-Makefile.in	2010-02-28 18:50:26.000000000 -0300
@@ -1,34 +1,34 @@
---- postgis/Makefile.in.orig	2009-11-14 06:26:00.000000000 +0800
-+++ postgis/Makefile.in	2010-01-22 11:41:18.000000000 +0800
-@@ -12,6 +12,10 @@
- 
+--- postgis/Makefile.in.orig	2010-01-08 20:48:29.000000000 -0200
++++ postgis/Makefile.in	2010-02-28 14:18:37.000000000 -0300
+@@ -13,6 +13,10 @@
  MODULE_big=postgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@
+ MODULEDIR=contrib/$(MODULE_big)
  
 +override datadir := $(DATADIR)
 +override bindir := $(PREFIX)/bin
 +override pkglibdir := $(PREFIX)/lib/postgresql
 +
  # Files to be copied to the contrib/ directory
- DATA_built=postgis.sql uninstall_postgis.sql postgis_upgrade_14_minor.sql postgis_upgrade_13_to_14.sql postgis_upgrade_12_to_14.sql
+ DATA_built=postgis.sql uninstall_postgis.sql postgis_upgrade_15_minor.sql postgis_upgrade_14_to_15.sql postgis_upgrade_13_to_15.sql
  DATA=../spatial_ref_sys.sql
-@@ -73,16 +77,16 @@
+@@ -103,16 +107,16 @@
  
  # Borrow the $libdir substitution from PGXS but customise by adding the version number
  %.sql: %.sql.in
--	sed 's,MODULE_PATHNAME,$$libdir/$*-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@,g' $< >$@
+-	sed 's,MODULE_PATHNAME,$$libdir/postgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@,g' $< >$@
 +	sed 's,MODULE_PATHNAME,$$libdir/$*,g' $< >$@
  
- postgis_upgrade_14_minor.sql: postgis.sql
+ postgis_upgrade_15_minor.sql: postgis.sql
+-	$(PERL) ../utils/postgis_proc_upgrade.pl $< 1.5 > $@
++	%PERL% ../utils/postgis_proc_upgrade.pl $< 1.5 > $@
+ 
+ postgis_upgrade_14_to_15.sql: postgis.sql
 -	$(PERL) ../utils/postgis_proc_upgrade.pl $< 1.4 > $@
 +	%PERL% ../utils/postgis_proc_upgrade.pl $< 1.4 > $@
  
- postgis_upgrade_13_to_14.sql: postgis.sql
+ postgis_upgrade_13_to_15.sql: postgis.sql
 -	$(PERL) ../utils/postgis_proc_upgrade.pl $< 1.3 > $@
 +	%PERL% ../utils/postgis_proc_upgrade.pl $< 1.3 > $@
  
- postgis_upgrade_12_to_14.sql: postgis.sql
--	$(PERL) ../utils/postgis_proc_upgrade.pl $< 1.2 > $@
-+	%PERL% ../utils/postgis_proc_upgrade.pl $< 1.2 > $@
- 
  # Generate any .sql.in files from .sql.in.c files by running them through the C pre-processor 
  $(SQL_OBJS): %.in: %.in.c
diff -Nur postgis.old/pkg-plist postgis/pkg-plist
--- postgis.old/pkg-plist	2010-02-01 12:43:46.000000000 -0200
+++ postgis/pkg-plist	2010-02-28 19:09:15.000000000 -0300
@@ -1,15 +1,15 @@
 bin/pgsql2shp
 bin/shp2pgsql
-lib/postgresql/postgis-1.4.so
-lib/postgresql/postgis.so
 lib/postgresql/liblwgeom.so
 lib/postgresql/liblwgeom.so.1
-%%DATADIR%%/contrib/postgis.sql
-%%DATADIR%%/contrib/postgis_upgrade_14_minor.sql
-%%DATADIR%%/contrib/postgis_upgrade_13_to_14.sql
-%%DATADIR%%/contrib/postgis_upgrade_12_to_14.sql
-%%DATADIR%%/contrib/spatial_ref_sys.sql
-%%DATADIR%%/contrib/uninstall_postgis.sql
+lib/postgresql/postgis-1.5.so
+lib/postgresql/postgis.so
+%%DATADIR%%/contrib/postgis-1.5/postgis.sql
+%%DATADIR%%/contrib/postgis-1.5/postgis_upgrade_13_to_15.sql
+%%DATADIR%%/contrib/postgis-1.5/postgis_upgrade_14_to_15.sql
+%%DATADIR%%/contrib/postgis-1.5/postgis_upgrade_15_minor.sql
+%%DATADIR%%/contrib/postgis-1.5/spatial_ref_sys.sql
+%%DATADIR%%/contrib/postgis-1.5/uninstall_postgis.sql
 %%DATADIR%%/utils/create_undef.pl
 %%DATADIR%%/utils/new_postgis_restore.pl
 %%DATADIR%%/utils/postgis_proc_upgrade.pl
@@ -17,7 +17,9 @@
 %%DATADIR%%/utils/profile_intersects.pl
 %%DATADIR%%/utils/test_estimation.pl
 %%DATADIR%%/utils/test_joinestimation.pl
-@dirrm %%DATADIR%%/utils
-@dirrm %%DATADIR%%/contrib
-@dirrm %%DATADIR%%
+@dirrmtry %%DATADIR%%/utils
+@dirrmtry %%DATADIR%%/contrib/postgis-1.5
+@dirrmtry %%DATADIR%%/contrib
+@dirrmtry %%DATADIR%%
 @dirrmtry lib/postgresql
+@dirrmtry lib
Comment 1 Wen Heping freebsd_committer freebsd_triage 2010-03-01 02:23:31 UTC
Responsible Changed
From-To: freebsd-ports-bugs->wen

I'll take it.
Comment 2 wenheping 2010-03-01 07:19:08 UTC
The patch has 2 problem:

1 postgis-1.5 require postgresql>8.2, while default postgresql version is
8.2 , so you should fix it.

2 When NOPORTSDOC is defined, the build will fail. it should be fixed too.


Regards,
wen
Comment 3 gebhart 2010-03-02 21:30:24 UTC
There is a third problem:

geos is listed in BUILD_DEPENDS , but as libgeos.so.* is required
at runtime, it should be listet in LIB_DEPENDS or even RUN_DEPENDS (I'm not
sure which one it should be).
I just stumbled across that problem, when I tried to use postgis.

-- 
Ralf 'Snake' Gebhart
Comment 4 wenheping 2010-03-02 22:32:46 UTC
On Wed, Mar 3, 2010 at 5:40 AM, Ralf Gebhart <gebhart@secnetix.de> wrote:

> The following reply was made to PR ports/144378; it has been noted by
> GNATS.
>
> From: Ralf Gebhart <gebhart@secnetix.de>
> To: bug-followup@FreeBSD.org, anderson@cnpm.embrapa.br
> Cc:
> Subject: Re: ports/144378: [maintainer-update] databases/postgis: Update to
> 1.5.0
> Date: Tue, 2 Mar 2010 22:30:24 +0100
>
>  There is a third problem:
>
>  geos is listed in BUILD_DEPENDS , but as libgeos.so.* is required
>  at runtime, it should be listet in LIB_DEPENDS or even RUN_DEPENDS (I'm
> not
>  sure which one it should be).
>  I just stumbled across that problem, when I tried to use postgis.
>

Thank you.

I think it should in LIB_DEPENDS.

wen


>
>  --
>  Ralf 'Snake' Gebhart
>
Comment 5 dfilter service freebsd_committer freebsd_triage 2010-03-26 03:01:03 UTC
wen         2010-03-26 03:00:34 UTC

  FreeBSD ports repository

  Modified files:
    databases/postgis    Makefile distinfo pkg-plist 
    databases/postgis/files patch-doc-Makefile.in 
                            patch-postgis-Makefile.in 
  Added files:
    databases/postgis/files patch-doc-html-image_src-Makefile.in 
  Log:
  - Update to 1.5.0
  
  PR:             ports/144378
  Submitted by:   Anderson Soares Ferreira <anderson@cnpm.embrapa.br> (maintainer)
  
  Revision  Changes    Path
  1.58      +5 -3      ports/databases/postgis/Makefile
  1.30      +3 -3      ports/databases/postgis/distinfo
  1.2       +22 -3     ports/databases/postgis/files/patch-doc-Makefile.in
  1.1       +30 -0     ports/databases/postgis/files/patch-doc-html-image_src-Makefile.in (new)
  1.4       +13 -13    ports/databases/postgis/files/patch-postgis-Makefile.in
  1.14      +13 -11    ports/databases/postgis/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 6 Wen Heping freebsd_committer freebsd_triage 2010-03-26 03:01:20 UTC
State Changed
From-To: open->closed

Committed. Thanks!