2 files changed, 84 insertions, 82 deletions

diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 0c9cfd2ed15a..b86fa1819577 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -14,8 +14,10 @@ MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Round Robin Database Tools
 
 USE_PERL5=	yes
-MAKE_ENV+=	PERL=${PERL}
+MAKE_ENV=	PERL=${PERL}
 
+USE_LIBTOOL_VER=15
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-local-zlib \
@@ -32,21 +34,22 @@ MAN1=		RRDp.1 RRDs.1 bin_dec_hex.1 rrdcgi.1 rrdcreate.1 rrddump.1 \
 MAN3=		RRDp.3 RRDs.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
+OPTIONS=	"ISO-8859-2 fonts support" off
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_LATIN2)
-CONFIGURE_ARGS+=	--enable-latin2
+CONFIGURE_ARGS+=--enable-latin2
 .endif
 
 .if ${ARCH} == "amd64"
 CONFIGURE_ARGS+=--with-pic
 .endif
 
-pre-extract:
-.if !defined(WITH_LATIN2)
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "You can enable support for ISO-8859-2 fonts by defining WITH_LATIN2."
-	@${ECHO_MSG} ""
+post-extract:
+.if defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -e 's/install-idocDATA install-ihtmlDATA//g' \
+		${WRKSRC}/doc/Makefile.in
 .endif
 
 post-install:
diff --git a/databases/rrdtool/pkg-plist b/databases/rrdtool/pkg-plist
index 6235d8efb1b3..8dff2081e87d 100644
--- a/databases/rrdtool/pkg-plist
+++ b/databases/rrdtool/pkg-plist
@@ -3,80 +3,79 @@ bin/rrdcgi
 bin/trytime
 bin/rrdupdate
 lib/librrd.a
-lib/librrd.la
 lib/librrd.so.0
 lib/librrd.so
 include/rrd.h
-share/examples/rrdtool/cgi-demo.cgi
-share/examples/rrdtool/piped-demo.pl
-share/examples/rrdtool/shared-demo.pl
-share/examples/rrdtool/stripes.pl
-share/examples/rrdtool/bigtops.pl
-share/examples/rrdtool/minmax.pl
-share/examples/rrdtool/trytime/trytime.c
-share/examples/rrdtool/trytime/README
-share/examples/rrdtool/README
-share/doc/rrdtool/rrdtool.pod
-share/doc/rrdtool/rrdinfo.pod
-share/doc/rrdtool/rrdlast.pod
-share/doc/rrdtool/rrdcreate.pod
-share/doc/rrdtool/rrdupdate.pod
-share/doc/rrdtool/cdeftutorial.pod
-share/doc/rrdtool/rpntutorial.pod
-share/doc/rrdtool/rrdgraph.pod
-share/doc/rrdtool/bin_dec_hex.pod
-share/doc/rrdtool/rrdfetch.pod
-share/doc/rrdtool/rrdrestore.pod
-share/doc/rrdtool/rrddump.pod
-share/doc/rrdtool/rrdtune.pod
-share/doc/rrdtool/rrdresize.pod
-share/doc/rrdtool/rrdcgi.pod
-share/doc/rrdtool/rrdtutorial.pod
-share/doc/rrdtool/rrdtutorial.es.pod
-share/doc/rrdtool/rrdxport.pod
-share/doc/rrdtool/rrd-beginners.pod
-share/doc/rrdtool/rrdtool.txt
-share/doc/rrdtool/rrdinfo.txt
-share/doc/rrdtool/rrdlast.txt
-share/doc/rrdtool/rrdcreate.txt
-share/doc/rrdtool/rrdupdate.txt
-share/doc/rrdtool/cdeftutorial.txt
-share/doc/rrdtool/rpntutorial.txt
-share/doc/rrdtool/rrdgraph.txt
-share/doc/rrdtool/bin_dec_hex.txt
-share/doc/rrdtool/rrdfetch.txt
-share/doc/rrdtool/rrdrestore.txt
-share/doc/rrdtool/rrddump.txt
-share/doc/rrdtool/rrdtune.txt
-share/doc/rrdtool/rrdresize.txt
-share/doc/rrdtool/rrdcgi.txt
-share/doc/rrdtool/rrdtutorial.txt
-share/doc/rrdtool/rrdtutorial.es.txt
-share/doc/rrdtool/RRDs.txt
-share/doc/rrdtool/RRDp.txt
-share/doc/rrdtool/rrdxport.txt
-share/doc/rrdtool/rrd-beginners.txt
-share/doc/rrdtool/html/rrdtool.html
-share/doc/rrdtool/html/rrdinfo.html
-share/doc/rrdtool/html/rrdlast.html
-share/doc/rrdtool/html/rrdcreate.html
-share/doc/rrdtool/html/rrdupdate.html
-share/doc/rrdtool/html/cdeftutorial.html
-share/doc/rrdtool/html/rpntutorial.html
-share/doc/rrdtool/html/rrdgraph.html
-share/doc/rrdtool/html/bin_dec_hex.html
-share/doc/rrdtool/html/rrdfetch.html
-share/doc/rrdtool/html/rrdrestore.html
-share/doc/rrdtool/html/rrddump.html
-share/doc/rrdtool/html/rrdtune.html
-share/doc/rrdtool/html/rrdresize.html
-share/doc/rrdtool/html/rrdcgi.html
-share/doc/rrdtool/html/rrdtutorial.html
-share/doc/rrdtool/html/rrdtutorial.es.html
-share/doc/rrdtool/html/RRDs.html
-share/doc/rrdtool/html/RRDp.html
-share/doc/rrdtool/html/rrdxport.html
-share/doc/rrdtool/html/rrd-beginners.html
+%%EXAMPLESDIR%%/cgi-demo.cgi
+%%EXAMPLESDIR%%/piped-demo.pl
+%%EXAMPLESDIR%%/shared-demo.pl
+%%EXAMPLESDIR%%/stripes.pl
+%%EXAMPLESDIR%%/bigtops.pl
+%%EXAMPLESDIR%%/minmax.pl
+%%EXAMPLESDIR%%/trytime/trytime.c
+%%EXAMPLESDIR%%/trytime/README
+%%EXAMPLESDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/rrdtool.pod
+%%PORTDOCS%%%%DOCSDIR%%/rrdinfo.pod
+%%PORTDOCS%%%%DOCSDIR%%/rrdlast.pod
+%%PORTDOCS%%%%DOCSDIR%%/rrdcreate.pod
+%%PORTDOCS%%%%DOCSDIR%%/rrdupdate.pod
+%%PORTDOCS%%%%DOCSDIR%%/cdeftutorial.pod
+%%PORTDOCS%%%%DOCSDIR%%/rpntutorial.pod
+%%PORTDOCS%%%%DOCSDIR%%/rrdgraph.pod
+%%PORTDOCS%%%%DOCSDIR%%/bin_dec_hex.pod
+%%PORTDOCS%%%%DOCSDIR%%/rrdfetch.pod
+%%PORTDOCS%%%%DOCSDIR%%/rrdrestore.pod
+%%PORTDOCS%%%%DOCSDIR%%/rrddump.pod
+%%PORTDOCS%%%%DOCSDIR%%/rrdtune.pod
+%%PORTDOCS%%%%DOCSDIR%%/rrdresize.pod
+%%PORTDOCS%%%%DOCSDIR%%/rrdcgi.pod
+%%PORTDOCS%%%%DOCSDIR%%/rrdtutorial.pod
+%%PORTDOCS%%%%DOCSDIR%%/rrdtutorial.es.pod
+%%PORTDOCS%%%%DOCSDIR%%/rrdxport.pod
+%%PORTDOCS%%%%DOCSDIR%%/rrd-beginners.pod
+%%PORTDOCS%%%%DOCSDIR%%/rrdtool.txt
+%%PORTDOCS%%%%DOCSDIR%%/rrdinfo.txt
+%%PORTDOCS%%%%DOCSDIR%%/rrdlast.txt
+%%PORTDOCS%%%%DOCSDIR%%/rrdcreate.txt
+%%PORTDOCS%%%%DOCSDIR%%/rrdupdate.txt
+%%PORTDOCS%%%%DOCSDIR%%/cdeftutorial.txt
+%%PORTDOCS%%%%DOCSDIR%%/rpntutorial.txt
+%%PORTDOCS%%%%DOCSDIR%%/rrdgraph.txt
+%%PORTDOCS%%%%DOCSDIR%%/bin_dec_hex.txt
+%%PORTDOCS%%%%DOCSDIR%%/rrdfetch.txt
+%%PORTDOCS%%%%DOCSDIR%%/rrdrestore.txt
+%%PORTDOCS%%%%DOCSDIR%%/rrddump.txt
+%%PORTDOCS%%%%DOCSDIR%%/rrdtune.txt
+%%PORTDOCS%%%%DOCSDIR%%/rrdresize.txt
+%%PORTDOCS%%%%DOCSDIR%%/rrdcgi.txt
+%%PORTDOCS%%%%DOCSDIR%%/rrdtutorial.txt
+%%PORTDOCS%%%%DOCSDIR%%/rrdtutorial.es.txt
+%%PORTDOCS%%%%DOCSDIR%%/RRDs.txt
+%%PORTDOCS%%%%DOCSDIR%%/RRDp.txt
+%%PORTDOCS%%%%DOCSDIR%%/rrdxport.txt
+%%PORTDOCS%%%%DOCSDIR%%/rrd-beginners.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdtool.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdinfo.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdlast.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdcreate.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdupdate.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cdeftutorial.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rpntutorial.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph.html
+%%PORTDOCS%%%%DOCSDIR%%/html/bin_dec_hex.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdfetch.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdrestore.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrddump.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdtune.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdresize.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdcgi.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdtutorial.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdtutorial.es.html
+%%PORTDOCS%%%%DOCSDIR%%/html/RRDs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/RRDp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdxport.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrd-beginners.html
 %%SITE_PERL%%/RRDp.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/RRDs.pm
@@ -84,9 +83,9 @@ share/doc/rrdtool/html/rrd-beginners.html
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/.packlist
-@dirrm share/examples/rrdtool/trytime
-@dirrm share/examples/rrdtool
-@dirrm share/doc/rrdtool/html
-@dirrm share/doc/rrdtool
+@dirrm %%EXAMPLESDIR%%/trytime
+@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs