From anderson@cnpm.embrapa.br Fri Aug 7 19:04:36 2009 Return-Path: Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F023F1065679 for ; Fri, 7 Aug 2009 19:04:36 +0000 (UTC) (envelope-from anderson@cnpm.embrapa.br) Received: from inga.cnpm.embrapa.br (inga.cnpm.embrapa.br [200.136.111.23]) by mx1.freebsd.org (Postfix) with ESMTP id 1ED238FC1A for ; Fri, 7 Aug 2009 19:04:35 +0000 (UTC) Received: from caraiba.cnpm.embrapa.br (caraiba.cnpm.embrapa.br [200.136.111.98]) by inga.cnpm.embrapa.br (Postfix) with ESMTP id 7F5B2CF0D1 for ; Fri, 7 Aug 2009 16:04:36 -0300 (BRT) Received: from localhost (localhost [127.0.0.1]) by caraiba.cnpm.embrapa.br (Postfix) with ESMTP id E539C3F42D for ; Fri, 7 Aug 2009 16:04:33 -0300 (BRT) Received: from localhost (localhost [127.0.0.1]) by caraiba.cnpm.embrapa.br (Postfix) with ESMTP id E2EFC3F42C for ; Fri, 7 Aug 2009 16:04:33 -0300 (BRT) Received: from caraiba.cnpm.embrapa.br ([127.0.0.1]) by localhost (caraiba.cnpm.embrapa.br [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yO8S5wZlcNN4 for ; Fri, 7 Aug 2009 16:04:33 -0300 (BRT) Received: by caraiba.cnpm.embrapa.br (Postfix, from userid 1100) id BAE9E3F42B; Fri, 7 Aug 2009 16:04:33 -0300 (BRT) Message-Id: <20090807190433.BAE9E3F42B@caraiba.cnpm.embrapa.br> Date: Fri, 7 Aug 2009 16:04:33 -0300 (BRT) From: Anderson S. Ferreira Reply-To: Anderson S. Ferreira To: FreeBSD-gnats-submit@freebsd.org Cc: Subject: [maintainer-update] databases/postgis: Upgrade from 1.3.6 to 1.4.0 X-Send-Pr-Version: 3.113 X-GNATS-Notify: >Number: 137537 >Category: ports >Synopsis: [maintainer-update] databases/postgis: Upgrade from 1.3.6 to 1.4.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: skreuzer >State: closed >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Aug 07 19:10:01 UTC 2009 >Closed-Date: Wed Oct 07 14:11:13 UTC 2009 >Last-Modified: Wed Oct 7 14:20:02 UTC 2009 >Originator: Anderson S. Ferreira >Release: FreeBSD 7.2-STABLE amd64 >Organization: Embrapa Monitoramento por Satelite >Environment: System: FreeBSD caraiba.cnpm.embrapa.br 7.2-STABLE FreeBSD 7.2-STABLE #0: Wed Jun 10 18:30:48 BRT 2009 root@caraiba.cnpm.embrapa.br:/usr/src/sys/amd64/compile/CARAIBA amd64 >Description: Upgrade to 1.4.0 This is a significant release including many performance enhancements, bug fixes, improved internal testing system, more detailed documentation. Some features: * API Stability - new policies surrounding minor releases * Support for PostgreSQL 8.4 * New methods - ST_GeoHash, ST_LineCrossingDirection, ST_AsGeoJSON, ST_MinimumBoundingCircle to name a few * Significant performance improvements for many spatial operations, including ST_Union, ST_Intersects, ST_Contains, and ST_Within * Vastly improved documentation and reference manual * Improved build system, library structure, debugging framework, unit testing * More stable support for CIRCULARSTRING, COMPOUNDCURVE and CURVEPOLYGON More details: http://www.postgis.org/news/20090724/ >How-To-Repeat: >Fix: --- postgis.patch begins here --- diff -Nru postgis.old/Makefile postgis/Makefile --- postgis.old/Makefile 2009-05-18 13:11:10.000000000 -0300 +++ postgis/Makefile 2009-08-07 15:56:44.000000000 -0300 @@ -6,13 +6,15 @@ # PORTNAME= postgis -DISTVERSION= 1.3.6 +DISTVERSION= 1.4.0 CATEGORIES= databases geography -MASTER_SITES= http://postgis.refractions.net/download/ +MASTER_SITES= http://postgis.refractions.net/download/ \ + http://www.postgis.org/download/ MAINTAINER= anderson@cnpm.embrapa.br COMMENT= Adds support for geographic objects to PostgreSQL databases +BUILD_DEPENDS= ${LOCALBASE}/bin/geos-config:${PORTSDIR}/graphics/geos LIB_DEPENDS= proj.5:${PORTSDIR}/graphics/proj RUN_DEPENDS= postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server @@ -24,52 +26,44 @@ INSTALL_TARGET= install -OPTIONS= GEOS "Include GEOS - the OpenGIS 'Simple Features for SQL'" off \ - UTF8 "UTF-8 support for shp2pgsql. (needs libiconv)" off - GNU_CONFIGURE= yes -CONFIGURE_ARGS= --datadir=${PREFIX}/share/postgis \ - --bindir=${PREFIX}/bin \ - --libdir=${PREFIX}/lib \ - --with-proj +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib +MAKE_ENV= DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} +CONFIGURE_ARGS= --with-projdir=${LOCALBASE} .include .if !defined(NOPORTDOCS) BUILD_DEPENDS+= xsltproc:${PORTSDIR}/textproc/libxslt \ ${LOCALBASE}/share/xsl/docbook/html/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl -MAKE_ARGS+= WITH-DOC=yes +CONFIGURE_ARGS+= --with-xsldir=/usr/local/share/xsl/docbook MAN1= pgsql2shp.1 shp2pgsql.1 PORTDOCS= * .else MAKE_ARGS+= NOPORTSDOC=yes .endif -.if defined(WITH_UTF8) -USE_ICONV= yes -MAKE_ENV+= "LDFLAGS=-L${LOCALBASE}/lib" -.else -CONFIGURE_ARGS+= --without-iconv -.endif - -.if defined(WITH_GEOS) -LIB_DEPENDS+= geos:${PORTSDIR}/graphics/geos -CONFIGURE_ARGS+= --with-geos=${LOCALBASE}/bin/geos-config -.else -CONFIGURE_ARGS+= --without-geos -.endif - -pre-everything:: - @${SH} ${PKGINSTALL} ${PORTNAME} MESSAGE +post-extract: + @${REINPLACE_CMD} -e 's#@ICONV_LDFLAGS@#-liconv -L${LOCALBASE}/lib#g' \ + ${WRKSRC}/loader/Makefile.in + +post-patch: + @${REINPLACE_CMD} -e 's#%PERL%#${PERL}#g' \ + ${WRKSRC}/postgis/Makefile.in post-install: + @${MKDIR} -p ${DATADIR}/utils + ${INSTALL_SCRIPT} ${WRKSRC}/utils/create_undef.pl ${DATADIR}/utils/ + ${INSTALL_SCRIPT} ${WRKSRC}/utils/new_postgis_restore.pl ${DATADIR}/utils/ + ${INSTALL_SCRIPT} ${WRKSRC}/utils/profile_intersects.pl ${DATADIR}/utils/ + ${INSTALL_SCRIPT} ${WRKSRC}/utils/postgis_proc_upgrade.pl ${DATADIR}/utils/ + ${INSTALL_SCRIPT} ${WRKSRC}/utils/test_estimation.pl ${DATADIR}/utils/ + ${INSTALL_SCRIPT} ${WRKSRC}/utils/postgis_restore.pl ${DATADIR}/utils/ + ${INSTALL_SCRIPT} ${WRKSRC}/utils/test_joinestimation.pl ${DATADIR}/utils/ @${MKDIR} ${PREFIX}/lib/postgresql - @${LN} -s ${PREFIX}/lib/liblwgeom.so.1 ${PREFIX}/lib/postgresql - @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL - -post-deinstall: - @ ${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGDEINSTALL} ${PORTNAME} POST-DEINSTALL + @${LN} -s ${PREFIX}/lib/postgresql/postgis-1.4.so ${PREFIX}/lib/postgresql/postgis.so + @${LN} -s ${PREFIX}/lib/postgresql/postgis-1.4.so ${PREFIX}/lib/postgresql/liblwgeom.so.1 + @${LN} -s ${PREFIX}/lib/postgresql/postgis-1.4.so ${PREFIX}/lib/postgresql/liblwgeom.so .include diff -Nru postgis.old/distinfo postgis/distinfo --- postgis.old/distinfo 2009-05-18 13:11:10.000000000 -0300 +++ postgis/distinfo 2009-08-07 10:40:11.000000000 -0300 @@ -1,4 +1,3 @@ -SIZE (postgis-1.3.6.tar.gz) = 2227317 -MD5 (postgis-1.3.6.tar.gz) = da590f0e485335e9cdaeb66c3d68aa24 -SHA256 (postgis-1.3.6.tar.gz) = d3b04d4a3439596a1f6368b0627f21762347cef1e0694d5471ef17c6a3b7d144 - +MD5 (postgis-1.4.0.tar.gz) = bc5b97d5399bd20ca90bfdf784ab6c33 +SHA256 (postgis-1.4.0.tar.gz) = 71c5ffde54a2ecbb88fbffa12ca18c617ecfe2404fb9049940cd1b7a06a7e38d +SIZE (postgis-1.4.0.tar.gz) = 3143966 diff -Nru postgis.old/files/patch-GNUmakefile postgis/files/patch-GNUmakefile --- postgis.old/files/patch-GNUmakefile 2007-08-31 07:32:16.000000000 -0300 +++ postgis/files/patch-GNUmakefile 2009-08-07 14:38:13.000000000 -0300 @@ -1,48 +1,36 @@ ---- GNUmakefile.orig 2007-07-11 05:12:42.000000000 +0800 -+++ GNUmakefile 2007-08-31 17:41:49.000000000 +0800 -@@ -4,9 +4,9 @@ +--- GNUmakefile.orig 2009-05-26 15:00:55.000000000 -0300 ++++ GNUmakefile 2009-08-07 14:36:10.000000000 -0300 +@@ -4,10 +4,10 @@ # #----------------------------------------------------- --all: Makefile.config liblwgeom loaderdumper utils -+all: Makefile.config liblwgeom loaderdumper utils docs +-all: postgis loaderdumper utils ++all: postgis loaderdumper utils docs + @echo "PostGIS was built successfully. Ready to install." --install: all liblwgeom-install loaderdumper-install -+install: all liblwgeom-install loaderdumper-install utils-install docs-install +-install: all postgis-install loaderdumper-install ++install: all postgis-install loaderdumper-install docs-install - uninstall: liblwgeom-uninstall loaderdumper-uninstall docs-uninstall + uninstall: postgis-uninstall loaderdumper-uninstall docs-uninstall comments-uninstall -@@ -72,21 +72,31 @@ +@@ -80,7 +80,9 @@ $(MAKE) -C extras/template_gis uninstall - docs: Makefile.config + docs: - $(MAKE) -C doc -+ifndef NOPORTSDOC -+ $(MAKE) -C doc ++ifndef NOPORTDOCS ++ $(MAKE) -C doc html/postgis.html +endif - docs-clean: Makefile.config -+ifndef NOPORTSDOC + docs-clean: $(MAKE) -C doc clean -- -+endif +@@ -95,7 +97,9 @@ + $(MAKE) -C doc comments-uninstall docs-install: -+ifndef NOPORTSDOC ++ifndef NOPORTDOCS $(MAKE) -C doc install +endif docs-uninstall: -+ifndef NOPORTSDOC $(MAKE) -C doc uninstall -+endif - - utils: - $(MAKE) -C utils - -+utils-install: -+ ${MAKE} -C utils install -+ - configure: configure.in - ./autogen.sh - diff -Nru postgis.old/files/patch-configure postgis/files/patch-configure --- postgis.old/files/patch-configure 2009-05-18 13:11:10.000000000 -0300 +++ postgis/files/patch-configure 1969-12-31 21:00:00.000000000 -0300 @@ -1,10 +0,0 @@ ---- configure 2009-05-04 15:03:04.000000000 -0300 -+++ configure 2009-05-18 08:36:54.000000000 -0300 -@@ -4806,6 +4806,7 @@ - /opt/local/share/xsl/docbook-xsl - /usr/local/share/xsl/docbook-xsl - /usr/share/xsl/docbook-xsl -+ /usr/local/share/xsl/docbook - " - for p in ${SEARCHPATH}; do - if test -r "${p}"/html/docbook.xsl; then diff -Nru postgis.old/files/patch-doc-Makefile.in postgis/files/patch-doc-Makefile.in --- postgis.old/files/patch-doc-Makefile.in 1969-12-31 21:00:00.000000000 -0300 +++ postgis/files/patch-doc-Makefile.in 2009-08-07 13:57:09.000000000 -0300 @@ -0,0 +1,21 @@ +--- doc/Makefile.in.orig 2009-08-07 13:20:39.000000000 -0300 ++++ doc/Makefile.in 2009-08-07 13:22:04.000000000 -0300 +@@ -135,12 +135,12 @@ + rm -f $(PGSQL_SHAREDIR)/contrib/postgis_comments.sql + + install: html/postgis.html man/shp2pgsql.1 man/pgsql2shp.1 +- @mkdir -p $(PGSQL_DOCDIR)/postgis +- @mkdir -p $(PGSQL_MANDIR)/man1 +- cp html/postgis.html $(PGSQL_DOCDIR)/postgis/postgis.html +- cp ../README.postgis $(PGSQL_DOCDIR)/postgis/README.postgis +- cp man/pgsql2shp.1 $(PGSQL_MANDIR)/man1/pgsql2shp.1 +- cp man/shp2pgsql.1 $(PGSQL_MANDIR)/man1/shp2pgsql.1 ++ @mkdir -p $(DOCSDIR) ++ @mkdir -p $(MANDIR)/man1 ++ cp html/postgis.html $(DOCSDIR)/postgis.html ++ cp ../README.postgis $(DOCSDIR)/README.postgis ++ cp man/pgsql2shp.1 $(PREFIX)/man/man1/pgsql2shp.1 ++ cp man/shp2pgsql.1 $(PREFIX)/man/man1/shp2pgsql.1 + + uninstall: + rm -f $(PGSQL_DOCDIR)/postgis/postgis.html diff -Nru postgis.old/files/patch-loader postgis/files/patch-loader --- postgis.old/files/patch-loader 2005-12-28 19:10:57.000000000 -0200 +++ postgis/files/patch-loader 1969-12-31 21:00:00.000000000 -0300 @@ -1,22 +0,0 @@ ---- loader/Makefile Fri Dec 16 14:47:24 2005 -+++ loader/Makefile Wed Dec 28 14:23:13 2005 -@@ -9,7 +9,7 @@ - #--------------------------------------------------------------- - - ifeq ($(USE_ICONV),1) -- override CFLAGS += -DUSE_ICONV -+ override CFLAGS += -DUSE_ICONV -I/usr/local/include - override LDFLAGS += $(ICONV_LDFLAGS) - endif - ---- loader/shp2pgsql.c Tue Nov 1 07:25:47 2005 -+++ loader/shp2pgsql.c Wed Dec 28 14:23:13 2005 -@@ -33,7 +33,7 @@ - #include - #include - #include "getopt.h" --#ifdef HAVE_ICONV_H -+#ifdef USE_ICONV - #include - #endif - diff -Nru postgis.old/files/patch-loader-Makefile.in postgis/files/patch-loader-Makefile.in --- postgis.old/files/patch-loader-Makefile.in 1969-12-31 21:00:00.000000000 -0300 +++ postgis/files/patch-loader-Makefile.in 2009-08-07 11:59:30.000000000 -0300 @@ -0,0 +1,13 @@ +--- loader/Makefile.in.orig 2009-08-07 11:13:19.000000000 -0300 ++++ loader/Makefile.in 2009-08-07 11:14:01.000000000 -0300 +@@ -13,6 +13,10 @@ + CC=@CC@ + CFLAGS=@CFLAGS@ @PICFLAGS@ @WARNFLAGS@ + ++override datadir := $(DATADIR) ++override bindir := $(PREFIX)/bin ++override pkglibdir := $(PREFIX)/lib/postgresql ++ + # Filenames with extension as determined by the OS + PGSQL2SHP=pgsql2shp@EXESUFFIX@ + SHP2PGSQL=shp2pgsql@EXESUFFIX@ diff -Nru postgis.old/files/patch-lwgeom postgis/files/patch-lwgeom --- postgis.old/files/patch-lwgeom 2008-04-27 02:41:08.000000000 -0300 +++ postgis/files/patch-lwgeom 1969-12-31 21:00:00.000000000 -0300 @@ -1,11 +0,0 @@ ---- lwgeom/Makefile 2008-03-28 18:28:21.000000000 -0300 -+++ lwgeom/Makefile 2008-04-16 11:41:22.000000000 -0300 -@@ -122,7 +122,7 @@ - $(PERL) ../utils/postgis_proc_upgrade.pl ../lwpostgis.sql > ../lwpostgis_upgrade.sql - - ../lwpostgis.sql: lwpostgis.sql.in long_xact.sql.in sqlmm.sql.in sqldefines.h -- cpp -P -traditional-cpp $(SQL_FLAGS) $< | sed -e 's:@MODULE_FILENAME@:$(MODULE_FILENAME):g;s:@POSTGIS_VERSION@:$(POSTGIS_VERSION):g;s:@POSTGIS_SCRIPTS_VERSION@:$(SCRIPTS_VERSION):g;s/@POSTGIS_BUILD_DATE@/$(POSTGIS_BUILD_DATE)/g' | grep -v '^#' > $@ -+ cpp -P -traditional-cpp $(SQL_FLAGS) $< | sed -e 's:@MODULE_FILENAME@:$$libdir/liblwgeom.so.1:g;s:@POSTGIS_VERSION@:$(POSTGIS_VERSION):g;s:@POSTGIS_SCRIPTS_VERSION@:$(SCRIPTS_VERSION):g;s/@POSTGIS_BUILD_DATE@/$(POSTGIS_BUILD_DATE)/g' | grep -v '^#' > $@ - - ../regress/lwpostgis.sql: lwpostgis.sql.in long_xact.sql.in sqlmm.sql.in sqldefines.h - cpp -P -traditional-cpp $(SQL_FLAGS) $< | sed -e 's#@MODULE_FILENAME@#$(MODULE_FILENAME)#g;s#@POSTGIS_VERSION@#$(POSTGIS_VERSION)#g;s#@POSTGIS_SCRIPTS_VERSION@#$(SCRIPTS_VERSION)#g;s/@POSTGIS_BUILD_DATE@/$(POSTGIS_BUILD_DATE)/g' | grep -v '^#' > $@ diff -Nru postgis.old/files/patch-postgis-Makefile.in postgis/files/patch-postgis-Makefile.in --- postgis.old/files/patch-postgis-Makefile.in 1969-12-31 21:00:00.000000000 -0300 +++ postgis/files/patch-postgis-Makefile.in 2009-08-07 15:19:29.000000000 -0300 @@ -0,0 +1,22 @@ +--- postgis/Makefile.in.orig 2009-06-06 11:09:39.000000000 -0300 ++++ postgis/Makefile.in 2009-08-07 15:18:27.000000000 -0300 +@@ -12,6 +12,10 @@ + + MODULE_big=postgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@ + ++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.sql + DATA=../spatial_ref_sys.sql +@@ -73,7 +77,7 @@ + + # 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/$*,g' $< >$@ + + postgis_upgrade.sql: postgis.sql + $(PERL) ../utils/postgis_proc_upgrade.pl $< > $@ diff -Nru postgis.old/files/patch-utils postgis/files/patch-utils --- postgis.old/files/patch-utils 2005-12-28 19:10:57.000000000 -0200 +++ postgis/files/patch-utils 1969-12-31 21:00:00.000000000 -0300 @@ -1,22 +0,0 @@ ---- utils/Makefile Mon Jun 6 13:49:41 2005 -+++ utils/Makefile Wed Dec 28 15:33:31 2005 -@@ -1,3 +1,6 @@ -+include ../Makefile.config -+include ../Version.config -+ - SCRIPTS = \ - postgis_restore.pl \ - create_undef.pl \ -@@ -8,3 +11,12 @@ - - all: - chmod +x $(SCRIPTS) -+ -+install: -+ @mkdir -p $(DESTDIR)$(datadir)/utils -+ $(INSTALL_DATA) README $(DESTDIR)$(datadir)/utils/README -+ $(INSTALL_DATA) create_undef.pl $(DESTDIR)$(datadir)/utils/create_undef.pl -+ $(INSTALL_DATA) postgis_restore.pl $(DESTDIR)$(datadir)/utils/postgis_restore.pl -+ $(INSTALL_DATA) profile_intersects.pl $(DESTDIR)$(datadir)/utils/profile_intersects.pl -+ $(INSTALL_DATA) test_estimation.pl $(DESTDIR)$(datadir)/utils/test_estimation.pl -+ $(INSTALL_DATA) test_joinestimation.pl $(DESTDIR)$(datadir)/utils/test_joinestimation.pl diff -Nru postgis.old/pkg-plist postgis/pkg-plist --- postgis.old/pkg-plist 2006-01-22 03:52:10.000000000 -0200 +++ postgis/pkg-plist 2009-08-07 15:28:47.000000000 -0300 @@ -1,19 +1,21 @@ bin/pgsql2shp bin/shp2pgsql -lib/liblwgeom.so -lib/liblwgeom.so.1 +lib/postgresql/postgis-1.4.so +lib/postgresql/postgis.so +lib/postgresql/liblwgeom.so lib/postgresql/liblwgeom.so.1 -%%DATADIR%%/lwpostgis.sql -%%DATADIR%%/lwpostgis_upgrade.sql -%%DATADIR%%/spatial_ref_sys.sql -%%DATADIR%%/utils/postgis_restore.pl -%%DATADIR%%/utils/profile_intersects.pl -%%DATADIR%%/utils/test_estimation.pl -%%DATADIR%%/utils/test_joinestimation.pl -%%DATADIR%%/utils/create_undef.pl -%%DATADIR%%/utils/README -%%PORTDOCS%%@dirrmtry %%DOCSDIR%% +share/postgis/contrib/postgis.sql +share/postgis/contrib/postgis_upgrade.sql +share/postgis/contrib/spatial_ref_sys.sql +share/postgis/contrib/uninstall_postgis.sql +share/postgis/utils/create_undef.pl +share/postgis/utils/new_postgis_restore.pl +share/postgis/utils/postgis_proc_upgrade.pl +share/postgis/utils/postgis_restore.pl +share/postgis/utils/profile_intersects.pl +share/postgis/utils/test_estimation.pl +share/postgis/utils/test_joinestimation.pl +@dirrm share/postgis/utils +@dirrm share/postgis/contrib +@dirrm share/postgis @dirrmtry lib/postgresql -@dirrmtry %%DATADIR%%/utils -@dirrmtry %%DATADIR%% -@dirrmtry lib --- postgis.patch ends here --- --- 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. >Release-Note: >Audit-Trail: Responsible-Changed-From-To: freebsd-ports-bugs->skreuzer Responsible-Changed-By: skreuzer Responsible-Changed-When: Fri Aug 7 20:11:28 UTC 2009 Responsible-Changed-Why: I'll take it. http://www.freebsd.org/cgi/query-pr.cgi?pr=137537 From: Steven Kreuzer To: bug-followup@FreeBSD.org, anderson@cnpm.embrapa.br Cc: Subject: Re: ports/137537: [maintainer-update] databases/postgis: Upgrade from 1.3.6 to 1.4.0 Date: Thu, 17 Sep 2009 16:20:17 -0400 --Apple-Mail-997-33710288 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii; format=flowed; delsp=yes This seems to be bombing in my tinderbox. Can you review the attached log and make any necessary changes. Thanks --Apple-Mail-997-33710288 Content-Disposition: attachment; filename=postgis-1.4.0.log Content-Type: application/octet-stream; x-unix-mode=0644; name="postgis-1.4.0.log" Content-Transfer-Encoding: 7bit building postgis-1.4.0 in directory /usr/local/tinderbox/7.1-FreeBSD build started at Fri Sep 4 14:30:21 UTC 2009 port directory: /usr/ports/databases/postgis building for: 7.1-RELEASE-p5 amd64 maintained by: anderson@cnpm.embrapa.br Makefile ident: $FreeBSD: ports/databases/postgis/Makefile,v 1.51 2009/08/14 21:29:24 miwi Exp $ prefixes: LOCALBASE=usr/local X11BASE=usr/local PREFIX=/usr/local Begin Configuration: ---Begin Environment--- ARCH=amd64 PACKAGE_BUILDING=1 USER=root CCACHE_DIR= BRANCH=RELEASE-p5 CCACHE_NOLINK=1 HOST_WORKDIR= X11BASE=/usr/local BATCH=1 OLDPWD=/ HOME=/root FORCE_PACKAGE=yes SRCBASE=/usr/local/tinderbox/jails/7.1/src PKGZIPCMD=bzip2 HAVE_MOTIF=1 FTP_TIMEOUT=900 HTTP_TIMEOUT=900 defaultUpdateHost=cvsup7.FreeBSD.org pb=/usr/local/tinderbox DISTFILE_CACHE=/usr/scratch/distfiles OSREL=7.1 defaultUpdateType=CSUP TINDERD_LOGFILE=/dev/null PORTOBJFORMAT=elf WRKDIRPREFIX=/work DISTDIR=/tmp/distfiles DISTCACHE=/distcache CCACHE_LOGFILE= PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/local/bin PACKAGES=/tmp/packages NOPORTDATA=yes TIMEOUT=7200 PKGSUFFIX=.tbz OSVERSION=701000 OPTIONS_ENABLED=0 __DSVERSION__=3.2 TINDERD_SLEEPTIME=120 UNAME_n=tinderbox.host __MKLVL__=1 CCACHE_JAIL=0 LOCALBASE=/usr/local CCACHE_MAX_SIZE=1G DISTFILE_URI= X_WINDOW_SYSTEM=xorg MASTER_SITE_OVERRIDE=file:///distcache/${DIST_SUBDIR}/ OPTIONS_DIR= UNAME_r=7.1-RELEASE-p5 USA_RESIDENT=YES UNAME_s=FreeBSD PARALLEL_PACKAGE_BUILD=1 PWD=/usr/ports/databases/postgis UNAME_v=FreeBSD 7.1-RELEASE-p5 #0: Fri Sep 4 10:25:12 EDT 2009 root@tinderbox.host:/usr/src/sys/magic/kernel/path FTP_PASSIVE_MODE=yes NOPORTEXAMPLES=yes CCACHE_ENABLED=0 INDEXFILE=INDEX-7 NOPORTDOCS=yes ---End Environment--- ---Begin OPTIONS List--- ---End OPTIONS List--- End Configuration. FETCH_DEPENDS= PATCH_DEPENDS=perl-5.8.9_3.tbz EXTRACT_DEPENDS=perl-5.8.9_3.tbz BUILD_DEPENDS=perl-5.8.9_3.tbz geos-3.1.1.tbz gettext-0.17_1.tbz libiconv-1.13.1.tbz gmake-3.81_3.tbz m4-1.4.13,1.tbz bison-2.4.1,1.tbz proj-4.6.1.tbz postgresql-client-8.2.13.tbz RUN_DEPENDS=proj-4.6.1.tbz gettext-0.17_1.tbz libiconv-1.13.1.tbz postgresql-client-8.2.13.tbz postgresql-server-8.2.13.tbz add_pkg ================================================================ ======================================== => postgis-1.4.0.tar.gz doesn't seem to exist in /tmp/distfiles/. => Attempting to fetch from file:///distcache//. postgis-1.4.0.tar.gz 3070 kB 385 MBps => MD5 Checksum OK for postgis-1.4.0.tar.gz. => SHA256 Checksum OK for postgis-1.4.0.tar.gz. ================================================================ ======================================== add_pkg perl-5.8.9_3.tbz adding dependencies pkg_add perl-5.8.9_3.tbz Removing stale symlinks from /usr/bin... Skipping /usr/bin/perl Skipping /usr/bin/perl5 Done. Creating various symlinks in /usr/bin... Symlinking /usr/local/bin/perl5.8.9 to /usr/bin/perl Symlinking /usr/local/bin/perl5.8.9 to /usr/bin/perl5 Done. Cleaning up /etc/make.conf... Done. Spamming /etc/make.conf... Done. Cleaning up /etc/manpath.config... Done. Spamming /etc/manpath.config... Done. ===> Extracting for postgis-1.4.0 => MD5 Checksum OK for postgis-1.4.0.tar.gz. => SHA256 Checksum OK for postgis-1.4.0.tar.gz. ===> postgis-1.4.0 depends on file: /usr/local/bin/perl5.8.9 - found Deleting perl-5.8.9_3 Removing stale symlinks from /usr/bin... Removing /usr/bin/perl Removing /usr/bin/perl5 Done. Cleaning up /etc/make.conf... Done. Cleaning up /etc/manpath.config... Done. ================================================================ ======================================== add_pkg perl-5.8.9_3.tbz adding dependencies pkg_add perl-5.8.9_3.tbz Removing stale symlinks from /usr/bin... Skipping /usr/bin/perl Skipping /usr/bin/perl5 Done. Creating various symlinks in /usr/bin... Symlinking /usr/local/bin/perl5.8.9 to /usr/bin/perl Symlinking /usr/local/bin/perl5.8.9 to /usr/bin/perl5 Done. Cleaning up /etc/make.conf... Done. Spamming /etc/make.conf... Done. Cleaning up /etc/manpath.config... Done. Spamming /etc/manpath.config... Done. ===> Patching for postgis-1.4.0 ===> postgis-1.4.0 depends on file: /usr/local/bin/perl5.8.9 - found ===> Applying FreeBSD patches for postgis-1.4.0 I can't seem to find a patch in there anywhere. I can't seem to find a patch in there anywhere. I can't seem to find a patch in there anywhere. I can't seem to find a patch in there anywhere. Deleting perl-5.8.9_3 Removing stale symlinks from /usr/bin... Removing /usr/bin/perl Removing /usr/bin/perl5 Done. Cleaning up /etc/make.conf... Done. Cleaning up /etc/manpath.config... Done. ================================================================ ======================================== add_pkg perl-5.8.9_3.tbz geos-3.1.1.tbz gettext-0.17_1.tbz libiconv-1.13.1.tbz gmake-3.81_3.tbz m4-1.4.13,1.tbz bison-2.4.1,1.tbz proj-4.6.1.tbz postgresql-client-8.2.13.tbz adding dependencies pkg_add perl-5.8.9_3.tbz Removing stale symlinks from /usr/bin... Skipping /usr/bin/perl Skipping /usr/bin/perl5 Done. Creating various symlinks in /usr/bin... Symlinking /usr/local/bin/perl5.8.9 to /usr/bin/perl Symlinking /usr/local/bin/perl5.8.9 to /usr/bin/perl5 Done. Cleaning up /etc/make.conf... Done. Spamming /etc/make.conf... Done. Cleaning up /etc/manpath.config... Done. Spamming /etc/manpath.config... Done. pkg_add geos-3.1.1.tbz pkg_add gettext-0.17_1.tbz pkg_add libiconv-1.13.1.tbz skipping libiconv-1.13.1, already added pkg_add gmake-3.81_3.tbz pkg_add m4-1.4.13,1.tbz pkg_add bison-2.4.1,1.tbz pkg_add proj-4.6.1.tbz pkg_add postgresql-client-8.2.13.tbz The PostgreSQL port has a collection of "side orders": postgresql-doc For all of the html documentation p5-Pg A perl5 API for client access to PostgreSQL databases. postgresql-tcltk If you want tcl/tk client support. postgresql-jdbc For Java JDBC support. postgresql-odbc For client access from unix applications using ODBC as access method. Not needed to access unix PostgreSQL servers from Win32 using ODBC. See below. ruby-postgres, py-PyGreSQL For client access to PostgreSQL databases using the ruby & python languages. p5-postgresql-plperl, postgresql-pltcl & postgresql-plruby For using perl5, tcl & ruby as procedural languages. postgresql-contrib Lots of contributed utilities, postgresql functions and datatypes. There you find autovacuum, pgcrypto and many other cool things. etc... ===> postgis-1.4.0 depends on file: /usr/local/bin/geos-config - found ===> postgis-1.4.0 depends on executable: gmake - found ===> postgis-1.4.0 depends on executable: bison - found ===> postgis-1.4.0 depends on file: /usr/local/bin/perl5.8.9 - found ===> postgis-1.4.0 depends on shared library: proj.5 - found ===> postgis-1.4.0 depends on shared library: pq.5 - found ===> Configuring for postgis-1.4.0 checking build system type... amd64-portbld-freebsd7.1 checking host system type... amd64-portbld-freebsd7.1 checking for gcc... cc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether cc accepts -g... yes checking for cc option to accept ISO C89... none needed checking for a sed that does not truncate output... /usr/bin/sed checking for grep that handles long lines and -e... /usr/bin/grep checking for egrep... /usr/bin/grep -E checking for fgrep... /usr/bin/grep -F checking for ld used by cc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... (cached) 262144 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... no checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for ar... ar checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from cc object... ok checking how to run the C preprocessor... cc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if cc supports -fno-rtti -fno-exceptions... no checking for cc option to produce PIC... -fPIC -DPIC checking if cc PIC flag -fPIC -DPIC works... yes checking if cc static flag -static works... yes checking if cc supports -c -o file.o... yes checking if cc supports -c -o file.o... (cached) yes checking whether the cc linker (/usr/bin/ld) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... freebsd7.1 ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for gcc... (cached) cc checking whether we are using the GNU C compiler... (cached) yes checking whether cc accepts -g... (cached) yes checking for cc option to accept ISO C89... (cached) none needed checking how to run the C preprocessor... cc -E checking whether we are using the GNU C++ compiler... yes checking whether c++ accepts -g... yes checking whether we are using the GNU C++ compiler... (cached) yes checking whether c++ accepts -g... (cached) yes checking how to run the C++ preprocessor... c++ -E checking for ld used by c++... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking whether the c++ linker (/usr/bin/ld) supports shared libraries... yes checking for c++ option to produce PIC... -fPIC -DPIC checking if c++ PIC flag -fPIC -DPIC works... yes checking if c++ static flag -static works... yes checking if c++ supports -c -o file.o... yes checking if c++ supports -c -o file.o... (cached) yes checking whether the c++ linker (/usr/bin/ld) supports shared libraries... yes checking dynamic linker characteristics... freebsd7.1 ld.so checking how to hardcode library paths into programs... immediate checking if c++ supports -Wall... yes checking if c++ supports -Wmissing-prototypes... yes checking for flex... flex checking lex output file root... lex.yy checking lex library... -lfl checking whether yytext is a pointer... yes checking for bison... bison -y checking ieeefp.h usability... yes checking ieeefp.h presence... yes checking for ieeefp.h... yes checking for convert... no configure: WARNING: ImageMagick does not seem to be installed. Documentation cannot be built checking for xsltproc... no configure: WARNING: xsltproc is not installed so documentation cannot be built checking for dblatex... no configure: WARNING: dblatex is not installed so PDF documentation cannot be built configure: WARNING: could not locate Docbook stylesheets required to build the documentation checking CUnit/CUnit.h usability... no checking CUnit/CUnit.h presence... no checking for CUnit/CUnit.h... no configure: WARNING: could not locate CUnit required for liblwgeom unit tests checking iconv.h usability... yes checking iconv.h presence... yes checking for iconv.h... yes checking for libiconv_open in -liconv... yes checking for pg_config... /usr/local/bin/pg_config checking libpq-fe.h usability... yes checking libpq-fe.h presence... yes checking for libpq-fe.h... yes checking for PQserverVersion in -lpq... yes checking for geos-config... /usr/local/bin/geos-config checking geos_c.h usability... yes checking geos_c.h presence... yes checking for geos_c.h... yes checking for initGEOS in -lgeos_c... yes Using user-specified proj directory: /usr/local checking proj_api.h usability... yes checking proj_api.h presence... yes checking for proj_api.h... yes checking for pj_get_release in -lproj... yes configure: creating ./config.status config.status: creating liblwgeom/Makefile config.status: creating liblwgeom/cunit/Makefile config.status: creating postgis/Makefile config.status: creating postgis/sqldefines.h config.status: creating loader/Makefile config.status: creating topology/Makefile config.status: creating regress/Makefile config.status: creating doc/Makefile config.status: creating doc/html/image_src/Makefile config.status: creating postgis_config.h config.status: executing libtool commands PostGIS is now configured for amd64-portbld-freebsd7.1 -------------- Compiler Info ------------- C compiler: cc -O2 -fno-strict-aliasing -pipe -I/usr/local/include C++ compiler: c++ -O2 -fno-strict-aliasing -pipe -I/usr/local/include -------------- Dependencies -------------- GEOS config: /usr/local/bin/geos-config GEOS version: 3.1 PostgreSQL config: /usr/local/bin/pg_config PostgreSQL version: 8.2 PROJ4 version: 46 PostGIS debug level: 0 -------- Documentation Generation -------- xsltproc: xsl style sheets: dblatex: convert: ===> Building for postgis-1.4.0 Using GNU make found at /usr/local/bin/gmake gmake[1]: Entering directory `/work/a/ports/databases/postgis/work/postgis-1.4.0' /usr/local/bin/gmake -C liblwgeom gmake[2]: Entering directory `/work/a/ports/databases/postgis/work/postgis-1.4.0/liblwgeom' cc -O2 -fno-strict-aliasing -pipe -I/usr/local/include -fPIC -DPIC -Wall -Wmissing-prototypes -c -o measures.o measures.c cc -O2 -fno-strict-aliasing -pipe -I/usr/local/include -fPIC -DPIC -Wall -Wmissing-prototypes -c -o box2d.o box2d.c cc -O2 -fno-strict-aliasing -pipe -I/usr/local/include -fPIC -DPIC -Wall -Wmissing-prototypes -c -o ptarray.o ptarray.c cc -O2 -fno-strict-aliasing -pipe -I/usr/local/include -fPIC -DPIC -Wall -Wmissing-prototypes -c -o lwgeom_api.o lwgeom_api.c cc -O2 -fno-strict-aliasing -pipe -I/usr/local/include -fPIC -DPIC -Wall -Wmissing-prototypes -c -o lwgeom.o lwgeom.c cc -O2 -fno-strict-aliasing -pipe -I/usr/local/include -fPIC -DPIC -Wall -Wmissing-prototypes -c -o lwpoint.o lwpoint.c cc -O2 -fno-strict-aliasing -pipe -I/usr/local/include -fPIC -DPIC -Wall -Wmissing-prototypes -c -o lwline.o lwline.c cc -O2 -fno-strict-aliasing -pipe -I/usr/local/include -fPIC -DPIC -Wall -Wmissing-prototypes -c -o lwpoly.o lwpoly.c cc -O2 -fno-strict-aliasing -pipe -I/usr/local/include -fPIC -DPIC -Wall -Wmissing-prototypes -c -o lwmpoint.o lwmpoint.c cc -O2 -fno-strict-aliasing -pipe -I/usr/local/include -fPIC -DPIC -Wall -Wmissing-prototypes -c -o lwmline.o lwmline.c cc -O2 -fno-strict-aliasing -pipe -I/usr/local/include -fPIC -DPIC -Wall -Wmissing-prototypes -c -o lwmpoly.o lwmpoly.c cc -O2 -fno-strict-aliasing -pipe -I/usr/local/include -fPIC -DPIC -Wall -Wmissing-prototypes -c -o lwcollection.o lwcollection.c cc -O2 -fno-strict-aliasing -pipe -I/usr/local/include -fPIC -DPIC -Wall -Wmissing-prototypes -c -o lwcircstring.o lwcircstring.c cc -O2 -fno-strict-aliasing -pipe -I/usr/local/include -fPIC -DPIC -Wall -Wmissing-prototypes -c -o lwcompound.o lwcompound.c cc -O2 -fno-strict-aliasing -pipe -I/usr/local/include -fPIC -DPIC -Wall -Wmissing-prototypes -c -o lwcurvepoly.o lwcurvepoly.c cc -O2 -fno-strict-aliasing -pipe -I/usr/local/include -fPIC -DPIC -Wall -Wmissing-prototypes -c -o lwmcurve.o lwmcurve.c cc -O2 -fno-strict-aliasing -pipe -I/usr/local/include -fPIC -DPIC -Wall -Wmissing-prototypes -c -o lwmsurface.o lwmsurface.c cc -O2 -fno-strict-aliasing -pipe -I/usr/local/include -fPIC -DPIC -Wall -Wmissing-prototypes -c -o lwutil.o lwutil.c cc -O2 -fno-strict-aliasing -pipe -I/usr/local/include -fPIC -DPIC -Wall -Wmissing-prototypes -c -o lwalgorithm.o lwalgorithm.c cc -O2 -fno-strict-aliasing -pipe -I/usr/local/include -fPIC -DPIC -Wall -Wmissing-prototypes -c -o lwgunparse.o lwgunparse.c cc -O2 -fno-strict-aliasing -pipe -I/usr/local/include -fPIC -DPIC -Wall -Wmissing-prototypes -c -o lwgparse.o lwgparse.c cc -O2 -fno-strict-aliasing -pipe -I/usr/local/include -fPIC -DPIC -Wall -Wmissing-prototypes -c -o lwsegmentize.o lwsegmentize.c cc -O2 -fno-strict-aliasing -pipe -I/usr/local/include -fPIC -DPIC -Wall -Wmissing-prototypes -c -o wktparse.tab.o wktparse.tab.c cc -O2 -fno-strict-aliasing -pipe -I/usr/local/include -fPIC -DPIC -Wall -Wmissing-prototypes -c -o lex.yy.o lex.yy.c lex.yy.c:4127: warning: 'yyunput' defined but not used cc -O2 -fno-strict-aliasing -pipe -I/usr/local/include -fPIC -DPIC -Wall -Wmissing-prototypes -c -o vsprintf.o vsprintf.c ar rs liblwgeom.a measures.o box2d.o ptarray.o lwgeom_api.o lwgeom.o lwpoint.o lwline.o lwpoly.o lwmpoint.o lwmline.o lwmpoly.o lwcollection.o lwcircstring.o lwcompound.o lwcurvepoly.o lwmcurve.o lwmsurface.o lwutil.o lwalgorithm.o lwgunparse.o lwgparse.o lwsegmentize.o wktparse.tab.o lex.yy.o vsprintf.o ar: creating liblwgeom.a gmake[2]: Leaving directory `/work/a/ports/databases/postgis/work/postgis-1.4.0/liblwgeom' /usr/local/bin/gmake -C postgis gmake[2]: Entering directory `/work/a/ports/databases/postgis/work/postgis-1.4.0/postgis' cc -E -traditional-cpp postgis.sql.in.c | grep -v '^#' > postgis.sql.in sed 's,MODULE_PATHNAME,$libdir/postgis,g' postgis.sql.in >postgis.sql cc -E -traditional-cpp uninstall_postgis.sql.in.c | grep -v '^#' > uninstall_postgis.sql.in sed 's,MODULE_PATHNAME,$libdir/uninstall_postgis,g' uninstall_postgis.sql.in >uninstall_postgis.sql "" ../utils/postgis_proc_upgrade.pl postgis.sql > postgis_upgrade.sql : Permission denied gmake[2]: *** [postgis_upgrade.sql] Error 127 gmake[2]: Leaving directory `/work/a/ports/databases/postgis/work/postgis-1.4.0/postgis' gmake[1]: *** [postgis] Error 2 gmake[1]: Leaving directory `/work/a/ports/databases/postgis/work/postgis-1.4.0' gmake: *** [all] Error 2 *** Error code 1 Stop in /a/ports/databases/postgis. ================================================================ build of /usr/ports/databases/postgis ended at Fri Sep 4 14:31:10 UTC 2009 --Apple-Mail-997-33710288 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii; format=flowed --Apple-Mail-997-33710288-- From: Anderson Soares Ferreira To: Steven Kreuzer Cc: bug-followup@FreeBSD.org Subject: Re: ports/137537: [maintainer-update] databases/postgis: Upgrade from 1.3.6 to 1.4.0 Date: Mon, 21 Sep 2009 07:45:32 -0300 This is a multi-part message in MIME format. --------------000900080805090600080201 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable Problem solved ! The attached file is a new patch with the corrections to= solve tinderbox build errors. Best regards Steven Kreuzer wrote: > This seems to be bombing in my tinderbox. Can you review the attached=20 > log and make any necessary changes. >=20 > Thanks >=20 >=20 --=20 Anderson Soares Ferreira - anderson@cnpm.embrapa.br Analista de Sistemas Embrapa Monitoramento por Sat=E9lite http://www.cnpm.embrapa.br Tel.: (19) 3211-6200 Fax: (19) 3211-6222/3211-6333 ---=0AAviso de confidencialidade:=0A=0AEsta mensagem da Empresa Brasileira = de Pesquisa Agropecu=E1ria (Embrapa), =0Aempresa p=FAblica federal regida pe= lo disposto na Lei Federal n=BA 5.851, =0Ade 7 de dezembro de 1972, =E9 envi= ada exclusivamente a seu destinat=E1rio =0Ae pode conter informa=E7=F5es con= fidenciais, protegidas por sigilo profissional. =0ASua utiliza=E7=E3o desaut= orizada =E9 ilegal e sujeita o infrator =E0s penas da lei. =0ASe voc=EA a re= cebeu indevidamente, queira, por gentileza, reenvi=E1-la ao emitente, =0Aesc= larecendo o equ=EDvoco.=0A=0AConfidentiality note:=0A=0AThis message from Em= presa Brasileira de Pesquisa Agropecu=E1ria (Embrapa), =0Aa government compa= ny established under Brazilian law (5.851/72), =0Ais directed exclusively to= its addressee and may contain confidential data, =0Aprotected under profess= ional secrecy rules. Its unauthorized use is illegal =0Aand may subject the = transgressor to the law's penalties. =0AIf you are not the addressee, please= send it back, elucidating the failure. =0A --------------000900080805090600080201 Content-Type: text/plain; name="postgis.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="postgis.patch" diff -Nru postgis.old/Makefile postgis/Makefile --- postgis.old/Makefile 2009-08-14 18:29:24.000000000 -0300 +++ postgis/Makefile 2009-09-20 09:50:12.000000000 -0300 @@ -6,14 +6,15 @@ # PORTNAME= postgis -DISTVERSION= 1.3.6 -PORTREVISION= 1 +DISTVERSION= 1.4.0 CATEGORIES= databases geography -MASTER_SITES= http://postgis.refractions.net/download/ +MASTER_SITES= http://postgis.refractions.net/download/ \ + http://www.postgis.org/download/ MAINTAINER= anderson@cnpm.embrapa.br COMMENT= Adds support for geographic objects to PostgreSQL databases +BUILD_DEPENDS= ${LOCALBASE}/bin/geos-config:${PORTSDIR}/graphics/geos LIB_DEPENDS= proj.5:${PORTSDIR}/graphics/proj RUN_DEPENDS= postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server @@ -25,52 +26,44 @@ INSTALL_TARGET= install -OPTIONS= GEOS "Include GEOS - the OpenGIS 'Simple Features for SQL'" off \ - UTF8 "UTF-8 support for shp2pgsql. (needs libiconv)" off - GNU_CONFIGURE= yes -CONFIGURE_ARGS= --datadir=${PREFIX}/share/postgis \ - --bindir=${PREFIX}/bin \ - --libdir=${PREFIX}/lib \ - --with-proj +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib +MAKE_ENV= DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} +CONFIGURE_ARGS= --with-projdir=${LOCALBASE} .include .if !defined(NOPORTDOCS) BUILD_DEPENDS+= xsltproc:${PORTSDIR}/textproc/libxslt \ ${LOCALBASE}/share/xsl/docbook/html/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl -MAKE_ARGS+= WITH-DOC=yes +CONFIGURE_ARGS+= --with-xsldir=${LOCALBASE}/share/xsl/docbook MAN1= pgsql2shp.1 shp2pgsql.1 PORTDOCS= * -.else -MAKE_ARGS+= NOPORTSDOC=yes -.endif - -.if defined(WITH_UTF8) -USE_ICONV= yes -MAKE_ENV+= "LDFLAGS=-L${LOCALBASE}/lib" -.else -CONFIGURE_ARGS+= --without-iconv -.endif - -.if defined(WITH_GEOS) -LIB_DEPENDS+= geos:${PORTSDIR}/graphics/geos -CONFIGURE_ARGS+= --with-geos=${LOCALBASE}/bin/geos-config -.else -CONFIGURE_ARGS+= --without-geos +#.else +#MAKE_ARGS+= NOPORTDOCS=yes .endif -pre-everything:: - @${SH} ${PKGINSTALL} ${PORTNAME} MESSAGE +post-extract: + @${REINPLACE_CMD} -e 's#@ICONV_LDFLAGS@#-liconv -L${LOCALBASE}/lib#g' \ + ${WRKSRC}/loader/Makefile.in + +post-patch: + @${REINPLACE_CMD} -e 's#%PERL%#${PERL}#g' \ + ${WRKSRC}/postgis/Makefile.in post-install: + @${MKDIR} ${DATADIR}/utils + ${INSTALL_SCRIPT} ${WRKSRC}/utils/create_undef.pl ${DATADIR}/utils/ + ${INSTALL_SCRIPT} ${WRKSRC}/utils/new_postgis_restore.pl ${DATADIR}/utils/ + ${INSTALL_SCRIPT} ${WRKSRC}/utils/profile_intersects.pl ${DATADIR}/utils/ + ${INSTALL_SCRIPT} ${WRKSRC}/utils/postgis_proc_upgrade.pl ${DATADIR}/utils/ + ${INSTALL_SCRIPT} ${WRKSRC}/utils/test_estimation.pl ${DATADIR}/utils/ + ${INSTALL_SCRIPT} ${WRKSRC}/utils/postgis_restore.pl ${DATADIR}/utils/ + ${INSTALL_SCRIPT} ${WRKSRC}/utils/test_joinestimation.pl ${DATADIR}/utils/ @${MKDIR} ${PREFIX}/lib/postgresql - @${LN} -s ${PREFIX}/lib/liblwgeom.so.1 ${PREFIX}/lib/postgresql - @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL - -post-deinstall: - @ ${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGDEINSTALL} ${PORTNAME} POST-DEINSTALL + @${LN} -s ${PREFIX}/lib/postgresql/postgis-1.4.so ${PREFIX}/lib/postgresql/postgis.so + @${LN} -s ${PREFIX}/lib/postgresql/postgis-1.4.so ${PREFIX}/lib/postgresql/liblwgeom.so.1 + @${LN} -s ${PREFIX}/lib/postgresql/postgis-1.4.so ${PREFIX}/lib/postgresql/liblwgeom.so .include diff -Nru postgis.old/distinfo postgis/distinfo --- postgis.old/distinfo 2009-05-18 13:11:10.000000000 -0300 +++ postgis/distinfo 2009-09-18 08:14:38.000000000 -0300 @@ -1,4 +1,3 @@ -SIZE (postgis-1.3.6.tar.gz) = 2227317 -MD5 (postgis-1.3.6.tar.gz) = da590f0e485335e9cdaeb66c3d68aa24 -SHA256 (postgis-1.3.6.tar.gz) = d3b04d4a3439596a1f6368b0627f21762347cef1e0694d5471ef17c6a3b7d144 - +MD5 (postgis-1.4.0.tar.gz) = bc5b97d5399bd20ca90bfdf784ab6c33 +SHA256 (postgis-1.4.0.tar.gz) = 71c5ffde54a2ecbb88fbffa12ca18c617ecfe2404fb9049940cd1b7a06a7e38d +SIZE (postgis-1.4.0.tar.gz) = 3143966 diff -Nru postgis.old/files/patch-GNUmakefile postgis/files/patch-GNUmakefile --- postgis.old/files/patch-GNUmakefile 2007-08-31 07:32:16.000000000 -0300 +++ postgis/files/patch-GNUmakefile 2009-09-18 08:14:38.000000000 -0300 @@ -1,48 +1,36 @@ ---- GNUmakefile.orig 2007-07-11 05:12:42.000000000 +0800 -+++ GNUmakefile 2007-08-31 17:41:49.000000000 +0800 -@@ -4,9 +4,9 @@ +--- GNUmakefile.orig 2009-05-26 15:00:55.000000000 -0300 ++++ GNUmakefile 2009-08-07 14:36:10.000000000 -0300 +@@ -4,10 +4,10 @@ # #----------------------------------------------------- --all: Makefile.config liblwgeom loaderdumper utils -+all: Makefile.config liblwgeom loaderdumper utils docs +-all: postgis loaderdumper utils ++all: postgis loaderdumper utils docs + @echo "PostGIS was built successfully. Ready to install." --install: all liblwgeom-install loaderdumper-install -+install: all liblwgeom-install loaderdumper-install utils-install docs-install +-install: all postgis-install loaderdumper-install ++install: all postgis-install loaderdumper-install docs-install - uninstall: liblwgeom-uninstall loaderdumper-uninstall docs-uninstall + uninstall: postgis-uninstall loaderdumper-uninstall docs-uninstall comments-uninstall -@@ -72,21 +72,31 @@ +@@ -80,7 +80,9 @@ $(MAKE) -C extras/template_gis uninstall - docs: Makefile.config + docs: - $(MAKE) -C doc -+ifndef NOPORTSDOC -+ $(MAKE) -C doc ++ifndef NOPORTDOCS ++ $(MAKE) -C doc html/postgis.html +endif - docs-clean: Makefile.config -+ifndef NOPORTSDOC + docs-clean: $(MAKE) -C doc clean -- -+endif +@@ -95,7 +97,9 @@ + $(MAKE) -C doc comments-uninstall docs-install: -+ifndef NOPORTSDOC ++ifndef NOPORTDOCS $(MAKE) -C doc install +endif docs-uninstall: -+ifndef NOPORTSDOC $(MAKE) -C doc uninstall -+endif - - utils: - $(MAKE) -C utils - -+utils-install: -+ ${MAKE} -C utils install -+ - configure: configure.in - ./autogen.sh - diff -Nru postgis.old/files/patch-configure postgis/files/patch-configure --- postgis.old/files/patch-configure 2009-05-18 13:11:10.000000000 -0300 +++ postgis/files/patch-configure 1969-12-31 21:00:00.000000000 -0300 @@ -1,10 +0,0 @@ ---- configure 2009-05-04 15:03:04.000000000 -0300 -+++ configure 2009-05-18 08:36:54.000000000 -0300 -@@ -4806,6 +4806,7 @@ - /opt/local/share/xsl/docbook-xsl - /usr/local/share/xsl/docbook-xsl - /usr/share/xsl/docbook-xsl -+ /usr/local/share/xsl/docbook - " - for p in ${SEARCHPATH}; do - if test -r "${p}"/html/docbook.xsl; then diff -Nru postgis.old/files/patch-doc-Makefile.in postgis/files/patch-doc-Makefile.in --- postgis.old/files/patch-doc-Makefile.in 1969-12-31 21:00:00.000000000 -0300 +++ postgis/files/patch-doc-Makefile.in 2009-09-20 10:13:54.000000000 -0300 @@ -0,0 +1,21 @@ +--- 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 @@ + rm -f $(PGSQL_SHAREDIR)/contrib/postgis_comments.sql + + install: html/postgis.html man/shp2pgsql.1 man/pgsql2shp.1 +- @mkdir -p $(PGSQL_DOCDIR)/postgis +- @mkdir -p $(PGSQL_MANDIR)/man1 +- cp html/postgis.html $(PGSQL_DOCDIR)/postgis/postgis.html +- cp ../README.postgis $(PGSQL_DOCDIR)/postgis/README.postgis +- cp man/pgsql2shp.1 $(PGSQL_MANDIR)/man1/pgsql2shp.1 +- cp man/shp2pgsql.1 $(PGSQL_MANDIR)/man1/shp2pgsql.1 ++ @mkdir -p $(DOCSDIR) ++ @mkdir -p $(PREFIX)/man/man1 ++ cp html/postgis.html $(DOCSDIR)/postgis.html ++ cp ../README.postgis $(DOCSDIR)/README.postgis ++ cp man/pgsql2shp.1 $(PREFIX)/man/man1/pgsql2shp.1 ++ cp man/shp2pgsql.1 $(PREFIX)/man/man1/shp2pgsql.1 + + uninstall: + rm -f $(PGSQL_DOCDIR)/postgis/postgis.html diff -Nru postgis.old/files/patch-loader postgis/files/patch-loader --- postgis.old/files/patch-loader 2005-12-28 19:10:57.000000000 -0200 +++ postgis/files/patch-loader 1969-12-31 21:00:00.000000000 -0300 @@ -1,22 +0,0 @@ ---- loader/Makefile Fri Dec 16 14:47:24 2005 -+++ loader/Makefile Wed Dec 28 14:23:13 2005 -@@ -9,7 +9,7 @@ - #--------------------------------------------------------------- - - ifeq ($(USE_ICONV),1) -- override CFLAGS += -DUSE_ICONV -+ override CFLAGS += -DUSE_ICONV -I/usr/local/include - override LDFLAGS += $(ICONV_LDFLAGS) - endif - ---- loader/shp2pgsql.c Tue Nov 1 07:25:47 2005 -+++ loader/shp2pgsql.c Wed Dec 28 14:23:13 2005 -@@ -33,7 +33,7 @@ - #include - #include - #include "getopt.h" --#ifdef HAVE_ICONV_H -+#ifdef USE_ICONV - #include - #endif - diff -Nru postgis.old/files/patch-loader-Makefile.in postgis/files/patch-loader-Makefile.in --- postgis.old/files/patch-loader-Makefile.in 1969-12-31 21:00:00.000000000 -0300 +++ postgis/files/patch-loader-Makefile.in 2009-09-18 08:14:38.000000000 -0300 @@ -0,0 +1,13 @@ +--- loader/Makefile.in.orig 2009-08-07 11:13:19.000000000 -0300 ++++ loader/Makefile.in 2009-08-07 11:14:01.000000000 -0300 +@@ -13,6 +13,10 @@ + CC=@CC@ + CFLAGS=@CFLAGS@ @PICFLAGS@ @WARNFLAGS@ + ++override datadir := $(DATADIR) ++override bindir := $(PREFIX)/bin ++override pkglibdir := $(PREFIX)/lib/postgresql ++ + # Filenames with extension as determined by the OS + PGSQL2SHP=pgsql2shp@EXESUFFIX@ + SHP2PGSQL=shp2pgsql@EXESUFFIX@ diff -Nru postgis.old/files/patch-lwgeom postgis/files/patch-lwgeom --- postgis.old/files/patch-lwgeom 2008-04-27 02:41:08.000000000 -0300 +++ postgis/files/patch-lwgeom 1969-12-31 21:00:00.000000000 -0300 @@ -1,11 +0,0 @@ ---- lwgeom/Makefile 2008-03-28 18:28:21.000000000 -0300 -+++ lwgeom/Makefile 2008-04-16 11:41:22.000000000 -0300 -@@ -122,7 +122,7 @@ - $(PERL) ../utils/postgis_proc_upgrade.pl ../lwpostgis.sql > ../lwpostgis_upgrade.sql - - ../lwpostgis.sql: lwpostgis.sql.in long_xact.sql.in sqlmm.sql.in sqldefines.h -- cpp -P -traditional-cpp $(SQL_FLAGS) $< | sed -e 's:@MODULE_FILENAME@:$(MODULE_FILENAME):g;s:@POSTGIS_VERSION@:$(POSTGIS_VERSION):g;s:@POSTGIS_SCRIPTS_VERSION@:$(SCRIPTS_VERSION):g;s/@POSTGIS_BUILD_DATE@/$(POSTGIS_BUILD_DATE)/g' | grep -v '^#' > $@ -+ cpp -P -traditional-cpp $(SQL_FLAGS) $< | sed -e 's:@MODULE_FILENAME@:$$libdir/liblwgeom.so.1:g;s:@POSTGIS_VERSION@:$(POSTGIS_VERSION):g;s:@POSTGIS_SCRIPTS_VERSION@:$(SCRIPTS_VERSION):g;s/@POSTGIS_BUILD_DATE@/$(POSTGIS_BUILD_DATE)/g' | grep -v '^#' > $@ - - ../regress/lwpostgis.sql: lwpostgis.sql.in long_xact.sql.in sqlmm.sql.in sqldefines.h - cpp -P -traditional-cpp $(SQL_FLAGS) $< | sed -e 's#@MODULE_FILENAME@#$(MODULE_FILENAME)#g;s#@POSTGIS_VERSION@#$(POSTGIS_VERSION)#g;s#@POSTGIS_SCRIPTS_VERSION@#$(SCRIPTS_VERSION)#g;s/@POSTGIS_BUILD_DATE@/$(POSTGIS_BUILD_DATE)/g' | grep -v '^#' > $@ diff -Nru postgis.old/files/patch-postgis-Makefile.in postgis/files/patch-postgis-Makefile.in --- postgis.old/files/patch-postgis-Makefile.in 1969-12-31 21:00:00.000000000 -0300 +++ postgis/files/patch-postgis-Makefile.in 2009-09-20 09:48:57.000000000 -0300 @@ -0,0 +1,26 @@ +--- postgis/Makefile.in.orig 2009-06-06 11:09:39.000000000 -0300 ++++ postgis/Makefile.in 2009-09-20 09:48:02.000000000 -0300 +@@ -12,6 +12,10 @@ + + MODULE_big=postgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@ + ++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.sql + DATA=../spatial_ref_sys.sql +@@ -73,10 +77,10 @@ + + # 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/$*,g' $< >$@ + + postgis_upgrade.sql: postgis.sql +- $(PERL) ../utils/postgis_proc_upgrade.pl $< > $@ ++ /usr/local/bin/perl ../utils/postgis_proc_upgrade.pl $< > $@ + + # Generate any .sql.in files from .sql.in.c files by running them through the C pre-processor + $(SQL_OBJS): %.in: %.in.c diff -Nru postgis.old/files/patch-utils postgis/files/patch-utils --- postgis.old/files/patch-utils 2005-12-28 19:10:57.000000000 -0200 +++ postgis/files/patch-utils 1969-12-31 21:00:00.000000000 -0300 @@ -1,22 +0,0 @@ ---- utils/Makefile Mon Jun 6 13:49:41 2005 -+++ utils/Makefile Wed Dec 28 15:33:31 2005 -@@ -1,3 +1,6 @@ -+include ../Makefile.config -+include ../Version.config -+ - SCRIPTS = \ - postgis_restore.pl \ - create_undef.pl \ -@@ -8,3 +11,12 @@ - - all: - chmod +x $(SCRIPTS) -+ -+install: -+ @mkdir -p $(DESTDIR)$(datadir)/utils -+ $(INSTALL_DATA) README $(DESTDIR)$(datadir)/utils/README -+ $(INSTALL_DATA) create_undef.pl $(DESTDIR)$(datadir)/utils/create_undef.pl -+ $(INSTALL_DATA) postgis_restore.pl $(DESTDIR)$(datadir)/utils/postgis_restore.pl -+ $(INSTALL_DATA) profile_intersects.pl $(DESTDIR)$(datadir)/utils/profile_intersects.pl -+ $(INSTALL_DATA) test_estimation.pl $(DESTDIR)$(datadir)/utils/test_estimation.pl -+ $(INSTALL_DATA) test_joinestimation.pl $(DESTDIR)$(datadir)/utils/test_joinestimation.pl diff -Nru postgis.old/pkg-plist postgis/pkg-plist --- postgis.old/pkg-plist 2006-01-22 03:52:10.000000000 -0200 +++ postgis/pkg-plist 2009-09-18 08:14:38.000000000 -0300 @@ -1,19 +1,21 @@ bin/pgsql2shp bin/shp2pgsql -lib/liblwgeom.so -lib/liblwgeom.so.1 +lib/postgresql/postgis-1.4.so +lib/postgresql/postgis.so +lib/postgresql/liblwgeom.so lib/postgresql/liblwgeom.so.1 -%%DATADIR%%/lwpostgis.sql -%%DATADIR%%/lwpostgis_upgrade.sql -%%DATADIR%%/spatial_ref_sys.sql -%%DATADIR%%/utils/postgis_restore.pl -%%DATADIR%%/utils/profile_intersects.pl -%%DATADIR%%/utils/test_estimation.pl -%%DATADIR%%/utils/test_joinestimation.pl -%%DATADIR%%/utils/create_undef.pl -%%DATADIR%%/utils/README -%%PORTDOCS%%@dirrmtry %%DOCSDIR%% +share/postgis/contrib/postgis.sql +share/postgis/contrib/postgis_upgrade.sql +share/postgis/contrib/spatial_ref_sys.sql +share/postgis/contrib/uninstall_postgis.sql +share/postgis/utils/create_undef.pl +share/postgis/utils/new_postgis_restore.pl +share/postgis/utils/postgis_proc_upgrade.pl +share/postgis/utils/postgis_restore.pl +share/postgis/utils/profile_intersects.pl +share/postgis/utils/test_estimation.pl +share/postgis/utils/test_joinestimation.pl +@dirrm share/postgis/utils +@dirrm share/postgis/contrib +@dirrm share/postgis @dirrmtry lib/postgresql -@dirrmtry %%DATADIR%%/utils -@dirrmtry %%DATADIR%% -@dirrmtry lib --------------000900080805090600080201-- State-Changed-From-To: open->closed State-Changed-By: skreuzer State-Changed-When: Wed Oct 7 14:11:12 UTC 2009 State-Changed-Why: Committed. Thanks! http://www.freebsd.org/cgi/query-pr.cgi?pr=137537 From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/137537: commit references a PR Date: Wed, 7 Oct 2009 14:11:11 +0000 (UTC) skreuzer 2009-10-07 14:10:58 UTC FreeBSD ports repository Modified files: databases/postgis Makefile distinfo pkg-plist databases/postgis/files patch-GNUmakefile Added files: databases/postgis/files patch-doc-Makefile.in patch-loader-Makefile.in patch-postgis-Makefile.in Removed files: databases/postgis/files patch-configure patch-loader patch-lwgeom patch-utils Log: Update to 1.4.0 PR: ports/137537 Submitted by: Anderson S. Ferreira Feature safe: Yes Revision Changes Path 1.52 +29 -36 ports/databases/postgis/Makefile 1.28 +3 -4 ports/databases/postgis/distinfo 1.5 +17 -29 ports/databases/postgis/files/patch-GNUmakefile 1.4 +0 -10 ports/databases/postgis/files/patch-configure (dead) 1.1 +21 -0 ports/databases/postgis/files/patch-doc-Makefile.in (new) 1.4 +0 -22 ports/databases/postgis/files/patch-loader (dead) 1.1 +13 -0 ports/databases/postgis/files/patch-loader-Makefile.in (new) 1.8 +0 -11 ports/databases/postgis/files/patch-lwgeom (dead) 1.1 +26 -0 ports/databases/postgis/files/patch-postgis-Makefile.in (new) 1.3 +0 -22 ports/databases/postgis/files/patch-utils (dead) 1.11 +17 -15 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" >Unformatted: