svn commit: r312600 - in head/databases/postgis: . files

Olli Hauer ohauer at FreeBSD.org
Tue Feb 19 20:34:15 UTC 2013 

Author: ohauer
Date: Tue Feb 19 20:34:13 2013
New Revision: 312600
URL: http://svnweb.freebsd.org/changeset/ports/312600

Log:
  - create conflict entry for postgis20
  - adopt new Makefile header and OPTIONS NG
  - rename patches so they match patchfile nameing style

Added:
     - copied unchanged from r312595, head/databases/postgis/files/patch-doc-Makefile.in
     - copied unchanged from r312595, head/databases/postgis/files/patch-doc-html-image_src-Makefile.in
     - copied unchanged from r312595, head/databases/postgis/files/patch-loader-Makefile.in
     - copied unchanged from r312595, head/databases/postgis/files/patch-postgis-Makefile.in
Directory Properties:
  head/databases/postgis/files/patch-doc__Makefile.in   (props changed)
  head/databases/postgis/files/patch-doc__html__image_src__Makefile.in   (props changed)
  head/databases/postgis/files/patch-loader__Makefile.in   (props changed)
  head/databases/postgis/files/patch-postgis__Makefile.in   (props changed)
Deleted:
  head/databases/postgis/files/patch-doc-Makefile.in
  head/databases/postgis/files/patch-doc-html-image_src-Makefile.in
  head/databases/postgis/files/patch-loader-Makefile.in
  head/databases/postgis/files/patch-postgis-Makefile.in
Modified:
  head/databases/postgis/Makefile   (contents, props changed)

Modified: head/databases/postgis/Makefile
==============================================================================
--- head/databases/postgis/Makefile	Tue Feb 19 20:16:22 2013	(r312599)
+++ head/databases/postgis/Makefile	Tue Feb 19 20:34:13 2013	(r312600)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	PostGIS
-# Date created:		June 09, 2004
-# Whom:			Anderson Soares Ferreira <anderson at cnpm.embrapa.br>
-#
+# Created by: Anderson Soares Ferreira <anderson at cnpm.embrapa.br>
 # $FreeBSD$
-#
 
 PORTNAME=	postgis
 PORTVERSION=	1.5.3
@@ -15,30 +11,33 @@ MASTER_SITES=	http://postgis.refractions
 MAINTAINER=	anderson at 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 <bsd.port.options.mk>
 
 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 <bsd.port.pre.mk>
 
-.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

Copied: head/databases/postgis/files/patch-doc__Makefile.in (from r312595, head/databases/postgis/files/patch-doc-Makefile.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/postgis/files/patch-doc__Makefile.in	Tue Feb 19 20:34:13 2013	(r312600, copy of r312595, head/databases/postgis/files/patch-doc-Makefile.in)
@@ -0,0 +1,40 @@
+--- 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
+ 
+ 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
+ 
+ uninstall:
+ 	rm -f $(PGSQL_DOCDIR)/postgis/postgis.html

Copied: head/databases/postgis/files/patch-doc__html__image_src__Makefile.in (from r312595, head/databases/postgis/files/patch-doc-html-image_src-Makefile.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/postgis/files/patch-doc__html__image_src__Makefile.in	Tue Feb 19 20:34:13 2013	(r312600, copy of r312595, head/databases/postgis/files/patch-doc-html-image_src-Makefile.in)
@@ -0,0 +1,30 @@
+--- 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
++

Copied: head/databases/postgis/files/patch-loader__Makefile.in (from r312595, head/databases/postgis/files/patch-loader-Makefile.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/postgis/files/patch-loader__Makefile.in	Tue Feb 19 20:34:13 2013	(r312600, copy of r312595, head/databases/postgis/files/patch-loader-Makefile.in)
@@ -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 at EXESUFFIX@
+ SHP2PGSQL=shp2pgsql at EXESUFFIX@

Copied: head/databases/postgis/files/patch-postgis__Makefile.in (from r312595, head/databases/postgis/files/patch-postgis-Makefile.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/postgis/files/patch-postgis__Makefile.in	Tue Feb 19 20:34:13 2013	(r312600, copy of r312595, head/databases/postgis/files/patch-postgis-Makefile.in)
@@ -0,0 +1,34 @@
+--- 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 @@
+ MODULE_big=postgis- at POSTGIS_MAJOR_VERSION@. at POSTGIS_MINOR_VERSION@
+ MODULEDIR=contrib/$(MODULE_big)
+ 
++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_15_minor.sql postgis_upgrade_14_to_15.sql postgis_upgrade_13_to_15.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- at POSTGIS_MAJOR_VERSION@. at 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

More information about the svn-ports-head mailing list