From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Dec 28 07:20:01 2012 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1F689972 for ; Fri, 28 Dec 2012 07:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id E71128FC13 for ; Fri, 28 Dec 2012 07:20:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id qBS7K0Fp008230 for ; Fri, 28 Dec 2012 07:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id qBS7K0H3008225; Fri, 28 Dec 2012 07:20:00 GMT (envelope-from gnats) Resent-Date: Fri, 28 Dec 2012 07:20:00 GMT Resent-Message-Id: <201212280720.qBS7K0H3008225@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Martin Birgmeier Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 467DE914 for ; Fri, 28 Dec 2012 07:19:03 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 225DE8FC14 for ; Fri, 28 Dec 2012 07:19:03 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id qBS7J1YM045808 for ; Fri, 28 Dec 2012 07:19:01 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id qBS7J1PM045807; Fri, 28 Dec 2012 07:19:01 GMT (envelope-from nobody) Message-Id: <201212280719.qBS7J1PM045807@red.freebsd.org> Date: Fri, 28 Dec 2012 07:19:01 GMT From: Martin Birgmeier To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/174764: [patch] upgrade postgis to 1.5.8 (fixes compile with postgresql 9.2) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Dec 2012 07:20:01 -0000 >Number: 174764 >Category: ports >Synopsis: [patch] upgrade postgis to 1.5.8 (fixes compile with postgresql 9.2) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Dec 28 07:20:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Martin Birgmeier >Release: 8, 9, 9.1 >Organization: MBi at home >Environment: FreeBSD v904.xyzzy 9.1-RELEASE FreeBSD 9.1-RELEASE #0: Tue Dec 25 21:36:00 UTC 2012 root@v904.xyzzy:/usr/obj/.../hal/z/SRC/FreeBSD/release/9.1.0/sys/XYZZY_SMP_MIN amd64 >Description: upgrade databases/postgis to 1.5.8, in the course also fixing compatibility with postgresql 9.2 >How-To-Repeat: >Fix: Patch attached with submission follows: --- ./Makefile.ORIG 2012-07-27 16:20:06.695232091 +0200 +++ ./Makefile 2012-12-28 07:46:59.125711478 +0100 @@ -6,11 +6,10 @@ # PORTNAME= postgis -PORTVERSION= 1.5.3 -PORTREVISION= 2 +PORTVERSION= 1.5.8 +PORTREVISION= CATEGORIES= databases geography -MASTER_SITES= http://postgis.refractions.net/download/ \ - http://www.postgis.org/download/ +MASTER_SITES= http://download.osgeo.org/postgis/source/ MAINTAINER= anderson@cnpm.embrapa.br COMMENT= Adds support for geographic objects to PostgreSQL databases --- ./distinfo.ORIG 2012-07-27 16:20:06.651171000 +0200 +++ ./distinfo 2012-12-28 07:47:58.552835013 +0100 @@ -1,2 +1,2 @@ -SHA256 (postgis-1.5.3.tar.gz) = a2334f8b229446c0497d48a430a40152a3b71a5da02f414a0340a0a025d416cf -SIZE (postgis-1.5.3.tar.gz) = 3779956 +SHA256 (postgis-1.5.8.tar.gz) = 4896fdae2f814b88c3ca458b7d01d7eca7e9aca021599c817919f131a1b0d804 +SIZE (postgis-1.5.8.tar.gz) = 3948219 --- ./files/XXXpatch-doc-Makefile.in.ORIG 2012-07-27 16:20:06.653227117 +0200 +++ ./files/patch-doc-Makefile.in 2012-12-28 07:57:20.781673129 +0100 @@ -1,40 +1,31 @@ ---- 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 +--- doc/Makefile.in.orig 2012-01-11 09:49:23.000000000 +0100 ++++ doc/Makefile.in 2012-12-28 07:57:15.000000000 +0100 +@@ -131,18 +131,18 @@ + $(MAKE) -f Makefile.comments uninstall 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 $(DESTDIR)$(PGSQL_DOCDIR)/postgis +- @mkdir -p $(DESTDIR)$(PGSQL_MANDIR)/man1 +- cp html/postgis.html $(DESTDIR)$(PGSQL_DOCDIR)/postgis/postgis.html +- cp ../README.postgis $(DESTDIR)$(PGSQL_DOCDIR)/postgis/README.postgis +- cp man/pgsql2shp.1 $(DESTDIR)$(PGSQL_MANDIR)/man1/pgsql2shp.1 +- cp man/shp2pgsql.1 $(DESTDIR)$(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 uninstall: - rm -f $(PGSQL_DOCDIR)/postgis/postgis.html +- rm -f $(DESTDIR)$(PGSQL_DOCDIR)/postgis/postgis.html +- rm -f $(DESTDIR)$(PGSQL_DOCDIR)/postgis/README.postgis +- rm -f $(DESTDIR)$(PGSQL_MANDIR)/man1/shp2pgsql.1 +- rm -f $(DESTDIR)$(PGSQL_MANDIR)/man1/pgsql2shp.1 ++ rm -f $(DOCSDIR)/postgis.html ++ rm -f $(DOCSDIR)/README.postgis ++ rm -f $(PREFIX)/man/man1/shp2pgsql.1 ++ rm -f $(PREFIX)/man/man1/pgsql2shp.1 + + requirements_not_met_xsltproc: + @echo --- ./files/XXXpatch-doc-html-image_src-Makefile.in.ORIG 2012-07-27 16:20:06.655163139 +0200 +++ ./files/patch-doc-html-image_src-Makefile.in 2012-12-28 08:05:16.341220769 +0100 @@ -1,26 +1,6 @@ ---- 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 @@ +--- doc/html/image_src/Makefile.in.orig 2010-01-11 18:31:49.000000000 +0100 ++++ doc/html/image_src/Makefile.in 2012-12-28 08:04:24.000000000 +0100 +@@ -134,3 +134,7 @@ @rm -f generator @rm -f tmp[0-9].png >Release-Note: >Audit-Trail: >Unformatted: