Date: Wed, 16 May 2012 08:13:22 -0300 From: Anderson Soares Ferreira <anderson@cnpm.embrapa.br> To: Sylvio Cesar Teixeira <sylvio@FreeBSD.org> Cc: freebsd-ports-bugs@freebsd.org Subject: Re: ports/167927: [maintainer-update] database/postgis: Upgrade to 2.0.0 Message-ID: <4FB38BD2.2040008@cnpm.embrapa.br> In-Reply-To: <CACsaXyRQY0cPkzV5EYx2SsU2pVcEVVXUtukQyNL7cNZWtKMQKg@mail.gmail.com> References: <201205151651.q4FGpeGX068541@freefall.freebsd.org> <CACsaXyRQY0cPkzV5EYx2SsU2pVcEVVXUtukQyNL7cNZWtKMQKg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------030802030708080903050106 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit I fixed errors found in original patch file. The new patch is attached in this message. I also looked for postgis dependent ports and I found two ports that incorrectly make reference to postgis binaries. Fixes for these problems are in PR ports/167954 and ports/167955. Regards, Anderson On 5/15/12 2:23 PM, Sylvio Cesar Teixeira wrote: > The patch file failed. Note that the current port's Makefile > PORTREVISION is the Makefile used by you to generate the patch does > not. You changed the @dirrmtry to @dirrm for postgresql directories > and this is wrong, because the removal of his port may not affect > files postgresql. Your port has a bump of lib, in which case you need > to pass a patch from all other ports that depend on postgis and test > them to see if all will work after the bump lib. > > --- 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. --------------030802030708080903050106 Content-Type: text/plain; charset=UTF-8; x-mac-type="0"; x-mac-creator="0"; name="postgis-2.0.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="postgis-2.0.patch" diff -Nru postgis/Makefile postgis/Makefile --- postgis/Makefile 2012-05-07 05:12:51.000000000 -0300 +++ postgis/Makefile 2012-05-15 20:31:06.000000000 -0300 @@ -6,8 +6,7 @@ # PORTNAME= postgis -PORTVERSION= 1.5.3 -PORTREVISION= 2 +PORTVERSION= 2.0.0 CATEGORIES= databases geography MASTER_SITES= http://postgis.refractions.net/download/ \ http://www.postgis.org/download/ @@ -25,26 +24,46 @@ USE_ICONV= yes USE_LDCONFIG= yes USE_PERL5_BUILD= yes +USE_GNOME= libxml2 -OPTIONS= LOADERGUI "Enable shp2pgsql-gui" Off +OPTIONS= LOADERGUI "Enable shp2pgsql-gui" Off \ + RASTER "Enable raster extension" Off \ + TOPOLOGY "Enable topology extension" Off .include <bsd.port.options.mk> INSTALL_TARGET= install GNU_CONFIGURE= yes + +CONFIGURE_ARGS= --with-projdir=${LOCALBASE} + .if defined(WITH_LOADERGUI) -USE_GNOME= libxml2 gtk20 -CONFIGURE_ARGS= --with-projdir=${LOCALBASE} --with-gui +USE_GNOME+= gtk20 +CONFIGURE_ARGS+= --with-projdir=${LOCALBASE} --with-gui PLIST_SUB+= LOADERGUI="" .else -USE_GNOME= libxml2 -CONFIGURE_ARGS= --with-projdir=${LOCALBASE} PLIST_SUB+= LOADERGUI="@comment " .endif +.if defined(WITH_RASTER) +LIB_DEPENDS+= gdal:${PORTSDIR}/graphics/gdal +PLIST_SUB+= RASTEREXT="" +.else +CONFIGURE_ARGS+= --without-raster +PLIST_SUB+= RASTEREXT="@comment " +.endif + +.if defined(WITH_TOPOLOGY) +PLIST_SUB+= TOPOLOGYEXT="" +.else +CONFIGURE_ARGS+= --without-topology +PLIST_SUB+= TOPOLOGYEXT="@comment " +.endif + CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +DATADIR= ${PREFIX}/share/postgresql MAKE_ENV= DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} MAKE_JOBS_UNSAFE= yes @@ -52,6 +71,7 @@ .if !defined(NOPORTDOCS) BUILD_DEPENDS+= xsltproc:${PORTSDIR}/textproc/libxslt \ + convert:${PORTSDIR}/graphics/ImageMagick \ ${LOCALBASE}/share/xsl/docbook/html/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl CONFIGURE_ARGS+= --with-xsldir=${LOCALBASE}/share/xsl/docbook MAN1= pgsql2shp.1 shp2pgsql.1 @@ -69,17 +89,10 @@ ${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/postgresql/postgis-1.5.so ${PREFIX}/lib/postgresql/postgis.so - @${LN} -s ${PREFIX}/lib/postgresql/postgis-1.5.so ${PREFIX}/lib/postgresql/liblwgeom.so.1 - @${LN} -s ${PREFIX}/lib/postgresql/postgis-1.5.so ${PREFIX}/lib/postgresql/liblwgeom.so +.if !defined(NOPORTDOCS) + ${INSTALL_SCRIPT} ${WRKSRC}/NEWS ${DOCSDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/MIGRATION ${DOCSDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/ChangeLog ${DOCSDIR} +.endif .include <bsd.port.post.mk> diff -Nru postgis/distinfo postgis/distinfo --- postgis/distinfo 2011-09-21 20:39:43.000000000 -0300 +++ postgis/distinfo 2012-05-15 20:30:07.000000000 -0300 @@ -1,2 +1,2 @@ -SHA256 (postgis-1.5.3.tar.gz) = a2334f8b229446c0497d48a430a40152a3b71a5da02f414a0340a0a025d416cf -SIZE (postgis-1.5.3.tar.gz) = 3779956 +SHA256 (postgis-2.0.0.tar.gz) = 12179e24e348421c60c501590fda25bd349e2f697003958d9493f5c91b280081 +SIZE (postgis-2.0.0.tar.gz) = 5446748 diff -Nru postgis/files/patch-GNUmakefile postgis/files/patch-GNUmakefile --- postgis/files/patch-GNUmakefile 2009-10-07 11:10:58.000000000 -0300 +++ postgis/files/patch-GNUmakefile 1969-12-31 21:00:00.000000000 -0300 @@ -1,36 +0,0 @@ ---- GNUmakefile.orig 2009-05-26 15:00:55.000000000 -0300 -+++ GNUmakefile 2009-08-07 14:36:10.000000000 -0300 -@@ -4,10 +4,10 @@ - # - #----------------------------------------------------- - --all: postgis loaderdumper utils -+all: postgis loaderdumper utils docs - @echo "PostGIS was built successfully. Ready to install." - --install: all postgis-install loaderdumper-install -+install: all postgis-install loaderdumper-install docs-install - - uninstall: postgis-uninstall loaderdumper-uninstall docs-uninstall comments-uninstall - -@@ -80,7 +80,9 @@ - $(MAKE) -C extras/template_gis uninstall - - docs: -- $(MAKE) -C doc -+ifndef NOPORTDOCS -+ $(MAKE) -C doc html/postgis.html -+endif - - docs-clean: - $(MAKE) -C doc clean -@@ -95,7 +97,9 @@ - $(MAKE) -C doc comments-uninstall - - docs-install: -+ifndef NOPORTDOCS - $(MAKE) -C doc install -+endif - - docs-uninstall: - $(MAKE) -C doc uninstall diff -Nru postgis/files/patch-GNUmakefile.in postgis/files/patch-GNUmakefile.in --- postgis/files/patch-GNUmakefile.in 1969-12-31 21:00:00.000000000 -0300 +++ postgis/files/patch-GNUmakefile.in 2012-05-15 20:30:07.000000000 -0300 @@ -0,0 +1,16 @@ +--- GNUmakefile.in.orig 2012-03-21 17:32:29.000000000 -0300 ++++ GNUmakefile.in 2012-05-14 23:46:02.000000000 -0300 +@@ -15,6 +15,13 @@ + echo "---- Making $@ in $${s}"; \ + $(MAKE) -C $${s} $@ || exit 1; \ + done; ++ @if test x"$(NOPORTDOCS)" != xyes; then \ ++ if test x"$@" = xinstall ; then \ ++ $(MAKE) -C doc docs-install man-install || exit 1; \ ++ else \ ++ $(MAKE) -C doc html || exit 1; \ ++ fi; \ ++ fi + @if test x"$@" = xall; then \ + echo "PostGIS was built successfully. Ready to install."; \ + fi diff -Nru postgis/files/patch-doc-Makefile.in postgis/files/patch-doc-Makefile.in --- postgis/files/patch-doc-Makefile.in 2010-03-26 00:00:34.000000000 -0300 +++ postgis/files/patch-doc-Makefile.in 2012-05-15 20:30:07.000000000 -0300 @@ -1,40 +1,66 @@ ---- 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 $< +--- doc/Makefile.in.orig 2012-03-21 18:36:59.000000000 -0300 ++++ doc/Makefile.in 2012-05-15 00:59:04.000000000 -0300 +@@ -21,13 +21,14 @@ + XSLBASE=@XSLBASE@ + XMLLINT=@XMLLINT@ - images: -- make -C html/image_src images ++override datadir := $(DATADIR) ++override bindir := $(PREFIX)/bin ++override pkglibdir := $(PREFIX)/lib/postgresql + - - 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 -- @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 -+ gmake -C html/image_src install + # To allow network access use: + # + # make html XSLTPROCFLAGS= + # +-ifeq ($(XSLTPROCFLAGS),) +- XSLTPROCFLAGS=--nonet +-endif + + XSLTPROC_COMMONOPTS= \ + --param section.autolabel 1 \ +@@ -70,7 +71,7 @@ + ifeq ($(IMAGEMAGICK),) + all: requirements_not_met_imagemagick + else +-all: comments ++all: html + endif + endif + endif +@@ -222,24 +223,29 @@ + $(MAKE) -f Makefile.comments uninstall + + man-install: man/shp2pgsql.1 man/pgsql2shp.1 +- mkdir -p $(DESTDIR)$(PGSQL_MANDIR)/man1 +- $(INSTALL_DATA) man/pgsql2shp.1 $(DESTDIR)$(PGSQL_MANDIR)/man1/pgsql2shp.1 +- $(INSTALL_DATA) man/shp2pgsql.1 $(DESTDIR)$(PGSQL_MANDIR)/man1/shp2pgsql.1 ++ mkdir -p $(PREFIX)/man/man1 ++ $(INSTALL_DATA) man/pgsql2shp.1 $(PREFIX)/man/man1/pgsql2shp.1 ++ $(INSTALL_DATA) man/shp2pgsql.1 $(PREFIX)/man/man1/shp2pgsql.1 + + man-uninstall: + rm -f $(DESTDIR)$(PGSQL_MANDIR)/man1/shp2pgsql.1 + rm -f $(DESTDIR)$(PGSQL_MANDIR)/man1/pgsql2shp.1 + + docs-install: html/postgis.html +- mkdir -p $(DESTDIR)$(PGSQL_DOCDIR)/postgis +- $(INSTALL_DATA) html/postgis.html $(DESTDIR)$(PGSQL_DOCDIR)/postgis/postgis.html +- $(INSTALL_DATA) ../README.postgis $(DESTDIR)$(PGSQL_DOCDIR)/postgis/README.postgis ++ mkdir -p $(DOCSDIR)/images ++ $(INSTALL_DATA) html/postgis.html $(DOCSDIR)/postgis.html ++ $(INSTALL_DATA) ../README.postgis $(DOCSDIR)/README.postgis ++ for img in $(wildcard html/images/*); do \ ++ $(INSTALL_DATA) $${img} $(DOCSDIR)/images/; \ ++ done; ++ ++ + + docs-uninstall: + rm -f $(DESTDIR)$(PGSQL_DOCDIR)/postgis/postgis.html + rm -f $(DESTDIR)$(PGSQL_DOCDIR)/postgis/README.postgis + +-install: comments-install ++install: docs-install man-install + + uninstall: comments-uninstall - uninstall: - rm -f $(PGSQL_DOCDIR)/postgis/postgis.html diff -Nru postgis/files/patch-doc-html-image_src-Makefile.in postgis/files/patch-doc-html-image_src-Makefile.in --- postgis/files/patch-doc-html-image_src-Makefile.in 2010-03-26 00:00:34.000000000 -0300 +++ postgis/files/patch-doc-html-image_src-Makefile.in 1969-12-31 21:00:00.000000000 -0300 @@ -1,30 +0,0 @@ ---- doc/html/image_src/Makefile.in.orig 2010-01-12 01:31:49.000000000 +0800 -+++ doc/html/image_src/Makefile.in 2010-03-26 10:15:25.000000000 +0800 -@@ -83,7 +83,18 @@ - ../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= \ -@@ -134,3 +145,7 @@ - @rm -f generator - @rm -f tmp[0-9].png - -+install: -+ @mkdir -p $(DOCSDIR)/images -+ cp $(IMAGES) $(DOCSDIR)/images -+ diff -Nru postgis/files/patch-postgis-Makefile.in postgis/files/patch-postgis-Makefile.in --- postgis/files/patch-postgis-Makefile.in 2010-03-26 00:00:34.000000000 -0300 +++ postgis/files/patch-postgis-Makefile.in 2012-05-15 20:30:07.000000000 -0300 @@ -1,6 +1,6 @@ ---- 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 @@ +--- postgis/Makefile.in 2012-05-14 16:50:54.000000000 -0300 ++++ postgis/Makefile.in 2012-05-14 16:53:28.000000000 -0300 +@@ -14,6 +14,10 @@ MODULE_big=postgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@ MODULEDIR=contrib/$(MODULE_big) @@ -9,26 +9,5 @@ +override pkglibdir := $(PREFIX)/lib/postgresql + # Files to be copied to the contrib/ directory - 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_built=postgis.sql uninstall_postgis.sql postgis_upgrade_20_minor.sql legacy.sql uninstall_legacy.sql legacy_minimal.sql DATA=../spatial_ref_sys.sql -@@ -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-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@,g' $< >$@ -+ sed 's,MODULE_PATHNAME,$$libdir/$*,g' $< >$@ - - 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_15.sql: postgis.sql -- $(PERL) ../utils/postgis_proc_upgrade.pl $< 1.3 > $@ -+ %PERL% ../utils/postgis_proc_upgrade.pl $< 1.3 > $@ - - # 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/files/patch-raster-Makefile.in postgis/files/patch-raster-Makefile.in --- postgis/files/patch-raster-Makefile.in 1969-12-31 21:00:00.000000000 -0300 +++ postgis/files/patch-raster-Makefile.in 2012-05-15 20:30:07.000000000 -0300 @@ -0,0 +1,51 @@ +--- raster/Makefile.in 2012-05-14 18:50:48.000000000 -0300 ++++ raster/Makefile.in 2012-05-14 18:52:27.000000000 -0300 +@@ -10,6 +10,9 @@ + # + ############################################################################# + ++override datadir := $(DATADIR) ++override bindir := $(PREFIX)/bin ++override pkglibdir := $(PREFIX)/lib/postgresql + + all: @RT_CORE_LIB@ @RT_PG_LIB@ @RT_LOADER@ @RT_POSTGIS_SQL@ + +--- raster/rt_pg/Makefile.in 2012-05-14 19:37:51.000000000 -0300 ++++ raster/rt_pg/Makefile.in 2012-05-14 19:39:07.000000000 -0300 +@@ -13,6 +13,10 @@ + MODULE_big=rtpostgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@ + MODULEDIR=contrib/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=rtpostgis.sql rtpostgis_upgrade_20_minor.sql uninstall_rtpostgis.sql rtpostgis_legacy.sql + DATA= +--- raster/loader/Makefile.in 2012-03-21 18:36:59.000000000 -0300 ++++ raster/loader/Makefile.in 2012-05-14 20:05:30.000000000 -0300 +@@ -19,6 +19,10 @@ + INSTALL = $(SHELL) ../../install-sh + LIBTOOL = @LIBTOOL@ + ++override datadir := $(DATADIR) ++override bindir := $(PREFIX)/bin ++override pkglibdir := $(PREFIX)/lib/postgresql ++ + # Filenames with extension as determined by the OS + RASTER2PGSQL=raster2pgsql@EXESUFFIX@ + +@@ -75,10 +79,10 @@ + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@ + + installdir: +- @mkdir -p $(DESTDIR)$(PGSQL_BINDIR) ++ @mkdir -p $(bindir) + + install: installdir +- $(LIBTOOL) --mode=install $(INSTALL) $(RASTER2PGSQL) "$(DESTDIR)$(PGSQL_BINDIR)/$(RASTER2PGSQL)" ++ $(LIBTOOL) --mode=install $(INSTALL) $(RASTER2PGSQL) "$(bindir)/$(RASTER2PGSQL)" + + uninstall: + $(LIBTOOL) --mode=uninstall $(RM) "$(DESTDIR)$(PGSQL_BINDIR)/$(RASTER2PGSQL)" diff -Nru postgis/files/patch-topology-Makefile.in postgis/files/patch-topology-Makefile.in --- postgis/files/patch-topology-Makefile.in 1969-12-31 21:00:00.000000000 -0300 +++ postgis/files/patch-topology-Makefile.in 2012-05-15 20:30:07.000000000 -0300 @@ -0,0 +1,13 @@ +--- topology/Makefile.in 2012-05-14 18:55:44.000000000 -0300 ++++ topology/Makefile.in 2012-05-14 18:56:00.000000000 -0300 +@@ -19,6 +19,10 @@ + + POSTGIS_PGSQL_VERSION=@POSTGIS_PGSQL_VERSION@ + ++override datadir := $(DATADIR) ++override bindir := $(PREFIX)/bin ++override pkglibdir := $(PREFIX)/lib/postgresql ++ + # NOTE: we can't use MODULE_big or PGXS insists in building a library... + PGIS_MODULE_big=postgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@ + MODULEDIR=contrib/$(PGIS_MODULE_big) diff -Nru postgis/files/patch-utils-Makefile.in postgis/files/patch-utils-Makefile.in --- postgis/files/patch-utils-Makefile.in 1969-12-31 21:00:00.000000000 -0300 +++ postgis/files/patch-utils-Makefile.in 2012-05-15 20:30:07.000000000 -0300 @@ -0,0 +1,30 @@ +--- utils/Makefile.in.orig 2012-03-28 20:12:17.000000000 -0300 ++++ utils/Makefile.in 2012-05-14 21:55:48.000000000 -0300 +@@ -18,6 +18,10 @@ + MODULE_doc=postgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@ + MODULEDIR=contrib/$(MODULE_doc) + ++override datadir := $(DATADIR) ++override bindir := $(PREFIX)/bin ++override pkglibdir := $(PREFIX)/lib/postgresql ++ + # Files to be copied to the contrib/ directory + DATA_built=postgis_restore.pl + +@@ -48,13 +52,13 @@ + sed 's,@SRID_MAXIMUM@,$(SRID_MAXIMUM),g;s,@SRID_USER_MAXIMUM@,$(SRID_USER_MAXIMUM),' $< >$@ + + installdir: +- @mkdir -p "$(DESTDIR)$(datadir)/$(MODULEDIR)" ++ @mkdir -p "$(datadir)/$(MODULEDIR)" + + uninstall: +- @rm -f "$(DESTDIR)$(datadir)/$(MODULEDIR)/postgis_restore.pl" ++ @rm -f "$(PREFIX)$(datadir)/$(MODULEDIR)/postgis_restore.pl" + + install: installdir +- $(LIBTOOL) --mode=install $(INSTALL) postgis_restore.pl "$(DESTDIR)$(datadir)/$(MODULEDIR)/postgis_restore.pl" ++ $(LIBTOOL) --mode=install $(INSTALL) postgis_restore.pl "$(datadir)/$(MODULEDIR)/postgis_restore.pl" + + clean: + rm -f postgis_restore.pl diff -Nru postgis/pkg-plist postgis/pkg-plist --- postgis/pkg-plist 2011-07-01 03:22:55.000000000 -0300 +++ postgis/pkg-plist 2012-05-15 20:32:07.000000000 -0300 @@ -1,26 +1,30 @@ bin/pgsql2shp bin/shp2pgsql %%LOADERGUI%%bin/shp2pgsql-gui -lib/postgresql/liblwgeom.so -lib/postgresql/liblwgeom.so.1 -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 -%%DATADIR%%/utils/postgis_restore.pl -%%DATADIR%%/utils/profile_intersects.pl -%%DATADIR%%/utils/test_estimation.pl -%%DATADIR%%/utils/test_joinestimation.pl -@dirrmtry %%DATADIR%%/utils -@dirrmtry %%DATADIR%%/contrib/postgis-1.5 -@dirrmtry %%DATADIR%%/contrib -@dirrmtry %%DATADIR%% +%%RASTEREXT%%bin/raster2pgsql +include/liblwgeom.h +lib/liblwgeom-2.0.0.so +lib/liblwgeom.a +lib/liblwgeom.la +lib/liblwgeom.so +lib/postgresql/postgis-2.0.so +%%RASTEREXT%%lib/postgresql/rtpostgis-2.0.so +share/postgresql/contrib/postgis-2.0/legacy.sql +share/postgresql/contrib/postgis-2.0/legacy_minimal.sql +share/postgresql/contrib/postgis-2.0/postgis.sql +share/postgresql/contrib/postgis-2.0/postgis_restore.pl +share/postgresql/contrib/postgis-2.0/postgis_upgrade_20_minor.sql +share/postgresql/contrib/postgis-2.0/spatial_ref_sys.sql +share/postgresql/contrib/postgis-2.0/uninstall_legacy.sql +share/postgresql/contrib/postgis-2.0/uninstall_postgis.sql +%%RASTEREXT%%share/postgresql/contrib/postgis-2.0/rtpostgis.sql +%%RASTEREXT%%share/postgresql/contrib/postgis-2.0/rtpostgis_legacy.sql +%%RASTEREXT%%share/postgresql/contrib/postgis-2.0/rtpostgis_upgrade_20_minor.sql +%%RASTEREXT%%share/postgresql/contrib/postgis-2.0/uninstall_rtpostgis.sql +%%TOPOLOGYEXT%%share/postgresql/contrib/postgis-2.0/topology.sql +%%TOPOLOGYEXT%%share/postgresql/contrib/postgis-2.0/topology_upgrade_20_minor.sql +%%TOPOLOGYEXT%%share/postgresql/contrib/postgis-2.0/uninstall_topology.sql +@dirrm share/postgresql/contrib/postgis-2.0 +@dirrmtry share/postgresql/contrib +@dirrmtry share/postgresql @dirrmtry lib/postgresql -@dirrmtry lib --------------030802030708080903050106--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4FB38BD2.2040008>