diff options
Diffstat (limited to 'databases/postgis/files')
| -rw-r--r-- | databases/postgis/files/patch-doc-Makefile.in | 25 | ||||
| -rw-r--r-- | databases/postgis/files/patch-doc-html-image_src-Makefile.in | 30 | ||||
| -rw-r--r-- | databases/postgis/files/patch-postgis-Makefile.in | 26 |
3 files changed, 65 insertions, 16 deletions
diff --git a/databases/postgis/files/patch-doc-Makefile.in b/databases/postgis/files/patch-doc-Makefile.in index 955f8c0129a6..796fced2d04c 100644 --- a/databases/postgis/files/patch-doc-Makefile.in +++ b/databases/postgis/files/patch-doc-Makefile.in @@ -1,6 +1,24 @@ ---- 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 @@ +--- 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 @@ -16,6 +34,7 @@ + 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 diff --git a/databases/postgis/files/patch-doc-html-image_src-Makefile.in b/databases/postgis/files/patch-doc-html-image_src-Makefile.in new file mode 100644 index 000000000000..cc66e6d3f6f9 --- /dev/null +++ b/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 ++ diff --git a/databases/postgis/files/patch-postgis-Makefile.in b/databases/postgis/files/patch-postgis-Makefile.in index aecbcdae6065..6562c4cfda54 100644 --- a/databases/postgis/files/patch-postgis-Makefile.in +++ b/databases/postgis/files/patch-postgis-Makefile.in @@ -1,34 +1,34 @@ ---- postgis/Makefile.in.orig 2009-11-14 06:26:00.000000000 +0800 -+++ postgis/Makefile.in 2010-01-22 11:41:18.000000000 +0800 -@@ -12,6 +12,10 @@ - +--- 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-@POSTGIS_MAJOR_VERSION@.@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_14_minor.sql postgis_upgrade_13_to_14.sql postgis_upgrade_12_to_14.sql + 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 -@@ -73,16 +77,16 @@ +@@ -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_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@,g' $< >$@ +- sed 's,MODULE_PATHNAME,$$libdir/postgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@,g' $< >$@ + sed 's,MODULE_PATHNAME,$$libdir/$*,g' $< >$@ - postgis_upgrade_14_minor.sql: postgis.sql + 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_14.sql: postgis.sql + postgis_upgrade_13_to_15.sql: postgis.sql - $(PERL) ../utils/postgis_proc_upgrade.pl $< 1.3 > $@ + %PERL% ../utils/postgis_proc_upgrade.pl $< 1.3 > $@ - postgis_upgrade_12_to_14.sql: postgis.sql -- $(PERL) ../utils/postgis_proc_upgrade.pl $< 1.2 > $@ -+ %PERL% ../utils/postgis_proc_upgrade.pl $< 1.2 > $@ - # Generate any .sql.in files from .sql.in.c files by running them through the C pre-processor $(SQL_OBJS): %.in: %.in.c |