ports/144021: [ PATCH ] databases/rrdtool doesn't honor NOPORTDOCS|NOPORTEXAMPLES after latest update

[Dan Lukes]

>Number:         144021
>Category:       ports
>Synopsis:       [ PATCH ] databases/rrdtool doesn't honor NOPORTDOCS|NOPORTEXAMPLES after latest update
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 16 21:40:00 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Dan Lukes
>Release:        FreeBSD
>Organization:
Obludarium
>Environment:
System: FreeBSD
databases/rrdtool/Makefile,v 1.89 2010/02/12 12:58:21 pav

>Description:
	See synopsis. Because of changed content of Makefile.in post-extract patch doesn't apply
>How-To-Repeat:
	Try to compile with NOPORTDOCS. install phase will fail
	Try to compile with NOPORTEXAMPLES. Examples will be installed
>Fix:

--- Makefile.orig	2010-02-16 21:22:42.000000000 +0100
+++ Makefile	2010-02-16 22:04:25.000000000 +0100
@@ -101,12 +101,13 @@
 post-extract:
 	@${REINPLACE_CMD} -e 's/^POD3/#POD3/' ${WRKSRC}/doc/Makefile.in
 .if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e 's/install-idocDATA install-ihtmlDATA//g' \
-		-e 's/^	cd .* rrdtool.html index.html/	#/' \
+	@${REINPLACE_CMD} -e 's/[[:space:]]install-idocDATA//g' \
+		-e 's/[[:space:]]install-ihtmlDATA//g' \
+		-e 's/^[[:space:]].*cd .* rrdtool.html index.html/	#/' \
 		${WRKSRC}/doc/Makefile.in
 .endif
 .if defined(NOPORTEXAMPLES)
-	${REINPLACE_CMD} -e 's|SUBDIRS = po src examples doc bindings intl|SUBDIRS = po src doc bindings intl|' \
+	${REINPLACE_CMD} -e '/^SUBDIRS = /s| examples | |' \
 		${WRKSRC}/Makefile.in
 .endif
 
--- pkg-plist.orig	2010-02-16 22:13:18.000000000 +0100
+++ pkg-plist	2010-02-16 22:14:04.000000000 +0100
@@ -24,8 +24,8 @@
 %%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/RRD.so
 %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp
 %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs
-share/rrdtool/examples/rrdcached/RRDCached.pm
-share/rrdtool/examples/rrdcached/rrdcached-size.pl
+%%PORTEXAMPLES%%share/rrdtool/examples/rrdcached/RRDCached.pm
+%%PORTEXAMPLES%%share/rrdtool/examples/rrdcached/rrdcached-size.pl
 @dirrm share/rrdtool/examples/rrdcached
 @dirrm share/rrdtool/examples
 @dirrm share/rrdtool
>Release-Note:
>Audit-Trail:
>Unformatted: