From a48936b7c5a2eafe151966ca4df0f12ec5d36b3e Mon Sep 17 00:00:00 2001 From: Olli Hauer Date: Tue, 19 Feb 2013 20:34:13 +0000 Subject: [PATCH] - create conflict entry for postgis20 - adopt new Makefile header and OPTIONS NG - rename patches so they match patchfile nameing style --- databases/postgis/Makefile | 25 +++++++++---------- ...doc-Makefile.in => patch-doc__Makefile.in} | 0 ...> patch-doc__html__image_src__Makefile.in} | 0 ...-Makefile.in => patch-loader__Makefile.in} | 0 ...Makefile.in => patch-postgis__Makefile.in} | 0 5 files changed, 12 insertions(+), 13 deletions(-) rename databases/postgis/files/{patch-doc-Makefile.in => patch-doc__Makefile.in} (100%) rename databases/postgis/files/{patch-doc-html-image_src-Makefile.in => patch-doc__html__image_src__Makefile.in} (100%) rename databases/postgis/files/{patch-loader-Makefile.in => patch-loader__Makefile.in} (100%) rename databases/postgis/files/{patch-postgis-Makefile.in => patch-postgis__Makefile.in} (100%) diff --git a/databases/postgis/Makefile b/databases/postgis/Makefile index 1694c58724d3..fa213749e5d8 100644 --- a/databases/postgis/Makefile +++ b/databases/postgis/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: PostGIS -# Date created: June 09, 2004 -# Whom: Anderson Soares Ferreira -# +# Created by: Anderson Soares Ferreira # $FreeBSD$ -# PORTNAME= postgis PORTVERSION= 1.5.3 @@ -15,30 +11,33 @@ MASTER_SITES= http://postgis.refractions.net/download/ \ MAINTAINER= anderson@cnpm.embrapa.br COMMENT= Adds support for geographic objects to PostgreSQL databases -LIB_DEPENDS= proj.7:${PORTSDIR}/graphics/proj \ - geos.0:${PORTSDIR}/graphics/geos +LIB_DEPENDS= proj:${PORTSDIR}/graphics/proj \ + geos:${PORTSDIR}/graphics/geos RUN_DEPENDS= postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server +CONFLICTS= postgis-2.* + USE_BISON= build +USE_GNOME= libxml2 USE_PGSQL= yes USE_GMAKE= yes USE_ICONV= yes USE_LDCONFIG= yes +GNU_CONFIGURE= yes USE_PERL5_BUILD= yes -OPTIONS= LOADERGUI "Enable shp2pgsql-gui" Off +OPTIONS_DEFINE= LOADERGUI +LOADERGUI_DESC= Enable shp2pgsql-gui .include INSTALL_TARGET= install -GNU_CONFIGURE= yes -.if defined(WITH_LOADERGUI) -USE_GNOME= libxml2 gtk20 +.if ${PORT_OPTIONS:MLOADERGUI} +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 @@ -50,7 +49,7 @@ MAKE_JOBS_UNSAFE= yes .include -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} BUILD_DEPENDS+= xsltproc:${PORTSDIR}/textproc/libxslt \ ${LOCALBASE}/share/xsl/docbook/html/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl CONFIGURE_ARGS+= --with-xsldir=${LOCALBASE}/share/xsl/docbook diff --git a/databases/postgis/files/patch-doc-Makefile.in b/databases/postgis/files/patch-doc__Makefile.in similarity index 100% rename from databases/postgis/files/patch-doc-Makefile.in rename to databases/postgis/files/patch-doc__Makefile.in diff --git a/databases/postgis/files/patch-doc-html-image_src-Makefile.in b/databases/postgis/files/patch-doc__html__image_src__Makefile.in similarity index 100% rename from databases/postgis/files/patch-doc-html-image_src-Makefile.in rename to databases/postgis/files/patch-doc__html__image_src__Makefile.in diff --git a/databases/postgis/files/patch-loader-Makefile.in b/databases/postgis/files/patch-loader__Makefile.in similarity index 100% rename from databases/postgis/files/patch-loader-Makefile.in rename to databases/postgis/files/patch-loader__Makefile.in diff --git a/databases/postgis/files/patch-postgis-Makefile.in b/databases/postgis/files/patch-postgis__Makefile.in similarity index 100% rename from databases/postgis/files/patch-postgis-Makefile.in rename to databases/postgis/files/patch-postgis__Makefile.in