From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Oct 19 11:50:11 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0F17316A41F for ; Wed, 19 Oct 2005 11:50:11 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6FCBF43D48 for ; Wed, 19 Oct 2005 11:50:10 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j9JBoA8T070798 for ; Wed, 19 Oct 2005 11:50:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j9JBoAj1070797; Wed, 19 Oct 2005 11:50:10 GMT (envelope-from gnats) Resent-Date: Wed, 19 Oct 2005 11:50:10 GMT Resent-Message-Id: <200510191150.j9JBoAj1070797@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, "Anderson S. Ferreira" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 564C816A41F for ; Wed, 19 Oct 2005 11:40:04 +0000 (GMT) (envelope-from anderson@cnpm.embrapa.br) Received: from ipe.cnpm.embrapa.br (ipe.cnpm.embrapa.br [200.136.111.1]) by mx1.FreeBSD.org (Postfix) with ESMTP id B5EBD43D46 for ; Wed, 19 Oct 2005 11:40:02 +0000 (GMT) (envelope-from anderson@cnpm.embrapa.br) Received: from localhost (localhost.cnpm.embrapa.br [127.0.0.1]) by ipe.cnpm.embrapa.br (Postfix) with ESMTP id 4CE418477B for ; Wed, 19 Oct 2005 09:40:00 -0200 (BRST) Received: by ipe.cnpm.embrapa.br (Postfix, from userid 1100) id F35B584464; Wed, 19 Oct 2005 09:39:57 -0200 (BRST) Message-Id: <20051019113957.F35B584464@ipe.cnpm.embrapa.br> Date: Wed, 19 Oct 2005 09:39:57 -0200 (BRST) From: "Anderson S. Ferreira" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/87657: [maintainer update] databases/postgis respects LOCALBASE X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Anderson S. Ferreira" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Oct 2005 11:50:11 -0000 >Number: 87657 >Category: ports >Synopsis: [maintainer update] databases/postgis respects LOCALBASE >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Oct 19 11:50:09 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Anderson S. Ferreira >Release: FreeBSD 5.4-STABLE i386 >Organization: Embrapa Monitoramento por Satélite >Environment: System: FreeBSD ipe.cnpm.embrapa.br 5.4-STABLE FreeBSD 5.4-STABLE #19: Mon Oct 17 08:03:51 BRST 2005 root@ipe.cnpm.embrapa.br:/usr/src/sys/i386/compile/IPE i386 >Description: This patch corrects the postgis failure when building in non-standard LOCALBASE. >How-To-Repeat: >Fix: --- postgis.patch begins here --- diff -ruN postgis.bak/Makefile postgis/Makefile --- postgis.bak/Makefile Tue Sep 13 19:31:47 2005 +++ postgis/Makefile Wed Oct 19 08:44:45 2005 @@ -7,6 +7,7 @@ PORTNAME= postgis DISTVERSION= 1.0.4 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://postgis.refractions.net/download/ diff -ruN postgis.bak/files/patch-doc postgis/files/patch-doc --- postgis.bak/files/patch-doc Sat Apr 23 05:44:08 2005 +++ postgis/files/patch-doc Tue Oct 18 17:08:34 2005 @@ -12,7 +12,7 @@ LAST_RELEASE_VERSION = $(SO_MAJOR_VERSION).$(SO_MINOR_VERSION).$(SO_MICRO_VERSION) -XSLBASE?=/usr/share/sgml/docbook/xsl-stylesheets -+XSLBASE?=/usr/local/share/xsl/docbook ++XSLBASE?=$(LOCALBASE)/share/xsl/docbook #XSLBASE = /usr/share/xml/docbook/stylesheet/nwalsh all: html diff -ruN postgis.bak/files/patch-lwgeom postgis/files/patch-lwgeom --- postgis.bak/files/patch-lwgeom Sat Apr 23 05:44:08 2005 +++ postgis/files/patch-lwgeom Wed Oct 19 07:47:06 2005 @@ -20,7 +20,7 @@ - $(INSTALL_DATA) lwpostgis.sql $(DESTDIR)$(datadir)/contrib/lwpostgis.sql - $(INSTALL_DATA) ../spatial_ref_sys.sql $(DESTDIR)$(datadir)/contrib/spatial_ref_sys.sql - $(INSTALL_DATA) ../README.postgis $(DESTDIR)$(docdir)/contrib/README.postgis -+ $(INSTALL_DATA) lwpostgis.sql $(DESTDIR)$(DATADIR)/lwpostgis.sql.default ++ $(INSTALL_DATA) lwpostgis.sql $(DESTDIR)$(DATADIR)/lwpostgis.sql + $(INSTALL_DATA) ../spatial_ref_sys.sql $(DESTDIR)$(DATADIR)/spatial_ref_sys.sql + $(INSTALL_DATA) ../README.postgis $(DESTDIR)$(DATADIR)/README.postgis $(INSTALL_DATA) ../doc/man/pgsql2shp.1 $(DESTDIR)$(mandir)/man1/pgsql2shp.1 diff -ruN postgis.bak/files/patch-main postgis/files/patch-main --- postgis.bak/files/patch-main Wed Apr 13 06:08:06 2005 +++ postgis/files/patch-main Wed Oct 19 08:08:28 2005 @@ -16,3 +16,32 @@ uninstall: liblwgeom-uninstall loaderdumper-uninstall +--- Makefile.config Tue Jun 28 10:59:23 2005 ++++ Makefile.config Wed Oct 19 08:06:43 2005 +@@ -16,7 +16,7 @@ + # Download from: http://www.remotesensing.org/proj + # + USE_PROJ ?= 0 +-PROJ_DIR ?= /usr/local ++PROJ_DIR ?= ${LOCALBASE} + + # + # Set USE_GEOS to 1 for GEOS spatial predicate and operator +@@ -31,14 +31,14 @@ + # Download from: http://geos.refractions.net + # + USE_GEOS ?= 0 +-GEOS_DIR ?= /usr/local ++GEOS_DIR ?= ${LOCALBASE} + + # + # Set USE_JTS to 1 if you have libjts installed. + # + USE_JTS ?= 0 +-JTS_INCLUDES = /usr/local/include +-JTS_LIBDIR = /usr/local/lib ++JTS_INCLUDES = ${LOCALBASE}/include ++JTS_LIBDIR = ${LOCALBASE}/lib + + + # diff -ruN postgis.bak/pkg-deinstall postgis/pkg-deinstall --- postgis.bak/pkg-deinstall Wed Apr 13 06:08:06 2005 +++ postgis/pkg-deinstall Wed Dec 31 21:00:00 1969 @@ -1,10 +0,0 @@ -#!/bin/sh - -case "$2" in - "POST-DEINSTALL") - PREF=${PREFIX:-$PKG_PREFIX} - SHAREDIR=${PREF}/share/postgis - rm -f ${SHAREDIR}/lwpostgis.sql - rmdir ${SHAREDIR} - ;; -esac diff -ruN postgis.bak/pkg-install postgis/pkg-install --- postgis.bak/pkg-install Sat Apr 23 05:44:07 2005 +++ postgis/pkg-install Wed Oct 19 07:45:18 2005 @@ -38,12 +38,6 @@ "PRE-INSTALL") msg ;; - "POST-INSTALL") - PREF=${PREFIX:-$PKG_PREFIX} - SHAREDIR=${PREF}/share/postgis - LIBDIR=${PREF}/lib - sed -e "s|\$libdir|${LIBDIR}|g" ${SHAREDIR}/lwpostgis.sql.default > ${SHAREDIR}/lwpostgis.sql - ;; "MESSAGE") msg ;; diff -ruN postgis.bak/pkg-plist postgis/pkg-plist --- postgis.bak/pkg-plist Wed Apr 13 06:08:06 2005 +++ postgis/pkg-plist Wed Oct 19 07:53:57 2005 @@ -3,7 +3,7 @@ lib/liblwgeom.so lib/liblwgeom.so.1 %%DATADIR%%/README.postgis -%%DATADIR%%/lwpostgis.sql.default +%%DATADIR%%/lwpostgis.sql %%DATADIR%%/spatial_ref_sys.sql %%DATADIR%%/utils/postgis_restore.pl %%DATADIR%%/utils/profile_intersects.pl --- postgis.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: