Attachment #98596 for bug #137537

View | Details | Raw Unified | Return to bug 137537
Collapse All | Expand All




#

PORTNAME=	postgis
DISTVERSION=	1.4.0
PORTREVISION=	1
CATEGORIES=	databases geography
MASTER_SITES=	http://postgis.refractions.net/download/ \
  		http://www.postgis.org/download/

MAINTAINER=	anderson@cnpm.embrapa.br
COMMENT=	Adds support for geographic objects to PostgreSQL databases

BUILD_DEPENDS=	${LOCALBASE}/bin/geos-config:${PORTSDIR}/graphics/geos
LIB_DEPENDS=	proj.5:${PORTSDIR}/graphics/proj
RUN_DEPENDS=	postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server



INSTALL_TARGET=	install

OPTIONS=	GEOS "Include GEOS - the OpenGIS 'Simple Features for SQL'" off \
		UTF8 "UTF-8 support for shp2pgsql. (needs libiconv)" off

GNU_CONFIGURE=	yes
CFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib
MAKE_ENV=	DATADIR=${DATADIR} DOCSDIR=${DOCSDIR}
CONFIGURE_ARGS=	--with-projdir=${LOCALBASE}

.include <bsd.port.pre.mk>

.if !defined(NOPORTDOCS)
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
MAN1=		pgsql2shp.1 shp2pgsql.1
PORTDOCS=	*
#.else
#MAKE_ARGS+=	NOPORTDOCS=yes
.endif

.if defined(WITH_UTF8)
USE_ICONV=	yes
MAKE_ENV+=	"LDFLAGS=-L${LOCALBASE}/lib"
.else
CONFIGURE_ARGS+=	--without-iconv
.endif

.if defined(WITH_GEOS)
LIB_DEPENDS+=	geos:${PORTSDIR}/graphics/geos
CONFIGURE_ARGS+=	--with-geos=${LOCALBASE}/bin/geos-config
.else
CONFIGURE_ARGS+=	--without-geos
.endif

post-extract:
	@${REINPLACE_CMD} -e 's#@ICONV_LDFLAGS@#-liconv -L${LOCALBASE}/lib#g' \
		${WRKSRC}/loader/Makefile.in

post-patch:
	@${REINPLACE_CMD} -e 's#%PERL%#${PERL}#g' \
		${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.4.so ${PREFIX}/lib/postgresql/postgis.so
	@${LN} -s ${PREFIX}/lib/postgresql/postgis-1.4.so ${PREFIX}/lib/postgresql/liblwgeom.so.1
	@${LN} -s ${PREFIX}/lib/postgresql/postgis-1.4.so ${PREFIX}/lib/postgresql/liblwgeom.so

post-deinstall:
	@ ${SETENV} PKG_PREFIX=${PREFIX} \
		${SH} ${PKGDEINSTALL} ${PORTNAME} POST-DEINSTALL

.include <bsd.port.post.mk>

Lines 1-4 Link Here

(-)postgis/distinfo (-4 / +3 lines)
1	SIZE (postgis-1.3.6.tar.gz) = 2227317	1	MD5 (postgis-1.4.0.tar.gz) = bc5b97d5399bd20ca90bfdf784ab6c33
2	MD5 (postgis-1.3.6.tar.gz) = da590f0e485335e9cdaeb66c3d68aa24	2	SHA256 (postgis-1.4.0.tar.gz) = 71c5ffde54a2ecbb88fbffa12ca18c617ecfe2404fb9049940cd1b7a06a7e38d
3	SHA256 (postgis-1.3.6.tar.gz) = d3b04d4a3439596a1f6368b0627f21762347cef1e0694d5471ef17c6a3b7d144	3	SIZE (postgis-1.4.0.tar.gz) = 3143966
4




--- 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:
+ifndef NOPORTSDOC
 	$(MAKE) -C doc clean
@@ -95,7 +97,9 @@
 	$(MAKE) -C doc comments-uninstall
 
 docs-install:
+ifndef NOPORTDOCS
 	$(MAKE) -C doc install
+endif
 
 docs-uninstall:
+ifndef NOPORTSDOC
 	$(MAKE) -C doc uninstall
+endif
 
 utils:
 	$(MAKE) -C utils
 
+utils-install:
+	${MAKE} -C utils install
+
 configure: configure.in
 	./autogen.sh
 

Lines 1-10 Link Here

(-)postgis/files/patch-configure (-10 lines)
1	--- configure 2009-05-04 15:03:04.000000000 -0300
2	+++ configure 2009-05-18 08:36:54.000000000 -0300
3	@@ -4806,6 +4806,7 @@
4	/opt/local/share/xsl/docbook-xsl
5	/usr/local/share/xsl/docbook-xsl
6	/usr/share/xsl/docbook-xsl
7	+ /usr/local/share/xsl/docbook
8	"
9	for p in ${SEARCHPATH}; do
10	if test -r "${p}"/html/docbook.xsl; then




--- doc/Makefile.in.orig	2009-07-08 12:16:53.000000000 -0300
+++ doc/Makefile.in	2009-09-20 10:12:53.000000000 -0300
@@ -135,12 +135,12 @@
 	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
 
 uninstall:
 	rm -f $(PGSQL_DOCDIR)/postgis/postgis.html




--- loader/Makefile	Fri Dec 16 14:47:24 2005
+++ loader/Makefile	Wed Dec 28 14:23:13 2005
@@ -9,7 +9,7 @@
 #---------------------------------------------------------------
 
 ifeq ($(USE_ICONV),1)
-	override CFLAGS += -DUSE_ICONV
+	override CFLAGS += -DUSE_ICONV -I/usr/local/include
 	override LDFLAGS += $(ICONV_LDFLAGS)
 endif
 
--- loader/shp2pgsql.c	Tue Nov  1 07:25:47 2005
+++ loader/shp2pgsql.c	Wed Dec 28 14:23:13 2005
@@ -33,7 +33,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include "getopt.h"
-#ifdef HAVE_ICONV_H
+#ifdef USE_ICONV
 #include <iconv.h>
 #endif
 




--- 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@EXESUFFIX@
 SHP2PGSQL=shp2pgsql@EXESUFFIX@

Lines 1-11 Link Here

(-)postgis/files/patch-lwgeom (-11 lines)
1	--- lwgeom/Makefile 2008-03-28 18:28:21.000000000 -0300
2	+++ lwgeom/Makefile 2008-04-16 11:41:22.000000000 -0300
3	@@ -122,7 +122,7 @@
4	$(PERL) ../utils/postgis_proc_upgrade.pl ../lwpostgis.sql > ../lwpostgis_upgrade.sql
5
6	../lwpostgis.sql: lwpostgis.sql.in long_xact.sql.in sqlmm.sql.in sqldefines.h
7	- cpp -P -traditional-cpp $(SQL_FLAGS) $< \| sed -e 's:@MODULE_FILENAME@:$(MODULE_FILENAME):g;s:@POSTGIS_VERSION@:$(POSTGIS_VERSION):g;s:@POSTGIS_SCRIPTS_VERSION@:$(SCRIPTS_VERSION):g;s/@POSTGIS_BUILD_DATE@/$(POSTGIS_BUILD_DATE)/g' \| grep -v '^#' > $@
8	+ cpp -P -traditional-cpp $(SQL_FLAGS) $< \| sed -e 's:@MODULE_FILENAME@:$$libdir/liblwgeom.so.1:g;s:@POSTGIS_VERSION@:$(POSTGIS_VERSION):g;s:@POSTGIS_SCRIPTS_VERSION@:$(SCRIPTS_VERSION):g;s/@POSTGIS_BUILD_DATE@/$(POSTGIS_BUILD_DATE)/g' \| grep -v '^#' > $@
9
10	../regress/lwpostgis.sql: lwpostgis.sql.in long_xact.sql.in sqlmm.sql.in sqldefines.h
11	cpp -P -traditional-cpp $(SQL_FLAGS) $< \| sed -e 's#@MODULE_FILENAME@#$(MODULE_FILENAME)#g;s#@POSTGIS_VERSION@#$(POSTGIS_VERSION)#g;s#@POSTGIS_SCRIPTS_VERSION@#$(SCRIPTS_VERSION)#g;s/@POSTGIS_BUILD_DATE@/$(POSTGIS_BUILD_DATE)/g' \| grep -v '^#' > $@




--- postgis/Makefile.in.orig	2009-06-06 11:09:39.000000000 -0300
+++ postgis/Makefile.in	2009-09-20 09:48:02.000000000 -0300
@@ -12,6 +12,10 @@
 
 MODULE_big=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=postgis.sql uninstall_postgis.sql postgis_upgrade.sql
 DATA=../spatial_ref_sys.sql
@@ -73,10 +77,10 @@
 
 # Borrow the $libdir substitution from PGXS but customise by adding the version number
 %.sql: %.sql.in
-	sed 's,MODULE_PATHNAME,$$libdir/$*-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@,g' $< >$@
+	sed 's,MODULE_PATHNAME,$$libdir/$*,g' $< >$@
 
 postgis_upgrade.sql: postgis.sql
-	$(PERL) ../utils/postgis_proc_upgrade.pl $< > $@
+	/usr/local/bin/perl ../utils/postgis_proc_upgrade.pl $< > $@
 
 # Generate any .sql.in files from .sql.in.c files by running them through the C pre-processor 
 $(SQL_OBJS): %.in: %.in.c




--- utils/Makefile	Mon Jun  6 13:49:41 2005
+++ utils/Makefile	Wed Dec 28 15:33:31 2005
@@ -1,3 +1,6 @@
+include ../Makefile.config
+include ../Version.config
+
 SCRIPTS = \
 	postgis_restore.pl \
 	create_undef.pl \
@@ -8,3 +11,12 @@
 
 all:
 	chmod +x $(SCRIPTS)
+
+install:
+	@mkdir -p $(DESTDIR)$(datadir)/utils
+	$(INSTALL_DATA) README $(DESTDIR)$(datadir)/utils/README
+	$(INSTALL_DATA) create_undef.pl $(DESTDIR)$(datadir)/utils/create_undef.pl
+	$(INSTALL_DATA) postgis_restore.pl $(DESTDIR)$(datadir)/utils/postgis_restore.pl
+	$(INSTALL_DATA) profile_intersects.pl $(DESTDIR)$(datadir)/utils/profile_intersects.pl
+	$(INSTALL_DATA) test_estimation.pl $(DESTDIR)$(datadir)/utils/test_estimation.pl
+	$(INSTALL_DATA) test_joinestimation.pl $(DESTDIR)$(datadir)/utils/test_joinestimation.pl




bin/pgsql2shp
bin/shp2pgsql
lib/postgresql/postgis-1.4.so
lib/postgresql/postgis.so
lib/postgresql/liblwgeom.so
lib/postgresql/liblwgeom.so.1
share/postgis/contrib/postgis.sql
share/postgis/contrib/postgis_upgrade.sql
share/postgis/contrib/spatial_ref_sys.sql
share/postgis/contrib/uninstall_postgis.sql
share/postgis/utils/create_undef.pl
share/postgis/utils/new_postgis_restore.pl
share/postgis/utils/postgis_proc_upgrade.pl
share/postgis/utils/postgis_restore.pl
share/postgis/utils/profile_intersects.pl
share/postgis/utils/test_estimation.pl
share/postgis/utils/test_joinestimation.pl
@dirrm share/postgis/utils
@dirrm share/postgis/contrib
@dirrm share/postgis
@dirrmtry lib/postgresql
@dirrmtry %%DATADIR%%/utils
@dirrmtry %%DATADIR%%
@dirrmtry lib

Return to bug 137537

Lines 6-19 Link Here

(-)postgis/Makefile (-36 / +29 lines)
6	#	6	#
7		7
8	PORTNAME= postgis	8	PORTNAME= postgis
9	DISTVERSION= 1.3.6	9	DISTVERSION= 1.4.0
10	PORTREVISION= 1
11	CATEGORIES= databases geography	10	CATEGORIES= databases geography
12	MASTER_SITES= http://postgis.refractions.net/download/	11	MASTER_SITES= http://postgis.refractions.net/download/ \
		12	http://www.postgis.org/download/
13		13
14	MAINTAINER= anderson@cnpm.embrapa.br	14	MAINTAINER= anderson@cnpm.embrapa.br
15	COMMENT= Adds support for geographic objects to PostgreSQL databases	15	COMMENT= Adds support for geographic objects to PostgreSQL databases
16		16
		17	BUILD_DEPENDS= ${LOCALBASE}/bin/geos-config:${PORTSDIR}/graphics/geos
17	LIB_DEPENDS= proj.5:${PORTSDIR}/graphics/proj	18	LIB_DEPENDS= proj.5:${PORTSDIR}/graphics/proj
18	RUN_DEPENDS= postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server	19	RUN_DEPENDS= postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
19		20
Lines 25-76 Link Here
25		26
26	INSTALL_TARGET= install	27	INSTALL_TARGET= install
27		28
28	OPTIONS= GEOS "Include GEOS - the OpenGIS 'Simple Features for SQL'" off \
29	UTF8 "UTF-8 support for shp2pgsql. (needs libiconv)" off
30
31	GNU_CONFIGURE= yes	29	GNU_CONFIGURE= yes
32	CONFIGURE_ARGS= --datadir=${PREFIX}/share/postgis \	30	CFLAGS+= -I${LOCALBASE}/include
33	--bindir=${PREFIX}/bin \	31	LDFLAGS+= -L${LOCALBASE}/lib
34	--libdir=${PREFIX}/lib \	32	MAKE_ENV= DATADIR=${DATADIR} DOCSDIR=${DOCSDIR}
35	--with-proj	33	CONFIGURE_ARGS= --with-projdir=${LOCALBASE}
36		34
37	.include <bsd.port.pre.mk>	35	.include <bsd.port.pre.mk>
38		36
39	.if !defined(NOPORTDOCS)	37	.if !defined(NOPORTDOCS)
40	BUILD_DEPENDS+= xsltproc:${PORTSDIR}/textproc/libxslt \	38	BUILD_DEPENDS+= xsltproc:${PORTSDIR}/textproc/libxslt \
41	${LOCALBASE}/share/xsl/docbook/html/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl	39	${LOCALBASE}/share/xsl/docbook/html/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl
42	MAKE_ARGS+= WITH-DOC=yes	40	CONFIGURE_ARGS+= --with-xsldir=${LOCALBASE}/share/xsl/docbook
43	MAN1= pgsql2shp.1 shp2pgsql.1	41	MAN1= pgsql2shp.1 shp2pgsql.1
44	PORTDOCS= *	42	PORTDOCS= *
45	.else	43	#.else
46	MAKE_ARGS+= NOPORTSDOC=yes	44	#MAKE_ARGS+= NOPORTDOCS=yes
47	.endif
48
49	.if defined(WITH_UTF8)
50	USE_ICONV= yes
51	MAKE_ENV+= "LDFLAGS=-L${LOCALBASE}/lib"
52	.else
53	CONFIGURE_ARGS+= --without-iconv
54	.endif
55
56	.if defined(WITH_GEOS)
57	LIB_DEPENDS+= geos:${PORTSDIR}/graphics/geos
58	CONFIGURE_ARGS+= --with-geos=${LOCALBASE}/bin/geos-config
59	.else
60	CONFIGURE_ARGS+= --without-geos
61	.endif	45	.endif
62		46
63	pre-everything::	47	post-extract:
64	@${SH} ${PKGINSTALL} ${PORTNAME} MESSAGE	48	@${REINPLACE_CMD} -e 's#@ICONV_LDFLAGS@#-liconv -L${LOCALBASE}/lib#g' \
		49	${WRKSRC}/loader/Makefile.in
		50
		51	post-patch:
		52	@${REINPLACE_CMD} -e 's#%PERL%#${PERL}#g' \
		53	${WRKSRC}/postgis/Makefile.in
65		54
66	post-install:	55	post-install:
		56	@${MKDIR} ${DATADIR}/utils
		57	${INSTALL_SCRIPT} ${WRKSRC}/utils/create_undef.pl ${DATADIR}/utils/
		58	${INSTALL_SCRIPT} ${WRKSRC}/utils/new_postgis_restore.pl ${DATADIR}/utils/
		59	${INSTALL_SCRIPT} ${WRKSRC}/utils/profile_intersects.pl ${DATADIR}/utils/
		60	${INSTALL_SCRIPT} ${WRKSRC}/utils/postgis_proc_upgrade.pl ${DATADIR}/utils/
		61	${INSTALL_SCRIPT} ${WRKSRC}/utils/test_estimation.pl ${DATADIR}/utils/
		62	${INSTALL_SCRIPT} ${WRKSRC}/utils/postgis_restore.pl ${DATADIR}/utils/
		63	${INSTALL_SCRIPT} ${WRKSRC}/utils/test_joinestimation.pl ${DATADIR}/utils/
67	@${MKDIR} ${PREFIX}/lib/postgresql	64	@${MKDIR} ${PREFIX}/lib/postgresql
68	@${LN} -s ${PREFIX}/lib/liblwgeom.so.1 ${PREFIX}/lib/postgresql	65	@${LN} -s ${PREFIX}/lib/postgresql/postgis-1.4.so ${PREFIX}/lib/postgresql/postgis.so
69	@${SETENV} PKG_PREFIX=${PREFIX} \	66	@${LN} -s ${PREFIX}/lib/postgresql/postgis-1.4.so ${PREFIX}/lib/postgresql/liblwgeom.so.1
70	${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL	67	@${LN} -s ${PREFIX}/lib/postgresql/postgis-1.4.so ${PREFIX}/lib/postgresql/liblwgeom.so
71
72	post-deinstall:
73	@ ${SETENV} PKG_PREFIX=${PREFIX} \
74	${SH} ${PKGDEINSTALL} ${PORTNAME} POST-DEINSTALL
75		68
76	.include <bsd.port.post.mk>	69	.include <bsd.port.post.mk>

Lines 1-48 Link Here

(-)postgis/files/patch-GNUmakefile (-29 / +17 lines)
1	--- GNUmakefile.orig 2007-07-11 05:12:42.000000000 +0800	1	--- GNUmakefile.orig 2009-05-26 15:00:55.000000000 -0300
2	+++ GNUmakefile 2007-08-31 17:41:49.000000000 +0800	2	+++ GNUmakefile 2009-08-07 14:36:10.000000000 -0300
3	@@ -4,9 +4,9 @@	3	@@ -4,10 +4,10 @@
4	#	4	#
5	#-----------------------------------------------------	5	#-----------------------------------------------------
6		6
7	-all: Makefile.config liblwgeom loaderdumper utils	7	-all: postgis loaderdumper utils
8	+all: Makefile.config liblwgeom loaderdumper utils docs	8	+all: postgis loaderdumper utils docs
		9	@echo "PostGIS was built successfully. Ready to install."
9		10
10	-install: all liblwgeom-install loaderdumper-install	11	-install: all postgis-install loaderdumper-install
11	+install: all liblwgeom-install loaderdumper-install utils-install docs-install	12	+install: all postgis-install loaderdumper-install docs-install
12		13
13	uninstall: liblwgeom-uninstall loaderdumper-uninstall docs-uninstall	14	uninstall: postgis-uninstall loaderdumper-uninstall docs-uninstall comments-uninstall
14		15
15	@@ -72,21 +72,31 @@	16	@@ -80,7 +80,9 @@
16	$(MAKE) -C extras/template_gis uninstall	17	$(MAKE) -C extras/template_gis uninstall
17		18
18	docs: Makefile.config	19	docs:
19	- $(MAKE) -C doc	20	- $(MAKE) -C doc
20	+ifndef NOPORTSDOC	21	+ifndef NOPORTDOCS
21	+ $(MAKE) -C doc	22	+ $(MAKE) -C doc html/postgis.html
22	+endif	23	+endif
23		24
24	docs-clean: Makefile.config	25	docs-clean:
25	+ifndef NOPORTSDOC
26	$(MAKE) -C doc clean	26	$(MAKE) -C doc clean
27	-	27	@@ -95,7 +97,9 @@
28	+endif	28	$(MAKE) -C doc comments-uninstall
29		29
30	docs-install:	30	docs-install:
31	+ifndef NOPORTSDOC	31	+ifndef NOPORTDOCS
32	$(MAKE) -C doc install	32	$(MAKE) -C doc install
33	+endif	33	+endif
34		34
35	docs-uninstall:	35	docs-uninstall:
36	+ifndef NOPORTSDOC
37	$(MAKE) -C doc uninstall	36	$(MAKE) -C doc uninstall
38	+endif
39
40	utils:
41	$(MAKE) -C utils
42
43	+utils-install:
44	+ ${MAKE} -C utils install
45	+
46	configure: configure.in
47	./autogen.sh
48

Line 0 Link Here

(-)postgis/files/patch-doc-Makefile.in (+21 lines)
	1	--- doc/Makefile.in.orig 2009-07-08 12:16:53.000000000 -0300
	2	+++ doc/Makefile.in 2009-09-20 10:12:53.000000000 -0300
	3	@@ -135,12 +135,12 @@
	4	rm -f $(PGSQL_SHAREDIR)/contrib/postgis_comments.sql
	5
	6	install: html/postgis.html man/shp2pgsql.1 man/pgsql2shp.1
	7	- @mkdir -p $(PGSQL_DOCDIR)/postgis
	8	- @mkdir -p $(PGSQL_MANDIR)/man1
	9	- cp html/postgis.html $(PGSQL_DOCDIR)/postgis/postgis.html
	10	- cp ../README.postgis $(PGSQL_DOCDIR)/postgis/README.postgis
	11	- cp man/pgsql2shp.1 $(PGSQL_MANDIR)/man1/pgsql2shp.1
	12	- cp man/shp2pgsql.1 $(PGSQL_MANDIR)/man1/shp2pgsql.1
	13	+ @mkdir -p $(DOCSDIR)
	14	+ @mkdir -p $(PREFIX)/man/man1
	15	+ cp html/postgis.html $(DOCSDIR)/postgis.html
	16	+ cp ../README.postgis $(DOCSDIR)/README.postgis
	17	+ cp man/pgsql2shp.1 $(PREFIX)/man/man1/pgsql2shp.1
	18	+ cp man/shp2pgsql.1 $(PREFIX)/man/man1/shp2pgsql.1
	19
	20	uninstall:
	21	rm -f $(PGSQL_DOCDIR)/postgis/postgis.html

Lines 1-22 Link Here

(-)postgis/files/patch-loader (-22 lines)
1	--- loader/Makefile Fri Dec 16 14:47:24 2005
2	+++ loader/Makefile Wed Dec 28 14:23:13 2005
3	@@ -9,7 +9,7 @@
4	#---------------------------------------------------------------
5
6	ifeq ($(USE_ICONV),1)
7	- override CFLAGS += -DUSE_ICONV
8	+ override CFLAGS += -DUSE_ICONV -I/usr/local/include
9	override LDFLAGS += $(ICONV_LDFLAGS)
10	endif
11
12	--- loader/shp2pgsql.c Tue Nov 1 07:25:47 2005
13	+++ loader/shp2pgsql.c Wed Dec 28 14:23:13 2005
14	@@ -33,7 +33,7 @@
15	#include <unistd.h>
16	#include <errno.h>
17	#include "getopt.h"
18	-#ifdef HAVE_ICONV_H
19	+#ifdef USE_ICONV
20	#include <iconv.h>
21	#endif
22

Line 0 Link Here

(-)postgis/files/patch-loader-Makefile.in (+13 lines)
	1	--- loader/Makefile.in.orig 2009-08-07 11:13:19.000000000 -0300
	2	+++ loader/Makefile.in 2009-08-07 11:14:01.000000000 -0300
	3	@@ -13,6 +13,10 @@
	4	CC=@CC@
	5	CFLAGS=@CFLAGS@ @PICFLAGS@ @WARNFLAGS@
	6
	7	+override datadir := $(DATADIR)
	8	+override bindir := $(PREFIX)/bin
	9	+override pkglibdir := $(PREFIX)/lib/postgresql
	10	+
	11	# Filenames with extension as determined by the OS
	12	PGSQL2SHP=pgsql2shp@EXESUFFIX@
	13	SHP2PGSQL=shp2pgsql@EXESUFFIX@

Line 0 Link Here

(-)postgis/files/patch-postgis-Makefile.in (+26 lines)
	1	--- postgis/Makefile.in.orig 2009-06-06 11:09:39.000000000 -0300
	2	+++ postgis/Makefile.in 2009-09-20 09:48:02.000000000 -0300
	3	@@ -12,6 +12,10 @@
	4
	5	MODULE_big=postgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@
	6
	7	+override datadir := $(DATADIR)
	8	+override bindir := $(PREFIX)/bin
	9	+override pkglibdir := $(PREFIX)/lib/postgresql
	10	+
	11	# Files to be copied to the contrib/ directory
	12	DATA_built=postgis.sql uninstall_postgis.sql postgis_upgrade.sql
	13	DATA=../spatial_ref_sys.sql
	14	@@ -73,10 +77,10 @@
	15
	16	# Borrow the $libdir substitution from PGXS but customise by adding the version number
	17	%.sql: %.sql.in
	18	- sed 's,MODULE_PATHNAME,$$libdir/$*-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@,g' $< >$@
	19	+ sed 's,MODULE_PATHNAME,$$libdir/$*,g' $< >$@
	20
	21	postgis_upgrade.sql: postgis.sql
	22	- $(PERL) ../utils/postgis_proc_upgrade.pl $< > $@
	23	+ /usr/local/bin/perl ../utils/postgis_proc_upgrade.pl $< > $@
	24
	25	# Generate any .sql.in files from .sql.in.c files by running them through the C pre-processor
	26	$(SQL_OBJS): %.in: %.in.c

Lines 1-22 Link Here

(-)postgis/files/patch-utils (-22 lines)
1	--- utils/Makefile Mon Jun 6 13:49:41 2005
2	+++ utils/Makefile Wed Dec 28 15:33:31 2005
3	@@ -1,3 +1,6 @@
4	+include ../Makefile.config
5	+include ../Version.config
6	+
7	SCRIPTS = \
8	postgis_restore.pl \
9	create_undef.pl \
10	@@ -8,3 +11,12 @@
11
12	all:
13	chmod +x $(SCRIPTS)
14	+
15	+install:
16	+ @mkdir -p $(DESTDIR)$(datadir)/utils
17	+ $(INSTALL_DATA) README $(DESTDIR)$(datadir)/utils/README
18	+ $(INSTALL_DATA) create_undef.pl $(DESTDIR)$(datadir)/utils/create_undef.pl
19	+ $(INSTALL_DATA) postgis_restore.pl $(DESTDIR)$(datadir)/utils/postgis_restore.pl
20	+ $(INSTALL_DATA) profile_intersects.pl $(DESTDIR)$(datadir)/utils/profile_intersects.pl
21	+ $(INSTALL_DATA) test_estimation.pl $(DESTDIR)$(datadir)/utils/test_estimation.pl
22	+ $(INSTALL_DATA) test_joinestimation.pl $(DESTDIR)$(datadir)/utils/test_joinestimation.pl

Lines 1-19 Link Here

(-)postgis/pkg-plist (-15 / +17 lines)
1	bin/pgsql2shp	1	bin/pgsql2shp
2	bin/shp2pgsql	2	bin/shp2pgsql
3	lib/liblwgeom.so	3	lib/postgresql/postgis-1.4.so
4	lib/liblwgeom.so.1	4	lib/postgresql/postgis.so
		5	lib/postgresql/liblwgeom.so
5	lib/postgresql/liblwgeom.so.1	6	lib/postgresql/liblwgeom.so.1
6	%%DATADIR%%/lwpostgis.sql	7	share/postgis/contrib/postgis.sql
7	%%DATADIR%%/lwpostgis_upgrade.sql	8	share/postgis/contrib/postgis_upgrade.sql
8	%%DATADIR%%/spatial_ref_sys.sql	9	share/postgis/contrib/spatial_ref_sys.sql
9	%%DATADIR%%/utils/postgis_restore.pl	10	share/postgis/contrib/uninstall_postgis.sql
10	%%DATADIR%%/utils/profile_intersects.pl	11	share/postgis/utils/create_undef.pl
11	%%DATADIR%%/utils/test_estimation.pl	12	share/postgis/utils/new_postgis_restore.pl
12	%%DATADIR%%/utils/test_joinestimation.pl	13	share/postgis/utils/postgis_proc_upgrade.pl
13	%%DATADIR%%/utils/create_undef.pl	14	share/postgis/utils/postgis_restore.pl
14	%%DATADIR%%/utils/README	15	share/postgis/utils/profile_intersects.pl
15	%%PORTDOCS%%@dirrmtry %%DOCSDIR%%	16	share/postgis/utils/test_estimation.pl
		17	share/postgis/utils/test_joinestimation.pl
		18	@dirrm share/postgis/utils
		19	@dirrm share/postgis/contrib
		20	@dirrm share/postgis
16	@dirrmtry lib/postgresql	21	@dirrmtry lib/postgresql
17	@dirrmtry %%DATADIR%%/utils
18	@dirrmtry %%DATADIR%%
19	@dirrmtry lib