From be407499ad6ed84fe0344de31635e99c6b979a05 Mon Sep 17 00:00:00 2001 From: chinsan Date: Fri, 31 Aug 2007 10:32:16 +0000 Subject: - Respect NOPORTDOCS. - Respect USE_LDCONFIG. PR: ports/115808 Submitted by: Sunpoet Po-Chuan Hsieh Approved by: maintainer --- databases/postgis/Makefile | 3 +++ databases/postgis/files/patch-GNUmakefile | 30 +++++++++++++++++++++++++++--- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/databases/postgis/Makefile b/databases/postgis/Makefile index db5484cbde35..045159464a21 100644 --- a/databases/postgis/Makefile +++ b/databases/postgis/Makefile @@ -20,6 +20,7 @@ RUN_DEPENDS= postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server USE_GCC= 3.2+ USE_PGSQL= yes USE_GMAKE= yes +USE_LDCONFIG= yes USE_PERL5_BUILD= yes INSTALL_TARGET= install @@ -41,6 +42,8 @@ BUILD_DEPENDS+= xsltproc:${PORTSDIR}/textproc/libxslt \ MAKE_ARGS+= WITH-DOC=yes MAN1= pgsql2shp.1 shp2pgsql.1 PORTDOCS= * +.else +MAKE_ARGS+= NOPORTSDOC=yes .endif .if defined(WITH_UTF8) diff --git a/databases/postgis/files/patch-GNUmakefile b/databases/postgis/files/patch-GNUmakefile index 20a3326c08fb..5cc80a4804b0 100644 --- a/databases/postgis/files/patch-GNUmakefile +++ b/databases/postgis/files/patch-GNUmakefile @@ -1,5 +1,5 @@ ---- GNUmakefile 2007-07-10 18:12:42.000000000 -0300 -+++ GNUmakefile 2007-08-01 08:23:45.000000000 -0300 +--- GNUmakefile.orig 2007-07-11 05:12:42.000000000 +0800 ++++ GNUmakefile 2007-08-31 17:41:49.000000000 +0800 @@ -4,9 +4,9 @@ # #----------------------------------------------------- @@ -12,7 +12,31 @@ uninstall: liblwgeom-uninstall loaderdumper-uninstall docs-uninstall -@@ -87,6 +87,9 @@ +@@ -72,21 +72,31 @@ + $(MAKE) -C extras/template_gis uninstall + + docs: Makefile.config +- $(MAKE) -C doc ++ifndef NOPORTSDOC ++ $(MAKE) -C doc ++endif + + docs-clean: Makefile.config ++ifndef NOPORTSDOC + $(MAKE) -C doc clean +- ++endif + + docs-install: ++ifndef NOPORTSDOC + $(MAKE) -C doc install ++endif + + docs-uninstall: ++ifndef NOPORTSDOC + $(MAKE) -C doc uninstall ++endif + utils: $(MAKE) -C utils -- cgit